2401 files changed, 174829 insertions, 241150 deletions

diff --git a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/GenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/GenUtils.java
index ffe9402c666..f71c2d7856d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/GenUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.codegen.base/src/org/eclipse/papyrus/codegen/base/GenUtils.java
@@ -23,7 +23,6 @@ import org.eclipse.emf.common.util.UniqueEList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.uml2.uml.Behavior;
-import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Comment;
 import org.eclipse.uml2.uml.Dependency;
@@ -56,14 +55,14 @@ public class GenUtils {
 	public static final String NL = System.getProperties().getProperty("line.separator"); //$NON-NLS-1$
 
 	/**
-	 * Retrieve template bindings for the class passed as a Parameter
-	 * only one template binding can exist for an element
+	 * Retrieve first template binding from list of template bindings, if
+	 * exactly one exists. Return null otherwise.
 	 *
 	 * @param current
 	 *            Class on which the template binding is searched
 	 * @return the template binding of current Class
 	 */
-	public static TemplateBinding getTemplateBindings(Class current) {
+	public static TemplateBinding getTemplateBinding(Classifier current) {
 		TemplateBinding binding = null;
 		if (current.getTemplateBindings().size() == 1) {
 			binding = current.getTemplateBindings().get(0);
@@ -382,8 +381,9 @@ public class GenUtils {
 	 * Is a certain stereotype applied?
 	 *
 	 * @param element
+	 *            a UML element
 	 * @param stereotype
-	 *            fully qualified stereotype name
+	 *            The class of an element of a static profile
 	 * @return
 	 */
 	public static boolean hasStereotype(Element element, java.lang.Class<? extends EObject> clazz) {
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
index cd8d62498a8..ff974a517e5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
@@ -178,11 +178,10 @@ public class CppModelElementsCreator extends ModelElementsCreator {
 				final String bindHeaderFileName = locStrategy.getFileName(classifier) + Constants.DOT + hppExt;

 				generateFile(bindHeaderFileName, commentHeader + CppClassifierGenerator.generateBindHeaderCode(classifier));

 

-				final String bindBodyFileName = classifier.getName() + Constants.DOT + cppExt;

+				final String bindBodyFileName = locStrategy.getFileName(classifier) + Constants.DOT + cppExt;

 				generateFile(bindBodyFileName, commentHeader + CppClassifierGenerator.generateBindBodyCode(classifier));

 			}

 			else {

-

 				// Class Header file generation

 				final String classHeaderFileName = locStrategy.getFileName(classifier) + Constants.DOT + hppExt;

 				generateFile(classHeaderFileName, commentHeader + CppClassifierGenerator.generateClassHeaderCode(classifier));

@@ -241,6 +240,4 @@ public class CppModelElementsCreator extends ModelElementsCreator {
 				GenUtils.hasStereotype(element, External.class) ||

 				GenUtils.hasStereotypeTree(element, ExternLibrary.class);

 	}

-

-

 }

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
index 9dd72f63bd6..7679a73abfe 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
@@ -138,6 +138,10 @@ public class CppGenUtils {
 			// always use the short name for types within the ANSI C library
 			return ne.getName();
 		}
+		else if (owner instanceof ClassifierTemplateParameter) {
+			// return short name for template in Type
+			return ne.getName();
+		}
 
 		String qName = ne.getName();
 		if (currentNS == ne.getNamespace()) {
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend
index 633f6c52673..184390e5135 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassifierGenerator.xtend
@@ -48,16 +48,16 @@ class CppClassifierGenerator {
 		
 		«CppIncludeUtil.CppIncludeHeader(classifier)»
 		
-		«var tb = classifier.templateBindings»
-		«var templateElement = tb.get(0)»
+		«var tb = GenUtils.getTemplateBinding(classifier)»
+		«var templateElement = tb.targets.get(0)»
 		«CppIncludeUtil.includeDirective(
 			GenUtils.getFullPath(classifier.package) + '/' + (templateElement.owner as NamedElement).name + '.' +
 				CppCodeGenUtils.getHeaderSuffix())»
 		
 		«CppGenUtils.openNS(classifier)»
 		/************************************************************/
-		typedef «(templateElement.owner as NamedElement).name»«FOR ps : templateElement.parameterSubstitutions»«CppTemplates.
-			CppTemplateBindingParameter(ps)»«ENDFOR» «classifier.name»;
+		typedef «(templateElement.owner as NamedElement).name»<«FOR ps : tb.parameterSubstitutions SEPARATOR ', '»«
+			CppTemplates.CppTemplateBindingParameter(ps)»«ENDFOR»> «classifier.name»;
 		
 		«CppGenUtils.closeNS(classifier)»
 		
@@ -96,10 +96,10 @@ class CppClassifierGenerator {
 		«ENDFOR»
 		
 		/************************************************************/
-		«var tb = GenUtils.getTemplateBindings(classifier as Class)»
+		«var tb = GenUtils.getTemplateBinding(classifier)»
 		«var templateElement = tb.targets.get(0)»
-		template class «(templateElement.owner as NamedElement).name»<«FOR ps : tb.parameterSubstitutions»«CppTemplates.
-			CppTemplateBindingParameter(ps)»«ENDFOR»;
+		template class «(templateElement.owner as NamedElement).name»<«FOR ps : tb.parameterSubstitutions SEPARATOR ', '»«
+			CppTemplates.CppTemplateBindingParameter(ps)»«ENDFOR»>;
 		
 		«CppGenUtils.closeNS(classifier)»
 		
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend
index 1898a8c38c2..7ab2661f252 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppEnumerations.xtend
@@ -20,10 +20,10 @@ import org.eclipse.papyrus.codegen.base.GenUtils
  * @author Önder GÜRCAN (onder.gurcan@cea.fr)
  */
 class CppEnumerations {
-	static def CppEnumerationDefinition(Enumeration enume) '''
-		«CppDocumentation.CppElementDoc(enume)»
-		enum «enume.name» {
-			«FOR ownedLiteral : enume.ownedLiterals»
+	static def CppEnumerationDefinition(Enumeration enumeration) '''
+		«CppDocumentation.CppElementDoc(enumeration)»
+		enum «enumeration.name» {
+			«FOR ownedLiteral : enumeration.ownedLiterals»
 				«CppDocumentation.CppElementDoc(ownedLiteral)»
 				«ownedLiteral.name»«IF GenUtils.hasStereotype(ownedLiteral, CppInit)»«UMLUtil.
 				getStereotypeApplication(ownedLiteral, CppInit).value»«ENDIF»,
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend
index 5d644df9701..b510c788a42 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppOperations.xtend
@@ -76,7 +76,7 @@ class CppOperations {
 	
 	static def CppConstInit(Operation operation) {
 		if (GenUtils.hasStereotype(operation, ConstInit) && GenUtils.hasStereotype(operation, Create)) {
-			(UMLUtil.getStereotypeApplication(operation, ConstInit) as ConstInit).initialisation
+			": " + UMLUtil.getStereotypeApplication(operation, ConstInit).initialisation
 		}
 	}
 
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java
index 035c06912b5..a16fe1d31b6 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java
@@ -130,10 +130,22 @@ public class CreateJavaValidationPluginHandler extends AbstractHandler {
 				existingProject = root.getProject(uri.segment(1));

 			}

 			IProject hostingProject = existingProject;

+			Shell shell = Display.getDefault().getActiveShell();

+

+			boolean isPlugin = false;

+			try {

+				isPlugin = hostingProject.getNature("org.eclipse.pde.PluginNature") != null; //$NON-NLS-1$

+				if (!isPlugin) {

+					// hosting project is not a plugin

+					MessageDialog.openWarning(shell, Messages.CreateJavaValidationPluginHandler_ProfileIsNotAPlugin, String.format(Messages.CreateJavaValidationPluginHandler_ProfileIsNotAPluginExplication, hostingProject.getName()));

+				}

+			}

+			catch (CoreException e) {

+				Activator.log.error(e);

+			}

 		

 			int question = 0;

-			Shell shell = Display.getDefault().getActiveShell();

-			if ((existingProject != null) && existingProject.exists()) {

+			if ((existingProject != null) && existingProject.exists() && isPlugin) {

 				MessageDialog dialog = new MessageDialog(shell,

 						Messages.CreateJavaValidationPluginHandler_ChoosePluginGeneration, null,

 						Messages.CreateJavaValidationPluginHandler_HowtoGeneratePlugin, MessageDialog.QUESTION,

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java
index eb9fa457e06..8be2b41e53a 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java
@@ -31,6 +31,8 @@ public class Messages extends NLS {
 	public static String CreateJavaValidationPluginHandler_SelectExisting;
 	public static String CreateJavaValidationPluginHandler_HostCurrent;
 	public static String CreateJavaValidationPluginHandler_HowtoGeneratePlugin;
+	public static String CreateJavaValidationPluginHandler_ProfileIsNotAPlugin;
+	public static String CreateJavaValidationPluginHandler_ProfileIsNotAPluginExplication;
 	public static String CreateJavaValidationPluginHandler_ProfileMustBeDefined;
 	static {
 		// initialize resource bundle
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties
index e4a290ae752..dfa481433c8 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties
@@ -8,4 +8,6 @@ CreateJavaValidationPluginHandler_GenerateIntoExisting=Generate DSML code into e
 CreateJavaValidationPluginHandler_HostCurrent=Host in current plugin
 CreateJavaValidationPluginHandler_SelectExisting=Select an existing plugin
 CreateJavaValidationPluginHandler_HowtoGeneratePlugin=How should the plugin be generated?
+CreateJavaValidationPluginHandler_ProfileIsNotAPlugin=Profile is not a plugin
+CreateJavaValidationPluginHandler_ProfileIsNotAPluginExplication=The project (%s) that hosts the profile is not a plugin. Verify that the project itself is imported into the workspace. If you continue, the option to generate into the hosting plugin is not available. Papyrus will also not be able to create a dependency to the DSML plugin for you.
 CreateJavaValidationPluginHandler_ProfileMustBeDefined=The profile must be defined in order to generate OCL Constraints
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/META-INF/MANIFEST.MF b/extraplugins/req/org.eclipse.papyrus.req.reqif/META-INF/MANIFEST.MF
index 4d1df6080ea..38e56875bdc 100644
--- a/extraplugins/req/org.eclipse.papyrus.req.reqif/META-INF/MANIFEST.MF
+++ b/extraplugins/req/org.eclipse.papyrus.req.reqif/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.edit.ui,
  org.eclipse.rmf.reqif10.edit;bundle-version="0.10.0",
  org.eclipse.papyrus.uml.extensionpoints,
- org.eclipse.emf.compare;bundle-version="3.1.0",
  org.eclipse.papyrus.uml.diagram.profile,
  org.eclipse.papyrus.uml.profile,
  org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.0",
@@ -40,9 +39,39 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.widgets.toolbox
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.req.reqif,
- org.eclipse.papyrus.req.reqif.assistant,
- org.eclipse.papyrus.req.reqif.integration.assistant,
- org.eclipse.papyrus.req.reqif.integration.command,
- org.eclipse.papyrus.req.reqif.integration.transformation,
- org.eclipse.papyrus.req.reqif.queries,
+Export-Package: org.eclipse.papyrus.req.reqif;uses:="org.osgi.framework,org.eclipse.ui.plugin",
+ org.eclipse.papyrus.req.reqif.assistant;
+  uses:="org.eclipse.uml2.uml,
+   org.eclipse.swt.widgets,
+   org.eclipse.core.resources,
+   org.eclipse.ui.forms.widgets,
+   org.eclipse.jface.wizard,
+   org.eclipse.ui.forms",
+ org.eclipse.papyrus.req.reqif.integration.assistant;
+  uses:="org.eclipse.swt.widgets,
+   org.eclipse.jface.wizard,
+   org.eclipse.jface.viewers,
+   org.eclipse.ui,
+   org.eclipse.papyrus.infra.core.services,
+   org.eclipse.papyrus.editor,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.papyrus.infra.core.resource,
+   org.eclipse.emf.transaction,
+   org.eclipse.papyrus.uml.profile.ui.dialogs,
+   org.eclipse.papyrus.req.reqif.assistant",
+ org.eclipse.papyrus.req.reqif.integration.command;
+  uses:="org.eclipse.papyrus.uml.tools.profile.definition,
+   org.eclipse.core.runtime,
+   org.eclipse.uml2.uml,
+   org.eclipse.gmf.runtime.common.core.command,
+   org.eclipse.emf.common.util,
+   org.eclipse.gmf.runtime.emf.commands.core.command,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.transaction",
+ org.eclipse.papyrus.req.reqif.integration.transformation;
+  uses:="org.eclipse.papyrus.req.reqif.transformation,
+   org.eclipse.uml2.uml,
+   org.eclipse.rmf.reqif10,
+   org.eclipse.emf.transaction",
+ org.eclipse.papyrus.req.reqif.queries;uses:="org.eclipse.papyrus.emf.facet.query.java.core,org.eclipse.uml2.uml,org.eclipse.papyrus.emf.facet.efacet.core"
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/I_SysMLStereotype.java b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/I_SysMLStereotype.java
index f00b8ba7cdb..29b45d7cbc5 100644
--- a/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/I_SysMLStereotype.java
+++ b/extraplugins/req/org.eclipse.papyrus.req.reqif/src/org/eclipse/papyrus/req/reqif/I_SysMLStereotype.java
@@ -14,7 +14,7 @@
 package org.eclipse.papyrus.req.reqif;

 

 /**

- * list of constant for SysML

+ * list of constants for SysML

  *

  */

 public interface I_SysMLStereotype {

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF
index 64b4fb46f79..ef6188449c8 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF
@@ -1,23 +1,25 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.core.expressions;bundle-version="3.4.500",

- org.eclipse.core.resources;bundle-version="3.8.100",

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

- org.eclipse.emf.compare.ide.ui;bundle-version="3.0.0",

- org.eclipse.emf.edit;bundle-version="2.9.0",

- org.eclipse.emf.common,

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

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

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

- org.eclipse.emf.compare.edit;bundle-version="3.1.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.1.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.compare.ui.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.compare.ui;singleton:=tru

- e

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.expressions;bundle-version="3.4.500",
+ org.eclipse.core.resources;bundle-version="3.8.100",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.emf.compare.ide.ui;bundle-version="3.0.0",
+ org.eclipse.emf.edit;bundle-version="2.9.0",
+ org.eclipse.emf.common,
+ org.eclipse.uml2.uml;bundle-version="4.1.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
+ org.eclipse.uml2.uml.edit;bundle-version="4.1.0",
+ org.eclipse.emf.compare.edit;bundle-version="3.1.0",
+ org.eclipse.papyrus.infra.emf,
+ org.eclipse.compare
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.1.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.compare.ui.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.compare.ui;singleton:=tru
+ e
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.xml b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.xml
index a29a66de652..5eb383a09d1 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.xml
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.xml
@@ -1,56 +1,116 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <!-- <extension

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

-      <command

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

-            description="Open the Papyrus Model Compare Editor"

-            id="org.eclipse.papyrus.uml.compare.ui.command"

-            name="Papyrus Model Compare Editor">

-      </command>

-   </extension>

-   <extension

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

-      <handler

-            class="org.eclipse.papyrus.uml.compare.ui.handler.CompareUMLFileHandler"

-            commandId="org.eclipse.papyrus.uml.compare.ui.command">

-      </handler>

-      

-      

-   </extension>

-   <extension

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

-      <menuContribution

-    allPopups="true"

-    locationURI="popup:org.eclipse.ui.popup.any?after=additions">

-	<command

-	       commandId="org.eclipse.papyrus.uml.compare.ui.command"

-	       style="push">

-	    <visibleWhen

-	          checkEnabled="false">

-	       <with

-	             variable="selection">

-	          <iterate

-	                ifEmpty="false"

-	                operator="and">

-	             <adapt

-	                   type="org.eclipse.core.resources.IFile">

-	             </adapt>

-	          </iterate>

-	       </with>

-	    </visibleWhen>

-	</command>

-</menuContribution>

-   </extension> -->

-   <extension

-         point="org.eclipse.emf.compare.edit.adapterFactory">

-      <factory

-            class="org.eclipse.papyrus.uml.compare.ui.provider.PapyrusCompareAdapterFactory"

-            ranking="11"

-            supportedTypes="org.eclipse.emf.edit.provider.IItemLabelProvider"

-            uri="http://www.eclipse.org/uml2/5.0.0/UML">

-      </factory>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.papyrus.uml.compare.ui.actions.CompareInEditor"
+            commandId="org.eclipse.papyrus.uml.compare.ui.compareInEditor">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <and>
+                  <or>
+                     <count
+                           value="2">
+                     </count>
+                     <count
+                           value="3">
+                     </count>
+                  </or>
+                  <iterate>
+                     <adapt
+                           type="org.eclipse.emf.ecore.EObject">
+                        <instanceof
+                              value="org.eclipse.emf.ecore.EObject">
+                        </instanceof>
+                     </adapt>
+                  </iterate>
+               </and>
+            </with>
+         </activeWhen>
+      </handler>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?after=org.eclipse.papyrus.infra.emf.readonly.EnableWriteCommand">
+         <separator
+               name="org.eclipse.papyrus.uml.compare.ui.compareGroup"
+               visible="true">
+         </separator>
+         <menu
+               icon="icons/papyrus_compare_16x16.png"
+               id="org.eclipse.papyrus.uml.compare.ui.compareWithMenu"
+               label="Compare With">
+            <command
+                  commandId="org.eclipse.papyrus.uml.compare.ui.compareInEditor"
+                  id="org.eclipse.papyrus.uml.compare.ui.compareInEditor"
+                  label="Each Other"
+                  style="push"
+                  tooltip="Papyrus UML Compare">
+            </command>
+         </menu>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            id="org.eclipse.papyrus.uml.compare.ui.compareInEditor"
+            name="Compare in Editor">
+      </command>
+   </extension>
+   <!-- <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            description="Open the Papyrus Model Compare Editor"
+            id="org.eclipse.papyrus.uml.compare.ui.command"
+            name="Papyrus Model Compare Editor">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.papyrus.uml.compare.ui.handler.CompareUMLFileHandler"
+            commandId="org.eclipse.papyrus.uml.compare.ui.command">
+      </handler>
+      
+      
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+    allPopups="true"
+    locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+	<command
+	       commandId="org.eclipse.papyrus.uml.compare.ui.command"
+	       style="push">
+	    <visibleWhen
+	          checkEnabled="false">
+	       <with
+	             variable="selection">
+	          <iterate
+	                ifEmpty="false"
+	                operator="and">
+	             <adapt
+	                   type="org.eclipse.core.resources.IFile">
+	             </adapt>
+	          </iterate>
+	       </with>
+	    </visibleWhen>
+	</command>
+</menuContribution>
+   </extension> -->
+   <extension
+         point="org.eclipse.emf.compare.edit.adapterFactory">
+      <factory
+            class="org.eclipse.papyrus.uml.compare.ui.provider.PapyrusCompareAdapterFactory"
+            ranking="11"
+            supportedTypes="org.eclipse.emf.edit.provider.IItemLabelProvider"
+            uri="http://www.eclipse.org/uml2/5.0.0/UML">
+      </factory>
+   </extension>
+
+</plugin>
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/actions/CompareInEditor.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/actions/CompareInEditor.java
new file mode 100644
index 00000000000..6ca87c291eb
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/actions/CompareInEditor.java
@@ -0,0 +1,89 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Shuai Li - shuai.li@cea.fr
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.compare.ui.actions;
+
+import java.util.Iterator;
+
+import org.eclipse.compare.CompareEditorInput;
+import org.eclipse.compare.CompareUI;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIMessages;
+import org.eclipse.emf.compare.ide.ui.internal.handler.AbstractCompareHandler;
+import org.eclipse.emf.compare.ide.ui.internal.handler.SelectAncestorDialog;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+public class CompareInEditor extends AbstractCompareHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		final IWorkbenchPart activePart = HandlerUtil.getActivePart(event);
+		final ISelection selection = HandlerUtil.getCurrentSelection(event);
+
+		if (selection instanceof IStructuredSelection) {
+			Iterator<?> selectionIterator = ((IStructuredSelection) selection).iterator();
+			Notifier left = null;
+			Notifier right = null;
+			Notifier origin = null;
+
+			left = (Notifier) EMFHelper.getEObject(selectionIterator.next());
+			if (selectionIterator.hasNext()) {
+				right = (Notifier) EMFHelper.getEObject(selectionIterator.next());
+			}
+			if (selectionIterator.hasNext()) {
+				origin = (Notifier) EMFHelper.getEObject(selectionIterator.next());
+			}
+
+			if (origin != null) {
+				Shell shell = HandlerUtil.getActiveShell(event);
+				SelectAncestorDialog dialog = new SelectAncestorDialog(shell, adapterFactory, new Notifier[] {left, right, origin});
+				if (dialog.open() == Window.CANCEL) {
+					return null;
+				} else {
+//					left = dialog.leftNotifier;
+//					right = dialog.rightNotifier;
+//					origin = dialog.originNotifier;
+					// TODO
+				}
+			}
+
+			// Do not compare an object with its ancestor (e.g. operation with its owner class).
+			if (left instanceof EObject
+					&& right instanceof EObject
+					&& (EcoreUtil.isAncestor((EObject) left, (EObject) right) || EcoreUtil.isAncestor((EObject) right, (EObject) left))) {
+				MessageDialog.openInformation(activePart.getSite().getShell(), "EMF Compare", EMFCompareIDEUIMessages.getString("CompareSelfWithAncestor"));
+			} else {
+				final CompareEditorInput input = createCompareEditorInput(activePart, adapterFactory, left, right, origin);
+				CompareUI.openCompareEditor(input);
+			}
+		}
+		
+		return null;
+	}
+}
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.Palette.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.Palette.xml
deleted file mode 100644
index 75e2dca7bfa..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.Palette.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer iconpath="/icons/drawer.gif" id="Drawer__1417096439749"
-			name="UML-RT">
-			<aspectTool description="Create a Capsule"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
-				id="composite.tool.class_1417096476020" name="Capsule"
-				refToolId="composite.tool.class">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::Capsule" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create a CapsulePart"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-				id="composite.tool.property_1417096489619" name="CapsulePart"
-				refToolId="composite.tool.property">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::CapsulePart" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>				
-			<aspectTool description="Create an RTConnector"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
-				id="composite.tool.connector_1417096565130" name="RTConnector"
-				refToolId="composite.tool.connector">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTConnector" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>			
-			<aspectTool description="Create an RTPort"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
-				id="composite.tool.port_1417096575355" name="RTPort"
-				refToolId="composite.tool.port">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTPort" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-		</drawer>
-	</content>
-</paletteDefinition>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.paletteconfiguration b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.paletteconfiguration
new file mode 100644
index 00000000000..2cca57cec7e
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.CapsuleDiagram.paletteconfiguration
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ASCII"?>

+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="palettemodel" label="UMLRealTime">

+  <drawerConfigurations id="UML-RT" label="UML-RT" description="UML-RT">

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.Capsule" label="Capsule" description="Create a Capsule">

+      <icon pluginID="" iconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_2008"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_3004"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_3008"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_3010"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Capsule_3014"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.CapsulePart" label="CapsulePart" description="Create a CapsulePart">

+      <icon iconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3002"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3005"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3006"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3012"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3018"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.CapsulePart_3041"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.ProtocolContainer" label="ProtocolContainer" description="Create a ProtocolContainer">

+      <icon iconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_2007"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_3009"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_PapyrusUMLClassDiagram"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.RTMessageSet" label="RTMessageSet" description="Create a RTMessageSet">

+      <icon iconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_2004"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3023"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3036"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3037"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3038"/>

+    </ownedConfigurations>

+  </drawerConfigurations>

+</paletteconfiguration:PaletteConfiguration>

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.Palette.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.Palette.xml
deleted file mode 100644
index f0cdba2174b..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.Palette.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer iconpath="/icons/drawer.gif"  id="Drawer__1416993599968"
-			name="UML-RT">			
-			<aspectTool description="Create a ProtocolContainer"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
-				id="clazz.tool.package_1416993803624" name="ProtocolContainer"
-				refToolId="clazz.tool.package">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::ProtocolContainer" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create a Protocol"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"
-				id="composite.tool.collaboration_1417096522723" name="Protocol"
-				refToolId="composite.tool.collaboration">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::Protocol" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>		
-			<aspectTool description="Create an RTMessageSet"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
-				id="clazz.tool.interface_1416994043249" name="RTMessageSet"
-				refToolId="clazz.tool.interface">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTMessageSet" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an RTTrigger"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
-				id="clazz.tool.operation_1416994043249" name="RTTrigger"
-				refToolId="clazz.tool.operation">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTTrigger" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create a Realization"
-				iconpath="bundleentry://1075.fwk31149847/icons/full/obj16/Realization.gif"
-				id="clazz.tool.realization_1417455608460" name="Realization"
-				refToolId="clazz.tool.realization" />	
-			<aspectTool description="Create an Usage"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
-				id="clazz.tool.usage_1417516786109" name="Usage" refToolId="clazz.tool.usage" />			
-		</drawer>
-	</content>
-</paletteDefinition>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.paletteconfiguration b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.paletteconfiguration
new file mode 100644
index 00000000000..967cbb7a53c
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.paletteconfiguration
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="ASCII"?>

+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="palettemodel" label="UMLRealTime">

+  <drawerConfigurations id="UML-RT" label="UML-RT" description="UML-RT">

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.Protocol" label="Protocol" description="Create a Protocol">

+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Collaboration.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Protocol_2008"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Protocol_3004"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Protocol_3008"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Protocol_3010"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Protocol_3014"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.ProtocolContainer" label="ProtocolContainer" description="Create a ProtocolContainer">

+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Package.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_2007"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_3009"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.ProtocolContainer_PapyrusUMLClassDiagram"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.RTMessageSet" label="RTMessageSet" description="Create a RTMessageSet">

+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Interface.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_2004"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3023"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3036"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3037"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3038"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.uml.Reception" label="RT OutMessage" description="Create a RT OutMessage">

+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Reception.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Reception_3011"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Reception_3039"/>

+    </ownedConfigurations>

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.uml.Signal" label="RT InMessage" description="Create a RT InMessage">

+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Reception.gif"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Signal_3022"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Signal_3049"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Signal_3050"/>

+      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Signal_3051"/>

+    </ownedConfigurations>

+  </drawerConfigurations>

+</paletteconfiguration:PaletteConfiguration>

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.StateMachineDiagram.Palette.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.StateMachineDiagram.Palette.xml
deleted file mode 100644
index acd51b33f39..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.StateMachineDiagram.Palette.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer iconpath="/icons/drawer.gif" id="Drawer__1416993599969"
-			name="UML-RT">
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
-				id="createStateMachineCreationTool_1416993776146" name="RTStateMachine"
-				refToolId="createStateMachineCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTStateMachine" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Region.gif"
-				id="createRegionCreationTool_1416993785626" name="RTRegion"
-				refToolId="createRegionCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTRegion" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
-				id="createPseudostateCreationTool_1416993803624" name="RTPseudostate"
-				refToolId="createPseudostateCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTPseudostate" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"
-				id="createTriggerCreationTool_1416993803625" name="RTTrigger"
-				refToolId="createTriggerCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTTrigger" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>			
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif"
-				id="createStateCreationTool_1416994043249" name="RTState (State)"
-				refToolId="createStateCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTState" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif"
-				id="createFinalStateCreationTool_1416994043249" name="RTState (Final State)"
-				refToolId="createFinalStateCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTState" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-		</drawer>
-	</content>
-</paletteDefinition>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/plugin.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/plugin.xml
index 07c27094e6a..e989491b8e7 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/plugin.xml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/plugin.xml
@@ -3,29 +3,13 @@
    <extension
          point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
       <paletteDefinition
-            ID="UML-RT-Composite-PE"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            ID="UML-RT-Protocol-PE"
+            class="org.eclipse.papyrus.uml.diagram.common.service.ExtendedPluginPaletteProvider"
             icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            name="UML-RT-CompositeDiagramPaletteExtension"
-            path="palettes/UML-RT.CapsuleDiagram.Palette.xml">
+            name="UML-RT-ProtocolDiagramPaletteExtension"
+            path="palettes/UML-RT.ProtocolDiagram.paletteconfiguration">
          <Priority
-               name="Medium">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="UML-RT-Class-PE"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            name="UML-RT-ClassDiagramPaletteExtension"
-            path="palettes/UML-RT.ProtocolDiagram.Palette.xml">
-         <Priority
-               name="Medium">
+               name="Low">
          </Priority>
          <editor
                id="org.eclipse.papyrus.uml.diagram.clazz">
@@ -33,22 +17,6 @@
       </paletteDefinition>
    </extension>
    <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="UML-RT-StateMachine-PE"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            name="UML-RT-StateMachineDiagramPaletteExtension"
-            path="palettes/UML-RT.StateMachineDiagram.Palette.xml">
-         <Priority
-               name="Medium">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.statemachine">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
          point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
       <configuration
             file="configuration/UMLRT.configuration"
@@ -61,5 +29,21 @@
             model="newchildmenu/newChildMenu.xmi">
       </menuCreationModel>
    </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="UML-RT-Capsule-PE"
+            class="org.eclipse.papyrus.uml.diagram.common.service.ExtendedPluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+            name="UML-RT-CapsuleDiagramPaletteExtension"
+            path="palettes/UML-RT.CapsuleDiagram.paletteconfiguration">
+         <Priority
+               name="Low">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.composite">
+         </editor>
+      </paletteDefinition>
+   </extension>
 
 </plugin>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations
new file mode 100644
index 00000000000..16ad4e2cb6e
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations
@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="ASCII"?>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration"

+    xmi:id="_sHw4IMQMEeS2vZeHP4gaVg"

+    name="UMLRealTime"

+    identifier="org.eclipse.papyrus.umlrt.elementTypes"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHw4IcQMEeS2vZeHP4gaVg"

+      name="Capsule (2008)"

+      identifier="org.eclipse.papyrus.umlrt.Capsule_2008"

+      hint="2008">

+    <iconEntry

+        xmi:id="_sHw4IsQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_2008</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGQMQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGQcQMEeS2vZeHP4gaVg"

+      name="Capsule (3004)"

+      identifier="org.eclipse.papyrus.umlrt.Capsule_3004"

+      hint="3004">

+    <iconEntry

+        xmi:id="_sHyGQsQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3004</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGQ8QMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGRMQMEeS2vZeHP4gaVg"

+      name="Capsule (3008)"

+      identifier="org.eclipse.papyrus.umlrt.Capsule_3008"

+      hint="3008">

+    <iconEntry

+        xmi:id="_sHyGRcQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3008</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGRsQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGR8QMEeS2vZeHP4gaVg"

+      name="Capsule (3010)"

+      identifier="org.eclipse.papyrus.umlrt.Capsule_3010"

+      hint="3010">

+    <iconEntry

+        xmi:id="_sHyGSMQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3010</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGScQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGSsQMEeS2vZeHP4gaVg"

+      name="Capsule (3014)"

+      identifier="org.eclipse.papyrus.umlrt.Capsule_3014"

+      hint="3014">

+    <iconEntry

+        xmi:id="_sHyGS8QMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3014</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGTMQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGTcQMEeS2vZeHP4gaVg"

+      name="CapsulePart (3002)"

+      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3002"

+      hint="3002">

+    <iconEntry

+        xmi:id="_sHyGTsQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3002</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGT8QMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGUMQMEeS2vZeHP4gaVg"

+      name="CapsulePart (3005)"

+      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3005"

+      hint="3005">

+    <iconEntry

+        xmi:id="_sHyGUcQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3005</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGUsQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGU8QMEeS2vZeHP4gaVg"

+      name="CapsulePart (3006)"

+      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3006"

+      hint="3006">

+    <iconEntry

+        xmi:id="_sHyGVMQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3006</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGVcQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGVsQMEeS2vZeHP4gaVg"

+      name="CapsulePart (3012)"

+      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3012"

+      hint="3012">

+    <iconEntry

+        xmi:id="_sHyGV8QMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3012</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGWMQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGWcQMEeS2vZeHP4gaVg"

+      name="CapsulePart (3018)"

+      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3018"

+      hint="3018">

+    <iconEntry

+        xmi:id="_sHyGWsQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3018</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGW8QMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHyGXMQMEeS2vZeHP4gaVg"

+      name="CapsulePart (3041)"

+      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3041"

+      hint="3041">

+    <iconEntry

+        xmi:id="_sHyGXcQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3041</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHyGXsQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_emBOIMlhEeSwZ7pccGhSNg"

+      name="Protocol (2008)"

+      identifier="org.eclipse.papyrus.umlrt.Protocol_2008"

+      hint="2008">

+    <iconEntry

+        xmi:id="_emBOIclhEeSwZ7pccGhSNg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_2008</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_emBOIslhEeSwZ7pccGhSNg">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_emBOI8lhEeSwZ7pccGhSNg"

+      name="Protocol (3004)"

+      identifier="org.eclipse.papyrus.umlrt.Protocol_3004"

+      hint="3004">

+    <iconEntry

+        xmi:id="_emBOJMlhEeSwZ7pccGhSNg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3004</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_emBOJclhEeSwZ7pccGhSNg">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_emBOJslhEeSwZ7pccGhSNg"

+      name="Protocol (3008)"

+      identifier="org.eclipse.papyrus.umlrt.Protocol_3008"

+      hint="3008">

+    <iconEntry

+        xmi:id="_emBOJ8lhEeSwZ7pccGhSNg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3008</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_emBOKMlhEeSwZ7pccGhSNg">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_emBOKclhEeSwZ7pccGhSNg"

+      name="Protocol (3010)"

+      identifier="org.eclipse.papyrus.umlrt.Protocol_3010"

+      hint="3010">

+    <iconEntry

+        xmi:id="_emBOKslhEeSwZ7pccGhSNg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3010</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_emBOK8lhEeSwZ7pccGhSNg">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_emBOLMlhEeSwZ7pccGhSNg"

+      name="Protocol (3014)"

+      identifier="org.eclipse.papyrus.umlrt.Protocol_3014"

+      hint="3014">

+    <iconEntry

+        xmi:id="_emBOLclhEeSwZ7pccGhSNg"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3014</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_emBOLslhEeSwZ7pccGhSNg">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytUMQMEeS2vZeHP4gaVg"

+      name="ProtocolContainer (2007)"

+      identifier="org.eclipse.papyrus.umlrt.ProtocolContainer_2007"

+      hint="2007">

+    <iconEntry

+        xmi:id="_sHytUcQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Package.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolContainer</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_2007</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytUsQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytU8QMEeS2vZeHP4gaVg"

+      name="ProtocolContainer (3009)"

+      identifier="org.eclipse.papyrus.umlrt.ProtocolContainer_3009"

+      hint="3009">

+    <iconEntry

+        xmi:id="_sHytVMQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Package.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolContainer</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_3009</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytVcQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytVsQMEeS2vZeHP4gaVg"

+      name="ProtocolContainer (PapyrusUMLClassDiagram)"

+      identifier="org.eclipse.papyrus.umlrt.ProtocolContainer_PapyrusUMLClassDiagram"

+      hint="PapyrusUMLClassDiagram">

+    <iconEntry

+        xmi:id="_sHytV8QMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Package.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolContainer</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_1000</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytWMQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytWcQMEeS2vZeHP4gaVg"

+      name="RTMessageSet (2004)"

+      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_2004"

+      hint="2004">

+    <iconEntry

+        xmi:id="_sHytWsQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_2004</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytW8QMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytXMQMEeS2vZeHP4gaVg"

+      name="RTMessageSet (3023)"

+      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3023"

+      hint="3023">

+    <iconEntry

+        xmi:id="_sHytXcQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3023</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytXsQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytX8QMEeS2vZeHP4gaVg"

+      name="RTMessageSet (3036)"

+      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3036"

+      hint="3036">

+    <iconEntry

+        xmi:id="_sHytYMQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3036</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytYcQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytYsQMEeS2vZeHP4gaVg"

+      name="RTMessageSet (3037)"

+      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3037"

+      hint="3037">

+    <iconEntry

+        xmi:id="_sHytY8QMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3037</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytZMQMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_sHytZcQMEeS2vZeHP4gaVg"

+      name="RTMessageSet (3038)"

+      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3038"

+      hint="3038">

+    <iconEntry

+        xmi:id="_sHytZsQMEeS2vZeHP4gaVg"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3038</specializedTypesID>

+    <matcherConfiguration

+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"

+        xmi:id="_sHytZ8QMEeS2vZeHP4gaVg">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
index bf4f7117a82..5cc0294043b 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
@@ -67,5 +67,11 @@
             path="elementtypes/uml-rt.elementtypesconfigurations">

       </elementTypeSet>

    </extension>

-

+   <extension

+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">

+      <elementTypeSet

+            id="org.eclipse.papyrus.umlrt.elementTypeSet2"

+            path="elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations">

+      </elementTypeSet>

+   </extension>

 </plugin>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
index a4a0e2b3eab..f198c631fad 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
@@ -1,49 +1,154 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.doc.feature" label="Papyrus Documentation Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

-

-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.

-All rights reserved.   This program and the accompanying materials

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

-which accompanies this distribution, and is available at

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

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.doc" install-size="0" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.search.ui.doc" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.cdo.ui.doc" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.common.doc" install-size="0" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.profile.doc" install-size="0" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.dsml.validation.doc" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.doc" install-size="0" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.views.properties.doc" install-size="0" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.copypaste.ui.doc" install-size="0" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.newchild.doc" install-size="0" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.moka.doc" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.controlmode.doc" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.layers.documentation" install-size="0" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.common.doc" install-size="0" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.decoratormodel.doc" install-size="0" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.modelrepair.doc" install-size="0" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.assistants.doc" install-size="0" version="0.0.0"/>

-

-</feature>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.doc.feature"
+      label="Papyrus Documentation Feature"
+      version="1.1.0.qualifier"
+      provider-name="Eclipse Modeling Project">
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.papyrus.cdo.ui.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.copypaste.ui.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.dsml.validation.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.common.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.css.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.nattable.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.newchild.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.controlmode.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.viewpoints.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.layers.documentation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.moka.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.req.reqif.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.decoratormodel.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.common.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.profile.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.modelrepair.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.profile.assistants.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.search.ui.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.views.properties.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
index ac7a1190a20..3e5d7d66723 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
@@ -157,4 +157,11 @@ http://www.eclipse.org/legal/epl-v10.html
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.papyrus.infra.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
index de2a46d13cc..20665f9e05e 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
@@ -19,9 +19,9 @@ http://www.eclipse.org/legal/epl-v10.html
 

    <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.properties" install-size="0" unpack="false" version="0.0.0"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.xtext" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css3.xtext" install-size="0" unpack="false" version="0.0.0"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>

 

    <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.theme" install-size="0" version="0.0.0"/>

 

diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/feature.xml
index a796805666d..ece4a7e4aa4 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/feature.xml
@@ -1,77 +1,148 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.uml.diagram.feature" label="Tests UML Diagram Feature" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">

-

-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2011, 2014 CEA LIST and others

-All rights reserved.   This program and the accompanying materials

-are made available under the terms of the Eclipse Public License

-v1.0

-which accompanies this distribution, and is available at

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

-   </copyright>

-

-   <license url="license.html">

-      Eclipse Foundation Software User Agreement

-March 17, 2005

-

-Usage Of Content

-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.

-

-Applicable Licenses

-Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.

-

-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS modules ("Modules") and made available as downloadable archives ("Downloads").

-

-Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features"). 

-Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java" ARchive) in a directory named "plugins". 

-A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins and/or Fragments associated with that Feature. 

-Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features. 

-The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:

-

-The top-level (root) directory 

-Plug-in and Fragment directories 

-Inside Plug-ins and Fragments packaged as JARs 

-Sub-directories of the directory named "src" of certain Plug-ins 

-Feature directories 

-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in that directory.

-

-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):

-

-Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html) 

-Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE) 

-Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0) 

-IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html) 

-Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html) 

-Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html) 

-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.

-

-Cryptography

-Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.

-

-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.

-   </license>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.tests" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.clazz.tests" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.activity.tests" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.usecase.tests" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.deployment.tests" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.component.tests" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.timing.tests" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.sequence.tests" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.composite.tests" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.wizards.tests" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.profile.tests" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.common.tests" install-size="0" version="0.0.0"/>

-

-</feature>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.tests.uml.diagram.feature"
+      label="Tests UML Diagram Feature"
+      version="1.1.0.qualifier"
+      provider-name="Eclipse Modeling Project">
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2011, 2014 CEA LIST and others
+All rights reserved.   This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+   </copyright>
+
+   <license url="license.html">
+      Eclipse Foundation Software User Agreement
+March 17, 2005
+
+Usage Of Content
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, &quot;Program&quot; will mean the Content.
+
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).
+
+Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;). 
+Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&quot; ARchive) in a directory named &quot;plugins&quot;. 
+A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins and/or Fragments associated with that Feature. 
+Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features. 
+The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
+
+The top-level (root) directory 
+Plug-in and Fragment directories 
+Inside Plug-ins and Fragments packaged as JARs 
+Sub-directories of the directory named &quot;src&quot; of certain Plug-ins 
+Feature directories 
+Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html) 
+Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE) 
+Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0) 
+IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html) 
+Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html) 
+Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html) 
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+Cryptography
+Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country&apos;s laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
+
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+   </license>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.clazz.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.activity.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.usecase.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.deployment.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.component.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.timing.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.sequence.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.composite.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.wizards.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.profile.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.common.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementTypes.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementTypes.xtend
index a07e8e1011d..5b0ee5b1422 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementTypes.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementTypes.xtend
@@ -55,7 +55,7 @@ import xpt.Common
 		    boolean result = KNOWN_ELEMENT_TYPES.contains(elementType);
 
 		    if (!result) {
-		        IElementType[] supertypes = elementType.getAllSuperTypes();
+		        org.eclipse.gmf.runtime.emf.type.core.IElementType[] supertypes = elementType.getAllSuperTypes();
 		        for (int i = 0; !result && (i < supertypes.length); i++) {
 		            result = KNOWN_ELEMENT_TYPES.contains(supertypes[i]);
 		        }
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/.gitignore b/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/.gitignore
index c9eccd3c5ff..d728878be1c 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/.gitignore
+++ b/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/.gitignore
@@ -1 +1,2 @@
 /ElementTypeRegistryGenerator.java
+/.ElementTypeRegistryGenerator.xtendbin
diff --git a/plugins/doc/.gitignore b/plugins/doc/.gitignore
new file mode 100644
index 00000000000..d0ef5a53fe4
--- /dev/null
+++ b/plugins/doc/.gitignore
@@ -0,0 +1,3 @@
+#ignoring neested eclipse project, keeping it as a pure maven project
+.project
+.classpath
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.project b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.project
index bf9c58543ff..b9e4bc91f00 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
@@ -15,8 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
index ae8ed85c6a2..20b61efd1df 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@ Bundle-Localization: plugin
 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui.doc;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Bundle-Description: %pluginDescription

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/build.properties b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/build.properties
index b73395d4db9..a17ae1c5dd3 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/build.properties
@@ -3,6 +3,7 @@ bin.includes = META-INF/,\
                about.html,\
                plugin.properties,\
                plugin.xml,\
-               resource/
-bin.excludes = **/*.md
-src.includes = about.html
+               target/generated-eclipse-help/**   
+bin.excludes = **/*.markdown
+src.includes = about.html,\
+				resource/
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/plugin.xml
index 196c66a420c..cb934f3c8b7 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/plugin.xml
@@ -18,19 +18,19 @@
    <extension

          point="org.eclipse.help.toc">

       <toc

-            file="resource/cdo-main-toc.xml"

+            file="target/generated-eclipse-help/cdo-main-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="resource/start/cdo-start-toc.xml"

+            file="target/generated-eclipse-help/start/cdo-start-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="resource/team/cdo-team-toc.xml"

+            file="target/generated-eclipse-help/team/cdo-team-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="resource/bugs/cdo-bugs-toc.xml"

+            file="target/generated-eclipse-help/bugs/cdo-bugs-toc.xml"

             primary="false">

       </toc>

    </extension>

diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/pom.xml
index c7d4088b716..809bf593963 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.markdown.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs-toc.xml b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs-toc.xml
deleted file mode 100644
index 90f74048535..00000000000
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs-toc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<toc label="Limitations and Known Issues" topic="resource/bugs/cdo-bugs.html">
-   <topic href="resource/bugs/cdo-bugs.html#Limitations" label="Limitations and Known Issues"></topic>
-   <anchor id="cdo-bugs-additions"/>
-   <anchor id="cdo-bugs-after"/>
-</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.html b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.html
deleted file mode 100644
index 3ab30d88ca7..00000000000
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8"/>
-	<meta name="creator" content="Marked.app"/>
-</head>
-<body>
-<h1 id="aidlimitationslimitationsandknownissuesa"><a id="Limitations">Limitations and Known Issues</a></h1>
-
-<p>The following Papyrus capabilities are supported on models in CDO repositories:</p>
-
-<ul>
-<li>create new UML and SysML models
-
-<ul>
-<li>initialize Papyrus model from existing domain model resource in the repository</li>
-<li>import models from the workspace</li>
-<li>reorganize models in folders by drag-and-drop</li>
-</ul></li>
-<li>create and edit all kinds of UML and SysML diagram</li>
-<li>create and edit tables</li>
-<li>export models to the workspace</li>
-<li>browse connected repositories for importing packages and applying profiles</li>
-<li>CSS diagram styling and themes (with restrictions, see below)</li>
-<li>properties view customization models can be stored in and loaded from the repository</li>
-</ul>
-
-<p>Some capabilities of Papyrus are not support on models in CDO repositories in this release:</p>
-
-<ul>
-<li>compare/merge: the <strong>Model Repositories</strong> view does not support branches and no &#8220;compare with each other&#8221; action is provided</li>
-<li>although CSS styling of diagrams is supported, this extends only to CSS stylsheets deployed in plug-ins. Custom stylesheets stored locally in the workspace or in a repository are not supported</li>
-<li>controlled resources are not supported</li>
-<li>attaching documents to model elements is not supported</li>
-</ul>
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.md b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
index 47643dcada2..47643dcada2 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.md
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml
index da6ee34c2d6..b21d14421c5 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='utf-8' ?>

 <toc label="CDO Model Repository" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

-   <topic href="resource/start/cdo-start.html" label="Working with CDO Model Repositories">

-      <link toc="resource/start/cdo-start-toc.xml"/>

-      <link toc="resource/team/cdo-team-toc.xml"/>

-      <link toc="resource/bugs/cdo-bugs-toc.xml"/>

+   <topic href="target/generated-eclipse-help/start/cdo-start.html" label="Working with CDO Model Repositories">

+      <link toc="target/generated-eclipse-help/start/cdo-start-toc.xml"/>

+      <link toc="target/generated-eclipse-help/team/cdo-team-toc.xml"/>

+      <link toc="target/generated-eclipse-help/bugs/cdo-bugs-toc.xml"/>

       <anchor id="cdo-additions"/>

    </topic>

 	

diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start-toc.xml b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start-toc.xml
deleted file mode 100644
index 7ea66ca775a..00000000000
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start-toc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<toc label="Getting Started" topic="resource/start/cdo-start.html">
-   <topic href="resource/start/cdo-start.html" label="Getting Started">
-      <topic href="resource/start/cdo-start.html#Installing" label="Installation"></topic>
-      <topic href="resource/start/cdo-start.html#Connecting" label="Connecting to a Repository"></topic>
-      <topic href="resource/start/cdo-start.html#Importing" label="Importing Models form the Workspace"></topic>
-      <topic href="resource/start/cdo-start.html#Validating" label="Validating Models"></topic>
-      <anchor id="cdo-start-additions"/>
-   </topic>
-   <anchor id="cdo-start-after"/>
-</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.html b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.html
deleted file mode 100644
index 8deb614f798..00000000000
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8"/>
-	<meta name="creator" content="Marked.app"/>
-</head>
-<body>
-<h1 id="workingwithcdomodelrepositories">Working with CDO Model Repositories</h1>
-
-<p>This document is a brief guide to getting started with Papyrus UML models in the CDO Model Repository.</p>
-
-<p>For more information about CDO, see the <a href="http://wiki.eclipse.org/CDO">EMF CDO wiki</a>.</p>
-
-<h2 id="aidinstallinginstallationa"><a id="Installing">Installation</a></h2>
-
-<p>The CDO Model Repository integration feature is not installed by default with Papyrus; it is an optional extra component. To install this feature, open the Papyrus discovery wizard from the <strong>Help &rarr; Install Papyrus Additional Components</strong> menu. You should find an entry like the following in the list:</p>
-
-<figure>
-<img src="discovery_dialog.png" alt="Install additional components" />
-<figcaption>Install additional components</figcaption></figure>
-
-
-
-<p>Select the CDO integration feature by checking the box on the left side and press <strong>Finish</strong> to perform the installation.</p>
-
-<h2 id="aidconnectingconnectingtoarepositorya"><a id="Connecting">Connecting to a Repository</a></h2>
-
-<p>Repository connections are managed in the <strong>Model Repositories</strong> view. Use the <strong>Add Repository&#8230;</strong> button in the view to create a new repository connection:</p>
-
-<figure>
-<img src="addrepo.png" alt="Add repository" />
-<figcaption>Add repository</figcaption></figure>
-
-
-
-<p>If your repository requires user authentication, a login dialog will appear to accept your credentials.</p>
-
-<p>The new repository is then added to the view. Select the new repository and pick <strong>New Papyrus Model</strong> in the context menu. Complete the wizard. You should now have a new blank model open and something like this in the <strong>Model Repositories</strong> view:</p>
-
-<figure>
-<img src="modelreposview.png" alt="Model Repositories view" />
-<figcaption>Model Repositories view</figcaption></figure>
-
-
-
-<p>Note that because it is necessary to explicitly connect to model repositories, any model editors that are open when shutting down the Papyrus workbench are not re-opened on next launch.</p>
-
-<h2 id="aidimportingimportingmodelsfromtheworkspacea"><a id="Importing">Importing Models from the Workspace</a></h2>
-
-<p>You probably already have models in your workspace that you would like to import into a repository. To do this, select one or more models in the <strong>Project Explorer</strong> and choose the <strong>Import into Repository&#8230;</strong> action in the context menu. Alternatively, just drag and drop one or more model onto a repository.</p>
-
-<figure>
-<img src="importmodels.png" alt="Import Models" />
-<figcaption>Import Models</figcaption></figure>
-
-
-
-<p>By default, the wizard maps incoming models to paths in the repository according to their paths in the workspace. This mapping may be customized in the last page.</p>
-
-<p>As a first step, the wizard analyzes the selected models for cross-reference dependencies. It is highly recommended also to import any models that references the initially selected models. Otherwise, they will be updated to reference the models in the repository and it may be difficult to edit them when Papyrus is not connected to the repository.</p>
-
-<p>It is also suggested to import models referenced by the initial selection. However, references from models in a repository to models in the workspace do not present the same kind of problem of availability as the reverse case.</p>
-
-<h2 id="aidvalidatingvalidatingmodelsa"><a id="Validating">Validating Models</a></h2>
-
-<p>The <strong>Validate</strong> context menu actions work in repository models just as in workspace models. Annotations are presented in the diagrams and in the <strong>Model Explorer</strong> view. The difference is that validation issues are not shown in the <strong>Problems</strong> view. Instead, they are shown in a new <strong>Model Validation</strong> view:</p>
-
-<figure>
-<img src="validation.png" alt="Model Validation" />
-<figcaption>Model Validation</figcaption></figure>
-
-
-
-<p>The <strong>Model Validation</strong> view supports the usual functions, including:</p>
-
-<ul>
-<li>double-click navigation to the problem element in the editor</li>
-<li>copy selected problems to CSV text on the system clipboard</li>
-<li>delete problems</li>
-</ul>
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.md b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown
index a63f6961934..a63f6961934 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.md
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team-toc.xml b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team-toc.xml
deleted file mode 100644
index 5b08ea0e72f..00000000000
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team-toc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<toc label="Sharing Models with a Team" topic="resource/team/cdo-team.html">
-   <topic href="resource/team/cdo-team.html" label="Sharing Models with a Team">
-      <topic href="resource/team/cdo-team.html#Locking" label="Locking Objects"></topic>
-      <topic href="resource/team/cdo-team.html#Conflicts" label="Handling Conflicts"></topic>
-      <anchor id="cdo-team-additions"/>
-   </topic>
-   <anchor id="cdo-team-after"/>
-</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.html b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.html
deleted file mode 100644
index 30968f22d18..00000000000
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8"/>
-	<meta name="creator" content="Marked.app"/>
-</head>
-<body>
-<h1 id="sharingmodelswithateam">Sharing Models with a Team</h1>
-
-<p>One purpose of keeping Papyrus models in a CDO model repository is to share them with a team and enjoy the benefits of real-time collaboration that CDO offers. However, this entails certain consequences that need to be accounted for in the workflow.</p>
-
-<h2 id="aidlockinglockingobjectsa"><a id="Locking">Locking Objects</a></h2>
-
-<p>The context menu in both the <strong>Model Explorer</strong> view and the diagrams has actions for locking and unlocking objects. Locking a model element reserves it for the exclusive use of the editor that has it locked. Other users connected to the same repository cannot edit it. Locking an element in a diagram locks not only the model element, but also the view of it in the diagram.</p>
-
-<p>An object locked by you shows a key decoration. To lock an element, use the <strong>Locks/Conflicts &rarr; Lock</strong> context menu action:</p>
-
-<figure>
-<img src="locked.png" alt="A locally locked element" />
-<figcaption>A locally locked element</figcaption></figure>
-
-
-
-<p>To unlock an object once you have finished editing it and saved the model, use the <strong>Locks/Conflicts &rarr; Unlock</strong> context menu action. Locks are also automatically released when the editor that holds them is closed.</p>
-
-<p>When another user has locked an element, the editor shows a lock decoration:</p>
-
-<figure>
-<img src="remotely_locked.png" alt="A remotely locked element" />
-<figcaption>A remotely locked element</figcaption></figure>
-
-
-
-<p>Note that in this case, the element cannot be edited: the <strong>Properties</strong> view is disabled and the diagram editor does not show the selection handles.</p>
-
-<h2 id="aidconflictshandlingconflictsa"><a id="Conflicts">Handling Conflicts</a></h2>
-
-<p>CDO is a real-time collaborative editing platform. When other users save changes they have made in models that are open in your Papyrus workbench, the repository server pushes those changes into your editors. You see those changes in real time. There is no &#8220;synchronize&#8221; step as with Git or Subversion source control.</p>
-
-<p>Most changes saved by other users will be in different model elements and diagram views than those in which you have unsaved changes. These do not present a problem. However, the repository may push changes in objects that you <em>have</em> edited and have not yet saved. Many of these changes, too, are automatically merged by Papyrus: changes to features of an object that you have not modified and certain changes in multi-valued features can be merged automatically. Other changes leave the objects that you have edited in a state of conflict. This is indicated by a decoration in the diagrams and the <strong>Model Explorer</strong> view:</p>
-
-<figure>
-<img src="conflict.png" alt="Conflicting changes" />
-<figcaption>Conflicting changes</figcaption></figure>
-
-
-
-<p>Papyrus cannot automatically resolve these conflicts by merging the incoming changes from the repository with the changes made in your editor. They require manual intervention to resolve.</p>
-
-<p>On an object that shows conflict, invoke the <strong>Locks/Conflicts &rarr; Resolve Conflicts</strong> context menu action. In the current release, the only strategy available is to rollback the editor&#8217;s unsaved changes, leaving only the changes pushed by the server from other users. Future releases will add more options, such as an interactive graphical merge.</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.md b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.markdown
index 4a4ae0ea3f1..4a4ae0ea3f1 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.md
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.markdown
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.project b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.project
index 9bccafb869e..6312f67d350 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
@@ -15,8 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index e778789326a..00000000000
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//resource/copypaste-toc.xml=utf-8
-encoding//resource/copypaste.html=utf-8
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF
index 6cdbd169fb0..4e666e1ee2d 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.help

+Require-Bundle: org.eclipse.help;bundle-version="3.6.0",

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.copypaste.ui.doc;singleton:=t

- rue

-

+Bundle-SymbolicName: org.eclipse.papyrus.copypaste.ui.doc;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/build.properties b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/build.properties
index 1b591767ffe..b7f01d49a76 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/build.properties
@@ -1,6 +1,7 @@
 bin.includes = META-INF/,\
                about.html,\
-               resource/,\
                plugin.xml,\
-               plugin.properties
-src.includes = about.html
+               plugin.properties,\
+               target/generated-eclipse-help/** 
+src.includes = about.html,\
+				resource/
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.xml
index c10abae3cb0..33b271d6e9a 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.xml
@@ -4,12 +4,12 @@
    <extension
          point="org.eclipse.help.toc">
       <toc
-            file="resource/copypaste-toc.xml"
+            file="target/generated-eclipse-help/copypaste-main-toc.xml"
             primary="false">
-      </toc>
+      </toc> 
       <toc
-            file="resource/copypaste-main-toc.xml"
+            file="target/generated-eclipse-help/copypaste-toc.xml"
             primary="false">
-      </toc>      
+      </toc>     
    </extension>
 </plugin>
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/pom.xml
index a278a3482b2..65769807685 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-main-toc.xml b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-main-toc.xml
index 57e9753760f..96b29f23bd4 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-main-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="Copy/Paste" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-   <topic href="resource/copypaste.html" label="Using Copy/paste">
-      <link toc="resource/copypaste-toc.xml"/>
+<toc label="Copy Paste" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
+   <topic href="target/generated-eclipse-help/copypaste.html" label="Using Copy paste">
+      <link toc="target/generated-eclipse-help/copypaste-toc.xml"/>
       <anchor id="copypaste"/>
    </topic>	
 </toc>
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-toc.xml b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-toc.xml
deleted file mode 100644
index b6d645869cb..00000000000
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-toc.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/copypaste.html" label="copypaste">
-	<topic href="resource/copypaste.html" label="Copying/Cutting/Pasting in Papyrus">
-		<topic href="resource/copypaste.html#Introduction" label="Introduction"></topic>
-		<topic href="resource/copypaste.html#User_Interface" label="User Interface">
-			<topic href="resource/copypaste.html#Model_Explorer_Menu" label="Model Explorer Menu"></topic>
-			<topic href="resource/copypaste.html#Model_Explorer_KeyBinding" label="Model Explorer KeyBinding"></topic>
-			<topic href="resource/copypaste.html#Diagram_Menu" label="Diagram Menu"></topic>
-			<topic href="resource/copypaste.html#Diagram_KeyBinding" label="Diagram KeyBinding"></topic>
-			<topic href="resource/copypaste.html#Preferences" label="Preferences"></topic>
-		</topic>
-		<topic href="resource/copypaste.html#List_of_Paste_strategies" label="List of Paste strategies">
-			<topic href="resource/copypaste.html#Common_Strategies" label="Common Strategies">
-				<topic href="resource/copypaste.html#Default_Paste_Strategy" label="Default Paste Strategy"></topic>
-				<topic href="resource/copypaste.html#SterotypeStrategy" label="SterotypeStrategy">
-					<topic href="resource/copypaste.html#Preferences_2" label="Preferences"></topic>
-				</topic>
-				<topic href="resource/copypaste.html#Rename_Strategy" label="Rename Strategy"></topic>
-				<topic href="resource/copypaste.html#Diagram_in_model_Explorer_Strategy" label="Diagram in model Explorer Strategy"></topic>
-				<topic href="resource/copypaste.html#Table_in_model_Explorer_Strategy" label="Table in model Explorer Strategy"></topic>
-			</topic>
-			<topic href="resource/copypaste.html#Uml_Strategies" label="Uml Strategies">
-				<topic href="resource/copypaste.html#Constraint_Paste_Strategy" label="Constraint Paste Strategy"></topic>
-			</topic>
-			<topic href="resource/copypaste.html#Sysml_Strategies" label="Sysml Strategies">
-				<topic href="resource/copypaste.html#Part_Paste_Strategy" label="Part Paste Strategy"></topic>
-			</topic>
-		</topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste.html b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste.html
deleted file mode 100644
index 1f087e149d9..00000000000
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Copying.2FCutting.2FPasting_in_Papyrus">Copying/Cutting/Pasting in Papyrus</h1><h2 id="Introduction">Introduction</h2><pre>Papyrus's policy is to ensure consistency between models and diagrams, so by default the cut/copy/paste functionalities act both on diagram and model elements.
-The Copy/Cut/Paste functionalities are available between models and diagrams but not between eclipse instances.  
-The Cut/Paste functionalities are disable on root and read only elements.
-</pre><h2 id="User_Interface">User Interface</h2><h3 id="Model_Explorer_Menu">Model Explorer Menu</h3><p>Right click on a model explorer element</p><p><img border="0" src="images/ModelExplorerMenus.png"/></p><h3 id="Model_Explorer_KeyBinding">Model Explorer KeyBinding</h3><ul><li>Type M1+C for Papyrus copy</li><li>Type M1+X for Papyrus cut</li><li>Type M1+V for Papyrus paste</li></ul><pre>M1 is the COMMAND key on MacOS X, and the CTRL key on most other platforms.
-M2 is the SHIFT key.
-</pre><h3 id="Diagram_Menu">Diagram Menu</h3><p>On a Diagram element <b>Right Click&gt;EDIT</b> </p><p><img border="0" src="images/DiagramMenus.png"/></p><h3 id="Diagram_KeyBinding">Diagram KeyBinding</h3><ul><li>Type M1+C for Papyrus copy</li><li>Type M1+X for Papyrus cut</li><li>Type M1+V for Papyrus paste</li></ul><ul><li>Type M1+M2+C for Graphical copy</li><li>Type M1+M2+X for Graphical cut</li><li>Type M1+M2+V for Graphical paste</li></ul><h3 id="Preferences">Preferences</h3><pre>Papyrus copy/paste/cut preferences is accessible on <b>Window&gt;Preferences&gt;Papyrus&gt;Paste</b>
-The preference page lists all the available strategies and the checkbox to select whether the references should be kept.
-</pre><p><img border="0" src="images/PastePreferences.png"/></p><h2 id="List_of_Paste_strategies">List of Paste strategies</h2><h3 id="Common_Strategies">Common Strategies</h3><h4 id="Default_Paste_Strategy">Default Paste Strategy</h4><p>The strategy paste all copied elements in the selected place.
-It is required for all other strategies.</p><h4 id="SterotypeStrategy">SterotypeStrategy</h4><p>The strategy reapply profiles and stereotypes on the newly copied elements.</p><h5 id="Preferences_2">Preferences</h5><ul><li>Always apply missing profiles: missing profiles will be applied to the root of the target model</li><li>Never apply missing profiles: stereotypes referencing missing profiles will not be paste</li></ul><p><img border="0" src="images/StereotypeStrategy.png"/></p><h4 id="Rename_Strategy">Rename Strategy</h4><ul><li>Only the duplications of the <b>roots elements</b> will be renamed</li><li>An element is renamed only if there is already an element with the <b>same name</b> on the paste selection</li><li>The element will be renamed in CopyOf_%NameOfTheElement%_%id%. The id will be incremented for each <i>same</i> copy/paste. Example: a Class1 will become CopyOf_Class1_1 then CopyOf_Class1_2…</li></ul><p><img border="0" src="images/RenameExample.png"/></p><h4 id="Diagram_in_model_Explorer_Strategy">Diagram in model Explorer Strategy</h4><p>The strategy allows copy/paste for diagrams in model explorer. </p><h4 id="Table_in_model_Explorer_Strategy">Table in model Explorer Strategy</h4><p>The strategy allows copy/paste for tables in model explorer. </p><h3 id="Uml_Strategies">Uml Strategies</h3><p>The following strategies will only apply on uml models</p><h4 id="Constraint_Paste_Strategy">Constraint Paste Strategy</h4><p>This strategy works only on uml class diagrams. It draws the constraint "context" link after a paste. </p><p><img border="0" src="images/ConstraintExample.png"/></p><h3 id="Sysml_Strategies">Sysml Strategies</h3><p>The following strategies will only apply on sysml models</p><h4 id="Part_Paste_Strategy">Part Paste Strategy</h4><p>This strategy duplicates the linked association for each property pasted. </p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste.mediawiki b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste.mediawiki
index 410a11bf974..30e66dda570 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste.mediawiki
@@ -9,7 +9,7 @@
   Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial Documentation
 -->
 
-=Copying/Cutting/Pasting in Papyrus=
+=Copying Cutting Pasting in Papyrus=
 ==Introduction==
 
 Papyrus's policy is to ensure consistency between models and diagrams, so by default the cut/copy/paste functionalities act both on diagram and model elements.
@@ -80,8 +80,8 @@ The strategy reapply profiles and stereotypes on the newly copied elements.
 
 * Only the duplications of the '''roots elements''' will be renamed
 * An element is renamed only if there is already an element with the '''same name''' on the paste selection
-* The element will be renamed in CopyOf_%NameOfTheElement%_%id%. The id will be incremented for each ''same'' copy/paste. Example: a Class1 will become CopyOf_Class1_1 then CopyOf_Class1_2�
-<!-- Featured : It will have two preferences, one for the prefix �copy_of� and one checkbox to disable the increment. -->
+* The element will be renamed in CopyOf_NameOfTheElement_id. The id will be incremented for each '''same''' copy/paste. Example: a Class1 will become CopyOf_Class1_1 then CopyOf_Class1_2
+<!-- Featured : It will have two preferences, one for the prefix copy_of and one checkbox to disable the increment. -->
 
 [[Image:images/RenameExample.png]]
 
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.project b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.project
index 2da4a15d5ff..3116242303c 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.project
@@ -6,6 +6,11 @@
 	</projects>

 	<buildSpec>

 		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

 			<arguments>

 			</arguments>

@@ -15,8 +20,15 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

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

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

 	</natures>

 </projectDescription>

diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF
index eb76d24b9c8..fc319912973 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.dsml.validation.doc.Activator

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.dsml.validation.doc;singleton

  :=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 

diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties
index eaf743af822..bcada499747 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties
@@ -1,9 +1,7 @@
-source.. = src/

-output.. = bin/

 bin.includes = META-INF/,\

-               .,\

                plugin.xml,\

-               resource/,\

                about.html,\

-               plugin.properties

-src.includes = about.html
+               plugin.properties,\

+               target/generated-eclipse-help/** 

+src.includes = about.html,\

+				resource/
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/plugin.xml
index 368dc50a301..054206f3230 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>

 <plugin>

    <extension point="org.eclipse.help.toc">

-      <toc file="resource/dsml-validation-main-toc.xml" primary="false"/>

-      <toc file="resource/dsml-validation-toc.xml" primary="false"/>

+      <toc file="target/generated-eclipse-help/dsml-validation-main-toc.xml" primary="false"/>

+      <toc file="target/generated-eclipse-help/dsml-validation-toc.xml" primary="false"/>

    </extension>

 </plugin>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/pom.xml
index bae2d6df262..46c77f656ba 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-main-toc.xml b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-main-toc.xml
index d83123369ae..fc4356fb58b 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-main-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>

-<toc label="Write and validate (OCL) constraints of a profile" link_to="../org.eclipse.papyrus.uml.diagram.common.doc/resource/constraints-toc.xml#Constraints">

-   <topic href="resource/dsml-validation.html" label="Validate (OCL) constraints of a profile">

-      <link toc="resource/dsml-validation-toc.xml"/>

+<toc label="Write and validate (OCL) constraints of a profile" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

+   <topic href="target/generated-eclipse-help/dsml-validation.html" label="Validate (OCL) constraints of a profile">

+      <link toc="target/generated-eclipse-help/dsml-validation-toc.xml"/>

       <anchor id="ValidateConstraints"/>

    </topic>	

 </toc>

diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-toc.xml b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-toc.xml
deleted file mode 100644
index ee1d57c8adb..00000000000
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-toc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/dsml-validation.html" label="dsml-validation">
-	<topic href="resource/dsml-validation.html#Generation_from_Constraints" label="Generation from Constraints">
-		<topic href="resource/dsml-validation.html#Generate_constraints_directly_into_the_definition" label="Generate constraints directly into the definition">
-			<topic href="resource/dsml-validation.html#How_to_5" label="How to"></topic>
-		</topic>
-		<topic href="resource/dsml-validation.html#Generate_constraints_as_EMF_validation_plugins" label="Generate constraints as EMF validation plugins">
-			<topic href="resource/dsml-validation.html#How_to_6" label="How to"></topic>
-		</topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation.html b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation.html
deleted file mode 100644
index df694e17a52..00000000000
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Constraint_validation">Constraint validation</h1><p>Papyrus supports two alternative ways of validating whether constraints are respected by models. Both ways provide the option to augment the information presented to the user when a given constraint fails. The user is always presented a list of constraints that failed. While this is an important information, it is better to have a customized message describing what is wrong. It's also useful to specify the severity, in particular, whether a constraint violation is an error or warning.</p><p>To augment the default constraint failure information you can either generate the constraints directly into the profile definition or generate a plugin that embeds the constraints. Both approaches are described below.</p><h2 id="Generate_constraints_directly_into_the_profile_definition">Generate constraints directly into the profile definition</h2><h3 id="Embedding_Basic_OCL_Constraint_Definitions">Embedding Basic OCL Constraint Definitions</h3><p>Constraints written in OCL within a UML profile can be generated into the definition of the profile. The constraint definition is taken into account during the validation of models that have applied the profile. This method is only applicable for OCL constraints.</p><p>How to embed the constraints definitions into a UML Profile:</p><ul><li>1. Save the profile</li><li>2. Papyrus asks: "Would you like to define it" (the profile), select Yes</li><li>3. Ensure "Save OCL constraints, if any, into the profile definition" is selected (this is checked by default). Please note that you should not embed constraints into the profile, if you plan to generate a plugin (see next section)<br/></li></ul><p><center>
-<img border="0" src="PapyrusDSML-ConstraintDefinition.png"/><br/>
-Save OCL Constraints in the Profile Definition
-</center></p><h3 id="Refine_constraint_validation">Refine constraint validation</h3><p>The OCL pivot delegate supports a specific way to define a customized message and severity in the OCL constraint: The constraint needs to be written in form of a tuple, as shown here for an example.</p><pre>
-Tuple{
-  status=base_Class.isActive,
-  message='\'' + base_Class.name + '\' is not active',
-  severity=-5
-}.status
-</pre><p>The original constraint expression is defined in the status field of the tuple, as well as the message and severity fields. Whereas only the status field is returned during evaluation, OCL evaluation with the Pivot delegate will also evaluate the custom message and severity.</p><p>Please note that this is just a different way to write OCL constraints, they are put into the profile definition in the same way as described above.
-At the moment, there is no specific support in Papyrus to facilitate entering OCL expressions in this way. Since the whole tuple is a "normal" OCL expression, syntax validation and completion is supported by the xtext based expression editor. But it is currently not clear whether Papyrus will offer a way to edit this tuple in a user friendly way, e.g. by synchronizing message and severity with information from the DSML stereotype and only showing the original OCL constraint to the user.</p><h3 id="Summary">Summary</h3><p>If you only deal with OCL constraints, this method is simple and straightforward. But it is not possible to select whether constraints defined in this way are included for validation or not (they are always included).</p><h2 id="Generate_a_plugin_that_embeds_the_constraints">Generate a plugin that embeds the constraints</h2><p>Users can generate a plugin from a profile that embeds the constraints, which are expressed either in OCL or Java. OCL constraints are embedded into the plugin.xml while Java constraints can directly be compiled into code. This is supported by the EMF validation framework.</p><p>CAVEAT: The validation of OCL rules within a plugin is a rather old mechanism. It does not take the user preference of an OCL validation delegate into account. Therefore, validation is done with the classical LPG mechanism whereas the constraint editor within Papyrus validates the constraint itself (not whether other parts of the model respect the constraint) using the Pivot OCL mechanism. In particular, the qualified name of UML meta classes in LPG must start with uml:: whereas Pivot requires UML:: (upper case). In the future Papyrus will offer a way to ensure that the Pivot will be used for OCL contraints within plugins.</p><h3 id="How_to_embed_the_generate_constraints_into_a_plugin">How to embed the generate constraints into a plugin</h3><ul><li>1. Install the DSML validation support from the Papyrus extensions</li></ul><p>Help-&gt;Install New Software, select Papyrus update site, deselect "group items by category" and search for DSML.</p><ul><li>2. Select the UML Profile element in the Model Explorer</li><li>3. Right click UML Profile element</li><li>4. Select "Create validation plugin for this DSML" from the context menu</li></ul><p><center>
-<img border="0" src="PapyrusDSML-PluginValidationGeneration.png"/><br/>
-Starting the validation plugin creation process
-</center></p><ul><li>5. Choose whether you want to create a new plugin or generate the code into the plugin containing the profile. The latter is the default.</li></ul><p><center>
-<img border="0" src="PapyrusDSML-GenPluginQuestion.png"/><br/>
-Running the constraint validation creation wizard
-</center></p><ul><li>6. <a href="Only">in case of new plugin</a>: Enter a Project name when prompted by the wizard, complete the wizard and select Finish</li></ul><p><center>
-<img border="0" src="PapyrusDSML-PluginWizard.png"/><br/>
-Running the constraint validation creation wizard
-</center></p><ul><li>7. Install or deploy the plugin with associated profile</li></ul><h3 id="Refine_constraint_validation_2">Refine constraint validation</h3><p>Papyrus supports a UML profile that enables a developer to refine how constraints are violated. This profile is called Domain Specific Modeling Language (DSML), since it is often used in the context of profiles that adds domain specific concepts to UML.</p><p>The additional profile enables a specification of the following properties:</p><ul><li>Mode: Defines if the validation of the constraint is done in “batch” or “live” mode</li><li>Severity: Defines the severity of the constraint violation. It can be one of INFORMATION, WARNING or ERROR. The latter is the default severity (if none is specified). The CANCEL severity should be used with caution, as it causes the validation operation to be interrupted, possibly resulting in the loss of valuable diagnostic information from other constraints.</li><li>Message: Defines the message that will be displayed if the constraint is violated</li><li>Description: Provides a description of the constraint </li><li>Enabled by default: Defined if this constraint should be enabled by default or not</li></ul><p>The attributes of the profile correspond quite closely to the possibilities that the EMF validation framework offers when constraints are specified in the plugin.xml of a profile.</p><p>Advanced users can also define:</p><ul><li>Status code: The plug-in unique status code, useful for logging. </li><li>Target: The element to be validated (normally not required since generated context selectors take care of that, see section below)</li></ul><p>Please note that the additional constraint information is only taken in to account if you generate a plugin embedding the constraints into the plugin.xml, as discussed above.</p><h3 id="How_to_apply_the_DSML_validation_profile">How to apply the DSML validation profile</h3><ul><li>1. Install the DSML profile from the Papyrus extensions</li></ul><p>Help-&gt;Install New Software, select Papyrus update site, deselect "group items by category" and search for DSML</p><ul><li>2. Select the UML Profile element in the Model Explorer</li></ul><ul><li>3. Select the Profile tab in the Properties View</li></ul><ul><li>4. Click on the "Apply registered profile" button</li></ul><ul><li>5. Select the "DSML Validation" profile</li></ul><p><center>
-<img border="0" src="PapyrusDSML-profileApplication.png"/><br/>
-Applying the DSML Validation Profile
-</center></p><ul><li>5. Select the UML Constraint element in the Model Explorer or diagram</li></ul><ul><li>6. Select the Profile tab of the Properties View</li></ul><ul><li>7. Click on the "Apply stereotype" button</li></ul><ul><li>8. Select the ValidationRule stereotype</li></ul><p><center>
-<img border="0" src="PapyrusDSML-stereotypeApplication.png"/><br/>
-Applying the ValidationRule Stereotype
-</center></p><ul><li>9. Edit the stereotype properties to define information about the behavior of the validation</li></ul><p><center>
-<img border="0" src="PapyrusDSML-AnnotationEdition.png"/><br/>
-Editing the DSML Stereotype Properties<br/>
-</center></p><h3 id="Summary_2">Summary</h3><p>This method is a bit more complicated than the first, but also more powerful. It works for both OCL and Java. The constraints are grouped in a category that can be included in the validation or not. A message and severity specified via the DSML validation profile is taken into account. It is also possible to distinguish between Live and Batch constraints. Note that this approach is currently of limited use in the case of OCL constraints as different OCL backends are used during constraint definition and validation.</p><h3 id="Information_about_generated_code">Information about generated code</h3><p>This section contains information about the code in the generated plugin. It is intended for readers that want to understand how the generated plugin works.<br/></p><p>The EMF validation framework supports constraints by means of a suitable definition in the plugin.xml file that embeds OCL or Java constraints, as shown here (example taken from the <a href="http://help.eclipse.org/helios/index.jsp?topic=%2Forg.eclipse.emf.validation.doc%2Ftutorials%2FoclValidationTutorial.html">OCL tutorial</a>).</p><p>First define a category</p><pre>
-&lt;extension point="org.eclipse.emf.validation.constraintProviders"&gt;
-   &lt;category
-         name="Your category" id="emf-validation-example/ocl"&gt;
-      Category description
-   &lt;/category&gt;
-</pre><p>Then define constraints within the category</p><pre>
-   &lt;constraint lang="OCL" severity="WARNING" mode="Batch" name="An example" id="example1" statusCode="101"&gt;
-      &lt;description&gt;Describe it&lt;/description&gt;
-      &lt;message&gt;Write the message&lt;/message&gt;
-      &lt;target class="Writer"/&gt;
-      &lt;![CDATA[
-         self.books-&gt;collect(b : Book | b.category)-&gt;asSet()-&gt;size() &lt;= 2
-      ]]&gt;
-   &lt;/constraint&gt;
-</pre><p>Constraint validation needs to be done on the context element. Therefore, the plug-in definition needs to associate constraints with the elements that should be validated. This is called constraint binding. The following snipped shows an example of such a binding.</p><pre>
-  &lt;extension point="org.eclipse.emf.validation.constraintBindings"&gt;
-      &lt;clientContext id="MyContextID"&gt;
-         &lt;selector class=myplugin.selectors.ConstraintSelector"/&gt;
-      &lt;/clientContext&gt;
-      &lt;binding context="MyContextID"&gt;
-         &lt;constraint ref="myplugin.example1"/&gt;
-      &lt;/binding&gt;
-</pre><p>The generator creates a selector for each context element (typically a stereotype). The selector checks the element to be validated and selects those typed with the context element or a sub-types thereof. The constraint binding associates a list of constraints with the selector: those that share the same context element.</p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation.mediawiki b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation.mediawiki
index 46a90e5cea6..09567cd925d 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation.mediawiki
@@ -15,7 +15,7 @@ How to embed the constraints definitions into a UML Profile:
 *2. Papyrus asks: "Would you like to define it" (the profile), select Yes
 *3. Ensure "Save OCL constraints, if any, into the profile definition" is selected (this is checked by default). Please note that you should not embed constraints into the profile, if you plan to generate a plugin (see next section)<br/>
 <center>
-[[image:PapyrusDSML-ConstraintDefinition.png]]<br>
+[[Image:images/PapyrusDSML-ConstraintDefinition.png]]<br>
 Save OCL Constraints in the Profile Definition
 </center>
 
@@ -56,19 +56,19 @@ Help->Install New Software, select Papyrus update site, deselect "group items by
 *3. Right click UML Profile element
 *4. Select "Create validation plugin for this DSML" from the context menu
 <center>
-[[image:PapyrusDSML-PluginValidationGeneration.png]]<br/>
+[[Image:images/PapyrusDSML-PluginValidationGeneration.png]]<br/>
 Starting the validation plugin creation process
 </center>
 
 *5. Choose whether you want to create a new plugin or generate the code into the plugin containing the profile. The latter is the default.
 <center>
-[[image:PapyrusDSML-GenPluginQuestion.png]]<br>
+[[Image:images/PapyrusDSML-GenPluginQuestion.png]]<br>
 Running the constraint validation creation wizard
 </center>
 *6. [Only in case of new plugin]: Enter a Project name when prompted by the wizard, complete the wizard and select Finish
 
 <center>
-[[image:PapyrusDSML-PluginWizard.png]]<br>
+[[Image:images/PapyrusDSML-PluginWizard.png]]<br>
 Running the constraint validation creation wizard
 </center>
 
@@ -109,7 +109,7 @@ Help->Install New Software, select Papyrus update site, deselect "group items by
 *5. Select the "DSML Validation" profile
 
 <center>
-[[Image:PapyrusDSML-profileApplication.png]]<br>
+[[Image:images/PapyrusDSML-profileApplication.png]]<br>
 Applying the DSML Validation Profile
 </center>
 
@@ -122,14 +122,14 @@ Applying the DSML Validation Profile
 *8. Select the ValidationRule stereotype
 
 <center>
-[[Image:PapyrusDSML-stereotypeApplication.png]]<br>
+[[Image:images/PapyrusDSML-stereotypeApplication.png]]<br>
 Applying the ValidationRule Stereotype
 </center>
 
 *9. Edit the stereotype properties to define information about the behavior of the validation
 
 <center>
-[[Image:PapyrusDSML-AnnotationEdition.png]]<br>
+[[Image:images/PapyrusDSML-AnnotationEdition.png]]<br>
 Editing the DSML Stereotype Properties<br/>
 </center>
 
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/MEConstraintCreation.png b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/MEConstraintCreation.png
index 9d3db996a19..9d3db996a19 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/MEConstraintCreation.png
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/MEConstraintCreation.png
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-AnnotationEdition.png b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-AnnotationEdition.png
index e722d70aa1f..e722d70aa1f 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-AnnotationEdition.png
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-AnnotationEdition.png
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-ConstraintDefinition.png b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-ConstraintDefinition.png
index bf24d63f234..bf24d63f234 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-ConstraintDefinition.png
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-ConstraintDefinition.png
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-GenPluginQuestion.png b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-GenPluginQuestion.png
index e6867c07f3d..e6867c07f3d 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-GenPluginQuestion.png
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-GenPluginQuestion.png
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-PluginValidationGeneration.png b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-PluginValidationGeneration.png
index 86f002c75f6..86f002c75f6 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-PluginValidationGeneration.png
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-PluginValidationGeneration.png
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-PluginWizard.png b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-PluginWizard.png
index 056f345b12a..056f345b12a 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-PluginWizard.png
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-PluginWizard.png
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-UseCaseGeneration.png b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-UseCaseGeneration.png
index a42a3de81b2..a42a3de81b2 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-UseCaseGeneration.png
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-UseCaseGeneration.png
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-profileApplication.png b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-profileApplication.png
index da5989da57b..da5989da57b 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-profileApplication.png
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-profileApplication.png
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-stereotypeApplication.png b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-stereotypeApplication.png
index 9b8b0157d1d..9b8b0157d1d 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/PapyrusDSML-stereotypeApplication.png
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/PapyrusDSML-stereotypeApplication.png
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/SpecificationCreation.png b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/SpecificationCreation.png
index 99111be2833..99111be2833 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/SpecificationCreation.png
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/images/SpecificationCreation.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.doc/.project
new file mode 100644
index 00000000000..af8565ff60e
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.infra.doc</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

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

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

+	</natures>

+</projectDescription>

diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF
index 1b7a2d3259f..0e93775928f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.doc;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/OSGI-INF/l10n/bundle.properties b/plugins/doc/org.eclipse.papyrus.infra.doc/OSGI-INF/l10n/bundle.properties
index 48d97b00463..48d97b00463 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/OSGI-INF/l10n/bundle.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/about.html b/plugins/doc/org.eclipse.papyrus.infra.doc/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/about.html
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/build.properties b/plugins/doc/org.eclipse.papyrus.infra.doc/build.properties
index 3b3a621cf02..270493cb64d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/build.properties
@@ -4,5 +4,6 @@ bin.includes = META-INF/,\
                intro/,\
                toc.xml,\
                about.html,\
-               resource/
-src.includes = about.html
+               resource/ 
+src.includes = about.html,\
+				resource/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/intro/css/firststeps.css b/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/firststeps.css
index 74f9c98b8e7..74f9c98b8e7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/intro/css/firststeps.css
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/firststeps.css
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject.png b/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject.png
index 1a6ee9b632f..1a6ee9b632f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject_hov.png b/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject_hov.png
index 1a6ee9b632f..1a6ee9b632f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject_hov.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject_hov.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/intro/css/overview.css b/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/overview.css
index 74f9c98b8e7..74f9c98b8e7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/intro/css/overview.css
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/overview.css
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/intro/firststeps.xml b/plugins/doc/org.eclipse.papyrus.infra.doc/intro/firststeps.xml
index 9d84d6b5484..9d84d6b5484 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/intro/firststeps.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/intro/firststeps.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/intro/overview.xml b/plugins/doc/org.eclipse.papyrus.infra.doc/intro/overview.xml
index 6d8ef3b5184..6d8ef3b5184 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/intro/overview.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/intro/overview.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.infra.doc/plugin.xml
index fb0251c8839..fb0251c8839 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/plugin.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.doc/pom.xml
index 6d4e31ab6d7..6d4e31ab6d7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/pom.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/resource/PapyrusLeftBanner.gif b/plugins/doc/org.eclipse.papyrus.infra.doc/resource/PapyrusLeftBanner.gif
index 6b17dfbb5c2..6b17dfbb5c2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/resource/PapyrusLeftBanner.gif
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/resource/PapyrusLeftBanner.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/resource/stylesheet.css b/plugins/doc/org.eclipse.papyrus.infra.doc/resource/stylesheet.css
index fc44366498a..fc44366498a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/resource/stylesheet.css
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/resource/stylesheet.css
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/toc.xml b/plugins/doc/org.eclipse.papyrus.infra.doc/toc.xml
index a3633c0dabe..a3633c0dabe 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/toc.xml
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project
index 474137c05b7..318bf6a9eec 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project
@@ -6,6 +6,11 @@
 	</projects>

 	<buildSpec>

 		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

 			<arguments>

 			</arguments>

@@ -15,8 +20,15 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

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

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

 	</natures>

 </projectDescription>

diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.core.resources.prefs
index 5ff369ffa40..d37b2d6f0e0 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.core.resources.prefs
@@ -1,8 +1,2 @@
 eclipse.preferences.version=1
-encoding//resource/alignmentTool-toc.xml=utf-8
-encoding//resource/alignmentTool.html=utf-8
-encoding//resource/marqueeSelectionTool-toc.xml=utf-8
-encoding//resource/marqueeSelectionTool.html=utf-8
-encoding//resource/textAlignment-toc.xml=utf-8
-encoding//resource/textAlignment.html=utf-8
 encoding//resource/tools-toc.xml=utf-8
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..4d72ad12656
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,288 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF
index aa47f65088d..2a95669f6f5 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.help;bundle-version="3.6.0"

+Require-Bundle: org.eclipse.help;bundle-version="3.6.0",

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/build.properties b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/build.properties
index 372c4fa9ca7..6023a417405 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/build.properties
@@ -2,5 +2,6 @@ bin.includes = META-INF/,\
                about.html,\

                plugin.properties,\

                plugin.xml,\

-               resource/

-src.includes = about.html

+               target/generated-eclipse-help/** 

+src.includes = about.html,\

+				resource/

diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.xml
index ff24d120716..cc2180c8961 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.xml
@@ -4,19 +4,19 @@
    <extension
          point="org.eclipse.help.toc">
       <toc
-            file="resource/marqueeSelectionTool-toc.xml"
+            file="target/generated-eclipse-help/marqueeSelectionTool-toc.xml"
             primary="false">
       </toc>
       <toc
-            file="resource/tools-toc.xml"
+            file="target/generated-eclipse-help/tools-toc.xml"
             primary="false">
       </toc>
       <toc
-            file="resource/alignmentTool-toc.xml"
+            file="target/generated-eclipse-help/alignmentTool-toc.xml"
             primary="false">
       </toc>
       <toc
-            file="resource/textAlignment-toc.xml"
+            file="target/generated-eclipse-help/textAlignment-toc.xml"
             primary="false">
       </toc>      
    </extension>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml
index f8829d95201..bd5e05a17b9 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool-toc.xml
deleted file mode 100644
index 46bc9aa3b5c..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool-toc.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/alignmentTool.html" label="Tool">
-	<topic href="resource/alignmentTool.html" label="Alignment Tool">
-		<topic href="resource/alignmentTool.html#Introduction" label="Introduction"></topic>
-		<topic href="resource/alignmentTool.html#General_Rules" label="General Rules"></topic>
-		<topic href="resource/alignmentTool.html#Using_of_Alignment_Tool" label="Using of Alignment Tool">
-			<topic href="resource/alignmentTool.html#General_Case" label="General Case"></topic>
-			<topic href="resource/alignmentTool.html#Hierarchy" label="Hierarchy"></topic>
-			<topic href="resource/alignmentTool.html#Labels" label="Labels"></topic>
-			<topic href="resource/alignmentTool.html#Edges" label="Edges"></topic>
-		</topic>
-		<topic href="resource/alignmentTool.html#Limitation" label="Limitation">
-			<topic href="resource/alignmentTool.html#Hierarchy_2" label="Hierarchy"></topic>
-			<topic href="resource/alignmentTool.html#Label" label="Label"></topic>
-			<topic href="resource/alignmentTool.html#Edge" label="Edge"></topic>
-		</topic>
-	</topic>
-</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool.html b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool.html
deleted file mode 100644
index 42e415216de..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/alignmentTool.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Alignment_Tool">Alignment Tool</h1><h2 id="Introduction">Introduction</h2><p>Alignment Tool is available in the Papyrus toolbar:<br/>
-<img border="0" src="images/Alignment/Alignment_Toolbar.JPG"/><br/>
-Alignment allows to align the different objects of the model based on a reference object.
-The reference object is basically the last object selected (primary selection) and can be identified with the handles color:<br/></p><table style="margin: auto;"><tr><td><img title="Normal Selection" alt="Normal Selection" border="1" src="images/Alignment/normal_Align_selection.JPG"/>   </td><td><img title="Primary Selection" alt="Primary Selection" border="1" src="images/Alignment/Reference_Align_selection.JPG"/>   </td></tr></table><p><br/>
-To implement Alignment, some rules have been defined. </p><h2 id="General_Rules">General Rules</h2><p>The Alignment Tools allows 6 types of alignment:
-<img align="right" title="Alignment Types" alt="Alignment Types" border="0" src="images/Alignment/Alignment_Toolbar.JPG"/></p><ul><li>Horizontally<ul><li>Left</li><li>Center</li><li>Right</li></ul></li><li>Vertically<ul><li>Top</li><li>Middle</li><li>Bottom</li></ul></li></ul><p>These types can be disable if the alignment is not possible.
-Here is the different rules on which the alignment is based:</p><ol><li>The alignment is available only if the selected object can be moved on the reference</li><li>When an object and one or several children should be aligned on a third object, only the parent is aligned</li><li>An object can only be aligned inside of its container's bounds.(In order to avoid scrollbar and invisible objects) </li><li>An object cannot be aligned on one of its children.</li></ol><h2 id="Using_of_Alignment_Tool">Using of Alignment Tool</h2><p>Here under, some examples of using of alignment tool. <br/></p><h3 id="General_Case">General Case</h3><p>Basically, alignment is used in order to make the model easier to be read and more aesthetic.
-To align objects:</p><ul><li>Select the object to be aligned</li><li>Click on the align tool button <img border="0" src="images/Alignment/Align_button.JPG"/>  </li><li>Choose the proper type of alignment </li></ul><p><br/></p><ol><li>Example A: Standard alignment<dl><dd><img border="0" src="images/Alignment/General_Align1_before.JPG"/> </dd><dd><img border="0" src="images/Alignment/General_Align1_after.JPG"/></dd><dd>In this case the reference object is the right one. <br/></dd></dl></li><li>Example B: Parent alignment<dl><dd>In this second example, the object (the Class ) is aligned on his parent (the Package),  the unauthorized alignment appears disable (in grey)</dd><dd><img border="0" src="images/Alignment/General_Align2_before.JPG"/> </dd><dd><img border="0" src="images/Alignment/General_Align2_after.JPG"/></dd></dl></li></ol><h3 id="Hierarchy">Hierarchy</h3><p>In this section, some examples of alignment in case of hierarchy between objects (parent / children).</p><ol><li>Example A: Only the parent is aligned <dl><dd><img border="0" src="images/Alignment/Hierarchy_Align1_before.JPG"/> </dd><dd>As shown in the result screenshot below , only the parent (the Package) has been aligned. </dd><dd><img border="0" src="images/Alignment/Hierarchy_Align1_after.JPG"/></dd></dl></li><li>Example B: Alignment inside the Container bounds is available<dl><dd><img border="0" src="images/Alignment/Hierarchy_Align2_before.JPG"/> </dd><dd>In the align options list, only the ones that keep the objects inside his container are enable.</dd><dd><img border="0" src="images/Alignment/Hierarchy_Align2_after.JPG"/></dd></dl></li></ol><h3 id="Labels">Labels</h3><p>In this section, some examples of labels alignments.</p><ol><li>Example A: Standard label alignment<dl><dd><img border="0" src="images/Alignment/Label_Align1_before.JPG"/> </dd><dd><img border="0" src="images/Alignment/Label_Align1_after.JPG"/></dd></dl></li><li>Example B: Dependency with another selected object<dl><dd><img border="0" src="images/Alignment/Label_Align2_before.JPG"/> </dd><dd>As shown in the result screenshot below, only the class is aligned. The label moves according to the connection move.</dd><dd><img border="0" src="images/Alignment/Label_Align2_after.JPG"/></dd></dl></li></ol><h3 id="Edges">Edges</h3><p>Edges alignment could sound not realistic. Actually, edge alignment is an alignment between the extremities of the edge, to make the edge horizontal or vertical. 
-Example: Standard edge alignment</p><dl><dd><img border="0" src="images/Alignment/Link_Align1_before.JPG"/> </dd></dl><p>The extremities are alignment in order to have an horizontal connection. The connection handles remained at the same place on the object</p><dl><dd><img border="0" src="images/Alignment/Link_Align1_after.JPG"/></dd></dl><h2 id="Limitation">Limitation</h2><p>This section will describe some limitations of the alignment tool.</p><h3 id="Hierarchy_2">Hierarchy</h3><p>A parent cannot be aligned on one of his child:
-<img border="0" src="images/Alignment/Hierarchy_Align3_limitation.JPG"/></p><h3 id="Label">Label</h3><p>The extremities (source or target )of a connection cannot be aligned on any Labels of this connection.
-<img border="0" src="images/Alignment/Label_Align3_limitation.JPG"/></p><h3 id="Edge">Edge</h3><p>To make the edge alignment available, the edge handles should correspond to the same direction (horizontal or vertical).
-In the following case, source handle is on TOP and target handle is on LEFT. it is then impossible to align the edge.
-<img border="0" src="images/Alignment/Link_Align2_Limitation.JPG"/></p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool-toc.xml
deleted file mode 100644
index 1a29ff761ba..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool-toc.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc label="Tool" topic="resource/marqueeSelectionTool.html">
-	<topic href="resource/marqueeSelectionTool.html" label="Marquee Selection Tools">
-		<topic href="resource/marqueeSelectionTool.html#Introduction" label="Introduction"></topic>
-		<topic href="resource/marqueeSelectionTool.html#Standard_Marquee_Selection" label="Standard Marquee Selection">
-			<topic href="resource/marqueeSelectionTool.html#Select_All" label="Select All"></topic>
-			<topic href="resource/marqueeSelectionTool.html#Select_Nodes_Only" label="Select Nodes Only"></topic>
-			<topic href="resource/marqueeSelectionTool.html#Select_Connections_Only" label="Select Connections Only"></topic>
-			<topic href="resource/marqueeSelectionTool.html#Select_Labels_Only" label="Select Labels Only"></topic>
-		</topic>
-		<topic href="resource/marqueeSelectionTool.html#Rubberband_Marquee_Selection" label="Rubberband Marquee Selection">
-			<topic href="resource/marqueeSelectionTool.html#Select_All_2" label="Select All"></topic>
-			<topic href="resource/marqueeSelectionTool.html#Select_Nodes_Only_2" label="Select Nodes Only"></topic>
-			<topic href="resource/marqueeSelectionTool.html#Select_Connections_Only_2" label="Select Connections Only"></topic>
-			<topic href="resource/marqueeSelectionTool.html#Select_Labels_Only_2" label="Select Labels Only"></topic>
-		</topic>
-	</topic>
-</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool.html b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool.html
deleted file mode 100644
index f4bcaf6872d..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/marqueeSelectionTool.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Marquee_Selection_Tools">Marquee Selection Tools</h1><h2 id="Introduction">Introduction</h2><p>In order to enlarge the default selection tool available in the Palette, additionnal marquee selection tools have been added into Papyrus.<br/>
-<img border="0" src="images/Palette1.JPG"/>
-<br/>
-A marquee selection is a multi-selection that allows to select several elements through a rectangle area.</p><p>Two types of marquee selections are available:</p><ul><li><i>Standard selection</i> : Select all elements included inside of the drawn marquee.</li></ul><p><img border="0" src="images/Palette2-Include.JPG"/></p><ul><li><i>Rubberband selection</i> : Select all elements intersecting the marquee in addition with all elements included in the marquee.<br/></li></ul><p><img border="0" src="images/Palette3-Rubberband.JPG"/>
-<br/></p><p>A demonstration of this tool is available on the Papyrus Channel :
-<a href="https://www.youtube.com/watch?v=sRSKYJ1mKBk">Marquee Selection Tool Demonstration</a></p><h2 id="Standard_Marquee_Selection">Standard Marquee Selection</h2><p>The Standard Marquee selection tool comes in a variety of 4 options:</p><ul><li>Select All</li><li>Nodes Only</li><li>Labels Only</li><li>Connections Only</li></ul><h3 id="Select_All">Select All</h3><p>Select blocks, labels and connections inside of the marquee area.
-<img border="0" src="images/SelectAllInclude.JPG"/></p><h3 id="Select_Nodes_Only">Select Nodes Only</h3><p>Select only the blocks inside of the marquee area.
-<img border="0" src="images/SelectNodeInclude.JPG"/></p><h3 id="Select_Connections_Only">Select Connections Only</h3><p>Select only the connectors inside of the marquee area.
-<img border="0" src="images/SelectConnectionInclude.JPG"/></p><h3 id="Select_Labels_Only">Select Labels Only</h3><p>Select only the floating labels inside of the marquee area.
-<img border="0" src="images/SelectLabelInclude.JPG"/></p><h2 id="Rubberband_Marquee_Selection">Rubberband Marquee Selection</h2><p>The Rubberband Marquee selection tool comes in a variety of 4 options:</p><ul><li>Select All</li><li>Nodes Only</li><li>Labels Only</li><li>Connections Only</li></ul><h3 id="Select_All_2">Select All</h3><p>Select the blocks, the labels and the connectors intersecting the marquee area or included inside of the marquee area.
-<img border="0" src="images/SelectAllTouched.JPG"/></p><h3 id="Select_Nodes_Only_2">Select Nodes Only</h3><p>Select only the blocks intersecting the marquee area or included inside of the marquee area.
-<img border="0" src="images/SelectNodeTouched.JPG"/></p><h3 id="Select_Connections_Only_2">Select Connections Only</h3><p>Select only the connectors intersecting the marquee area or included inside of the marquee area.
-<img border="0" src="images/SelectConnectionTouched.JPG"/></p><h3 id="Select_Labels_Only_2">Select Labels Only</h3><p>Select only the labels intersecting the marquee area or included inside of the marquee area.
-<img border="0" src="images/SelectLabelTouched.JPG"/></p><p><hr/></p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/textAlignment-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/textAlignment-toc.xml
deleted file mode 100644
index 9a311032d57..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/textAlignment-toc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc label="textAlignment" link_to="Tool" topic="resource/textAlignment.html">
-	<topic href="resource/textAlignment.html" label="Text Alignment">
-		<topic href="resource/textAlignment.html#Introduction" label="Introduction"></topic>
-		<topic href="resource/textAlignment.html#Apply_text_alignment_with_button" label="Apply text alignment with button"></topic>
-		<topic href="resource/textAlignment.html#Apply_text_alignment_with_CSS" label="Apply text alignment with CSS"></topic>
-	</topic>
-</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/textAlignment.html b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/textAlignment.html
deleted file mode 100644
index 8e8613ee1dd..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/textAlignment.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Text_Alignment">Text Alignment</h1><h2 id="Introduction">Introduction</h2><p>Papyrus allows text alignment on external label, that means that when you're editing text, it will be moved on the selected side. You can align text to the left,  to the center or to the right. </p><p>Example of text alignment to the right:</p><ul><li>Before a rename of the label</li></ul><p><img border="0" src="images/textAlignment/TextAlignmentBefore.png"/>  </p><ul><li>After a rename of the label</li></ul><p><img border="0" src="images/textAlignment/TextAlignmentAfter.png"/></p><p>There is two ways to align text: with the existing button or thanks CSS:</p><h2 id="Apply_text_alignment_with_button">Apply text alignment with button</h2><p>To apply text alignment you can use button. There are available in tree places:</p><ul><li>In the papyrus menu</li></ul><p><img border="0" src="images/textAlignment/TextAlignmentButton01.png"/></p><ul><li>In the toolbar</li></ul><p><img border="0" src="images/textAlignment/TextAlignmentButton02.png"/></p><ul><li>In the contextual menu</li></ul><p><img border="0" src="images/textAlignment/TextAlignmentButton03.png"/></p><h2 id="Apply_text_alignment_with_CSS">Apply text alignment with CSS</h2><p>Text alignment can be defined through the CSS attributes "textAlignment" :</p><p>Example for Label of Port aligned to the right:</p><pre class="source-css">Port &gt; Label {
-   textAlignment:"right";
-   }
-</pre><p>Note: Text alignment of port's label is forced according to the position of its parent when it is constrained.</p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/textAlignment.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/textAlignment.mediawiki
index 4b5273ea13f..96ada3b4206 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/textAlignment.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/textAlignment.mediawiki
@@ -5,10 +5,10 @@ Papyrus allows text alignment on external label, that means that when you're edi
 Example of text alignment to the right:
 
 *Before a rename of the label
-[[File:images/textAlignment/TextAlignmentBefore.png]]  
+[[Image:images/textAlignment/textAlignmentBefore.png]]  
 
 *After a rename of the label
-[[File:images/textAlignment/TextAlignmentAfter.png]]
+[[File:images/textAlignment/textAlignmentAfter.png]]
 
 There is two ways to align text: with the existing button or thanks CSS:
 
@@ -16,15 +16,15 @@ There is two ways to align text: with the existing button or thanks CSS:
 To apply text alignment you can use button. There are available in tree places:
 
 *In the papyrus menu
-[[File:images/textAlignment/TextAlignmentButton01.png]]
+[[File:images/textAlignment/textAlignmentButton01.png]]
 
 
 *In the toolbar
-[[File:images/textAlignment/TextAlignmentButton02.png]]
+[[File:images/textAlignment/textAlignmentButton02.png]]
 
 
 *In the contextual menu
-[[File:images/textAlignment/TextAlignmentButton03.png]]
+[[File:images/textAlignment/textAlignmentButton03.png]]
 
 ==Apply text alignment with CSS==
 Text alignment can be defined through the CSS attributes "textAlignment" :
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml
index e4d8fe0bb2c..81d97da7438 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml
@@ -2,7 +2,7 @@
 <toc label="Papyrus Modelling Tools" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
 	<topic label="Using Papyrus modelling tools">
     <anchor id="Tool"/>
-    <link toc="resource/marqueeSelectionTool-toc.xml"/>
-    <link toc="resource/alignmentTool-toc.xml"/>
-    <link toc="resource/textAlignment-toc.xml"/></topic>
+    <link toc="target/generated-eclipse-help/marqueeSelectionTool-toc.xml"/>
+    <link toc="target/generated-eclipse-help/alignmentTool-toc.xml"/>
+    <link toc="target/generated-eclipse-help/textAlignment-toc.xml"/></topic>
 </toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.project
index 4c819662588..9b2f21dda0c 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.project
@@ -6,7 +6,7 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.core.resources.prefs
index 8c016f234e3..b785029b95f 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,2 @@
 eclipse.preferences.version=1
-encoding//resource/css-toc.xml=utf-8
-encoding//resource/css.html=utf-8
 encoding/resource=UTF-8
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF
index fbad4194184..813e502a330 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Bundle-Name: CSS Documentation
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.doc;singlet

  on:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 

diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/build.properties b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/build.properties
index 4887a1c42cb..3abab9716c1 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/build.properties
@@ -1,5 +1,7 @@
 bin.includes = META-INF/,\

                about.html,\

                resource/,\

-               plugin.xml

-src.includes = about.html

+               plugin.xml,\

+               target/generated-eclipse-help/** 

+src.includes = about.html,\

+				resource/

diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/plugin.xml
index bb0a32197dd..8033502770f 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/plugin.xml
@@ -4,11 +4,11 @@
    <extension

          point="org.eclipse.help.toc">

       <toc

-            file="resource/css-main-toc.xml"

+            file="target/generated-eclipse-help/css-main-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="resource/css-toc.xml"

+            file="target/generated-eclipse-help/css-toc.xml"

             primary="false">

       </toc>

    </extension>

diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/pom.xml
index 7247a9367fb..8aca04cfb0c 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/pom.xml
@@ -11,4 +11,39 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-main-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-main-toc.xml
index e2409e8153f..74e70784dd6 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-main-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <toc label="CSS Stylesheets" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-   <topic href="resource/css.html" label="CSS Stylesheets">
+   <topic href="target/generated-eclipse-help/css.html" label="CSS Stylesheets">
       <anchor id="CSS"/>
-      <link toc="resource/css-toc.xml"/>
+      <link toc="target/generated-eclipse-help/css-toc.xml"/>
    </topic>	
 </toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-toc.xml
deleted file mode 100644
index 01cea67865c..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-toc.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/css.html" label="css">
-	<topic href="resource/css.html" label="Introduction"></topic>
-	<topic href="resource/css.html#Installation" label="Installation"></topic>
-	<topic href="resource/css.html#Using_StyleSheets" label="Using StyleSheets">
-		<topic href="resource/css.html#Diagram_Stylesheets" label="Diagram Stylesheets"></topic>
-		<topic href="resource/css.html#Model_StyleSheet" label="Model StyleSheet"></topic>
-		<topic href="resource/css.html#Project_Stylesheets" label="Project Stylesheets"></topic>
-	</topic>
-	<topic href="resource/css.html#Deploying_a_CSS_Theme" label="Deploying a CSS Theme">
-		<topic href="resource/css.html#With_extension_point" label="With extension point"></topic>
-		<topic href="resource/css.html#In_workspace_preference" label="In workspace preference"></topic>
-	</topic>
-	<topic href="resource/css.html#Editing_a_StyleSheet" label="Editing a StyleSheet">
-		<topic href="resource/css.html#Manually:_The_CSS_Syntax" label="Manually: The CSS Syntax">
-			<topic href="resource/css.html#Syntax_elements" label="Syntax elements"></topic>
-			<topic href="resource/css.html#Examples" label="Examples"></topic>
-		</topic>
-		<topic href="resource/css.html#With_the_Papyrus_tooling" label="With the Papyrus tooling"></topic>
-	</topic>
-	<topic href="resource/css.html#Supported_properties" label="Supported properties">
-		<topic href="resource/css.html#Selector_properties" label="Selector properties"></topic>
-		<topic href="resource/css.html#Style_properties" label="Style properties">
-			<topic href="resource/css.html#Value_types" label="Value types"></topic>
-			<topic href="resource/css.html#Mask_Label" label="Mask Label"></topic>
-		</topic>
-	</topic>
-	<topic href="resource/css.html#Manipulating_styles" label="Manipulating styles"></topic>
-	<topic href="resource/css.html#Limitations_and_issues" label="Limitations and issues">
-		<topic href="resource/css.html#Selectors" label="Selectors">
-			<topic href="resource/css.html#Selector_inheritance" label="Selector inheritance"></topic>
-			<topic href="resource/css.html#Events_support" label="Events support"></topic>
-		</topic>
-		<topic href="resource/css.html#Known_bugs" label="Known bugs"></topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.html b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.html
deleted file mode 100644
index 3e8b27ade53..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><link rel="stylesheet" type="text/css" href="documentation.css"/></head><body><ol style="list-style: none;"><li><a href="#Introduction">Introduction</a></li><li><a href="#Installation">Installation</a></li><li><a href="#Using_StyleSheets">Using StyleSheets</a><ol style="list-style: none;"><li><a href="#Diagram_Stylesheets">Diagram Stylesheets</a></li><li><a href="#Model_StyleSheet">Model StyleSheet</a></li><li><a href="#Project_Stylesheets">Project Stylesheets</a></li></ol></li><li><a href="#Deploying_a_CSS_Theme">Deploying a CSS Theme</a><ol style="list-style: none;"><li><a href="#With_extension_point">With extension point</a></li><li><a href="#In_workspace_preference">In workspace preference</a></li></ol></li><li><a href="#Editing_a_StyleSheet">Editing a StyleSheet</a><ol style="list-style: none;"><li><a href="#Manually:_The_CSS_Syntax">Manually: The CSS Syntax</a><ol style="list-style: none;"><li><a href="#Syntax_elements">Syntax elements</a></li><li><a href="#Examples">Examples</a></li></ol></li><li><a href="#With_the_Papyrus_tooling">With the Papyrus tooling</a></li></ol></li><li><a href="#Supported_properties">Supported properties</a><ol style="list-style: none;"><li><a href="#Selector_properties">Selector properties</a></li><li><a href="#Style_properties">Style properties</a><ol style="list-style: none;"><li><a href="#Value_types">Value types</a></li><li><a href="#Mask_Label">Mask Label</a></li></ol></li></ol></li><li><a href="#Manipulating_styles">Manipulating styles</a></li><li><a href="#Limitations_and_issues">Limitations and issues</a><ol style="list-style: none;"><li><a href="#Selectors">Selectors</a><ol style="list-style: none;"><li><a href="#Selector_inheritance">Selector inheritance</a></li><li><a href="#Events_support">Events support</a></li></ol></li><li><a href="#Known_bugs">Known bugs</a></li></ol></li></ol><h1 id="Introduction">Introduction</h1><p>The standard UML specification provides a few hints to represent graphical elements. However, it only focuses on the general representation of these elements (e.g. A Class is a rectangle, with optional compartments for its attributes and operations, and its name should be displayed in italic if the Class is abstract). </p><p>Nevertheless, for a better readability (and even esthetic), the user has a certain freedom for changing some graphical properties, such as an Element's color. Until now, in Papyrus, this customization could be done by two complement means: </p><ul><li>Appearance tab (Properties view): change the appearance of the selected element(s) </li><li>Preferences page: change the initial appearance of all newly created element(s)</li></ul><p>While this allows defining a custom theme for our diagrams, this mechanism suffers from a few limitations: </p><ul><li>It is not possible to create different categories of appearance for the same semantic Element (e.g. "Blue Class" and "Green class"). We'd have to create "Blue classes" and change some of them to "Green"manually. </li><li>If we wanted to change the current theme, we'd have either to change each object's appearance one by one, or to write an automatic transformation, which could be really complicated. </li><li>It is not easy to export a Theme, as they are stored in the Eclipse preferences. It is almost impossible to ship a ready-to-use distribution of Papyrus with a custom theme.</li></ul><p>The Cascading StyleSheets (CSS) component adds the capacity to define some Stylesheets for your diagrams. Just like in web pages, the CSS format is used to separate the contents of our diagrams from their appearance. It becomes possible to change the appearance of a whole diagram, or even a set of diagrams, independently of the number of represented elements, in a single click.<br/></p><h1 id="Installation">Installation</h1><p>The CSS Stylesheet support is now shipped in the base installation of Papyrus. It doesn't require any specific installation step anymore.</p><p>Without the CSS component, or with the "Black &amp; White" CSS Theme, your diagrams look like: </p><p><img title="Papyrus diagram without CSS Theme" alt="Papyrus diagram without CSS Theme" border="0" src="Papyrus_CSS_no_theme.png"/><br/></p><p>With the default "Papyrus" CSS Theme, your diagrams look like:</p><p><img title="Papyrus Diagram with CSS Theme" alt="Papyrus Diagram with CSS Theme" border="0" src="Papyrus_CSS_theme.png"/><br/></p><p>Note: If you opened a diagram which has been created without the CSS Support, it may still have a user-defined appearance, e.g. without Element icons. This might or might not be a problem, as this may conflict with the CSS Theme. You can reset all custom appearances by pressing the "Default style" button in the Style tab of the Diagram's properties view.</p><h1 id="Using_StyleSheets">Using StyleSheets</h1><p>To define a custom style, the first step is to create a Stylesheet. The creation is really straightforward: a Stylesheet is a text file with the .css extension. You can create such a file using the "New &gt; File" wizard.<br/> There are several options for using stylesheets.</p><h2 id="Diagram_Stylesheets">Diagram Stylesheets</h2><p>You can define a particular style for a diagram.</p><ol><li>Select a diagram</li><li>Go to the Style tab of the properties view</li><li>Add a new "Diagram style sheet". There isn't currently any style sheet available from the diagram, so you need to create a new "Stylesheet reference".<br/><img title="Import stylesheet in Papyrus" alt="Import stylesheet in Papyrus" border="0" src="Papyrus_CSS_Import_stylesheet.png"/> </li><li>Browse your workspace to find your css file, and press OK. Your stylesheet is now associated to your diagram.</li></ol><h2 id="Model_StyleSheet">Model StyleSheet</h2><p>Similarily to "Diagram Stylesheet" you can define a particular style for a Model.</p><ol><li>Select a model</li><li>Go to the Style tab of the properties view</li><li>Add a new "Model style sheet"</li><li>Browse your workspace to find your css file, and press OK. Your stylesheet is now associated to your Model.</li></ol><h2 id="Project_Stylesheets">Project Stylesheets</h2><p>You can associate to a project specific stylesheets.</p><ol><li>Select a project in "Project Explorer" view</li><li>Open project preference properties: "Right click &gt; properties"</li><li>Go to CSS stylesheets page: "Papyrus &gt; Style sheets"</li><li>Add a new "Project style sheet". There isn't currently any style sheet available from project, so you need to create a new "Stylesheet reference".<br/><img title="Style sheets project properties in Papyrus" alt="Style sheets project properties in Papyrus" border="0" src="Papyrus_CSS_project.png"/></li><li>Browse your workspace to find your css file, and press OK. Now, your stylesheet is associated with the project.</li></ol><h1 id="Deploying_a_CSS_Theme">Deploying a CSS Theme</h1><p>Once you have defined your style sheets, you may want to export it to create a new theme (Or to extend an existing theme). To do so, Papyrus provides two ways to define a theme.</p><h2 id="With_extension_point">With extension point</h2><p>Papyrus provides an extension point: org.eclipse.papyrus.infra.gmfdiag.css.theme. </p><p>This extension point needs two entries: a Theme Definition (ID, Label and icon of the Theme), and Theme contributions (A set of style sheets which will compose the Theme). More than one plug-in can contribute to the same Theme, which makes it possible to extend a Theme. </p><p>The Theme can be modified from the Papyrus preferences page "CSS Theme". Only one theme can be activated at the same time. A Theme applies to all Papyrus Diagrams from the workspace.<br/> </p><h2 id="In_workspace_preference">In workspace preference</h2><p>You can define theme in workspace preferences. A theme is defined by style sheets.</p><ol><li>Go to the Papyrus preference: "Window &gt; Preferences &gt; Papyrus &gt; CSS Theme"</li><li>Add a new theme. There are currently two existing themes: "Papyrus Theme" and "Black &amp; White".<br/><img title="Creation of theme in Papyrus" alt="Creation of theme in Papyrus" border="0" src="Papyrus_CSS_theme_creation.png"/></li><li>Write a name for this new theme</li><li>(optional) Choose an icon</li><li>Associate one or more style sheets with this theme</li><li>Press OK to finish creation</li></ol><p>You can edit or create a theme with a selection of CSS files in Project Explorer view. For this, select the CSS files, right click and select "CSS Theme"</p><h1 id="Editing_a_StyleSheet">Editing a StyleSheet</h1><p>Papyrus Stylesheets are stored in text files with the ".css" extension (e.g. stylesheet.css).<br/> </p><h2 id="Manually:_The_CSS_Syntax">Manually: The CSS Syntax</h2><h3 id="Syntax_elements">Syntax elements</h3><p>The CSS syntax is a list of rules, which associates selectors and properties.<br/> </p><ul><li>The selector: describes the condition which has to be fulfilled for a rule to be applied<br/> </li><li>The properties: describes the appearance of the elements matching the rule<br/></li></ul><p>Eclipse implements the 2.1 version of the CSS syntax. The available selectors are:<br/> </p><ul><li><b>*</b>: Matches all elements<br/> </li><li><b>ElementType</b>: Matches the elements of type "ElementType"<br/> </li><li><b>.myStyle</b>: Matches the elements on which the style "myStyle" is applied<br/> </li><li><b>#myID</b>: Matches the element with the CSS ID "myID". The CSS ID must be unique among a diagram. To avoid confusing the users, and because this selector doesn't make much sense on diagrams, this selector has been disabled in Papyrus.<br/> </li><li><b>[property=value]</b>: Matches the elements which have a property "property" with the value "value". It can also match the properties of Stereotypes<br/></li><li><b>[appliedStereotypes~="MyStereotype"]</b>: Matches the elements on which the Stereotype "MyStereotype" is applied. You can use either the Stereotype's name or qualified name (MyProfile::MyPackage::MyStereotype). Note: always use the "~=" operator (Which means "contains"), because UML elements can have more than one applied stereotype.</li><li><b>:pseudo</b>: Matches the element on which the pseudo-selector "pseudo" is applied. Pseudo-selectors are typically used for dynamic events, and for filtering some non-semantic properties. In Papyrus, they are used for identifying more precisely the floating labels (When an element has more than one label: see the <a href="#Mask_Label">Mask Label</a> chapter below), and they are also used by the animation framework to specify events (See the Moka documentation)</li></ul><p>These selectors can be combined using one of the following combinators:<br/> </p><ul><li><b>Selector1 Selector2</b>: Descendant selector. Matches the elements which match Selector2 and are contained in an element matching Selector1<br/> </li><li><b>Selector1 &gt; Selector2</b>: Child selector. Matches the elements which match Selector2 and are directly contained in an element matching Selector2<br/> </li><li><b>Selector1 + Selector2</b>: Sibling selector. Matches the elements which match Selector2 and are immediately preceded by a Sibling element which match Selector1.<br/> </li><li><b>Selector1, Selector2</b>: Alternative selector. Matches elements matching either Selector1 or Selector2<br/></li></ul><p>A rule also contains a list of properties, in the form property:value; </p><p>In Papyrus, the selectors apply to semantic elements and properties (i.e. UML Elements), and the properties apply to the appearance properties (i.e. GMF Appearance properties). A few custom properties (Independent from the GMF Appearance model) are also available (See "Supported properties" below).<br/> </p><h3 id="Examples">Examples</h3><pre class="source-css">* {
-    fillColor: red;
-    fontColor: #0000FF;
-}
-</pre><p> </p><p>Meaning: all elements should be filled in red, and all texts should be blue (RGB Color #0000FF)<br/> </p><pre class="source-css">Class {
-    gradient: white vertical;
-    elementIcon:true;
-    shadow:true;
-    qualifiedNameDepth:full;
-}
-</pre><p> </p><p>Meaning: this style applies to all UML Classes. They will have a white and vertical gradient. The Element icon and the shadow will be displayed, as well as their fully qualified name.<br/> </p><pre class="source-css">ClassDiagram Class&gt;Property {
-    fontColor: red;
-}
-</pre><p> </p><p>Meaning: The properties directly contained in a Class, which is drawn on a ClassDiagram (Either as a root element of the diagram, or in a Package) will be displayed in red.<br/> </p><pre class="source-css">[appliedStereotypes~="Block"]{
-    bold:true;
-}
-
-/* Equivalent: qualified name */
-[appliedStereotypes~="SysML::Blocks::Block"]{
-    bold:true;
-}
-</pre><p>Meaning: The elements with the "Block" stereotype must be displayed in bold.</p><pre class="source-css">[appliedStereotypes~=Block][isEncapsulated=true]{
-    fontColor:red;
-}
-</pre><p>Meaning: The elements with the "Block" stereotype, and the stereotype property "isEncapsulated" set to true, must be displayed in red.</p><p>All these rules can be combined:</p><pre class="source-css">Class[appliedStereotypes~=Block][appliedStereotypes~=MyCustomStereotype][isEncapsulated=true][myCustomProperty=SomeValue][isAbstract=false]{
-	/* A class on which the stereotypes "Block" and "MyCustomStereotype" are applied, 
-	*  and on which the stereotype property "isEncapsulated" is set to true, 
-	*  the stereotype property "myCustomProperty" is set to "SomeValue", and 
-	*  the UML Property "isAbstract" is set to false */
-	
-	fillColor:red;
-}
-</pre><h2 id="With_the_Papyrus_tooling">With the Papyrus tooling</h2><p>Papyrus also provides a tool to generate a CSS Rule from an element displayed in the diagram. You need to create a stylesheet before you can edit it with the Create style tool, and it is recommended (Although not required) to associate this style sheet with your current diagram. </p><p>To use it, create an element and change its appearance via the "Appearance" tab of the properties view. Then, right click on the element, and select "Format", "Create a new style". The dialog box contains three tabs:<br/> </p><ul><li>Conditions: The conditions under which the style will be applied (Corresponds to the "CSS Selectors") </li><li>Properties: The graphical properties to export to the style sheet </li><li>Stylesheet: The style sheet to edit<br/></li></ul><p><img title="Create style dialog" alt="Create style dialog" border="0" src="Papyrus_CSS_Export_style.png"/><br/> </p><p>In the Stylesheet tab, select your stylesheet:<br/> </p><ul><li>If you have already associated the style sheet to your diagram, you can use the "Applies stylesheet" button. </li><li>Otherwise, you need to select "External stylesheet", and browse your workspace to retrieve the file. Note that in this case, as the edited stylesheet might not be applied to your diagram, you won't be able to see the changes in the current diagram.<br/></li></ul><p>In the conditions tab, there are three groups of options:<br/> </p><ul><li>The kind of element to which the style applies (e.g. the style will be applied to "Class" elements, or to any kind of elements). It can be restricted to a specific diagram. </li><li>You can add restrictions on the current value(s) of the element (e.g. the style will be applied to concrete classes). Only primitive type and enumerated attributes are supported here. </li><li>The style name is used to apply a style manually.<br/></li></ul><p>The properties tab contains all the graphical properties that can be applied to the selected object. It is used to choose the graphical properties to apply on the objects matching the conditions.<br/></p><h1 id="Supported_properties">Supported properties</h1><h2 id="Selector_properties">Selector properties</h2><p>Selector properties are semantic element properties. They can be used with one of the following syntaxes:</p><p><b>[isAbstract=true]</b></p><p><b>Class[isAbstract=true]</b></p><p>The supported semantic element properties are:</p><ul><li>Strings: <b>[name=MyName]</b>, <b>[name="My name"]</b> (Quotes are required for complex Strings)<br/></li><li>Integers: <b>[size="12"]</b> (Quotes are required) <br/></li><li>Booleans: <b>[isAbstract=true]</b> (Quotes are optional)<br/></li><li>Enumerations: <b>[visibility=visible]</b> (Quotes are optional)<br/></li><li>References to named elements (UML NamedElement or Ecore ENamedElement): <b>[type=String]</b><br/></li></ul><p>The supported properties are the semantic properties of the UML element (e.g. isAbstract, name, type, ...), as well as the semantic properties of the stereotypes applied to the UML element (e.g. isEncapsulated for a SysML Block)</p><p>Some selectors can also be used to represent some specific parts of an element. For example, it is possible to hide a specific compartment:</p><pre class="source-css">Class &gt; Compartment[kind="attribute"] {
-    visible:false;
-}
-
-Class &gt; Compartment[kind="symbol"] {
-    visible:true;
-}
-
-Compartment[kind="structure"]{
-    collapsed:true;
-}
-
-Port &gt; Label {
-    visible: false;
-}
-</pre><h2 id="Style_properties">Style properties</h2><p>Style properties are graphical properties supported by the display. Note that some graphical elements may not support some specific properties (Either because they shouldn't support them, or because they are not yet implemented). For example, a UML::Class will not support the <i>italic</i> property, because in UML, <i>italic</i> means <i>abstract</i>.</p><p>The CSS Supports all GMF Notation properties, as well as a few Papyrus-specific properties. This chapter will only list all the Papyrus-specific properties.</p><p>The simplest way to discover new style properties is to use the Appearance tab of the Properties view in Papyrus. When hovering one of the appearance properties, the tooltip indicates the name of the corresponding CSS property</p><p><img title="CSS Property in tooltip" alt="CSS Property in tooltip" border="0" src="Papyrus_CSS_tooltip.png"/><br/></p><p>This table lists the most common properties:</p><table class="wikitable"><tr><th>Property&nbsp;name</th><th>Value&nbsp;type</th><th>Initial&nbsp;Value</th><th>Applies&nbsp;to</th><th>Comment</th></tr><tr><td>fillColor</td><td>Color</td><td>white</td><td>Shapes</td><td>In the default "Papyrus Theme", the fill color depends on the type of element. The used colors are #C3D1D5 (Light blue, Default), #C3D7DD (Lighter blue, Class), #FFFFCC (Yellow, Comment), #C8FFE6 (Teal, Constraints)</td></tr><tr><td>transparency</td><td>integer</td><td>0</td><td>Shapes</td><td>Value is a percentage: values in the range (0, 100) are supported. Transparency works only if the gradient is activated: <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=419320">Bug 419320</a></td></tr><tr><td>gradient</td><td>[Color Color [ horizontal | vertical ] | none]</td><td>none</td><td>Shapes</td><td>Examples: "white blue horizontal" or "none"</td></tr><tr><td>fontColor</td><td>Color</td><td>black</td><td>Shapes, floating labels</td><td>Comments support HTML syntax. Most style-properties have no effect on comments</td></tr><tr><td>fontName</td><td>String</td><td>"Segoe UI"</td><td>Shapes, floating labels</td><td>Most fonts are platform-specific. The list of available Fonts can be found in the "Appearance" tab of the properties view</td></tr><tr><td>fontSize</td><td>integer</td><td>9</td><td>Shapes, floating labels</td></tr><tr><td>bold</td><td>boolean</td><td>false</td><td>Shapes, floating labels</td></tr><tr><td>italic</td><td>boolean</td><td>false</td><td>Shapes, floating labels</td><td>In UML, "italic" means "isAbstract=true". This property is disabled for all elements which can be abstract (e.g. Class)</td></tr><tr><td>underline</td><td>boolean</td><td>false</td><td>Shapes, floating labels</td><td>In UML, "underline" means "isStatic=true". This property is disabled for all elements which can be static (e.g. Property)</td></tr><tr><td>strikeThrough</td><td>boolean</td><td>false</td><td>Shapes, floating labels</td></tr><tr><td>visible</td><td>boolean</td><td>true</td><td>All elements</td><td>Although this property will work for any diagram elements, it is probably a bad idea to use it with anything else than a Compartment or a Label </td></tr><tr><td>collapsed</td><td>boolean</td><td>false</td><td>Compartments</td></tr><tr><td>showTitle</td><td>boolean</td><td>false</td><td>Compartments</td></tr><tr><td>lineColor</td><td>Color</td><td>black</td><td>Shapes, Connectors</td></tr><tr><td>lineWidth</td><td>integer</td><td>-1</td><td>Shapes, Connectors</td><td>-1 means "default", and typically corresponds to 1px</td></tr><tr><td>routing</td><td>[Manual | Rectilinear | Tree]</td><td>Manual</td><td>Connectors</td><td>The value is case-sensitive: don't forget the initial Capital</td></tr><tr><td>roundedBendpointsRadius</td><td>integer</td><td>0</td><td>Connectors</td><td>Applies to connectors with routingStyle = Rectilinear or Tree</td></tr><tr><td>smoothness</td><td>[None | Normal | Less | More]</td><td>None</td><td>Connectors</td></tr><tr><td>avoidObstructions</td><td>boolean</td><td>false</td><td>Connectors</td></tr><tr><td>closestDistance</td><td>boolean</td><td>false</td><td>Connectors</td></tr><tr><td>jumpLinkStatus</td><td>[None | All | Below | Above]</td><td>None</td><td>Connectors</td><td>It is not recommended to use jump links via CSS, as it gives strange results for overlapping connectors</td></tr><tr><td>jumpLinkType</td><td>[Semicircle | Square | Chamfered]</td><td>Semicircle</td><td>Connectors</td></tr><tr><td>jumpLinkReverse</td><td>boolean</td><td>false</td><td>Connectors</td></tr><tr><td>leftMarginLabel</td><td>integer</td><td>0</td><td>Labels</td><td>Define the left margin of the label in pixel. This is the space between the text box and his container</td></tr><tr><td>topMarginLabel</td><td>integer</td><td>0</td><td>Labels</td><td>Define the top margin of the label in pixel. This is the space between the text box and his container</td></tr><tr><td>rightMarginLabel</td><td>integer</td><td>0</td><td>Labels</td><td>Define the right margin of the label in pixel. This is the space between the text box and his container</td></tr><tr><td>bottomMarginLabel</td><td>integer</td><td>0</td><td>Labels</td><td>Define the bottom margin of the label in pixel. This is the space between the text box and his container</td></tr><tr></tr></table><p>The following properties can be used to bypass the standard UML notation. They can typically be used for pure DSML notations:</p><table class="wikitable"><tr><th>Property&nbsp;name</th><th>Value&nbsp;type</th><th>Initial&nbsp;Value</th><th>Applies&nbsp;to</th><th>Comment</th></tr><tr><td>displayBorder</td><td>boolean</td><td>true</td><td>Shapes</td><td>If set to false, the borders of the Shape will be hidden.</td></tr><tr><td>displayName</td><td>boolean</td><td>true</td><td>Shapes</td><td>If set to false, the name of the Shape will be hidden</td></tr><tr><td>displayTag</td><td>boolean</td><td>true</td><td>Shapes, connectors</td><td>If set to false, the tags (e.g. « component ») of the element will be hidden </td></tr><tr><td>maintainSymbolRatio</td><td>boolean</td><td>true</td><td>Shapes</td><td>If the shape is represented with a Symbol, specifies whether the ratio should be maintained or not. If the Symbol is displayed in a compartment, it is usually a good idea to maintain the ratio. If the symbol is the only representation (e.g. when the name, border and compartments are hidden), it is recommended to not maintain the ratio</td></tr><tr><td>elementIcon</td><td>boolean</td><td>false</td><td>Shapes, floating labels</td><td>Whether the icon should be displayed next to the label of the element. In the default "Papyrus Theme", the icon is displayed by default</td></tr><tr><td>shadow</td><td>boolean</td><td>false</td><td>Shapes</td><td>Display a shadow under the shape</td></tr><tr><td>qualifiedNameDepth</td><td>[full | none | integer]</td><td>none</td><td>Shapes, floating labels</td><td>The depth of the qualified name to display. Applies to UML::NamedElement</td></tr><tr><td>lineStyle</td><td>[solid | dashed | dotted | hidden | double]</td><td>N/A</td><td>Connectors</td><td>In UML, the line type depends on the semantic element (e.g. solid line for associations, dashed line for dependencies...). In most cases, you should avoid using this property, as this would change the well-known UML notation. However, it can be useful for creating pure DSML, where the UML notation should be hidden.</td></tr><tr><td>lineDashLength</td><td>integer</td><td>N/A</td><td>Connectors</td><td>When the lineStyle is set to "Dash", specifies the length of the dash</td></tr><tr><td>lineDashGap</td><td>integer</td><td>N/A</td><td>Connectors</td><td>When the lineStyle is set to "Dash", specifies the gap between the dashes</td></tr><tr><td>targetDecoration</td><td>[none]</td><td>N/A</td><td>Connectors</td><td>If "targetDecoration" is set to None, hides the target decoration of the Connector (e.g. the arrow)</td></tr><tr><td>sourceDecoration</td><td>[none]</td><td>N/A</td><td>Connectors</td><td>If "sourceDecoration" is set to None, hides the source decoration of the Connector (e.g. the arrow)</td></tr><tr><td>maskLabel</td><td>string[]</td><td>N/A</td><td>Labels, floating labels</td><td>This property can be used to configure the display of complex labels (e.g. properties). See examples in the <a href="#Mask_Label">Mask Label</a> chapter below</td></tr><tr><td>svgFile</td><td>path</td><td>N/A</td><td>Shapes</td><td>The path to an SVG file, which should be used as a symbol for the element. It will be displayed in the "symbol" compartment of the shape</td></tr><tr><td>followSVGSymbol</td><td>boolean</td><td>false</td><td>Shapes</td><td>If the SVG file has a path with the ID "papyrusPath", this path will be used to connect edges</td></tr><tr><td>svgCssFile</td><td>path</td><td>N/A</td><td>Shapes</td><td>The path to a CSS file which will be applied to the SVG symbol (If an SVG symbol is used). Can be used to dynamically change the appearance of the SVG image (e.g. change color, ...)</td></tr><tr><td>svgCssClass</td><td>string</td><td>N/A</td><td>Shapes</td><td>The CSS Class to be applied at the root of the SVG document (If an SVG symbol is used). Can be used to dynamically change the appearance of the SVG image</td></tr><tr><td>textAlignment</td><td>string</td><td>left/center</td><td>Floating labels</td><td>Set the text alignment of the label. (left, center, right)</td></tr><tr><td>labelConstrained</td><td>boolean</td><td>false</td><td>Labels of Port</td><td>Constraint the label, it will be automatic positioned at the proper position according to the position of the Port on its parents. Text alignment will be forced according to the position of its parent.The label can't be moved.</td></tr><tr><td>labelOffsetX</td><td>integer</td><td>0</td><td>Labels of Port</td><td>Set the offset on X when label is constrained</td></tr><tr><td>labelOffsetY</td><td>integer</td><td>0</td><td>Labels of Port</td><td>Set the offset on Y when label is constrained</td></tr><tr></tr></table><h3 id="Value_types">Value types</h3><p><b>String:</b> Simple (Ascii) strings can be written without quotes: <i>property:value</i>. Complex strings must be written with quotes: <i>property:&nbsp;"my value"</i>; <i>path:&nbsp;"platform:/plugin/my.example.plugin/resources/myFile.ext";</i><br/>
-<b>Integer:</b> Quotes are optional: <i>size: 18</i><br/>
-<b>Boolean:</b> Quotes are optional: <i>bold: true</i><br/>
-<b>Color:</b> There are three ways for using colors. The simplest one is to use the list of predefined <a href="http://www.w3.org/TR/css3-color/#svg-color">CSS Color names</a>: <i>fillColor: teal</i>. It is also possible to use the Hexadecimal RGB notation: <i>fillColor: #008080</i>. The last option is to use the rgb() function: <i>fillColor: rgb(0, 128, 128)</i></p><h3 id="Mask_Label">Mask Label</h3><p>Some labels can be configured with a "Mask": in the appearance tab of the properties view, some elements have a list of checkboxes which are used to select which parts of the label should be displayed (e.g. visibility, type, name, multiplicity...)</p><p>The CSS property "maskLabel" has the same purpose. The value of this property is the list of labels to display. For example, if you want to display only the name of the Ports, write:</p><pre class="source-css">/* Broken in Papyrus 1.0.0 (See Erratum below) */
-Port &gt; Label { 
-	maskLabel: name;
-}
-</pre><pre class="source-css">/* Works in Papyrus 1.0.0 (See Erratum below) */
-Port { 
-	maskLabel: name;
-}
-</pre><p>If you want to display the name, type and multiplicity of a Property, write:</p><pre class="source-css">Property {
-	maskLabel: name type multiplicity;
-}
-</pre><p>Note that the order of the values doesn't matter. It is also important to understand the difference between the port and the property: the rule to match the port's label is different than the one for the property, because the Port is represented with two graphical elements: a square for the Port, and a floating text for its label. The Property is represented with a single text element. It is especially important for Associations, as Association have six different labels: one label for the Association itself, two labels for each association end (Source and target), and one label for the Association's stereotypes. The rules for configuring associations thus needs to be more precise. </p><p><font color="red">Erratum:</font> Due to <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=437186">Bug 437186</a>, in Papyrus 1.0.0 / Luna, the rule <b>Port &gt; Label</b> doesn't work for maskLabel. You need to use <b>Port</b>. In Papyrus 1.0.1, both rules should be valid. The syntax <b>Association &gt; Label</b> is still valid for Associations, because we still need to distinguish the different labels (Whereas the Port has a single Label and doesn't require the distinction)</p><p>For example:</p><pre class="source-css">Association &gt; Label:sourceMultiplicity {
-	visible:false;
-}
-
-Association &gt; Label:targetMultiplicity {
-	visible:false;
-}
-
-Association &gt; Label:sourceRole {
-	maskLabel: name multiplicity;
-}
-
-Association &gt; Label:targetRole {
-	maskLabel: name multiplicity;
-}
-
-Association &gt; Label:name {
-	visible:false;
-}
-</pre><p>These rules result in:</p><p><img title="Association labels result" alt="Association labels result" border="0" src="Papyrus_CSS_maskLabel_association.png"/><br/></p><p>The list of accepted values depends on the element. To find the list of values, select an element in a Diagram (e.g. a Property), go to the Appearance tab of the properties view, and find the list of checkboxes named "Label customization". Hover the checkboxes, and look at the tooltip to find the value:</p><p><img title="Mask label" alt="Mask label" border="0" src="Papyrus_CSS_maskLabel.png"/><br/></p><p>To obtain the result shown in this screenshot, write:</p><pre class="source-css">Property {
-	maskLabel: name type defaultValue;
-}
-</pre><p>Which results in:</p><p><img title="Mask label result" alt="Mask label result" border="0" src="Papyrus_CSS_maskLabel_result.png"/><br/></p><h1 id="Manipulating_styles">Manipulating styles</h1><p>The computed styles will be applied automatically. For example, if your stylesheet tells that all your abstract classes must be red, the classes color will change automatically according to the value of their "isAbstract" property. </p><p>In some other cases, however, you may want to specify manually the style that should be applied to your objects. For this case, you can use the "Applied styles" property in the "Style" tab of the properties view.<br/> </p><pre class="source-css">.myOwnStyle {
-    fillColor: #A6C198;
-    gradient:white horizontal;
-}
-</pre><p> </p><p><img title="Result" alt="Result" border="0" src="Papyrus_CSS_CustomStyle.png"/><br/> </p><p>Once a style is applied on an object, the object will be refreshed each time the style definition changes. For example, changing the style "myOwnStyle" to the following declaration:<br/> </p><pre class="source-css">.myOwnStyle {
-     fillColor: #E3A49C;
-     gradient: #FFFFFF horizontal;
-}
-</pre><p> </p><p>All the green classes will become red.<br/></p><h1 id="Limitations_and_issues">Limitations and issues</h1><p>There are currently a few identified limitations to the Stylesheet framework, as well as a few minor bugs:<br/> </p><h2 id="Selectors">Selectors</h2><p>Currently, some complex selectors are not supported in the Papyrus stylesheets. Especially, the following are not supported yet:<br/> </p><h3 id="Selector_inheritance">Selector inheritance</h3><p>It is not possible to apply a style to all descendant of a given Metaclass. For example, a Behavior will not inherit styles from a Class, although a Behavior actually is a Class.<br/>  </p><h3 id="Events_support">Events support</h3><p>Selectors based on user events are not yet implemented. For example, the CSS specification defines the&nbsp;:hover pseudo-selector to represent an element hovered by the mouse, which is not yet supported in Papyrus.<br/> </p><h2 id="Known_bugs">Known bugs</h2><p>The following bugs have been identified:<br/> </p><ul><li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=372322">Bug 372322</a>: [Diagram - Refresh] The refresh action is not correctly binded to F5<br/> </li><li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=386574">Bug 386574</a>: [CSS - Refresh]  Only the active diagram is refresh when the stylesheets change<br/></li><li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=436665">Bug 436665</a>: [CSS] Refresh issue when an element is moved to a different owner</li></ul><p><a href="/wiki/Category:Papyrus" title="Category:Papyrus">Category:Papyrus</a></p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.mediawiki
index edb382c5b93..d0c3830ecda 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.mediawiki
@@ -22,11 +22,11 @@ The CSS Stylesheet support is now shipped in the base installation of Papyrus. I
 
 Without the CSS component, or with the "Black & White" CSS Theme, your diagrams look like: 
 
-[[Image:Papyrus CSS no theme.png|Papyrus diagram without CSS Theme]]<br>
+[[Image:images/Papyrus_CSS_no_theme.png|Papyrus diagram without CSS Theme]]<br>
 
 With the default "Papyrus" CSS Theme, your diagrams look like:
 
-[[Image:Papyrus CSS theme.png|Papyrus Diagram with CSS Theme]]<br>
+[[Image:images/Papyrus_CSS_theme.png|Papyrus Diagram with CSS Theme]]<br>
 
 Note: If you opened a diagram which has been created without the CSS Support, it may still have a user-defined appearance, e.g. without Element icons. This might or might not be a problem, as this may conflict with the CSS Theme. You can reset all custom appearances by pressing the "Default style" button in the Style tab of the Diagram's properties view.
 
@@ -36,7 +36,7 @@ To define a custom style, the first step is to create a Stylesheet. The creation
 You can define a particular style for a diagram.
 # Select a diagram
 # Go to the Style tab of the properties view
-# Add a new "Diagram style sheet". There isn't currently any style sheet available from the diagram, so you need to create a new "Stylesheet reference".<br/>[[Image:Papyrus CSS Import stylesheet.png|Import stylesheet in Papyrus]] 
+# Add a new "Diagram style sheet". There isn't currently any style sheet available from the diagram, so you need to create a new "Stylesheet reference".<br/>[[Image:images/Papyrus_CSS_Import_stylesheet.png|Import stylesheet in Papyrus]] 
 # Browse your workspace to find your css file, and press OK. Your stylesheet is now associated to your diagram.
 == Model StyleSheet ==
 Similarily to "Diagram Stylesheet" you can define a particular style for a Model.
@@ -49,7 +49,7 @@ You can associate to a project specific stylesheets.
 # Select a project in "Project Explorer" view
 # Open project preference properties: "Right click > properties"
 # Go to CSS stylesheets page: "Papyrus > Style sheets"
-# Add a new "Project style sheet". There isn't currently any style sheet available from project, so you need to create a new "Stylesheet reference".<br/>[[Image:Papyrus_CSS_project.png|Style sheets project properties in Papyrus]]
+# Add a new "Project style sheet". There isn't currently any style sheet available from project, so you need to create a new "Stylesheet reference".<br/>[[Image:images/Papyrus_CSS_project.png|Style sheets project properties in Papyrus]]
 # Browse your workspace to find your css file, and press OK. Now, your stylesheet is associated with the project.
 = Deploying a CSS Theme  =
 
@@ -64,7 +64,7 @@ The Theme can be modified from the Papyrus preferences page "CSS Theme". Only on
 == In workspace preference ==
 You can define theme in workspace preferences. A theme is defined by style sheets.
 # Go to the Papyrus preference: "Window > Preferences > Papyrus > CSS Theme"
-# Add a new theme. There are currently two existing themes: "Papyrus Theme" and "Black & White".<br/>[[Image:Papyrus_CSS_theme_creation.png|Creation of theme in Papyrus]]
+# Add a new theme. There are currently two existing themes: "Papyrus Theme" and "Black & White".<br/>[[Image:images/Papyrus_CSS_theme_creation.png|Creation of theme in Papyrus]]
 # Write a name for this new theme
 # (optional) Choose an icon
 # Associate one or more style sheets with this theme
@@ -168,7 +168,7 @@ To use it, create an element and change its appearance via the "Appearance" tab
 *Properties: The graphical properties to export to the style sheet 
 *Stylesheet: The style sheet to edit<br>
 
-[[Image:Papyrus CSS Export style.png|Create style dialog]]<br> 
+[[Image:images/Papyrus_CSS_Export_style.png|Create style dialog]]<br> 
 
 In the Stylesheet tab, select your stylesheet:<br> 
 
@@ -229,7 +229,7 @@ The CSS Supports all GMF Notation properties, as well as a few Papyrus-specific
 
 The simplest way to discover new style properties is to use the Appearance tab of the Properties view in Papyrus. When hovering one of the appearance properties, the tooltip indicates the name of the corresponding CSS property
 
-[[Image:Papyrus CSS tooltip.png|CSS Property in tooltip]]<br>
+[[Image:images/Papyrus_CSS_tooltip.png|CSS Property in tooltip]]<br>
 
 This table lists the most common properties:
 
@@ -401,12 +401,12 @@ Association > Label:name {
 
 These rules result in:
 
-[[Image:Papyrus_CSS_maskLabel_association.png|Association labels result]]<br>
+[[Image:images/Papyrus_CSS_maskLabel_association.png|Association labels result]]<br>
 
 
 The list of accepted values depends on the element. To find the list of values, select an element in a Diagram (e.g. a Property), go to the Appearance tab of the properties view, and find the list of checkboxes named "Label customization". Hover the checkboxes, and look at the tooltip to find the value:
 
-[[Image:Papyrus_CSS_maskLabel.png|Mask label]]<br>
+[[Image:images/Papyrus_CSS_maskLabel.png|Mask label]]<br>
 
 To obtain the result shown in this screenshot, write:
 
@@ -416,7 +416,7 @@ To obtain the result shown in this screenshot, write:
 
 Which results in:
 
-[[Image:Papyrus_CSS_maskLabel_result.png|Mask label result]]<br>
+[[Image:images/Papyrus_CSS_maskLabel_result.png|Mask label result]]<br>
 
 = Manipulating styles  =
 
@@ -429,7 +429,7 @@ In some other cases, however, you may want to specify manually the style that sh
     gradient:white horizontal;
 }</source> 
 
-[[Image:Papyrus CSS CustomStyle.png|Result]]<br> 
+[[Image:images/Papyrus_CSS_CustomStyle.png|Result]]<br> 
 
 Once a style is applied on an object, the object will be refreshed each time the style definition changes. For example, changing the style "myOwnStyle" to the following declaration:<br> 
 
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_customStyle.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_customStyle.png
index fd0122f970e..fd0122f970e 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_customStyle.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_customStyle.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_default_style.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_default_style.png
index 80df20f3ffd..80df20f3ffd 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_default_style.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_default_style.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_export_style.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_export_style.png
index 6a930cf737a..6a930cf737a 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_export_style.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_export_style.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_import_stylesheet.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_import_stylesheet.png
index 4d34280c2d6..4d34280c2d6 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_import_stylesheet.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_import_stylesheet.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_installation.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_installation.png
index 6ec9164e4d7..6ec9164e4d7 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_installation.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_installation.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_maskLabel.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_maskLabel.png
index 5cbadf4a7f0..5cbadf4a7f0 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_maskLabel.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_maskLabel.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_maskLabel_association.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_maskLabel_association.png
index c7172a79f5a..c7172a79f5a 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_maskLabel_association.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_maskLabel_association.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_maskLabel_result.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_maskLabel_result.png
index ad3c7006e6a..ad3c7006e6a 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_maskLabel_result.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_maskLabel_result.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_no_theme.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_no_theme.png
index e890a228d35..e890a228d35 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_no_theme.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_no_theme.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_project.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_project.png
index cf1600abd10..cf1600abd10 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_project.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_project.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_theme.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_theme.png
index fe6558c5d11..fe6558c5d11 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_theme.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_theme.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_theme_creation.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_theme_creation.png
index b71d0a2b28a..b71d0a2b28a 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_theme_creation.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_theme_creation.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_tooltip.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_tooltip.png
index 917fa97468c..917fa97468c 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_tooltip.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/images/Papyrus_CSS_tooltip.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.project
new file mode 100644
index 00000000000..30d8f853e0e
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.infra.nattable.doc</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

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

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

+	</natures>

+</projectDescription>

diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..de42a025059
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0

+Bundle-Vendor: Eclipse Modeling Project

+Require-Bundle: org.eclipse.help;bundle-version="3.6.0",

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

+Bundle-Version: 1.1.0.qualifier

+Bundle-Name: Papyrus Table Documentation

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.doc;singleton:=true

+Bundle-Description: %pluginDescription

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/about.html b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/about.html
index 598b3684879..598b3684879 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/about.html
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/about.html
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/build.properties b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/build.properties
new file mode 100644
index 00000000000..a886e4fd4a0
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/build.properties
@@ -0,0 +1,7 @@
+bin.includes = META-INF/,\

+               about.html,\

+               site/mediawiki/,\

+               plugin.xml,\

+               target/generated-eclipse-help/** 

+src.includes = about.html,\

+				site/mediawiki/

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/plugin.properties
index 37734d357e4..37734d357e4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/plugin.properties
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/plugin.xml
new file mode 100644
index 00000000000..7797b391971
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/plugin.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="target/generated-eclipse-help/nattable-main-toc.xml"
+            primary="false">
+      </toc>
+      <toc
+            file="target/generated-eclipse-help/tablemetamodeldocumentation-toc.xml"
+            primary="false">
+      </toc>
+   </extension>
+
+</plugin>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/pom.xml
new file mode 100644
index 00000000000..31aee60199a
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../../../releng/top-pom-main.xml</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.doc</artifactId>
+	<groupId>org.eclipse.papyrus</groupId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>site/mediawiki</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice>
+					<title>${help.documentTitle}</title-->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls>
+						<param>styles/main.css</param>
+					</stylesheetUrls-->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/site/mediawiki/nattable-main-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/site/mediawiki/nattable-main-toc.xml
new file mode 100644
index 00000000000..fd52ecd2d1e
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/site/mediawiki/nattable-main-toc.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="Nattable" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
+   <topic href="target/generated-eclipse-help/tablemetamodeldocumentation.html" label="Nattable">
+      <link toc="target/generated-eclipse-help/tablemetamodeldocumentation-toc.xml"/>
+      <anchor id="nattable"/>
+   </topic>	
+</toc>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/tablemetamodeldocumentation.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/site/mediawiki/tablemetamodeldocumentation.mediawiki
index 1c42a44865f..385eddec6a4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/tablemetamodeldocumentation.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/site/mediawiki/tablemetamodeldocumentation.mediawiki
@@ -1,98 +1,99 @@
-=Metamodel Description= 

-==CellEditorDeclaration==

-This enumeration allows to describe the way to declare the cell editor in the table : 

-<li>by column </li>

-<li>by row </li>

-<li>by cell </li>

-

-==AxisIndexStyle==

-This enumeration allows to describe how to display the index of the axis : 

-<li>Alphabetic : A, B, C ... Y, Z, AA, AB, ... </li>

-<li>Numeric : 1, 2, 3 </li>

-

-==TableNamedElement==

-abstract object used when an element need to have a name and a description

-

-==TableConfiguration==

-this object is used to configure the table

-

-===Fields=== 

- <li>type : the type of the table</li>

- <li>iconPath : the icon associated to the table</li>

- <li>cellEditorDeclaration : describe how the cell editor will be declared in the table : They can be declared by row, by column or by cells</li>

- <li>rowAxisProviders : the possible axis providers used for rows for this configuration</li>

- <li>columnAxisProviders : the possible axis providers used for the columns for this configuration</li>

- <li>defaultRowAxisProvider : the axis provider used for row just after the table creation </li>

- <li>defaultColumnAxisProvider : the axis provider used for column just after the table creation </li>

- 

- 

- ????rowAxisProviderConfiguration -> a la bonne place ? -> peut-�tre sur un (local)AbstractAxisProvider?

- ????columnAxisProviderConfiguration -> � la bonne place? -> peut-�tre sur un (local)AbstractAxisProvider?

- 

- ===Constraints===

- the field defaultRowAxisProvider must references an axis owned by rowAxisProviders

- the field defaultColumnAxisProvider must references an axis owned by columnAxisProviders

-  

-

-==Table==

-This object represents the model of the table used in Papyrus

-===Fields===

-<li>invertAxis : indicates if the rows and the columns are inverted</li>

-<li>tableConfiguration : the configuration used for the table</li>

-<li>currentColumnAxisProvider : the current axis provider used for columns</li>

-<li>currentRowAxisProvider : the current axis provider used for rows</li>

-<li>rowAxisProvidersHistory : an history of the axis provider used for rows</li>

-<li>columnAxisProvidersHistory : an history of the axis provider used for columns</li>

- 

-===Constraints===

-<li>the field currentRowAxisProvider must references an axis owned by rowAxisProviderHistory</li>

-<li>The field currentColumnAxisProvider must references one of axis provider referenced by columnAxisProviderHistory </li>

-<li>the field rowAxisProviderHistory will contains only 1 axisProvider just after the table creation even if the config provides several row axis providers in rowAxisProviders</li>

-<li>the field columnAxisProviderHistory will contains only 1 axisProvider just after the table creation even if the config provides several column axis providers in columnAxisProviders</li>

-<li> the axis providers owned by columnAxisProviderHistory and rowAxisProviderHistory contains only the axis provider already used by the user. </li>

-

-

-??? localTableConfiguration : must be here?

-

-??? add header in the name of the label configuration????

-==AbstractLabelConfiguration==

-This object allows to store the configuration for the label provider.

-===Fields===

-<li>labelProviderContext : the context to use to find the label provider to use</li>

-

-

-==ObjectLabelProviderConfiguration==

-This label provider can be used for all element displayed in a table

-===Fields===

-<li>displayIcon : indicates if we want display the icon of the object in the header</li>

-<li>displayLabel : indicates if we want display the label of the object in the header</li>

-

-==FeatureLabelProviderConfiguration==

-The label provider used for object representing properties/features of others objects

-===Fields===

-<li>displayIsDerived: indicates if we want display the "/" for the derived feature</li>

-<li>displayType: indicates if we want display the type of the feature</li>

-<li>displayMultiplicity: : indicates if we want display the multiplicity of the feature</li>

-<li>displayName:indicates if the want display the name of the feature</li>

-

-

-==AbstractAxisProvider==

-This class stores in an ordered list the IAxis displayed in rows or in columns

-

-

-=Table Refresh=

- There are 2 kinds of refresh in the tables :

-#a refresh of the appearance of the table <br> This refresh is done after each command executed in the command stack.

-#a refresh of the rows and columns of the table <br> This refresh needs to recalculate the rows and the columns to display before to refresh the table. This refresh is called thanks to listen which listen specific modifications on the model :

-##add/remove/move/... IAxis inside the model of the table, if the table is not synchronized

-##add/remove/move/... elements in the display feature if the table is synchronized

-

-=Refresh Rows/Columns to display=

-A table is managed by 2 CompositeAxisManager one for Rows and one for Columns. These managers refers one or several Axis Manager, identified in the model by an id (AxisManager#managerId). The CompositeAxisManager is used to update the list of the element to display as rows/columns. Here, we need to distinguish 2 kinds of AxisManager

-#the axis manager which provides a contents stored in the model of the table <br> the user can reorder and 'mix'/reoder the elements provided by this kind of AxisManager. <br> The CompositeAxisManager reads the table model to update the list of the elements to display.

-#the axis manager which provides a contents derived of the (UML) model. These one are dynamic, because they doesn't contribute to the table model. <br>the elements can't be mixed with the elements managed by the non-dynamic AxisManager, but they can be reorder 'inside' the Axismanager <br> in case of dynamic and non-dynamic AxisManager used on the same axis, the dynamic will always be displayed at the end of the axis.

-

-The distinction between them is done by a boolean 'isDynamic' stored in the AxisManager class

-

-

-

+=Metamodel Description=
+ 
+==CellEditorDeclaration==
+This enumeration allows to describe the way to declare the cell editor in the table : 
+<li>by column </li>
+<li>by row </li>
+<li>by cell </li>
+
+==AxisIndexStyle==
+This enumeration allows to describe how to display the index of the axis : 
+<li>Alphabetic : A, B, C ... Y, Z, AA, AB, ... </li>
+<li>Numeric : 1, 2, 3 </li>
+
+==TableNamedElement==
+abstract object used when an element need to have a name and a description
+
+==TableConfiguration==
+this object is used to configure the table
+
+===Fields=== 
+ <li>type : the type of the table</li>
+ <li>iconPath : the icon associated to the table</li>
+ <li>cellEditorDeclaration : describe how the cell editor will be declared in the table : They can be declared by row, by column or by cells</li>
+ <li>rowAxisProviders : the possible axis providers used for rows for this configuration</li>
+ <li>columnAxisProviders : the possible axis providers used for the columns for this configuration</li>
+ <li>defaultRowAxisProvider : the axis provider used for row just after the table creation </li>
+ <li>defaultColumnAxisProvider : the axis provider used for column just after the table creation </li>
+ 
+ 
+ ????rowAxisProviderConfiguration -> a la bonne place ? -> peut-�tre sur un (local)AbstractAxisProvider?
+ ????columnAxisProviderConfiguration -> � la bonne place? -> peut-�tre sur un (local)AbstractAxisProvider?
+ 
+ ===Constraints===
+ the field defaultRowAxisProvider must references an axis owned by rowAxisProviders
+ the field defaultColumnAxisProvider must references an axis owned by columnAxisProviders
+  
+
+==Table==
+This object represents the model of the table used in Papyrus
+===Fields===
+<li>invertAxis : indicates if the rows and the columns are inverted</li>
+<li>tableConfiguration : the configuration used for the table</li>
+<li>currentColumnAxisProvider : the current axis provider used for columns</li>
+<li>currentRowAxisProvider : the current axis provider used for rows</li>
+<li>rowAxisProvidersHistory : an history of the axis provider used for rows</li>
+<li>columnAxisProvidersHistory : an history of the axis provider used for columns</li>
+ 
+===Constraints===
+<li>the field currentRowAxisProvider must references an axis owned by rowAxisProviderHistory</li>
+<li>The field currentColumnAxisProvider must references one of axis provider referenced by columnAxisProviderHistory </li>
+<li>the field rowAxisProviderHistory will contains only 1 axisProvider just after the table creation even if the config provides several row axis providers in rowAxisProviders</li>
+<li>the field columnAxisProviderHistory will contains only 1 axisProvider just after the table creation even if the config provides several column axis providers in columnAxisProviders</li>
+<li> the axis providers owned by columnAxisProviderHistory and rowAxisProviderHistory contains only the axis provider already used by the user. </li>
+
+
+??? localTableConfiguration : must be here?
+
+??? add header in the name of the label configuration????
+==AbstractLabelConfiguration==
+This object allows to store the configuration for the label provider.
+===Fields===
+<li>labelProviderContext : the context to use to find the label provider to use</li>
+
+
+==ObjectLabelProviderConfiguration==
+This label provider can be used for all element displayed in a table
+===Fields===
+<li>displayIcon : indicates if we want display the icon of the object in the header</li>
+<li>displayLabel : indicates if we want display the label of the object in the header</li>
+
+==FeatureLabelProviderConfiguration==
+The label provider used for object representing properties/features of others objects
+===Fields===
+<li>displayIsDerived: indicates if we want display the "/" for the derived feature</li>
+<li>displayType: indicates if we want display the type of the feature</li>
+<li>displayMultiplicity: : indicates if we want display the multiplicity of the feature</li>
+<li>displayName:indicates if the want display the name of the feature</li>
+
+
+==AbstractAxisProvider==
+This class stores in an ordered list the IAxis displayed in rows or in columns
+
+
+=Table Refresh=
+ There are 2 kinds of refresh in the tables :
+#a refresh of the appearance of the table <br> This refresh is done after each command executed in the command stack.
+#a refresh of the rows and columns of the table <br> This refresh needs to recalculate the rows and the columns to display before to refresh the table. This refresh is called thanks to listen which listen specific modifications on the model :
+##add/remove/move/... IAxis inside the model of the table, if the table is not synchronized
+##add/remove/move/... elements in the display feature if the table is synchronized
+
+=Refresh Rows/Columns to display=
+A table is managed by 2 CompositeAxisManager one for Rows and one for Columns. These managers refers one or several Axis Manager, identified in the model by an id (AxisManager#managerId). The CompositeAxisManager is used to update the list of the element to display as rows/columns. Here, we need to distinguish 2 kinds of AxisManager
+#the axis manager which provides a contents stored in the model of the table <br> the user can reorder and 'mix'/reoder the elements provided by this kind of AxisManager. <br> The CompositeAxisManager reads the table model to update the list of the elements to display.
+#the axis manager which provides a contents derived of the (UML) model. These one are dynamic, because they doesn't contribute to the table model. <br>the elements can't be mixed with the elements managed by the non-dynamic AxisManager, but they can be reorder 'inside' the Axismanager <br> in case of dynamic and non-dynamic AxisManager used on the same axis, the dynamic will always be displayed at the end of the axis.
+
+The distinction between them is done by a boolean 'isDynamic' stored in the AxisManager class
+
+
+
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.classpath b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.classpath
index e9bcd511f17..14129a12bff 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.classpath
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.classpath
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

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

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.project
index df56d80c041..687350b13e3 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.project
@@ -6,6 +6,11 @@
 	</projects>

 	<buildSpec>

 		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

 			<arguments>

 			</arguments>

@@ -15,8 +20,15 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

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

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

 	</natures>

 </projectDescription>

diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 98553c18ede..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1

-encoding//resource/newChild-toc.xml=utf-8

-encoding//resource/newChild.html=utf-8

diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.core.prefs
index 980b98c1d5f..e6d053cf5eb 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.core.prefs
@@ -10,3 +10,287 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

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

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

+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_assignment=0

+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_after_package=1

+org.eclipse.jdt.core.formatter.blank_lines_before_field=0

+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

+org.eclipse.jdt.core.formatter.blank_lines_before_method=1

+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

+org.eclipse.jdt.core.formatter.blank_lines_before_package=0

+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

+org.eclipse.jdt.core.formatter.comment.format_block_comments=true

+org.eclipse.jdt.core.formatter.comment.format_header=false

+org.eclipse.jdt.core.formatter.comment.format_html=true

+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

+org.eclipse.jdt.core.formatter.comment.format_line_comments=true

+org.eclipse.jdt.core.formatter.comment.format_source_code=true

+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

+org.eclipse.jdt.core.formatter.comment.line_length=260

+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

+org.eclipse.jdt.core.formatter.compact_else_if=true

+org.eclipse.jdt.core.formatter.continuation_indentation=2

+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_empty_lines=false

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

+org.eclipse.jdt.core.formatter.indentation.size=4

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.join_lines_in_comments=false

+org.eclipse.jdt.core.formatter.join_wrapped_lines=false

+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.lineSplit=260

+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

+org.eclipse.jdt.core.formatter.tabulation.char=tab

+org.eclipse.jdt.core.formatter.tabulation.size=4

+org.eclipse.jdt.core.formatter.use_on_off_tags=false

+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF
index a24482bb7bf..4f41886c691 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Bundle-Name: New Child Documentation
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.doc;singleton:

  =true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 

diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/build.properties b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/build.properties
index db10df1d840..c1a2f1fa035 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/build.properties
@@ -1,6 +1,7 @@
 bin.includes = META-INF/,\

                about.html,\

                plugin.xml,\

-               resource/

-src.includes = about.html

+               target/generated-eclipse-help/** 

+src.includes = about.html,\

+				resource/

 

diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/plugin.xml
index 1d9a4f45f85..ac128d6671d 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/plugin.xml
@@ -4,11 +4,11 @@
    <extension

          point="org.eclipse.help.toc">

       <toc

-            file="resource/newChild-main-toc.xml"

+            file="target/generated-eclipse-help/newChild-main-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="resource/newChild-toc.xml"

+            file="target/generated-eclipse-help/newChild-toc.xml"

             primary="false">

       </toc>

    </extension>

diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/pom.xml
index 30063f8c7d9..9a5eeb4818f 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/AllPossibleActivities.png b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/AllPossibleActivities.png
index 93a409795ee..93a409795ee 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/AllPossibleActivities.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/AllPossibleActivities.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/AllPossibleActivitiesIllustration.png b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/AllPossibleActivitiesIllustration.png
index 2ead41a7865..2ead41a7865 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/AllPossibleActivitiesIllustration.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/AllPossibleActivitiesIllustration.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/Architecture.png b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/Architecture.png
index 9b86fcb30c2..9b86fcb30c2 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/Architecture.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/Architecture.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/EnableCreationMenu.png b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/EnableCreationMenu.png
index 2ee0b82d010..2ee0b82d010 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/EnableCreationMenu.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/EnableCreationMenu.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/MenuExample.png b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/MenuExample.png
index e0996bc1801..e0996bc1801 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/MenuExample.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/MenuExample.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/NestedClassifier.png b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/NestedClassifier.png
index 26d8b568537..26d8b568537 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/NestedClassifier.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/NestedClassifier.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/NestedClassifierIllustration.png b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/NestedClassifierIllustration.png
index 40046cf4bf3..40046cf4bf3 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/NestedClassifierIllustration.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/NestedClassifierIllustration.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/NewDiagram.png b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/NewDiagram.png
index 9f50a45041d..9f50a45041d 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/NewDiagram.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/NewDiagram.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/PackageWithIconO.png b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/PackageWithIconO.png
index 63772d65186..63772d65186 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/PackageWithIconO.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/PackageWithIconO.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/PackageWithIconOIllustration.png b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/PackageWithIconOIllustration.png
index f88d08f681e..f88d08f681e 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/PackageWithIconOIllustration.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/PackageWithIconOIllustration.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/UseCaseDiagram.png b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/UseCaseDiagram.png
index 7d475969113..7d475969113 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/UseCaseDiagram.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/UseCaseDiagram.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/codeXML.PNG b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/codeXML.PNG
index 94721d526ab..94721d526ab 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/codeXML.PNG
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/images/codeXML.PNG
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild-main-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild-main-toc.xml
index b2354f3915e..f9d043cc461 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild-main-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="CSS Stylesheets" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-   <topic href="resource/newChild.html" label="Menu new child">
+<toc label="Papyrus Guide" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
+   <topic href="target/generated-eclipse-help/newChild.html" label="Menu new child">
       <anchor id="new Child"/>
-      <link toc="resource/newChild-toc.xml"/>
+      <link toc="target/generated-eclipse-help/newChild-toc.xml"/>
    </topic>	
 </toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild-toc.xml
deleted file mode 100644
index 09bc9744e31..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild-toc.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/newChild.html" label="newChild">
-	<topic href="resource/newChild.html" label="Requirements"></topic>
-	<topic href="resource/newChild.html#Use_Cases" label="Use Cases">
-		<topic href="resource/newChild.html#UseCreateMenu" label="UseCreateMenu">
-			<topic href="resource/newChild.html#How_to" label="How to"></topic>
-		</topic>
-		<topic href="resource/newChild.html#Create_or_modify_ElementCreationModel" label="Create or modify ElementCreationModel">
-			<topic href="resource/newChild.html#How_to_2" label="How to"></topic>
-		</topic>
-		<topic href="resource/newChild.html#Generate_.22ElementCreationModel.22_from_a_profile" label="Generate &quot;ElementCreationModel&quot; from a profile"></topic>
-		<topic href="resource/newChild.html#Hide.2C_change_order_or_add_submenus" label="Hide, change order or add submenus">
-			<topic href="resource/newChild.html#How_to_3" label="How to"></topic>
-		</topic>
-		<topic href="resource/newChild.html#Create_or_modify_ElementCreationModel_at_runtime_thanks_to_a_GUI" label="Create or modify ElementCreationModel at runtime thanks to a GUI"></topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild.html b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild.html
deleted file mode 100644
index 41bb3e024b1..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><ol style="list-style: none;"><li><a href="#Requirements">Requirements</a></li><li><a href="#Use_Cases">Use Cases</a><ol style="list-style: none;"><li><a href="#UseCreateMenu">UseCreateMenu</a><ol style="list-style: none;"><li><a href="#How_to">How to</a></li></ol></li><li><a href="#Create_or_modify_ElementCreationModel">Create or modify ElementCreationModel</a><ol style="list-style: none;"><li><a href="#How_to_2">How to</a></li></ol></li><li><a href="#Generate_.22ElementCreationModel.22_from_a_profile">Generate "ElementCreationModel" from a profile</a></li><li><a href="#Hide.2C_change_order_or_add_submenus">Hide, change order or add submenus</a><ol style="list-style: none;"><li><a href="#How_to_3">How to</a></li></ol></li><li><a href="#Create_or_modify_ElementCreationModel_at_runtime_thanks_to_a_GUI">Create or modify ElementCreationModel at runtime thanks to a GUI</a></li></ol></li></ol><h1 id="Requirements">Requirements</h1><dl><dt>AddNewChild (id=newChild001):</dt><dd>Papyrus shall add in the menu new child for new customized elements by using extended type</dd><dt>HideElement (id=newChild002):</dt><dd>Papyrus shall not display all UML or SysML element creation</dd><dt>newChildFromProfile (id=newChild003):</dt><dd>Papyrus shall add the creation of new element from a subset of profile</dd><dt>newChildMenuDisplay (id=newChild004):</dt><dd>Papyrus shall be able to associate icons to folder or creation menu</dd><dt>RoleAndElementCreation (id=newChild005):</dt><dd>When an element can be created from several roles for a container, Papyrus shall let the possibility to choose the role or to let to the possibility to be created from all roles.</dd></dl><h1 id="Use_Cases">Use Cases</h1><p><img title="UseCaseDiagram" alt="UseCaseDiagram" border="0" src="UseCaseDiagram.png"/><br/></p><h2 id="UseCreateMenu">UseCreateMenu</h2><p>The Papyrus User shall use this functionality from the model explorer in order to create elements in the model. He can decide to display or not this element creation.</p><h3 id="How_to">How to</h3><p>In order to not display a menu,  a user can edit the model that represents the creation menu and set the attribute visibility to false. 
-<img title="EnableCreationMenu" alt="EnableCreationMenu" border="0" src="EnableCreationMenu.png"/><br/></p><h2 id="Create_or_modify_ElementCreationModel">Create or modify ElementCreationModel</h2><p>An advanced User is able to create or modify creation menu. This menu is a model that can be edited </p><h3 id="How_to_2">How to</h3><p>An advanced user can contribute to the menu by adding a new plugin that contains:</p><ul><li>a xmi file that represents a creation menu. The model must be an instance of org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore. It contains<br/><ul><li>CreationMenu<br/><ul><li>It corresponds to a menu<br/></li><li>The ElemenTypeIDRef corresponds a reference to the element Type.<br/></li><li>The role can be filled in order to specify the role play by the element.<br/></li><li>If displayAllRole is set to true, it displays all roles played by the element if the number of roles is greater than 1. By default this property is true;<br/></li></ul></li><li>Folder<br/><ul><li>It is possible to add owns label an icon.<br/></li></ul></li><li>Visibility to specify if the folder is visible.<br/></li></ul></li><li>a reference to an extension point, to specify that papyrus must take in account this file to display the menu<br/></li></ul><pre class="source-xml">&lt;extension
-         point="org.eclipse.papyrus.infra.newchild"&gt;
-      &lt;menuCreationModel
-            model="YourCreationMenu.xmi"&gt;
-      &lt;/menuCreationModel&gt;
-&lt;/extension&gt;
-
-</pre><p>In the following example, a menu creation for a package is presented. This menu is contained in the folder SimpleUMLTest. We have associated an image for this menu.
-<br/><img title="Creation menu for a package with a specific icon" alt="Creation menu for a package with a specific icon" border="0" src="PackageWithIconO.png"/><br/>
-<br/><img title="Result for this menu" alt="Result for this menu" border="0" src="PackageWithIconOIllustration.png"/><br/></p><p>In this following example, a creation menu will be specified to allow creation of nested classifier. That 's why the role "nestedClassifier" is precised. The label for this creation is "nestedClass"
-<br/><img title="Result for the menu nestedClass" alt="Result for the menu nestedClass" border="0" src="NestedClassifierIllustration.png"/><br/>
-<br/><img title="Creation menu model for nested class" alt="Creation menu model for nested class" border="0" src="NestedClassifier.png"/><br/></p><p>In the following example a creation menu is created for activities. In this case, all roles are displayed. Thanks to this, when we want to associate an activity to a state, 3 roles are proposed. 
-<br/><img title="Creation menu model for activity" alt="Creation menu model for activity" border="0" src="AllPossibleActivities.png"/><br/>
-<br/><img title="Result for this menu activity" alt="Result for this menu activity" border="0" src="AllPossibleActivitiesIllustration.png"/><br/></p><h2 id="Generate_.22ElementCreationModel.22_from_a_profile">Generate "ElementCreationModel" from a profile</h2><p>From a stereotyped profile, a model of new child menu can be generated.
-For example a user after designing a profile, want to have a dedicated menu  from this profile/
-For the moment this function is not implemented.</p><h2 id="Hide.2C_change_order_or_add_submenus">Hide, change order or add submenus</h2><p>The User can modify the creation menu by adding submenus: order about new child menu, precise if the role must be displayed.</p><h3 id="How_to_3">How to</h3><p>It only needed to change the order of element in the corresponding creation menu model</p><h2 id="Create_or_modify_ElementCreationModel_at_runtime_thanks_to_a_GUI">Create or modify ElementCreationModel at runtime thanks to a GUI</h2><p>A user can edit a the model that represents the creation menu  at runtime for papyrus thanks to a dedicated UI.
-For the moment this function is not implemented.</p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild.mediawiki
index 916f8d09911..89cb72512d8 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild.mediawiki
@@ -7,12 +7,12 @@ __TOC__
 ; newChildMenuDisplay (id=newChild004): : Papyrus shall be able to associate icons to folder or creation menu
 ; RoleAndElementCreation (id=newChild005): : When an element can be created from several roles for a container, Papyrus shall let the possibility to choose the role or to let to the possibility to be created from all roles.
 =Use Cases=
-[[Image:UseCaseDiagram.png|UseCaseDiagram]]<br>
+[[Image:images/UseCaseDiagram.png|UseCaseDiagram]]<br>
 ==UseCreateMenu==
 The Papyrus User shall use this functionality from the model explorer in order to create elements in the model. He can decide to display or not this element creation.
 ===How to===
 In order to not display a menu,  a user can edit the model that represents the creation menu and set the attribute visibility to false. 
-[[Image:EnableCreationMenu.png|EnableCreationMenu]]<br>
+[[Image:images/EnableCreationMenu.png|EnableCreationMenu]]<br>
 ==Create or modify ElementCreationModel==
 An advanced User is able to create or modify creation menu. This menu is a model that can be edited 
 ===How to===
@@ -38,16 +38,16 @@ An advanced user can contribute to the menu by adding a new plugin that contains
 </source>
 
 In the following example, a menu creation for a package is presented. This menu is contained in the folder SimpleUMLTest. We have associated an image for this menu.
-<br>[[Image:PackageWithIconO.png|Creation menu for a package with a specific icon]]<br>
-<br>[[Image:PackageWithIconOIllustration.png|Result for this menu]]<br>
+<br>[[Image:images/PackageWithIconO.png|Creation menu for a package with a specific icon]]<br>
+<br>[[Image:images/PackageWithIconOIllustration.png|Result for this menu]]<br>
 
 In this following example, a creation menu will be specified to allow creation of nested classifier. That 's why the role "nestedClassifier" is precised. The label for this creation is "nestedClass"
-<br>[[Image:NestedClassifierIllustration.png|Result for the menu nestedClass]]<br>
-<br>[[Image:NestedClassifier.png|Creation menu model for nested class]]<br>
+<br>[[Image:images/NestedClassifierIllustration.png|Result for the menu nestedClass]]<br>
+<br>[[Image:images/NestedClassifier.png|Creation menu model for nested class]]<br>
 
 In the following example a creation menu is created for activities. In this case, all roles are displayed. Thanks to this, when we want to associate an activity to a state, 3 roles are proposed. 
-<br>[[Image:AllPossibleActivities.png|Creation menu model for activity]]<br>
-<br>[[Image:AllPossibleActivitiesIllustration.png|Result for this menu activity]]<br>
+<br>[[Image:images/AllPossibleActivities.png|Creation menu model for activity]]<br>
+<br>[[Image:images/AllPossibleActivitiesIllustration.png|Result for this menu activity]]<br>
 ==Generate "ElementCreationModel" from a profile==
 From a stereotyped profile, a model of new child menu can be generated.
 For example a user after designing a profile, want to have a dedicated menu  from this profile/
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.classpath b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.classpath
index e2b0c940c74..14129a12bff 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.classpath
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.classpath
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

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

-	<classpathentry kind="output" path="target/classes"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.project
index 78adc84635e..5f14405dd5c 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.project
@@ -20,8 +20,14 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

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

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

 	</natures>

diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 609a5c7a1a9..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1

-encoding//resource/controlMode-toc.xml=utf-8

-encoding//resource/controlMode.html=utf-8

diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..9ca8e68231b 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1

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

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

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

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

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

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

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

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

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

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF
index ca3a08f340b..eada040dc63 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@ Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.do

  c;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 

diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/build.properties b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/build.properties
index 6d0849257d3..bfc88885d62 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/build.properties
@@ -2,6 +2,7 @@ bin.includes = META-INF/,\
                .,\

                plugin.xml,\

                about.html,\

-               resource/,\

-               OSGI-INF/

-src.includes = about.html

+               OSGI-INF/,\

+               target/generated-eclipse-help/** 

+src.includes = about.html,\

+				resource/

diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/plugin.xml
index 58ed1218e42..92665f116e5 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/plugin.xml
@@ -3,8 +3,8 @@
 <plugin>

    <extension

          point="org.eclipse.help.toc">

-         <toc file="resource/controlMode-main-toc.xml" primary="false"/>

-         <toc file="resource/controlMode-toc.xml" primary="false"/>

+         <toc file="target/generated-eclipse-help/controlMode-main-toc.xml" primary="false"/>

+         <toc file="target/generated-eclipse-help/controlMode-toc.xml" primary="false"/>

    </extension>

 

 </plugin>

diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/pom.xml
index 6f80703987d..a168bf5308d 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/pom.xml
@@ -11,4 +11,37 @@
 	<groupId>org.eclipse.papyrus</groupId>

 	<version>1.1.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

+	<build>

+		<plugins>

+			<plugin>

+				<groupId>org.eclipse.mylyn.docs</groupId>

+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>

+				<configuration>

+					<sourceFolder>resource</sourceFolder>

+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>

+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->

+					<multipleOutputFiles>false</multipleOutputFiles>

+					<navigationImages>true</navigationImages>

+					<formatOutput>true</formatOutput>

+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>

+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>

+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->

+				</configuration>

+				<executions>

+					<execution>

+						<goals>

+							<goal>eclipse-help</goal>

+						</goals>

+					</execution>

+				</executions>

+				<dependencies>

+					<dependency>

+						<groupId>org.eclipse.mylyn.docs</groupId>

+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>

+						<version>${mylyn.wikitext.version}</version>

+					</dependency>

+				</dependencies>

+			</plugin>

+		</plugins>

+	</build>

 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode-main-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode-main-toc.xml
index 01d8eea6382..8f246f8b86e 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode-main-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>

 <toc label="Submodel Creation and Reintegration" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

-   <topic href="resource/controlMode.html" label="Submodel Creation and Reintegration">

-      <link toc="resource/controlMode-toc.xml"/>

+   <topic href="target/generated-eclipse-help/controlMode.html" label="Submodel Creation and Reintegration">

+      <link toc="target/generated-eclipse-help/controlMode-toc.xml"/>

       <anchor id="controlMode"/>

    </topic>	

 </toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode-toc.xml
deleted file mode 100644
index 4aaebb8f54e..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode-toc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/controlMode.html" label="controlMode">
-	<topic href="resource/controlMode.html" label="Creation of submodels and reintegration">
-		<topic href="resource/controlMode.html#What_is_it.3F" label="What is it?"></topic>
-		<topic href="resource/controlMode.html#Create_a_submodel" label="Create a submodel"></topic>
-		<topic href="resource/controlMode.html#Reintegrate_a_submodel_into_the_main_model" label="Reintegrate a submodel into the main model"></topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode.html b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode.html
deleted file mode 100644
index 75650b87356..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Creation_of_submodels_and_reintegration">Creation of submodels and reintegration</h1><p>In this page we will show the Papyrus capabilities to create and reintegrate submodels, also known as <i>control mode</i>. </p><h2 id="What_is_it.3F">What is it?</h2><p>As a model grows large in number of elements, it is convenient to split them into different physical resources i.e. files.
-Papyrus provides a feature to perform this splitting in a seamless fashion, allowing to move parts of the model to another resource. We call this <i>create a submodel</i>.  
-This is specially helpful working in collaborative environments, since the Team features can be applied individually to the different resources i.e. make changes and commit them in only one part of the model.</p><h2 id="Create_a_submodel">Create a submodel</h2><p>To create a submodel, right click on the element which you wish to move to a different resource (a Package in the common case) and select <i>Create submodel unit</i>
-<img border="0" src="img/ControlAction.png"/> </p><p>The following dialog appears. Select the desired location for the new resource and click <i>OK</i>.</p><p><img border="0" src="img/ControlDialog.png"/> </p><p><b>Important:</b> The selected element has not been moved just yet. The model editor will be dirty i.e. there will be an asterisk next to its name in the tab. In order to complete the submodel creation, you need to <b>save</b> your model.</p><p>The new resource is created in the chosen location with the chosen file name, whilst a green decorator is shown in the model explorer view of the parent model to indicate this element is in a submodel.</p><h2 id="Reintegrate_a_submodel_into_the_main_model">Reintegrate a submodel into the main model</h2><p>To reintegrate a submodel into the main model, open the parent model and right click on the submodel element in the model explorer (recognizable with the green decorator).
-<img border="0" src="img/UncontrolAction.png"/> </p><p>The submodel is reintegrated into the main model resource, and the submodel resource is deleted. </p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode.mediawiki
index 4f86a80ebec..facbeffe137 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode.mediawiki
@@ -9,11 +9,11 @@ This is specially helpful working in collaborative environments, since the Team
 

 ==Create a submodel==

 To create a submodel, right click on the element which you wish to move to a different resource (a Package in the common case) and select ''Create submodel unit''

-[[Image:img/ControlAction.png]] 

+[[Image:images/ControlAction.png]] 

 

 The following dialog appears. Select the desired location for the new resource and click ''OK''.

 

-[[Image:img/ControlDialog.png]] 

+[[Image:images/ControlDialog.png]] 

 

 '''Important:''' The selected element has not been moved just yet. The model editor will be dirty i.e. there will be an asterisk next to its name in the tab. In order to complete the submodel creation, you need to '''save''' your model.

 

@@ -22,6 +22,6 @@ The new resource is created in the chosen location with the chosen file name, wh
 ==Reintegrate a submodel into the main model==

 

 To reintegrate a submodel into the main model, open the parent model and right click on the submodel element in the model explorer (recognizable with the green decorator).

-[[Image:img/UncontrolAction.png]] 

+[[Image:images/UncontrolAction.png]] 

 

 The submodel is reintegrated into the main model resource, and the submodel resource is deleted. 
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/img/ControlAction.png b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/images/ControlAction.png
index 54fcdabeb45..54fcdabeb45 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/img/ControlAction.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/images/ControlAction.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/img/ControlDialog.png b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/images/ControlDialog.png
index 6152f6cd50a..6152f6cd50a 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/img/ControlDialog.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/images/ControlDialog.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/img/UncontrolAction.png b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/images/UncontrolAction.png
index 11adcfcbf74..11adcfcbf74 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/img/UncontrolAction.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/images/UncontrolAction.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project
index 7299daed0e7..6423e76bc97 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
@@ -15,8 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index bcaa1b4d07e..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1

-encoding//resources/viewpoints-toc.xml=utf-8

-encoding//resources/viewpoints.html=utf-8

diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
index 2032e6c6ba5..d969de2d78f 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.help

+Require-Bundle: org.eclipse.help;bundle-version="3.6.0",

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

@@ -7,5 +8,5 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.doc;singleto

  n:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 

diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties
index 6f7dcdff777..f33d8fa50e2 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties
@@ -3,5 +3,6 @@ bin.includes = META-INF/,\
                plugin.xml,\

                about.html,\

                plugin.properties,\

-               resources/

-src.includes = about.html
+               target/generated-eclipse-help/** 

+src.includes = about.html,\

+				resources/
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml
index 2fba0cfd74f..c8744786dda 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml
@@ -4,7 +4,7 @@
    <extension

          point="org.eclipse.help.toc">

       <toc

-            file="resources/viewpoints-toc.xml"

+            file="target/generated-eclipse-help/viewpoints-toc.xml"

             primary="false">

       </toc>

    </extension>

diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/pom.xml
index 7d3cd77844c..afbe390a86e 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resources</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/explorer.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/explorer.png
index f412ac7f575..f412ac7f575 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/explorer.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/explorer.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/preferences.png
index d0270ff1ff8..d0270ff1ff8 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/preferences.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/properties.png
index 9663d824ce5..9663d824ce5 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/properties.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-main-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-main-toc.xml
new file mode 100644
index 00000000000..5d6cdd9a971
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-main-toc.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<toc label="Papyrus Guide" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

+   <topic href="target/generated-eclipse-help/viewpoints.html" label="Viewpoints">

+      <anchor id="viewpoint"/>

+      <link toc="target/generated-eclipse-help/viewpoints-toc.xml"/>

+   </topic>	

+</toc>

diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml
deleted file mode 100644
index 45a1e184ada..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc label="viewpoints" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser" topic="resources/viewpoints.html">
-	<topic href="resources/viewpoints.html" label="Viewpoints in Papyrus">
-		<topic href="resources/viewpoints.html#Introduction" label="Introduction"></topic>
-		<topic href="resources/viewpoints.html#Configuration_Options_for_Viewpoints" label="Configuration Options for Viewpoints"></topic>
-		<topic href="resources/viewpoints.html#Viewpoints-Related_UI_Elements" label="Viewpoints-Related UI Elements"></topic>
-		<topic href="resources/viewpoints.html#Definition_of_New_Viewpoints" label="Definition of New Viewpoints">
-			<topic href="resources/viewpoints.html#Basic_Concepts" label="Basic Concepts"></topic>
-			<topic href="resources/viewpoints.html#Walkthrough" label="Walkthrough"></topic>
-			<topic href="resources/viewpoints.html#Diagram_Specification" label="Diagram Specification"></topic>
-		</topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html
deleted file mode 100644
index f097c3ec210..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Viewpoints_in_Papyrus">Viewpoints in Papyrus</h1><h2 id="Introduction">Introduction</h2><p>Viewpoints in Papyrus enable the specialization and customization of the user experience by constraining what can be seen and interacted with in Papyrus diagrams and tables. Viewpoints can be used for the following purposes in Papyrus:</p><ul><li>Constrain the set  of diagrams and tables that are available to a particular class of users</li><li>Define new kinds of diagrams with custom names, icons, figures and palette in order to implement domain-specific views in Papyrus, based on the classical UML and SysML diagrams.</li></ul><h2 id="Configuration_Options_for_Viewpoints">Configuration Options for Viewpoints</h2><p>At any given time, there can only be one viewpoint that is currently applied to an Eclipse instance. Users are free to select any viewpoint that is provided to them. Papyrus itself comes with a default viewpoint that is automatically selected when to other viewpoint is specified.</p><p>All the viewpoints-related configuration options available to the users are provided in the <i>Papyrus &gt; Viewpoints Configuration</i> preference page of Eclipse:</p><p><img border="0" src="captures/preferences.png"/></p><p>The first available option is the <i>Configuration selection</i>. It determines how the current viewpoint is selected. The possible options are:</p><ul><li><b>Default (Papyrus built-in configuration)</b>. This option forces the selection of the default viewpoint provided by Papyrus. This default viewpoint exposes all the UML and SysML diagrams and tables implemented in Papyrus and does not restrict their use.</li><li><b>Deployed through the extension point</b>. This option allows Papyrus to choose the viewpoint with the highest priority provided through the appropriate extension point. This option is typically chosen when 3rd party viewpoints are provided through the extension point. In this way they are automatically applied. When no custom viewpoint is provide through the extension point the default Papyrus viewpoint is applied instead.</li><li><b>Manual configuration selection</b>. This option allows the user to force the application of a specific viewpoint that is manually selected. When this option is chosen the second part of the preference page becomes available. The appropriate configuration file containing the viewpoint can be selected through 3 possible schemes:<ul><li><b>Absolute path</b>: The absolute path a file in the local file system.</li><li><b>Workspace file</b>: The selection of a file in the current Eclipse workspace</li><li><b>Embedded in a plugin</b>: The selection of a file contained within a plugin that has been loaded by the current Eclipse instance.</li></ul></li></ul><p>In the case where multiple viewpoints are available through the current configuration options as explained above the specific viewpoint to be applied can be chosen through the two drop-down lists:</p><ul><li><b>Stakeholder</b>. The class of user that is associated to a list of possible viewpoints.</li><li><b>Viewpoint</b>. The viewpoint will be applied. The list is populated based on the Stakeholder field.</li></ul><p>In addition, the checkbox <b>Multiplicity</b> can be activated so that at most one diagram or table of the each kind defined in the applied viewpoint can be created for each model element. For example, at most one class diagram per package, etc.</p><p>It is possible at any time to see the details of the diagrams and tables offered by the currently used viewpoint in the <i>Viewpoint Explorer</i> view in Eclipse. This view is available in <i>Window &gt; Show View &gt; Other</i>, and then selecting <i>Papyrus &gt; Viewpoint Explorer</i>.</p><p><img border="0" src="captures/explorer.png"/></p><p>This view summarizes the currently available diagrams and tables, as well as the conditions for their availability.</p><h2 id="Viewpoints-Related_UI_Elements">Viewpoints-Related UI Elements</h2><p>The application of a viewpoint has some impacts on the following UI elements in Papyrus:</p><ul><li>The diagram selection window in the <b>New Model</b> wizard is populated with only the diagrams and tables that are available in the current viewpoint.</li><li>The <b>New Diagram</b> and <b>New Table</b> contextual menus for the model elements provides only the diagrams and tables that are available in the current viewpoint and are applicable to the currently selected model element. For example, when a UML Activity is selected, the <b>New Diagram</b> context menu will not offer to create a Package diagram, or a class diagram.</li><li>The same holds for the toolbar elements for the creation of diagrams and tables.</li><li>The diagrams properties show the following information:</li></ul><p><img border="0" src="captures/properties.png"/></p><ul><li><b>View Type</b> is the qualified name of the diagram’s type. It gives an indication of which viewpoint is providing it.</li><li>The <b>Owner</b> attribute is the model element that syntactically contains the diagram in the model explorer. It can be different from the root element.</li><li>The <b>Root</b> element attribute is the model element that is the diagram’s root semantic element.</li></ul><h2 id="Definition_of_New_Viewpoints">Definition of New Viewpoints</h2><p>Papyrus supports the definition of new viewpoints that can subsequently be used by selecting them in the Papyrus Viewpoints preference panel, as presented above. Papyrus viewpoints are defined in configuration files with the ‘.configuration’ extension. They are really just an ECore model that can be edited with the specialized viewpoint configuration editor provided by Papyrus.</p><h3 id="Basic_Concepts">Basic Concepts</h3><p>Viewpoints in Papyrus are implemented as an extension to the ISO 42010 standard for architecture description framework. Hence many concepts presented here are derived from those presented in the ISO 42010 standard. However, the standard has been extended with Papyrus-specific concepts and properties.</p><ul><li>A <i>configuration</i> is a top element of a configuration file. It contains can contains <i>viewpoints</i> specifications, <i>stakeholders</i>, as well as <i>view categories</i>.</li><li>A <i>stakeholder</i> (from ISO 42010) represents in Papyrus an archetype of users. They can be attributed <i>viewpoints</i>, thus defining what users of this kind can see.</li><li>A <i>viewpoint</i> (from ISO 42010) in Papyrus is simply set of <i>views</i>, which can be <i>diagrams</i> or <i>tables</i>.</li><li>A <i>diagram</i> in this context does not represent a single instance (for example the diagram named X in model Y), but the specification (or prototype) of future diagrams of this kind. For example the <i>UML Class Diagram</i>.</li><li>A <i>table</i> is another kind of view in Papyrus that enables the presentation of models in a tabular format.</li></ul><h3 id="Walkthrough">Walkthrough</h3><p>The definition of a new viewpoint in Papyrus starts with the creation of a new configuration file: <i>Viewpoint s configuration</i> in the Papyrus folder of the Eclipse new element creation dialog. The top element of the file should be a <i>Papyrus Configuration</i> element.</p><p><u>Step 1</u>: Select the metamodel that is applicable to this configuration. Generally, this should be UML. The metamodel is selected as the <i>metamodel</i> property of the <i>Papyrus Configuration</i> root element. The drop-down value selection is automatically filled with the currently metamodel currently loaded in Eclipse. For UML select, "<a href="http://www.eclipse.org/uml2/5.0.0/UML">http://www.eclipse.org/uml2/5.0.0/UML</a>".</p><p><u>Step 2</u>: Add the basic elements. The setting of the elements below is required for the configuration to work correctly.</p><ul><li>Right click on the <i>Papyrus Configuration</i> root element to a new <i>Stakeholder</i> child.</li><li>Give it an appropriate name</li><li>Right click on the <i>Papyrus Configuration</i> root element to a new <i>Viewpoint</i> child.</li><li>Give it an appropriate name</li><li>In the properties of the new stakeholder, add the new viewpoint to the <i>viewpoints</i> property to specify that this stakeholder will have to the specified viewpoint.</li><li>In the properties of the <i>Papyrus Configuration</i> root element, select the new stakeholder in the <i>Default Stakeholder</i> property.</li></ul><p>Notes:</p><ul><li>Stakeholder attributes other than <i>viewpoints</i> and <i>name</i> are inherited from the ISO 42010 implementation and are currently not used in Papyrus.</li><li>Viewpoint attributes other than <i>parent</i> and <i>name</i> are inherited from the ISO 42010 implementation and are currently not used in Papyrus.</li></ul><p><u>Step 3</u>: Complete the viewpoint with new diagrams and tables. Those elements can be added by right clicking on the viewpoint element, in the <i>New child</i> menu. Refer to the sections below for more information on the specification of diagrams and tables.</p><p><u>Step 4</u>: Deploy the configuration. The new configuration file can be deployed in an Eclipse plugin and registered through an extension point. The extension point to use is <code>org.eclipse.papyrus.infra.viewpoints.policy.custom</code>. It comes in two flavors that are the possible child elements for it:</p><ul><li>The <i>configuration</i> element lets you register a configuration file and give it a priority. The configuration file is selected with the <i>file</i> property. Giving an URI of the form <code>platform:/plugin/my.plugin.name/path/myconfig.configuration</code> is a good practice. The <i>priority</i> is a value between 0 and 100, 100 is the highest priority. This value will be used to select the configuration with the highest priority when the user selects the <i>Deployed through the extension point</i> option in the configuration page as explained above. In this mode, the deployed configuration replaces the default Papyrus configuration and its viewpoint. This means that unless the provided viewpoint extends the default one or replicate it, the UML and SysML diagrams and tables will not be available.</li><li>The <i>contribution</i> elements lets you specifies a configuration file as an extension of another one. The custom configuration file is selected with the <i>file</i> property. The <i>original</i> property is used to select the configuration file that is extended. To extend the default Papyrus configuration, this value must be <code>platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration</code>. In this mode the custom viewpoints must have the same name as the extended on in the original configuration file. In essence, the diagrams and tables defined in the new custom viewpoint will be available along the one in the original viewpoints, instead of replacing them. This mode is used by RobotML to add the RobotML diagrams to the default Papyrus viewpoint.</li></ul><h3 id="Diagram_Specification">Diagram Specification</h3><p>A diagram has the following attributes:</p><ul><li>A <i>name</i> (required) that is the user-visible name of the diagram. It will appear in the creation menus and property panel.</li><li>An <i>icon</i> (required), as an URI of the form <code>platform:/plugin/...</code>.</li><li>An <i>implementation ID</i> (required) which selects the physical (hard-coded) diagram in Papyrus that will be used as a base. The possible values for this property are summarized in the following table.</li><li>An optional <i>parent</i> that specifies a parent viewpoint-defined diagram to inherit from. Essentially, the inheriting diagram will defer to its parent’s rules (see below) when its own are not sufficient to take a decision.</li><li>An optional list of <i>profiles</i> that must be applied on the model for this diagram to be available. The possible values are automatically populated from the loaded EPackages.</li><li>An optional <i>custom style</i> as an URI of the form <code>platform:/plugin/...</code>. It must point to a CSS file that will then be automatically applied to the diagram.</li><li>An optional <i>custom palette</i> as an URI of the form <code>platform:/plugin/...</code>. It must point a palette definition in XML that will be automatically applied to the diagram.</li><li>Other attributes are inherited from the ISO 42010 implementation and are currently not used in Papyrus.</li></ul><table border="solid 1px grey"><tr><th>Implementation ID</th><th>Description</th></tr><tr><td><b>PapyrusUMLActivityDiagram</b></td><td>UML Activity Diagram</td></tr><tr><td><b>PapyrusUMLClassDiagram</b></td><td>UML Class Diagram</td></tr><tr><td><b>PapyrusUMLCommunicationDiagram</b></td><td>UML Communication Diagram</td></tr><tr><td><b>PapyrusUMLComponentDiagram</b></td><td>UML Component Diagram</td></tr><tr><td><b>CompositeStructure</b></td><td>UML Composite Diagram</td></tr><tr><td><b>PapyrusUMLDeploymentDiagram</b></td><td>UML Deployment Diagram</td></tr><tr><td><b>PapyrusUMLProfileDiagram</b></td><td>UML Profile Diagram</td></tr><tr><td><b>PapyrusUMLSequenceDiagram</b></td><td>UML Sequence Diagram</td></tr><tr><td><b>PapyrusUMLStateMachineDiagram</b></td><td>UML State Machine Diagram</td></tr><tr><td><b>PapyrusUMLTimingDiagram</b></td><td>UML Timing Diagram</td></tr><tr><td><b>UseCase</b></td><td>UML Use Case Diagram</td></tr><tr><td><b>PapyrusUMLInteractionOverviewDiagram</b></td><td>UML Interaction Overview Diagram</td></tr><tr><td><b>BlockDefinition</b></td><td>SysML Block Definition Diagram</td></tr><tr><td><b>InternalBlock</b></td><td>SysML Internal Block Diagram</td></tr><tr><td><b>Parametric</b></td><td>SysML Parametric Diagram</td></tr><tr><td><b>RequirementDiagram</b></td><td>SysML Requirements Diagram</td></tr></table><p>Once a diagram has been created it is possible to constraint it using rules. There are four kinds of rules:</p><ul><li>Model rules constrain the type of the (root) model elements that can be visualized through this view. Hence model rules control what model elements can be selected for the <i>Root element</i> property of the diagrams, as shown in the capture below.</li><li>Owning rules constrain the type of the model elements that can own the diagram itself. In practice this materializes as the type of model elements under which the diagrams can appear in the model explorer. Owning rules control what model elements can be selected for the <i>Owner</i> property of the diagrams, as shown in the capture below.</li><li>Child rules constrain the type of the model elements that can be dropped within this diagram.</li><li>Palette rules constrain the display of the diagram's palette elements.</li></ul><p><img border="0" src="captures/properties.png"/></p><p>Each rule has a <i>permit</i> property that specify whether the rule authorizes or forbids the action it represents. Otherwise, the properties of the rules are as follow:</p><ul><li><i>Model rules</i><ul><li><i>element</i> (required) represents the type of the model elements to apply the rule on.</li><li><i>multiplicity</i> (required, default is -1) represents the maximum number of this kind of diagram that can be created for the referenced model element. -1 represents an unbounded number.</li><li><i>stereotypes</i> represents the set of stereotypes that must be applied in the model element for the rule to match. The stereotypes can be picked from the classifiers of the <i>profiles</i> defined in the parent diagram.</li></ul></li><li><i>Owning rules</i><ul><li><i>element</i> (required) represents the type of the model elements to apply the rule on.</li><li><i>multiplicity</i> (required, default is -1) represents the maximum number of this kind of diagram that can be created for the referenced model element. -1 represents an unbounded number.</li><li><i>stereotypes</i> represents the set of stereotypes that must be applied in the model element for the rule to match. The stereotypes can be picked from the classifiers of the <i>profiles</i> defined in the parent diagram.</li></ul></li><li><i>Child rules</i><ul><li><i>element</i> (required) represents the type of the model elements begin dropped.</li><li><i>stereotypes</i> represents the set of stereotypes that must be applied in the model element for the rule to match. The stereotypes can be picked from the classifiers of the <i>profiles</i> defined in the parent diagram.</li><li><i>origin</i> (required) represents the type of the model elements that are the target of the drop. It is usually one of the type defined in the <i>model rules</i>.</li><li>Additionally, <i>child rules</i> can be completed with children called <i>path elements</i> using the <b>New Child</b> contextual menu. <i>Path elements</i> defines a path of properties that must be used from the <i>origin</i> to insert the new <i>element</i> in the model.</li></ul></li><li><i>Palette rules</i><ul><li><i>element</i> (required) represents a pattern to match for the identifier of a palette element.<ul><li>If the value ends with '*', it will match any palette element with the prefix specified before the '*'.</li><li>If the value is '*', it will match any palette element.</li></ul></li></ul></li></ul><p>The minimal required rules for a diagram specification to work are:</p><ul><li>A model rule that allows the diagram to be created for a model element. For example, a model rule with <i>element</i> set to UML Package, <i>multiplicity</i> to -1 and <i>permit</i> to true; meaning this diagram can be created for UML Packages and an unlimited number of diagrams can be created for each UML Package.</li><li>An owning rule that allows the diagram to be owned by a model element (appear under an element in the model explorer). For example, an owning rule with <i>element</i> set to UML Package, <i>multiplicity</i> set to -1 and <i>permit</i> to true; meaning an unlimited number of diagrams of this kind can be placed under each UML Package element in the model explorer.</li><li>A child rule that allows the dropping of any element in the diagram, expressed with the <i>permit</i> attribute set to true and other attributes left empty.</li></ul></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki
index 9bc8d18acec..d52167bd1cc 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki
@@ -24,7 +24,7 @@ At any given time, there can only be one viewpoint that is currently applied to
 

 All the viewpoints-related configuration options available to the users are provided in the ''Papyrus > Viewpoints Configuration'' preference page of Eclipse:

 

-[[image:captures/preferences.png]]

+[[Image:images/preferences.png]]

 

 The first available option is the ''Configuration selection''. It determines how the current viewpoint is selected. The possible options are:

 

@@ -44,7 +44,7 @@ In addition, the checkbox '''Multiplicity''' can be activated so that at most on
 

 It is possible at any time to see the details of the diagrams and tables offered by the currently used viewpoint in the ''Viewpoint Explorer'' view in Eclipse. This view is available in ''Window > Show View > Other'', and then selecting ''Papyrus > Viewpoint Explorer''.

 

-[[image:captures/explorer.png]]

+[[Image:images/explorer.png]]

 

 This view summarizes the currently available diagrams and tables, as well as the conditions for their availability.

 

@@ -57,16 +57,16 @@ The application of a viewpoint has some impacts on the following UI elements in
 * The same holds for the toolbar elements for the creation of diagrams and tables.

 * The diagrams properties show the following information:

 

-[[image:captures/properties.png]]

+[[Image:images/properties.png]]

 

-* '''View Type''' is the qualified name of the diagram�s type. It gives an indication of which viewpoint is providing it.

+* '''View Type''' is the qualified name of the diagram�s type. It gives an indication of which viewpoint is providing it.

 * The '''Owner''' attribute is the model element that syntactically contains the diagram in the model explorer. It can be different from the root element.

-* The '''Root''' element attribute is the model element that is the diagram�s root semantic element.

+* The '''Root''' element attribute is the model element that is the diagram�s root semantic element.

 

 

 ==Definition of New Viewpoints==

 

-Papyrus supports the definition of new viewpoints that can subsequently be used by selecting them in the Papyrus Viewpoints preference panel, as presented above. Papyrus viewpoints are defined in configuration files with the �.configuration� extension. They are really just an ECore model that can be edited with the specialized viewpoint configuration editor provided by Papyrus.

+Papyrus supports the definition of new viewpoints that can subsequently be used by selecting them in the Papyrus Viewpoints preference panel, as presented above. Papyrus viewpoints are defined in configuration files with the �.configuration� extension. They are really just an ECore model that can be edited with the specialized viewpoint configuration editor provided by Papyrus.

 

 ===Basic Concepts===

 

@@ -106,7 +106,7 @@ A diagram has the following attributes:
 * A ''name'' (required) that is the user-visible name of the diagram. It will appear in the creation menus and property panel.

 * An ''icon'' (required), as an URI of the form <code>platform:/plugin/...</code>.

 * An ''implementation ID'' (required) which selects the physical (hard-coded) diagram in Papyrus that will be used as a base. The possible values for this property are summarized in the following table.

-* An optional ''parent'' that specifies a parent viewpoint-defined diagram to inherit from. Essentially, the inheriting diagram will defer to its parent�s rules (see below) when its own are not sufficient to take a decision.

+* An optional ''parent'' that specifies a parent viewpoint-defined diagram to inherit from. Essentially, the inheriting diagram will defer to its parent�s rules (see below) when its own are not sufficient to take a decision.

 * An optional list of ''profiles'' that must be applied on the model for this diagram to be available. The possible values are automatically populated from the loaded EPackages.

 * An optional ''custom style'' as an URI of the form <code>platform:/plugin/...</code>. It must point to a CSS file that will then be automatically applied to the diagram.

 * An optional ''custom palette'' as an URI of the form <code>platform:/plugin/...</code>. It must point a palette definition in XML that will be automatically applied to the diagram.

@@ -171,7 +171,7 @@ Once a diagram has been created it is possible to constraint it using rules. The
 * Child rules constrain the type of the model elements that can be dropped within this diagram.

 * Palette rules constrain the display of the diagram's palette elements.

 

-[[image:captures/properties.png]]

+[[Image:images/properties.png]]

 

 Each rule has a ''permit'' property that specify whether the rule authorizes or forbids the action it represents. Otherwise, the properties of the rules are as follow:

 * ''Model rules''

diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/.project b/plugins/doc/org.eclipse.papyrus.layers.documentation/.project
index 99176fc7af7..5d11eab7f79 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/.project
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
@@ -15,8 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 47ba1efd3d1..00000000000
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1

-encoding//guides/developpers/layersDevs-toc.xml=utf-8

-encoding//guides/developpers/layersDevs.html=utf-8

-encoding//guides/tutorials/derivedLayerTutorial-toc.xml=utf-8

-encoding//guides/tutorials/derivedLayerTutorial.html=utf-8

-encoding//guides/tutorials/simpleTutorial-toc.xml=utf-8

-encoding//guides/tutorials/simpleTutorial.html=utf-8

diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF
index a616a7407fe..baac6883f87 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.help

+Require-Bundle: org.eclipse.help;bundle-version="3.6.0",

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %pluginName

@@ -7,4 +8,5 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.layers.documentation;singleto

  n:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 

diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/build.properties b/plugins/doc/org.eclipse.papyrus.layers.documentation/build.properties
index 14023a435e2..68c9e960761 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/build.properties
@@ -1,6 +1,7 @@
 bin.includes = META-INF/,\

-               guides/,\

                plugin.xml,\

                plugin.properties,\

+               target/generated-eclipse-help/**,\

                about.html

-src.includes = about.html

+src.includes = about.html,\

+				resources/

diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/developpers/layers-toc.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/developpers/layers-toc.xml
deleted file mode 100644
index b54cf6ff390..00000000000
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/developpers/layers-toc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc label="Papyrus Layers" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocDev">
-	<topic href="guides/developpers/layersDevs.html" label="Layers Developers Documentation">
-        <link toc="guides/developpers/layersDevs-toc.xml"/>
-        <anchor id="layers.guides.devs"/>
-	</topic>
-</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/developpers/layersDevs-toc.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/developpers/layersDevs-toc.xml
deleted file mode 100644
index 0d173331c62..00000000000
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/developpers/layersDevs-toc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="guides/developpers/layersDevs.html" label="layersDevs">
-	<topic href="guides/developpers/layersDevs.html" label="Layers Developpers"></topic>
-	<topic href="guides/developpers/layersDevs.html#General_Architecture" label="General Architecture"></topic>
-	<topic href="guides/developpers/layersDevs.html#Plugins" label="Plugins"></topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/developpers/layersDevs.html b/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/developpers/layersDevs.html
deleted file mode 100644
index 98dd7080b47..00000000000
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/developpers/layersDevs.html
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h2 id="Layers_Developpers">Layers Developpers</h2><p>This is the documentation for layers developpers</p><h2 id="General_Architecture">General Architecture</h2><h2 id="Plugins">Plugins</h2></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/derivedLayerTutorial-toc.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/derivedLayerTutorial-toc.xml
deleted file mode 100644
index 42a0f7e2d56..00000000000
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/derivedLayerTutorial-toc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="guides/tutorials/derivedLayerTutorial.html" label="derivedLayerTutorial">
-	<topic href="guides/tutorials/derivedLayerTutorial.html" label="Using Derived Layer (OCL Expression)">
-		<topic href="guides/tutorials/derivedLayerTutorial.html#Creating_a_derived_Layer" label="Creating a derived Layer"></topic>
-		<topic href="guides/tutorials/derivedLayerTutorial.html#Writing_an_expression" label="Writing an expression"></topic>
-		<topic href="guides/tutorials/derivedLayerTutorial.html#Expressions_Examples" label="Expressions Examples">
-			<topic href="guides/tutorials/derivedLayerTutorial.html#All_views_starting_with_a_particular_string" label="All views starting with a particular string"></topic>
-			<topic href="guides/tutorials/derivedLayerTutorial.html#All_classes_that_are_abstract" label="All classes that are abstract"></topic>
-			<topic href="guides/tutorials/derivedLayerTutorial.html#All_classes_containing_an_operation_named_.27abc.27" label="All classes containing an operation named 'abc'"></topic>
-		</topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/derivedLayerTutorial.html b/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/derivedLayerTutorial.html
deleted file mode 100644
index c335b620d42..00000000000
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/derivedLayerTutorial.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Using_Derived_Layer_.28OCL_Expression.29">Using Derived Layer (OCL Expression)</h1><p>This tutorial show how to use a Derived Layer.</p><p>A derived layer is a leaf Layer where the views are automatically attached to 
-the layer, according to an expression. Actually, the expression is expressed in OCL.</p><h2 id="Creating_a_derived_Layer">Creating a derived Layer</h2><p>Derived Layer are actually called 'RegExp Layer'.</p><p>To create a derived layer:</p><ul><li>Click on the Layer stack</li><li>Click Layer-&gt;Create Layers ...-&gt;Create RegExp Layer</li></ul><p><img border="0" src="derivedLayerTutorial/createRegExpLayer.png"/></p><p>The new Layer appears under the Layer Stack. You can add Properties to the layer.</p><h2 id="Writing_an_expression">Writing an expression</h2><p>A derived layer is a Layer where views are automatically attached to 
-the layer. The expression is used for this purpose.</p><p>Actually, the expression can only be written in OCL.</p><p>The expression is a boolean expression returning true or false. The expression is applied on each <b><i>view</i></b> (ie Shapes and Links) in the diagram. If the expression return true, the corresponding element is attached to the layer. If the expression return false, the element is not attached to the layer.</p><p>The OCL expression has a predefined variable called 'self'. It is the 'view' that must be checked.
-This variable is of type <b><i>notation::View</i></b> . It can be subclassed in <b><i>notation::Shape</i></b>  and <b><i>notation::Link</i></b> .</p><p>A view in a uml diagram is always associated to a UML element. This element can be accessed with the expression <b><i>self.element</i></b> .</p><p>The expression is written in the Layer property-&gt;Expr
-<img border="0" src="derivedLayerTutorial/writeExpression.png"/></p><h2 id="Expressions_Examples">Expressions Examples</h2><h3 id="All_Shapes">All Shapes</h3><ul><li>self.oclIsKindOf(Shape)</li></ul><h3 id="All_Classes.2FInterface.2F_...">All Classes/Interface/ ...</h3><ul><li>self.element.oclIsKindOf(uml::NamedElement)</li><li>self.element.oclIsKindOf(uml::Class)</li><li>self.element.oclIsKindOf(uml::Package)</li></ul><h3 id="All_Classes.2FNamedElement.2F..._starting_with_a_particular_string">All Classes/NamedElement/... starting with a particular string</h3><ul><li>self.element.oclAsType(uml::NamedElement).name.startsWith('D') = true</li><li>self.element.oclAsType(uml::Class).name.startsWith('Cl') = true</li><li>self.element.oclAsType(uml::Interface).name.startsWith('I') = true</li></ul><h3 id="and_.2F_or">and / or</h3><ul><li>self.oclIsKindOf(Shape) <b>and</b>  self.oclAsType(Shape).visible = true </li></ul><ul><li>self.element.oclIsKindOf(uml::Class) <b>or</b>  self.element.oclIsKindOf(uml::Package) </li></ul><h3 id="All_classes_that_are_abstract">All classes that are abstract</h3><ul><li>self.element.oclAsType(uml::Class).isAbstract</li></ul><h3 id="All_classes_containing_an_operation_named_.27op1.27">All classes containing an operation named 'op1'</h3><ul><li>self.element.oclAsType(uml::Class).ownedOperation-&gt;exists( op | op.name = 'op1')</li></ul><p>Also:</p><ul><li>self.element.oclAsType(uml::Class).ownedAttribute-&gt;exists( attr | attr.name = 'name')</li></ul></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/layers-toc.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/layers-toc.xml
deleted file mode 100644
index 7baf497198d..00000000000
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/layers-toc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc label="Layers Tutorials" >
-	<topic label="Layers Tutorials">
-        <link toc="guides/tutorials/simpleTutorial-toc.xml"/>
-        <link toc="guides/tutorials/derivedLayerTutorial-toc.xml"/>
-        <anchor id="layers.guides.tutorials"/>
-	</topic>
-</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorial-toc.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorial-toc.xml
deleted file mode 100644
index cc37f9ba974..00000000000
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorial-toc.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="guides/tutorials/simpleTutorial.html" label="simpleTutorial">
-	<topic href="guides/tutorials/simpleTutorial.html" label="A simple Example and Tutorial">
-		<topic href="guides/tutorials/simpleTutorial.html#Create_a_new_Class_Diagram" label="Create a new Class Diagram"></topic>
-		<topic href="guides/tutorials/simpleTutorial.html#Open_the_LayersExplorer" label="Open the LayersExplorer"></topic>
-		<topic href="guides/tutorials/simpleTutorial.html#Attach_a_LayersStack_to_your_diagram" label="Attach a LayersStack to your diagram"></topic>
-		<topic href="guides/tutorials/simpleTutorial.html#Create_a_new_Layer_in_the_LayersStack" label="Create a new Layer in the LayersStack"></topic>
-		<topic href="guides/tutorials/simpleTutorial.html#Attach_Classes_to_the_Layer" label="Attach Classes to the Layer"></topic>
-		<topic href="guides/tutorials/simpleTutorial.html#Attach_some_properties_to_the_layer" label="Attach some properties to the layer"></topic>
-		<topic href="guides/tutorials/simpleTutorial.html#Add_more_layers" label="Add more layers"></topic>
-		<topic href="guides/tutorials/simpleTutorial.html#Change_the_value_of_an_attached_property" label="Change the value of an attached property"></topic>
-		<topic href="guides/tutorials/simpleTutorial.html#Add_the_3rd_layer" label="Add the 3rd layer"></topic>
-		<topic href="guides/tutorials/simpleTutorial.html#Disabling_a_Layer" label="Disabling a Layer"></topic>
-	</topic>
-	<topic href="guides/tutorials/simpleTutorial.html#Layer_Operators" label="Layer Operators">
-		<topic href="guides/tutorials/simpleTutorial.html#Top_Layer_Operator" label="Top Layer Operator"></topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorial.html b/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorial.html
deleted file mode 100644
index 16a657ecba0..00000000000
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorial.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="A_simple_Example_and_Tutorial">A simple Example and Tutorial</h1><p>In this example, we create a class diagram with 3 classes (class1, class2, class3), and a LayersStack with 3 layers (layer2, layer1, bottom). The bottom layer control the 3 classes and all the available properties. The layer1 control Class1 and Class2. The layer2 control Class2 and Class3.</p><p>This example is also a tutorial, if you follow it step by step.</p><h2 id="Create_a_new_Class_Diagram">Create a new Class Diagram</h2><p>Start by creating a Papyrus Class Diagram with 3 classes:</p><ul><li>Create a new ClassDiagram in a Papyrus model</li><li>Create three classes: Class1, Class2, Class3</li><li>Open the Papyrus ModelExplorer and the Property View.</li></ul><p>You should have a diagram and model explorer like in the following figure:</p><p><img border="0" src="simpleTutorialImages/diagramWith3Classes.png"/></p><h2 id="Open_the_LayersExplorer">Open the LayersExplorer</h2><p>To open the LayersExplorer:</p><ul><li>In the diagram, Right Click-&gt;Layers-&gt;Open LayersExplorer</li></ul><p><img border="0" src="simpleTutorialImages/opnLayersExplorer.png"/></p><ul><li>The explorer should open (not necessarly at the same position as in the following snapshoot):</li></ul><p><img border="0" src="simpleTutorialImages/OpenedLayersExplorer.png"/></p><h2 id="Attach_a_LayersStack_to_your_diagram">Attach a LayersStack to your diagram</h2><p>To attach a LayersStack to your diagram:</p><ul><li>Click in the diagram, then Right Click-&gt;Layers-&gt;Attach Layer Stack</li></ul><p><img border="0" src="simpleTutorialImages/attachLayersStack.png"/></p><ul><li>The LayersExplorer should show the layers attached to the LayersStack. By default, there is a 'Layer Operator' of type 'Top Layer'. The 'Top Layer Operator' contains layers that are ordered from top to bottom. When computing the value for a particular (view, property type) couple, it search the first layer that define a value for the couple, and return this value.</li></ul><p><img border="0" src="simpleTutorialImages/attachedLayersStack.png"/></p><h2 id="Create_a_new_Layer_in_the_LayersStack">Create a new Layer in the LayersStack</h2><p>We need now to create a layer in the stack.</p><p>To create a new Layer in the LayersStack:</p><ul><li>In the LayerExplorer, select the Top Layer Operator</li><li>right click-&gt;Layers-&gt;Create Layers ...-&gt;Create Layer</li></ul><p><img border="0" src="simpleTutorialImages/createLayer.png"/></p><ul><li>A new layer is created:<ul><li>Open the tree node to see the layer (1)</li><li>Select the layers tab in the Property view (2)</li><li>Change the name of the layer to 'bottomLayer' (3)</li></ul></li></ul><p><img border="0" src="simpleTutorialImages/createdLayer.png"/></p><h2 id="Attach_Classes_to_the_Layer">Attach Classes to the Layer</h2><p>Attaching some classes (also called views) to a layer means that this layer will partially control the value of some properties for this attached classes.
-Here, we attach the 3 classes.
-To Attach the classes to the Layer:</p><ul><li>Select the layer 'bottomLayer', right click-&gt;Layers-&gt;Attach Views</li></ul><p><img border="0" src="simpleTutorialImages/attachViewsToLayer.png"/> </p><ul><li>A window open, select the 3 classes (1) and click 'ok (2)'.:</li></ul><p><img border="0" src="simpleTutorialImages/attachViewWindowSelectClasses.png"/></p><h2 id="Attach_some_properties_to_the_layer">Attach some properties to the layer</h2><p>A layer is used to control some properties of the attached views. It is necessary to attach the properties
-controled by the layer. Once attached, it is possible to modify the values of this properties.</p><p>To attach some properties to the layer:</p><ul><li>In the LayersExplorer, select the defaul layer, right click-&gt;Layers-&gt;Attach Properties</li></ul><p><img border="0" src="simpleTutorialImages/openAttachPropertiesWindow.png"/></p><ul><li>The Attach Properties window open. Select properties as in the screenshot, and then 'ok'.</li></ul><p><img border="0" src="simpleTutorialImages/attachPropertiesWindow.png"/></p><ul><li>The properties and the views are now attached to the layers. Properties for these views are computed according to the layer, and as a resul the fill color change. This is because the default value for 'fill color' of the layer property is different from the Papyrus value.<ul><li>You can open the property node in the LayersExplorer, select a property, and change its value in the Property view.</li></ul></li></ul><p><img border="0" src="simpleTutorialImages/defaulLayerProperties.png"/></p><h2 id="Add_more_layers">Add more layers</h2><p>Now, add a new Layer in the Top Layer Operator:</p><ul><li>Select the Top Layer Operator, </li><li>right click-&gt;Layers-&gt;Create Layers ...-&gt;Create Layer</li><li>The new layer shoul appear as the first layer of the top layer operator.</li><li>Attach the class1 and class2</li><li>Attach the fill property</li></ul><h2 id="Change_the_value_of_an_attached_property">Change the value of an attached property</h2><p>You can change the value of the fill property color for the layer.</p><ul><li>Open the node 'Color' of the 'Fill Property' </li><li>click on the color picker in the Property view. </li><li>Choose a new color (blue).</li><li>The color should be applied on the 2 classes attached to the layer (Class1 and Class2). </li><li>Class3 still have the color of the 'bottom' layer.</li></ul><p><img border="0" src="simpleTutorialImages/changeFillColorValue.png"/></p><ul><li>Note that Class1 and Class2 color change to 'blue' because when computing the color for Class1, the first layer that attach both Class1and Property Fill is the Layer1. In this layer, the value for the Property Fill is 'blue', so it is for Class1. The same happen for class2.</li></ul><h2 id="Add_the_3rd_layer">Add the 3rd layer</h2><ul><li>Add a 3rd layer<ul><li>Attach the 2 classes Class2 and Class3 to this layer.</li><li>Attach the property 'Fill Color'</li><li>Change the value of 'Fill Color' to orange<ul><li>Class2 and Class3 should change to orange.</li></ul></li></ul></li></ul><p><img border="0" src="simpleTutorialImages/layer2.png"/></p><h2 id="Disabling_a_Layer">Disabling a Layer</h2><p>It is possible to disable a layer without deleting it. A disabled layer do not participate in layer stack.</p><p>To disable a layer, select it in the LayersExplorer.</p><ul><li>Then in the PropertyView, open the Layers tab</li><li>select or unselect the layer with 'Is Layer Enable".<ul><li>Note that in our example, disabling the Layer2 will change the color of the Class2 and Class3. Class2 take the color specified by layer1, and Class3 the color specified by bottomLayer.</li></ul></li></ul><p><img border="0" src="simpleTutorialImages/disableLayer.png"/></p><h1 id="Layer_Operators">Layer Operators</h1><p>Layer Operators are a kind of layer that can contain other Layers.</p><p>A layer operator is called like this because it is used to apply an 'operator' on its nested layers. The operator compute the property values for attached layers.</p><p>It is not possible to attach directly views or properties to a layer operator. But a layer operator still have a set of attached views and a set of attached properties. The values of these properties are the results of applying the operator on the properties of the nested layers. The set of the attached views is generally the union of the views attached to the nested layers.</p><p>There is different kind of 'layer operators', each one proposing a different way of computing the property values.</p><h2 id="Top_Layer_Operator">Top Layer Operator</h2><p>The 'Top Layer Operator' contains layers that are ordered from top to bottom. It is called 'Top Layer Operator' because it return the top most value for a particular (view, property type) couple. </p><p>When computing the property value for a specified (view, property type), the Top Layer Operator return the first value found for this couple. It start from the top layer, and stop as soon as a layer as a value set for the specified (view, property type).</p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/plugin.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/plugin.xml
index 001043a872d..e8d2facd160 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/plugin.xml
@@ -4,31 +4,31 @@
    <extension

          point="org.eclipse.help.toc">

       <toc

-            file="guides/users/index-toc.xml"

+            file="target/generated-eclipse-help/guides/users/index-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="guides/tutorials/layers-toc.xml"

+            file="target/generated-eclipse-help/guides/tutorials/layers-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="guides/tutorials/simpleTutorial-toc.xml"

+            file="target/generated-eclipse-help/guides/tutorials/simpleTutorial-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="guides/tutorials/derivedLayerTutorial-toc.xml"

+            file="target/generated-eclipse-help/guides/tutorials/derivedLayerTutorial-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="guides/developpers/layers-toc.xml"

+            file="target/generated-eclipse-help/guides/developpers/layers-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="guides/developpers/layersDevs-toc.xml"

+            file="target/generated-eclipse-help/guides/developpers/layersDevs-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="guides/index-toc.xml"

+            file="target/generated-eclipse-help/guides/index-toc.xml"

             primary="false">

       </toc>

    </extension>

diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/pom.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/pom.xml
index fd471886590..8e8b904d569 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resources</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/developpers/layers-toc.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/developpers/layers-toc.xml
new file mode 100644
index 00000000000..8392350d660
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/developpers/layers-toc.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="Papyrus Layers" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocDev">
+	<topic href="target/generated-eclipse-help/guides/developpers/layersDevs.html" label="Layers Developers Documentation">
+        <link toc="target/generated-eclipse-help/guides/developpers/layersDevs-toc.xml"/>
+        <anchor id="layers.guides.devs"/>
+	</topic>
+</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/developpers/layersDevs.mediawiki b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/developpers/layersDevs.mediawiki
index d9a33a73e11..d9a33a73e11 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/developpers/layersDevs.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/developpers/layersDevs.mediawiki
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/index-toc.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/index-toc.xml
index da056b58757..2de1876a0a8 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/index-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/index-toc.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <toc label="Layers" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
   <topic label="Layers" >
-     <link toc="guides/tutorials/layers-toc.xml"/>
+     <link toc="target/generated-eclipse-help/guides/tutorials/layers-toc.xml"/>
      <anchor id="tutorials"/>
-     <link toc="guides/users/index-toc.xml"/>
+     <link toc="target/generated-eclipse-help/guides/users/index-toc.xml"/>
      <anchor id="documentation"/>
   </topic>
 </toc>
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/derivedLayerTutorial.mediawiki b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/derivedLayerTutorial.mediawiki
index 583466e2f44..583466e2f44 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/derivedLayerTutorial.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/derivedLayerTutorial.mediawiki
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/derivedLayerTutorial/createRegExpLayer.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/derivedLayerTutorial/createRegExpLayer.png
index e277553b384..e277553b384 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/derivedLayerTutorial/createRegExpLayer.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/derivedLayerTutorial/createRegExpLayer.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/derivedLayerTutorial/writeExpression.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/derivedLayerTutorial/writeExpression.png
index 81061e0e1a5..81061e0e1a5 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/derivedLayerTutorial/writeExpression.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/derivedLayerTutorial/writeExpression.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/layers-toc.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/layers-toc.xml
new file mode 100644
index 00000000000..d19a8577eb5
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/layers-toc.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="Layers Tutorials" >
+	<topic label="Layers Tutorials">
+        <link toc="target/generated-eclipse-help/guides/tutorials/simpleTutorial-toc.xml"/>
+        <link toc="target/generated-eclipse-help/guides/tutorials/derivedLayerTutorial-toc.xml"/>
+        <anchor id="layers.guides.tutorials"/>
+	</topic>
+</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorial.mediawiki b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorial.mediawiki
index c4289c45315..c4289c45315 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorial.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorial.mediawiki
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/OpenedLayersExplorer.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/OpenedLayersExplorer.png
index 3243d6a59a0..3243d6a59a0 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/OpenedLayersExplorer.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/OpenedLayersExplorer.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/attachLayersStack.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/attachLayersStack.png
index fb89859462d..fb89859462d 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/attachLayersStack.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/attachLayersStack.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/attachPropertiesWindow.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/attachPropertiesWindow.png
index 43352b552f8..43352b552f8 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/attachPropertiesWindow.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/attachPropertiesWindow.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/attachViewWindow.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/attachViewWindow.png
index 9aad29fef4c..9aad29fef4c 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/attachViewWindow.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/attachViewWindow.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/attachViewWindowSelectClasses.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/attachViewWindowSelectClasses.png
index 3275da01c65..3275da01c65 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/attachViewWindowSelectClasses.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/attachViewWindowSelectClasses.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/attachViewsToLayer.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/attachViewsToLayer.png
index 669be6f747e..669be6f747e 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/attachViewsToLayer.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/attachViewsToLayer.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/attachedLayersStack.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/attachedLayersStack.png
index 8d536ad621e..8d536ad621e 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/attachedLayersStack.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/attachedLayersStack.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/changeFillColorValue.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/changeFillColorValue.png
index db065e6effe..db065e6effe 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/changeFillColorValue.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/changeFillColorValue.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/createLayer.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/createLayer.png
index 190ec7c5fba..190ec7c5fba 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/createLayer.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/createLayer.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/createdLayer.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/createdLayer.png
index 27564e6d832..27564e6d832 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/createdLayer.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/createdLayer.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/defaulLayerProperties.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/defaulLayerProperties.png
index e2da266906d..e2da266906d 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/defaulLayerProperties.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/defaulLayerProperties.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/diagramWith3Classes.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/diagramWith3Classes.png
index 45529bd2afa..45529bd2afa 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/diagramWith3Classes.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/diagramWith3Classes.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/disableLayer.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/disableLayer.png
index f4cb2f36020..f4cb2f36020 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/disableLayer.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/disableLayer.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/layer2.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/layer2.png
index 9181d275fcb..9181d275fcb 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/layer2.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/layer2.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/openAttachPropertiesWindow.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/openAttachPropertiesWindow.png
index 79c2737f73e..79c2737f73e 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/openAttachPropertiesWindow.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/openAttachPropertiesWindow.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/opnLayersExplorer.png b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/opnLayersExplorer.png
index 4a4a2c92104..4a4a2c92104 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/tutorials/simpleTutorialImages/opnLayersExplorer.png
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/tutorials/simpleTutorialImages/opnLayersExplorer.png
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/users/index-toc.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/users/index-toc.xml
index 6dc87b4974a..0e395c226c0 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/guides/users/index-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/users/index-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <toc label="Layers Documentation" >
 	<topic label="Layers Documentation">
-        <link toc="guides/tutorials/derivedLayerTutorial-toc.xml"/>
+        <link toc="target/generated-eclipse-help/guides/²tutorials/derivedLayerTutorial-toc.xml"/>
          <anchor id="layers.guides.documentations"/>
 	</topic>
 </toc>
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/.classpath b/plugins/doc/org.eclipse.papyrus.moka.doc/.classpath
index 8a8f1668cdc..14129a12bff 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/.classpath
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/.classpath
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

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

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

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

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/.project b/plugins/doc/org.eclipse.papyrus.moka.doc/.project
index 8435e8d743b..015900e0122 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/.project
@@ -20,8 +20,14 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

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

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

 	</natures>

diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.moka.doc/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..9ca8e68231b 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1

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

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

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

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

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

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

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

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

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

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.moka.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF
index 270c1114d66..b260eed246e 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.help;bundle-version="3.6.0"

+ org.eclipse.help;bundle-version="3.6.0",

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.1.0.qualifier

@@ -8,5 +9,5 @@ Bundle-Name: Moka Documentation
 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.moka.doc.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.moka.doc;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Bundle-Description: %pluginDescription

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/build.properties b/plugins/doc/org.eclipse.papyrus.moka.doc/build.properties
index 65c4043115b..fff5fe292bc 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/build.properties
@@ -1,8 +1,7 @@
-source.. = src/

-output.. = bin/

 bin.includes = META-INF/,\

-               .,\

                about.html,\

-               resource/,\

-               plugin.xml

-src.includes = about.html

+               plugin.xml,\

+               target/generated-eclipse-help/** 

+src.includes = about.html,\

+				resource/

+jre.compilation.profile = JavaSE-1.7
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.moka.doc/plugin.xml
index 53bafee9b90..c4d8bc2a1bf 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/plugin.xml
@@ -4,11 +4,11 @@
    <extension

          point="org.eclipse.help.toc">

       <toc

-            file="resource/moka-main-toc.xml"

+            file="target/generated-eclipse-help/moka-main-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="resource/moka-toc.xml"

+            file="target/generated-eclipse-help/moka-toc.xml"

             primary="false">

       </toc>

    </extension>

diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.moka.doc/pom.xml
index 3b3ac78973e..529edaa8f25 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/ActiveClassDiagram.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/ActiveClassDiagram.png
index d7b42d11c98..d7b42d11c98 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/ActiveClassDiagram.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/ActiveClassDiagram.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/AnimationConfiguration.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/AnimationConfiguration.png
index 812fbe6d763..812fbe6d763 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/AnimationConfiguration.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/AnimationConfiguration.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/BreakpointDiagramView.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/BreakpointDiagramView.png
index 32ec55daa83..32ec55daa83 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/BreakpointDiagramView.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/BreakpointDiagramView.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/BreakpointsView.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/BreakpointsView.png
index 4e59ae7f65b..4e59ae7f65b 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/BreakpointsView.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/BreakpointsView.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/Debug_Configuration.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/Debug_Configuration.png
index 400ecfe1daa..400ecfe1daa 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/Debug_Configuration.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/Debug_Configuration.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/EmptyLaunchConfiguration.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/EmptyLaunchConfiguration.png
index 1af79b7d573..1af79b7d573 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/EmptyLaunchConfiguration.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/EmptyLaunchConfiguration.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/GenerateFactory.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/GenerateFactory.png
index ccfd5c9a9f9..ccfd5c9a9f9 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/GenerateFactory.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/GenerateFactory.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/MyStyleSheets.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/MyStyleSheets.png
index e5450262eea..e5450262eea 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/MyStyleSheets.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/MyStyleSheets.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/NewStyleSheets.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/NewStyleSheets.png
index f64cdfa9eef..f64cdfa9eef 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/NewStyleSheets.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/NewStyleSheets.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/New_Configuration.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/New_Configuration.png
index b613b716098..b613b716098 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/New_Configuration.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/New_Configuration.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/Papyrus_Moka_ExecutionEngines.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/Papyrus_Moka_ExecutionEngines.png
index ce252a39b33..ce252a39b33 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/Papyrus_Moka_ExecutionEngines.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/Papyrus_Moka_ExecutionEngines.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/PropertiesView_EmptyStyleSheets.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/PropertiesView_EmptyStyleSheets.png
index b6b4a6c3af0..b6b4a6c3af0 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/PropertiesView_EmptyStyleSheets.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/PropertiesView_EmptyStyleSheets.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/RemoveBreakpoints.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/RemoveBreakpoints.png
index 299d3fa9c9e..299d3fa9c9e 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/RemoveBreakpoints.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/RemoveBreakpoints.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/Setup_launch_configuration.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/Setup_launch_configuration.png
index ec20e9e1d3f..ec20e9e1d3f 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/Setup_launch_configuration.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/Setup_launch_configuration.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/ThreadStatusView_empty.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/ThreadStatusView_empty.png
index 3d55740a814..3d55740a814 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/ThreadStatusView_empty.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/ThreadStatusView_empty.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/ToggleBreakpoint.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/ToggleBreakpoint.png
index 971f72af9f6..971f72af9f6 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/ToggleBreakpoint.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/ToggleBreakpoint.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/ToggleBreakpointModelExplorer.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/ToggleBreakpointModelExplorer.png
index 2fd1644792e..2fd1644792e 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/ToggleBreakpointModelExplorer.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/ToggleBreakpointModelExplorer.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/ToogleBreakpointActivation.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/ToogleBreakpointActivation.png
index b563f8acf4c..b563f8acf4c 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/ToogleBreakpointActivation.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/ToogleBreakpointActivation.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/VariableView.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/VariableView.png
index d64ef6433e5..d64ef6433e5 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/VariableView.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/VariableView.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/Window_Preferences.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/Window_Preferences.png
index b3d99eda6aa..b3d99eda6aa 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/Window_Preferences.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/Window_Preferences.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/modelExplorer_Create.png b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/modelExplorer_Create.png
index 051f1e5a8ec..051f1e5a8ec 100644
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/modelExplorer_Create.png
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/images/modelExplorer_Create.png
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka-main-toc.xml b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka-main-toc.xml
index 75384be892a..91fab5f24ed 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka-main-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>

 <toc label="Model Execution" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

-   <topic href="resource/moka.html" label="Execute UML Models using MOKA">

-      <link toc="resource/moka-toc.xml"/>

+   <topic href="target/generated-eclipse-help/moka.html" label="Execute UML Models using MOKA">

+      <link toc="target/generated-eclipse-help/moka-toc.xml"/>

       <anchor id="ModelExecution"/>

    </topic>	

 </toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka-toc.xml b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka-toc.xml
deleted file mode 100755
index 5e78a64999c..00000000000
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka-toc.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/moka.html" label="moka">
-	<topic href="resource/moka.html" label="Moka Overview">
-		<topic href="resource/moka.html#Based_on_standards" label="Based on standards"></topic>
-		<topic href="resource/moka.html#Interactive_executions" label="Interactive executions"></topic>
-		<topic href="resource/moka.html#Extensible_framework" label="Extensible framework"></topic>
-	</topic>
-	<topic href="resource/moka.html#Getting_started_with_Moka" label="Getting started with Moka">
-		<topic href="resource/moka.html#Your_first_executable_model" label="Your first executable model"></topic>
-		<topic href="resource/moka.html#Selecting_the_execution_engine" label="Selecting the execution engine"></topic>
-		<topic href="resource/moka.html#Starting_an_execution_with_a_launch_configuration" label="Starting an execution with a launch configuration"></topic>
-		<topic href="resource/moka.html#Managing_breakpoints" label="Managing breakpoints"></topic>
-		<topic href="resource/moka.html#Controlling_Executions" label="Controlling Executions"></topic>
-		<topic href="resource/moka.html#Configuring_animation" label="Configuring animation"></topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka.html b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka.html
deleted file mode 100755
index c753da1052a..00000000000
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka.html
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Moka_Overview">Moka Overview</h1><p>Moka is a Papyrus module for execution of UML models, which natively includes an execution engine complying with OMG standards foundational UML (fUML <a href="http://www.omg.org/spec/FUML/">http://www.omg.org/spec/FUML/</a>) and Precise Semantics of UML Composite Structures (PSCS <i>[link to OMG webpage available soon</i>]). These standards deal with execution semantics of UML. Moka is integrated with the Eclipse debug framework to provide  control, observation and animation facilities over executions. Moka can be easily extended to support alternative execution semantics, and thereby be adapted to multiple usage scenarios and domains. The key features of Moka are:</p><h2 id="Based_on_standards">Based on standards</h2><p>Moka provides basic execution and debugging facilities for fUML and its extension PSCS, which capture an executable subset of UML with precise and standard semantics. This subset is expressive enough to model structure and behavior of systems involving concurrent communicating entities, independently of technological platform details.</p><h2 id="Interactive_executions">Interactive executions</h2><p>Moka provides debug and animation facilities through a contribution and an extension to the Eclipse debug API. It is thereby possible to control execution of models(e.g., suspending/resuming executions after breakpoints have been encountered) as well as to observing states of executed models at runtime (e.g., emphasizing graphical views of model elements on which execution has suspended, retrieving and displaying any state information about the runtime manifestation of these model elements).</p><h2 id="Extensible_framework">Extensible framework</h2><p>Moka can be easily extended to address new execution semantics.  This can be done through extension points enabling registration of executable model libraries (e.g., new MoCs, trace libraries, etc.) or simply tool-level extensions of the execution engine.</p><h1 id="Getting_started_with_Moka">Getting started with Moka</h1><h2 id="Your_first_executable_model">Your first executable model</h2><p>This tutorial is based on a simple executable model. It consists in an active class, with a classifier behavior that indefinitely increments a counter. The corresponding Papyrus model is available here <a href="https://wiki.eclipse.org/File:BasicActiveObjectExample.zip">https://wiki.eclipse.org/File:BasicActiveObjectExample.zip</a>. Download it, define a project in your workspace, and then import the model in this project. Once the model is imported and open in Papyrus, the Increment class should look like:</p><p><img title="The active class increment" alt="The active class increment" border="0" src="ActiveClassDiagram.png"/></p><p>The behaviors associated with this class (i.e., IncrementClassifierBehavior, which is the classifier behavior, and incrementMethod, which is the implementation of operation increment) are specified by activity diagrams. Corresponding activities are executable, according to the semantics given in OMG standards fUML and PSCS. Anyway,  in fUML and PSCS, the execution of a model usually starts by executing a kind of "main" activity, which is responsible for instantiating objects, and stimulate them if needed (through signals or operation calls). Moka provides some facilities to generate this kind of activities. Just right click on class Increment, then go to Moka / Modeling Utils / Generate Factory.</p><p><img border="0" src="GenerateFactory.png"/></p><p>A factory activity for class Increment (Increment_Factory in the figure below) is then generated. This activity will be used in the next steps of this tutorial to actually start the execution of the model. Do not forget to save your model, otherwise the factory will not be visible in the launch configuration definition step described below in this tutorial.</p><p><img border="0" src="modelExplorer_Create.png"/></p><h2 id="Selecting_the_execution_engine">Selecting the execution engine</h2><p>Since Moka is an extensible execution framework, multiple execution engines can be registered in your environment. Before starting an execution, you should make sure that the appropriate execution engine is selected. To do so, go to Eclipse preferences, as shown in the figure below.</p><p><img border="0" src="Window_Preferences.png"/></p><p>Once the preference page is open, go to Papyrus/Moka. Moka is released with 3 execution engines. There are two versions of the PSCS execution engine (one is multi-threaded, with on thread per active object, and the other one is single-threaded). There is also an implementation of the fUML execution engine.</p><p><img border="0" src="Papyrus_Moka_ExecutionEngines.png"/></p><p>To make sure that the Increment example properly executes, you should select one of the two PSCS engines, press Apply and then OK.</p><h2 id="Starting_an_execution_with_a_launch_configuration">Starting an execution with a launch configuration</h2><p>Moka is integrated with the Eclipse Debug Framework. It implies that, in order to start an execution, a launch configuration has to be defined. A launch configuration can be created by clicking on the "Debug As" tool from the Eclipse tool bar, and then by pressing Debug Configurations.</p><p><img border="0" src="Debug_Configuration.png"/></p><p>Then create a new Moka launch configuration, as shown in the figure below.</p><p><img border="0" src="New_Configuration.png"/></p><p>A Moka launch configuration requires two pieces of information: the UML model from which the execution will be started, and the actual model element to be executed.</p><p><img border="0" src="EmptyLaunchConfiguration.png"/></p><p>Press the Browse button to select a UML model from your workspace (a .uml file shall be selected). Then, select the actual model element to be executed in the list "Element to be executed". This list is sorted alphabetically, by qualified names. Note that, in the case of the fUML and PSCS execution engines provided by Moka, the "Element to be executed" shall be an Activity. Your launch configuration should now look like:</p><p><img border="0" src="Setup_launch_configuration.png"/></p><p>To start the execution, simply press the Debug button. In our example, according to the semantics of PSCS, the effect of executing activity Increment_Factory will be to instantiate an Increment object, to construct this object (please refer to the default construction strategy described in the PSCS specification), and then start its classifier behavior. Our increment object will start to increment, and will go on until you stop the execution. Note that a Launch configuration is a persistent artifact, so that, if you close Papyrus and then open it again, your launch configuration will still be available, and you will be able to relaunch it.</p><h2 id="Managing_breakpoints">Managing breakpoints</h2><p>In order to easily observe and control the state of you model at some specific points of the execution, Moka lets you associate breakpoints with model elements. This can be done through the contextual menu Moka/Debug, which is available from the model explorer and from diagrams.</p><p><img border="0" src="ToggleBreakpointModelExplorer.png"/></p><p><img border="0" src="ToggleBreakpoint.png"/></p><p>Once a breakpoint has been created, a small icon (blue circle) appears on top of the corresponding model element.</p><p><img border="0" src="BreakpointDiagramView.png"/></p><p>Using the Moka/Debug menu, an existing breakpoing can also be de-activated (without being removed), using the "Toggle breakpoint activation" button. In this case, it will be depicted by a small white circle on top of the corresponding model element.</p><p><img border="0" src="ToogleBreakpointActivation.png"/></p><p>The set of existing breakpoints (as well as their status - Enabled / Disabled) is given in the breakpoint control panel, which is usually located in the upper, righ-hand part of the Debug perspective.</p><p><img border="0" src="BreakpointsView.png"/></p><p>The breakpoint control panel more generally lets you enable, disable and remove breakpoints. Just right click in the panel, as depicted in the figure below.</p><p><img border="0" src="RemoveBreakpoints.png"/></p><p>From  an execution standpoint, it is important to note that the selected execution engine (see section on "Selecting the execution engine") is responsible for interpreting breakpoints. In the case of the fUML and PSCS execution engines provided by Moka, only breakpoints associated with activity nodes or edges will be taken into account (even if Moka lets you associate breakpoints with any kind of model element). Other breakpoints are simply ignored.</p><h2 id="Controlling_Executions">Controlling Executions</h2><p>Executions can be controlled using the execution control panel, provided by the Eclipse Debug perspective.</p><p><img border="0" src="ThreadStatusView_empty.png"/></p><p>It is thereby possible to resume, suspend, stop, or even do step-by-step executions. Note also that, when execution is suspended, variables may be observable in the variable panel.</p><p><img border="0" src="VariableView.png"/></p><p>The selected execution engine is responsible to determine what the visible variables are in the context of an execution. In the case of the fUML and PSCS engines provided by Moka, visible variables are properties of the context object in which in the suspended activity is executing (in our example, the suspended activity is the classifier behavior of class Increment, which executes in the context of a particular Increment object, which holds a value for property counter).</p><h2 id="Configuring_animation">Configuring animation</h2><p>By default, Moka is configured to animate diagrams during executions, without automatically giving focus / making visible a diagram where a model element being executed has a graphical representation. This can be configured in the Animation control panel, which is available in the Debug perspective.</p><p><img border="0" src="AnimationConfiguration.png"/></p><p>The slide bar enables to control the artificial animation delay between two animation steps. Note that option "Open diagrams automatically" may decrease performances of the execution engine. By default, Moka is released with some default animation styles, which determine the emphasis style to be applied to graphical elements when the execution is suspended, or more generally for animation. This default style can be overloaded per diagram, by attaching a CSS style sheet, as depicted in the figures below.</p><p><img border="0" src="PropertiesView_EmptyStyleSheets.png"/></p><p><img border="0" src="NewStyleSheets.png"/></p><p><img border="0" src="MyStyleSheets.png"/></p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka.mediawiki b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka.mediawiki
index cf4262b98af..0a82648b995 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/resource/moka.mediawiki
@@ -19,25 +19,25 @@ Moka can be easily extended to address new execution semantics.  This can be don
 
 This tutorial is based on a simple executable model. It consists in an active class, with a classifier behavior that indefinitely increments a counter. The corresponding Papyrus model is available here [https://wiki.eclipse.org/File:BasicActiveObjectExample.zip]. Download it, define a project in your workspace, and then import the model in this project. Once the model is imported and open in Papyrus, the Increment class should look like:
 
-[[Image:ActiveClassDiagram.png|The active class increment]]
+[[Image:images/ActiveClassDiagram.png|The active class increment]]
 
 The behaviors associated with this class (i.e., IncrementClassifierBehavior, which is the classifier behavior, and incrementMethod, which is the implementation of operation increment) are specified by activity diagrams. Corresponding activities are executable, according to the semantics given in OMG standards fUML and PSCS. Anyway,  in fUML and PSCS, the execution of a model usually starts by executing a kind of "main" activity, which is responsible for instantiating objects, and stimulate them if needed (through signals or operation calls). Moka provides some facilities to generate this kind of activities. Just right click on class Increment, then go to Moka / Modeling Utils / Generate Factory.
 
-[[Image:GenerateFactory.png]]
+[[Image:images/GenerateFactory.png]]
 
 A factory activity for class Increment (Increment_Factory in the figure below) is then generated. This activity will be used in the next steps of this tutorial to actually start the execution of the model. Do not forget to save your model, otherwise the factory will not be visible in the launch configuration definition step described below in this tutorial.
 
-[[Image:modelExplorer_Create.png]]
+[[Image:images/modelExplorer_Create.png]]
 
 == Selecting the execution engine  ==
 
 Since Moka is an extensible execution framework, multiple execution engines can be registered in your environment. Before starting an execution, you should make sure that the appropriate execution engine is selected. To do so, go to Eclipse preferences, as shown in the figure below.
 
-[[Image:Window_Preferences.png]]
+[[Image:images/Window_Preferences.png]]
 
 Once the preference page is open, go to Papyrus/Moka. Moka is released with 3 execution engines. There are two versions of the PSCS execution engine (one is multi-threaded, with on thread per active object, and the other one is single-threaded). There is also an implementation of the fUML execution engine.
 
-[[Image:Papyrus_Moka_ExecutionEngines.png]]
+[[Image:images/Papyrus_Moka_ExecutionEngines.png]]
 
 To make sure that the Increment example properly executes, you should select one of the two PSCS engines, press Apply and then OK.
 
@@ -45,19 +45,19 @@ To make sure that the Increment example properly executes, you should select one
 
 Moka is integrated with the Eclipse Debug Framework. It implies that, in order to start an execution, a launch configuration has to be defined. A launch configuration can be created by clicking on the "Debug As" tool from the Eclipse tool bar, and then by pressing Debug Configurations.
 
-[[Image:Debug_Configuration.png]]
+[[Image:images/Debug_Configuration.png]]
 
 Then create a new Moka launch configuration, as shown in the figure below.
 
-[[Image:New_Configuration.png]]
+[[Image:images/New_Configuration.png]]
 
 A Moka launch configuration requires two pieces of information: the UML model from which the execution will be started, and the actual model element to be executed.
 
-[[Image:EmptyLaunchConfiguration.png]]
+[[Image:images/EmptyLaunchConfiguration.png]]
 
 Press the Browse button to select a UML model from your workspace (a .uml file shall be selected). Then, select the actual model element to be executed in the list "Element to be executed". This list is sorted alphabetically, by qualified names. Note that, in the case of the fUML and PSCS execution engines provided by Moka, the "Element to be executed" shall be an Activity. Your launch configuration should now look like:
 
-[[Image:Setup_launch_configuration.png]]
+[[Image:images/Setup_launch_configuration.png]]
 
 To start the execution, simply press the Debug button. In our example, according to the semantics of PSCS, the effect of executing activity Increment_Factory will be to instantiate an Increment object, to construct this object (please refer to the default construction strategy described in the PSCS specification), and then start its classifier behavior. Our increment object will start to increment, and will go on until you stop the execution. Note that a Launch configuration is a persistent artifact, so that, if you close Papyrus and then open it again, your launch configuration will still be available, and you will be able to relaunch it.
 
@@ -65,25 +65,25 @@ To start the execution, simply press the Debug button. In our example, according
 
 In order to easily observe and control the state of you model at some specific points of the execution, Moka lets you associate breakpoints with model elements. This can be done through the contextual menu Moka/Debug, which is available from the model explorer and from diagrams.
 
-[[Image:ToggleBreakpointModelExplorer.png]]
+[[Image:images/ToggleBreakpointModelExplorer.png]]
 
-[[Image:ToggleBreakpoint.png]]
+[[Image:images/ToggleBreakpoint.png]]
 
 Once a breakpoint has been created, a small icon (blue circle) appears on top of the corresponding model element.
 
-[[Image:BreakpointDiagramView.png]]
+[[Image:images/BreakpointDiagramView.png]]
 
 Using the Moka/Debug menu, an existing breakpoing can also be de-activated (without being removed), using the "Toggle breakpoint activation" button. In this case, it will be depicted by a small white circle on top of the corresponding model element.
 
-[[Image:ToogleBreakpointActivation.png]]
+[[Image:images/ToogleBreakpointActivation.png]]
 
 The set of existing breakpoints (as well as their status - Enabled / Disabled) is given in the breakpoint control panel, which is usually located in the upper, righ-hand part of the Debug perspective.
 
-[[Image:BreakpointsView.png]]
+[[Image:images/BreakpointsView.png]]
 
 The breakpoint control panel more generally lets you enable, disable and remove breakpoints. Just right click in the panel, as depicted in the figure below.
 
-[[Image:RemoveBreakpoints.png]]
+[[Image:images/RemoveBreakpoints.png]]
 
 From  an execution standpoint, it is important to note that the selected execution engine (see section on "Selecting the execution engine") is responsible for interpreting breakpoints. In the case of the fUML and PSCS execution engines provided by Moka, only breakpoints associated with activity nodes or edges will be taken into account (even if Moka lets you associate breakpoints with any kind of model element). Other breakpoints are simply ignored.
 
@@ -91,11 +91,11 @@ From  an execution standpoint, it is important to note that the selected executi
 
 Executions can be controlled using the execution control panel, provided by the Eclipse Debug perspective.
 
-[[Image:ThreadStatusView_empty.png]]
+[[Image:images/ThreadStatusView_empty.png]]
 
 It is thereby possible to resume, suspend, stop, or even do step-by-step executions. Note also that, when execution is suspended, variables may be observable in the variable panel.
 
-[[Image:VariableView.png]]
+[[Image:images/VariableView.png]]
 
 The selected execution engine is responsible to determine what the visible variables are in the context of an execution. In the case of the fUML and PSCS engines provided by Moka, visible variables are properties of the context object in which in the suspended activity is executing (in our example, the suspended activity is the classifier behavior of class Increment, which executes in the context of a particular Increment object, which holds a value for property counter).
 
@@ -103,13 +103,13 @@ The selected execution engine is responsible to determine what the visible varia
 
 By default, Moka is configured to animate diagrams during executions, without automatically giving focus / making visible a diagram where a model element being executed has a graphical representation. This can be configured in the Animation control panel, which is available in the Debug perspective.
 
-[[Image:AnimationConfiguration.png]]
+[[Image:images/AnimationConfiguration.png]]
 
 The slide bar enables to control the artificial animation delay between two animation steps. Note that option "Open diagrams automatically" may decrease performances of the execution engine. By default, Moka is released with some default animation styles, which determine the emphasis style to be applied to graphical elements when the execution is suspended, or more generally for animation. This default style can be overloaded per diagram, by attaching a CSS style sheet, as depicted in the figures below.
 
-[[Image:PropertiesView_EmptyStyleSheets.png]]
+[[Image:images/PropertiesView_EmptyStyleSheets.png]]
 
-[[Image:NewStyleSheets.png]]
+[[Image:images/NewStyleSheets.png]]
 
-[[Image:MyStyleSheets.png]]
+[[Image:images/MyStyleSheets.png]]
 
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.classpath b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.classpath
index 8a8f1668cdc..c93a9d1e930 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.classpath
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

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

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

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

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.project b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.project
index f5b8a7b60c4..a778de96791 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.project
@@ -20,8 +20,14 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

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

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

 	</natures>

diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 2b3add74f34..00000000000
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1

-encoding//resource/reqif-toc.xml=utf-8

-encoding//resource/reqif.html=utf-8

diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF
index 92d6347c9e6..fd0a28892e5 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF
@@ -5,9 +5,11 @@ Bundle-SymbolicName: org.eclipse.papyrus.req.reqif.doc;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.req.reqif.doc.Activator
 Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ org.eclipse.core.runtime,
+ org.eclipse.help;bundle-version="3.6.0",
+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-Description: This is the plugin that present the user documentation of the ReqIF import
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/build.properties b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/build.properties
index db6ac4ca2a7..0993594b855 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/build.properties
@@ -1,7 +1,8 @@
-source.. = src/

-output.. = bin/

 bin.includes = META-INF/,\

-               .,\

+               about.html,\

                plugin.xml,\

-               resource/

-src.includes = resource/DeveloperDoc.mediawiki

+               target/generated-eclipse-help/**,\

+               plugin.properties

+src.includes = about.html,\

+				resource/

+jre.compilation.profile = JavaSE-1.7

diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.xml
index 5e6625a9d0c..997ba14c0dd 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.xml
@@ -4,11 +4,11 @@
    <extension

          point="org.eclipse.help.toc">

       <toc

-            file="resource/reqif-main-toc.xml"

+            file="target/generated-eclipse-help/DeveloperDoc-main-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="resource/reqif-toc.xml"

+            file="target/generated-eclipse-help/DeveloperDoc-toc.xml"

             primary="false">

       </toc>

    </extension>

diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/pom.xml
index 2d419b0ed82..d342d418c81 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/reqif-main-toc.xml b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc-main-toc.xml
index 3454eac4e9a..a05843330f8 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/reqif-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc-main-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <toc label="ReqID Import Export" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-   <topic href="resource/reqif.html" label="ReqIF Import Export">
+   <topic href="target/generated-eclipse-help/DeveloperDoc.html" label="ReqIF Import Export">
       <anchor id="ReqIF Import Export"/>
-      <link toc="resource/reqif-toc.xml"/>
+      <link toc="target/generated-eclipse-help/DeveloperDoc-toc.xml"/>
    </topic>	
 </toc>
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc.mediawiki b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc.mediawiki
index 136ae6a7ea1..a9832aa51ff 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc.mediawiki
@@ -1,39 +1,39 @@
 
 
 = Import Export of ReqIF elements into Papyrus =
-<span id="_joeEYLH0EeSvo7o7Iu6GQQ">This model explains the functionality in Papyrus Req in order to import or export ReqIF files into Papyrus (OMG Document Number: formal/2013-10-01 Standard document URL: http://www.omg.org/spec/ReqIF/1.1)
-</span>
-
-==<span id="_johHsbH0EeSvo7o7Iu6GQQ">Requirements</span>==
-<span id="_jokyELH0EeSvo7o7Iu6GQQ">- ReqIfImport (id=ReqIF_001): 
- Darwin shall allow importation of Reqif elements to SysML Model</span>
-<span id="_jon1YLH0EeSvo7o7Iu6GQQ">- Import SpecObjects (id=ReqIF_001_001): 
- The user shall be able to import spec object</span>
-<span id="_joq4sLH0EeSvo7o7Iu6GQQ">- Two  Kind of Users (id=ReqIF_001_002): 
- The simple User can only import SpecObject by choosing domain. The AdvancedUser can import Types and DataTypes. </span>
-<span id="_jotU8LH0EeSvo7o7Iu6GQQ">- Import DataType Enumeration (id=ReqIF_001_003): 
- The advanced user shall be able to import DataType and enumeration</span>
-<span id="_jovxMLH0EeSvo7o7Iu6GQQ">- Import SpecObjectTypes (id=ReqIF_001_004): 
- The advanced user shall be able to import specObjectType</span>
-<span id="_joxmYLH0EeSvo7o7Iu6GQQ">- Import SpecRelationType (id=ReqIF_001_005): 
- The advanced user  shall be able to import SpecRelationType</span>
-<span id="_jozbkLH0EeSvo7o7Iu6GQQ">- Import SpecRelation (id=ReqIF_001_006): 
- Papyrus Req shall import SpecRelation</span>
-<span id="_jo130LH0EeSvo7o7Iu6GQQ">- ReqIFExport (id=ReqIF_002): 
- Darwin shall enable export of SysML requirement to ReqIF Model</span>
-<span id="_jo3tALH0EeSvo7o7Iu6GQQ">- ControlMode (id=ReqIF_003): 
- The managment with ReqIf must support Control Mode</span>
-<span id="_jo6JQLH0EeSvo7o7Iu6GQQ">- WihtoutUI (id=ReqIF_004): 
- The export can be done programmatically, without GUI, in order to test it, or to be enable to pilot it programmatically</span>
-<span id="_jo8lgLH0EeSvo7o7Iu6GQQ">- Re-Export (id=ReqIF_005): 
- Papyrus shall re-export requirements in existing reqIF file</span>
-<span id="_jo-asLH0EeSvo7o7Iu6GQQ">- Re-Import (id=ReqIF_006): 
- Papyrus shall re-Import requirement from a ReqIF file</span>
-==<span id="_jo_o0bH0EeSvo7o7Iu6GQQ">Use Cases</span>==
-
-====<span id="_jryeIbH0EeSvo7o7Iu6GQQ">Import ReqIF file</span>====
-
-<span id="_jwVm8LH0EeSvo7o7Iu6GQQ">Before import requirement fro ReqIF file, the kinf of User has to be verified.
+This model explains the functionality in Papyrus Req in order to import or export ReqIF files into Papyrus (OMG Document Number: formal/2013-10-01 Standard document URL: http://www.omg.org/spec/ReqIF/1.1)
+
+
+==Requirements==
+- ReqIfImport (id=ReqIF_001): 
+ Darwin shall allow importation of Reqif elements to SysML Model
+- Import SpecObjects (id=ReqIF_001_001): 
+ The user shall be able to import spec object
+- Two  Kind of Users (id=ReqIF_001_002): 
+ The simple User can only import SpecObject by choosing domain. The AdvancedUser can import Types and DataTypes. 
+- Import DataType Enumeration (id=ReqIF_001_003): 
+ The advanced user shall be able to import DataType and enumeration
+- Import SpecObjectTypes (id=ReqIF_001_004): 
+ The advanced user shall be able to import specObjectType
+- Import SpecRelationType (id=ReqIF_001_005): 
+ The advanced user  shall be able to import SpecRelationType
+- Import SpecRelation (id=ReqIF_001_006): 
+ Papyrus Req shall import SpecRelation
+- ReqIFExport (id=ReqIF_002): 
+ Darwin shall enable export of SysML requirement to ReqIF Model
+- ControlMode (id=ReqIF_003): 
+ The managment with ReqIf must support Control Mode
+- WihtoutUI (id=ReqIF_004): 
+ The export can be done programmatically, without GUI, in order to test it, or to be enable to pilot it programmatically
+- Re-Export (id=ReqIF_005): 
+ Papyrus shall re-export requirements in existing reqIF file
+- Re-Import (id=ReqIF_006): 
+ Papyrus shall re-Import requirement from a ReqIF file
+==Use Cases==
+
+====Import ReqIF file====
+
+Before import requirement fro ReqIF file, the kinf of User has to be verified.
 
 There are two kind of users:
 
@@ -41,67 +41,67 @@ There are two kind of users:
 
 	- Advancerd User: he can importe new types of requirements and instance of requirement inside  the Papyrus tool 
 
-To verify it, go to window--> preferences--> Papyrus--> ReqIF Import</span>
+To verify it, go to window--> preferences--> Papyrus--> ReqIF Import
 
-[[Image:./imgDOC/Userkind.png|Two kinds of user]]<br>
+[[Image:./images/Userkind.png|Two kinds of user]]<br>
 
-<span id="_jwXcIbH0EeSvo7o7Iu6GQQ">First the User must have a SysML model. Select the package where ReqIF elements will be imported.
-</span>
+First the User must have a SysML model. Select the package where ReqIF elements will be imported.
 
-[[Image:./imgDOC/import_1.png|Import SysMLModel]]<br>
 
-<span id="_jwZ4YbH0EeSvo7o7Iu6GQQ">Select the menu Import  of Eclipse.</span>
+[[Image:./images/import_1.png|Import SysMLModel]]<br>
 
-[[Image:./imgDOC/import_2.png|Select import Menu of Eclipse]]<br>
+Select the menu Import  of Eclipse.
 
-<span id="_jwcUobH0EeSvo7o7Iu6GQQ">Select the menu Import ReqIF from Papyrus Categories</span>
+[[Image:./images/import_2.png|Select import Menu of Eclipse]]<br>
 
-[[Image:./imgDOC/import_3.png|Import ReqIF]]<br>
+Select the menu Import ReqIF from Papyrus Categories
 
-<span id="_jwew4bH0EeSvo7o7Iu6GQQ">Select the ReqIF file to import</span>
+[[Image:./images/import_3.png|Import ReqIF]]<br>
 
-[[Image:./imgDOC/import_4.png|ReqIF file Selection]]<br>
+Select the ReqIF file to import
 
-<span id="_jwhNILH0EeSvo7o7Iu6GQQ">Select  Requirement types of ReqIF file that you want to import</span>
+[[Image:./images/import_4.png|ReqIF file Selection]]<br>
 
-[[Image:./imgDOC/import_5.png|SpecObject Type selection]]<br>
+Select  Requirement types of ReqIF file that you want to import
 
-<span id="_jwjCUbH0EeSvo7o7Iu6GQQ">When the current user is an "Advanced User", he can import Requirement types and all requirements from ReqIF , if needed he can select or create the profile that will contain imported types</span>
+[[Image:./images/import_5.png|SpecObject Type selection]]<br>
 
-[[Image:./imgDOC/import_6.png|Create or select Profile]]<br>
+When the current user is an "Advanced User", he can import Requirement types and all requirements from ReqIF , if needed he can select or create the profile that will contain imported types
 
-<span id="_jwlekbH0EeSvo7o7Iu6GQQ">When the current user is a "Simple User", he can only import instances of requirements by choosen predefined types contained in the profile.
-If the profile does not contain all needed types, the import is not done and a message is displayed on the screen. </span>
+[[Image:./images/import_6.png|Create or select Profile]]<br>
 
-[[Image:./imgDOC/Choose_Predefined_Profile.png|Choose predefined type contained in profile]]<br>
+When the current user is a "Simple User", he can only import instances of requirements by choosen predefined types contained in the profile.
+If the profile does not contain all needed types, the import is not done and a message is displayed on the screen. 
 
-[[Image:./imgDOC/CannotImport.png|The import cannot be done if the profile is not complete.]]<br>
+[[Image:./images/Choose_Predefined_Profile.png|Choose predefined type contained in profile]]<br>
 
-<span id="_jwpI8bH0EeSvo7o7Iu6GQQ">The model has now imported requirements with relations. Note that a comment explains the origin of the import.</span>
+[[Image:./images/CannotImport.png|The import cannot be done if the profile is not complete.]]<br>
 
-[[Image:./imgDOC/import7.png|Resulted model]]<br>
+The model has now imported requirements with relations. Note that a comment explains the origin of the import.
 
+[[Image:./images/import7.png|Resulted model]]<br>
 
-====<span id="_jwyS4bH0EeSvo7o7Iu6GQQ">Export UML Model to ReqIF File</span>====
 
-<span id="_jznkcbH0EeSvo7o7Iu6GQQ">Select the SysML that you want to export
-</span>
+====Export UML Model to ReqIF File====
 
-[[Image:./imgDOC/export1.png|SysML Model]]<br>
+Select the SysML that you want to export
 
-<span id="_jzqnwbH0EeSvo7o7Iu6GQQ">Select the export Menu from Eclipse menu.</span>
 
-[[Image:./imgDOC/export2.png|Export Menu]]<br>
+[[Image:./images/export1.png|SysML Model]]<br>
 
-<span id="_jztrELH0EeSvo7o7Iu6GQQ">Select the menu export ReqIF form the papyrus Category</span>
+Select the export Menu from Eclipse menu.
 
-[[Image:./imgDOC/export3.png|Import ReqIF file]]<br>
+[[Image:./images/export2.png|Export Menu]]<br>
 
-<span id="_jzwHUbH0EeSvo7o7Iu6GQQ">Choose the name of the reqif file.</span>
+Select the menu export ReqIF form the papyrus Category
 
-[[Image:./imgDOC/export5.png|Choose ReqIF File name]]<br>
+[[Image:./images/export3.png|Import ReqIF file]]<br>
 
-<span id="_jzzKobH0EeSvo7o7Iu6GQQ">At the end, a reqFile is generated. The header has an information that explain that the result comes from UML file.
-</span>
+Choose the name of the reqif file.
 
-[[Image:./imgDOC/Export4.png|Result in the ReqIf file]]<br>
+[[Image:./images/export5.png|Choose ReqIF File name]]<br>
+
+At the end, a reqFile is generated. The header has an information that explain that the result comes from UML file.
+
+
+[[Image:./images/Export4.png|Result in the ReqIf file]]<br>
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/ActivityDiagram.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/ActivityDiagram.png
index 83f93dce02f..83f93dce02f 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/ActivityDiagram.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/ActivityDiagram.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/Architecture_of_ReqIF_Import-Export.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/Architecture_of_ReqIF_Import-Export.png
index 88ca29c47e1..88ca29c47e1 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/Architecture_of_ReqIF_Import-Export.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/Architecture_of_ReqIF_Import-Export.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/CannotImport.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/CannotImport.png
index 141507fc140..141507fc140 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/CannotImport.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/CannotImport.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/Choose_Predefined_Profile.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/Choose_Predefined_Profile.png
index 75184420307..75184420307 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/Choose_Predefined_Profile.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/Choose_Predefined_Profile.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/ClassDiagram.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/ClassDiagram.png
index f7a862a4aca..f7a862a4aca 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/ClassDiagram.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/ClassDiagram.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/Export4.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/Export4.png
index 3e1ce645c9b..3e1ce645c9b 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/Export4.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/Export4.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/Export_Activity.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/Export_Activity.png
index 4779d9612a9..4779d9612a9 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/Export_Activity.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/Export_Activity.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/Import_Activity.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/Import_Activity.png
index 9f4907f2826..9f4907f2826 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/Import_Activity.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/Import_Activity.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/UseCaseDiagram.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/UseCaseDiagram.png
index 566521d1065..566521d1065 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/UseCaseDiagram.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/UseCaseDiagram.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/UseCases_Diagram.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/UseCases_Diagram.png
index 7d67ecdf41e..7d67ecdf41e 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/UseCases_Diagram.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/UseCases_Diagram.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/Userkind.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/Userkind.png
index 2ccc675c07f..2ccc675c07f 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/Userkind.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/Userkind.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/export1.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/export1.png
index e2c94205722..e2c94205722 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/export1.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/export1.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/export2.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/export2.png
index 23e146579a5..23e146579a5 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/export2.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/export2.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/export3.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/export3.png
index ce1ac09917a..ce1ac09917a 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/export3.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/export3.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/export5.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/export5.png
index ce1ac09917a..ce1ac09917a 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/export5.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/export5.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import7.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import7.png
index dbe4a7e8dd9..dbe4a7e8dd9 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import7.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import7.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import_1.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import_1.png
index 5e1326c147d..5e1326c147d 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import_1.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import_1.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import_2.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import_2.png
index 0e93c1807ce..0e93c1807ce 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import_2.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import_2.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import_3.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import_3.png
index 7bc74271c1d..7bc74271c1d 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import_3.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import_3.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import_4.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import_4.png
index 8715d79fd7c..8715d79fd7c 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import_4.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import_4.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import_5.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import_5.png
index c4bfc2781a1..c4bfc2781a1 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import_5.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import_5.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import_6.png b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import_6.png
index 947e6f80c85..947e6f80c85 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/imgDOC/import_6.png
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/images/import_6.png
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/reqif-toc.xml b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/reqif-toc.xml
deleted file mode 100644
index b0755d06852..00000000000
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/reqif-toc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/DeveloperDoc.html" label="ReqIF  Import Export">
-	<topic href="resource/reqif.html" label="Import Export of ReqIF elements into Papyrus">
-		<topic href="resource/reqif.html#Requirements" label="Requirements"></topic>
-		<topic href="resource/reqif.html#Use_Cases" label="Use Cases">
-			<topic href="resource/reqif.html#Import_ReqIF_file" label="Import ReqIF file"></topic>
-			<topic href="resource/reqif.html#Export_UML_Model_to_ReqIF_File" label="Export UML Model to ReqIF File"></topic>
-		</topic>
-	</topic>
-</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/reqif.html b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/reqif.html
deleted file mode 100644
index 09738368ac3..00000000000
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/reqif.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-</head>
-<body>
-<h1 id="Import_Export_of_ReqIF_elements_into_Papyrus">Import Export of ReqIF elements into Papyrus</h1>
-<p>This model explains the functionality in Papyrus Req in order to import or export ReqIF files into Papyrus (OMG Document Number: formal/2013-10-01 Standard document URL: <a href="http://www.omg.org/spec/ReqIF/1.1">http://www.omg.org/spec/ReqIF/1.1</a>)</p>
-<h2 id="Requirements">
-Requirements
-</h2>
-<p>
-- ReqIfImport (id=ReqIF_001): </p><pre>Darwin shall allow importation of Reqif elements to SysML Model
-
-</pre>
-<p>- Import SpecObjects (id=ReqIF_001_001): </p><pre>The user shall be able to import spec object
-
-</pre><p>- Two  Kind of Users (id=ReqIF_001_002): </p><pre>The simple User can only import SpecObject by choosing domain. The AdvancedUser can import Types and DataTypes. 
-</pre><p>- Import DataType Enumeration (id=ReqIF_001_003): </p><pre>The advanced user shall be able to import DataType and enumeration
-</pre><p>- Import SpecObjectTypes (id=ReqIF_001_004): </p><pre>The advanced user shall be able to import specObjectType
-</pre><p>- Import SpecRelationType (id=ReqIF_001_005): </p><pre>The advanced user  shall be able to import SpecRelationType
-</pre><p>- Import SpecRelation (id=ReqIF_001_006): </p><pre>Papyrus Req shall import SpecRelation
-</pre><p>- ReqIFExport (id=ReqIF_002): </p><pre>Darwin shall enable export of SysML requirement to ReqIF Model
-</pre><p>- ControlMode (id=ReqIF_003): </p><pre>The managment with ReqIf must support Control Mode
-</pre><p>- WihtoutUI (id=ReqIF_004): </p><pre>The export can be done programmatically, without GUI, in order to test it, or to be enable to pilot it programmatically
-</pre><p>- Re-Export (id=ReqIF_005): </p><pre>Papyrus shall re-export requirements in existing reqIF file
-</pre><p>- Re-Import (id=ReqIF_006): </p><pre>Papyrus shall re-Import requirement from a ReqIF file
-</pre><h2 id="Use_Cases">Use Cases</h2><h4 id="Import_ReqIF_file">Import ReqIF file</h4><p>Before import requirement fro ReqIF file, the kinf of User has to be verified.</p><p>There are two kind of users:</p><p>	- Simple User: he can only import instance of requirements inside the Papyrus tool.</p><p>	- Advancerd User: he can importe new types of requirements and instance of requirement inside  the Papyrus tool </p><p>To verify it, go to window--> preferences--> Papyrus--> ReqIF Import</p><p><img title="Two kinds of user" alt="Two kinds of user" border="0" src="./imgDOC/Userkind.png"/><br/></p><p>First the User must have a SysML model. Select the package where ReqIF elements will be imported.
-</p><p><img title="Import SysMLModel" alt="Import SysMLModel" border="0" src="./imgDOC/import_1.png"/><br/></p><p>Select the menu Import  of Eclipse.</p><p><img title="Select import Menu of Eclipse" alt="Select import Menu of Eclipse" border="0" src="./imgDOC/import_2.png"/><br/></p><p>Select the menu Import ReqIF from Papyrus Categories</p><p><img title="Import ReqIF" alt="Import ReqIF" border="0" src="./imgDOC/import_3.png"/><br/></p><p>Select the ReqIF file to import</p><p><img title="ReqIF file Selection" alt="ReqIF file Selection" border="0" src="./imgDOC/import_4.png"/><br/></p><p>Select  Requirement types of ReqIF file that you want to import</p><p><img title="SpecObject Type selection" alt="SpecObject Type selection" border="0" src="./imgDOC/import_5.png"/><br/></p><p>When the current user is an "Advanced User", he can import Requirement types and all requirements from ReqIF , if needed he can select or create the profile that will contain imported types</p><p><img title="Create or select Profile" alt="Create or select Profile" border="0" src="./imgDOC/import_6.png"/><br/></p><p>When the current user is a "Simple User", he can only import instances of requirements by choosen predefined types contained in the profile.
-If the profile does not contain all needed types, the import is not done and a message is displayed on the screen. </p><p><img title="Choose predefined type contained in profile" alt="Choose predefined type contained in profile" border="0" src="./imgDOC/Choose_Predefined_Profile.png"/><br/></p><p><img title="The import cannot be done if the profile is not complete." alt="The import cannot be done if the profile is not complete." border="0" src="./imgDOC/CannotImport.png"/><br/></p><p>The model has now imported requirements with relations. Note that a comment explains the origin of the import.</p><p><img title="Resulted model" alt="Resulted model" border="0" src="./imgDOC/import7.png"/><br/></p><h4 id="Export_UML_Model_to_ReqIF_File">Export UML Model to ReqIF File</h4><p>Select the SysML that you want to export
-</p><p><img title="SysML Model" alt="SysML Model" border="0" src="./imgDOC/export1.png"/><br/></p><p>Select the export Menu from Eclipse menu.</p><p><img title="Export Menu" alt="Export Menu" border="0" src="./imgDOC/export2.png"/><br/></p><p>Select the menu export ReqIF form the papyrus Category</p><p><img title="Import ReqIF file" alt="Import ReqIF file" border="0" src="./imgDOC/export3.png"/><br/></p><p>Choose the name of the reqif file.</p><p><img title="Choose ReqIF File name" alt="Choose ReqIF File name" border="0" src="./imgDOC/export5.png"/><br/></p><p>At the end, a reqFile is generated. The header has an information that explain that the result comes from UML file.
-</p><p><img title="Result in the ReqIf file" alt="Result in the ReqIf file" border="0" src="./imgDOC/Export4.png"/><br/></p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.project
index d9f1933bece..767eb789dcf 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
@@ -15,8 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.core.resources.prefs
index be4bb130864..dc35234bfad 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
 eclipse.preferences.version=1
 encoding//resource/profileapplications-toc.xml=utf-8
-encoding//resource/profileapplications.html=utf-8
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF
index 360c7b30eaf..9b99e16c1b7 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@ Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Description: %pluginDescription
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/build.properties
index ee908ced3ab..b4dab6d6286 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/build.properties
@@ -15,5 +15,6 @@ bin.includes = META-INF/,\
                plugin.xml,\
                plugin.properties,\
                about.html,\
-               resource/
-src.includes = about.html
+               target/generated-eclipse-help/** 
+src.includes = about.html,\
+				resource/
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/plugin.xml
index a73d0128793..5fd1ee91234 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/plugin.xml
@@ -4,11 +4,11 @@
    <extension
          point="org.eclipse.help.toc">
       <toc
-            file="resource/profileapplications-main-toc.xml"
+            file="target/generated-eclipse-help/profileapplications-main-toc.xml"
             primary="false">
       </toc>
       <toc
-            file="resource/profileapplications-toc.xml"
+            file="target/generated-eclipse-help/profileapplications-toc.xml"
             primary="false">
       </toc>
    </extension>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/pom.xml
index 21fe9d68963..9d39cd3b8e1 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/resource/profileapplications-main-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/resource/profileapplications-main-toc.xml
index 5c69665bb0d..4c8a4259be3 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/resource/profileapplications-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/resource/profileapplications-main-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <toc label="Externalized Profile Applications" link_to="../org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-main-toc.xml#profiles">
-   <topic href="resource/profileapplications.html" label="Externalizing Profile Applications">
-      <link toc="resource/profileapplications-toc.xml"/>
+   <topic href="target/generated-eclipse-help/profileapplications.html" label="Externalizing Profile Applications">
+      <link toc="target/generated-eclipse-help/profileapplications-toc.xml"/>
       <anchor id="profileapplications"/>
    </topic>
 	
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/resource/profileapplications-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/resource/profileapplications-toc.xml
index f043391eee1..ddd2feb8bb1 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/resource/profileapplications-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/resource/profileapplications-toc.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <toc label="profileapplications" topic="resource/profileapplications.html">
-	<topic href="resource/profileapplications.html" label="About Externalized Profile Applications"></topic>
-	<topic href="resource/profileapplications.html#Externalizing_a_Profile_Application" label="Externalizing a Profile Application"></topic>
-	<topic href="resource/profileapplications.html#Loading_and_Unloading_Profile_Applications" label="Loading and Unloading Profile Applications"></topic>
-    <topic href="resource/profileapplications.html#Duplicating_Profile_Applications" label="Duplicating Profile Applications"></topic>
-    <topic href="resource/profileapplications.html#Opening_Profile_Application_Models" label="Opening Profile Application Models"></topic>
-    <topic href="resource/profileapplications.html#Reintegrating_Profile_Applications" label="Reintegrating Profile Applications"></topic>
-    <topic href="resource/profileapplications.html#Preferences" label="Preferences"></topic>
+	<topic href="target/generated-eclipse-help/profileapplications.html" label="About Externalized Profile Applications"></topic>
+	<topic href="target/generated-eclipse-help/profileapplications.html#Externalizing_a_Profile_Application" label="Externalizing a Profile Application"></topic>
+	<topic href="target/generated-eclipse-help/profileapplications.html#Loading_and_Unloading_Profile_Applications" label="Loading and Unloading Profile Applications"></topic>
+    <topic href="target/generated-eclipse-help/profileapplications.html#Duplicating_Profile_Applications" label="Duplicating Profile Applications"></topic>
+    <topic href="target/generated-eclipse-help/profileapplications.html#Opening_Profile_Application_Models" label="Opening Profile Application Models"></topic>
+    <topic href="target/generated-eclipse-help/profileapplications.html#Reintegrating_Profile_Applications" label="Reintegrating Profile Applications"></topic>
+    <topic href="target/generated-eclipse-help/profileapplications.html#Preferences" label="Preferences"></topic>
 </toc>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/resource/profileapplications.html b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/resource/profileapplications.html
deleted file mode 100644
index f934950f191..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/resource/profileapplications.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="About_Externalized_Profile_Applications">About Externalized Profile Applications</h1><p>Ordinarily, profile applications in UML models are owned by the packages to which they apply profiles.  However, Papyrus provides an extended
-semantics that externalizes the application of profiles, letting profile applications be defined separately from the packages that apply them.
-This has a few advantages:</p><ul><li>profile applications may be loaded and unloaded as required, to present extended attributes of model elements (as defined by stereotypes) when and if they are needed by the modeling user</li><li>multiple applications of the same profile to a package can provide alternative values for stereotype extensions of model elements</li></ul><h1 id="Externalizing_a_Profile_Application">Externalizing a Profile Application</h1><p>Consider the following small example of a model that has the Ecore profile applied: </p><p><img border="0" src="images/profile.png"/> </p><p>This model has two classes, both stereotyped as <tt>«eClass»</tt>.  A CSS stylesheet paints EClasses yellow that specify the <tt>xmlName</tt> attribute and red that do not. Initially, this profile application is owned by the model.  To separate it out into its own resource, invoke the <b>Refactor &rarr; Externalize Profile Applications...</b> context menu action on the applying package:</p><p><img border="0" src="images/refactor_externalize_menu.png"/></p><p>or select the profile application in the applying package's properties and press the externalize action button:</p><p><img border="0" src="images/externalize_button.png"/></p><p>Either way brings up the <b>Externalize Profile Applications</b> dialog:</p><p><img border="0" src="images/externalize_dlg.png"/></p><p>In this dialog, you must:</p><ul><li>select which profile applications to externalize (there may be more than one)</li><li>enter or browse to a model resource in which to put the profile application.  It may be a new resource, or it may be an existing resource<ul><li><b><i>Note</i></b> that in the case of an existing resource, it must be a "profile application model".  Profile applications may not be added to regular UML models</li></ul></li><li>enter a name for the profile application model (if it is new)<ul><li>if an existing profile application model is chosen to add the profile application to, then the name field is not editable as the model already has a name</li></ul></li></ul><p>After completing this dialog, it is recommended to save to create the new profile application model.  This is similar to sub-model units, which are created when saving the parent model.  The result is something like this:</p><p><img border="0" src="images/externalized.png"/></p><p>Note the new elements in the user interface, indicated by the arrows in the graphic above:</p><ul><li>a new UML resource is created containing the profile application.  It shows a decoration indicating that it is a special kind of model, a <i>profile application model</i></li><li>the Model Explorer decorates the applying package (in this case, the root package) with the names of all of its externalized profile applications that are currently loaded</li><li>the properties of the applying package decorate the names of externalized profile applications to show which profile application model they are loaded from</li></ul><p>Moreover, the applying package has a new tab in its property sheet listing available and loaded profile applications.  This is discussed further in the next section.</p><p>Note that in this example, the profile application model was created in the same project as the model to which it applies profiles.  Profile application models may be created in any project in the workspace; they do not have to be in the same project as the models that they extend.  Also, a profile application model may contain applications of any number of profiles on any number of packages in any number of models.  The only restriction is that a single profile application model may not apply the same profile more than once to the same package.  Two or more different profile application models may apply the profile to the same package in a user model, but then only one of them may be loaded at any one time in the context of that package.</p><h1 id="Loading_and_Unloading_Profile_Applications">Loading and Unloading Profile Applications</h1><p>Once a profile application has been externalized (see the preceding section), it may be unloaded and loaded again as needed.  There are two ways to unload profile applications.</p><h2 id="Unload_In_Model_Explorer_View">Unload In Model Explorer View</h2><p>In the Model Explorer, select a package that has profile applications loaded and choose the <b>Unload Profile Applications...</b> action in the context menu:</p><p><img border="0" src="images/unload_menu.png"/></p><p>This brings up a dialog that lets you choose which profile application models to unload:</p><p><img border="0" src="images/unload_dlg.png"/></p><p>Finish the dialog to unload the selected models.</p><h2 id="Unload_in_Properties_View">Unload in Properties View</h2><p>Alternatively, in the <b>Applications</b> tab of the property sheet for a package that has externalized profile applications, select one or more loaded profile applications and press the unload button to quickly unload them:</p><p><img border="0" src="images/unload_button.png"/></p><p>The result on our example Ecore-profiled model is this:</p><p><img border="0" src="images/unloaded.png"/></p><p>The default styling in the diagram suggests that the <tt>«eClass»</tt> stereotype applications are now unloaded and the profile application's state in the property sheet is changed to <b>Unloaded</b>.  Also, the root package no longer shows the decoration indicating loaded profile applications.</p><h2 id="Load_in_Model_Explorer_View">Load in Model Explorer View</h2><p>For packages that have available unloaded profile applications, the Model Explorer provides a <b>Load Profile Applications...</b> context menu action:</p><p><img border="0" src="images/load_menu.png"/></p><p>This brings up the <b>Load Profile Applications</b> dialog in which you may select the profile applications to load:</p><p><img border="0" src="images/load_dlg.png"/></p><p>Select the profile applications to load and finish the dialog to load them.</p><h2 id="Load_in_Properties_View">Load in Properties View</h2><p>In addition to any profile applications that are already loaded, the <b>Applications</b> tab in the property sheet shows those that are currently available to load:</p><p><img border="0" src="images/load_button.png"/></p><p>Select one or more unloaded profile applications and press the load action button to load them:</p><p><img border="0" src="images/loaded.png"/></p><p>As a quick alternative, you can double-click on an unloaded profile application to load it.</p><h2 id="Profile_Application_Resources">Profile Application Resources</h2><p>An externalized profile application is defined in a UML package in its own, separate, resource.  As such, when it is loaded into the Papyrus editor, it appears in many respects like any other UML package.  For convenience, the packages containing profile applications are hidden in the Model Explorer.  However, they can be revealed if necessary by disabling the filter in the <b>Customize View...</b> view menu action:</p><p><img border="0" src="images/customize_view.png"/></p><p>Uncheck the <b>Profile Applications</b> filter and complete the dialog to see the loaded profile application models in the explorer:</p><p><img border="0" src="images/show_in_explorer.png"/></p><h1 id="Duplicating_Profile_Applications">Duplicating Profile Applications</h1><p>Using externalized profile applications, not only is it possible to apply multiple profiles externally to a package, but the same profile may be applied multiple times to the same package.  This facilitates development of alternative extensions of the same model elements, such as for "what if" analysis or other comparisons.</p><p>The simplest way to create another application of the same profile is to duplicate an existing one.  Simply select a profile application in the property sheet (it may be either loaded or unloaded) and press the duplicate action button:</p><p><img border="0" src="images/duplicate_button.png"/></p><p>This opens the <b>Duplicate Profile Application</b> dialog in which you select which of the profile applications in the model that you are duplicating you want to copy (you don't have to duplicate all of them) and then specify a new file name and profile-application model name:</p><p><img border="0" src="images/duplicate_dlg.png"/></p><p>The result looks something like this:</p><p><img border="0" src="images/duplicated.png"/></p><p>If the original profile application was loaded, then the new duplicate is loaded in its place (because the new profile application applies at least one of the same profiles as the original to the same package, only one can be loaded at a time).  Otherwise, you can proceed by opening the new profile application and configuring its stereotype applications differently than in the original:</p><p><img border="0" src="images/variant2.png"/></p><h2 id="Restrictions">Restrictions</h2><p>There are certain restrictions in working with multiple profile applications, especially when they concern the same combinations of profiles and applying packages:</p><ul><li>a profile application model cannot be loaded if it applies a profile to a package that already has that profile applied<ul><li>this is concerned only with the actual package that the profile is applied to.  A package may apply a profile that is also applied to some package containing it</li><li>this applies equally to the case where the package already owns an application of the profile and also the case where an externalized application of the profile is already loaded.  However, in the latter case, there is a remedy available:  the current profile application model may be unloaded.  Papyrus will prompt to unload the conflicting profile application, with the option to just automatically unload it in the future, which is convenient for quickly switching between alternative configurations of stereotypes</li></ul></li><li>a profile application may not be externalized into a model that already has an application of the same profile for the same package.  A different model must be selected or created</li></ul><h1 id="Opening_Profile_Application_Models">Opening Profile Application Models</h1><p>Profile application models may be opened in their own editors to provide convenient access to the perspective that they offer on the models that they extend.  Ordinarily, they contain only stereotype applications extending elements in the user model, but it may be useful in some circumstances to create diagrams in a profile application model that are specific to the profile applications that it contains.  It is <b>highly recommended</b> never to add UML content to a profile application model; only stereotype applications extending UML content. </p><p>The <b>New &rarr; Papyrus Model</b> wizard may be used to initialize a complete Papyrus model from the UML resource of a profile application:</p><p><img border="0" src="images/init_model_menu.png"/></p><p>Complete the wizard, creating for example a class diagram, and you can drag and drop elements from the profiled model onto the diagram to visualize them in some way specific to the profile application:</p><p><img border="0" src="images/decorator_model.png"/></p><p>Note that the Model Explorer shows the profile model, not the profile application model itself, simply by virtue of the latter being filtered out of the view by default (see above for details).  In this way, various different perspectives on the same user model may be revealed in separate editors through the profile applications.  Of course, the same caveats apply for making changes to the same UML content in multiple such editors as would normally apply to editing shared "library" models.</p><h1 id="Reintegrating_Profile_Applications">Reintegrating Profile Applications</h1><p>The opposite process to externalizing a profile application is reintegrating it into the model proper.  There are two ways to reintegrate a loaded profile application:  using the <b>Refactor &rarr; Internalize Profile Applications...</b> action in the context menu:</p><p><img border="0" src="images/internalize_menu.png"/></p><p>or by selecting one or more profile applications in the property sheet and pressing the internalize action button:</p><p><img border="0" src="images/internalize_button.png"/></p><p>The context menu action opens a dialog in which you may choose which profile applications, for the selected package, that are currently loaded should be reintegrated.  Upon saving the model, then, these profile applications and the stereotype applications that they define are stored once more in the same resources as the UML elements that they extend.</p><h1 id="Preferences">Preferences</h1><p>A few preference options are available to control how Papyrus behaves in working with externalized profile applications.  These are:</p><p><img border="0" src="images/preferences.png"/></p><ol><li>Whether Papyrus should automatically prompt you to select one or more profile applications to load when opening a model that has externalized profile applications available for one or more packages within the model.</li><li>When loading a profile application model, whether Papyrus should prompt to confirm that applications of the same profile(s) to the same package(s) that are already loaded should first be unloaded, or else cancel loading the new profile application.  Disabling this prompt makes for quick switching of profile applications by double-clicking in the property sheet to load alternatives.</li><li>What to do when a profile application model is emptied of all profile applications by reintegration.  Ordinarily, no useful data besides stereotype applications is stored in a profile application model, and these are simply moved into the main model resource by reintegration, so it is safe and practical to delete the profile application model when it is no longer needed.  However, in the case that it has specialized diagrams or (though not recommended) other UML content, it may be important to retain that model.</li></ol></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.project
index 10b283473f1..9d896a5995b 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.project
@@ -6,6 +6,11 @@
 	</projects>

 	<buildSpec>

 		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

 			<arguments>

 			</arguments>

@@ -15,8 +20,15 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

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

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

 	</natures>

 </projectDescription>

diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 04e71bcb4e2..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1

-encoding//resource/symbols-toc.xml=utf-8

-encoding//resource/symbols.html=utf-8

diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF
index 1e3526d8205..478ac59d5a7 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF
@@ -1,9 +1,11 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.help

+Require-Bundle: org.eclipse.help;bundle-version="3.6.0",

+ org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-Version: 1.1.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.doc;single

  ton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 

diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/build.properties
index 92a2ba56dcf..0fc01342315 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/build.properties
@@ -1,6 +1,7 @@
 bin.includes = META-INF/,\

                plugin.xml,\

-               resource/,\

                about.html,\

-               OSGI-INF/

-src.includes = about.html
+               OSGI-INF/,\

+               target/generated-eclipse-help/** 

+src.includes = about.html,\

+				resource/
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/plugin.xml
index d492aa6226c..1c192db9263 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/plugin.xml
@@ -4,19 +4,15 @@
    <extension

          point="org.eclipse.help.toc">

       <toc

-            file="resource/symbols-main-toc.xml"

+            file="target/generated-eclipse-help/symbols-main-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="resource/symbols-toc.xml"

+            file="target/generated-eclipse-help/symbols-toc.xml"

             primary="false">

       </toc>

-	  <toc

-      		file="resource/constraints-toc.xml"

-      		primary="false">

-      </toc>

       <toc

-      		file="resource/constraint-creation-toc.xml"

+      		file="target/generated-eclipse-help/constraint-creation-toc.xml"

       		primary="false">

       </toc>

    </extension>

diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/pom.xml
index ae51d06a79a..f341b4b07e9 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation-toc.xml
index 87199061f03..1c3035af614 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation-toc.xml
@@ -1,9 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/constraint-creation.html" label="Create constraints" link_to="constraints-toc.xml">
-	<topic href="resource/constraint-creation.html" label="Create and edit constraints">
-		<topic href="resource/constraint-creation.html#Specify_the_context" label="Specify the context">
-		</topic>
-		<topic href="resource/constraint-creation.html#Define_specification" label="Define constraint specification">
-		</topic>
-	</topic>	
+<toc topic="org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html" label="constraint-creation">
+	<topic href="org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html" label="Create and edit constraints">
+		<topic href="org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html#Define_a_constraint_and_its_context" label="Define a constraint and its context"></topic>
+		<topic href="org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html#Define_constraint_specification" label="Define constraint specification"></topic>
+	</topic>
 </toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html
deleted file mode 100644
index 0bde6404e72..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Create_and_edit_constraints">Create and edit constraints</h1><p>Creation and edition comprises includes multiple use case, namely creation of a constraint and its context and setting a specification.</p><p><center>
-<img border="0" src="PapyrusConstraint-CreationUseCase.png"/><br/> 
-</center></p><h2 id="Define_a_constraint_and_its_context">Define a constraint and its context</h2><p>Papyrus supports the creation of UML constraints. To create a constraint, and associated context, do one of the following:</p><ul><li>Within any Papyrus diagram select the constraint tool from the palette and then press the mouse button at the position where you want to create the constraint on the diagram canvas. The constraint should then be connected to another element on the diagram, via a ContextLink relationship, by clicking on the target element in the diagram (in two-click mode). If you are in one-click-mode (connection tool preference), press the mouse button on the constraint and keep it pressed until the context object is selected. This ContextLink relationship defines the context for which the constraint will be evaluated.</li></ul><p><center>
-<img border="0" src="PapyrusConstraint-CreateViaDiagram.png"/>&nbsp;&nbsp;&nbsp;<img border="0" src="PapyrusConstraint-ContextViaDiagram.png"/><br/>
-The constraint and context-link tools in the palette
-</center></p><ul><li>Within the Model Explorer via right clicking a model element and then selecting New Child -&gt; Create a new Constraint. The context is automatically set to the parent of the constraint. The context can be changed via the Properties View if required.<br/></li></ul><p><center>
-<img border="0" src="PapyrusConstraint-CreateViaME.png"/><br/>
-Create a constraint via the model explorer
-</center></p><p><center>
-<img border="0" src="PapyrusConstraint-ContextViaPropertyView.png"/><br/>
-Set the context via the property view
-</center></p><h2 id="Define_constraint_specification">Define constraint specification</h2><p>Each constraint has a specification containing a condition. Whereas it may be an arbitrary value specification, such as a StringExpression or LiteralInteger, it is in most cases useful to define an opaque expression consisting of a pair of language and body (a list of these pairs). The constraint body may be written in at least OCL, JAVA, or natural language. In order to make constraints evaluable by Papyrus the constraint must be written in either OCL or JAVA. To define a constraint's specification, first select a constraint on either a diagram or in the Model Explorer, then do the following:</p><ul><li>On the diagram open the default editor for constraints using the keyboard shortcut F2 or with a second click on an already selected constraint. The editor assume the language is OCL but this can be changed later via the Properties View. The constraint text is defined directly in the editor. The default editor can be controlled via the preferences. </li></ul><ul><li>On the diagram select a specific editor via the context menu, as shown in the following screenshot.</li></ul><p><center>
-<img border="0" src="PapyrusConstraint-ChooseEditor.png"/><br/>
-Explicitly choose the editor for the constraint
-</center></p><p>Use the property view to create a new or open an existing specification, as shown in the following figure.
-In the sequel, we assume that the specification is an opaque expression.</p><p><center>
-<img border="0" src="PapyrusConstraint-SpecViaPropertyView.png"/><br/>
-Open the specification via the property view
-</center></p><p>You can add the language, as in the following figure:<br/></p><p><center>
-<img border="0" src="PapyrusConstraint-OpaqueExpressionAddLang.png"/><br/>
-Specify a language.
-</center></p><p><center>
-<img border="0" src="PapyrusConstraint-OpaqueExpressionEdit.png"/><br/>
-Write the body of the opaque expression
-</center></p><p>This method is a bit more complicated, but gives the user full control over the opaque specification. In particular,
-it is possible to enter more than one language, body pair (even if this is rarely needed).</p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.mediawiki b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.mediawiki
index 16d61ff1925..87a3870aa02 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.mediawiki
@@ -3,7 +3,7 @@
 Creation and edition comprises includes multiple use case, namely creation of a constraint and its context and setting a specification.
 
 <center>
-[[image:PapyrusConstraint-CreationUseCase.png]]<br/> 
+[[Image:images/PapyrusConstraint-CreationUseCase.png]]<br/> 
 </center>
 
 == Define a constraint and its context ==
@@ -13,19 +13,19 @@ Papyrus supports the creation of UML constraints. To create a constraint, and as
 * Within any Papyrus diagram select the constraint tool from the palette and then press the mouse button at the position where you want to create the constraint on the diagram canvas. The constraint should then be connected to another element on the diagram, via a ContextLink relationship, by clicking on the target element in the diagram (in two-click mode). If you are in one-click-mode (connection tool preference), press the mouse button on the constraint and keep it pressed until the context object is selected. This ContextLink relationship defines the context for which the constraint will be evaluated.
 
 <center>
-[[Image:PapyrusConstraint-CreateViaDiagram.png]]&nbsp;&nbsp;&nbsp;[[Image:PapyrusConstraint-ContextViaDiagram.png]]<br>
+[[Image:images/PapyrusConstraint-CreateViaDiagram.png]]&nbsp;&nbsp;&nbsp;[[Image:images/PapyrusConstraint-ContextViaDiagram.png]]<br>
 The constraint and context-link tools in the palette
 </center>
 
 * Within the Model Explorer via right clicking a model element and then selecting New Child -> Create a new Constraint. The context is automatically set to the parent of the constraint. The context can be changed via the Properties View if required.<br>
 
 <center>
-[[Image:PapyrusConstraint-CreateViaME.png]]<br>
+[[Image:images/PapyrusConstraint-CreateViaME.png]]<br>
 Create a constraint via the model explorer
 </center>
 
 <center>
-[[Image:PapyrusConstraint-ContextViaPropertyView.png]]<br>
+[[Image:images/PapyrusConstraint-ContextViaPropertyView.png]]<br>
 Set the context via the property view
 </center>
 
@@ -38,7 +38,7 @@ Each constraint has a specification containing a condition. Whereas it may be an
 * On the diagram select a specific editor via the context menu, as shown in the following screenshot.
 
 <center>
-[[Image:PapyrusConstraint-ChooseEditor.png]]<br>
+[[Image:images/PapyrusConstraint-ChooseEditor.png]]<br>
 Explicitly choose the editor for the constraint
 </center>
 
@@ -46,19 +46,19 @@ Use the property view to create a new or open an existing specification, as show
 In the sequel, we assume that the specification is an opaque expression.
 
 <center>
-[[Image:PapyrusConstraint-SpecViaPropertyView.png]]<br>
+[[Image:images/PapyrusConstraint-SpecViaPropertyView.png]]<br>
 Open the specification via the property view
 </center>
 
 You can add the language, as in the following figure:<br>
   
 <center>
-[[Image:PapyrusConstraint-OpaqueExpressionAddLang.png]]<br>
+[[Image:images/PapyrusConstraint-OpaqueExpressionAddLang.png]]<br>
 Specify a language.
 </center>
 
 <center>
-[[Image:PapyrusConstraint-OpaqueExpressionEdit.png]]<br>
+[[Image:images/PapyrusConstraint-OpaqueExpressionEdit.png]]<br>
 Write the body of the opaque expression
 </center>
 
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraints-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraints-toc.xml
deleted file mode 100644
index d15a17d0302..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraints-toc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>

-<toc label="Constraints in Papyrus" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

-	<topic href="resource/constraints.html" label="Constraints in Papyrus">

-		<anchor id="Constraints"/>

-		<link toc="resource/constraint-creation-toc.xml"/>

-	</topic>	

-</toc>

diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraints.html b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraints.html
deleted file mode 100644
index 4fef1890ee5..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraints.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<?xml version='1.0' encoding='utf-8'?>
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 25 March 2009), see www.w3.org" />
-  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-  <title>Constraint creation</title>
-</head>
-
-<body>
-<h1 id="constraints">Constraints in Papyrus</h1>
-
-Constraint describe valid intervals for values, e.g. a value of a stereotype attribute or a
-value of a slot in an instance specification. Thus, constraints are important elements of a user model.
-Constraints can also be defined in the context of a profile, since the use of a specific stereotype
-might only be valid, if the element applying the stereotype satisfies certain constraints.
-
-</body>
-</html>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-ChooseEditor.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-ChooseEditor.png
index 45da47a8afb..45da47a8afb 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-ChooseEditor.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-ChooseEditor.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-ContextViaDiagram.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-ContextViaDiagram.png
index 2530c64e2a0..2530c64e2a0 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-ContextViaDiagram.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-ContextViaDiagram.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-ContextViaPropertyView.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-ContextViaPropertyView.png
index a3d325cfbe0..a3d325cfbe0 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-ContextViaPropertyView.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-ContextViaPropertyView.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-CreateViaDiagram.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-CreateViaDiagram.png
index d7928a19f34..d7928a19f34 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-CreateViaDiagram.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-CreateViaDiagram.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-CreateViaME.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-CreateViaME.png
index f920598521b..f920598521b 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-CreateViaME.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-CreateViaME.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-CreationUseCase.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-CreationUseCase.png
index a6965fb8519..a6965fb8519 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-CreationUseCase.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-CreationUseCase.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-OpaqueExpressionAddLang.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-OpaqueExpressionAddLang.png
index c69dd04d6a6..c69dd04d6a6 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-OpaqueExpressionAddLang.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-OpaqueExpressionAddLang.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-OpaqueExpressionEdit.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-OpaqueExpressionEdit.png
index d6560ee0c1e..d6560ee0c1e 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-OpaqueExpressionEdit.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-OpaqueExpressionEdit.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-SpecViaPropertyView.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-SpecViaPropertyView.png
index 44d41af47f9..44d41af47f9 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/PapyrusConstraint-SpecViaPropertyView.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/PapyrusConstraint-SpecViaPropertyView.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_ActorAndTypedElementWithTypeActor.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_ActorAndTypedElementWithTypeActor.png
index 90ccc78680a..90ccc78680a 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_ActorAndTypedElementWithTypeActor.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_ActorAndTypedElementWithTypeActor.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_AddImageToStereotype.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_AddImageToStereotype.png
index fd4fa2880c2..fd4fa2880c2 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_AddImageToStereotype.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_AddImageToStereotype.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_ApplyRegisteredProfile.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_ApplyRegisteredProfile.png
index 542cc3945d0..542cc3945d0 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_ApplyRegisteredProfile.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_ApplyRegisteredProfile.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_ApplyTypeSymbolDefinitionStereotype.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_ApplyTypeSymbolDefinitionStereotype.png
index 3648449a4af..3648449a4af 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_ApplyTypeSymbolDefinitionStereotype.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_ApplyTypeSymbolDefinitionStereotype.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_ApplyTypeSymbolDefinitionStereotypeDialog.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_ApplyTypeSymbolDefinitionStereotypeDialog.png
index e056adb27c4..e056adb27c4 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_ApplyTypeSymbolDefinitionStereotypeDialog.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_ApplyTypeSymbolDefinitionStereotypeDialog.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_Compartment.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_Compartment.png
index 87abab342b6..87abab342b6 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_Compartment.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_Compartment.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_CompartmentDialog.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_CompartmentDialog.png
index 54c3e3f136a..54c3e3f136a 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_CompartmentDialog.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_CompartmentDialog.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_Decorator.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_Decorator.png
index 29f79c29d04..29f79c29d04 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_Decorator.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_Decorator.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_DecoratorPropertyView.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_DecoratorPropertyView.png
index a6e568960a6..a6e568960a6 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_DecoratorPropertyView.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_DecoratorPropertyView.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_Example.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_Example.png
index 82b06fdb502..82b06fdb502 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_Example.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_Example.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_ProfileSelectionDialog.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_ProfileSelectionDialog.png
index a4c2abfe353..a4c2abfe353 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_ProfileSelectionDialog.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_ProfileSelectionDialog.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_ProfileSelectionDialogAllSubProfile.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_ProfileSelectionDialogAllSubProfile.png
index 40e9b841add..40e9b841add 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_ProfileSelectionDialogAllSubProfile.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_ProfileSelectionDialogAllSubProfile.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_TypeSymbolDefinition_SymbolPath.png b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_TypeSymbolDefinition_SymbolPath.png
index d94cba91a91..d94cba91a91 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/Symbol_TypeSymbolDefinition_SymbolPath.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/images/Symbol_TypeSymbolDefinition_SymbolPath.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols-main-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols-main-toc.xml
index 2db77f51781..4b9fd0124eb 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols-main-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <toc label="Symbols" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-   <topic href="resource/symbols.html" label="Symbols">
-      <link toc="resource/symbols-toc.xml"/>
+   <topic href="target/generated-eclipse-help/symbols.html" label="Symbols">
+      <link toc="target/generated-eclipse-help/symbols-toc.xml"/>
       <anchor id="UMLCommon"/>
    </topic>	
 </toc>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols-toc.xml
deleted file mode 100644
index 9368f9a0d8a..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols-toc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/symbols.html" label="symbols">
-	<topic href="resource/symbols.html" label="Introduction"></topic>
-	<topic href="resource/symbols.html#Symbol_display_place_in_diagrams" label="Symbol display place in diagrams">
-		<topic href="resource/symbols.html#Symbol_representation_in_compartments" label="Symbol representation in compartments"></topic>
-		<topic href="resource/symbols.html#Symbol_representation_as_a_decorator" label="Symbol representation as a decorator"></topic>
-	</topic>
-	<topic href="resource/symbols.html#Defining_symbols_in_models" label="Defining symbols in models">
-		<topic href="resource/symbols.html#Define_new_symbols_in_profiles" label="Define new symbols in profiles"></topic>
-		<topic href="resource/symbols.html#Symbol_associated_to_Actor_UML_element" label="Symbol associated to Actor UML element"></topic>
-		<topic href="resource/symbols.html#Symbol_associated_to_Type_element" label="Symbol associated to Type element"></topic>
-	</topic>
-	<topic href="resource/symbols.html#FAQ" label="FAQ"></topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols.html b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols.html
deleted file mode 100644
index 49b57fdb171..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><ol style="list-style: none;"><li><a href="#Introduction">Introduction</a></li><li><a href="#Symbol_display_place_in_diagrams">Symbol display place in diagrams</a><ol style="list-style: none;"><li><a href="#Symbol_representation_in_compartments">Symbol representation in compartments</a></li><li><a href="#Symbol_representation_as_a_decorator">Symbol representation as a decorator</a></li></ol></li><li><a href="#Defining_symbols_in_models">Defining symbols in models</a><ol style="list-style: none;"><li><a href="#Define_new_symbols_in_profiles">Define new symbols in profiles</a></li><li><a href="#Symbol_associated_to_Actor_UML_element">Symbol associated to Actor UML element</a></li><li><a href="#Symbol_associated_to_Type_element">Symbol associated to Type element</a></li></ol></li><li><a href="#FAQ">FAQ</a></li></ol><p>This short documentation will present the support for custom representations available to Papyrus users </p><h1 id="Introduction">Introduction</h1><p>The goal of the symbol support in Papyrus is to give users access to some custom representations. They can use their own representation, i.e. their own svg files, in their diagrams, so the model can be easily read and understood. SVG file format was used, as this vectorial format scales easily. </p><p><img border="0" src="Symbol_Example.png"/> </p><h1 id="Symbol_display_place_in_diagrams">Symbol display place in diagrams</h1><p>There are 2 manners to display symbols on the diagrams, in compartments and as decorators.</p><h2 id="Symbol_representation_in_compartments">Symbol representation in compartments</h2><p>For all nodes, like Package or Class in a Class diagram, it is possible to display the symbols in a "shape" compartment. This compartment can be displayed/hidden using the context menu on the diagram </p><p><img border="0" src="Symbol_Compartment.png"/> </p><p>To display/hide shape compartment:&nbsp; </p><ul><li>Right click on the node </li><li>Filters </li><li>Show/Hide Compartments </li><li>Select "shape". you can also select if you wish to show/hide the title of the shape compartment. </li><li>OK</li></ul><p><br/> </p><pre>Hint: you can also select the node and press 'Ctrl'+'F5' simultaneously to display the Show/hide Compartment dialog
-</pre><p> </p><h2 id="Symbol_representation_as_a_decorator">Symbol representation as a decorator</h2><p>For all Nodes in diagrams, it is possible to display the available symbols as decorators. The decorators are small representations depicted above the figures. for example, validation errors and warnings are displayed as decorators on Papyrus diagrams. </p><p><img border="0" src="Symbol_Decorator.png"/> </p><p>The Appearance tab of the properties view allows user to toggle the visibility of decorators, and the location of the display on the figure. There are 9 positions on the figure (north/east/south/west and all valid combinations) </p><p><img border="0" src="Symbol_DecoratorPropertyView.png"/> </p><pre>Hint: if the properties view is not displayed in your Eclipse environnement, you can display it using context menu on a diagram =&gt; show Properties view.
-</pre><p> </p><h1 id="Defining_symbols_in_models">Defining symbols in models</h1><p>This section explains how symbols can be associated to model elements. There are currently 3 ways to define specific symbols for model elements. </p><h2 id="Define_new_symbols_in_profiles">Define new symbols in profiles</h2><p>UML offers the possiblity to associate new icons to stereotyped elements, via the <i>image</i> Property of Stereotypes. In Papyrus, one of these images can be a shape. This shape will be availalbe for any node representation of a steoretyped element. </p><p>On the property view of a Stereotype, you can associate an image to the stereotype </p><p><img border="0" src="Symbol_AddImageToStereotype.png"/> </p><p>This shape wil now be available on all elements that are stereotyped by this given Stereotype. </p><pre>Hint: You can have more documentation about profiles in Papyrus on the website, users corner
-</pre><p> </p><h2 id="Symbol_associated_to_Actor_UML_element">Symbol associated to Actor UML element</h2><p>By default, Actors and TypedElement that are typed by an Actor have a stickman symbol associated. </p><p><img border="0" src="Symbol_ActorAndTypedElementWithTypeActor.png"/> </p><h2 id="Symbol_associated_to_Type_element">Symbol associated to Type element</h2><p>The last way to associate symbols to model element is to apply the PapryusInternal profile. </p><p>Steps: </p><ul><li>Select the model in which you want to associate symbols to types. </li><li>Go to the property view </li><li>Go to the profile Tab </li><li>Select the icon for the registered profiles in the Applied Profile section</li></ul><p><img border="0" src="Symbol_ApplyRegisteredProfile.png"/> </p><ul><li>In the dialog, select the PapyrusInternal Profile</li></ul><p><img border="0" src="Symbol_ProfileSelectionDialog.png"/> </p><ul><li>In the next dialog, select all profiles and subprofiles</li></ul><p><img border="0" src="Symbol_ProfileSelectionDialogAllSubProfile.png"/> </p><ul><li>OK</li></ul><p><br/> </p><p>As soon as the Internal profile is applied, the user can apply a specific stereotype on Type elements. On this stereotype, a field allows user to define a symbol for the stereotyped Type. Then the symbol will be available for all representations of this Type and the representations of TypedElements typed by it. </p><p>Steps: </p><ul><li>Select the Type for which you want to associate a symbol </li><li>Go to the property view </li><li>Go to the profile Tab </li><li>Apply the TypeSymbolDefinition stereotype (available on Type elements, as soon as the internal profile is applied on the model)</li></ul><p><img border="0" src="Symbol_ApplyTypeSymbolDefinitionStereotype.png"/> </p><p><img border="0" src="Symbol_ApplyTypeSymbolDefinitionStereotypeDialog.png"/> </p><ul><li>Select the property symbolPath of the TypeSymbolDefinition stereotype.</li></ul><ul><li>Set the path to the symbol file</li></ul><p><img border="0" src="Symbol_TypeSymbolDefinition_SymbolPath.png"/> </p><h1 id="FAQ">FAQ</h1><ul><li>What is the format supported for the symbols?</li></ul><p>Currently, Papyrus supports SVG and PNG files. </p><ul><li>What are the limitations of the SVG support?</li></ul><p>Papyrus relies on a SVG render provided by the GMF project. This renderer do not support all the funny things provided by the SVG format. For example, it is known that the gradients are not supported. If a svg file has some gradient in its definition, it will not be displayed at all by Papryus. </p><ul><li>What is the syntax for the path to the symbol?</li></ul><p>Paths can be expressed as Eclipse URIs (Either absolute or relative to the current model), e.g: </p><pre>platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/symbols/actor.svg
-</pre><p> 
-=&gt; This is a svg image contained in the plug-in {oep}.uml.diagram.common </p><pre>Images/logo.svg
-</pre><p> 
-=&gt; This is a svg image contained in an images/ folder next to my current model </p><pre>platform:/resource/my-project/images/logo.svg
-</pre><p> 
-=&gt; This is a svg image contained in the project “my-project”, in the current workspace </p><pre>file:/home/images/logo.svg
-</pre><p> 
-=&gt; This is an absolute filesystem URI </p><ul><li>(Developers) Can I implement my own policy for Symbol support?</li></ul><p>Yes. Papyrus relies on the Eclipse extension point framework to associate symbols with elements. It is possible for users to declare new extensions to provide their own symbol associations. See the extension point: org.eclipse.papyrus.infra.gmfdiag.common.shapeProvider for more information.</p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols.mediawiki b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols.mediawiki
index c07d80b1d29..e3a289c9036 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols.mediawiki
@@ -6,7 +6,7 @@ This short documentation will present the support for custom representations ava
 

 The goal of the symbol support in Papyrus is to give users access to some custom representations. They can use their own representation, i.e. their own svg files, in their diagrams, so the model can be easily read and understood. SVG file format was used, as this vectorial format scales easily. 

 

-[[Image:Symbol Example.png]] 

+[[Image:images/Symbol_Example.png]] 

 

 = Symbol display place in diagrams  =

 

@@ -16,7 +16,7 @@ There are 2 manners to display symbols on the diagrams, in compartments and as d
 

 For all nodes, like Package or Class in a Class diagram, it is possible to display the symbols in a "shape" compartment. This compartment can be displayed/hidden using the context menu on the diagram 

 

-[[Image:Symbol Compartment.png]] 

+[[Image:images/Symbol_Compartment.png]] 

 

 To display/hide shape compartment:&nbsp; 

 

@@ -33,11 +33,11 @@ To display/hide shape compartment:&nbsp;
 

 For all Nodes in diagrams, it is possible to display the available symbols as decorators. The decorators are small representations depicted above the figures. for example, validation errors and warnings are displayed as decorators on Papyrus diagrams. 

 

-[[Image:Symbol Decorator.png]] 

+[[Image:images/Symbol_Decorator.png]] 

 

 The Appearance tab of the properties view allows user to toggle the visibility of decorators, and the location of the display on the figure. There are 9 positions on the figure (north/east/south/west and all valid combinations) 

 

-[[Image:Symbol DecoratorPropertyView.png]] 

+[[Image:images/Symbol_DecoratorPropertyView.png]] 

 <pre>Hint: if the properties view is not displayed in your Eclipse environnement, you can display it using context menu on a diagram => show Properties view.

 </pre> 

 = Defining symbols in models  =

@@ -50,7 +50,7 @@ UML offers the possiblity to associate new icons to stereotyped elements, via th
 

 On the property view of a Stereotype, you can associate an image to the stereotype 

 

-[[Image:Symbol AddImageToStereotype.png]] 

+[[Image:images/Symbol_AddImageToStereotype.png]] 

 

 This shape wil now be available on all elements that are stereotyped by this given Stereotype. 

 <pre>Hint: You can have more documentation about profiles in Papyrus on the website, users corner

@@ -59,7 +59,7 @@ This shape wil now be available on all elements that are stereotyped by this giv
 

 By default, Actors and TypedElement that are typed by an Actor have a stickman symbol associated. 

 

-[[Image:Symbol ActorAndTypedElementWithTypeActor.png]] 

+[[Image:images/Symbol_ActorAndTypedElementWithTypeActor.png]] 

 

 == Symbol associated to Type element  ==

 

@@ -72,15 +72,15 @@ Steps:
 *Go to the profile Tab 

 *Select the icon for the registered profiles in the Applied Profile section

 

-[[Image:Symbol ApplyRegisteredProfile.png]] 

+[[Image:images/Symbol_ApplyRegisteredProfile.png]] 

 

 *In the dialog, select the PapyrusInternal Profile

 

-[[Image:Symbol ProfileSelectionDialog.png]] 

+[[Image:images/Symbol_ProfileSelectionDialog.png]] 

 

 *In the next dialog, select all profiles and subprofiles

 

-[[Image:Symbol ProfileSelectionDialogAllSubProfile.png]] 

+[[Image:images/Symbol_ProfileSelectionDialogAllSubProfile.png]] 

 

 *OK

 

@@ -95,15 +95,15 @@ Steps:
 *Go to the profile Tab 

 *Apply the TypeSymbolDefinition stereotype (available on Type elements, as soon as the internal profile is applied on the model)

 

-[[Image:Symbol ApplyTypeSymbolDefinitionStereotype.png]] 

+[[Image:images/Symbol_ApplyTypeSymbolDefinitionStereotype.png]] 

 

-[[Image:Symbol ApplyTypeSymbolDefinitionStereotypeDialog.png]] 

+[[Image:images/Symbol_ApplyTypeSymbolDefinitionStereotypeDialog.png]] 

 

 *Select the property symbolPath of the TypeSymbolDefinition stereotype.

 

 *Set the path to the symbol file

 

-[[Image:Symbol TypeSymbolDefinition SymbolPath.png]] 

+[[Image:images/Symbol_TypeSymbolDefinition_SymbolPath.png]] 

 

 = FAQ  =

 

@@ -126,7 +126,7 @@ Paths can be expressed as Eclipse URIs (Either absolute or relative to the curre
 =&gt; This is a svg image contained in an images/ folder next to my current model 

 <pre>platform:/resource/my-project/images/logo.svg

 </pre> 

-=&gt; This is a svg image contained in the project �my-project�, in the current workspace 

+=&gt; This is a svg image contained in the project �my-project�, in the current workspace 

 <pre>file:/home/images/logo.svg

 </pre> 

 =&gt; This is an absolute filesystem URI 

diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.project
index 17669199be7..b03d5dc5a29 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.project
@@ -6,6 +6,11 @@
 	</projects>

 	<buildSpec>

 		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

 			<arguments>

 			</arguments>

@@ -15,8 +20,15 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

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

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

 	</natures>

 </projectDescription>

diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 00d953e86b0..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-eclipse.preferences.version=1
-encoding//resource/users/definingProfilesAndStereotypes-toc.xml=utf-8
-encoding//resource/users/definingProfilesAndStereotypes.html=utf-8
-encoding//resource/users/papyrusProfileArchitecture-toc.xml=utf-8
-encoding//resource/users/papyrusProfileArchitecture.html=utf-8
-encoding//resource/users/papyrusProfileLimitations-toc.xml=utf-8
-encoding//resource/users/papyrusProfileLimitations.html=utf-8
-encoding//resource/users/profile-toc.xml=utf-8
-encoding//resource/users/profile.html=utf-8
-encoding//resource/users/simplifiedUsageOfProfilesAndStereotypes-toc.xml=utf-8
-encoding//resource/users/simplifiedUsageOfProfilesAndStereotypes.html=utf-8
-encoding//resource/users/usingProfilesAndStereotypes-toc.xml=utf-8
-encoding//resource/users/usingProfilesAndStereotypes.html=utf-8
-encoding//resource/users/whatIsAUmlProfile-toc.xml=utf-8
-encoding//resource/users/whatIsAUmlProfile.html=utf-8
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF
index 2799cfaa2c8..0fa8318c7bf 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Bundle-Name: Profile Documentation
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile.doc;singl

  eton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 

diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/build.properties
index 4887a1c42cb..3abab9716c1 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/build.properties
@@ -1,5 +1,7 @@
 bin.includes = META-INF/,\

                about.html,\

                resource/,\

-               plugin.xml

-src.includes = about.html

+               plugin.xml,\

+               target/generated-eclipse-help/** 

+src.includes = about.html,\

+				resource/

diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/plugin.xml
index 23577ac4f75..c4880e8531f 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/plugin.xml
@@ -4,35 +4,35 @@
    <extension
          point="org.eclipse.help.toc">
       <toc
-            file="resource/users/profile-main-toc.xml"
+            file="target/generated-eclipse-help/users/profile-main-toc.xml"
             primary="false">
       </toc>
       <toc
-            file="resource/users/profile-toc.xml"
+            file="target/generated-eclipse-help/users/profile-toc.xml"
             primary="false">
       </toc>
       <toc
-            file="resource/users/whatIsAUmlProfile-toc.xml"
+            file="target/generated-eclipse-help/users/whatIsAUmlProfile-toc.xml"
             primary="false">
       </toc>
       <toc
-            file="resource/users/usingProfilesAndStereotypes-toc.xml"
+            file="target/generated-eclipse-help/users/usingProfilesAndStereotypes-toc.xml"
             primary="false">
       </toc>
       <toc
-            file="resource/users/definingProfilesAndStereotypes-toc.xml"
+            file="target/generated-eclipse-help/users/definingProfilesAndStereotypes-toc.xml"
             primary="false">
       </toc>
       <toc
-            file="resource/users/papyrusProfileArchitecture-toc.xml"
+            file="target/generated-eclipse-help/users/papyrusProfileArchitecture-toc.xml"
             primary="false">
       </toc>
       <toc
-            file="resource/users/papyrusProfileLimitations-toc.xml"
+            file="target/generated-eclipse-help/users/papyrusProfileLimitations-toc.xml"
             primary="true">
       </toc>
       <toc
-            file="resource/users/simplifiedUsageOfProfilesAndStereotypes-toc.xml"
+            file="target/generated-eclipse-help/users/simplifiedUsageOfProfilesAndStereotypes-toc.xml"
             primary="true">
       </toc>
    </extension>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/pom.xml
index ad9849a3aaa..c4bcaf3199b 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/definingProfilesAndStereotypes-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/definingProfilesAndStereotypes-toc.xml
deleted file mode 100644
index 804cd6ee7f5..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/definingProfilesAndStereotypes-toc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/users/definingProfilesAndStereotypes.html" label="definingProfilesAndStereotypes">
-	<topic href="resource/users/definingProfilesAndStereotypes.html" label="Defining Profiles and Stereotypes">
-		<topic href="resource/users/definingProfilesAndStereotypes.html#Creating_a_Profile_Resource" label="Creating a Profile Resource"></topic>
-		<topic href="resource/users/definingProfilesAndStereotypes.html#Defining_a_Stereotype" label="Defining a Stereotype">
-			<topic href="resource/users/definingProfilesAndStereotypes.html#Creating_a_Stereotype" label="Creating a Stereotype"></topic>
-			<topic href="resource/users/definingProfilesAndStereotypes.html#Importing_Metaclass" label="Importing Metaclass"></topic>
-			<topic href="resource/users/definingProfilesAndStereotypes.html#Linking_Stereotype_to_Metaclass_:_Extension_Creation" label="Linking Stereotype to Metaclass : Extension Creation"></topic>
-		</topic>
-		<topic href="resource/users/definingProfilesAndStereotypes.html#Creating_a_Subprofile" label="Creating a Subprofile"></topic>
-		<topic href="resource/users/definingProfilesAndStereotypes.html#Generalizing_Stereotype" label="Generalizing Stereotype"></topic>
-		<topic href="resource/users/definingProfilesAndStereotypes.html#Displaying_Stereotype_Options" label="Displaying Stereotype Options"></topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/definingProfilesAndStereotypes.html b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/definingProfilesAndStereotypes.html
deleted file mode 100644
index 49b34b4260e..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/definingProfilesAndStereotypes.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Defining_Profiles_and_Stereotypes">Defining Profiles and Stereotypes</h1><p><b>Contents</b></p><ol style="list-style: none;"><li><a href="#Defining_Profiles_and_Stereotypes">Defining Profiles and Stereotypes</a><ol style="list-style: none;"><li><a href="#Creating_a_Profile_Resource">Creating a Profile Resource</a></li><li><a href="#Defining_a_Stereotype">Defining a Stereotype</a><ol style="list-style: none;"><li><a href="#Creating_a_Stereotype">Creating a Stereotype</a></li><li><a href="#Importing_Metaclass">Importing Metaclass</a></li><li><a href="#Linking_Stereotype_to_Metaclass_:_Extension_Creation">Linking Stereotype to Metaclass : Extension Creation</a></li></ol></li><li><a href="#Creating_a_Subprofile">Creating a Subprofile</a></li><li><a href="#Generalizing_Stereotype">Generalizing Stereotype</a></li><li><a href="#Displaying_Stereotype_Options">Displaying Stereotype Options</a></li></ol></li></ol><p>In UML, Stereotypes should be defined in a UML Profile. A UML Profile is a kind of uml::Package.</p><p>Papyrus allows to create Profiles and Sterotypes in any kind of models. But, if you want to define Profiles and Stereotypes in order to apply them to UML elements, <b>you need to define a Profile in a Papyrus profile resource (file)</b>.</p><p>Defining Stereotypes with Papyrus required the following:</p><ul><li>A <b>profile resource</b> - The resource (file) containing the profile (uml+di+notation files)</li><li>A <b>uml::Profile</b> - The uml element containing the Stereotypes</li><li>The <b>Stereotype</b> - The uml::Stereotype element defining the Stereotype</li></ul><h2 id="Creating_a_Profile_Resource">Creating a Profile Resource</h2><p>To create a new Profile, select File &gt; New &gt; Papyrus Project (Or Papyrus model, if you already have an opened project). When asked for a Diagram Language, Select "Profile":</p><p><img title="New Profile" alt="New Profile" border="0" src="images/newProfile.png"/><br/></p><p><img title="New Profile Diagram" alt="New Profile Diagram" border="0" src="images/newProfileDiagram.png"/><br/></p><p><img title="Profile Editor" alt="Profile Editor" border="0" src="images/profileEditor.png"/><br/></p><p>This creates a Resource containing a uml::Profile as root element.</p><h2 id="Defining_a_Stereotype">Defining a Stereotype</h2><p>Once a profile is created, it is now time to populate this latter with UML extensions, i.e. stereotypes, and their related concepts such as properties, extensions, and metaclasses.</p><h3 id="Creating_a_Stereotype">Creating a Stereotype</h3><p>A stereotype is created as any other UML model elements in Papyrus: select the related tool in the palette of the profile diagram editor, and then click in the place you want to create this element on the background of the diagram. If the palette is not open, just click on the small arrow on the upper right corner of the diagram editor. Papyrus will then ask you to provide a name. Once done, hit the return key and that all.</p><p><img title="Stereotype Palette" alt="Stereotype Palette" border="0" src="images/stereotypePalette.png"/><br/></p><p><img title="Stereotype Name" alt="Stereotype Name" border="0" src="images/stereotypeName.png"/><br/></p><h3 id="Importing_Metaclass">Importing Metaclass</h3><p>Once you have created a stereotype, you need to import the UML2 metaclasses you want to extend. First, you have to select the tool “Import Metaclass� within the palette of the profile diagram editor. Then, let’s click on the profile diagram where you want to drop the imported metaclass. A Papyrus dialog box is then opened in order to ask you to specify which metaclasses you want to import. Select the metaclasses in the left list and either drag and drop these latter in the right list or press the button with arrow directed from left to right and located between both aforementioned lists. Then, let’s press the button “ok� and it is done. The imported metaclasses are then shown in the diagram as illustrated.</p><p><img title="Import Metaclass" alt="Import Metaclass" border="0" src="images/importMetaclassDialog.png"/><br/></p><p><img title="Imported Metaclass" alt="Imported Metaclass" border="0" src="images/importedMetaclass.png"/><br/></p><p>Note: When you import UML2 metaclasses, Papyrus is creating ImportElement model element referent to the metaclasses of the UML2 metamodel itself. Those so-called specific model elements, the ImportElement, are indeed a kind of proxy to the model elements contained in another model, in the UML2 metamodel. If a metaclass has already be imported, you do not need to import it again to use it in another context. You can select the imported meta-class from the model browser and drag and drop this latter on the diagram you want to use it.</p><h3 id="Linking_Stereotype_to_Metaclass_:_Extension_Creation">Linking Stereotype to Metaclass : Extension Creation</h3><p>Once the stereotype is created and the meta-class is imported, you may then model the extension relation from the stereotype to the meta-class as shown in the following figure. The extension relationship is modeled using the extension tool in the profile diagram palette, <img title="Extension" alt="Extension" border="0" src="images/Extension.gif"/>. Within the diagram shown in next figure, both stereotypes «Requirement» and «Refinement» extend respectively both meta-classes Class and Dependency:</p><p><img title="Metaclass Extension" alt="Metaclass Extension" border="0" src="images/metaclassExtension.png"/><br/></p><h2 id="Creating_a_Subprofile">Creating a Subprofile</h2><p>Some profile may be complex due as for example to their scope that may be large. In order to cope with this complexity, it is then possible to decompose a profile into a hierarchy of subprofiles. A subprofile behaves such as a sub-package; it is a container of stereotypes.</p><p>To create a sub profile, select the profile tool in the profile diagram palette (<img title="Profile" alt="Profile" border="0" src="images/Profile.gif"/>) and then click on the profile diagram where you want to create your new profile.</p><p>In the example denoted below, we have created two sub-profiles of the SimplifiedReqML profile in order to gather in one hand the extensions that apply to node elements of the models and in the other hand the extension defined in the DSML for modeling relationships between those nodes:</p><p><img title="Sub Profiles" alt="Sub Profiles" border="0" src="images/subProfiles.png"/><br/></p><h2 id="Generalizing_Stereotype">Generalizing Stereotype</h2><p>When designing a profile, it is possible to reuse existing stereotypes defined in other existing profiles. Stereotypes can indeed be generalized enabling to create child stereotypes that inherit features of one or more generalized stereotype define either locally in the profile or externally other profiles.</p><p>To create a stereotype generalization using the profile diagram editor, let’s draw a generalization relationship using the tool <img title="Generalization" alt="Generalization" border="0" src="images/Generalization.gif"/> from the palette. As any relationship within Papyrus, you need to click first on the source and then on the target of the relationship you want to model.</p><p>In our example, there exists in the UML predefined profile a stereotype extending the dependency relationship in order to introduce the concept of refinement: «Refine». Consequently, we will redesign our sub-profile SRMLRelationship in order our stereotype «Refinement» to be a specialization of this UML stereotype instead of directly extending the UML dependency meta-class.</p><p>As previously mentioned, you may extend a stereotype defined in your profile or a stereotype defined in another external profile. In the latter case, the first thing to do is to import the profile where the stereotype has been defined, as denoted in the following example:</p><p><img title="Import Profile" alt="Import Profile" border="0" src="images/importProfile.png"/><br/></p><p><img title="Select Profile" alt="Select Profile" border="0" src="images/selectProfile.png"/><br/></p><p>Once the profile has been imported, you can select the stereotype you want to generalize from the imported profile (In the Model Explorer) and drop this latter in the diagram of profile description: </p><p><img title="Drop Stereotype" alt="Drop Stereotype" border="0" src="images/dropStereotype.png"/><br/></p><p>Now, let’s draw the generalization relationship from your stereotype (e.g., «Refinement» in the figure below) to the generalized stereotype (e.g., «Refine» in the figure below). </p><p><img title="Generalize Stereotype" alt="Generalize Stereotype" border="0" src="images/generalizeStereotype.png"/><br/></p><p>At this point, your diagram should look like something like the one shown here:</p><p><img title="Result Profile" alt="Result Profile" border="0" src="images/resultProfile.png"/><br/></p><h2 id="Displaying_Stereotype_Options">Displaying Stereotype Options</h2><p>When a stereotype application is shown in a diagram, the by-default way to show it within diagrams is using a string where the name of the stereotype is shown within a pair of French guillemets above or before the name of the model element. However, it is also possible to modify the graphical appearance of the annotated model element using icons. If the graphical representation of the model element is something like a box (including ellipse of the use cases), the icons can be displayed inside and on top of the figures, or it may replace this latter. In that latter case, the property of the element cannot be shown and the name of the model element appears within a label displayed near the icon. If the model element is graphically denoted by a line, the icon is shown in front of the name of the link.</p><p>In order to specify the icons you want to attach to a stereotype, select the stereotype and the tab UML of the property view. In the right-upper corner of the widget named “icons�, press the button <img title="Add" alt="Add" border="0" src="images/Add.gif"/> to add a new icon as shown in step 1. Once done, the dialog box shown at step 2 is open. Within this latter, let’s fill in a name and select an image file using the button <img title="Add" alt="Add" border="0" src="images/Add.gif"/> defining the content of the icon. Next, you have to define the kind value: icon or shape. Using this property, you can choose to associate the selected image either as an icon or as a shape.</p><p><img title="Step 1: Icons for Stereotypes" alt="Step 1: Icons for Stereotypes" border="0" src="images/iconsForStereotype.png"/><br/></p><p><img title="Step 2: Select Icon" alt="Step 2: Select Icon" border="0" src="images/selectIcon.png"/><br/></p><p>It is possible to associate only one shape to a stereotype, but you can associate different icons to a same stereotype. In that latter case, there is a description property that is used to select which one to display. By default, if no expression is defined, the first one is the list is chosen for displaying. The expression has to be on a property of the stereotype which type is an enumeration type.
-In our example, we can set different icons to the stereotype «Requirement» depending on the value of its importance property. This latter is indeed typed by the ImportanceLevel enumeration which values may be High, Medium of Low (figure shown below). For this example, we will then associate the three following images <img title="High" alt="High" border="0" src="images/high.png"/>, <img title="Medium" alt="Medium" border="0" src="images/medium.png"/>, and <img title="Low" alt="Low" border="0" src="images/low.png"/>, to the stereotype «Requirement» and their related expression will be respectively importance=High (e.g. figure shown below), importance=Medium and importance=Low.</p><p><img title="Many Stereotype Icons" alt="Many Stereotype Icons" border="0" src="images/manyStereotypeIcons.png"/><br/></p><p><img title="Icon Kind" alt="Icon Kind" border="0" src="images/iconKind.png"/><br/></p><p><img title="Icon Expressions" alt="Icon Expressions" border="0" src="images/iconExpressions.png"/><br/></p><p><img title="High Req. Icon" alt="High Req. Icon" border="0" src="images/highReqIcon.png"/><br/></p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/papyrusProfileArchitecture-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/papyrusProfileArchitecture-toc.xml
deleted file mode 100644
index 3b127e17ba8..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/papyrusProfileArchitecture-toc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/users/papyrusProfileArchitecture.html" label="papyrusProfileArchitecture">
-	<topic href="resource/users/papyrusProfileArchitecture.html" label="Papyrus Profile Architecture">
-		<topic href="resource/users/papyrusProfileArchitecture.html#Profile_and_Stereotype_Definitions_Architecture" label="Profile and Stereotype Definitions Architecture"></topic>
-		<topic href="resource/users/papyrusProfileArchitecture.html#Profile_and_Stereotype_applications_Architecture" label="Profile and Stereotype applications Architecture"></topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/papyrusProfileArchitecture.html b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/papyrusProfileArchitecture.html
deleted file mode 100644
index 14e15bc6024..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/papyrusProfileArchitecture.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Papyrus_Profile_Architecture">Papyrus Profile Architecture</h1><p><b>Contents</b></p><ol style="list-style: none;"><li><a href="#Papyrus_Profile_Architecture">Papyrus Profile Architecture</a><ol style="list-style: none;"><li><a href="#Profile_and_Stereotype_Definitions_Architecture">Profile and Stereotype Definitions Architecture</a></li><li><a href="#Profile_and_Stereotype_applications_Architecture">Profile and Stereotype applications Architecture</a></li></ol></li></ol><p>This section describes the architecture used to define uml Profiles in Papyrus. </p><p>Papyrus Profiles and Stereotypes implementation is made of two different parts:</p><ul><li>The Profile and Stereotype <b>definitions</b> - This part is used to handle the stereotype and profile definitions.</li><li>The Profile and Stereotype <b>applications</b> - This part is used to apply an existing stereotype or profile to an UML element.</li></ul><h2 id="Profile_and_Stereotype_Definitions_Architecture">Profile and Stereotype Definitions Architecture</h2><p>Papyrus allows to create Profiles and Sterotypes in any kind of models. But, if you want to define Profiles and Stereotypes in order to apply them to UML elements, <b>you need to define a Profile in a 'Papyrus profile resource</b>' (i.e. a file).</p><p>The definitions of Profiles and Stereoptypes is made of two parts: the UML definitions, and the corresponding dynamic model. User define profiles and stereotypes in UML. The corresponding dynamic model is computed by Papyrus when the resource is saved.</p><p>UML definition of profile follows UML standard: Stereotypes must be defined in a uml::Profile.</p><p>The dynamic model is defined by Papyrus using the EMF/UML framework. This dynamic model is associated to a version number. The version number is incremented each time the dynamic model is re-created, so each time the profile resource is saved.</p><h2 id="Profile_and_Stereotype_applications_Architecture">Profile and Stereotype applications Architecture</h2><p>When Profile or a Stereotype is applied to an UML element, this create a Application object referencing both the uml element, and the profile or stereotype definition. 
-Thus, an uml element is not directly linked to an Application object.</p><p>Application objects are normally stored in the resource file containing the uml element they reference. They are not stored inside the UML model. Rather, they are stored alongside of the uml model. </p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/papyrusProfileLimitations-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/papyrusProfileLimitations-toc.xml
deleted file mode 100644
index 79f8866b7fa..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/papyrusProfileLimitations-toc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/users/papyrusProfileLimitations.html" label="papyrusProfileLimitations">
-	<topic href="resource/users/papyrusProfileLimitations.html" label="Papyrus Profile Limitations">
-		<topic href="resource/users/papyrusProfileLimitations.html#Cyclic_Profile_Definitions" label="Cyclic Profile Definitions"></topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/papyrusProfileLimitations.html b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/papyrusProfileLimitations.html
deleted file mode 100644
index 78688f35ac2..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/papyrusProfileLimitations.html
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Papyrus_Profile_Limitations">Papyrus Profile Limitations</h1><p><b>Contents</b></p><ol style="list-style: none;"><li><a href="#Papyrus_Profile_Limitations">Papyrus Profile Limitations</a><ol style="list-style: none;"><li><a href="#Cyclic_Profile_Definitions">Cyclic Profile Definitions</a></li></ol></li></ol><h2 id="Cyclic_Profile_Definitions">Cyclic Profile Definitions</h2><p>Due to the way the Dynamic ECore model is built, Papyrus does not support Definition of Profiles with cyclic references.</p><p>See <a href="/wiki/https://bugs.eclipse.org/bugs/show_bug.cgi?id=451613" title="https://bugs.eclipse.org/bugs/show_bug.cgi?id=451613">Bug 451613</a>: ClassCastException when updating hierarchical profile with datatype</p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-main-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-main-toc.xml
index cbcc0662ee4..a9cc04d1492 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-main-toc.xml
@@ -2,13 +2,13 @@
 <toc label="Papyrus Profiles" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
    <topic label="Using UML Profiles">
       <anchor id="profiles-start"/>
-        <link toc="resource/users/whatIsAUmlProfile-toc.xml"/>
-        <link toc="resource/users/papyrusProfileArchitecture-toc.xml" />
-          <link toc="resource/users/definingProfilesAndStereotypes-toc.xml" />
-           <link toc="resource/users/usingProfilesAndStereotypes-toc.xml" />
-      <link toc="resource/users/simplifiedUsageOfProfilesAndStereotypes-toc.xml" />
+        <link toc="target/generated-eclipse-help/users/whatIsAUmlProfile-toc.xml"/>
+        <link toc="target/generated-eclipse-help/users/papyrusProfileArchitecture-toc.xml" />
+          <link toc="target/generated-eclipse-help/users/definingProfilesAndStereotypes-toc.xml" />
+           <link toc="target/generated-eclipse-help/users/usingProfilesAndStereotypes-toc.xml" />
+      <link toc="target/generated-eclipse-help/users/simplifiedUsageOfProfilesAndStereotypes-toc.xml" />
        <anchor id="profiles" />
-        <link toc="resource/users/papyrusProfileLimitations-toc.xml" />
+        <link toc="target/generated-eclipse-help/users/papyrusProfileLimitations-toc.xml" />
       <anchor id="profiles-end" />
 
    </topic>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-toc.xml
deleted file mode 100644
index e46a2c21144..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-toc.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/profile.html" label="profile">
-	<topic href="resource/profile.html" label="Introduction"></topic>
-	<topic href="resource/profile.html#Profile_Creation_and_Modeling" label="Profile Creation and Modeling">
-		<topic href="resource/profile.html#Profile_Creation" label="Profile Creation"></topic>
-		<topic href="resource/profile.html#Stereotype_Definition" label="Stereotype Definition">
-			<topic href="resource/profile.html#Stereotype_Creation" label="Stereotype Creation"></topic>
-			<topic href="resource/profile.html#Metaclass_Import" label="Metaclass Import"></topic>
-			<topic href="resource/profile.html#Extension_Creation" label="Extension Creation"></topic>
-			<topic href="resource/profile.html#Subprofile_Creation" label="Subprofile Creation"></topic>
-			<topic href="resource/profile.html#Stereotype_Generalization" label="Stereotype Generalization"></topic>
-		</topic>
-		<topic href="resource/profile.html#Stereotype_display_options" label="Stereotype display options"></topic>
-	</topic>
-	<topic href="resource/profile.html#Profile_Definition_and_Export" label="Profile Definition and Export"></topic>
-	<topic href="resource/profile.html#Profile_Application_and_Usage" label="Profile Application and Usage">
-		<topic href="resource/profile.html#Applying_a_Profile" label="Applying a Profile"></topic>
-		<topic href="resource/profile.html#Using_the_Stereotypes_of_a_Profile" label="Using the Stereotypes of a Profile">
-			<topic href="resource/profile.html#Applying_a_Stereotype" label="Applying a Stereotype"></topic>
-			<topic href="resource/profile.html#Assigning_values_to_properties_of_stereotypes" label="Assigning values to properties of stereotypes"></topic>
-			<topic href="resource/profile.html#Display_options_of_a_stereotype_application" label="Display options of a stereotype application"></topic>
-		</topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile.html b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile.html
deleted file mode 100644
index d20358f0f02..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Introduction">Introduction</h1><p>The purpose of this chapter is to provide the Papyrus users all the documentation needed in order to be able to use UML profiles. It includes the information for modeling and defining a profile using the Papyrus UML profile editor, but also the information for the usage of a profile within a user application model.</p><p>The basic premise of profiles is that all domain-specific concepts are derived as extensions or refinements of existing UML concepts, called UML metaclasses. These extensions are called stereotypes. A stereotype definition must be consistent with the abstract syntax and semantics of standard UML meta-classes it extends. Consequently, a profile-based model can be created and manipulated by any tool that supports standard UML. Moreover, because the concepts underlying a profile are specializations of existing UML concepts, it is more easily learned by anyone with knowledge of UML.</p><p>A stereotype is defined either as an extension of a UML base metaclass or as a specialization of an existing stereotype. The extension relationship of UML is not an association but a kind of association directed from the stereotype to the extended metaclass. Consequently, the metadata conveyed by the associated the attributes of the stereotype are associated to the extended metaclass in a transparent manner for the metaclass itself. This allows profiles owning the stereotypes to be applied and removed dynamically without modifying the underlying models — a fundamental feature of the profile mechanism.</p><p>A stereotype may have attributes and may be associated with other stereotypes or existing UML metaclasses.</p><p>Constraints, such as OCL constraints, can also be defined in a profile. They can apply to stereotypes defined in the profile or those imported by the profile. They can also be used to further constrain elements of the UML metamodel. For instance, one could define an OCL constraint that all instances of Class in a model are active, or that all instances of Class must have at least one Operation (regardless of whether the Class is extended by a stereotype or not). However, not all constraints can be written in OCL. In that case, it is common to denote those latter in natural language. The drawback is that such constraints are no more automatically interpretable and need to be first rewritten in some language the UML tool will understand. In the context of Papyrus, it is then usual to use Java.</p><h1 id="Profile_Creation_and_Modeling">Profile Creation and Modeling</h1><h2 id="Profile_Creation">Profile Creation</h2><p>To create a new Profile, select File &gt; New &gt; Papyrus Project (Or Papyrus model, if you already have an opened project). When asked for a Diagram Language, Select "Profile":</p><p><img title="New Profile" alt="New Profile" border="0" src="images/newProfile.png"/><br/></p><p><img title="New Profile Diagram" alt="New Profile Diagram" border="0" src="images/newProfileDiagram.png"/><br/></p><p><img title="Profile Editor" alt="Profile Editor" border="0" src="images/profileEditor.png"/><br/></p><h2 id="Stereotype_Definition">Stereotype Definition</h2><p>Once a profile has been created, it is now time to populate this latter with UML extensions, i.e. stereotypes, and their related concepts such as properties, extensions, and metaclasses.</p><h3 id="Stereotype_Creation">Stereotype Creation</h3><p>A stereotype is created as any other UML model elements in Papyrus: select the related tool in the palette of the profile diagram editor, and then click in the place you want to create this element on the background of the diagram. If the palette is not open, just click on the small arrow on the upper right corner of the diagram editor. Papyrus will then ask you to provide a name. Once done, hit the return key and that all.</p><p><img title="Stereotype Palette" alt="Stereotype Palette" border="0" src="images/stereotypePalette.png"/><br/></p><p><img title="Stereotype Name" alt="Stereotype Name" border="0" src="images/stereotypeName.png"/><br/></p><h3 id="Metaclass_Import">Metaclass Import</h3><p>Once you have created a stereotype, you need to import the UML2 metaclasses you want to extend. First, you have to select the tool “Import Metaclass” within the palette of the profile diagram editor. Then, let’s click on the profile diagram where you want to drop the imported metaclass. A Papyrus dialog box is then opened in order to ask you to specify which metaclasses you want to import. Select the metaclasses in the left list and either drag and drop these latter in the right list or press the button with arrow directed from left to right and located between both aforementioned lists. Then, let’s press the button “ok” and it is done. The imported metaclasses are then shown in the diagram as illustrated.</p><p><img title="Import Metaclass" alt="Import Metaclass" border="0" src="images/importMetaclassDialog.png"/><br/></p><p><img title="Imported Metaclass" alt="Imported Metaclass" border="0" src="images/importedMetaclass.png"/><br/></p><p>Note: When you import UML2 metaclasses, Papyrus is creating ImportElement model element referent to the metaclasses of the UML2 metamodel itself. Those so-called specific model elements, the ImportElement, are indeed a kind of proxy to the model elements contained in another model, in the UML2 metamodel. If a metaclass has already be imported, you do not need to import it again to use it in another context. You can select the imported meta-class from the model browser and drag and drop this latter on the diagram you want to use it.</p><h3 id="Extension_Creation">Extension Creation</h3><p>Once the stereotype is created and the meta-class is imported, you may then model the extension relation from the stereotype to the meta-class as shown in the following figure. The extension relationship is modeled using the extension tool in the profile diagram palette, <img title="Extension" alt="Extension" border="0" src="images/Extension.gif"/>. Within the diagram shown in next figure, both stereotypes «Requirement» and «Refinement» extend respectively both meta-classes Class and Dependency:</p><p><img title="Metaclass Extension" alt="Metaclass Extension" border="0" src="images/metaclassExtension.png"/><br/></p><h3 id="Subprofile_Creation">Subprofile Creation</h3><p>Some profile may be complex due as for example to their scope that may be large. In order to cope with this complexity, it is then possible to decompose a profile into a hierarchy of subprofiles. A subprofile behaves such as a sub-package; it is a container of stereotypes.</p><p>To create a sub profile, select the profile tool in the profile diagram palette (<img title="Profile" alt="Profile" border="0" src="images/Profile.gif"/>) and then click on the profile diagram where you want to create your new profile.</p><p>In the example denoted below, we have created two sub-profiles of the SimplifiedReqML profile in order to gather in one hand the extensions that apply to node elements of the models and in the other hand the extension defined in the DSML for modeling relationships between those nodes:</p><p><img title="Sub Profiles" alt="Sub Profiles" border="0" src="images/subProfiles.png"/><br/></p><h3 id="Stereotype_Generalization">Stereotype Generalization</h3><p>When designing a profile, it is possible to reuse existing stereotypes defined in other existing profiles. Stereotypes can indeed be generalized enabling to create child stereotypes that inherit features of one or more generalized stereotype define either locally in the profile or externally other profiles.</p><p>To create a stereotype generalization using the profile diagram editor, let’s draw a generalization relationship using the tool <img title="Generalization" alt="Generalization" border="0" src="images/Generalization.gif"/> from the palette. As any relationship within Papyrus, you need to click first on the source and then on the target of the relationship you want to model.</p><p>In our example, there exists in the UML predefined profile a stereotype extending the dependency relationship in order to introduce the concept of refinement: «Refine». Consequently, we will redesign our sub-profile SRMLRelationship in order our stereotype «Refinement» to be a specialization of this UML stereotype instead of directly extending the UML dependency meta-class.</p><p>As previously mentioned, you may extend a stereotype defined in your profile or a stereotype defined in another external profile. In the latter case, the first thing to do is to import the profile where the stereotype has been defined, as denoted in the following example:</p><p><img title="Import Profile" alt="Import Profile" border="0" src="images/importProfile.png"/><br/></p><p><img title="Select Profile" alt="Select Profile" border="0" src="images/selectProfile.png"/><br/></p><p>Once the profile has been imported, you can select the stereotype you want to generalize from the imported profile (In the Model Explorer) and drop this latter in the diagram of profile description: </p><p><img title="Drop Stereotype" alt="Drop Stereotype" border="0" src="images/dropStereotype.png"/><br/></p><p>Now, let’s draw the generalization relationship from your stereotype (e.g., «Refinement» in the figure below) to the generalized stereotype (e.g., «Refine» in the figure below). </p><p><img title="Generalize Stereotype" alt="Generalize Stereotype" border="0" src="images/generalizeStereotype.png"/><br/></p><p>At this point, your diagram should look like something like the one shown here:</p><p><img title="Result Profile" alt="Result Profile" border="0" src="images/resultProfile.png"/><br/></p><h2 id="Stereotype_display_options">Stereotype display options</h2><p>When a stereotype application is shown in a diagram, the by-default way to show it within diagrams is using a string where the name of the stereotype is shown within a pair of French guillemets above or before the name of the model element. However, it is also possible to modify the graphical appearance of the annotated model element using icons. If the graphical representation of the model element is something like a box (including ellipse of the use cases), the icons can be displayed inside and on top of the figures, or it may replace this latter. In that latter case, the property of the element cannot be shown and the name of the model element appears within a label displayed near the icon. If the model element is graphically denoted by a line, the icon is shown in front of the name of the link.</p><p>In order to specify the icons you want to attach to a stereotype, select the stereotype and the tab UML of the property view. In the right-upper corner of the widget named “icons”, press the button <img title="Add" alt="Add" border="0" src="images/Add.gif"/> to add a new icon as shown in step 1. Once done, the dialog box shown at step 2 is open. Within this latter, let’s fill in a name and select an image file using the button <img title="Add" alt="Add" border="0" src="images/Add.gif"/> defining the content of the icon. Next, you have to define the kind value: icon or shape. Using this property, you can choose to associate the selected image either as an icon or as a shape.</p><p><img title="Step 1: Icons for Stereotypes" alt="Step 1: Icons for Stereotypes" border="0" src="images/iconsForStereotype.png"/><br/></p><p><img title="Step 2: Select Icon" alt="Step 2: Select Icon" border="0" src="images/selectIcon.png"/><br/></p><p>It is possible to associate only one shape to a stereotype, but you can associate different icons to a same stereotype. In that latter case, there is a description property that is used to select which one to display. By default, if no expression is defined, the first one is the list is chosen for displaying. The expression has to be on a property of the stereotype which type is an enumeration type.
-In our example, we can set different icons to the stereotype «Requirement» depending on the value of its importance property. This latter is indeed typed by the ImportanceLevel enumeration which values may be High, Medium of Low (figure shown below). For this example, we will then associate the three following images <img title="High" alt="High" border="0" src="images/high.png"/>, <img title="Medium" alt="Medium" border="0" src="images/medium.png"/>, and <img title="Low" alt="Low" border="0" src="images/low.png"/>, to the stereotype «Requirement» and their related expression will be respectively importance=High (e.g. figure shown below), importance=Medium and importance=Low.</p><p><img title="Many Stereotype Icons" alt="Many Stereotype Icons" border="0" src="images/manyStereotypeIcons.png"/><br/></p><p><img title="Icon Kind" alt="Icon Kind" border="0" src="images/iconKind.png"/><br/></p><p><img title="Icon Expressions" alt="Icon Expressions" border="0" src="images/iconExpressions.png"/><br/></p><p><img title="High Req. Icon" alt="High Req. Icon" border="0" src="images/highReqIcon.png"/><br/></p><h1 id="Profile_Definition_and_Export">Profile Definition and Export</h1><p>Once a profile has been modeled, we need to define it before being able to apply it on user models. The definition of a profile consists in:</p><p><i>“When defining a dynamic profile representation, the contents of a profile are converted to an equivalent Ecore format that is stored as an annotation on the profile. Then, when a profile and its stereotypes are applied to a model and its elements, dynamic EMF (see the EMF book for details) is used to store property values for the stereotypes. For the most part, you can ignore this complexity, as long as you remember to define your profile before using it.”</i></p><p>(This definition has been extracted from <a href="/wiki/http://wiki.eclipse.org/MDT/UML2/Introduction_to_UML2_Profiles" title="http://wiki.eclipse.org/MDT/UML2/Introduction_to_UML2_Profiles">http://wiki.eclipse.org/MDT/UML2/Introduction_to_UML2_Profiles</a>)</p><p><i>PS: The implementation of profile support in the UML2 component of MDT supports defining both dynamic and static profile representations. In this the document, we will focus on dynamic profiles.</i></p><p>To define a profile within Papyrus, you just need to save it doing as for example following actions: either through the menu bar action File &gt; Save or using the key shortcut “CTRL S”.
-Let’s notice, that it is not mandatory to define a profile each time you save it. If you do not want to define your profile when saving it, just answer no to the related question asked by Papyrus when saving profile modifications. However, if you want to apply the modifications you have done on a given profile, this you have to define it again in order the modifications may be taken into account at the user model level.</p><p><img title="Profile Definition" alt="Profile Definition" border="0" src="images/profileDefinition1.png"/><br/></p><p><img title="Profile Definition" alt="Profile Definition" border="0" src="images/profileDefinition2.png"/><br/></p><p>Note: If the profile contains errors (Such as an untyped Property or unnamed Stereotype), you won't be able to define it. However, it can still be saved. In such a case, a Diagnostic dialog displays all the validation errors preventing the profile from being defined.</p><p><img title="Profile Definition Errors" alt="Profile Definition Errors" border="0" src="images/profileDefinitionErrors.png"/><br/></p><h1 id="Profile_Application_and_Usage">Profile Application and Usage</h1><p>Once a profile has been designed and defined as previously explained, it now times to use it. The first step to process is to apply the profile on your model or a part of the model. This is the purpose of the next section to explain this first step. Then, we will explain how to use the applied profile and mainly how to use its extensions, i.e. its stereotypes.</p><h2 id="Applying_a_Profile">Applying a Profile</h2><p>To apply a profile, first you need to open your model.</p><p>The first step consists in selecting the part of the model you want to apply the profile on. Profiles can be applied either on Models or Packages. Then to apply the profile on this part, let’s select the profile tab in the property view, and press the <img title="Apply Profile" alt="Apply Profile" border="0" src="images/Add.gif"/> button.</p><p><img title="Select Package" alt="Select Package" border="0" src="images/applyProfile.png"/><br/></p><p><img title="Profile Tab" alt="Profile Tab" border="0" src="images/applyProfile2.png"/><br/></p><p><img title="Apply Profile" alt="Apply Profile" border="0" src="images/applyProfile3.png"/><br/></p><p>Then, Papyrus will ask you firstly to choose the profile to apply from your workspace, and secondly to choose which part of the selected profile you want to apply. It is indeed possible that your profile may be composed of sub-profiles as explained in the previous chapter. It is then possible to apply partially a profile by applying one or more of its sub-profiles.</p><p><img title="Select Profile" alt="Select Profile" border="0" src="images/selectProfileModel.png"/><br/></p><p><img title="Select Profiles" alt="Select Profiles" border="0" src="images/selectProfiles.png"/><br/></p><p>Your model should now look like this:</p><p><img title="Applied Profiles" alt="Applied Profiles" border="0" src="images/appliedProfiles.png"/><br/></p><h2 id="Using_the_Stereotypes_of_a_Profile">Using the Stereotypes of a Profile</h2><p>Once the profile is applied on you model, its extensions, i.e. stereotypes, are available in the modeling tool and can be used in your model to annotate it.</p><h3 id="Applying_a_Stereotype">Applying a Stereotype</h3><p>To annotate a model element, you first need to select it either through the model explorer or in one open diagram. Then, select the tab named “profile” in the properties view, and add your stereotype using the <img title="Apply Profile" alt="Apply Profile" border="0" src="images/Add.gif"/> button of the widget named “Applied stereotypes”</p><p><img title="Apply Stereotype" alt="Apply Stereotype" border="0" src="images/applyStereotype.png"/><br/></p><p><img title="Apply Stereotype" alt="Apply Stereotype" border="0" src="images/applyStereotype2.png"/><br/></p><p><img title="Apply Stereotype" alt="Apply Stereotype" border="0" src="images/applyStereotype3.png"/><br/></p><p>A dialog box enables you to select the stereotype(s) you want to apply (left part of the dialog box) and using the <img title="Add" alt="Add" border="0" src="images/arrow_right.gif"/> button located in the middle of the dialog box enables to define which stereotypes have to be applied. The list located on the right of the dialog box denotes the list of applied stereotype. If you want to unapply stereotypes, you can select those latter from the right list and use the <img title="Remove" alt="Remove" border="0" src="images/arrow_left.gif"/> button to unapply them.</p><p><img title="Apply Stereotype" alt="Apply Stereotype" border="0" src="images/applyStereotype4.png"/><br/></p><p><img title="Apply Stereotype" alt="Apply Stereotype" border="0" src="images/applyStereotype5.png"/><br/></p><p>At this point, your Papyrus should look like this:</p><p><img title="Applied Stereotype" alt="Applied Stereotype" border="0" src="images/appliedStereotype.png"/><br/></p><h3 id="Assigning_values_to_properties_of_stereotypes">Assigning values to properties of stereotypes</h3><p>As already mentioned, Stereotypes may have properties. Consequently, when applying a stereotype to a model element, it may be necessary to set the values of those properties. For that, you will go to the profile tab of the properties view and then you can unfold the stereotype application as shown in following figure:</p><p><img title="Stereotype Properties" alt="Stereotype Properties" border="0" src="images/stereotypeProperties.png"/><br/></p><p>Once you have selected the property to edit, its value (if already set, as for example if there is a default value defined in the profile for the property) appear in the right part of the property view. If the property has not yet been valued, you can add a value by using the <img title="Add" alt="Add" border="0" src="images/add.gif"/> button located on the top right of the widget named “Properties values”. If there is a value, double-click on the value to edit this latter.</p><p><img title="Edit Property" alt="Edit Property" border="0" src="images/stereotypePropertyEdition.png"/><br/></p><p>Ps: If you want to delete a value set to property, let’s use the <img title="Delete" alt="Delete" border="0" src="images/Delete.gif"/> button located on the top right of the widget named “Properties values”.</p><h3 id="Display_options_of_a_stereotype_application">Display options of a stereotype application</h3><p>Stereotype applications may be graphically rendered under different forms, either textually, or using specific icons. Details to specify those icons associated to a stereotype are given in previous chapters (See <a href="#Stereotype_display_options">Stereotype display options</a>).</p><p>Let’s remind that in UML, you can apply several stereotypes on a same model element. In Papyrus, it is then possible to select the ones you want to show for each diagram. For showing or hiding a stereotype application, you have to select the tab “appearance” in the properties view. As shown in the next figure, there is one widget named “Applied stereotypes” that denotes the list of stereotypes applied on the current selected model element. On the example illustrated within this figure, you can see on the upper corner of the icon placed in front of the stereotype name “Requirement” an overlay denoting that this stereotype application is shown.</p><p><img title="Stereotype Display" alt="Stereotype Display" border="0" src="images/stereotypeDisplayOptions.png"/><br/></p><p><i>Warning: Let’s notice that the appearance tab of the property view is only visible if you select a model element from one of the open diagram. In other case, if you select the model element from the model explorer, the concept of graphical does not make sense because the information specified within this view are only related to graphical information.</i></p><p><i>Consequently, the values set to the appearance properties of model element are valid only in the context of the diagram where the element is selected. It is then possible to show a stereotype on a diagram and hide it in another diagram depending on the concerns of the view realized by the diagram.</i></p><p>To hide or show stereotype applications, you have to select them from the list of applied stereotypes available within the appearance tab and then either press the <img title="Display qualified name" alt="Display qualified name" border="0" src="images/ConsoleViewQN.gif"/> button or <img title="Display" alt="Display" border="0" src="images/change_display.gif"/>.</p><p>The former is to be used if you want to display the stereotype application with its qualified name, and the latter is to be used if you want to show it without qualified name. Using one of both depends if you may have ambiguities or not on the origin of the stereotype when as for example applying several profiles defining similar stereotypes. As for example, both profiles, MARTE and SysML, define a stereotype named «FlowPort».</p><p>In addition, there are three other widgets dedicated to configure the stereotype display options:</p><ul><li>“Stereotype display” is an enumeration which values may be Text, Icon, Text and Icon or Shape. In UML, as explained previously, a stereotype may be denoted either as a string between a pair of French guillemets (e.g., «Requirement»), or as an icon embedded in the figure or as a shape with a label. In case of the shape option, it substitutes the normal graphical figure used to represent the element and its label denotes the name of the element.</li></ul><ul><li>“Text alignment” is an enumeration which values may be Horizontal or Vertical. When several applied stereotypes are shown, it is rendered as a list of string separated by a comma and enclosed between a pair of French guillemets. By default, this string is shown horizontally. But some times for aesthetic reasons, it may be useful to show it vertically, that is to say showing one stereotype per line.</li></ul><ul><li>“Display place” is an enumeration which values may be Compartment, Comment or With brace. This appearance property is used to set where to show the properties values of the applied stereotypes. In UML, those values can be shown either within a pair of braces located just near (above or on top) the name label of the model element (“With brace” option), or into a dedicated compartment, or in a text note associated with the annotated model element.</li></ul><p><i>PS: if you display several stereotype applications, and if you select the options to display them with icon or with icon and text, this is the icon of the first stereotype application in the list which is chosen to be displayed.</i></p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/simplifiedUsageOfProfilesAndStereotypes-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/simplifiedUsageOfProfilesAndStereotypes-toc.xml
deleted file mode 100644
index a75bb434755..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/simplifiedUsageOfProfilesAndStereotypes-toc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/users/simplifiedUsageOfProfilesAndStereotypes.html" label="simplifiedUsageOfProfilesAndStereotypes">
-	<topic href="resource/users/simplifiedUsageOfProfilesAndStereotypes.html" label="Simplified Usage of Profiles and Stereotypes">
-		<topic href="resource/users/simplifiedUsageOfProfilesAndStereotypes.html#Creating_Profile_and_Stereotype" label="Creating Profile and Stereotype"></topic>
-		<topic href="resource/users/simplifiedUsageOfProfilesAndStereotypes.html#Updating_Stereotype" label="Updating Stereotype"></topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/simplifiedUsageOfProfilesAndStereotypes.html b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/simplifiedUsageOfProfilesAndStereotypes.html
deleted file mode 100644
index 5f224fb02d7..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/simplifiedUsageOfProfilesAndStereotypes.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Simplified_Usage_of_Profiles_and_Stereotypes">Simplified Usage of Profiles and Stereotypes</h1><p><b>Contents</b></p><ol style="list-style: none;"><li><a href="#Simplified_Usage_of_Profiles_and_Stereotypes">Simplified Usage of Profiles and Stereotypes</a><ol style="list-style: none;"><li><a href="#Creating_Profile_and_Stereotype">Creating Profile and Stereotype</a></li><li><a href="#Updating_Stereotype">Updating Stereotype</a></li></ol></li></ol><p>Papyrus provides a simplified way to create, apply and modify Profiles and Stereotypes.
-We call it 'simplified' comparatively to the way where one should first define Profile and Stereotypes, then apply the Profile, and finally apply and modify the Stereotype.</p><p>The simplified usage propose one single Dialog used to create a Profile and a Stereotype, then apply both to the selected element, and all in no more than two clicks !
-Also, the same Dialog can be used to update the Stereotype definition, or the application values.</p><h2 id="Creating_Profile_and_Stereotype">Creating Profile and Stereotype</h2><p>Select the UML element to apply the profile, right click -&gt; Profile -&gt; Update Profile ...<br/>
-The following Dialog appears:</p><p><img title="Profile Easy Usage Dialog" alt="Profile Easy Usage Dialog" border="0" src="images/profile-DialogExplained.png"/><br/></p><p>In <b>Qualified Name</b>, type the Profile name and the Stereotype name separated by '::'.</p><p>The <b>metaclass</b> should already be selected, based on the metaclass of the currently selected UML element. You can add metaclasses if you whish.</p><p>In <b>Properties</b>, add properties to your profile: click '+', then set the name, select a type, and set a value.</p><p>Clicking '<b>OK</b>' will do the following:</p><ul><li><b>Create the Profile</b> if needed</li><li><b>Create the Stereotype</b> if needed</li><li><b>Create new properties</b></li><li><b>Apply the Profile</b>, if needed,  to the uml::Package containing the selected uml element.</li><li><b>Apply the Stereotype</b>, if needed, to the selected uml element.</li><li><b>Set values to the applied stereotype</b>, if some values are set to the properties.</li></ul><h2 id="Updating_Stereotype">Updating Stereotype</h2><p>Select the UML element applying the profile to update, right click -&gt; Profile -&gt; Update Profile ...<br/>
-In <b>Qualified Name</b>, type the beginning of the name of the Stereotype to update. The Content Assist should propose Stereotypes matching your input. Select your Stereotype.
-The Dialog should show the actual values of the Stereotype. You can change the Properties and their values.</p><p>If you change the name of the Stereotype or the Profile, this will create a new Stereotype.</p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/usingProfilesAndStereotypes-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/usingProfilesAndStereotypes-toc.xml
deleted file mode 100644
index 5211d50f0ad..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/usingProfilesAndStereotypes-toc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/users/usingProfilesAndStereotypes.html" label="usingProfilesAndStereotypes">
-	<topic href="resource/users/usingProfilesAndStereotypes.html" label="Using Profiles and Stereotypes">
-		<topic href="resource/users/usingProfilesAndStereotypes.html#Applying_a_Profile" label="Applying a Profile"></topic>
-		<topic href="resource/users/usingProfilesAndStereotypes.html#Applying_a_Stereotype" label="Applying a Stereotype"></topic>
-		<topic href="resource/users/usingProfilesAndStereotypes.html#Setting_values_to_stereotype.27_properties" label="Setting values to stereotype' properties"></topic>
-		<topic href="resource/users/usingProfilesAndStereotypes.html#Display_options_of_a_stereotype_application" label="Display options of a stereotype application"></topic>
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/usingProfilesAndStereotypes.html b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/usingProfilesAndStereotypes.html
deleted file mode 100644
index edef6cdb52d..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/usingProfilesAndStereotypes.html
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="Using_Profiles_and_Stereotypes">Using Profiles and Stereotypes</h1><p><b>Contents</b></p><ol style="list-style: none;"><li><a href="#Using_Profiles_and_Stereotypes">Using Profiles and Stereotypes</a><ol style="list-style: none;"><li><a href="#Applying_a_Profile">Applying a Profile</a></li><li><a href="#Applying_a_Stereotype">Applying a Stereotype</a></li><li><a href="#Setting_values_to_stereotype.27_properties">Setting values to stereotype' properties</a></li><li><a href="#Display_options_of_a_stereotype_application">Display options of a stereotype application</a></li></ol></li></ol><p>Once a profile has been designed and defined as previously explained, it now times to use it. The first step to process is to apply the profile on your model or a part of the model. This is the purpose of the next section to explain this first step. Then, we will explain how to use the applied profile and mainly how to use its extensions, i.e. its stereotypes.</p><h2 id="Applying_a_Profile">Applying a Profile</h2><p>To apply a profile, first you need to open your model.</p><p>The first step consists in selecting the part of the model you want to apply the profile on. Profiles can be applied either on Models or Packages. Then to apply the profile on this part, let’s select the profile tab in the property view, and press the <img title="Apply Profile" alt="Apply Profile" border="0" src="images/Add.gif"/> button.</p><p><img title="Select Package" alt="Select Package" border="0" src="images/applyProfile.png"/><br/></p><p><img title="Profile Tab" alt="Profile Tab" border="0" src="images/applyProfile2.png"/><br/></p><p><img title="Apply Profile" alt="Apply Profile" border="0" src="images/applyProfile3.png"/><br/></p><p>Then, Papyrus will ask you firstly to choose the profile to apply from your workspace, and secondly to choose which part of the selected profile you want to apply. It is indeed possible that your profile may be composed of sub-profiles as explained in the previous chapter. It is then possible to apply partially a profile by applying one or more of its sub-profiles.</p><p><img title="Select Profile" alt="Select Profile" border="0" src="images/selectProfileModel.png"/><br/></p><p><img title="Select Profiles" alt="Select Profiles" border="0" src="images/selectProfiles.png"/><br/></p><p>Your model should now look like this:</p><p><img title="Applied Profiles" alt="Applied Profiles" border="0" src="images/appliedProfiles.png"/><br/></p><h2 id="Applying_a_Stereotype">Applying a Stereotype</h2><p>Once the profile is applied on your model, its extensions, i.e. stereotypes, are available in the modeling tool and can be used in your model to annotate uml elements.</p><p>To annotate a model element, you first need to select it either through the model explorer or in one open diagram. Then, select the tab named “profile” in the properties view, and add your stereotype using the <img title="Apply Profile" alt="Apply Profile" border="0" src="images/Add.gif"/> button of the widget named “Applied stereotypes”</p><p><img title="Apply Stereotype" alt="Apply Stereotype" border="0" src="images/applyStereotype.png"/><br/></p><p><img title="Apply Stereotype" alt="Apply Stereotype" border="0" src="images/applyStereotype2.png"/><br/></p><p><img title="Apply Stereotype" alt="Apply Stereotype" border="0" src="images/applyStereotype3.png"/><br/></p><p>A dialog box enables you to select the stereotype(s) you want to apply (left part of the dialog box) and using the <img title="Add" alt="Add" border="0" src="images/arrow_right.gif"/> button located in the middle of the dialog box enables to define which stereotypes have to be applied. The list located on the right of the dialog box denotes the list of applied stereotype. If you want to unapply stereotypes, you can select those latter from the right list and use the <img title="Remove" alt="Remove" border="0" src="images/arrow_left.gif"/> button to unapply them.</p><p><img title="Apply Stereotype" alt="Apply Stereotype" border="0" src="images/applyStereotype4.png"/><br/></p><p><img title="Apply Stereotype" alt="Apply Stereotype" border="0" src="images/applyStereotype5.png"/><br/></p><p>At this point, your Papyrus should look like this:</p><p><img title="Applied Stereotype" alt="Applied Stereotype" border="0" src="images/appliedStereotype.png"/><br/></p><h2 id="Setting_values_to_stereotype.27_properties">Setting values to stereotype' properties</h2><p>As already mentioned, Stereotypes may have properties. Consequently, when applying a stereotype to a model element, it may be necessary to set the values of those properties. For that, you will go to the profile tab of the properties view and then you can unfold the stereotype application as shown in following figure:</p><p><img title="Stereotype Properties" alt="Stereotype Properties" border="0" src="images/stereotypeProperties.png"/><br/></p><p>Once you have selected the property to edit, its value (if already set, as for example if there is a default value defined in the profile for the property) appear in the right part of the property view. If the property has not yet been valued, you can add a value by using the <img title="Add" alt="Add" border="0" src="images/add.gif"/> button located on the top right of the widget named “Properties values”. If there is a value, double-click on the value to edit this latter.</p><p><img title="Edit Property" alt="Edit Property" border="0" src="images/stereotypePropertyEdition.png"/><br/></p><p>Ps: If you want to delete a value set to property, let’s use the <img title="Delete" alt="Delete" border="0" src="images/Delete.gif"/> button located on the top right of the widget named “Properties values”.</p><h2 id="Display_options_of_a_stereotype_application">Display options of a stereotype application</h2><p>Stereotype applications may be graphically rendered under different forms, either textually, or using specific icons. Details to specify those icons associated to a stereotype are given in previous chapters (See <a href="/wiki/definingProfilesAndStereotypes#Stereotype_display_options" title="definingProfilesAndStereotypes#Stereotype display options">definingProfilesAndStereotypes#Stereotype display options</a>).</p><p>Let’s remind that in UML, you can apply several stereotypes on a same model element. In Papyrus, it is then possible to select the ones you want to show for each diagram. For showing or hiding a stereotype application, you have to select the tab “appearance” in the properties view. As shown in the next figure, there is one widget named “Applied stereotypes” that denotes the list of stereotypes applied on the current selected model element. On the example illustrated within this figure, you can see on the upper corner of the icon placed in front of the stereotype name “Requirement” an overlay denoting that this stereotype application is shown.</p><p><img title="Stereotype Display" alt="Stereotype Display" border="0" src="images/stereotypeDisplayOptions.png"/><br/></p><p><i>Warning: Let’s notice that the appearance tab of the property view is only visible if you select a model element from one of the open diagram. In other case, if you select the model element from the model explorer, the concept of graphical does not make sense because the information specified within this view are only related to graphical information.</i></p><p><i>Consequently, the values set to the appearance properties of model element are valid only in the context of the diagram where the element is selected. It is then possible to show a stereotype on a diagram and hide it in another diagram depending on the concerns of the view realized by the diagram.</i></p><p>To hide or show stereotype applications, you have to select them from the list of applied stereotypes available within the appearance tab and then either press the <img title="Display qualified name" alt="Display qualified name" border="0" src="images/ConsoleViewQN.gif"/> button or <img title="Display" alt="Display" border="0" src="images/change_display.gif"/>.</p><p>The former is to be used if you want to display the stereotype application with its qualified name, and the latter is to be used if you want to show it without qualified name. Using one of both depends if you may have ambiguities or not on the origin of the stereotype when as for example applying several profiles defining similar stereotypes. As for example, both profiles, MARTE and SysML, define a stereotype named «FlowPort».</p><p>In addition, there are three other widgets dedicated to configure the stereotype display options:</p><ul><li>“Stereotype display” is an enumeration which values may be Text, Icon, Text and Icon or Shape. In UML, as explained previously, a stereotype may be denoted either as a string between a pair of French guillemets (e.g., «Requirement»), or as an icon embedded in the figure or as a shape with a label. In case of the shape option, it substitutes the normal graphical figure used to represent the element and its label denotes the name of the element.</li></ul><ul><li>“Text alignment” is an enumeration which values may be Horizontal or Vertical. When several applied stereotypes are shown, it is rendered as a list of string separated by a comma and enclosed between a pair of French guillemets. By default, this string is shown horizontally. But some times for aesthetic reasons, it may be useful to show it vertically, that is to say showing one stereotype per line.</li></ul><ul><li>“Display place” is an enumeration which values may be Compartment, Comment or With brace. This appearance property is used to set where to show the properties values of the applied stereotypes. In UML, those values can be shown either within a pair of braces located just near (above or on top) the name label of the model element (“With brace” option), or into a dedicated compartment, or in a text note associated with the annotated model element.</li></ul><p><i>PS: if you display several stereotype applications, and if you select the options to display them with icon or with icon and text, this is the icon of the first stereotype application in the list which is chosen to be displayed.</i></p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/whatIsAUmlProfile-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/whatIsAUmlProfile-toc.xml
deleted file mode 100644
index 56645bfea3a..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/whatIsAUmlProfile-toc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/users/whatIsAUmlProfile.html" label="whatIsAUmlProfile">
-	<topic href="resource/users/whatIsAUmlProfile.html" label="What is a UML Profile"></topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/whatIsAUmlProfile.html b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/whatIsAUmlProfile.html
deleted file mode 100644
index 0f660e8f490..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/whatIsAUmlProfile.html
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="What_is_a_UML_Profile">What is a UML Profile</h1><p><b>Contents</b></p><ol style="list-style: none;"><li><a href="#What_is_a_UML_Profile">What is a UML Profile</a></li></ol><p>The purpose of this chapter is to provide the Papyrus users all the documentation needed in order to be able to use UML profiles. It includes the information for modeling and defining a profile using the Papyrus UML profile editor, but also the information for the usage of a profile within a user application model.</p><p>The basic premise of profiles is that all domain-specific concepts are derived as extensions or refinements of existing UML concepts, called UML metaclasses. These extensions are called stereotypes. A stereotype definition must be consistent with the abstract syntax and semantics of standard UML meta-classes it extends. Consequently, a profile-based model can be created and manipulated by any tool that supports standard UML. Moreover, because the concepts underlying a profile are specializations of existing UML concepts, it is more easily learned by anyone with knowledge of UML.</p><p>A stereotype is defined either as an extension of a UML base metaclass or as a specialization of an existing stereotype. The extension relationship of UML is not an association but a kind of association directed from the stereotype to the extended metaclass. Consequently, the metadata conveyed by the associated the attributes of the stereotype are associated to the extended metaclass in a transparent manner for the metaclass itself. This allows profiles owning the stereotypes to be applied and removed dynamically without modifying the underlying models — a fundamental feature of the profile mechanism.</p><p>A stereotype may have attributes and may be associated with other stereotypes or existing UML metaclasses.</p><p>Constraints, such as OCL constraints, can also be defined in a profile. They can apply to stereotypes defined in the profile or those imported by the profile. They can also be used to further constrain elements of the UML metamodel. For instance, one could define an OCL constraint that all instances of Class in a model are active, or that all instances of Class must have at least one Operation (regardless of whether the Class is extended by a stereotype or not). However, not all constraints can be written in OCL. In that case, it is common to denote those latter in natural language. The drawback is that such constraints are no more automatically interpretable and need to be first rewritten in some language the UML tool will understand. In the context of Papyrus, it is then usual to use Java.</p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.doc/.project
index 3d8c60578e2..bf12f5f0c00 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/.project
@@ -6,6 +6,11 @@
 	</projects>

 	<buildSpec>

 		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

 			<arguments>

 			</arguments>

@@ -15,8 +20,15 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

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

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

 	</natures>

 </projectDescription>

diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 4216b790e5b..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1

-encoding//resource/PapyrusStarterGuide-toc.xml=utf-8

-encoding//resource/PapyrusStarterGuide.html=utf-8

diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF
index 917d26d4a3f..4b5a72da82d 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF
@@ -6,4 +6,5 @@ Bundle-Version: 1.1.0.qualifier
 Bundle-Name: Papyrus UML User Guide

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.doc;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 

diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.doc/build.properties
index 1fc4f90e0c9..d8b52f252bd 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/build.properties
@@ -1,5 +1,6 @@
 bin.includes = META-INF/,\

                plugin.xml,\

                about.html,\

-               resource/

-src.includes = about.html
+               target/generated-eclipse-help/** 

+src.includes = about.html,\

+				resource/
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.uml.doc/plugin.xml
index 443cdcda029..9796e3d71be 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/plugin.xml
@@ -4,11 +4,11 @@
    <extension

          point="org.eclipse.help.toc">

       <toc

-            file="resource/PapyrusStarterGuide-main-toc.xml"

+            file="target/generated-eclipse-help/PapyrusStarterGuide-main-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="resource/PapyrusStarterGuide-toc.xml"

+            file="target/generated-eclipse-help/PapyrusStarterGuide-toc.xml"

             primary="false">

       </toc>

    </extension>

diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.doc/pom.xml
index e68b417746b..cce56e6c28b 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-main-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-main-toc.xml
index cd8a9501ee4..cd4672bdb80 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-main-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <toc label="Papyrus UML Starter Guide" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-   <topic href="resource/PapyrusStarterGuide.html" label="Papyrus UML Starter Guide">
-      <link toc="resource/PapyrusStarterGuide-toc.xml"/>
+   <topic href="target/generated-eclipse-help/PapyrusStarterGuide.html" label="Papyrus UML Starter Guide">
+      <link toc="target/generated-eclipse-help/PapyrusStarterGuide-toc.xml"/>
       <anchor id="UMLStarterDoc"/>
    </topic>	
 </toc>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-toc.xml
deleted file mode 100644
index ec44f564d2c..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-toc.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/PapyrusStarterGuide.html" label="PapyrusStarterGuide">
-	<topic href="resource/PapyrusStarterGuide.html" label="1 Overview">
-		<topic href="resource/PapyrusStarterGuide.html#1.1_Table_of_Contents" label="1.1 Table of Contents"></topic>
-	</topic>
-	<topic href="resource/PapyrusStarterGuide.html#2_Introduction" label="2 Introduction">
-		<topic href="resource/PapyrusStarterGuide.html#2.1_Legend" label="2.1 Legend"></topic>
-	</topic>
-	<topic href="resource/PapyrusStarterGuide.html#3_Installation" label="3 Installation">
-		<topic href="resource/PapyrusStarterGuide.html#3.1_Install_Eclipse_Standard" label="3.1 Install Eclipse Standard"></topic>
-		<topic href="resource/PapyrusStarterGuide.html#3.2_Install_basic_Papyrus" label="3.2 Install basic Papyrus"></topic>
-		<topic href="resource/PapyrusStarterGuide.html#3.3_Additional_installation_for_Papyrus_UML_RT_modeling" label="3.3 Additional installation for Papyrus UML RT modeling"></topic>
-	</topic>
-	<topic href="resource/PapyrusStarterGuide.html#4_Eclipse" label="4 Eclipse">
-		<topic href="resource/PapyrusStarterGuide.html#4.1_Architecture" label="4.1 Architecture"></topic>
-		<topic href="resource/PapyrusStarterGuide.html#4.2_Workspace" label="4.2 Workspace"></topic>
-		<topic href="resource/PapyrusStarterGuide.html#4.3_Resources" label="4.3 Resources"></topic>
-		<topic href="resource/PapyrusStarterGuide.html#4.4_Workbench" label="4.4 Workbench">
-			<topic href="resource/PapyrusStarterGuide.html#4.4.1_Views" label="4.4.1 Views">
-				<topic href="resource/PapyrusStarterGuide.html#4.4.1.1_Single_views" label="4.4.1.1 Single views"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#4.4.1.2_Stacked_views" label="4.4.1.2 Stacked views"></topic>
-			</topic>
-		</topic>
-		<topic href="resource/PapyrusStarterGuide.html#4.5_Preferences" label="4.5 Preferences"></topic>
-		<topic href="resource/PapyrusStarterGuide.html#4.6_Import_and_Export" label="4.6 Import and Export"></topic>
-	</topic>
-	<topic href="resource/PapyrusStarterGuide.html#5_Modeling" label="5 Modeling">
-		<topic href="resource/PapyrusStarterGuide.html#5.1_Model_and_diagrams" label="5.1 Model and diagrams"></topic>
-	</topic>
-	<topic href="resource/PapyrusStarterGuide.html#6_Tutorials" label="6 Tutorials">
-		<topic href="resource/PapyrusStarterGuide.html#6.1_Getting_started" label="6.1 Getting started">
-			<topic href="resource/PapyrusStarterGuide.html#6.1.1_Exploring_perspectives" label="6.1.1 Exploring perspectives">
-				<topic href="resource/PapyrusStarterGuide.html#6.1.1.1_Exploring_the_.27.27Papyrus.27.27_perspective" label="6.1.1.1 Exploring the ''Papyrus'' perspective"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#6.1.1.2_Exploring_and_customizing_the_Resource_perspective" label="6.1.1.2 Exploring and customizing the Resource perspective"></topic>
-			</topic>
-			<topic href="resource/PapyrusStarterGuide.html#6.1.2_Creating_a_project.2C_folder_and_files" label="6.1.2 Creating a project, folder and files">
-				<topic href="resource/PapyrusStarterGuide.html#6.1.2.1_Creating_a_new_general_project" label="6.1.2.1 Creating a new general project"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#6.1.2.2_Creating_a_new_folder" label="6.1.2.2 Creating a new folder"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#6.1.2.3_Creating_and_editing_a_new_file" label="6.1.2.3 Creating and editing a new file"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#6.1.2.4_Creating_another_file" label="6.1.2.4 Creating another file"></topic>
-			</topic>
-			<topic href="resource/PapyrusStarterGuide.html#6.1.3_Exploring_editors_and_views" label="6.1.3 Exploring editors and views">
-				<topic href="resource/PapyrusStarterGuide.html#6.1.3.1_Maximizing_and_restoring_an_editor" label="6.1.3.1 Maximizing and restoring an editor"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#6.1.3.2_Tiling_and_restacking_the_editors" label="6.1.3.2 Tiling and restacking the editors"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#6.1.3.3_Organizing_views" label="6.1.3.3 Organizing views"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#6.1.3.4_Using_view_menus" label="6.1.3.4 Using view menus"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#6.1.3.5_Closing_and_opening_views" label="6.1.3.5 Closing and opening views"></topic>
-			</topic>
-			<topic href="resource/PapyrusStarterGuide.html#6.1.4_Exporting_and_importing_a_project" label="6.1.4 Exporting and importing a project">
-				<topic href="resource/PapyrusStarterGuide.html#6.1.4.1_Exporting_a_project" label="6.1.4.1 Exporting a project"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#6.1.4.2_Removing_the_project_from_the_workspace" label="6.1.4.2 Removing the project from the workspace"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#6.1.4.3_Importing_a_project" label="6.1.4.3 Importing a project"></topic>
-			</topic>
-			<topic href="resource/PapyrusStarterGuide.html#6.1.5_Conclusion" label="6.1.5 Conclusion"></topic>
-		</topic>
-		<topic href="resource/PapyrusStarterGuide.html#6.2_Creating_profiles" label="6.2 Creating profiles"></topic>
-		<topic href="resource/PapyrusStarterGuide.html#6.3_Creating_models" label="6.3 Creating models">
-			<topic href="resource/PapyrusStarterGuide.html#6.3.1_Use_case_modeling" label="6.3.1 Use case modeling"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#6.3.2_Design_modeling" label="6.3.2 Design modeling"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#6.3.3_RT_modeling" label="6.3.3 RT modeling"></topic>
-		</topic>
-	</topic>
-	<topic href="resource/PapyrusStarterGuide.html#7_Papyrus" label="7 Papyrus">
-		<topic href="resource/PapyrusStarterGuide.html#7.1_Papyrus_resources_in_the_workspace" label="7.1 Papyrus resources in the workspace"></topic>
-		<topic href="resource/PapyrusStarterGuide.html#7.2_The_Papyrus_perspective" label="7.2 The Papyrus perspective">
-			<topic href="resource/PapyrusStarterGuide.html#7.2.1_Project_Explorer_view" label="7.2.1 Project Explorer view"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.2.2_Model_Explorer_view" label="7.2.2 Model Explorer view"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.2.3_Editing_view" label="7.2.3 Editing view"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.2.4_Outline_view" label="7.2.4 Outline view"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.2.5_Properties_view" label="7.2.5 Properties view"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.2.6_Model_Validation_view" label="7.2.6 Model Validation view"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.2.7_Search_view" label="7.2.7 Search view"></topic>
-		</topic>
-		<topic href="resource/PapyrusStarterGuide.html#7.3_Diagram_editing_in_Papyrus" label="7.3 Diagram editing in Papyrus">
-			<topic href="resource/PapyrusStarterGuide.html#7.3.1_Diagram_editors" label="7.3.1 Diagram editors"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.3.2_Basic_tool_techniques" label="7.3.2 Basic tool techniques">
-				<topic href="resource/PapyrusStarterGuide.html#7.3.2.1_Creating_diagrams" label="7.3.2.1 Creating diagrams"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#7.3.2.2_Scrolling_and_panning_in_diagrams" label="7.3.2.2 Scrolling and panning in diagrams"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#7.3.2.3_Creating_an_element_in_a_diagram" label="7.3.2.3 Creating an element in a diagram"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#7.3.2.4_Delete_and_hide" label="7.3.2.4 Delete and hide"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#7.3.2.5_Formating_and_validating_diagrams" label="7.3.2.5 Formating and validating diagrams"></topic>
-			</topic>
-		</topic>
-		<topic href="resource/PapyrusStarterGuide.html#7.4_UML_modeling" label="7.4 UML modeling">
-			<topic href="resource/PapyrusStarterGuide.html#7.4.1_Diagrams" label="7.4.1 Diagrams">
-				<topic href="resource/PapyrusStarterGuide.html#7.4.1.1_Diagrams_related_to_Use_Cases" label="7.4.1.1 Diagrams related to Use Cases">
-					<topic href="resource/PapyrusStarterGuide.html#7.4.1.1.1_Use_case_diagram" label="7.4.1.1.1 Use case diagram"></topic>
-					<topic href="resource/PapyrusStarterGuide.html#7.4.1.1.2_Activity_diagram" label="7.4.1.1.2 Activity diagram"></topic>
-					<topic href="resource/PapyrusStarterGuide.html#7.4.1.1.3_Interaction_diagrams" label="7.4.1.1.3 Interaction diagrams">
-						<topic href="resource/PapyrusStarterGuide.html#7.4.1.1.3.1_Sequence_diagram" label="7.4.1.1.3.1 Sequence diagram"></topic>
-						<topic href="resource/PapyrusStarterGuide.html#7.4.1.1.3.2_Communication_diagram" label="7.4.1.1.3.2 Communication diagram"></topic>
-					</topic>
-				</topic>
-				<topic href="resource/PapyrusStarterGuide.html#7.4.1.2_Diagrams_related_to_Classes" label="7.4.1.2 Diagrams related to Classes">
-					<topic href="resource/PapyrusStarterGuide.html#7.4.1.2.1_Class_diagram" label="7.4.1.2.1 Class diagram"></topic>
-					<topic href="resource/PapyrusStarterGuide.html#7.4.1.2.2_Composite_structure_diagram" label="7.4.1.2.2 Composite structure diagram"></topic>
-					<topic href="resource/PapyrusStarterGuide.html#7.4.1.2.3_State_machine_diagram" label="7.4.1.2.3 State machine diagram"></topic>
-				</topic>
-			</topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.4.2_Model_elements" label="7.4.2 Model elements">
-				<topic href="resource/PapyrusStarterGuide.html#7.4.2.1_Package" label="7.4.2.1 Package"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#7.4.2.2_Use_Case" label="7.4.2.2 Use Case"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#7.4.2.3_Actor" label="7.4.2.3 Actor"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#7.4.2.4_Class" label="7.4.2.4 Class">
-					<topic href="resource/PapyrusStarterGuide.html#7.4.2.5.1_Attributes_on_Classes" label="7.4.2.5.1 Attributes on Classes"></topic>
-					<topic href="resource/PapyrusStarterGuide.html#7.4.2.5.2_Operations_on_Classes" label="7.4.2.5.2 Operations on Classes"></topic>
-				</topic>
-			</topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.4.3_Relationships" label="7.4.3 Relationships"></topic>
-		</topic>
-		<topic href="resource/PapyrusStarterGuide.html#7.5_UML_RT_modeling" label="7.5 UML RT modeling">
-			<topic href="resource/PapyrusStarterGuide.html#7.5.1_Additional_modeling_elements" label="7.5.1 Additional modeling elements">
-				<topic href="resource/PapyrusStarterGuide.html#7.5.1.1_Capsule_Class" label="7.5.1.1 Capsule Class"></topic>
-				<topic href="resource/PapyrusStarterGuide.html#7.5.1.2_Protocol_Class" label="7.5.1.2 Protocol Class"></topic>
-			</topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.5.2_Using_C_in_a_model" label="7.5.2 Using C in a model"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.5.3_C_service_library" label="7.5.3 C service library">
-				<topic href="resource/PapyrusStarterGuide.html#7.5.3.1_Sending_messages" label="7.5.3.1 Sending messages"></topic>
-			</topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.5.4_Transformation_from_model_to_code" label="7.5.4 Transformation from model to code"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.5.5_Edit_the_generated_code" label="7.5.5 Edit the generated code"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.5.6_Compiling_and_linking_the_generated_code" label="7.5.6 Compiling and linking the generated code"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.5.7_Using_external_libraries" label="7.5.7 Using external libraries"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.5.8_Running_the_application" label="7.5.8 Running the application"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.5.9_Model_components" label="7.5.9 Model components"></topic>
-		</topic>
-		<topic href="resource/PapyrusStarterGuide.html#7.6_Papyrus_in_a_team_environment" label="7.6 Papyrus in a team environment">
-			<topic href="resource/PapyrusStarterGuide.html#7.6.1_Model_fragmentation" label="7.6.1 Model fragmentation"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.6.2_Source_configuration_management" label="7.6.2 Source configuration management"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.6.3_Compare_and_Merge" label="7.6.3 Compare and Merge"></topic>
-		</topic>
-		<topic href="resource/PapyrusStarterGuide.html#7.7_Model_validation" label="7.7 Model validation">
-			<topic href="resource/PapyrusStarterGuide.html#7.7.1_Object_Constrain_Language_.28OCL.29" label="7.7.1 Object Constrain Language (OCL)"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.7.2_Defining_constraints_using_OCL" label="7.7.2 Defining constraints using OCL"></topic>
-		</topic>
-		<topic href="resource/PapyrusStarterGuide.html#7.8_Searching" label="7.8 Searching"></topic>
-		<topic href="resource/PapyrusStarterGuide.html#7.9_Sample_models" label="7.9 Sample models">
-			<topic href="resource/PapyrusStarterGuide.html#7.9.1_Class_model_with_inheritance" label="7.9.1 Class model with inheritance"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.9.2_Send_and_receive_data" label="7.9.2 Send and receive data"></topic>
-			<topic href="resource/PapyrusStarterGuide.html#7.9.3_Interprocess_communication" label="7.9.3 Interprocess communication"></topic>
-		</topic>
-		<topic href="resource/PapyrusStarterGuide.html#7.10_UML_profiling" label="7.10 UML profiling"></topic>
-	</topic>
-	<topic href="resource/PapyrusStarterGuide.html#8_Support" label="8 Support"></topic>
-	<topic href="resource/PapyrusStarterGuide.html#9_References" label="9 References"></topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.html b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.html
deleted file mode 100644
index 0eedcc90492..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="1_Overview">1 Overview</h1><p>Papyrus is an environment for editing any kind of <a href="http://www.eclipse.org/modeling/emf/">EMF model</a>, particularly supporting UML 2 (<a href="http://www.omg.org/spec/UML/2.4.1/">Unified Modeling Language (UML) version 2.4.1</a> ) and related modeling languages such as SysML (<a href="http://www.omg.org/spec/SysML/">System Modeling Language</a> ) and MARTE (<a href="http://www.omg.org/omgmarte/Specification.htm/">Modeling and Analysis of Real-Time and Embedded systems</a> ). Papyrus also offers very advanced support for UML profiles that enables users to define editors for DSLs (Domain Specific Languages) based on the UML 2 standard.</p><p>Papyrus is a collection of plug-ins and features on top of the Eclipse Modeling Framework. For more information about Eclipse, please go to the Eclipse web site <a href="http://www.eclipse.org/">eclipse.org</a>. Some of the terminology used in this Papyrus user guide are basic Eclipse concepts and briefly described here. To get more information about the Eclipse concepts, please visit the <i>Workbench User Guide</i> by selecting <b>Help &gt; Help Contents</b> from within Eclipse.</p><h2 id="1.1_Table_of_Contents">1.1 Table of Contents</h2><ol style="list-style: none;"><li><a href="#1_Overview">1 Overview</a><ol style="list-style: none;"><li><a href="#1.1_Table_of_Contents">1.1 Table of Contents</a></li></ol></li><li><a href="#2_Introduction">2 Introduction</a><ol style="list-style: none;"><li><a href="#2.1_Legend">2.1 Legend</a></li></ol></li><li><a href="#3_Installation">3 Installation</a><ol style="list-style: none;"><li><a href="#3.1_Install_Eclipse_Standard">3.1 Install Eclipse Standard</a></li><li><a href="#3.2_Install_basic_Papyrus">3.2 Install basic Papyrus</a></li><li><a href="#3.3_Additional_installation_steps">3.3 Additional installation steps</a></li></ol></li><li><a href="#4_Eclipse">4 Eclipse</a><ol style="list-style: none;"><li><a href="#4.1_Architecture">4.1 Architecture</a></li><li><a href="#4.2_Workspace">4.2 Workspace</a></li><li><a href="#4.3_Resources">4.3 Resources</a></li><li><a href="#4.4_Workbench">4.4 Workbench</a><ol style="list-style: none;"><li><a href="#4.4.1_Views">4.4.1 Views</a><ol style="list-style: none;"><li><a href="#4.4.1.1_Single_views">4.4.1.1 Single views</a></li><li><a href="#4.4.1.2_Stacked_views">4.4.1.2 Stacked views</a></li></ol></li></ol></li><li><a href="#4.5_Preferences">4.5 Preferences</a></li><li><a href="#4.6_Import_and_Export">4.6 Import and Export</a></li></ol></li><li><a href="#5_Modeling">5 Modeling</a><ol style="list-style: none;"><li><a href="#5.1_Model_and_diagrams">5.1 Model and diagrams</a></li></ol></li><li><a href="#6_Tutorials">6 Tutorials</a><ol style="list-style: none;"><li><a href="#6.1_Getting_started_with_general_Eclipse_functionality">6.1 Getting started with general Eclipse functionality</a><ol style="list-style: none;"><li><a href="#6.1.1_Exploring_perspectives">6.1.1 Exploring perspectives</a><ol style="list-style: none;"><li><a href="#6.1.1.1_Exploring_the_.27.27Papyrus.27.27_perspective">6.1.1.1 Exploring the ''Papyrus'' perspective</a></li><li><a href="#6.1.1.2_Exploring_and_customizing_the_Resource_perspective">6.1.1.2 Exploring and customizing the Resource perspective</a></li></ol></li><li><a href="#6.1.2_Creating_a_new_project.2C_folder_and_files">6.1.2 Creating a new project, folder and files</a><ol style="list-style: none;"><li><a href="#6.1.2.1_Creating_a_new_general_project">6.1.2.1 Creating a new general project</a></li><li><a href="#6.1.2.2_Creating_a_new_folder">6.1.2.2 Creating a new folder</a></li><li><a href="#6.1.2.3_Creating_and_editing_a_new_file">6.1.2.3 Creating and editing a new file</a></li><li><a href="#6.1.2.4_Creating_another_file">6.1.2.4 Creating another file</a></li></ol></li><li><a href="#6.1.3_Exploring_editors_and_views">6.1.3 Exploring editors and views</a><ol style="list-style: none;"><li><a href="#6.1.3.1_Maximizing_and_restoring_an_editor">6.1.3.1 Maximizing and restoring an editor</a></li><li><a href="#6.1.3.2_Tiling_and_restacking_the_editors">6.1.3.2 Tiling and restacking the editors</a></li><li><a href="#6.1.3.3_Organizing_views">6.1.3.3 Organizing views</a></li><li><a href="#6.1.3.4_Using_view_menus">6.1.3.4 Using view menus</a></li><li><a href="#6.1.3.5_Closing_and_opening_views">6.1.3.5 Closing and opening views</a></li></ol></li><li><a href="#6.1.4_Exporting_and_importing_a_project">6.1.4 Exporting and importing a project</a><ol style="list-style: none;"><li><a href="#6.1.4.1_Exporting_a_project">6.1.4.1 Exporting a project</a></li><li><a href="#6.1.4.2_Removing_the_project_from_the_workspace">6.1.4.2 Removing the project from the workspace</a></li><li><a href="#6.1.4.3_Importing_a_project">6.1.4.3 Importing a project</a></li></ol></li><li><a href="#6.1.5_Conclusion">6.1.5 Conclusion</a></li></ol></li><li><a href="#6.2_Creating_profiles">6.2 Creating profiles</a></li><li><a href="#6.3_Creating_models_using_Papyrus">6.3 Creating models using Papyrus</a><ol style="list-style: none;"><li><a href="#6.3.1_Use-case_modeling">6.3.1 Use-case modeling</a></li><li><a href="#6.3.2_Design_modeling">6.3.2 Design modeling</a><ol style="list-style: none;"><li><a href="#6.3.2.1_Create_a_new_UML_project">6.3.2.1 Create a new UML project</a></li><li><a href="#6.3.2.2_Create_new_packages_to_be_used_for_classes">6.3.2.2 Create new packages to be used for classes</a></li><li><a href="#6.3.2.3_Create_new_classes">6.3.2.3 Create new classes</a></li><li><a href="#6.3.2.4_Create_new_class_diagrams">6.3.2.4 Create new class diagrams</a></li><li><a href="#6.3.2.5_Create_new_operations_and_attributes">6.3.2.5 Create new operations and attributes</a></li><li><a href="#6.3.2.6_Create_new_relationships_between_classes">6.3.2.6 Create new relationships between classes</a></li><li><a href="#6.3.2.7_Create_a_new_package_to_be_used_for_objects">6.3.2.7 Create a new package to be used for objects</a></li><li><a href="#6.3.2.8_Create_new_objects">6.3.2.8 Create new objects</a></li><li><a href="#6.3.2.9_Create_a_new_class_diagram">6.3.2.9 Create a new class diagram</a></li><li><a href="#6.3.2.10_Create_new_relationships_between_objects">6.3.2.10 Create new relationships between objects</a></li><li><a href="#6.3.2.11_Conclusion">6.3.2.11 Conclusion</a></li></ol></li><li><a href="#6.3.3_RT_modeling">6.3.3 RT modeling</a></li></ol></li></ol></li><li><a href="#7_Papyrus">7 Papyrus</a><ol style="list-style: none;"><li><a href="#7.1_Papyrus_resources_in_the_workspace">7.1 Papyrus resources in the workspace</a></li><li><a href="#7.2_The_Papyrus_perspective">7.2 The Papyrus perspective</a><ol style="list-style: none;"><li><a href="#7.2.1_Project_Explorer_view">7.2.1 Project Explorer view</a></li><li><a href="#7.2.2_Model_Explorer_view">7.2.2 Model Explorer view</a></li><li><a href="#7.2.3_Editing_view">7.2.3 Editing view</a></li><li><a href="#7.2.4_Outline_view">7.2.4 Outline view</a></li><li><a href="#7.2.5_Properties_view">7.2.5 Properties view</a></li><li><a href="#7.2.6_Model_Validation_view">7.2.6 Model Validation view</a></li><li><a href="#7.2.7_Search_view">7.2.7 Search view</a></li></ol></li><li><a href="#7.3_Diagram_editing_in_Papyrus">7.3 Diagram editing in Papyrus</a><ol style="list-style: none;"><li><a href="#7.3.1_Diagram_editors">7.3.1 Diagram editors</a></li><li><a href="#7.3.2_Basic_tool_techniques">7.3.2 Basic tool techniques</a><ol style="list-style: none;"><li><a href="#7.3.2.1_Creating_diagrams">7.3.2.1 Creating diagrams</a></li><li><a href="#7.3.2.2_Scrolling_and_panning_in_diagrams">7.3.2.2 Scrolling and panning in diagrams</a></li><li><a href="#7.3.2.3_Creating_an_element_in_a_diagram">7.3.2.3 Creating an element in a diagram</a></li><li><a href="#7.3.2.4_Delete_and_hide">7.3.2.4 Delete and hide</a></li><li><a href="#7.3.2.5_Formating_and_validating_diagrams">7.3.2.5 Formating and validating diagrams</a></li></ol></li></ol></li><li><a href="#7.4_UML_modeling">7.4 UML modeling</a><ol style="list-style: none;"><li><a href="#7.4.1_Package">7.4.1 Package</a></li><li><a href="#7.4.2_Use-case">7.4.2 Use-case</a></li><li><a href="#7.4.3_Actor">7.4.3 Actor</a></li><li><a href="#7.4.4_Class">7.4.4 Class</a><ol style="list-style: none;"><li><a href="#7.4.4.1_Attributes_on_classes">7.4.4.1 Attributes on classes</a></li><li><a href="#7.4.4.2_Operations_on_classes">7.4.4.2 Operations on classes</a></li></ol></li><li><a href="#7.4.5_Object">7.4.5 Object</a></li><li><a href="#7.4.6_Relationships">7.4.6 Relationships</a></li><li><a href="#7.4.7_Diagrams">7.4.7 Diagrams</a><ol style="list-style: none;"><li><a href="#7.4.7.1_Diagrams_related_to_use-cases">7.4.7.1 Diagrams related to use-cases</a></li><li><a href="#7.4.7.2_Diagrams_related_to_classes">7.4.7.2 Diagrams related to classes</a></li></ol></li></ol></li><li><a href="#7.5_UML_RT_modeling">7.5 UML RT modeling</a><ol style="list-style: none;"><li><a href="#7.5.1_Additional_modeling_elements">7.5.1 Additional modeling elements</a><ol style="list-style: none;"><li><a href="#7.5.1.1_Capsule_class">7.5.1.1 Capsule class</a></li><li><a href="#7.5.1.2_Protocol_class">7.5.1.2 Protocol class</a></li></ol></li><li><a href="#7.5.2_Using_C.2B.2B_in_a_model">7.5.2 Using C++ in a model</a></li><li><a href="#7.5.3_C.2B.2B_service_library">7.5.3 C++ service library</a><ol style="list-style: none;"><li><a href="#7.5.3.1_Sending_messages">7.5.3.1 Sending messages</a></li></ol></li><li><a href="#7.5.4_Transformation_from_model_to_code">7.5.4 Transformation from model to code</a></li><li><a href="#7.5.5_Edit_the_generated_code">7.5.5 Edit the generated code</a></li><li><a href="#7.5.6_Compiling_and_linking_the_generated_code">7.5.6 Compiling and linking the generated code</a></li><li><a href="#7.5.7_Using_external_libraries">7.5.7 Using external libraries</a></li><li><a href="#7.5.8_Running_the_system">7.5.8 Running the system</a></li></ol></li><li><a href="#7.6_Papyrus_in_a_team_environment">7.6 Papyrus in a team environment</a><ol style="list-style: none;"><li><a href="#7.6.1_Model_fragmentation">7.6.1 Model fragmentation</a></li><li><a href="#7.6.2_Source_configuration_management">7.6.2 Source configuration management</a></li><li><a href="#7.6.3_Compare_and_Merge">7.6.3 Compare and Merge</a></li></ol></li><li><a href="#7.7_Model_validation">7.7 Model validation</a><ol style="list-style: none;"><li><a href="#7.7.1_Object_Constrain_Language_.28OCL.29">7.7.1 Object Constrain Language (OCL)</a></li><li><a href="#7.7.2_Defining_constraints_using_OCL">7.7.2 Defining constraints using OCL</a></li></ol></li><li><a href="#7.8_Searching">7.8 Searching</a></li><li><a href="#7.9_Sample_models">7.9 Sample models</a><ol style="list-style: none;"><li><a href="#7.9.1_Class_model_with_inheritance">7.9.1 Class model with inheritance</a></li><li><a href="#7.9.2_Send_and_receive_data">7.9.2 Send and receive data</a></li><li><a href="#7.9.3_Interprocess_communication">7.9.3 Interprocess communication</a></li></ol></li><li><a href="#7.10_UML_profiling">7.10 UML profiling</a></li></ol></li><li><a href="#8_Support">8 Support</a></li><li><a href="#9_References">9 References</a></li></ol><h1 id="2_Introduction">2 Introduction</h1><p>Papyrus is built on the extensible Eclipse framework and is an implementation of the OMG (Object Management Group) specification <a href="http://www.omg.org/spec/UML/2.4.1/">Unified Modeling Language (UML) version 2.4.1</a>. Papyrus is a comprehensive UML modeling environment, where many diagrams can be used to view different aspects of a system. Behind all diagrams, there is a model where all modeling elements, used in these diagrams, are kept. The model keeps the consistency between the diagrams.</p><p>UML diagrams can help system architects and developers understand, collaborate on and develop a system. Architects and managers can use diagrams to visualize an entire system or project and separate systems into smaller components for development.</p><p>System developers can use diagrams to specify, visualize, and document systems, which can increase efficiency and improve their system design. Also code can be generated from UML models.</p><p>Since UML is general-purpose modeling language in the field of software engineering, it is possible to adapt UML to specific domains. This is done by creating and applying UML profiles. Papyrus is a complete UML modeling environment, which also can be used to develop UML profiles.</p><h2 id="2.1_Legend">2.1 Legend</h2><p>In this user guide, bold text is used for menu selections, e.g. <b>Help &gt; Welcome</b> means from the <b>Help</b> item on the main menu, select the <b>Welcome</b> item.</p><p>A context menu is the pop-up menu that appears when right clicking on something, e.g. right click on a class select <b>New Child &gt; Create a new Operation</b>, will create a new operation on the class, using the class' context menu.</p><p>When text should be typed in, it is indicated by inline code, e.g. <code>this text should be typed in</code>.</p><p>Fields in wizards, pop-up windows, different editors, radio buttons and check boxes are indicated by italic text, e.g. set the field <i>Name</i> to <code>MyClass</code>.</p><h1 id="3_Installation"><div id="Installation">3 Installation</div></h1><p>It is a several step process to install Papyrus and its optional components. The <i>Eclipse Standard</i> must first be installed and when that is done, Papyrus is installed on top of <i>Eclipse Standard</i>.</p><h2 id="3.1_Install_Eclipse_Standard">3.1 Install Eclipse Standard</h2><p><i>Eclipse Standard</i> is installed from the <a href="http://www.eclipse.org/downloads/">Eclipse download page</a>. On the download page select <i>Eclipse Standard &lt;version number&gt;</i> to install. Follow the install wizard to complete the installation.</p><h2 id="3.2_Install_basic_Papyrus">3.2 Install basic Papyrus</h2><p>When <i>Eclipse Standard</i> is installed, go to <b>Help &gt; Install New Software</b> and type in <code><a href="http://download.eclipse.org/releases/kepler/">http://download.eclipse.org/releases/kepler/</a></code> in the field named <i>Work with:</i>.</p><p><b>Note!</b> When this user guide was written, the Kepler release of Eclipse was the latest. Select the latest official Eclipse release.</p><p><b>Note!</b> In some industrial environments, a proxy has to be used instead of this type of direct URL to the Eclipse web-site. To configure Eclipse to use a proxy is done under <b>Windows &gt; Preferences</b> and <b>General &gt; Network Connections</b></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:566px;"><a href="InstallNewSoftware.bmp" class="image"><img class="thumbimage" width="564" align="middle" border="0" src="InstallNewSoftware.bmp"/></a><div class="thumbcaption">Figure 1: Install New Software wizard</div></div></div></center></p><p>In the <i>Name</i> column of the wizard, scroll down to <i>Modeling</i> and expand to the next level. Under <i>Modeling</i>, select <i>Papyrus UML</i> and follow the installation wizard to complete the installation.</p><p>When Eclipse is restarted, the environment is now ready for UML modeling.</p><h2 id="3.3_Additional_installation_steps">3.3 Additional installation steps</h2><p>After installation of the basic Papyrus feature, go to <b>Help &gt; Install Papyrus Additional Components</b>. In the wizard that pops up, select the needed additional Papyrus components, e.g. to be able to do UML RT modeling, the <i>Real Time</i> component is needed. It is also recommended to install the <i>Diagram Stylesheets</i> and <i>Papyrus Compare</i> components. Follow the installation wizard to complete the installation.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:439px;"><a href="InstallPapyrusComp.bmp" class="image"><img class="thumbimage" width="437" align="middle" border="0" src="InstallPapyrusComp.bmp"/></a><div class="thumbcaption">Figure 2: The Install Papyrus Additional Components wizard</div></div></div></center></p><h1 id="4_Eclipse">4 Eclipse</h1><p>Papyrus is built on the Eclipse framework, so most of its look and feel is inherited from Eclipse.</p><p>The Eclipse framework has a plug-in architecture, where plug-ins can be grouped into features. Features and plug-ins can be added to an existing Eclipse installation.</p><h2 id="4.1_Architecture">4.1 Architecture</h2><p>The plug-in architecture applies also for all subsystems. A plug-in is the smallest unit of Eclipse Platform functionality that can be developed and delivered separately. Usually, a small tool is written as a single plug-in, whereas a complex tool has its functionality split across several plug-ins. Except for a small kernel known as the Platform Runtime, all of the Eclipse Platform's functionality is located in plug-ins. Plug-ins can be grouped into features.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="EclipseArchitecture.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="EclipseArchitecture.bmp"/></a><div class="thumbcaption">Figure 3: The Eclipse architecture</div></div></div></center></p><p>Plug-ins are coded in Java. A typical plug-in consists of Java code in a JAR (Java Archive) library, some read-only files, and other resources such as images, Web templates, message catalogs, native code libraries, and so on. Some plug-ins do not contain code at all. One such example is a plug-in that contributes online help in the form of HTML pages. A single plug-in’s code libraries and read-only content are located together in a directory in the file system, or at a base URL on a server. There is also a mechanism that permits a plug-in to be synthesized from several separate fragments, each in their own directory or URL. This is the mechanism used to deliver separate language packs for an internationalized plug-in.</p><p>Each plug-in has a manifest file declaring its interconnections to other plug-ins. The interconnection model is simple: a plug-in declares any number of named extension points, and any number of extensions to one or more extension points in other plug-ins.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:292px;"><a href="Feature-Plug-in.bmp" class="image"><img class="thumbimage" width="290" align="middle" border="0" src="Feature-Plug-in.bmp"/></a><div class="thumbcaption">Figure 4: Plug-ins and Features</div></div></div></center></p><h2 id="4.2_Workspace"><div id="Workspace">4.2 Workspace</div></h2><p>The workspace is located in the file-system and is the place where Eclipse resources (files, folders and projects) are stored. When Eclipse is started, a pop-up window appears, where a workspace should be selected. One instance of Eclipse is connected to one workspace.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:595px;"><a href="WorkspacePopup.bmp" class="image"><img class="thumbimage" width="593" align="middle" border="0" src="WorkspacePopup.bmp"/></a><div class="thumbcaption">Figure 5: Pop-up window to select the workspace</div></div></div></center></p><p>In the file system all resources are stored in the selected workspace and in the same hierarchical structure as in the <i>Project Explorer</i>.</p><h2 id="4.3_Resources">4.3 Resources</h2><p>Resources are a collective term for the projects, folders, and files that exist in the workbench. The resources are stored in the workspace, where the projects are on the first level. Inside a project, there are files and folders in the same hierarchical structure as in the <i>Project Explorer</i> and <i>Model Explorer</i>.</p><p>Files appear in the file system as files and folders are Unix directories or Windows folders and may contain other files and folders. Each time a file is saved, a copy is saved, which makes it possible to replace the current file with a previous edit or even restore a deleted file. Earlier versions of a file can be compared to the contents of all the local edits. Each edit in the local history is time stamped, i.e. is uniquely represented by the date and time the file was saved.</p><p>Projects can be viewed as the top level folder in the file system under the workspace. In Eclipse there are different types of projects, e.g. Model, C/C or Java projects and they are the top level resource in the <i>Project Explorer</i>. Projects can be closed and opened in the <i>Project Explorer</i>.</p><h2 id="4.4_Workbench"><div id="Workbench">4.4 Workbench</div></h2><p>The workbench is the Eclipse user interface and is used to navigate, view, and edit resources in a workspace, i.e. the workbench is the Eclipse IDE's application window. The workbench presents one or more editors and <i>views</i> that are gathered into adjustable groups (<i>perspectives</i>).</p><p>The first time Eclipse is started, after the installation, a <i>Welcome</i> page is presented. Take a few minutes to explore the product overview and getting started information that is located here.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:482px;"><a href="WelcomePage.bmp" class="image"><img class="thumbimage" width="480" align="middle" border="0" src="WelcomePage.bmp"/></a><div class="thumbcaption">Figure 6: The Eclipse welcome page</div></div></div></center></p><p>To return to the ordinary workbench, just click on the workbench icon up to the right. When starting Eclipse, subsequent times, the workbench appears directly. To visit the welcome page at any time, just select <b>Help &gt; Welcome</b>.</p><p>The title bar of the workbench window and the little Papyrus icon to the right indicates which <i>perspective</i> is active. In this example, the Papyrus <i>perspective</i> is in use. The <i>Project Explorer</i> and the <i>Model Explorer, Outline, Properties</i> views, etc. are open, along with a <i>Class Diagram</i> editor and its tool palette.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:514px;"><a href="Workbench.bmp" class="image"><img class="thumbimage" width="512" align="middle" border="0" src="Workbench.bmp"/></a><div class="thumbcaption">Figure 7: The Papyrus perspective in the workbench</div></div></div></center></p><p>It is easy to toggle between perspectives by clicking on some shown <i>perspective</i> in top of the right hand corner or open a new one by clicking on the <i>Open Perspective</i> icon <img border="0" src="IkonOpenPerspective.png"/> and browse to the <i>perspective</i> to open. It is also possible to reorganize a <i>perspective</i>, open/close <i>views</i>, customize menus, etc. and then save the <i>perspective</i> with a new name by <b>Window &gt; Save Perspective As ...</b>.</p><h3 id="4.4.1_Views">4.4.1 Views</h3><p><i>Views</i> and editors are the main visual entities that appear in the workbench. Any given <i>perspective</i> can contain multiple editors and a number of surrounding <i>views</i> that provide context.<i>Views</i> provide different ways to visualize, navigate and edit the resources in the Eclipse workspace. <i>Views</i> can be single or stacked on top of each other.</p><p><i>Views</i>, including editor views, can be resize, moved, detached. In addition, a <i>view</i> can be maximized to cover the entire workbench by double-clicking on its tab. By double-clicking once more, it will return to its original size. Some <i>views</i> has a view specific menu, e.g. <i>Project Explorer</i> view, where some specific view settings could be done.</p><p>To add a new <i>view</i> to the active <i>perspective</i>, use <b>Window &gt; Show View</b>and if the desired <i>view</i> does not appear on top of the pop-up menu, select <b>Other</b>, which opens up a <i>view</i> browser, where all available <i>views</i> are organized in different categories.</p><h4 id="4.4.1.1_Single_views">4.4.1.1 Single views</h4><p>In the workbench figure, above, several single views appears, e.g. <i>Outline, Class Diagram</i> editor, <i>Help, Project Explorer</i> and <i>Model Explorer</i> views. The <i>single view</i> has only one tab with the view name. By draging a <i>single view</i> tab and release it on another <i>single view</i> tab, <i>stacked views</i> are created.</p><h4 id="4.4.1.2_Stacked_views">4.4.1.2 Stacked views</h4><p>In the workbench figure, above, also <i>stacked views</i> appear, e.g. <i>Properties</i> and <i>Model Validation</i> views. To select the one that should be on top of the stack, just click on its tab and it becomes visible. By selecting a <i>stacked view</i> and drag it besides another view in the workbench, a <i>single view</i> will appear.</p><h2 id="4.5_Preferences">4.5 Preferences</h2><p>To customize the settings for the Eclipse workbench and the installed features, the preference window is used. Use <b>Windows &gt; Preferences</b> to open it, e.g. under <b>General &gt; Keys</b> in the preference window there are shortcuts and keys defined for the user interface. Here they can be redefined or own sets could be defined.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:558px;"><a href="Preferences.bmp" class="image"><img class="thumbimage" width="556" align="middle" border="0" src="Preferences.bmp"/></a><div class="thumbcaption">Figure 8: The preference window</div></div></div></center></p><p>The preference window pages can be searched using the filter function. To filter by matching the page title, simply type the name of the page and the available pages will be presented below.</p><p>The filter also searches on keywords. By the history controls (the left, right and drop-down arrows up in the right corner of the preference window) it is possible to navigate through previously viewed pages. To step back or forward several pages at a time, click the drop-down arrow and a list of the most recently viewed preference pages are displayed.</p><h2 id="4.6_Import_and_Export">4.6 Import and Export</h2><p>Projects can be shared between workspaces by using project import and export, which are done through wizards. To open the import wizard, use <b>File &gt; Import</b> and in several steps select what, where from and if it should be imported as a copy or just referenced. To export resources, There are also an export wizard, which is opened by <b>File &gt; Export</b> and select details about what should be exported, if it should be compressed and where to export it to.</p><table><tr><td><p><div class="thumb middle"><div class="thumbinner" style="width:422px;"><a href="ImportWiz.bmp" class="image"><img class="thumbimage" width="420" align="middle" border="0" src="ImportWiz.bmp"/></a><div class="thumbcaption">Figure 9: Import wizard</div></div></div>    </p></td><td><p><div class="thumb middle"><div class="thumbinner" style="width:540px;"><a href="ExportWiz.bmp" class="image"><img class="thumbimage" width="538" align="middle" border="0" src="ExportWiz.bmp"/></a><div class="thumbcaption">Figure 10: Export wizard</div></div></div></p></td></tr></table><p>When importing a project into the used workspace, it can be copied by checking the box <i>Copy ...</i> in the import wizard. If this check box is unchecked, there will just be a reference to the other workspace and when editing that project, it will be edited in its original place. Be aware of that when doing so, several instances of Eclipse may edit the same resource.</p><p>When exporting a project, browse to the place where to export it to name it and select if and how compression should be used.</p><h1 id="5_Modeling">5 Modeling</h1><p>Papyrus is a comprehensive UML modeling environment, where diagrams can be used to view different aspects of a system. Behind all the diagrams, there is a model where the modeling elements, used in these diagrams, are stored. The model maintains the consistency between all diagrams.</p><p>A model is the collection of all the modeling elements and relationships that compose a software system. Papyrus enables the creation, viewing and manipulation of UML diagrams as specified in the <a href="http://www.omg.org/spec/UML/2.4.1/">UML 2 specification</a>.</p><p>The model defines every element, representing some part of the system. Multiple model diagrams can reference an element many times. Each of the different diagrams can view a different aspect of the system.</p><p>The model is the basis of the diagrams and keep the diagrams consistent. The diagrams are stored in the model's hierarchical structure. Some are owned by a modeling element like a class and some are just organized into packages and then owned by the package (a.k.a folders in basic Eclipse projects). <b>Note!</b> the top level of the model is the model package, which is a special kind of a package.</p><h2 id="5.1_Model_and_diagrams">5.1 Model and diagrams</h2><p>The model is the basis for all diagrams and maintains the consistency between the diagrams. The model is a collection of definitions of elements that compose the system and the relationships between them. Diagrams can be used to view subsets of the underlying model and from various view points. A model of a system may require many different diagrams to represent different views of the system for different project stakeholders.</p><p>In Papyrus, diagrams are be viewed and created in the <i>Model Explorer</i> view. The <i>Model Explorer</i> shows diagrams in their logical place within the model.</p><p>The visual representation of a system that diagrams provide can offer both low-level and high-level insights into the concepts and design of a system.</p><h1 id="6_Tutorials">6 Tutorials</h1><p>The tutorials are focused on selected topics regarding the use of Papyrus and contains step by step instructions on how to create and manipulate the workbench and models.</p><h2 id="6.1_Getting_started_with_general_Eclipse_functionality">6.1 Getting started with general Eclipse functionality</h2><p>This tutorial is about to understand the workbench environment and the basic Eclipse terminology.</p><h3 id="6.1.1_Exploring_perspectives">6.1.1 Exploring perspectives</h3><p>This part demonstrates the differences between the <i>Papyrus</i> and the <i>Resource</i> perspectives and also how to customize the <i>Resource</i> perspective.</p><h4 id="6.1.1.1_Exploring_the_.27.27Papyrus.27.27_perspective">6.1.1.1 Exploring the <i>Papyrus</i> perspective</h4><p>Explore the Papyrus default menus, toolbar, and views in the <i>Papyrus</i> perspective.</p><ol><li>To switch to the <i>Payrus</i> perspective, click <b>Window &gt; Open Perspective &gt; Other</b>. Then choose the <i>Papyrus</i> perspective. (Notice the workbench title bar and perspective bar reflect that the <i>Papyrus</i> perspective is active. Notice also the main menu items, toolbar buttons, and views that is visible in this perspective.)</li><li>Click <b>File &gt; New</b> and notice that the menu contains the items <i>Papyrus Project</i> and <i>Papyrus Model</i> among other items.</li><li>Click <b>Window &gt; Show View</b> and notice that the menu contains the items <i>Model Explorer</i>, <i>Model Validation</i> and more.</li></ol><h4 id="6.1.1.2_Exploring_and_customizing_the_Resource_perspective">6.1.1.2 Exploring and customizing the Resource perspective</h4><p>Explore the default menu, toolbar, and views in the <i>Resource</i> perspective and customize a menu.</p><ol><li>To switch to the <i>Resource</i> perspective, click <b>Window &gt; Open Perspective &gt; Other</b>. Then choose the <i>Resource</i> perspective. Notice that the workbench title bar and perspective bar reflect that the <i>Resource</i> perspective is active. (Notice the main menu items, toolbar buttons, and views visible in this perspective)</li><li>Click <b>File &gt; New</b> and notice that there are no Papyrus items in the menu.</li><li>Click <b>Window &gt; Show View</b> and notice that the menu does NOT contain the items <i>Model Explorer</i> and <i>Model Validation</i>.</li><li>Click <b>Window &gt; Customize Perspective</b>. Ensure that the workbench title bar and perspective bar reflect that the <i>Resource</i> perspective is active.</li><li>In the <i>Customize Perspective - Resource</i> pop-up window, select the <i>Shortcuts</i> tab and select <b>Show View</b> from the <i>Submenus</i> combo box.</li><li>Clear all check boxes in the <i>Shortcut Categories</i> list.</li><li>Click <i>General</i>(not check the check box) in the <i>Shortcut Categories</i> list, select the check box next to <i>Project Explorer</i> in the <i>Shortcuts</i> list, and click <i>OK</i>.</li><li>Click <b>Window &gt; Show View</b> and notice the menu now just contains the <i>Project Explorer</i> item.</li></ol><h3 id="6.1.2_Creating_a_new_project.2C_folder_and_files">6.1.2 Creating a new project, folder and files</h3><p>In this section a new project, folder and files will be created in the <i>Resource</i> perspective.</p><h4 id="6.1.2.1_Creating_a_new_general_project">6.1.2.1 Creating a new general project</h4><p>Create a new project in the <i>Resource</i> perspective by completing these steps:</p><ol><li>If necessary switch to the <i>Resource</i> perspective by clicking on <b>Window &gt; Open Perspective &gt; Other</b>. Then choose the <i>Resource</i> perspective. If the <i>Resource</i> perspective already is active, click on <b>Window &gt; Reset Perspective...</b> to get back to its default configuration.</li><li>Click <b>File &gt; New &gt; Project</b>.</li><li>In the <i>New Project</i> wizard, name the project <code>My Project</code> and click <i>Finish</i>.</li></ol><h4 id="6.1.2.2_Creating_a_new_folder">6.1.2.2 Creating a new folder</h4><p>Create a folder in the project:</p><ol><li>Right-click on <i>My Project</i> in the <i>Project Explorer</i> and select <b>New &gt; Folder</b>.</li><li>Type <code>Text Files</code> in the the field <i>Folder name</i>, and then click <i>Finish</i>.</li></ol><h4 id="6.1.2.3_Creating_and_editing_a_new_file">6.1.2.3 Creating and editing a new file</h4><p>Create a file in the folder:</p><ol><li>In the <i>Project Explorer</i>, right-click on the <i>Text Files</i> folder and select <b>New &gt; File</b>.</li><li>In the <i>New File</i> wizard, ensure that <i>My Project/Text Files</i> is the parent folder. Type <code>My File</code> as the file name and click <i>Finish</i>. (Notice that a text editor opens in the editing view for the created resource)</li><li>Enter any text into the editor view for <i>My File</i>. Notice the asterisk (*) next to the file name indicates unsaved changes.</li><li>Press <i>Ctrl S</i> to save the work. Notice that the asterisk disappears.</li></ol><h4 id="6.1.2.4_Creating_another_file">6.1.2.4 Creating another file</h4><p>Create another file in the <i>Text Files</i> folder, using the workbench menu this time.</p><ol><li>On the workbench menu, click <b>File &gt; New &gt; File</b>.</li><li>In the <i>New File</i> wizard, expand <i>My Project</i> and then select <i>Text Files</i> as the parent folder.</li><li>Type <code>My Other File</code> as the file name and click <i>Finish</i>.</li><li>Reviewing the contents of the <i>Project Explorer</i> view, which should be like this</li></ol><p><center><div class="thumb middle"><div class="thumbinner" style="width:202px;"><a href="MyProject.bmp" class="image"><img class="thumbimage" width="200" align="middle" border="0" src="MyProject.bmp"/></a></div></div></center></p><h3 id="6.1.3_Exploring_editors_and_views">6.1.3 Exploring editors and views</h3><p>This section demonstrates how to manipulate views and editors.</p><h4 id="6.1.3.1_Maximizing_and_restoring_an_editor">6.1.3.1 Maximizing and restoring an editor</h4><p>Maximize one of the editors to expand the viewable area:</p><ol><li>Double-click the file name on the editor tab for <i>My File</i>.</li><li>Double-click the file name again to restore the editor to its original size.</li></ol><h4 id="6.1.3.2_Tiling_and_restacking_the_editors">6.1.3.2 Tiling and restacking the editors</h4><p>Currently, the editors are stacked one in front of the other. Try tiling them horizontally and vertically:</p><ol><li>Click the <i>My Other File</i> editor tab and drag it to the bottom of the editor pane. Colored frames indicates how the views will be tiled. Drop the editor and notice that the editors are tiled horizontally.</li><li>Drag the <i>My Other File</i> editor tab to the left of the editor pane and release it. Notice that the editors are tiled vertically.</li><li>Restack the editors by dragging one of the editor tabs on top of the other.</li></ol><h4 id="6.1.3.3_Organizing_views">6.1.3.3 Organizing views</h4><p>Try moving a view:</p><ol><li>Drag the title bar of the <i>Outline</i> view onto the title bar of the <i>Project Explorer</i>.</li><li>Experiment by dragging the title bar of the <i>Outline</i> view to various locations within the workbench.</li><li>Return the <i>Outline</i> view to its original place to the lower left of the workbench. It is always possible to return to the default configuration of the active perspective by clicking on <b>Windows &gt; Reset Perspective...</b></li></ol><h4 id="6.1.3.4_Using_view_menus">6.1.3.4 Using view menus</h4><p>Some views has view menus, e.g. <i>Project Explorer</i> view, which is indicated by a down arrow in the upper-right corner of the view. Click this down arrow of the <i>Project Explorer</i> view and review the pull-down menu options specific for this view.</p><h4 id="6.1.3.5_Closing_and_opening_views">6.1.3.5 Closing and opening views</h4><p>If a view does not appear in the workbench, it can be open by using the <b>Window</b> menu:</p><ol><li>Close the <i>Project Explorer</i> view by right-click on the <i>Project Explorer</i> view tab and select <b>Close</b>.</li><li>Click <b>Window &gt; Show View &gt; Other</b> and type <code>Project Explorer</code> in the filter text box.</li><li>Select <i>Project Explorer</i> and click <i>OK</i> which opens the view again.</li></ol><h3 id="6.1.4_Exporting_and_importing_a_project">6.1.4 Exporting and importing a project</h3><p>This section demonstrates how projects can be shared between users and workspaces using the <i>export</i> and <i>import</i> feature.</p><h4 id="6.1.4.1_Exporting_a_project">6.1.4.1 Exporting a project</h4><p>Export <i>My Project</i> to a compressed file:</p><ol><li>Select <b>File &gt; Export...</b> from the workbench menu.</li><li>In the <i>Export</i> wizard, expand <b>General</b>, and then select <b>Archive File</b>. Click <i>Next</i>.</li><li>Check the check box next to <i>My Project</i> in the resource list.</li><li>Click <i>Browse</i> to specify an export destination in the <i>To archive file</i> field. Note the available options for archive formats.</li><li>In the <i>Browse</i> window, select the <i>Desktop</i> as the destination folder and type <code>My Project</code> as the file name. Click <i>OK</i>.</li><li>In the <i>Export</i> wizard, click <i>Finish</i> to perform the export process.</li><li>View the desktop and notice the new compressed (.zip) file.</li></ol><h4 id="6.1.4.2_Removing_the_project_from_the_workspace">6.1.4.2 Removing the project from the workspace</h4><p>Remove <i>My Project</i> from the workspace:</p><ol><li>Right-click <i>My Project</i> in the <i>Project Explorer</i> and select <b>Delete</b> from the context menu.</li><li>In the <i>Delete Resources</i> pop-up window, make sure to check the</li></ol><p><i>Delete project contents on disk</i> check box. Click <i>OK</i>. Note: If this check box is unchecked, the resource will just be deleted from the Workbench, but it will still exist in the workspace. (Notice <i>My Project</i> is no longer listed in the <i>Project Explorer</i>)</p><h4 id="6.1.4.3_Importing_a_project">6.1.4.3 Importing a project</h4><p>Import <i>My Project</i> from a compressed file:</p><ol><li>Select <b>File &gt; Import...</b> from the workbench menu.</li><li>In the <i>Import</i> wizard, expand <b>General</b>, and then select <b>Existing Projects into Workspace</b>. Click <i>Next</i>.</li><li>Click the <b>Select archive file</b> radio button.</li><li>Click the <i>Browse</i> button.</li><li>In the <i>Browse</i> window, browse to the <i>Desktop</i> and select <b>My Project.zip</b> and click <i>Open</i>.</li></ol>#In the <p><i>Import</i> wizard, check the check box next to <i>My Project</i> and click <i>Finish</i> to perform the import process. (Notice <i>My Project</i> is once again listed in the <i>Project Explorer</i>)</p><h3 id="6.1.5_Conclusion">6.1.5 Conclusion</h3><p>The basic features of the Eclipse workbench have now been demonstrated.</p><ul><li>How to view and customize perspectives.</li><li>How to create a project, folder and files.</li><li>How to manipulate editors and views.</li><li>How to export and import projects.</li></ul><h2 id="6.2_Creating_profiles">6.2 Creating profiles</h2><h2 id="6.3_Creating_models_using_Papyrus">6.3 Creating models using Papyrus</h2><h3 id="6.3.1_Use-case_modeling">6.3.1 Use-case modeling</h3><h3 id="6.3.2_Design_modeling">6.3.2 Design modeling</h3><p>This is a tutorial about general class and object modeling using Papyrus.</p><h4 id="6.3.2.1_Create_a_new_UML_project">6.3.2.1 Create a new UML project</h4><p>Create a new UML modeling project as follows:</p><ol><li>If necessary switch to the <i>Papyrus</i> perspective by clicking on <b>Window &gt; Open Perspective &gt; Other</b>. Then choose the <i>Papyrus</i> perspective. If the <i>Papyrus</i> perspective is already active, click on <b>Window &gt; Reset Perspective...</b> to get back to its default configuration.</li><li>Click <b>File &gt; New &gt; Papyrus Project</b>.</li><li>In the <i>New Papyrus Project</i> wizard, name the project <code>My Design Model</code> and click <i>Next</i>.</li><li>Make sure that the radio button <i>UML</i> is selected and click <i>Next</i>.</li><li>Under the section <i>You can load a template</i>, check the box <i>A UML model with basic primitive types (ModelWithBasicTypes)</i> and click on <i>Finish</i>.</li></ol><h4 id="6.3.2.2_Create_new_packages_to_be_used_for_classes">6.3.2.2 Create new packages to be used for classes</h4><p>Create two packages in the model:</p><ol><li>Right-click on the <i>model</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Package</b> and select the created package in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>Clients</code> in the the field <i>Name</i>.</li><li>Right-click on the <i>model</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Package</b> and select the created package in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>Server</code> in the the field <i>Name</i>.</li></ol><h4 id="6.3.2.3_Create_new_classes">6.3.2.3 Create new classes</h4><p>Create two classes in the <i>Server</i> package. One is called <i>Server1</i> and the other is called <i>DataClass1</i>:</p><ol><li>Right-click on the <i>Server</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Class</b> and select the created class in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>Server1</code> in the the field <i>Name</i>.</li><li>Right-click on the <i>Server</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Class</b> and select the created class in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>DataClass1</code> in the the field <i>Name</i>.</li></ol><p>Create three different client classes in the <i>Clients</i> package:</p><ol><li>Right-click on the <i>Clients</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Class</b> and select the created class in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>Client1</code> in the the field <i>Name</i>.</li><li>Right-click on the <i>Clients</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Class</b> and select the created class in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>Client2</code> in the the field <i>Name</i>.</li><li>Right-click on the <i>Clients</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Class</b> and select the created class in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>ClientRoot</code> in the the field <i>Name</i>.</li></ol><h4 id="6.3.2.4_Create_new_class_diagrams">6.3.2.4 Create new class diagrams</h4><p>Create two class diagrams in the model:</p><ol><li>Right-click on the <i>model</i> package in the <i>Model Explorer</i>, select <b>New Diagram &gt; Create a new Class Diagram</b> and type <code>Packages</code> in the <i>Enter a new diagram name</i> pop-up window.</li><li>Right-click on the <i>model</i> package in the <i>Model Explorer</i>, select <b>New Diagram &gt; Create a new Class Diagram</b> and type <code>Classes</code> in the <i>Enter a new diagram name</i> pop-up window.</li></ol><h4 id="6.3.2.5_Create_new_operations_and_attributes">6.3.2.5 Create new operations and attributes</h4><ol><li>Right-click on the class <i>DataClass1</i> and select <b>New Child &gt; Create a new Property</b> and select the created attribute in the <i>Model Explorer</i>.  </li><li>In the <i>Properties</i> view, type <code>Field1</code> in the field <i>Name</i> and by the <i>Type</i> field click on the <img border="0" src="TypeKey.bmp"/> key and select <i>Integer</i> from the <i>UML Primitive Types</i>. This cause the created attribute to be named <i>Field1</i> and to be of type <i>Integer</i>.</li><li>Follow the above pattern to also create the attributes <i>Field2</i> of type <i>Integer</i>, <i>Field3</i> of type <i>String</i>, and <i>Field4</i> of type <i>String</i> on class <i>DataClass1</i>.</li><li>Create the attributes <i>Attribute2</i> of type <i>String</i>, <i>Attribute4</i> of type <i>Integer</i> and <i>Attribute5</i> of type <i>DataClass1</i> on class <i>Client1</i>.</li><li>Create the attribute <i>Attribute3</i> on class <i>Client2</i>.</li><li>Create the attribute <i>Attribute1</i> on class <i>Server1</i>.</li><li>Create the operation <i>service1</i> on class <i>Server1</i> by right-click on on the class <i>Server1</i> and select <b>New Child &gt; Create a new Operation</b> and select the created operation in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view, type <code>service1</code> in the the field <i>Name</i> and by the <i>Owned parameter</i> field click on the <img border="0" src="PlusKey.bmp"/> key.</li><li>In the <i>Create a new parameter</i> pop-up window, type <code>service1return</code> in the <i>Name</i> field, select <i>return</i> from the <i>Direction</i> field drop down list and by the <i>Type</i> field click on the <img border="0" src="TypeKey.bmp"/> key and select <i>Integer</i> from the <i>UML Primitive Types</i>. This causes the return type of the operation to be defined as an integer.</li></ol><h4 id="6.3.2.6_Create_new_relationships_between_classes">6.3.2.6 Create new relationships between classes</h4><p>Create a <i>Dependency</i> relationship between the <i>Clients</i> and the <i>Server</i> packages:</p><ol><li>Open the <i>Diagram Packages</i> diagram by double click on it in the <i>Model Explorer</i></li><li>Drag the <i>Clients</i> package to the class diagram (by click on it and while holding the mouse button down, move the cursor to the editing area in the class diagram editor and release it).</li><li>Drag the <i> Server</i> package to the class diagram.</li><li>Select the <i>Dependency</i> tool from the <i>Edges</i> drawer in the <i>Palette</i>, click on the <i>Clients</i> package and then on the <i>Server</i> package in the class diagram.</li><li>Type <code>Dependency</code> as the name of the relationship.</li></ol><p>Create a <i>Generalization</i> relationship between the classes <i>Client2</i> and <i>Client1</i>, i.e. make <i>Client2</i> a sub-class of <i>Client1</i>:</p><ol><li>Open the <i>Diagram Classes</i> diagram by double click on it in the <i>Model Explorer</i></li><li>Drag the <i>Client1</i> class to the class diagram.</li><li>Drag the <i>Client2</i> class to the class diagram.</li><li>Select the <i>Generalization</i> tool from the <i>Edges</i> drawer in the <i>Palette</i>, click on the <i>Client2</i> class and then on the <i>Client1</i> class in the class diagram.</li></ol><p>Create a <i>Composite</i> relationships between the classes <i>ClientRoot</i> and <i>Client1</i> plus <i>ClientRoot</i> and <i>Client2</i>:</p><ol><li>Continue with the already opened class diagram <i>Diagram Classes</i>.</li><li>Drag the <i>ClientRoot</i> class to the class diagram.</li><li>Select the <i>Association</i> tool from the <i>Edges</i> drawer in the <i>Palette</i>, click on the <i>ClientRoot</i> class and the on the <i>Client1</i> class in the class diagram.</li><li>Select the created association in the class diagram and in the <i>Properties</i> view, rename the association to <code>cr-c1</code>.</li><li>Also in the same <i>Properties</i> view, at the member end, named <i>client1</i>, by the <i>Aggregation</i> field, select <i>composite</i> from the drop down list.</li><li>Select the <i>Association</i> tool from the <i>Edges</i> drawer in the <i>Palette</i>, click on the <i>ClientRoot</i> class and the on the <i>Client2</i> class in the class diagram.</li><li>Select the created association in the class diagram and in the <i>Properties</i> view, rename the association to <code>cr-c2</code>.</li><li>Also in the same <i>Properties</i> view, at the member end, named <i>client2</i>, by the <i>Aggregation</i> field, select <i>composite</i> from the drop down list.</li></ol><h4 id="6.3.2.7_Create_a_new_package_to_be_used_for_objects">6.3.2.7 Create a new package to be used for objects</h4><p>Create a new package in the model:</p><ol><li>Right-click on the <i>model</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Package</b> and select the created package in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>Objects</code> in the the field <i>Name</i>.</li></ol><h4 id="6.3.2.8_Create_new_objects">6.3.2.8 Create new objects</h4><p>Create objects (instances of classes) in the <i>Objects</i> package:</p><ol><li>Right-click on the <i>Objects</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new InstanceSpecification</b> and select the created object (InstanceSpecification) in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>clientObj1</code> in the the field <i>Name</i> and by the <i>Classifier</i> field click on the <img border="0" src="PlusKey.bmp"/> key. In the <i>Classifier</i> window that pops up, browse to the <i>Client2</i> class and click on the <img border="0" src="Arrow.bmp"/> key, which specifies the object's class as shown in figure 11.</li></ol><p><center><div class="thumb middle"><div class="thumbinner" style="width:402px;"><a href="ClassifierPopUp.bmp" class="image"><img class="thumbimage" width="400" align="middle" border="0" src="ClassifierPopUp.bmp"/></a><div class="thumbcaption">Figure 11: The Classifier pop up window</div></div></div></center></p><p>Follow the same pattern to create:</p><ol><li>An object called <i>clientObj2</i> in the <i>Objects</i> package based on class <i>Clent2</i>.</li><li>An object called <i>serverObj1</i> in the <i>Objects</i> package based on class <i>Server1</i>.</li></ol><h4 id="6.3.2.9_Create_a_new_class_diagram">6.3.2.9 Create a new class diagram</h4><p>Create a class diagrams in the model to depicts the created objects:</p><ol><li>Right-click on the <i>model</i> package in the <i>Model Explorer</i>, select <b>New Diagram &gt; Create a new Class Diagram</b> and type <code>Objects</code> in the the <i>Enter a new diagram name</i> pop-up window.</li></ol><h4 id="6.3.2.10_Create_new_relationships_between_objects">6.3.2.10 Create new relationships between objects</h4><p>Create a <i>Dependency</i> relationship between the clients and the server objects:</p><ol><li>Open the <i>Diagram Objects</i> diagram by double click on it in the <i>Model Explorer</i></li><li>Drag the <i>clientObj1</i> object to the class diagram (by click on it and while holding the mouse button down, move the cursor to the editing area in the class diagram editor and release it).</li><li>Drag the <i>clientObj2</i> object to the class diagram</li><li>Drag the <i>serverObj1</i> object to the class diagram.</li><li>Select the <i>Dependency</i> tool from the <i>Edges</i> drawer in the <i>Palette</i>, click on the <i>clientObj1</i> object and then on the <i>serverObj1</i> object in the class diagram. Leave the default name on the relationship.</li><li>Also create a <i>Dependency</i> relationship between the <i>clientObj2 and the </i>serverObj1''.</li></ol><h4 id="6.3.2.11_Conclusion">6.3.2.11 Conclusion</h4><p>In this tutorial the following model was created:</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:402px;"><a href="DesignModelEx1.bmp" class="image"><img class="thumbimage" width="400" align="middle" border="0" src="DesignModelEx1.bmp"/></a><div class="thumbcaption">Figure 12: Two packages on top in the model</div></div></div></center></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:402px;"><a href="DesignModelEx2.bmp" class="image"><img class="thumbimage" width="400" align="middle" border="0" src="DesignModelEx2.bmp"/></a><div class="thumbcaption">Figure 13: Relationships between the client classes</div></div></div></center></p><p><b>Note!</b> The inherited attributes depicted in figure 13 on the <i>Client2</i> class.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:402px;"><a href="ObjectDiagram.bmp" class="image"><img class="thumbimage" width="400" align="middle" border="0" src="ObjectDiagram.bmp"/></a><div class="thumbcaption">Figure 14: Objects in the model and their relationships</div></div></div></center></p><h3 id="6.3.3_RT_modeling">6.3.3 RT modeling</h3><h1 id="7_Papyrus">7 Papyrus</h1><p>Papyrus can be used to do</p><ul><li>General UML modeling.</li><li>UML RT modeling, which is described in the section <a href="#6.3.3_RT_modeling">6.3.3_RT_modeling</a> when the UML RT profile is applied.</li><li>SysML modeling when the SysML profile is applied.</li><li>MARTE modeling when the MARTE profile is applied.</li><li>UML profiles, which is described in the section <a href="#7.10_UML_profiling">UMLprofiling</a> .</li></ul><p>In Papyrus, different UML profiles can be applied. When installing Papyrus, as described in section <a href="#3_Installation">Installation</a> , also the UML, UML RT, SysML and MARTE profiles can be added. When creating a new Papyrus project, the type of Papyrus project is selected. Project types to chose from are SysML, Profile and UML.</p><h2 id="7.1_Papyrus_resources_in_the_workspace">7.1 Papyrus resources in the workspace</h2><p>When modeling in Papyrus, three types of resources are stored in the workspace.</p><table><tr><td><p><div class="thumb middle"><div class="thumbinner" style="width:402px;"><a href="ModelProjResourcesFS.bmp" class="image"><img class="thumbimage" width="400" align="middle" border="0" src="ModelProjResourcesFS.bmp"/></a><div class="thumbcaption">Figure 15: Resources in the file system</div></div></div></p></td><td><p><div class="thumb middle"><div class="thumbinner" style="width:202px;"><a href="ModelProjResourcesPE.bmp" class="image"><img class="thumbimage" width="200" align="middle" border="0" src="ModelProjResourcesPE.bmp"/></a><div class="thumbcaption">Figure 16: Resources in the Project Explorer</div></div></div></p></td></tr></table><ul><li><b>.di</b> file persists the status of the workbench, i.e. which diagrams and views are opened, etc.</li><li><b>.notation</b> file persists the information about the diagrams in the model.</li><li><b>.uml</b> file persists the UML model.</li></ul><p>Note! In this case the model is contained in three files. When working in an industrial context, the model may need to be split up into several fragments in order for several designers to work concurrently with the same model. This is described in section <a href="#7.6_Papyrus_in_a_team_environment">Papyrus in a team environment</a> .</p><h2 id="7.2_The_Papyrus_perspective">7.2 The Papyrus perspective</h2><p>When Papyrus is installed a predefined perspective called <i>Papyrus</i> is made available. This is the perspective to use when modeling with Papyrus. The Papyrus perspective can be customized to the user needs and saved as new perspective ( see section <a href="#4.4_Workbench">Workbench</a> ).</p><h3 id="7.2.1_Project_Explorer_view">7.2.1 Project Explorer view</h3><p>The <i>Project Explorer</i> view is used to browse, select and manipulate resources in the workspace. Projects or working sets are the top level in this view. From the <i>Project Explorer's</i> (right click on the white space) context menu, e.g. new projects can be created.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:202px;"><a href="ProjectExpl.bmp" class="image"><img class="thumbimage" width="200" align="middle" border="0" src="ProjectExpl.bmp"/></a><div class="thumbcaption">Figure 17: The Project Explorer</div></div></div></center></p><p>In some views, as in this case, there is a view specific menu (indicated in Figure 13 with a red ring). Here some settings can be applied for the view, e.g. if the top level should be working sets or projects.</p><h3 id="7.2.2_Model_Explorer_view">7.2.2 Model Explorer view</h3><p>In the <i>Model Explorer</i> view, the model that has been opened in the <i>Project Explorer</i>, can be browsed and edited. Model elements can be added by using the context menu of any existing modeling element, including the model package and packages. Diagrams can also be added by using the context menus. Existing diagrams can be opened in an appropriate editor by just double clicking on the diagram in the <i>Model Explorer</i>.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:202px;"><a href="ModelExpl.bmp" class="image"><img class="thumbimage" width="200" align="middle" border="0" src="ModelExpl.bmp"/></a><div class="thumbcaption">Figure 18: The Model Explorer</div></div></div></center></p><h3 id="7.2.3_Editing_view">7.2.3 Editing view</h3><p>The <i>Editing View</i> is in the middle part of the workbench and here opens different types of editors, depending on the type of resource to edit, e.g. if a class diagram is opened, the class diagram editor will be visible in the <i>Editing View</i>.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:402px;"><a href="EditingView.bmp" class="image"><img class="thumbimage" width="400" align="middle" border="0" src="EditingView.bmp"/></a><div class="thumbcaption">Figure 19: The Editing View</div></div></div></center></p><p>How to use editors is described in section <a href="#7.3_Diagram_editing_in_Papyrus">Editors in Papyrus</a>.</p><h3 id="7.2.4_Outline_view">7.2.4 Outline view</h3><p>The <i>Outline View</i> is connected to the <i>Editing View</i> and gives an overview of what is open in the <i>Editing View</i>. The <i>Outline View</i> may be used to pan the <i>Editing View</i> or to select some information that will be highlighted in the <i>Editing View</i>. The shaded area is the area that is visible in the <i>Editing View</i>.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:202px;"><a href="OutlineView.bmp" class="image"><img class="thumbimage" width="200" align="middle" border="0" src="OutlineView.bmp"/></a><div class="thumbcaption">Figure 20: The Outline View</div></div></div></center></p><h3 id="7.2.5_Properties_view">7.2.5 Properties view</h3><p>The <i>Properties view</i> is a stacked view which is located at the bottom of the workbench and shows the properties of a selected modeling element. The modeling element can be selected in the Model Explorer or in a diagram. The properties are categorized under different tabs located to the left in the <i>Properties view</i>.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="PropertiesView.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="PropertiesView.bmp"/></a><div class="thumbcaption">Figure 21: The Properties View</div></div></div></center></p><p>In this view the properties may be viewed and edited, e.g. rename the operation and change the visibility of the operation.</p><h3 id="7.2.6_Model_Validation_view">7.2.6 Model Validation view</h3><p>From the context menu in the <i>Model Explorer</i> it is possible to validate the entire model or parts of it (for more details see section <a href="#7.7_Model_validation">Model validation</a> . All warnings and errors appear in the <i>Model Validation View</i>, which is a stacked view together with the <i>Properties View</i> and the <i>Search View</i> at the bottom of the workbench.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="ModelValidationView.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="ModelValidationView.bmp"/></a><div class="thumbcaption">Figure 22: The Model Validation View</div></div></div></center></p><p>The model validation constraints are customizable and how to work with it is described in section <a href="#7.7_Model_validation">Model validation</a> .</p><h3 id="7.2.7_Search_view">7.2.7 Search view</h3><p>It is possible to do searches on a selected resource in a specific project or in the entire workspace. When the search is finished, the result appears in the <i>Search View</i>. Details about specifying searches is described in the <a href="#7.8_Searching">Searching</a> section.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="SearchView.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="SearchView.bmp"/></a><div class="thumbcaption">Figure 23: The Search View</div></div></div></center></p><p>The example in Figure 23 shows the result of a model search for <i>Class1</i> in the entire workspace.</p><h2 id="7.3_Diagram_editing_in_Papyrus"><div id="EditorsinPapyrus">7.3 Diagram editing in Papyrus</div></h2><p>To edit diagrams different editors are available in Papyrus. They have the same basic look and feel. When double clicking on some diagram in the <i>Model Explorer</i>, the diagram opens in the editing view. An outline view and a tool palette are also opened. Creating a new diagram in the <i>Model Explorer</i> will also open up a diagram editor together with its tool palette and outline view.</p><h3 id="7.3.1_Diagram_editors">7.3.1 Diagram editors</h3><p>When a diagram editor is opened in Papyrus, three views are opened:</p><ul><li>Editing surface</li><li>Palette</li><li>Outline</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="DiagramEditorFieldsPointers.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="DiagramEditorFieldsPointers.bmp"/></a><div class="thumbcaption">Figure 24: Parts of a diagram editor (as an example, the class diagram editor is used)</div></div></div></center></p><p>Figure 24 shows the different parts of a diagram editor. In this case the class diagram editor has been chosen as an example. The <i>Editing surface</i> is where the diagram editing is taken place. The <i>Outline view</i> gives an overview of the entire diagram. The blue shaded part in the <i>Outline view</i> shows what is visible in the editing surface. The <i>Palette</i> contains <i>Drawers</i> and in each drawer there are <i>Tools</i> to be used to add different things into the diagram. In Figure 22, the <i>Nodes</i> drawer is closed and the <i>Edges</i> drawer is opened. In the <i>Edges</i> drawer there are <i>Tools</i> to create different types of edges. By clicking on a drawer, it toggles open and close drawer.</p><h3 id="7.3.2_Basic_tool_techniques">7.3.2 Basic tool techniques</h3><p>Diagrams can be created in different places in the model such as they can be owned by model elements like classes or packages. Diagrams can also be placed on top of the model directly under the model package.</p><h4 id="7.3.2.1_Creating_diagrams">7.3.2.1 Creating diagrams</h4><p>To create a diagram, right click on the model element that should be the owner of the diagram and select <b>New Diagram</b> from the context menu. A new level of menu appears, displaying all types of diagrams that are available to create in this place, e.g. Figure 21 shows the available diagram types that can be created directly on top in the model package.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewDiagram.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewDiagram.bmp"/></a><div class="thumbcaption">Figure 25: Available diagram types that can be created directly under the model package</div></div></div></center></p><p><b>Note!</b> In Figure 25, no adaptation of Papyrus has taken place, hence all diagram types according pops up.</p><h4 id="7.3.2.2_Scrolling_and_panning_in_diagrams">7.3.2.2 Scrolling and panning in diagrams</h4><p>Scrolling and panning in diagrams can be done by either:</p><ul><li>Use the outline view and click (hold down) and drag the blue shaded area around, which simultaneously pans the editing surface.</li><li>Use the vertical and horizontal scroll bars in the editing surface.</li></ul><h4 id="7.3.2.3_Creating_an_element_in_a_diagram">7.3.2.3 Creating an element in a diagram</h4><p>Elements can be created in a diagram directly, by using a tool from the palette, e.g. to create a class</p><ol><li>Open a class diagram</li><li>Open the nodes drawer</li><li>Click on the class tool</li><li>Click somewhere in the editing surface</li><li>Name the class</li></ol><p>If an element already exists in the model, just click on (hold down) the element in the <i>Model Explorer</i> and drag it to the editing surface. When releasing the mouse key, the modeling element appears in the diagram.</p><h4 id="7.3.2.4_Delete_and_hide">7.3.2.4 Delete and hide</h4><p>In a diagram, elements can be deleted or hided.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:202px;"><a href="ElementContextMenuDiaDelHide.bmp" class="image"><img class="thumbimage" width="200" align="middle" border="0" src="ElementContextMenuDiaDelHide.bmp"/></a><div class="thumbcaption">Figure 26: Context menu of an element in a diagram</div></div></div></center></p><p>Right click on an element in a diagram and do</p><ul><li><b>Delete Selected Element</b> will delete the element from the entire model and also from all diagrams where it was present.</li><li><b>Hide Selected Element</b> will hide the element just in this diagram.</li></ul><p><b>Note!</b> These menu items have short cuts, i.e. instead of using the context menu, just select the element in the diagram and use the <b>Delete</b> or <b>Shift-Delete</b> keys</p><h4 id="7.3.2.5_Formating_and_validating_diagrams">7.3.2.5 Formating and validating diagrams</h4><p>Diagrams can be adjusted and graphically edited to get a nicer look also using the element context menu. From the same context menu it is also possible to validate the model or specific parts of the model.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:302px;"><a href="ElementContextMenuDiaFormat.bmp" class="image"><img class="thumbimage" width="300" align="middle" border="0" src="ElementContextMenuDiaFormat.bmp"/></a><div class="thumbcaption">Figure 27: Example of the Format sub context menu</div></div></div></center></p><p>In Figure 27 several menu items are shown, e.g.:</p><ul><li><b>Validation</b> to validate the model partly or fully</li><li><b>Format</b> to do some advanced formating of the diagram like adjustments, routing, etc. as shown in the sub context menu in Figure 25</li><li><b>Filter</b> to select/unselect parts of symbols that should be visible or not</li></ul><h2 id="7.4_UML_modeling"><div id="UMLmodeling">7.4 UML modeling</div></h2><p>With Papyrus, UML models can be created. This is done using different types of diagrams. Modeling elements can be created in these diagrams or directly in the <i>Model Explorer</i>. Diagrams are created in the <i>Model Explorer</i> and when doing so a diagram editor together with its tool palette and outline view are also opened. Section <a href="#7.3_Diagram_editing_in_Papyrus">Diagram editing in Papyrus</a> describes how to work with diagram editors.</p><p>The most common modeling elements are:</p><ul><li>Package</li><li>Use-case</li><li>Actor</li><li>Class</li><li>Object</li></ul><h3 id="7.4.1_Package">7.4.1 Package</h3><p>A <i>package</i> is a general UML grouping element, comparable to a folder in Windows or a directory in Unix. It is used to bring order in the model. A <i>package</i> may have a semantical meaning (e.g. representing a subsystem) and then a UML stereotype, defined in a applied UML Profile, may be added to it (e.g. &lt;&lt; subsystem &gt;&gt;). To create a new <i>package</i>, right click on the owning element, e.g. the model package and from the context menu select <b>New Child &gt; Create a new Package</b></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewPackage.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewPackage.bmp"/></a><div class="thumbcaption">Figure 28: Create a new Package</div></div></div></center></p><h3 id="7.4.2_Use-case">7.4.2 Use-case</h3><p>A <i>use-case</i> is a functionality in the system. A <i>use-case</i> is a model of the dialogue between actors and the system. It should return a result of measurable value to at least one actor. A <i>use-case</i> is initiated by an actor to invoke a certain functionality in the system.
-A <i>use-case</i> is a complete and meaningful flow of events.
-Taken together, all <i>use-cases</i> constitute all possible ways of using the system.</p><p>To create a new <i>use-case</i>, right click on the owning element, e.g. a package and from the context menu select <b>New Child &gt; Create a new UseCase</b></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewUseCase.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewUseCase.bmp"/></a><div class="thumbcaption">Figure 29: Create a new use-case</div></div></div></center></p><h3 id="7.4.3_Actor">7.4.3 Actor</h3><p>An <i>actor</i> is something external to the system, but interacts with it. An <i>actor</i> may be a human being or another system. It may be active or passive. An <i>actor</i> interacts (active <i>actor</i>) or receive (passive <i>actor</i>) information from one or several use-cases.</p><p>To create a new <i>actor</i>, right click on the owning element, e.g. a package and from the context menu select <b>New Child &gt; Create a new Actor</b></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewActor.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewActor.bmp"/></a><div class="thumbcaption">Figure 30: Create a new actor</div></div></div></center></p><h3 id="7.4.4_Class">7.4.4 Class</h3><p>A <i>class</i> is an extensible template for creating objects, providing initial values for state (member variables, attributes) and implementations of behavior (member functions, methods, operations). </p><p>Collectively attributes define the structure of a <i>class</i>. A class may have any number of attributes or none. Attributes are typically implemented as variables. An attribute has a type, which tells us what kind of attribute it is. Typical types of attributes are integer, Boolean, real, and enumeration. These types are called primitive types. More complex types are defined by other <i>classes</i>.</p><p>Collectively operations define the behavior of the <i>class</i>. A <i>class</i> may have any number of operations or none. Operations are implemented as functions or procedures.</p><p>To create a new <i>class</i>, right click on the owning element, e.g. a package and from the context menu select <b>New Child &gt; Create a new Class</b></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewClass.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewClass.bmp"/></a><div class="thumbcaption">Figure 31: Create a new class</div></div></div></center></p><h4 id="7.4.4.1_Attributes_on_classes">7.4.4.1 Attributes on classes</h4><p>When a <i>class</i> is created, <i>attributes</i> can be added to it by using the context menu of the <i>class</i>. To create a new <i>attribute</i> on the a <i>class</i> select <b>New Child &gt; Create a new Property</b> from its context menu.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewAttribute.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewAttribute.bmp"/></a><div class="thumbcaption">Figure 32: Create a new attribute</div></div></div></center></p><p>The visibility, type and default value of the attribute are set in the properties view when the attribute is selected.</p><h4 id="7.4.4.2_Operations_on_classes">7.4.4.2 Operations on classes</h4><p>When a <i>class</i> is created, <i>operations</i> can be added to it by using the context menu of the <i>class</i>. To create a new <i>operation</i> on the a <i>class</i> select <b>New Child &gt; Create a new Operation</b> from its context menu.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewOperation.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewOperation.bmp"/></a><div class="thumbcaption">Figure 33: Create a new operation</div></div></div></center></p><p>The visibility, arguments and return type of the operation are set in the properties view when the operation is selected.</p><p>Regarding the arguments and return type of the an operation, select the <img border="0" src="PlusKey.bmp"/> key by the <i>Owned parameter</i> field.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="ClassOp1.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="ClassOp1.bmp"/></a><div class="thumbcaption">Figure 34: Create a new argument</div></div></div></center></p><p>Then the following window pops up and from the drop list in the <i>Direction</i> field, select the direction of the argument. In the <i>Name</i> field the name of the argument is written and the type is defined in the <i>Type</i> field.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="ClassOp2.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="ClassOp2.bmp"/></a><div class="thumbcaption">Figure 35: Select the argument´s direction</div></div></div></center></p><p>The direction <i>return</i> defines the return type of the operation. Only one argument can have the return direction.</p><h3 id="7.4.5_Object">7.4.5 Object</h3><p>An <i>object</i> is an instance of a class. In UML it is called and <i>InstanceSpecification</i>, which is a more general term since it can be used for instances of other classifiers than classes. </p><p>To create a new <i>object</i>, right click on the owning element, e.g. a package and from the context menu select <b>New Child &gt; Create a new InstanceSpecification</b></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewObject.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewObject.bmp"/></a><div class="thumbcaption">Figure 36: Create a new object</div></div></div></center></p><p>The class to be instanciated is selected by clicking on the <img border="0" src="PlusKey.bmp"/> key by the <i>Classifier</i> field in the <i>Properties</i> view of the <i>InstanceSpecification</i>. This will open the <i>Classifier</i> pop-up window (figure 37), where the class to be used is selected.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="ClassifierPopup.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="ClassifierPopup.bmp"/></a><div class="thumbcaption">Figure 37: Classifier pop-up window</div></div></div></center></p><h3 id="7.4.6_Relationships">7.4.6 Relationships</h3><p>There are different types of relationships that can be used in diagrams, hence in the model between different modeling elements.</p><pre>    <div class="thumb middle"><div class="thumbinner" style="width:302px;"><a href="Relationships.bmp" class="image"><img class="thumbimage" width="300" align="middle" border="0" src="Relationships.bmp"/></a></div></div>
-</pre><p>Navigability can be unidirectional or bidirectional for <i>Association</i>, <i>Aggregation</i> and <i>Composition</i>.</p><p><i>Association</i> specifies peer-to-peer relationships between model elements, e.g. if a Class-x has an attribute of type Class-y, it can be viewed in a class diagram as and <i>Association</i> between Class-x and Class-y.</p><p><i>Aggregation</i> is used to model a whole/part relationship between model elements. The part element can exist without the whole. <i>Aggregation</i> causes the generated code to contain the aggregate either by reference or by value, depending on the details of the relationship. E.g. to model an aggregation, the aggregate (Department) has an aggregation association to its constituent parts (Employee). A hollow diamond is attached to the end of an association path on the side of the aggregate (the whole) to indicate aggregation.</p><p><i>Composition</i> is an aggregation with strong ownership, i.e. when the container is destroyed, all of its composite objects are destroyed as well.</p><p><i>Dependency</i> is a relationship in which one model element uses another. <i>Dependency</i> may exist between classes if a message is sent from one class to the other or if one class mentions the other as a parameter to an operation. <i>Dependency</i> may exist between packages if one package is dependent on another.</p><p>A <i>Dependency</i> relationship causes a class to be generated with inclusions or references to another class.</p><p>A <i>Generalization</i> relationship causes a class to be generated as a subclass of another class.</p><p>The <i>Realizes</i> relationship specifies that, e.g. an implementation realizes a specification. The <i>Realizes</i> relationship does not affect the code.</p><p>To create a relationship between two modeling elements, use the tool palette in the diagram editor, e.g. to create an <i>Association</i> between two classes, select the <i>Association</i> tool in the tool palette, click on the source element and then click on the destination element as described in figure 38.</p><p><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="ClassDiagramEditorNewAss.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="ClassDiagramEditorNewAss.bmp"/></a><div class="thumbcaption">Figure 38: Create a new Association</div></div></div></p><p>In the <i>Edges</i> drawer in the tool palette, all available relationships are shown. To create a <i>Generalization</i> relationship, select the <i>Generalization</i> tool from the tool palette and follow the same procedure as described.</p><p>The <i>Aggregation</i> and the <i>Composition</i> relationships are a special kind of an <i>Association</i> relationship. To create any of these, an <i>Association</i> relationship needs first to be created. Then select the created <i>Association</i> and in the properties view, change the <i>Aggregation</i> field at the appropriate end of the <i>Association</i> to <i>shared</i>(if an <i>Aggregation</i> is desired) or to <i>composite</i> (if a <i>Composition</i> is desired). Figure 39 shows how to do it.</p><p><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="ClassDiagramEditorNewAgg.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="ClassDiagramEditorNewAgg.bmp"/></a><div class="thumbcaption">Figure 39: Create a new Association</div></div></div></p><p>When the <i>Association</i> is created, the <i>Aggregation</i> field is set to <i>none</i> by default. When doing the change at the destination end (as in figure 35), the diamond shows up at the source end of the relationship.</p><h3 id="7.4.7_Diagrams">7.4.7 Diagrams</h3><p>UML has many different types of diagrams to capture all different aspects of a system. To capture and refine requirements, diagrams related to use-cases are used. To specify the architecture and design, diagrams related to classes and packages are used. To specify the implementation, state and activity diagrams are used, etc.</p><p>The different diagrams in UML 2 are shown in figure 40 and here they are structured after diagram type. In the following of this section they are organized how they are used. </p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="UMLdiagrams.png" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="UMLdiagrams.png"/></a><div class="thumbcaption">Figure 40: UMl 2 diagram types</div></div></div></center></p><p><b>Note!</b> In Papyrus class diagrams are also used as object diagrams.</p><h4 id="7.4.7.1_Diagrams_related_to_use-cases">7.4.7.1 Diagrams related to use-cases</h4><p>When working with requirement capture and refinement, use-case modeling is used and any or all of the following diagrams can be used:</p><ul><li>Use-case diagram</li><li>Activity diagram</li><li>Interaction diagram<ul><li>Sequence diagram</li><li>Collaboration diagram</li></ul></li></ul><p>A <i>use-case diagram</i> describe how different <i>Actors</i> use different functionality of the system. Implicitly, it also define the system boundary, since it shows what should be performed by the system and what exists outside the system. The elements used in <i>use-case diagrams</i> are:</p><ul><li><b>Actors</b> interact with, but are outside the system.</li><li><b>Use-cases</b> are some functionality that are performed by the system.</li><li><b>Relationships</b> between elements.</li></ul><p>A diagram may depict all or some of the use-cases of a system.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="UCdiagram.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="UCdiagram.bmp"/></a><div class="thumbcaption">Figure 41: Use-case diagram</div></div></div></center></p><p>A <i>use-case</i> interacts with an <i>actor</i> and perform something useful for that <i>actor</i>. A <i>use-case</i> exist because of its main flow, but all odd cases and error situations have to be specified. A <i>use-case</i> has a black box and a white box view. The black box view is preferably described in plain text or by using activity diagrams. The white box view is described by one or several sequence diagrams.</p><p>All <i>use-cases</i> together span the entire functionality of the system. <i>Actors</i>, <i>use-cases</i> and <i>use-case diagrams</i> are owned by packages (general UML packages or model packages).</p><p>To create a <i>use-case diagram</i>, right click on the owning package and select <b>New Diagram &gt; Create a new UseCase Diagram</b> from its context menu.</p><p>An <i>activity diagram</i> is a kind of behavioral diagram and shows flow of control from activity to activity. It is used to specify a use-case black box view. It can also be used to specify a flow chart for a class operation.</p><p>The main elements in an <i>activity diagram</i> are:</p><ul><li>Initial and end states</li><li>Activities</li><li>States</li><li>Transitions</li><li>Synchronization lines</li><li>Decisions</li><li>Partitions</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="ActivityDiagram.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="ActivityDiagram.bmp"/></a><div class="thumbcaption">Figure 42: Activity diagram</div></div></div></center></p><p>The <i>activity diagram</i> is preferably used to specify the black box behavior of a use-case instead of using plain text. It may also be used to specify a flow chart for a class operation.<i>Activity diagrams</i> are owned by use-cases or classes. </p><p>To create an <i>activity diagram</i>, right click on the owning use-case or class and select <b>New Diagram &gt; Create a new Activity Diagram</b> from its context menu.</p><p>Interaction diagrams are used to specify how different modeling elements interacts. Here two types are described, the <i>sequence diagram</i> and the <i>communication diagram</i>.</p><p>A <i>sequence diagram</i> describes the interactions between elements as a time ordered set of messages. One or several <i>sequence diagrams</i> are used to specify the white box view of a use-case.</p><p>Sequences involving collaborating elementsThe main elements in a <i>sequence diagram</i> are:</p><ul><li>Class instances (objects)</li><li>Life lines</li><li>Messages</li><li>Combined fragments</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="SequenceDiagram.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="SequenceDiagram.bmp"/></a><div class="thumbcaption">Figure 43: Sequence diagram</div></div></div></center></p><p>The example (Figure 43) describes Interaction1, two objects (instances of Class1 and Class2) are created and interacts by messages. The time goes down along the life lines. In the bottom, there is a combined fragment of type "Ref" which is a reference to another interaction, Interaction2, meaning that the sequences in that interaction are executed.There are a lot of combined fragment types, e.g. type "Loop" specifies a loop, type "Alt" specifies alternatives, etc. All combined fragment types are defined in <a href="http://www.omg.org/spec/UML/2.4.1/">Unified Modeling Language (UML) version 2.4.1</a></p><p><i>Sequence diagrams</i> are owned by use-cases or communication diagrams (see below). </p><p>To create a <i>sequence diagram</i>, right click on the owning use-case or communication diagram and select <b>New Diagram &gt; Create a new Sequence Diagram</b> from its context menu.</p><p><i>Communication diagrams</i> show the lines of communication among a set of objects to accomplish a specific purpose. They act as the framework for sequence diagrams and define access paths between elements. i.e. <i>communication diagrams</i> are used to specify a use-case's white box communication channels between elements in the system.</p><p>The main elements in a <i>collaboration diagram</i> are:</p><ul><li>Class instances (objects)</li><li>Access paths</li><li>Messages</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="CommunicationDiagram.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="CommunicationDiagram.bmp"/></a><div class="thumbcaption">Figure 44: Communication diagram</div></div></div></center></p><p>The example (Figure 44) describes access paths between objects and which messages are passed in these paths.<i>Communication diagrams</i> are owned by use-cases. </p><p>To create a <i>communication diagram</i>, right click on the owning use-case and select <b>New Diagram &gt; Create a new Communication Diagram</b> from its context menu.</p><h4 id="7.4.7.2_Diagrams_related_to_classes">7.4.7.2 Diagrams related to classes</h4><p>When modeling classes, any or all of the following diagrams may be used:</p><ul><li><i>Class diagrams</i></li><li><i>Composite structure diagrams</i></li><li><i>State diagrams</i></li></ul><p>As described above, activity diagrams may also be used to specify a flowchart for a class operation.</p><p><i>Class diagrams</i> depict static views of the system. A <i>class diagram</i> may represent all or part of the class structure of a system. Typically there are many <i>class diagrams</i> in a model. Usually one or many <i>class diagrams</i> are used to specify the inheritance structure in the system. <i>Class diagrams</i> may also be used to define dependency rules between packages.</p><p>The main elements in a <i>class diagram</i> are:</p><ul><li>Packages</li><li>Classes</li><li>Relationships</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="ClassDiagram.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="ClassDiagram.bmp"/></a><div class="thumbcaption">Figure 45: Class diagram</div></div></div></center></p><p>The example (Figure 45) shows a <i>class diagram</i> used to specify an inheritance structure between classes. Note: The <i>Generalization</i> relationship and the indication of the inherited attributes in Class1 and Class2.</p><p><i>Class diagrams</i> are owned by ordinary UML packages or model packages. </p><p>To create a <i>class diagram</i>, right click on the owning package and select <b>New Diagram &gt; Create a new Class Diagram</b> from its context menu.</p><p>The <i>composite structure diagram</i> specifies structure classes contents, i.e. how the class uses <i>roles</i> (instances from other classes) and how they are connected to fulfill its responsibility.</p><p>The main elements in a <i>composite structure diagram</i> are:</p><ul><li>Contained roles (instances of classes)</li><li>Ports (interface objects)</li><li>Connectors</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="CompositeStructure.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="CompositeStructure.bmp"/></a><div class="thumbcaption">Figure 46: Composite structure diagram</div></div></div></center></p><p>The example (Figure 46) shows a <i>composite structure diagram</i> used to specify the structural contents of Class4. Note: Class4 uses one instance (class2) of Class2 and one instance (class3) of Class3 and they are connected between Class2/Port1 and Class3/Port2.</p><p><i>Composite structure diagrams</i> are owned by structured classes. </p><p>To create a <i>composite structure diagram</i>, right click on the owning class and select <b>New Diagram &gt; Create a new Composite Structure Diagram</b> from its context menu.</p><p>The <i>state machine diagram</i> specifies the behavior of a class. It is used when the class is state rich, i.e. has an event driven behavior. If the class has no states, activity diagrams can be used.</p><p>The main elements in a <i>state machine diagram</i> are:</p><ul><li>States</li><li>Transitions</li><li>Effect code</li><li>Triggering events</li><li>Pseudo states, e.g. initial, final and choice points</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="StateDiagram.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="StateDiagram.bmp"/></a><div class="thumbcaption">Figure 47: State machine diagram</div></div></div></center></p><p>The example (Figure 47) shows a <i>state machine diagram</i> that has an initial pseudo state, three states and transitions between them. On each transition (except for initialize), a <i>triggering event</i> is specified, which defines the event that makes the transition to be taken. Transitions and states may have effect code, which specify detailed behavior to be executed when an associated transition is taken.</p><p><i>State machine diagrams</i> are owned by classes. </p><p>To create a <i>state machine diagram</i>, right click on the owning class and select <b>New Diagram &gt; Create a new State Machine Diagram</b> from its context menu.</p><h2 id="7.5_UML_RT_modeling"><div id="UMLRTmodeling">7.5 UML RT modeling</div></h2><p>When creating models UML is used. Since UML is general-purpose modeling language in the field of software engineering, it is possible to adapt UML to specific domains. This is done by creating and applying UML profiles. When using UML for RT modeling with Capsules and Protocols, the UML RT profile is applied. When a profile is applied we can say that Papyrus has been specialized. There is a specific use-case in Papyrus to develop UML profiles and when doing so a domain specific modeling language is defined. This use-case is described in section <a href="#7.10_UML_profiling">UML profiling</a> in this user guide.</p><h3 id="7.5.1_Additional_modeling_elements">7.5.1 Additional modeling elements</h3><h4 id="7.5.1.1_Capsule_class">7.5.1.1 Capsule class</h4><h4 id="7.5.1.2_Protocol_class">7.5.1.2 Protocol class</h4><h3 id="7.5.2_Using_C.2B.2B_in_a_model">7.5.2 Using C++ in a model</h3><h3 id="7.5.3_C.2B.2B_service_library">7.5.3 C++ service library</h3><h4 id="7.5.3.1_Sending_messages">7.5.3.1 Sending messages</h4><h3 id="7.5.4_Transformation_from_model_to_code">7.5.4 Transformation from model to code</h3><h3 id="7.5.5_Edit_the_generated_code">7.5.5 Edit the generated code</h3><h3 id="7.5.6_Compiling_and_linking_the_generated_code">7.5.6 Compiling and linking the generated code</h3><h3 id="7.5.7_Using_external_libraries">7.5.7 Using external libraries</h3><h3 id="7.5.8_Running_the_system">7.5.8 Running the system</h3><h2 id="7.6_Papyrus_in_a_team_environment"><div id="Papyrusinateamenvironment">7.6 Papyrus in a team environment</div></h2><h3 id="7.6.1_Model_fragmentation">7.6.1 Model fragmentation</h3><h3 id="7.6.2_Source_configuration_management">7.6.2 Source configuration management</h3><h3 id="7.6.3_Compare_and_Merge">7.6.3 Compare and Merge</h3><h2 id="7.7_Model_validation"><div id="Modelvalidation">7.7 Model validation</div></h2><h3 id="7.7.1_Object_Constrain_Language_.28OCL.29">7.7.1 Object Constrain Language (OCL)</h3><h3 id="7.7.2_Defining_constraints_using_OCL">7.7.2 Defining constraints using OCL</h3><h2 id="7.8_Searching"><div id="Searching">7.8 Searching</div></h2><h2 id="7.9_Sample_models">7.9 Sample models</h2><p>In the Papyrus installation directory There are several sample models</p><h3 id="7.9.1_Class_model_with_inheritance">7.9.1 Class model with inheritance</h3><h3 id="7.9.2_Send_and_receive_data">7.9.2 Send and receive data</h3><h3 id="7.9.3_Interprocess_communication">7.9.3 Interprocess communication</h3><h2 id="7.10_UML_profiling"><div id="UMLprofiling">7.10 UML profiling</div></h2><p>TBD include the information in the user guide "About UML profiling"</p><h1 id="8_Support">8 Support</h1><p>To report bugs, suggest improvements, view the status of the Papyrus project, discuss different Papyrus subjects, etc. please use the following references:</p><ul><li><a href="http://www.eclipse.org/papyrus/">The Papyrus project home page</a></li><li><a href="http://www.eclipse.org/forums/index.php/f/121/">The Papyrus discussion forum</a></li><li>Proposals for Papyrus improvements</li><li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;classification=Modeling&amp;product=MDT.Papyrus&amp;component=Core&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailtype1=exact&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse%20same%20sort%20as%20last%20time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">Bugzilla_to_report_bugs</a></li></ul><h1 id="9_References">9 References</h1><ol><li><a href="http://www.eclipse.org/">eclipse.org</a></li><li><a href="http://www.eclipse.org/modeling/emf/">EMF model</a></li><li><a href="http://www.eclipse.org/downloads/">Eclipse download page</a></li><li><a href="http://www.omg.org/spec/UML/2.4.1/">Unified Modeling Language (UML) version 2.4.1</a></li><li><a href="http://www.omg.org/spec/SysML/">System Modeling Language</a></li><li><a href="http://www.omg.org/omgmarte/Specification.htm/">Modeling and Analysis of Real-Time and Embedded systems</a></li></ol></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.mediawiki b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.mediawiki
index 5b96dc2f7b0..d043edfc408 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.mediawiki
@@ -45,7 +45,7 @@ When ''Eclipse Standard'' is installed, go to '''Help &gt; Install New Software'
 

 '''Note!''' In some industrial environments, a proxy has to be used instead of this type of direct URL to the Eclipse web-site. To configure Eclipse to use a proxy is done under '''Windows &gt; Preferences''' and '''General &gt; Network Connections'''

 

-<center>[[File:InstallNewSoftware.bmp|thumb|center|thumb|564px|Figure 1: Install New Software wizard]]</center>

+<center>[[Image:images/InstallNewSoftware.bmp|thumb|center|thumb|564px|Figure 1: Install New Software wizard]]</center>

 

 In the ''Name'' column of the wizard, scroll down to ''Modeling'' and expand to the next level. Under ''Modeling'', select ''Papyrus UML'' and follow the installation wizard to complete the installation.

 

@@ -55,7 +55,7 @@ When Eclipse is restarted, the environment is now ready for UML modeling.
 

 After installation of the basic Papyrus feature, go to '''Help &gt; Install Papyrus Additional Components'''. In the wizard that pops up, select the needed additional Papyrus components, e.g. to be able to do UML RT modeling, the ''Real Time'' component is needed. It is also recommended to install the ''Diagram Stylesheets'' and ''Papyrus Compare'' components. Follow the installation wizard to complete the installation.

 

-<center>[[File:InstallPapyrusComp.bmp|thumb|center|thumb|437px|Figure 2: The Install Papyrus Additional Components wizard]]</center>

+<center>[[Image:images/InstallPapyrusComp.bmp|thumb|center|thumb|437px|Figure 2: The Install Papyrus Additional Components wizard]]</center>

 

 = 4 Eclipse =

 

@@ -67,19 +67,19 @@ The Eclipse framework has a plug-in architecture, where plug-ins can be grouped
 

 The plug-in architecture applies also for all subsystems. A plug-in is the smallest unit of Eclipse Platform functionality that can be developed and delivered separately. Usually, a small tool is written as a single plug-in, whereas a complex tool has its functionality split across several plug-ins. Except for a small kernel known as the Platform Runtime, all of the Eclipse Platform's functionality is located in plug-ins. Plug-ins can be grouped into features.

 

-<center>[[File:EclipseArchitecture.bmp|center|thumb|500px|Figure 3: The Eclipse architecture]]</center>

+<center>[[Image:images/EclipseArchitecture.bmp|center|thumb|500px|Figure 3: The Eclipse architecture]]</center>

 

 Plug-ins are coded in Java. A typical plug-in consists of Java code in a JAR (Java Archive) library, some read-only files, and other resources such as images, Web templates, message catalogs, native code libraries, and so on. Some plug-ins do not contain code at all. One such example is a plug-in that contributes online help in the form of HTML pages. A single plug-in’s code libraries and read-only content are located together in a directory in the file system, or at a base URL on a server. There is also a mechanism that permits a plug-in to be synthesized from several separate fragments, each in their own directory or URL. This is the mechanism used to deliver separate language packs for an internationalized plug-in.

 

 Each plug-in has a manifest file declaring its interconnections to other plug-ins. The interconnection model is simple: a plug-in declares any number of named extension points, and any number of extensions to one or more extension points in other plug-ins.

 

-<center>[[File:Feature-Plug-in.bmp|center|thumb|290px|Figure 4: Plug-ins and Features]]</center>

+<center>[[Image:images/Feature-Plug-in.bmp|center|thumb|290px|Figure 4: Plug-ins and Features]]</center>

 

 == <div id="Workspace">4.2 Workspace</div> ==

 

 The workspace is located in the file-system and is the place where Eclipse resources (files, folders and projects) are stored. When Eclipse is started, a pop-up window appears, where a workspace should be selected. One instance of Eclipse is connected to one workspace.

 

-<center>[[File:WorkspacePopup.bmp|center|thumb|593px|Figure 5: Pop-up window to select the workspace]]</center>

+<center>[[Image:images/WorkspacePopup.bmp|center|thumb|593px|Figure 5: Pop-up window to select the workspace]]</center>

 

 In the file system all resources are stored in the selected workspace and in the same hierarchical structure as in the ''Project Explorer''.

 

@@ -97,15 +97,15 @@ The workbench is the Eclipse user interface and is used to navigate, view, and e
 

 The first time Eclipse is started, after the installation, a ''Welcome'' page is presented. Take a few minutes to explore the product overview and getting started information that is located here.

 

-<center>[[File:WelcomePage.bmp|center|thumb|480px|Figure 6: The Eclipse welcome page]]</center>

+<center>[[Image:images/WelcomePage.bmp|center|thumb|480px|Figure 6: The Eclipse welcome page]]</center>

 

 To return to the ordinary workbench, just click on the workbench icon up to the right. When starting Eclipse, subsequent times, the workbench appears directly. To visit the welcome page at any time, just select '''Help &gt; Welcome'''.

 

 The title bar of the workbench window and the little Papyrus icon to the right indicates which ''perspective'' is active. In this example, the Papyrus ''perspective'' is in use. The ''Project Explorer'' and the ''Model Explorer, Outline, Properties'' views, etc. are open, along with a ''Class Diagram'' editor and its tool palette.

 

-<center>[[File:Workbench.bmp|center|thumb|512px|Figure 7: The Papyrus perspective in the workbench]]</center>

+<center>[[Image:images/Workbench.bmp|center|thumb|512px|Figure 7: The Papyrus perspective in the workbench]]</center>

 

-It is easy to toggle between perspectives by clicking on some shown ''perspective'' in top of the right hand corner or open a new one by clicking on the ''Open Perspective'' icon [[File:IkonOpenPerspective.png]] and browse to the ''perspective'' to open. It is also possible to reorganize a ''perspective'', open/close ''views'', customize menus, etc. and then save the ''perspective'' with a new name by '''Window &gt; Save Perspective As ...'''.

+It is easy to toggle between perspectives by clicking on some shown ''perspective'' in top of the right hand corner or open a new one by clicking on the ''Open Perspective'' icon [[Image:images/IkonOpenPerspective.png]] and browse to the ''perspective'' to open. It is also possible to reorganize a ''perspective'', open/close ''views'', customize menus, etc. and then save the ''perspective'' with a new name by '''Window &gt; Save Perspective As ...'''.

 

 === 4.4.1 Views ===

 

@@ -127,7 +127,7 @@ In the workbench figure, above, also ''stacked views'' appear, e.g. ''Properties
 

 To customize the settings for the Eclipse workbench and the installed features, the preference window is used. Use '''Windows &gt; Preferences''' to open it, e.g. under '''General &gt; Keys''' in the preference window there are shortcuts and keys defined for the user interface. Here they can be redefined or own sets could be defined.

 

-<center>[[File:Preferences.bmp|center|thumb|556px|Figure 8: The preference window]]</center>

+<center>[[Image:images/Preferences.bmp|center|thumb|556px|Figure 8: The preference window]]</center>

 

 The preference window pages can be searched using the filter function. To filter by matching the page title, simply type the name of the page and the available pages will be presented below.

 

@@ -139,9 +139,9 @@ Projects can be shared between workspaces by using project import and export, wh
 

 {|

 |

-[[File:ImportWiz.bmp|center|thumb|420px|Figure 9: Import wizard]]    

+[[Image:images/images/ImportWiz.bmp|center|thumb|420px|Figure 9: Import wizard]]    

 |

-[[File:ExportWiz.bmp|center|thumb|538px|Figure 10: Export wizard]]

+[[Image:images/images/ExportWiz.bmp|center|thumb|538px|Figure 10: Export wizard]]

 |}

 

 When importing a project into the used workspace, it can be copied by checking the box ''Copy ...'' in the import wizard. If this check box is unchecked, there will just be a reference to the other workspace and when editing that project, it will be edited in its original place. Be aware of that when doing so, several instances of Eclipse may edit the same resource.

@@ -236,7 +236,7 @@ Create another file in the ''Text Files'' folder, using the workbench menu this
 # Type <code>My Other File</code> as the file name and click ''Finish''.

 # Reviewing the contents of the ''Project Explorer'' view, which should be like this

 

-<center>[[File:MyProject.bmp|center|thumb|200px]]</center>

+<center>[[Image:images/MyProject.bmp|center|thumb|200px]]</center>

 

 === 6.1.3 Exploring editors and views ===

 

@@ -380,14 +380,14 @@ Create two class diagrams in the model:
 ==== 6.3.2.5 Create new operations and attributes ====

 

 # Right-click on the class ''DataClass1'' and select '''New Child &gt; Create a new Property''' and select the created attribute in the ''Model Explorer''.  

-# In the ''Properties'' view, type <code>Field1</code> in the field ''Name'' and by the ''Type'' field click on the [[File:TypeKey.bmp]] key and select ''Integer'' from the ''UML Primitive Types''. This cause the created attribute to be named ''Field1'' and to be of type ''Integer''.

+# In the ''Properties'' view, type <code>Field1</code> in the field ''Name'' and by the ''Type'' field click on the [[Image:images/TypeKey.bmp]] key and select ''Integer'' from the ''UML Primitive Types''. This cause the created attribute to be named ''Field1'' and to be of type ''Integer''.

 # Follow the above pattern to also create the attributes ''Field2'' of type ''Integer'', ''Field3'' of type ''String'', and ''Field4'' of type ''String'' on class ''DataClass1''.

 # Create the attributes ''Attribute2'' of type ''String'', ''Attribute4'' of type ''Integer'' and ''Attribute5'' of type ''DataClass1'' on class ''Client1''.

 # Create the attribute ''Attribute3'' on class ''Client2''.

 # Create the attribute ''Attribute1'' on class ''Server1''.

 # Create the operation ''service1'' on class ''Server1'' by right-click on on the class ''Server1'' and select '''New Child &gt; Create a new Operation''' and select the created operation in the ''Model Explorer''.

-# In the ''Properties'' view, type <code>service1</code> in the the field ''Name'' and by the ''Owned parameter'' field click on the [[File:PlusKey.bmp]] key.

-# In the ''Create a new parameter'' pop-up window, type <code>service1return</code> in the ''Name'' field, select ''return'' from the ''Direction'' field drop down list and by the ''Type'' field click on the [[File:TypeKey.bmp]] key and select ''Integer'' from the ''UML Primitive Types''. This causes the return type of the operation to be defined as an integer.

+# In the ''Properties'' view, type <code>service1</code> in the the field ''Name'' and by the ''Owned parameter'' field click on the [[Image:images/PlusKey.bmp]] key.

+# In the ''Create a new parameter'' pop-up window, type <code>service1return</code> in the ''Name'' field, select ''return'' from the ''Direction'' field drop down list and by the ''Type'' field click on the [[Image:images/TypeKey.bmp]] key and select ''Integer'' from the ''UML Primitive Types''. This causes the return type of the operation to be defined as an integer.

 

 

 ==== 6.3.2.6 Create new relationships between classes ====

@@ -430,9 +430,9 @@ Create a new package in the model:
 Create objects (instances of classes) in the ''Objects'' package:

 

 # Right-click on the ''Objects'' package in the ''Model Explorer'', select '''New Child &gt; Create a new InstanceSpecification''' and select the created object (InstanceSpecification) in the ''Model Explorer''.

-# In the ''Properties'' view type <code>clientObj1</code> in the the field ''Name'' and by the ''Classifier'' field click on the [[File:PlusKey.bmp]] key. In the ''Classifier'' window that pops up, browse to the ''Client2'' class and click on the [[File:Arrow.bmp]] key, which specifies the object's class as shown in figure 11.

+# In the ''Properties'' view type <code>clientObj1</code> in the the field ''Name'' and by the ''Classifier'' field click on the [[Image:images/PlusKey.bmp]] key. In the ''Classifier'' window that pops up, browse to the ''Client2'' class and click on the [[Image:images/Arrow.bmp]] key, which specifies the object's class as shown in figure 11.

 

-<center>[[File:ClassifierPopUp.bmp|center|thumb|400px|Figure 11: The Classifier pop up window]]</center>

+<center>[[Image:images/ClassifierPopUp.bmp|center|thumb|400px|Figure 11: The Classifier pop up window]]</center>

 

 Follow the same pattern to create:

 

@@ -460,13 +460,13 @@ Create a ''Dependency'' relationship between the clients and the server objects:
 

 In this tutorial the following model was created:

 

-<center>[[File:DesignModelEx1.bmp|center|thumb|400px|Figure 12: Two packages on top in the model]]</center>

+<center>[[Image:images/DesignModelEx1.bmp|center|thumb|400px|Figure 12: Two packages on top in the model]]</center>

 

-<center>[[File:DesignModelEx2.bmp|center|thumb|400px|Figure 13: Relationships between the client classes]]</center>

+<center>[[Image:images/DesignModelEx2.bmp|center|thumb|400px|Figure 13: Relationships between the client classes]]</center>

 

 '''Note!''' The inherited attributes depicted in figure 13 on the ''Client2'' class.

 

-<center>[[File:ObjectDiagram.bmp|center|thumb|400px|Figure 14: Objects in the model and their relationships]]</center>

+<center>[[Image:images/ObjectDiagram.bmp|center|thumb|400px|Figure 14: Objects in the model and their relationships]]</center>

 

 === 6.3.3 RT modeling ===

 

@@ -489,9 +489,9 @@ In Papyrus, different UML profiles can be applied. When installing Papyrus, as d
 When modeling in Papyrus, three types of resources are stored in the workspace.

 {|

 |

-[[File:ModelProjResourcesFS.bmp|center|thumb|400px|Figure 15: Resources in the file system]]

+[[Image:images/ModelProjResourcesFS.bmp|center|thumb|400px|Figure 15: Resources in the file system]]

 |

-[[File:ModelProjResourcesPE.bmp|center|thumb|200px|Figure 16: Resources in the Project Explorer]]

+[[Image:images/ModelProjResourcesPE.bmp|center|thumb|200px|Figure 16: Resources in the Project Explorer]]

 |}

 * '''.di''' file persists the status of the workbench, i.e. which diagrams and views are opened, etc.

 * '''.notation''' file persists the information about the diagrams in the model.

@@ -507,7 +507,7 @@ When Papyrus is installed a predefined perspective called ''Papyrus'' is made av
 

 The ''Project Explorer'' view is used to browse, select and manipulate resources in the workspace. Projects or working sets are the top level in this view. From the ''Project Explorer's'' (right click on the white space) context menu, e.g. new projects can be created.

 

-<center>[[File:ProjectExpl.bmp|center|thumb|200px|Figure 17: The Project Explorer]]</center>

+<center>[[Image:images/ProjectExpl.bmp|center|thumb|200px|Figure 17: The Project Explorer]]</center>

 

 In some views, as in this case, there is a view specific menu (indicated in Figure 13 with a red ring). Here some settings can be applied for the view, e.g. if the top level should be working sets or projects.

 

@@ -515,13 +515,13 @@ In some views, as in this case, there is a view specific menu (indicated in Figu
 

 In the ''Model Explorer'' view, the model that has been opened in the ''Project Explorer'', can be browsed and edited. Model elements can be added by using the context menu of any existing modeling element, including the model package and packages. Diagrams can also be added by using the context menus. Existing diagrams can be opened in an appropriate editor by just double clicking on the diagram in the ''Model Explorer''.

 

-<center>[[File:ModelExpl.bmp|center|thumb|200px|Figure 18: The Model Explorer]]</center>

+<center>[[Image:images/ModelExpl.bmp|center|thumb|200px|Figure 18: The Model Explorer]]</center>

 

 === 7.2.3 Editing view ===

 

 The ''Editing View'' is in the middle part of the workbench and here opens different types of editors, depending on the type of resource to edit, e.g. if a class diagram is opened, the class diagram editor will be visible in the ''Editing View''.

 

-<center>[[File:EditingView.bmp|center|thumb|400px|Figure 19: The Editing View]]</center>

+<center>[[Image:images/EditingView.bmp|center|thumb|400px|Figure 19: The Editing View]]</center>

 

 How to use editors is described in section [[#7.3_Diagram_editing_in_Papyrus|Editors in Papyrus]].

 

@@ -529,14 +529,14 @@ How to use editors is described in section [[#7.3_Diagram_editing_in_Papyrus|Edi
 

 The ''Outline View'' is connected to the ''Editing View'' and gives an overview of what is open in the ''Editing View''. The ''Outline View'' may be used to pan the ''Editing View'' or to select some information that will be highlighted in the ''Editing View''. The shaded area is the area that is visible in the ''Editing View''.

 

-<center>[[File:OutlineView.bmp|center|thumb|200px|Figure 20: The Outline View]]</center>

+<center>[[Image:images/OutlineView.bmp|center|thumb|200px|Figure 20: The Outline View]]</center>

 

 

 === 7.2.5 Properties view ===

 

 The ''Properties view'' is a stacked view which is located at the bottom of the workbench and shows the properties of a selected modeling element. The modeling element can be selected in the Model Explorer or in a diagram. The properties are categorized under different tabs located to the left in the ''Properties view''.

 

-<center>[[File:PropertiesView.bmp|center|thumb|500px|Figure 21: The Properties View]]</center>

+<center>[[Image:images/PropertiesView.bmp|center|thumb|500px|Figure 21: The Properties View]]</center>

 

 

 In this view the properties may be viewed and edited, e.g. rename the operation and change the visibility of the operation.

@@ -545,7 +545,7 @@ In this view the properties may be viewed and edited, e.g. rename the operation
 

 From the context menu in the ''Model Explorer'' it is possible to validate the entire model or parts of it (for more details see section [[#7.7_Model_validation|Model validation]] . All warnings and errors appear in the ''Model Validation View'', which is a stacked view together with the ''Properties View'' and the ''Search View'' at the bottom of the workbench.

 

-<center>[[File:ModelValidationView.bmp|center|thumb|500px|Figure 22: The Model Validation View]]</center>

+<center>[[Image:images/ModelValidationView.bmp|center|thumb|500px|Figure 22: The Model Validation View]]</center>

 

 

 The model validation constraints are customizable and how to work with it is described in section [[#7.7_Model_validation|Model validation]] .

@@ -554,7 +554,7 @@ The model validation constraints are customizable and how to work with it is des
 

 It is possible to do searches on a selected resource in a specific project or in the entire workspace. When the search is finished, the result appears in the ''Search View''. Details about specifying searches is described in the [[#7.8_Searching|Searching]] section.

 

-<center>[[File:SearchView.bmp|center|thumb|500px|Figure 23: The Search View]]</center>

+<center>[[Image:images/SearchView.bmp|center|thumb|500px|Figure 23: The Search View]]</center>

 

 The example in Figure 23 shows the result of a model search for ''Class1'' in the entire workspace.

 

@@ -570,7 +570,7 @@ When a diagram editor is opened in Papyrus, three views are opened:
 * Palette

 * Outline

 

-<center>[[File:DiagramEditorFieldsPointers.bmp|center|thumb|500px|Figure 24: Parts of a diagram editor (as an example, the class diagram editor is used)]]</center>

+<center>[[Image:images/DiagramEditorFieldsPointers.bmp|center|thumb|500px|Figure 24: Parts of a diagram editor (as an example, the class diagram editor is used)]]</center>

 

 Figure 24 shows the different parts of a diagram editor. In this case the class diagram editor has been chosen as an example. The ''Editing surface'' is where the diagram editing is taken place. The ''Outline view'' gives an overview of the entire diagram. The blue shaded part in the ''Outline view'' shows what is visible in the editing surface. The ''Palette'' contains ''Drawers'' and in each drawer there are ''Tools'' to be used to add different things into the diagram. In Figure 22, the ''Nodes'' drawer is closed and the ''Edges'' drawer is opened. In the ''Edges'' drawer there are ''Tools'' to create different types of edges. By clicking on a drawer, it toggles open and close drawer.

 

@@ -582,7 +582,7 @@ Diagrams can be created in different places in the model such as they can be own
 

 To create a diagram, right click on the model element that should be the owner of the diagram and select '''New Diagram''' from the context menu. A new level of menu appears, displaying all types of diagrams that are available to create in this place, e.g. Figure 21 shows the available diagram types that can be created directly on top in the model package.

 

-<center>[[File:NewDiagram.bmp|center|thumb|500px|Figure 25: Available diagram types that can be created directly under the model package]]</center>

+<center>[[Image:images/NewDiagram.bmp|center|thumb|500px|Figure 25: Available diagram types that can be created directly under the model package]]</center>

 

 '''Note!''' In Figure 25, no adaptation of Papyrus has taken place, hence all diagram types according pops up.

 

@@ -609,7 +609,7 @@ If an element already exists in the model, just click on (hold down) the element
 

 In a diagram, elements can be deleted or hided.

 

-<center>[[File:ElementContextMenuDiaDelHide.bmp|center|thumb|200px|Figure 26: Context menu of an element in a diagram]]</center>

+<center>[[Image:images/ElementContextMenuDiaDelHide.bmp|center|thumb|200px|Figure 26: Context menu of an element in a diagram]]</center>

 

 Right click on an element in a diagram and do

 

@@ -622,7 +622,7 @@ Right click on an element in a diagram and do
 

 Diagrams can be adjusted and graphically edited to get a nicer look also using the element context menu. From the same context menu it is also possible to validate the model or specific parts of the model.

 

-<center>[[File:ElementContextMenuDiaFormat.bmp|center|thumb|300px|Figure 27: Example of the Format sub context menu]]</center>

+<center>[[Image:images/ElementContextMenuDiaFormat.bmp|center|thumb|300px|Figure 27: Example of the Format sub context menu]]</center>

 

 In Figure 27 several menu items are shown, e.g.:

 

@@ -646,7 +646,7 @@ The most common modeling elements are:
 

 A ''package'' is a general UML grouping element, comparable to a folder in Windows or a directory in Unix. It is used to bring order in the model. A ''package'' may have a semantical meaning (e.g. representing a subsystem) and then a UML stereotype, defined in a applied UML Profile, may be added to it (e.g. &lt;&lt; subsystem &gt;&gt;). To create a new ''package'', right click on the owning element, e.g. the model package and from the context menu select '''New Child &gt; Create a new Package'''

 

-<center>[[File:NewPackage.bmp|center|thumb|500px|Figure 28: Create a new Package]]</center>

+<center>[[Image:images/NewPackage.bmp|center|thumb|500px|Figure 28: Create a new Package]]</center>

 

 === 7.4.2 Use-case ===

 

@@ -656,7 +656,7 @@ Taken together, all ''use-cases'' constitute all possible ways of using the syst
 

 To create a new ''use-case'', right click on the owning element, e.g. a package and from the context menu select '''New Child &gt; Create a new UseCase'''

 

-<center>[[File:NewUseCase.bmp|center|thumb|500px|Figure 29: Create a new use-case]]</center>

+<center>[[Image:images/NewUseCase.bmp|center|thumb|500px|Figure 29: Create a new use-case]]</center>

 

 === 7.4.3 Actor ===

 

@@ -664,7 +664,7 @@ An ''actor'' is something external to the system, but interacts with it. An ''ac
 

 To create a new ''actor'', right click on the owning element, e.g. a package and from the context menu select '''New Child &gt; Create a new Actor'''

 

-<center>[[File:NewActor.bmp|center|thumb|500px|Figure 30: Create a new actor]]</center>

+<center>[[Image:images/NewActor.bmp|center|thumb|500px|Figure 30: Create a new actor]]</center>

 

 === 7.4.4 Class ===

 

@@ -676,13 +676,13 @@ Collectively operations define the behavior of the ''class''. A ''class'' may ha
 

 To create a new ''class'', right click on the owning element, e.g. a package and from the context menu select '''New Child &gt; Create a new Class'''

 

-<center>[[File:NewClass.bmp|center|thumb|500px|Figure 31: Create a new class]]</center>

+<center>[[Image:images/NewClass.bmp|center|thumb|500px|Figure 31: Create a new class]]</center>

 

 ==== 7.4.4.1 Attributes on classes ====

 

 When a ''class'' is created, ''attributes'' can be added to it by using the context menu of the ''class''. To create a new ''attribute'' on the a ''class'' select '''New Child &gt; Create a new Property''' from its context menu.

 

-<center>[[File:NewAttribute.bmp|center|thumb|500px|Figure 32: Create a new attribute]]</center>

+<center>[[Image:images/NewAttribute.bmp|center|thumb|500px|Figure 32: Create a new attribute]]</center>

 

 The visibility, type and default value of the attribute are set in the properties view when the attribute is selected.

 

@@ -690,17 +690,17 @@ The visibility, type and default value of the attribute are set in the propertie
 

 When a ''class'' is created, ''operations'' can be added to it by using the context menu of the ''class''. To create a new ''operation'' on the a ''class'' select '''New Child &gt; Create a new Operation''' from its context menu.

 

-<center>[[File:NewOperation.bmp|center|thumb|500px|Figure 33: Create a new operation]]</center>

+<center>[[Image:images/NewOperation.bmp|center|thumb|500px|Figure 33: Create a new operation]]</center>

 

 The visibility, arguments and return type of the operation are set in the properties view when the operation is selected.

 

-Regarding the arguments and return type of the an operation, select the [[File:PlusKey.bmp]] key by the ''Owned parameter'' field.

+Regarding the arguments and return type of the an operation, select the [[Image:images/PlusKey.bmp]] key by the ''Owned parameter'' field.

 

-<center>[[File:ClassOp1.bmp|center|thumb|600px|Figure 34: Create a new argument]]</center>

+<center>[[Image:images/ClassOp1.bmp|center|thumb|600px|Figure 34: Create a new argument]]</center>

 

 Then the following window pops up and from the drop list in the ''Direction'' field, select the direction of the argument. In the ''Name'' field the name of the argument is written and the type is defined in the ''Type'' field.

 

-<center>[[File:ClassOp2.bmp|center|thumb|600px|Figure 35: Select the argument�s direction]]</center>

+<center>[[Image:images/ClassOp2.bmp|center|thumb|600px|Figure 35: Select the argument�s direction]]</center>

 

 The direction ''return'' defines the return type of the operation. Only one argument can have the return direction.

 

@@ -710,17 +710,17 @@ An ''object'' is an instance of a class. In UML it is called and ''InstanceSpeci
 

 To create a new ''object'', right click on the owning element, e.g. a package and from the context menu select '''New Child &gt; Create a new InstanceSpecification'''

 

-<center>[[File:NewObject.bmp|center|thumb|500px|Figure 36: Create a new object]]</center>

+<center>[[Image:images/NewObject.bmp|center|thumb|500px|Figure 36: Create a new object]]</center>

 

-The class to be instanciated is selected by clicking on the [[File:PlusKey.bmp]] key by the ''Classifier'' field in the ''Properties'' view of the ''InstanceSpecification''. This will open the ''Classifier'' pop-up window (figure 37), where the class to be used is selected.

+The class to be instanciated is selected by clicking on the [[Image:images/PlusKey.bmp]] key by the ''Classifier'' field in the ''Properties'' view of the ''InstanceSpecification''. This will open the ''Classifier'' pop-up window (figure 37), where the class to be used is selected.

 

-<center>[[File:ClassifierPopup.bmp|center|thumb|500px|Figure 37: Classifier pop-up window]]</center>

+<center>[[Image:images/ClassifierPopup.bmp|center|thumb|500px|Figure 37: Classifier pop-up window]]</center>

 

 === 7.4.6 Relationships ===

 

 There are different types of relationships that can be used in diagrams, hence in the model between different modeling elements.

 

-     [[Image:Relationships.bmp|center|thumb|300px]]

+     [[Image:./images/Relationships.bmp|center|thumb|300px]]

 

 Navigability can be unidirectional or bidirectional for ''Association'', ''Aggregation'' and ''Composition''.

 

@@ -740,14 +740,14 @@ The ''Realizes'' relationship specifies that, e.g. an implementation realizes a
 

 To create a relationship between two modeling elements, use the tool palette in the diagram editor, e.g. to create an ''Association'' between two classes, select the ''Association'' tool in the tool palette, click on the source element and then click on the destination element as described in figure 38.

 

-[[Image:ClassDiagramEditorNewAss.bmp|center|thumb|500px|Figure 38: Create a new Association]]

+[[Image:./images/ClassDiagramEditorNewAss.bmp|center|thumb|500px|Figure 38: Create a new Association]]

 

 

 In the ''Edges'' drawer in the tool palette, all available relationships are shown. To create a ''Generalization'' relationship, select the ''Generalization'' tool from the tool palette and follow the same procedure as described.

 

 The ''Aggregation'' and the ''Composition'' relationships are a special kind of an ''Association'' relationship. To create any of these, an ''Association'' relationship needs first to be created. Then select the created ''Association'' and in the properties view, change the ''Aggregation'' field at the appropriate end of the ''Association'' to ''shared''(if an ''Aggregation'' is desired) or to ''composite'' (if a ''Composition'' is desired). Figure 39 shows how to do it.

 

-[[Image:ClassDiagramEditorNewAgg.bmp|center|thumb|500px|Figure 39: Create a new Association]]

+[[Image:./images/ClassDiagramEditorNewAgg.bmp|center|thumb|500px|Figure 39: Create a new Association]]

 

 When the ''Association'' is created, the ''Aggregation'' field is set to ''none'' by default. When doing the change at the destination end (as in figure 35), the diamond shows up at the source end of the relationship.

 

@@ -757,7 +757,7 @@ UML has many different types of diagrams to capture all different aspects of a s
 

 The different diagrams in UML 2 are shown in figure 40 and here they are structured after diagram type. In the following of this section they are organized how they are used. 

 

-<center>[[File:UMLdiagrams.png|center|thumb|500px|Figure 40: UMl 2 diagram types]]</center>

+<center>[[Image:images/UMLdiagrams.png|center|thumb|500px|Figure 40: UMl 2 diagram types]]</center>

 

 '''Note!''' In Papyrus class diagrams are also used as object diagrams.

 

@@ -780,7 +780,7 @@ A ''use-case diagram'' describe how different ''Actors'' use different functiona
 

 A diagram may depict all or some of the use-cases of a system.

 

-<center>[[File:UCdiagram.bmp|center|thumb|600px|Figure 41: Use-case diagram]]</center>

+<center>[[Image:images/UCdiagram.bmp|center|thumb|600px|Figure 41: Use-case diagram]]</center>

 

 A ''use-case'' interacts with an ''actor'' and perform something useful for that ''actor''. A ''use-case'' exist because of its main flow, but all odd cases and error situations have to be specified. A ''use-case'' has a black box and a white box view. The black box view is preferably described in plain text or by using activity diagrams. The white box view is described by one or several sequence diagrams.

 

@@ -801,7 +801,7 @@ The main elements in an ''activity diagram'' are:
 * Decisions

 * Partitions

 

-<center>[[File:ActivityDiagram.bmp|center|thumb|600px|Figure 42: Activity diagram]]</center>

+<center>[[Image:images/ActivityDiagram.bmp|center|thumb|600px|Figure 42: Activity diagram]]</center>

 

 The ''activity diagram'' is preferably used to specify the black box behavior of a use-case instead of using plain text. It may also be used to specify a flow chart for a class operation.''Activity diagrams'' are owned by use-cases or classes. 

 

@@ -820,7 +820,7 @@ Sequences involving collaborating elementsThe main elements in a ''sequence diag
 * Messages

 * Combined fragments

 

-<center>[[File:SequenceDiagram.bmp|center|thumb|600px|Figure 43: Sequence diagram]]</center>

+<center>[[Image:images/SequenceDiagram.bmp|center|thumb|600px|Figure 43: Sequence diagram]]</center>

 

 The example (Figure 43) describes Interaction1, two objects (instances of Class1 and Class2) are created and interacts by messages. The time goes down along the life lines. In the bottom, there is a combined fragment of type "Ref" which is a reference to another interaction, Interaction2, meaning that the sequences in that interaction are executed.There are a lot of combined fragment types, e.g. type "Loop" specifies a loop, type "Alt" specifies alternatives, etc. All combined fragment types are defined in [http://www.omg.org/spec/UML/2.4.1/ Unified Modeling Language (UML) version 2.4.1]

 

@@ -837,7 +837,7 @@ The main elements in a ''collaboration diagram'' are:
 * Access paths

 * Messages

 

-<center>[[File:CommunicationDiagram.bmp|center|thumb|600px|Figure 44: Communication diagram]]</center>

+<center>[[Image:images/CommunicationDiagram.bmp|center|thumb|600px|Figure 44: Communication diagram]]</center>

 

 

 The example (Figure 44) describes access paths between objects and which messages are passed in these paths.''Communication diagrams'' are owned by use-cases. 

@@ -863,7 +863,7 @@ The main elements in a ''class diagram'' are:
 * Classes

 * Relationships

 

-<center>[[File:ClassDiagram.bmp|center|thumb|600px|Figure 45: Class diagram]]</center>

+<center>[[Image:images/ClassDiagram.bmp|center|thumb|600px|Figure 45: Class diagram]]</center>

 

 The example (Figure 45) shows a ''class diagram'' used to specify an inheritance structure between classes. Note: The ''Generalization'' relationship and the indication of the inherited attributes in Class1 and Class2.

 

@@ -880,7 +880,7 @@ The main elements in a ''composite structure diagram'' are:
 * Ports (interface objects)

 * Connectors

 

-<center>[[File:CompositeStructure.bmp|center|thumb|600px|Figure 46: Composite structure diagram]]</center>

+<center>[[Image:images/CompositeStructure.bmp|center|thumb|600px|Figure 46: Composite structure diagram]]</center>

 

 The example (Figure 46) shows a ''composite structure diagram'' used to specify the structural contents of Class4. Note: Class4 uses one instance (class2) of Class2 and one instance (class3) of Class3 and they are connected between Class2/Port1 and Class3/Port2.

 

@@ -899,7 +899,7 @@ The main elements in a ''state machine diagram'' are:
 * Triggering events

 * Pseudo states, e.g. initial, final and choice points

 

-<center>[[File:StateDiagram.bmp|center|thumb|600px|Figure 47: State machine diagram]]</center>

+<center>[[Image:images/StateDiagram.bmp|center|thumb|600px|Figure 47: State machine diagram]]</center>

 

 The example (Figure 47) shows a ''state machine diagram'' that has an initial pseudo state, three states and transitions between them. On each transition (except for initialize), a ''triggering event'' is specified, which defines the event that makes the transition to be taken. Transitions and states may have effect code, which specify detailed behavior to be executed when an associated transition is taken.

 

diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ActivityDiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ActivityDiagram.bmp
index ce150ed16d0..ce150ed16d0 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ActivityDiagram.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ActivityDiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ClassDiagram.bmp
index ecbfd96c698..ecbfd96c698 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagram.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ClassDiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorBase.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ClassDiagramEditorBase.bmp
index d39a0d74fd5..d39a0d74fd5 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorBase.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ClassDiagramEditorBase.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorNewAgg.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ClassDiagramEditorNewAgg.bmp
index a72ba31434c..a72ba31434c 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorNewAgg.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ClassDiagramEditorNewAgg.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ClassDiagramEditorNewAgg.png b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ClassDiagramEditorNewAgg.png
new file mode 100644
index 00000000000..b0f05a5641c
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ClassDiagramEditorNewAgg.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorNewAss.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ClassDiagramEditorNewAss.bmp
index 251060abd70..251060abd70 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorNewAss.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ClassDiagramEditorNewAss.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/CommunicationDiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/CommunicationDiagram.bmp
index 35e1cdd0c9f..35e1cdd0c9f 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/CommunicationDiagram.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/CommunicationDiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/CompositeStructure.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/CompositeStructure.bmp
index adbeeb8cfcb..adbeeb8cfcb 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/CompositeStructure.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/CompositeStructure.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditor.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/DiagramEditor.bmp
index 4e82c94cba3..4e82c94cba3 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditor.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/DiagramEditor.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditorFields.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/DiagramEditorFields.bmp
index b30e976b628..b30e976b628 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditorFields.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/DiagramEditorFields.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditorFieldsPointers.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/DiagramEditorFieldsPointers.bmp
index 5259119a843..5259119a843 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditorFieldsPointers.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/DiagramEditorFieldsPointers.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EclipseArchitecture.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/EclipseArchitecture.bmp
index cea20f60bc0..cea20f60bc0 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EclipseArchitecture.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/EclipseArchitecture.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EclipseView.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/EclipseView.bmp
index 18d6597bfaf..18d6597bfaf 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EclipseView.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/EclipseView.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EditingView.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/EditingView.bmp
index 28f04781b6e..28f04781b6e 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EditingView.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/EditingView.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDia.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ElementContextMenuDia.bmp
index bd79eb310d0..bd79eb310d0 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDia.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ElementContextMenuDia.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDiaDelHide.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ElementContextMenuDiaDelHide.bmp
index a0680064d83..a0680064d83 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDiaDelHide.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ElementContextMenuDiaDelHide.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDiaFormat.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ElementContextMenuDiaFormat.bmp
index 0e1c51a9fb6..0e1c51a9fb6 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDiaFormat.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ElementContextMenuDiaFormat.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ExportWiz.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ExportWiz.bmp
index 48e6c07a047..48e6c07a047 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ExportWiz.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ExportWiz.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Feature-Plug-in.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/Feature-Plug-in.bmp
index 4a4eeab0274..4a4eeab0274 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Feature-Plug-in.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/Feature-Plug-in.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/IkonOpenPerspective.png b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/IkonOpenPerspective.png
index d887221695c..d887221695c 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/IkonOpenPerspective.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/IkonOpenPerspective.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ImportWiz.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ImportWiz.bmp
index f505187abb8..f505187abb8 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ImportWiz.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ImportWiz.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/InstallNewSoftware.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/InstallNewSoftware.bmp
index 7e2ce2c8036..7e2ce2c8036 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/InstallNewSoftware.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/InstallNewSoftware.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/InstallPapyrusComp.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/InstallPapyrusComp.bmp
index ec0306a73bd..ec0306a73bd 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/InstallPapyrusComp.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/InstallPapyrusComp.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelExpl.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ModelExpl.bmp
index 4c96e45b6ed..4c96e45b6ed 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelExpl.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ModelExpl.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelProjResourcesFS.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ModelProjResourcesFS.bmp
index 9b83f8dd607..9b83f8dd607 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelProjResourcesFS.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ModelProjResourcesFS.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelProjResourcesPE.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ModelProjResourcesPE.bmp
index 11157c7c6da..11157c7c6da 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelProjResourcesPE.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ModelProjResourcesPE.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelValidationView.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ModelValidationView.bmp
index bd40576507f..bd40576507f 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelValidationView.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ModelValidationView.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/MyProject.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/MyProject.bmp
index b07a71f5abc..b07a71f5abc 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/MyProject.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/MyProject.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewActor.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewActor.bmp
index 3ee16271152..3ee16271152 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewActor.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewActor.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewAttribute.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewAttribute.bmp
index 3ae5925c9e0..3ae5925c9e0 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewAttribute.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewAttribute.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewClass.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewClass.bmp
index d4292e62b98..d4292e62b98 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewClass.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewClass.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewDiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewDiagram.bmp
index 0f77a431dff..0f77a431dff 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewDiagram.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewDiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewOperation.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewOperation.bmp
index 1de99f275d9..1de99f275d9 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewOperation.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewOperation.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewPackage.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewPackage.bmp
index 87e43b999dd..87e43b999dd 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewPackage.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewPackage.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewUseCase.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewUseCase.bmp
index 313587fbbe5..313587fbbe5 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewUseCase.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/NewUseCase.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/OutlineView.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/OutlineView.bmp
index 55390342176..55390342176 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/OutlineView.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/OutlineView.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Preferences.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/Preferences.bmp
index 4ae9abb00d2..4ae9abb00d2 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Preferences.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/Preferences.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ProjectExpl.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ProjectExpl.bmp
index 3c5171557d6..3c5171557d6 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ProjectExpl.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ProjectExpl.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PropertiesView.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/PropertiesView.bmp
index 5fbed2fa110..5fbed2fa110 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PropertiesView.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/PropertiesView.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Relationships.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/Relationships.bmp
index 2e739eabe47..2e739eabe47 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Relationships.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/Relationships.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/SearchView.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/SearchView.bmp
index b74183c0777..b74183c0777 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/SearchView.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/SearchView.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/SequenceDiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/SequenceDiagram.bmp
index 104d2da3fcb..104d2da3fcb 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/SequenceDiagram.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/SequenceDiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/StateDiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/StateDiagram.bmp
index 0005e29f839..0005e29f839 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/StateDiagram.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/StateDiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/UCdiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/UCdiagram.bmp
index 5a0ce561e9d..5a0ce561e9d 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/UCdiagram.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/UCdiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ValidationConstraints.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ValidationConstraints.bmp
index 1c69e697969..1c69e697969 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ValidationConstraints.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/ValidationConstraints.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/WelcomePage.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/WelcomePage.bmp
index 4d63a9ba7c0..4d63a9ba7c0 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/WelcomePage.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/WelcomePage.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Workbench.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/Workbench.bmp
index 8dbb1476af0..8dbb1476af0 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Workbench.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/Workbench.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/WorkspacePopup.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/WorkspacePopup.bmp
index 267fd10af3a..267fd10af3a 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/WorkspacePopup.bmp
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/images/WorkspacePopup.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.project
index 9b07ce3a166..6954c03addb 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
@@ -15,8 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index fe2780158d6..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//resource/stereotype-repair-toc.xml=utf-8
-encoding//resource/stereotype-repair.html=utf-8
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/META-INF/MANIFEST.MF
index 87902101332..9b2e0202764 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/META-INF/MANIFEST.MF
@@ -9,4 +9,4 @@ Bundle-Name: %pluginName
 Bundle-Description: %pluginDescription
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/build.properties
index 0b4f3c00f95..fa5ca4804a2 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/build.properties
@@ -15,5 +15,6 @@ bin.includes = META-INF/,\
                plugin.xml,\
                plugin.properties,\
                about.html,\
-               resource/
-src.includes = about.html
+               target/generated-eclipse-help/** 
+src.includes = about.html,\
+				resource/
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/plugin.xml
index 3539faf71c1..ad72e82f3ad 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/plugin.xml
@@ -18,11 +18,11 @@
    <extension
          point="org.eclipse.help.toc">
       <toc
-            file="resource/model-repair-main-toc.xml"
+            file="target/generated-eclipse-help/model-repair-main-toc.xml"
             primary="false">
       </toc>
       <toc
-            file="resource/stereotype-repair-toc.xml"
+            file="target/generated-eclipse-help/stereotype-repair-toc.xml"
             primary="false">
       </toc>
    </extension>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/pom.xml
index 85b4e8ca1b8..8149aa705a7 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/resource/model-repair-main-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/resource/model-repair-main-toc.xml
index 61aec4c6887..8f17d75d77a 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/resource/model-repair-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/resource/model-repair-main-toc.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <toc label="Repairing UML Models" link_to="../org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-main-toc.xml#profiles">
    <anchor id="model-repair-start"/>
-   <topic href="resource/stereotype-repair.html" label="Repairing Stereotype Applications">
-      <link toc="resource/stereotype-repair-toc.xml"/>
+   <topic href="target/generated-eclipse-help/stereotype-repair.html" label="Repairing Stereotype Applications">
+      <link toc="target/generated-eclipse-help/stereotype-repair-toc.xml"/>
       <anchor id="stereotype-repair"/>
    </topic>
    <anchor id="model-repair-end"/>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/resource/stereotype-repair-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/resource/stereotype-repair-toc.xml
deleted file mode 100644
index fb4bfd20530..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/resource/stereotype-repair-toc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc label="stereotype-repair" topic="resource/stereotype-repair">
-	<topic href="resource/stereotype-repair.html" label="About Stereotype Application Repair"></topic>
-	<topic href="resource/stereotype-repair.html#Invocation_of_Stereotype_Application_Repair" label="Invocation of Stereotype Application Repair">
-    <topic href="resource/stereotype-repair.html#Model_Validation" label="Model Validation">
-    </topic></topic>
-</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/resource/stereotype-repair.html b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/resource/stereotype-repair.html
deleted file mode 100644
index 41889482cfe..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/resource/stereotype-repair.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="About_Stereotype_Application_Repair">About Stereotype Application Repair</h1><p>The EMF-based implementation of UML profiles in Papyrus has consequences for the storage of stereotype applications
-in Papyrus model files.  Essentially, each profile applied to a model maps to an XML schema namespace which, upon
-loading a model, must be resolvable in the form of an EMF <tt>EPackage</tt> located either in a deployed plug-in or
-embedded in the UML profile, itself.  Because of the dynamic nature of profiles, which can be moved from one location
-to another or re-defined to produce new versions over time, there are a number of ways in which stereotype applications
-(being effectively instances of the stereotypes defined in the profile as though they were metaclasses) can drift out
-of sync with the profile definition:</p><ul><li>the profile defining the stereotype applications may no longer be applied to the model. Normally, unapplying a profile removes all applications of its stereotypes, but this may be undone by various means:  bad merges in a version control system, model units (resources) that were not available/loaded at the time, etc. </li><li>the profile may be applied but the model may have applied a different version of the profile than the version on which the stereotype applications in the model are based. Thus the stereotype applications are properly loaded (the XML schema describing them is resolved) but they may not function correctly in the Papyrus editor</li><li>the profile may have moved or been undeployed or is otherwise not known, resulting in the XML schema namespace in the model file being unresolved</li></ul><p>Also, stereotype applications may sometimes become disconnected from the UML elements that they extend (effectively
-"dangling stereotypes") even though the correct version of the profile is properly applied.  Reasons may be bad merges
-or bugs in the software, but the result is objects in the model resource that are no longer stereotype applications
-because they do not extend any model element.</p><p>The Stereotype Application Repair function can resolve or otherwise address all of these problems.</p><h1 id="Invocation_of_Stereotype_Application_Repair">Invocation of Stereotype Application Repair</h1><p>Papyrus scans all UML model resources when they are loaded to look for problems with stereotype applications.
-If any are found, the <b>Repair Stereotypes</b> dialog opens automatically to let the user fix them. </p><p><img border="0" src="images/repair_dialog.png"/> </p><p>For each discrete XML namespace in a resource that has a problem, the dialog presents:</p><ul><li>the resource in which the problem is found</li><li>the number of stereotype applications affected</li><li>the name of the profile that defines the affected stereotypes. If the profile cannot be found automatically, a name is inferred from the XML namespace name (this is indicated by the "unknown schema" annotation as shown in the figure above</li><li>the available actions for resolution of the problem</li></ul><p>The dialog may be cancelled at any time, in which case no further action will be taken until the next time the
-repair dialog is launched.  Any problems for which a repair action is selected  (being not the <i>Postpone</i> action; see below)
-may be repaired by pressing the <b>Apply</b> button.  The dialog will then remain open to continue with the
-remaining problems.  Or press <b>OK</b> to apply all selected actions (including <i>Postpone</i>) and close the dialog.</p><p>The complete set of actions available for fixing a group of stereotype applications is</p><ul><li><i>Migrate Profile</i>: if the profile defining the stereotype applications can be determined automatically, in the case where the problem is simply that a different version of the profile is applied to the model, this action migrates the stereotype applications to the currently applied profile definition.  Otherwise, the user is asked to find the profile (either in the workspace or registered by an installed plug-in) and that profile is applied to the model, implicitly migrating the stereotype applications to its current definition</li><li><i>Create Markers</i>: this action does not change the model or the stereotype applications in any way but simply creates a problem marker for each affected model element as a reminder that there is an unresolved problem in its applied stereotype</li><li><i>Delete Stereotypes</i>: this action deletes the affected stereotype applications. Use it when the profile simply no longer exists or is otherwise obsolete and no longer required by the model</li><li><i>Postpone</i>: this action simply does nothing. Fixing the problem is deferred to the next time that Papyrus scans the resource for problems in stereotype applications</li></ul><p>The dialog initially suggests the best available repair action for each group of broken stereotype applications.
-Usually this is the <i>Migrate Profile</i> action, which has the best chance of fixing the problem and not losing
-valuable information from the model.  However, in the case of dangling stereotypes (which have become disconnected
-from the UML elements that they extend), the <i>Migrate Profile</i> action is not available and <i>Delete Stereotypes</i>
-is suggested instead.  This is because these objects are not actually stereotype applications, being not extensions
-of any UML element, and so there is nothing to repair.  If it happens that the elements they were meant to extend
-still exist and they need to be reconnected, then Papyrus cannot determine two which elements they should be
-reconnected.  In that case, the user must simply take the <i>Postpone</i> option and fix up these objects' base
-element references by some other means.</p><h2 id="Model_Validation">Model Validation</h2><p>Papyrus contributes a model validation constraint, enabled by default, that scans the model's stereotypes for problems when the entire model
-is validated.  This uses the same repair analysis capability described above.  Problems reported by this constraint have a "quick fix"
-available in the <b>Model Validation</b> view and in the <b>Problems</b> view that launches the same dialog described above for resolution
-of stereotype application issues.</p><p>This is useful, for example, after completing a compare/merge operation, profile migration, or other complex operation that may have resulted
-in structural problems in the model (whether in stereotype applications or otherwise).</p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.project
index b0c2b835733..51c5c0048c9 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
@@ -15,8 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 148d2d22c24..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//resource/profile-assistants-toc.xml=utf-8
-encoding//resource/profile-assistants.html=utf-8
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/META-INF/MANIFEST.MF
index 330c6940b4d..c78c6fd382a 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@ Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.assistants.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/build.properties
index 0b4f3c00f95..fa5ca4804a2 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/build.properties
@@ -15,5 +15,6 @@ bin.includes = META-INF/,\
                plugin.xml,\
                plugin.properties,\
                about.html,\
-               resource/
-src.includes = about.html
+               target/generated-eclipse-help/** 
+src.includes = about.html,\
+				resource/
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/plugin.xml
index 2018ed66862..ddcfff958dc 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/plugin.xml
@@ -4,11 +4,11 @@
    <extension
          point="org.eclipse.help.toc">
       <toc
-            file="resource/profile-assistants-main-toc.xml"
+            file="target/generated-eclipse-help/profile-assistants-main-toc.xml"
             primary="false">
       </toc>
       <toc
-            file="resource/profile-assistants-toc.xml"
+            file="target/generated-eclipse-help/profile-assistants-toc.xml"
             primary="false">
       </toc>
    </extension>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/pom.xml
index f97756bff53..c55f70be75e 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants-main-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants-main-toc.xml
index edafa1a0868..194d95527b6 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants-main-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <toc label="Diagram Assistants for UML Profiles" link_to="../org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-main-toc.xml#profiles">
-   <topic href="resource/profile-assistants.html" label="Diagram Assistants for UML Profiles">
-      <link toc="resource/profile-assistants-toc.xml"/>
+   <topic href="target/generated-eclipse-help/profile-assistants.html" label="Diagram Assistants for UML Profiles">
+      <link toc="target/generated-eclipse-help/profile-assistants-toc.xml"/>
       <anchor id="profile-diagram-assistants"/>
    </topic>
 	
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants-toc.xml
deleted file mode 100644
index b00be201856..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants-toc.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc label="profile-assistants" topic="resource/profile-assistants.html">
-	<topic href="resource/profile-assistants.html" label="About Diagram Assistants for UML Profiles"></topic>
-	<topic href="resource/profile-assistants.html#Diagram_Assistant_Models" label="Diagram Assistant Models"></topic>
-	<topic href="resource/profile-assistants.html#Generating_Diagram_Assistants" label="Generating Diagram Assistants">
-    <topic href="resource/profile-assistants.html#Choosing_a_Base_Element_Types_Set" label="Choosing a Base Element Types Set">
-    </topic>
-    <topic href="resource/profile-assistants.html#Considerations_for_Designing_Assistants_Models" label="Considerations for Designing Assistants Models">
-    </topic></topic>
-    <topic href="resource/profile-assistants.html#Deploying_a_Diagram_Assistants_Model" label="Deploying a Diagram Assistants Model">
-    <topic href="resource/profile-assistants.html#Deploying_Models_in_the_Host_Workbench" label="Deploying Models in the Host Workbench">
-    </topic>
-    <topic href="resource/profile-assistants.html#Deploying_Models_in_Plug-ins" label="Deploying Models in Plug-ins">
-    </topic></topic>
-</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants.html b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants.html
deleted file mode 100644
index e5b0ba6b08b..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="About_Diagram_Assistants_for_UML_Profiles">About Diagram Assistants for UML Profiles</h1><p>Papyrus UML diagrams provide a feature called <i>Diagram Assistants</i> that offer context-sensitive tools directly in the diagram.  These are manifest in two forms:</p><ul><li>pop-up bar:  an orange rounded rectangle containing a variety of tools for creation of new model elements</li><li>connection handles:  a pair of arrows handles, one incoming and outgoing, appearing at the border of a shape from which new connections can be dragged to other shapes in the diagram</li></ul><p>The diagram assistants provided out-of-the-box by Papyrus support creation of the basic UML elements.  However, you can extend the capabilities of the diagram assistants to create elements from your profile-based DSL, by creating new UML elements having your stereotypes applied.</p><h1 id="Diagram_Assistant_Models">Diagram Assistant Models</h1><p>Papyrus uses EMF-based models to describe the diagram assistants that can be presented in UML diagrams.  The core UML assistants are described by these models, and so are the assistants for your DSLs.</p><p>Consider a trivial example of a profile for design of use cases in a J2EE-based system: </p><p><img border="0" src="images/usecase-stereotypes.png"/> </p><p>This profile has several stereotypes:</p><ul><li>«webScenario» extending UseCase</li><li>«branchPoint» extending ExtensionPoint</li><li>«user» and «browser» extending Actor</li><li>«web» extending Association</li></ul><p>Diagram assistants that might be provided for such a profile should offer to create «branchPoint» ExtensionPoints in «webScenario» use cases:</p><p><img border="0" src="images/popup-bar.png"/></p><p>and «web» Associations between «webScenario» UseCases and «user» or «browser» Actors, thus:</p><p><img border="0" src="images/connection-assistant.png"/></p><p>The model is described by a <b>ModelingAssistantProvider</b> in a <code>*.assistants</code> resource.  The ModelingAssistantProvider captures essentially the same information as is provided by implementations of the <code>org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider</code> interface, with the exception of "show related elements" queries.  In particular, it provides:</p><ul><li>a list of element types (by ID) for which the provider offers diagram assistants</li><li>a list of <b>PopupAssistant</b>s describing creation tools presented in the pop-up bar. Each of these specifies:<ul><li>the element type (by ID) of the model element that the tool creates</li><li>a <b>Filter</b> matching model elements on which the popup assistant should be shown</li></ul></li><li>a list of <b>ConnectionAssistant</b>s describing relationships (elements and references) that should be presented by the connection handles. Each of these specifies:<ul><li>the element type (by ID) of the model element or reference that the tool creates</li><li>a <b>Filter</b> matching source model elements on which the popup assistant should be shown</li><li>a <b>Filter</b> matching target model elements on which the popup assistant should be shown</li></ul></li></ul><p>The filters specified by the different kinds of assistants may be owned by the assistants that require them (private one-offs) or may be shared for re-use by any number of assistants.  The latter are commonly stored in the root <b>ModelingAssistantProvider</b> element, which just serves as a container.  Several different kinds of filter are provided by Papyrus:</p><ul><li><b>ElementTypeFilter</b>:  matches the element type of any <code>EObject</code> or <code>IAdaptable</code> (such as a diagram <code>EditPart</code>) by ID.  The match is a subtype match:  any object that matches the given element type or any specialization of that element type is accepted by the filter.  This is particularly useful with the visual-ID hinted types that distinguish different visualizations of UML elements in the different diagrams.</li><li><b>Equals</b>:  matches an element that is equal to (the same as) the element referenced by the filter</li><li><b>ProfileApplied</b>:  matches an element that is in the context of a UML Package that has a particular profile applied.  The profile may be specified by URI (preferred) or by qualified name (which is susceptible to shadowing by name conflicts)</li><li><b>AssistedElementTypeFilter</b>: a special filter that matches any object of an element type that is referenced as one of the element types for which the containing ModelAssistantProvider provides assistants</li><li><b>CompoundFilter</b>:  groups filters with boolean expressions.  Filters in an expression may be owned or referenced by the compound.  Supported operators are:<ul><li><b>and</b>: matches objects for which all filters matches. An empty compound matches no objects</li><li><b>or</b>:  matches objects for which at least one filter matches. An empty compound matches no objects</li><li><b>xor</b>: matches objects for which exactly one filter matches. An empty compound matches no objects</li><li><b>not</b>: matches objects for which none of the filters match (more than one filter may be referenced). An empty compound matches any object</li></ul></li></ul><p>Extenders can define custom filters by extending the filter model defined in the <code>org.eclipse.papyrus.infra.filters</code> plug-in.  The editor makes use of EMF's "child creation extenders" facility to integrate your custom filters with the core set.</p><p><img border="0" src="images/assistant-filter.png"/></p><p>The image above shows a detail of the filter generated by Papyrus for a «branchPoint» ExtensionPoint pop-up tool in the example J2EE profile in Use Case diagrams.  The filter is an <b>and</b> combination of</p><ul><li>the "pertains to Profile1" filter (which is based on a ProfileApplied filter referencing the J2EE profile)</li><li>an <b>or</b> combination of the various visualizations of UseCase supported by the diagram, including UseCases visualized as ellipse or as classifier shapes.  To restrict the pop-up assistant to only «webScenario» UseCases from this DSL, one would replace the generic UseCase element type filters with filters selecting the more specific <code>org.eclipse.papyrus.example.j2ee.WebScenario</code> element type that specializes UseCase for the stereotype extension</li></ul><h1 id="Generating_Diagram_Assistants">Generating Diagram Assistants</h1><p>Building a diagram assistant model by hand is a tedious undertaking.  To ease this process, Papyrus provides a wizard that generates an assistants model from a Profile selected in the <b>Model Explorer</b> view:</p><p><img border="0" src="images/generate-assistants-menu.png"/></p><p>Because the diagram assistants model specifies the element types that are created by the assistant tools, the wizard also generates the element types for your DSL as an <code>*.elementtypesconfigurations</code> model.  If you only need to generate this latter model, that option is also available in the menu.</p><p>The diagram assistants wizard dialog requires several pieces of information as inputs (as identified in the image below):</p><ol><li>An unique identifier for the assistants model. This is used as a prefix for element types that are generated for your DSL</li><li>The element types set model on which to base the element types generated for your DSL.  This has important consequences discussed below</li><li>Whether to suppress the reference to a semantic supertype distinct from the diagram-specific ("visual") element type in the list of specialized types for generated element types.  This option is only applicable when generating a diagram-specific diagram assistants model</li><li>The workspace folder or project in which to create the model</li><li>The name of the <code>*.assistants</code> model file to create.  The element types model will use the same name, except with the <code>*.elementtypesconfigurations</code> extension</li></ol><p><img border="0" src="images/generate-assistants-wizard.png"/></p><p>Upon completion of the wizard, element types and modeling assistants are generated as follows:</p><ul><li>for each metaclass extension of a stereotype in the profile, <b>SpecializationTypeConfiguration</b>s are generated that specialize each of the element types in the base element types set that are based on the same UML metaclass.  So, in our trivial J2EE profile example, the «branchPoint» stereotype generates two element types: one for each of the 3007 and 3008 visualizations of the ExtensionPoint metaclass in the Use Case diagram<ul><li>if your assistants model is based on a diagram-specific element types model, then the visualization-specific element types that are generated will specialize the visual UML element types of the diagram and also semantic element types representing the stereotyped element in the model (unless the option to suppress the semantic supertype was selected)</li><li>if your stereotypes include Image specifications that reference an icon by a <code>profile:/plugin/...</code> URI, then that is used to generate an equivalent <b>IconEntry</b> in the element type configuration</li></ul></li><li>for each profile-specific element type, a diagram assistant is generated, either<ul><li>a <b>ConnectionAssistant</b> if the element type is not a relationship or reference type, or</li><li>a <b>PopupAssistant</b> otherwise</li></ul></li><li>for each pop-up assistant, a filter is generated that is an <b>or</b> combination of <b>ElementTypeFilter</b>s for each of the element types in the base set that can contain an instance of the profile element type</li><li>for each connection assistant, filters are generated that are <b>or</b> combinations of <b>ElementTypeFilter</b>s for each of the element types in the base set that can be sources and targets, respectively, of the profile element type</li><li>a few common filters are generated for use by all of the assistants, including:<ul><li>an <b>AssistedElementTypeFilter</b> matching objects of an element type that is provided by the model as an assistant</li><li>a <b>ProfileApplied</b> filter that matches objects in the context of some package that has the source profile applied</li><li>a "pertains to <i>profile name</i>" filter that is an <b>or</b> combination of the previous two</li></ul></li><li>the generated <b>ModelingAssistantProvider</b> lists the element types generated in the accompanying <code>*.elementtypesconfigurations</code> model as the element types that it provides as assistants.  This restricts the sources and targets of connections from/to new elements to only element types specific to your profile.  You can edit this list as necessary to further restrict or widen the end types created by the connection assistants</li></ul><h2 id="Choosing_a_Base_Element_Types_Set">Choosing a Base Element Types Set</h2><p>As mentioned above, the decision of which element types set model to base the generated assistants on is crucial in determining the shape of the result.  There are essentially two choices to be made:</p><ul><li>generate assistants based on the core UML element types, describing the unprofiled UML metamodel without reference to any particular visualizations of elements in any diagram</li><li>generate assistants based on the visual-ID hinted element types of a specific UML diagram</li></ul><h3 id="Generating_Generic_UML-based_Assistants">Generating Generic UML-based Assistants</h3><p>To generate modeling assistants that will be applicable to any diagram in which the elements of your DSL can be visualized, choose the <b>uml</b> element types set from the <code>org.eclipse.papyrus.uml.service.types</code> plug-in.  This option has the advantage that if your profile has stereotypes extending metaclasses in several different diagrams, you will need only the one assistants model to cover all of those diagrams.</p><p>However, there are some drawbacks that you will have to account for.  The most important of these is that, as generated, the assistants model has to infer on-the-fly specializations of your profile element types for the various visual ID hinted types supported by the different specific diagrams.  This inference is automatic and can result in</p><ul><li>repetition of the same element type (for different visual IDs) on some selections</li><li>presentation of element types in contexts that actually are inappropriate (such as N-ary association branch in a use case diagram) if the diagram's view provider is not sufficiently specific about the visualizations that it supports</li></ul><p>These problems can usually be remedied by careful crafting of filters to restrict the applicability of each assistant.  It may be necessary in some cases to resort to custom filters.</p><h3 id="Generating_Diagram-specific_Assistants">Generating Diagram-specific Assistants</h3><p>To generate modeling assistants that are applicable only to a particular diagram in which the elements of your DSL can be visualized, choose that diagram's element types set from the list (the example screen shot above shows the Use Case Diagram selected).  This option has the advantage of giving the most accurate/appropriate assistants out of the box but it does require a separate model for each diagram that your DSL covers.</p><p>In this case, the element types generated for your assistants are specializations of the particular visual-ID hinted types supported by the diagram for the different visualizations, in that diagram context, of the base UML metaclass.  The most significant customization that you would do after generating the assistants model is to delete assistants that are not required.</p><p>By default, the wizard will also reference a second supertype in each generated specialization element type:  an element type representing the
-stereotyped element in the model, irrespective of any visualization in the diagram.  This is effectively referencing the element type that would be
-generated in the "Generic UML-based Assistants" case, asdescribed above.  At run-time, these "semantic element types" will be expected to be
-available, so it is necessary to generate them using the <b>Generate Tooling Model &rarr; Element Types...</b> action in the context menu and
-selecting the generic UML element types as the base model.  However, the reference to the semantic super-types may be ommitted, if desired, by
-checking the <b>Suppress semantic parent in diagram-specific element types</b> box in the wizard.</p><h2 id="Considerations_for_Designing_Assistants_Models">Considerations for Designing Assistants Models</h2><p>The most important considerations in designing assistant models are appropriateness of the element types suggested to the user and the number of element types suggested to the user.</p><p>As discussed above, the generation of the assistants model just provides a starting point that needs to be fine-tuned.  The generator outputs every combination that seems to be valid; these need to be culled in practice.  Some assistants are not valid in every context where they may be shown (which requires customization of their filters) whereas many assistants just may not be necessary because they are element types that are rarely used, or only in advanced use cases.</p><p>Of particular concern is the scaling of the diagram assistants user interface:  it is important not to overwhelm users with too many options.  There is a practical limit to how large the pop-up bar can be before its usability degrades; likewise the menus that are popped up for completion of connections.  When designing the assistants model for your profile, keep in mind that the diagram assistants will include proposals from five sources:</p><ul><li>the base UML assistants models deployed by Papyrus for each of the diagrams</li><li>the assistant models deployed by Papyrus for first-party profiles such as SysML and UML-RT</li><li>assistant models deployed from the workspace or in third-party plug-ins for other profiles</li><li>the assistant model that you are designing for your profile</li><li>the pop-up bar shows hyperlinks created by the user, in addition to the green "plus" button for creation of new hyperlinks</li></ul><p>The number of assistants presented on any given selection in a diagram can add up rather quickly.  Precise filtering of assistants is critical and restricting the overall number of assistants that are defined to only the most commonly used elements is highly recommended.</p><h1 id="Deploying_a_Diagram_Assistants_Model">Deploying a Diagram Assistants Model</h1><p>There are two ways to deploy diagram assistants. The assistants in a <code>*.assistants</code> resource can be hot-deployed directly from the workspace or they may be statically deployed in a plug-in installed in the Papyrus workbench.</p><h2 id="Deploying_Models_in_the_Host_Workbench">Deploying Models in the Host Workbench</h2><p>The simplest method, which is best for testing during development of the assistants model, is to deploy the assistants model in your workspace directly into the running Papyrus workbench.  In the <b>Project Explorer</b>, select your assistants model and choose the <b>Deploy Modeling Assistants</b> action in the context menu:</p><p><img border="0" src="images/deploy.png"/></p><p>Note that you may first need to deploy the element types configuration model if you have not already done so.</p><p>From this point, the assistants described in your model are active in the system.  Whenever you save changes, the model is "hot re-deployed" to update the diagrams in real time.  Papyrus remembers which assistant models in the workspace are deployed so that you don't have to deploy them again the next time you open that workspace.</p><p>To remove the assistants in a model from the Papyrus run-time, just select the <b>Deactivate Modeling Assistants</b> action in the context menu:</p><p><img border="0" src="images/undeploy.png"/></p><h2 id="Deploying_Models_in_Plug-ins">Deploying Models in Plug-ins</h2><p>When your assistants model is ready to ship, together with your profile and other DSL tooling, you should deploy it statically in the plug-in that installs your profile into your users' Papyrus workbenches.  Simply bundle the <code>*.assistants</code> resource in your plug-in and register it on the <code>org.eclipse.papyrus.infra.gmfdiag.assistants.modelProviders</code> extension point just as Papyrus, itself, does for the core UML diagram assistants:</p><p><img border="0" src="images/providers-extpt.png"/></p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.project
index b8000ad7c51..01dd3d2eb5c 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
@@ -15,8 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index cf739aaa384..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1

-encoding//resource/search-toc.xml=utf-8

-encoding//resource/search.html=utf-8

diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF
index f50fc8fb856..9ca66121471 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@ Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.search.ui.doc;singleton:=

  true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 

diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/build.properties
index 51024c6f314..073e47dfbc3 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/build.properties
@@ -3,5 +3,6 @@ bin.includes = META-INF/,\
                plugin.xml,\

                plugin.properties,\

                about.html,\

-               resource/

-src.includes = about.html
+               target/generated-eclipse-help/** 

+src.includes = about.html,\

+				resource/
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/plugin.xml
index 08907a88250..baf1deb2d2f 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/plugin.xml
@@ -4,11 +4,11 @@
    <extension

          point="org.eclipse.help.toc">

       <toc

-            file="resource/search-main-toc.xml"

+            file="target/generated-eclipse-help/search-main-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="resource/search-toc.xml"

+            file="target/generated-eclipse-help/search-toc.xml"

             primary="false">

       </toc>

    </extension>

diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/pom.xml
index b0ddf3c7987..a855dedce90 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/C-result.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/C-result.png
index 6b5e8b1d262..6b5e8b1d262 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/C-result.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/C-result.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/C-search.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/C-search.png
index bd99157a3c7..bd99157a3c7 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/C-search.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/C-search.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/OCL.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/OCL.png
index 8aa959e3ea7..8aa959e3ea7 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/OCL.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/OCL.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/a-results.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/a-results.png
index 9669ff43c22..9669ff43c22 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/a-results.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/a-results.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/a-search.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/a-search.png
index 3e3b7542f8e..3e3b7542f8e 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/a-search.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/a-search.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/advanced_search.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/advanced_search.png
index 5d8932cfe9a..5d8932cfe9a 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/advanced_search.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/advanced_search.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/body_result.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/body_result.png
index 38b096c9671..38b096c9671 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/body_result.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/body_result.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/body_search.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/body_search.png
index 7a88be13b15..7a88be13b15 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/body_search.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/body_search.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/comment-result.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/comment-result.png
index 0039b81f4fb..0039b81f4fb 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/comment-result.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/comment-result.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/comment-search.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/comment-search.png
index fa6b2ef026d..fa6b2ef026d 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/comment-search.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/comment-search.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/filter.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/filter.png
index 87c456b6b46..87c456b6b46 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/filter.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/filter.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/my-filtered.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/my-filtered.png
index 50a22cd3d3c..50a22cd3d3c 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/my-filtered.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/my-filtered.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/my-search.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/my-search.png
index b3cc3c8a2d0..b3cc3c8a2d0 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/my-search.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/my-search.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/papyrus-search.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/papyrus-search.png
index f5cdc6f98af..f5cdc6f98af 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/papyrus-search.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/papyrus-search.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/query_kind.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/query_kind.png
index 2ec1ff8e877..2ec1ff8e877 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/query_kind.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/query_kind.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/replace.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/replace.png
index 32e0df131ea..32e0df131ea 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/replace.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/replace.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/requirement_result.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/requirement_result.png
index 93156cf8603..93156cf8603 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/requirement_result.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/requirement_result.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/requirement_search.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/requirement_search.png
index c7fa4152bc1..c7fa4152bc1 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/requirement_search.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/requirement_search.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-model1.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/search-model1.png
index 6c540f51972..6c540f51972 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-model1.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/search-model1.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search_kind.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/search_kind.png
index ebb7fb584bc..ebb7fb584bc 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search_kind.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/search_kind.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/select-filters.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/select-filters.png
index f0f5f668f2c..f0f5f668f2c 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/select-filters.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/select-filters.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/simple_search.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/simple_search.png
index 8ab34b99fdd..8ab34b99fdd 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/simple_search.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/images/simple_search.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-main-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-main-toc.xml
index 14ecc4b1eb5..ba4f15b99a1 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-main-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>

 <toc label="Search" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

-   <topic href="resource/search.html" label="Search in Models">

-      <link toc="resource/search-toc.xml"/>

+   <topic href="target/generated-eclipse-help/search.html" label="Search in Models">

+      <link toc="target/generated-eclipse-help/search-toc.xml"/>

       <anchor id="SearchID"/>

    </topic>

 	

diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-toc.xml
deleted file mode 100644
index 200de63be1a..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-toc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc label="search" topic="resource/search.html">
-	<topic href="resource/search.html" label="Search elements"></topic>
-	<topic href="resource/search.html#Replace_String" label="Replace String"></topic>
-	<topic href="resource/search.html#Filter" label="Filter"></topic>
-</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.html b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.html
deleted file mode 100644
index 978df0a3cd5..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><p>In this documentation, we will use this UML model to illustrate the search features. </p><p><img border="0" src="search-model1.png"/></p><h1 id="Search_elements">Search elements</h1><p>The search feature of Papyrus helps the user to find elements in the models. The user can choose between a text search and an OCL search.</p><p>As it is shown in the following image the user chooses the query kind he wants to use: </p><p><img border="0" src="query_kind.png"/> </p><h1 id="Text_search">Text search</h1><p>The user can do a simple search or an advanced search.
-The user makes his choice in the A area of the following image which represents the text search dialog.</p><p><img border="0" src="search_kind.png"/> </p><h2 id="Simple_search">Simple search</h2><p>The following image illustrates a simple text search dialog:</p><p><img border="0" src="simple_search.png"/> </p><ul><li>The user can specify the string pattern he/she is looking for in the A area. <ul><li>Check the "Case sensitive" if case must be considered. </li><li>The user may also want to use regular expression to express the query. Then check "Regular expression" button. The regular expression must respect Java Regex.</li></ul></li><li>The user chooses whether he wants to search only in the name attribute of instances of UML::NamedElement or in all string attributes of instances of UML metaClasses, in B area.</li></ul><p>For instance, the following search: </p><p><img border="0" src="C-search.png"/></p><p>will provide the following results: </p><p><img border="0" src="C-result.png"/></p><p>The comment is not returned because we were note looking for all string attributes. </p><p>However, this search:</p><p><img border="0" src="comment-search.png"/></p><p>will return : </p><p><img border="0" src="comment-result.png"/></p><h2 id="Advanced_search">Advanced search</h2><p>The following image shows the advanced text search dialog.</p><p><img border="0" src="advanced_search.png"/></p><ul><li>As in the simple search the user can specify the string pattern he/she is looking for, and may indicate if he uses regular expression or if he wants to consider case, in the A area. </li><li>The user can filter the types of elements to search the string pattern in by selecting the UML metaClasses or applied stereotypes in area B . He can also choose in which attributes he wants to do the research. The stereotypes displayed in the B area are the stereotypes which can be applied on elements from the model(s) corresponding to the selected scope, for example if the selected scope is "Selected resources" only the stereotypes defined in the profiles applied on the current model will be displayed, but if the selected scope is "Workspace" the stereotypes defined in all the profiles applied on models from the current workspace will be displayed.</li><li>In the C area, the user can select all subelements of the actual selected element. For example, if the user selects "NamedElement" and clicks on "Select subelements",all metaClasses which inherit of UML::NamedElement will be checked. If the name attribute of "NamedElement" is checked and the user selects "NamedElement" and then clicks on "Select subelements",all instances of UML::NamedElement and their name attribute will be checked.    If the user changes the selected scope he should click on the refresh types button, this will update the list of stereotypes displayed.</li><li>The user can specify, in the D area, if he wants to search for model elements with all the specified stereotype (the ones checked in the B area).</li></ul><p>In the following image we search the pattern "my"  in the attribute body of the metaClass "Comment". The research will give us all the instances of "Comment" having an attribute body matching with the string pattern. </p><p><img border="0" src="body_search.png"/></p><p>The result will be</p><p><img border="0" src="body_result.png"/></p><p>If the user select a stereotype or an UML metaClass without indicating a string pattern, the research will give him all the instances of the metaClasses he checked and all the elements having the applied stereotypes he checked.</p><p>For example the result of this research:</p><pre><img border="0" src="requirement_search.png"/>
-</pre><p>will be</p><pre><img border="0" src="requirement_result.png"/>
-</pre><h1 id="OCL_search">OCL search</h1><p>The following image shows an OCL search dialog</p><p><img border="0" src="OCL.png"/></p><p>The user writes his OCL query in the A area.
-The scope must be "Selected resources" if the user wants to do this kind of query.</p><h1 id="Replace_String">Replace String</h1><p>Should the user want to replace the matches of your search with another string, he/she may click on the "Replace" button in the search dialog. A new dialog will popup:</p><p><img border="0" src="replace.png"/></p><p>More details about the refactoring tool in the Model Refactor Wizard page.</p><h1 id="Filter">Filter</h1><p>The user can filter the results of the search by selecting the types of the elements he/she wants to show.</p><p>For instance, on the following search (we use the model 1): </p><p><img border="0" src="a-search.png"/></p><p>the user may filter the results by clicking on the icon identified in a red rectangle in the following picture: </p><p><img border="0" src="a-results.png"/></p><p>this will open a new dialog where the user can select the metaclasses he/she want to show: </p><p><img border="0" src="filter.png"/></p><p>then, the result page will show only the matches of the selected type: </p><p><img border="0" src="my-filtered.png"/></p><p>If the user wants to remove this filtering, he/she may click on the Filters button as illustrated in previous picture. This will open the following dialog: </p><p><img border="0" src="select-filters.png"/></p><p><hr/>
-This work is developed by <a href="http://www-list.cea.fr">CEA LIST</a> and sponsored by <a href="http://www.ericsson.com">Ericsson</a> in the context of Polarsys <a href="http://wiki.eclipse.org/Polarsys">http://wiki.eclipse.org/Polarsys</a></p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.mediawiki b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.mediawiki
index 444807ed899..a3cbd8bdafa 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.mediawiki
@@ -1,25 +1,25 @@
 In this documentation, we will use this UML model to illustrate the search features. 

 

-[[image:search-model1.png]]

+[[Image:images/search-model1.png]]

 

 =Search elements=

 The search feature of Papyrus helps the user to find elements in the models. The user can choose between a text search and an OCL search.

 

 As it is shown in the following image the user chooses the query kind he wants to use: 

 

-[[image:query_kind.png]] 

+[[Image:images/query_kind.png]] 

 

 =Text search=

 

 The user can do a simple search or an advanced search.

 The user makes his choice in the A area of the following image which represents the text search dialog.

 

-[[image:search_kind.png]] 

+[[Image:images/search_kind.png]] 

 

 ==Simple search==

 The following image illustrates a simple text search dialog:

 

-[[image:simple_search.png]] 

+[[Image:images/simple_search.png]] 

 

 * The user can specify the string pattern he/she is looking for in the A area. 

 ** Check the "Case sensitive" if case must be considered. 

@@ -28,26 +28,26 @@ The following image illustrates a simple text search dialog:
 

 For instance, the following search: 

 

-[[image:C-search.png]]

+[[Image:images/C-search.png]]

 

 will provide the following results: 

 

-[[image:C-result.png]]

+[[Image:images/C-result.png]]

 

 The comment is not returned because we were note looking for all string attributes. 

 

 However, this search:

 

-[[image:comment-search.png]]

+[[Image:images/comment-search.png]]

 

 will return : 

 

-[[image:comment-result.png]]

+[[Image:images/comment-result.png]]

 

 ==Advanced search==

 The following image shows the advanced text search dialog.

 

-[[image:advanced_search.png]]

+[[Image:images/advanced_search.png]]

 

 * As in the simple search the user can specify the string pattern he/she is looking for, and may indicate if he uses regular expression or if he wants to consider case, in the A area. 

 * The user can filter the types of elements to search the string pattern in by selecting the UML metaClasses or applied stereotypes in area B . He can also choose in which attributes he wants to do the research. The stereotypes displayed in the B area are the stereotypes which can be applied on elements from the model(s) corresponding to the selected scope, for example if the selected scope is "Selected resources" only the stereotypes defined in the profiles applied on the current model will be displayed, but if the selected scope is "Workspace" the stereotypes defined in all the profiles applied on models from the current workspace will be displayed.

@@ -58,28 +58,28 @@ The following image shows the advanced text search dialog.
 

 In the following image we search the pattern "my"  in the attribute body of the metaClass "Comment". The research will give us all the instances of "Comment" having an attribute body matching with the string pattern. 

 

-[[Image:body_search.png]]

+[[Image:images/body_search.png]]

 

 The result will be

 

-[[Image:body_result.png]]

+[[Image:images/body_result.png]]

 

 

 If the user select a stereotype or an UML metaClass without indicating a string pattern, the research will give him all the instances of the metaClasses he checked and all the elements having the applied stereotypes he checked.

 

 For example the result of this research:

 

- [[Image:requirement_search.png]]

+ [[Image:images/requirement_search.png]]

  

 will be

  

- [[Image:requirement_result.png]]

+ [[Image:images/requirement_result.png]]

  

 =OCL search=

     

 The following image shows an OCL search dialog

 

-[[Image:OCL.png]]

+[[Image:images/OCL.png]]

 

 The user writes his OCL query in the A area.

 The scope must be "Selected resources" if the user wants to do this kind of query.

@@ -88,7 +88,7 @@ The scope must be "Selected resources" if the user wants to do this kind of quer
 =Replace String=

 Should the user want to replace the matches of your search with another string, he/she may click on the "Replace" button in the search dialog. A new dialog will popup:

 

-[[Image:replace.png]]

+[[Image:images/replace.png]]

 

 More details about the refactoring tool in the Model Refactor Wizard page.

 

@@ -97,23 +97,23 @@ The user can filter the results of the search by selecting the types of the elem
 

 For instance, on the following search (we use the model 1): 

 

-[[image:a-search.png]]

+[[Image:images/a-search.png]]

 

 the user may filter the results by clicking on the icon identified in a red rectangle in the following picture: 

 

-[[image:a-results.png]]

+[[Image:images/a-results.png]]

 

 this will open a new dialog where the user can select the metaclasses he/she want to show: 

 

-[[image:filter.png]]

+[[Image:images/filter.png]]

 

 then, the result page will show only the matches of the selected type: 

 

-[[image:my-filtered.png]]

+[[Image:images/my-filtered.png]]

 

 If the user wants to remove this filtering, he/she may click on the Filters button as illustrated in previous picture. This will open the following dialog: 

 

-[[image:select-filters.png]]

+[[Image:images/select-filters.png]]

 

 ----

 This work is developed by [http://www-list.cea.fr CEA LIST] and sponsored by [http://www.ericsson.com Ericsson] in the context of Polarsys [http://wiki.eclipse.org/Polarsys]

diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/.project b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.project
index 2c7104fb1bd..655f09640a0 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.project
@@ -6,6 +6,11 @@
 	</projects>

 	<buildSpec>

 		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

 			<arguments>

 			</arguments>

@@ -15,8 +20,15 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

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

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

 	</natures>

 </projectDescription>

diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index bd2764b6735..00000000000
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1

-encoding//resource/properties-view-toc.xml=utf-8

-encoding//resource/properties-view.html=utf-8

diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF
index 7002aa9138d..f59f3bb5377 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Bundle-Name: Properties view Documentation
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.views.properties.doc;singleto

  n:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 

diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/build.properties b/plugins/doc/org.eclipse.papyrus.views.properties.doc/build.properties
index 43e3cf466aa..064e816b187 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/build.properties
@@ -1,6 +1,6 @@
 bin.includes = META-INF/,\

                about.html,\

                plugin.xml,\

-               resource/,\

-               resource/properties-view-main-toc.xml

-src.includes = about.html

+               target/generated-eclipse-help/** 

+src.includes = about.html,\

+				resource/

diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.views.properties.doc/plugin.xml
index 2da83e6a412..3559a4b0d41 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/plugin.xml
@@ -4,11 +4,11 @@
    <extension

          point="org.eclipse.help.toc">

       <toc

-            file="resource/properties-view-main-toc.xml"

+            file="target/generated-eclipse-help/properties-view-main-toc.xml"

             primary="false">

       </toc>

       <toc

-            file="resource/properties-view-toc.xml"

+            file="target/generated-eclipse-help/properties-view-toc.xml"

             primary="false">

       </toc>

    </extension>

diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.views.properties.doc/pom.xml
index aacd4505ae3..da9b0400e6e 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/pom.xml
@@ -11,4 +11,38 @@
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.mylyn.docs</groupId>
+				<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+				<configuration>
+					<sourceFolder>resource</sourceFolder>
+					<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
+					<!-- copyrightNotice>${help.copyrightNotice}</copyrightNotice> <title>${help.documentTitle}</title -->
+					<multipleOutputFiles>false</multipleOutputFiles>
+					<navigationImages>true</navigationImages>
+					<formatOutput>true</formatOutput>
+					<htmlFilenameFormat>$1.html</htmlFilenameFormat>
+					<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
+					<helpPrefix>target/generated-eclipse-help</helpPrefix>
+					<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-help</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.mylyn.docs</groupId>
+						<artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+						<version>${mylyn.wikitext.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig1.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig1.png
index 3d2d1cc8400..3d2d1cc8400 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig1.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig1.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig10.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig10.png
index 821f836738c..821f836738c 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig10.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig10.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig11.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig11.png
index 2d4b2083184..2d4b2083184 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig11.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig11.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig12.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig12.png
index f204a909cd7..f204a909cd7 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig12.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig12.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig13.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig13.png
index b6ae9861817..b6ae9861817 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig13.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig13.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig14.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig14.png
index 81746438e79..81746438e79 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig14.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig14.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig2.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig2.png
index b5712ef6266..b5712ef6266 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig2.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig2.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig3.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig3.png
index 8f7403353cd..8f7403353cd 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig3.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig3.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig4.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig4.png
index 52c37965379..52c37965379 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig4.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig4.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig5.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig5.png
index ebff4ac7ee5..ebff4ac7ee5 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig5.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig5.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig6.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig6.png
index 806380aced8..806380aced8 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig6.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig6.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig7.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig7.png
index b0968464086..b0968464086 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig7.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig7.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig8.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig8.png
index f76736bca29..f76736bca29 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig8.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig8.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig9.png b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig9.png
index cc2a2e442a0..cc2a2e442a0 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/fig9.png
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/images/fig9.png
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view-main-toc.xml b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view-main-toc.xml
index 8c3854bcdd3..f026f340756 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view-main-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>

 <toc label="Search" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

-   <topic href="resource/properties-view.html" label="Properties view customization">

-      <link toc="resource/properties-view-toc.xml"/>

+   <topic href="target/generated-eclipse-help/properties-view.html" label="Properties view customization">

+      <link toc="target/generated-eclipse-help/properties-view-toc.xml"/>

       <anchor id="properties-view"/>

    </topic>	

 </toc>

diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view-toc.xml b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view-toc.xml
deleted file mode 100644
index be8502d6810..00000000000
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view-toc.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/properties-view.html" label="properties-view">
-	<topic href="resource/properties-view.html" label="INTRODUCTION"></topic>
-	<topic href="resource/properties-view.html#THE_CUSTOMIZATION_TOOL" label="THE CUSTOMIZATION TOOL">
-		<topic href="resource/properties-view.html#Edit_a_configuration" label="Edit a configuration"></topic>
-		<topic href="resource/properties-view.html#The_property_view_elements" label="The property view elements">
-			<topic href="resource/properties-view.html#Preview" label="Preview"></topic>
-			<topic href="resource/properties-view.html#Property_view" label="Property view"></topic>
-		</topic>
-		<topic href="resource/properties-view.html#Priorities_between_views" label="Priorities between views"></topic>
-		<topic href="resource/properties-view.html#Preferences" label="Preferences"></topic>
-	</topic>
-	<topic href="resource/properties-view.html#ADVANCED_CUSTOMIZATION" label="ADVANCED CUSTOMIZATION">
-		<topic href="resource/properties-view.html#The_Environment_model" label="The Environment model"></topic>
-		<topic href="resource/properties-view.html#Create_a_new_widget" label="Create a new widget"></topic>
-		<topic href="resource/properties-view.html#Constraints" label="Constraints"></topic>
-		<topic href="resource/properties-view.html#ModelElement" label="ModelElement"></topic>
-		<topic href="resource/properties-view.html#ModelElement_Factory" label="ModelElement Factory"></topic>
-		<topic href="resource/properties-view.html#Content_Providers_and_Widgets" label="Content Providers and Widgets"></topic>
-		<topic href="resource/properties-view.html#Dynamic_sections" label="Dynamic sections"></topic>
-		<topic href="resource/properties-view.html#Property_view_Header" label="Property view Header"></topic>
-		<topic href="resource/properties-view.html#Binding_and_Validation" label="Binding and Validation"></topic>
-		<topic href="resource/properties-view.html#Field_coloration" label="Field coloration"></topic>
-	</topic>
-	<topic href="resource/properties-view.html#GENERATION_TOOL" label="GENERATION TOOL"></topic>
-	<topic href="resource/properties-view.html#DEPLOYING_A_PROPERTY_VIEW" label="DEPLOYING A PROPERTY VIEW"></topic>
-</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view.html b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view.html
deleted file mode 100644
index 5749a8205f3..00000000000
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h2 id="INTRODUCTION">INTRODUCTION</h2><p>In UML, the main information is represented in graphical diagrams. However, it is not always possible to represent graphically the whole semantic of UML, not talking of all the cosmetic properties. For example, it is pretty easy to represent and to edit a Class’ name graphically. While we still can represent the “is abstract” property graphically (By using the italic font for the Class’ name), it is harder to edit this property directly from the diagram. Worse, the “is leaf” property doesn’t even have a graphical representation. Thus, we often need a different view for representing all the properties of a UML Element, without polluting the graphical view.</p><p>As UML is highly extensible, through the mean of Profiles, it is also important to be able to represent and edit the profile’s properties, without managing everything from the diagram view.</p><p>Eclipse provides a standard view for these properties: the Properties Page. This view is a table representing all the properties available for the selected Element, including the ones that cannot be represented or edited graphically. This view is pretty useful, but is neither really user-friendly nor optimal, as it may require up to four clicks to simply edit a comment’s body. Moreover, it can only be extended via Java code, which requires some technical skills and prevents a dynamic modification of the view, as the Java code needs to be recompiled after each modification.</p><p>There is an extension of the base Property View framework, still in the standard Eclipse implementation, which fixes some of these problems. It is called the “Eclipse Tabbed Properties View” framework. It provides a better look and feel for the property view, with more flexibility, and a better usability. However, it keeps being difficult to customize, as it still hard-coded in Java.</p><p>Papyrus provides its own Property View framework, based on the Tabbed Property View framework. The Papyrus Property View can be extended in two ways:</p><ul><li>Dynamically, for the layout of the property view: show/hide a property, reorder the properties, add/remove a tab…</li><li>Statically, through Java code, for advanced operations: create a new widget for editing the properties, add a custom Content Provider for selecting a reference value…</li></ul><p>This document aims at detailing all the features related to the property view customization, both dynamically and statically.</p><h2 id="THE_CUSTOMIZATION_TOOL">THE CUSTOMIZATION TOOL</h2><p>Most customizations can be done through the Property view customization Editor. It provides native support for EMF Models, UML models and profiles. It also provides a set of basic widgets and property editors.</p><h3 id="Edit_a_configuration">Edit a configuration</h3><p>Each property view configuration is defined in a different set of files. Each configuration can contain elements from different contexts, but we typically have one configuration per Ecore Metamodel or UML Profile (i.e. one configuration for UML, one for the Diagram Appearance tab, another one for the SysML profile…)</p><p>To see the list of available configurations, open the properties view (Window -&gt; Show View -&gt; Other… -&gt; General/Properties). Click on the white arrow in the upper right corner of the Properties view, and select “Customize property view”. You should see a dialog with the list of all available configurations.</p><p><img title="Open the property view customization menu" alt="Open the property view customization menu" border="0" src="fig1.png"/></p><p>As the standard configurations are read-only, you cannot edit them directly. You will first need to make a copy of the configuration. You will then be able to edit the copy.</p><p><img title="Copy an existing configuration to edit it" alt="Copy an existing configuration to edit it" border="0" src="fig2.png"/></p><p>The Property View Editor has three panes:</p><ul><li>The Editor part</li><li>The Preview part</li><li>The Properties part</li></ul><p>The Editor presents the elements defined by this configuration. The Preview displays an overview of the selected View, as it will be displayed in the property view at runtime. The properties view displays the properties of the selected element</p><p><img title="The property view Editor" alt="The property view Editor" border="0" src="fig3.png"/></p><h3 id="The_property_view_elements">The property view elements</h3><p>The editor contains a Tree, containing the following elements :</p><ul><li>Context: it is a property view configuration. You will typically have one property view Context per Ecore Metamodel or UML Profile, but you can choose the granularity you want. A context has a list of tabs, and a list of views.</li><li>Tab: describes a tab in the property view. A tab has a label, an (optional) image, and can be indented. It also has a priority.</li><li>View: describes a property view associated to a selection. The view has a name, a constraint, a multiplicity and a list of sections. The constraint is used to determine for what kind of object the view should be displayed.</li><li>Constraint: a query that inputs a selection, and outputs a boolean (true if the constraint matches the input object, false otherwise). It is possible to implement your own constraint type (In Java).</li><li>Section: a section is a sub-part of a view. A view generally needs only one section, but there are cases where you need more than one section. A section is associated to a single tab, so, if you want to display more than one tab in a single view (For example, « UML » and « Profile » in the UML property view), you will need at least two sections in that view (One for each tab). Another (advanced) case is described in « Dynamic sections ». A section has a name, a tab, and a Composite.</li><li>Composite: this is the actual presentation element. The composite is a widget which can contain other widgets. A composite has a type, and a list of widgets.</li><li>Layout: all composites need a layout. The default is « PropertiesLayout », which is a variant of the SWT standard GridLayout. A PropertiesLayout has a number of columns. The default is one column.</li><li>Property Editor: a property editor is a widget which is used to edit a single property of the selected object. You will typically have one Property editor for each property that you want to edit in the property view. The property editor has a property, and a widget to edit that property.</li><li>Standard Widget: a widget from the standard SWT Library. Few of them are currently available, because they are rarely needed.</li></ul><p>The Tree allows reordering or removing easily the elements (Through drag &amp; drop, delete). The editor also supports the Undo/Redo commands.</p><h4 id="Preview">Preview</h4><p>The preview displays a real-time overview of the selected View. However, some widgets can only be computed at runtime, which prevents a pertinent preview. This is the case of the “Enum Radio” widget, for example, as the enumerated values are only known at runtime.</p><h4 id="Property_view">Property view</h4><p>The property view is used to edit the properties of the element selected in the tree. The property view uses the Papyrus Property View framework, thus can be customized just the same way you would customize any other property view.</p><p><img title=" the three panes of the Property view editor" alt=" the three panes of the Property view editor" border="0" src="fig4.png"/></p><h3 id="Priorities_between_views">Priorities between views</h3><p>When more than one view match a selection, a priority mechanism will determine which one(s) should be displayed. The priorities are defined at the level of the view’s constraints, i.e. if the constraint for a View A overrides a constraint for the View B, the View B won’t be displayed. For example, a UML Class from a Class Diagram will match many views (The list is not exhaustive):</p><ul><li>SingleClass (From UML)</li><li>MultipleClass (As the -1 multiplicity actually means “any number of elements”)</li><li>SingleElement (And MultipleElement)</li><li>SingleClassifier (And MultipleClassifier)</li><li>*Style (From GMF Notation model)</li><li>StereotypeDisplay (From UML Notation model)</li></ul><p>The priorities are computed in two ways:</p><ul><li>Automatic, according to the Java constraints implementations</li><li>Statically, according to the property view configuration</li></ul><p>When the “isOverrideable” property is set to false for a Constraint (In the property view model), only the static rules will be taken into account.</p><p><img title="The constraint cannot be dynamically overridden" alt="The constraint cannot be dynamically overridden" border="0" src="fig5.png"/></p><p>The automatic rules are the following:</p><ul><li>A constraint with a multiplicity of 1 always overrides the same constraint with a multiplicity of -1 (Or &gt;1). Thus, “MultipleClass” won’t be displayed, because “SingleClass” also matches our selection.</li><li>An EMF (Or UML) “Instance of” constraint always overrides a constraint matching a supertype. Thus, “SingleClassifier” won’t be displayed, because a Class is more specific than a Classifier. However, “SingleElement” *will be* displayed, because it is not overrideable (isOverrideable=false).</li><li>A stereotype constraint (HasStereotype) will *not* override its UML “Instance of” constraint. However, a specific implementation of this constraint has been provided for Scade, which *will* override the UML metaclass (i.e., a Block will override a Class’ property view, hiding the UML tab).</li><li>For CompositeConstraints: if a composite constraint is a superset of another constraint, it will override it (It is more specific). For example, a Composite Constraint “isA and isB” will override a constraint “isB”, but will not override a constraint “isB and isC”.</li></ul><p>Please note that each constraint has its own implementation of the overrides() method. See the advanced chapter for more information</p><p>The static rule is simple: when a Constraint explicitly overrides another constraint, it will always override it. This is especially useful when you’ve marked a constraint as “overrideable=false”, but still want to override it in a specific case (Remember that overrideable=false only applies to *automatic* constraint resolution).</p><p><img title="Force this constraint to override another constraint" alt="Force this constraint to override another constraint" border="0" src="fig6.png"/></p><p>Finally, in the previous example, the following views will be displayed:</p><ul><li>SingleClass (Overrides MultipleClass, Single/MultipleClassifier ; UML Tab)</li><li>SingleElement (overrideable=false ; Profile tab)</li><li>FillStyle, FontStyle, LineStyle (Appearance tab)</li><li>StereotypeDisplay (overrideable=false ; Appearance tab)</li></ul><h3 id="Preferences">Preferences</h3><p>When you make a copy of a property view, it is not automatically activated. Thus, the modifications brought to the copy are not immediately visible on your property view. To activate a property view, you need to open the Papyrus preferences, from Window &gt; Preferences.</p><p><img title="Preferences" alt="Preferences" border="0" src="fig7.png"/></p><p>When making a copy of an existing configuration, you should uncheck the default one, and check the new one.</p><h2 id="ADVANCED_CUSTOMIZATION">ADVANCED CUSTOMIZATION</h2><p>The customization tool only allows basic operations, such as adding, removing or reordering properties.</p><p>The property view framework is much more powerful, but this requires some Java development. This chapter will focus on the advanced customization of the property view.</p><h3 id="The_Environment_model">The Environment model</h3><p>To associate Java implementations with the property view model, you need to declare an Environment model. You can create a new Environment model with the “Environment Model” wizard in “Example EMF Model Creation Wizards” category. Select “Environment” as the Model Object.</p><p>Once you’ve added your Java class declarations, you should register the environment model so that the property view knows about it. Add an extension to org.eclipse.papyrus.properties.environment, and select your model file.</p><h3 id="Create_a_new_widget">Create a new widget</h3><p>You can create new widgets for the property view. There are four kinds of graphical elements: CompositeWidget, Layout, StandardWidget and PropertyEditor.
-The widgets contain three common fields:</p><ul><li>Label: The label displayed in the Customization editor when the user selects a widget type.</li><li>Namespace: The XWT namespace associated to the Widget.</li><li>WidgetClass: The simple name of the Java class implementing the Widget.</li></ul><p>The PropertyEditor contains two additional fields:</p><ul><li>Multiplicity: The multiplicity of the properties it can handle (1 for single-valued properties, -1 for multivalued properties)</li><li>Type: The type of the properties it can handle.</li></ul><p>To implement a Composite, Layout or Standard widget, you should simply follow the SWT rules, i.e. extend either Composite, Canvas or Layout, and have a (Composite, int) constructor. To define a PropertyEditor, you have two options:</p><ul><li>Extend Composite, have a (Composite, int) constructor, and implement the CustomizablePropertyEditor interface (From org.eclipse.papyrus.properties.widgets)</li><li>Extend directly AbstractPropertyEditor (From org.eclipse.papyrus.properties.widgets)</li></ul><h3 id="Constraints">Constraints</h3><p>Adding a Constraint is similar to creating a new Widget. You have two options to implement a new Constraint:</p><ul><li>Implement the Constraint interface (From org.eclipse.papyrus.properties.constraints)</li><li>Extend the AbstractConstraint class (From org.eclipse.papyrus.properties.constraints)</li></ul><p>The important methods are the following (depending on whether you’re implement Constraint or extending AbstractConstraint):</p><ul><li>setDescriptor/setConstraintDescriptor: <ul><li>Configures the constraint.</li></ul></li><li>match(Object)/match(IStructuredSelection) : Boolean<ul><li>Indicates whether this constraint matches the given given or not</li></ul></li><li>overrides(Constraint) : Boolean<ul><li>Indicates whether this constraint overrides another constraint or not. A constraint should override another constraint when it is more specific.</li></ul></li><li>equivalent(Constraint) : Boolean<ul><li>This is only used by AbstractConstraint. Two constraints are equivalent if they have the same parameters (ConstraintDescriptor). Two equivalent constraints can have different multiplicities.</li></ul></li></ul><p>The equivalent() and overrides() methods are used to automatically resolve constraints conflicts (Two different constraints matching the same element).
-Once the Constraint is implemented, don’t forget to register it in your environment model.</p><h3 id="ModelElement">ModelElement</h3><p>The ModelElement is the interface between the property view and your domain model. It is used to retrieve information about the object(s) being edited from the property. These informations will be used to configure the widget. AbstractModelElement provides a base implementation for this interface.</p><p>All methods from this interface take a single parameter, which is the name of the property being edited.</p><ul><li>getObservable(String) / doGetObservable(String) :</li></ul><p>This method returns an IObservable which will be used to read and write a single property from the represented object. It should return an IObservableValue for single-valued properties, and IObservableList for multi-valued properties.</p><ul><li>getContentProvider(String) :</li></ul><p>This method is only used for reference and enumerated properties. It should return a list of values which can be set to the edited property. Unlike IStructuredContentProvider, this provider will not rely on a StructuredViewer to retrieve an input object: the method getElement() will be called without any parameter, so the implementation should be able to retrieve its own typically. This will typically be achieved by passing a context object in the provider’s constructor.</p><ul><li>getLabelProvider(String) :</li></ul><p>This method is used to display an element’s label for a few widgets. Note that the same instance of label provider can be used by more than one Viewer for a given property. For example, the MultiReference widget will display three viewers, each using the same label provider. Each viewer will try to dispose the LabelProvider as soon as they are themselves disposed (For example, when closing the selection dialog from MultiReference). Thus, you should probably not implement the dispose() method, to avoid inconsistent providers.</p><ul><li>getValidator(String) : </li></ul><p>This method returns an IValidator, if there’s one which is set up for the current property. </p><h3 id="ModelElement_Factory">ModelElement Factory</h3><p>The ModelElements are associated to DataContextElements through a ModelElementFactory. The ModelElementFactory is defined on the DataContextRoot. All children of a DataContextRoot will share the same ModelElementFactory.</p><p>To add a new ModelElement, you should also create a new ModelElementFactory, and register it in your Environment model. Then, you can set this factory to your DataContextRoot.</p><p>Note: to display the Data contexts, you need to check the toggle button on top of the editor: <img border="0" src="fig8.png"/></p><p><img title="The UML DataContextRoots, with their own factories" alt="The UML DataContextRoots, with their own factories" border="0" src="fig9.png"/></p><h3 id="Content_Providers_and_Widgets">Content Providers and Widgets</h3><p>Note: The ContentProviders have been refactored in Papyrus 0.9, to be simplified. However, most of this chapter should remain true.</p><p>The ContentProvider is a complex features, which often evolves in the Papyrus property view. The ModelElement has been designed to be compatible with many kinds of different widgets (Combo-box, Tree-based dialogs…). The problem is that these widgets typically use different kinds of JFace ContentProvider (IStructuredContentProvider for flat display, ITreeContentProvider for Tree display). In the Property view, we needed to unify these providers.</p><p>Thus, it is recommended to use a IHierarchicContentProvider, which extends ITreeContentProvider, with an additional method: isValidValue(Object). In a Tree, we typically have two kinds of elements: the elements which can potentially be selected, and their containers, which often cannot. The isValidValue() method is used to distinguish between these values.</p><p>When a flat widget (e.g. ReferenceCombo) is used, only the valid values will be displayed. When a tree-based widget (e.g. ReferenceDialog) is used, a sub-tree will be displayed, excluding the sub-trees which don’t contain any valid value. Moreover, the invalid values won’t be selectable (For example, in the ReferenceDialog, the “ok” button will be grayed).</p><p><img title="IHierarchicContentProvider at runtime" alt="IHierarchicContentProvider at runtime" border="0" src="fig10.png"/></p><h3 id="Dynamic_sections">Dynamic sections</h3><p>Sometimes, the property view should not depend on a selection, but on a specific property of the selected element. In such a case, it is frequent that this specific property might be edited by the property view itself. However, the property view is only refreshed when the selection changes.</p><p>To overcome this problem, Papyrus offers a “Dynamic section” feature, which allows refreshing dynamically one or more sections of the property view. For example, when you’re editing a View’s constraint in the Property view Editor, the constraint’s properties directly depend on the constraint’s type. When you select an UML constraint, the constraint’s parameter is the name of a UML Metaclass. When you select an EMF constraint, the constraint has two parameters: Namespace URI of the Metamodel, and the name of the Metaclass. Changing the constraint type should also change the constraint’s parameters editors.</p><p><img title="A view with a static and a dynamic section" alt="A view with a static and a dynamic section" border="0" src="fig11.png"/></p><p>This can be achieved with dynamic sections, i.e. a section with a constraint. The constraint will be executed once at the beginning, and once again each time a property from the property view changes. If the constraint is matched, the section will be displayed. Otherwise, it will be hidden.
-A view with dynamic sections will typically look like the following:</p><ul><li>A single unconstrained section containing the common parameters</li><li>One dynamic (i.e. constrained) section for each specific case</li></ul><p><img title="Dynamic sections configuration" alt="Dynamic sections configuration" border="0" src="fig12.png"/></p><p>Please note that tabs cannot be added nor removed dynamically. For example, when you apply a stereotype on a UML Element, the tab associated to the stereotype’s property view cannot be displayed until you select the element again.</p><h3 id="Property_view_Header">Property view Header</h3><p>The Eclipse Tabbed Property View offers an extension point to define the label provider for the property view header. However, this label provider will be specific to the editor. For generic editors, it is not always possible to provide a pertinent label provider: they will always be too generic, and won’t be able to handle specific elements. For example, a generic EMF Model Editor with the customizable property view will only be able to display standard EMF labels and icons. To overcome this problem, Papyrus offers a configurable label provider for the header: org.eclipse.papyrus.properties.provider.SelectionLabelProvider</p><p>This label provider uses the selected element to find the most appropriate label provider, then dispatches the getText and getIcon calls to it. This label provider can be configured through an extension point: org.eclipse.papyrus.properties.labelprovider</p><p>This extension point takes an implementation of IFilteredLabelProvider and a priority. The IFilteredLabelProvider is a label provider with an additional method: boolean accept(IStructuredSelection). For each selection, the label provider accepting the selection, and having the highest priority will be used to display a header for it. It will then be possible to define a generic label provider for all java objects, with the lowest priority; another generic label provider for all EMF Objects, and a really specific label provider for a given metamodel (with the highest priority).
-In Papyrus, we have such an example for UML. The Papyrus UML Diagrams use the GMF model, which doesn’t have icons. We wanted to have a different icon for each type of Diagram: this is not possible with a standard EMF label provider, which associates an icon to an EClass, independently of its instances’ attributes.</p><p>So, we registered the standard EMF Label Provider with a medium priority, which can handle any kind of EObject, and a UML Label Provider, which can only handle UML Elements and GMF Diagrams, with a higher priority.</p><p>The lower the priority number, the higher the priority actually is: </p><ul><li>100: Lowest priority. The standard EMF Object label provider has a priority of 100, and is called iff no other label provider can accept an EObject.</li><li>50: Medium priority.  The Papyrus UML Label Provider has a priority of 50.</li><li>10: High priority. </li><li>0: Highest priority.</li></ul><p>If no label provider matches the selection, the default JFace LabelProvider is used.</p><h3 id="Binding_and_Validation">Binding and Validation</h3><p>View Properties support JFace Databinding, which connects our UI to our model. For the validation there are two kinds of validators: </p><ul><li>Widget validators:  they check that  our input is the kind of data expected by our widget before synchronizing it ( e.g IntegerEditor must have a correct integer for input) </li></ul><ul><li>Model validators: they check that our input verifies our model constraint, they must be instantiate in UmlModelElement#getValidator();</li></ul><p>If there are errors during the binding a control decoration is shown next to the widget. It also supports three level of severity (Ok, Warning, Error).</p><p><img title="Example of binding with a model validator and warning severity result" alt="Example of binding with a model validator and warning severity result" border="0" src="fig13.png"/></p><h3 id="Field_coloration">Field coloration</h3><p>Properties views have fields’ coloration. If you modify a value the background of the field will be orange, when you validate a change the background will turn green for couple of seconds if the synchronization was successful, it will turn red otherwise. </p><p><img title="Example of a field being modified" alt="Example of a field being modified" border="0" src="fig14.png"/></p><h2 id="GENERATION_TOOL">GENERATION TOOL</h2><p>Editing an existing property view can be useful, but most of the time, you’ll want a brand new configuration for your own profile or meta-model. Thus, the framework provides a tool to automatically generate the initial property view, which you can then customize using the customization tool.
-The generator can create a property view configuration from either a UML Profile or an Ecore Meta-model. The wizard is available in the Papyrus category: File -&gt; New -&gt; Other… -&gt; Papyrus/Property view configuration.</p><p>The wizard provides two default generators:</p><ul><li>Generate a property view from a UML Profile</li><li>Generate a property view from an Ecore Meta-model</li></ul><p>The source file must be located in your workspace. A default target file named will be filled with the .ctx extension (This is the extension for a property view configuration).</p><p>Press next: a combo asks you which strategy to use. </p><p>A basic method: all the elements from the profile or meta-model will be extracted, with no dependencies to other models. </p><p>Same CTX file: you are asked to choose which models you want to extract, and will be saved in the same file</p><p>Different CTX file(s): you are asked to choose which models you want to extract and they will be saved in different files, (each profile name will be the name of the generated  ctx file)</p><p>Press next: a table with all the elements extracted from your profile or meta-model is displayed. This table contains four columns:</p><ul><li>Field: the name of the element or property</li><li>Display single: whether this property should be displayed when a single instance of this element is selected</li><li>Display multiple: whether this property should be displayed when more than one instance of this element is selected</li><li>Description: the description of the property (Most of the time, it will be N/A, as the default generators cannot extract the documentation from the source model).</li></ul><p>Press finish: two files or more files according to the chosen strategy and a folder are generated:</p><ul><li>The *.ctx file, corresponding to your property view configuration</li><li>The ui/ folder, containing a set of XWT files, which contain the graphical information of your property views</li><li>The *FieldSelection.xmi file, which reminds the choices you’ve made about displaying each property. This file is currently unused.</li></ul><p>You can now open the *.ctx file and customize your property view.</p><h2 id="DEPLOYING_A_PROPERTY_VIEW">DEPLOYING A PROPERTY VIEW</h2><p>Papyrus provides a simple tool to deploy a property view locally (Right click on a CTX file -&gt; Deploy/Undeploy) </p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view.mediawiki b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view.mediawiki
index f7eccaac750..e609186f061 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view.mediawiki
@@ -1,19 +1,19 @@
 == INTRODUCTION ==

-In UML, the main information is represented in graphical diagrams. However, it is not always possible to represent graphically the whole semantic of UML, not talking of all the cosmetic properties. For example, it is pretty easy to represent and to edit a Class� name graphically. While we still can represent the �is abstract� property graphically (By using the italic font for the Class� name), it is harder to edit this property directly from the diagram. Worse, the �is leaf� property doesn�t even have a graphical representation. Thus, we often need a different view for representing all the properties of a UML Element, without polluting the graphical view.

+In UML, the main information is represented in graphical diagrams. However, it is not always possible to represent graphically the whole semantic of UML, not talking of all the cosmetic properties. For example, it is pretty easy to represent and to edit a Class' name graphically. While we still can represent the 'is abstract' property graphically (By using the italic font for the Class' name), it is harder to edit this property directly from the diagram. Worse, the 'is leaf' property doesn't even have a graphical representation. Thus, we often need a different view for representing all the properties of a UML Element, without polluting the graphical view.

 

 

-As UML is highly extensible, through the mean of Profiles, it is also important to be able to represent and edit the profile�s properties, without managing everything from the diagram view.

+As UML is highly extensible, through the mean of Profiles, it is also important to be able to represent and edit the profile's properties, without managing everything from the diagram view.

 

 

-Eclipse provides a standard view for these properties: the Properties Page. This view is a table representing all the properties available for the selected Element, including the ones that cannot be represented or edited graphically. This view is pretty useful, but is neither really user-friendly nor optimal, as it may require up to four clicks to simply edit a comment�s body. Moreover, it can only be extended via Java code, which requires some technical skills and prevents a dynamic modification of the view, as the Java code needs to be recompiled after each modification.

+Eclipse provides a standard view for these properties: the Properties Page. This view is a table representing all the properties available for the selected Element, including the ones that cannot be represented or edited graphically. This view is pretty useful, but is neither really user-friendly nor optimal, as it may require up to four clicks to simply edit a comment's body. Moreover, it can only be extended via Java code, which requires some technical skills and prevents a dynamic modification of the view, as the Java code needs to be recompiled after each modification.

 

 

-There is an extension of the base Property View framework, still in the standard Eclipse implementation, which fixes some of these problems. It is called the �Eclipse Tabbed Properties View� framework. It provides a better look and feel for the property view, with more flexibility, and a better usability. However, it keeps being difficult to customize, as it still hard-coded in Java.

+There is an extension of the base Property View framework, still in the standard Eclipse implementation, which fixes some of these problems. It is called the 'Eclipse Tabbed Properties View' framework. It provides a better look and feel for the property view, with more flexibility, and a better usability. However, it keeps being difficult to customize, as it still hard-coded in Java.

 

 

 Papyrus provides its own Property View framework, based on the Tabbed Property View framework. The Papyrus Property View can be extended in two ways:

-*	Dynamically, for the layout of the property view: show/hide a property, reorder the properties, add/remove a tab�

-*	Statically, through Java code, for advanced operations: create a new widget for editing the properties, add a custom Content Provider for selecting a reference value�

+*	Dynamically, for the layout of the property view: show/hide a property, reorder the properties, add/remove a tab'

+*	Statically, through Java code, for advanced operations: create a new widget for editing the properties, add a custom Content Provider for selecting a reference value'

 This document aims at detailing all the features related to the property view customization, both dynamically and statically.

 

 == THE CUSTOMIZATION TOOL ==

@@ -22,16 +22,16 @@ Most customizations can be done through the Property view customization Editor.
 

 === Edit a configuration ===

 

-Each property view configuration is defined in a different set of files. Each configuration can contain elements from different contexts, but we typically have one configuration per Ecore Metamodel or UML Profile (i.e. one configuration for UML, one for the Diagram Appearance tab, another one for the SysML profile�)

+Each property view configuration is defined in a different set of files. Each configuration can contain elements from different contexts, but we typically have one configuration per Ecore Metamodel or UML Profile (i.e. one configuration for UML, one for the Diagram Appearance tab, another one for the SysML profile')

 

-To see the list of available configurations, open the properties view (Window -> Show View -> Other� -> General/Properties). Click on the white arrow in the upper right corner of the Properties view, and select �Customize property view�. You should see a dialog with the list of all available configurations.

+To see the list of available configurations, open the properties view (Window -> Show View -> Other' -> General/Properties). Click on the white arrow in the upper right corner of the Properties view, and select 'Customize property view'. You should see a dialog with the list of all available configurations.

 

 

-[[File:fig1.png|Open the property view customization menu]]

+[[File:images/fig1.png|Open the property view customization menu]]

 

 As the standard configurations are read-only, you cannot edit them directly. You will first need to make a copy of the configuration. You will then be able to edit the copy.

 

-[[File:fig2.png|Copy an existing configuration to edit it]]

+[[File:images/fig2.png|Copy an existing configuration to edit it]]

 

 

 The Property View Editor has three panes:

@@ -40,7 +40,7 @@ The Property View Editor has three panes:
 *	The Properties part

 The Editor presents the elements defined by this configuration. The Preview displays an overview of the selected View, as it will be displayed in the property view at runtime. The properties view displays the properties of the selected element

 

-[[File:fig3.png|The property view Editor]]

+[[File:images/fig3.png|The property view Editor]]

 

 

 === The property view elements ===

@@ -50,28 +50,28 @@ The editor contains a Tree, containing the following elements :
 *	Tab: describes a tab in the property view. A tab has a label, an (optional) image, and can be indented. It also has a priority.

 *	View: describes a property view associated to a selection. The view has a name, a constraint, a multiplicity and a list of sections. The constraint is used to determine for what kind of object the view should be displayed.

 *	Constraint: a query that inputs a selection, and outputs a boolean (true if the constraint matches the input object, false otherwise). It is possible to implement your own constraint type (In Java).

-*	Section: a section is a sub-part of a view. A view generally needs only one section, but there are cases where you need more than one section. A section is associated to a single tab, so, if you want to display more than one tab in a single view (For example, � UML � and � Profile � in the UML property view), you will need at least two sections in that view (One for each tab). Another (advanced) case is described in � Dynamic sections �. A section has a name, a tab, and a Composite.

+*	Section: a section is a sub-part of a view. A view generally needs only one section, but there are cases where you need more than one section. A section is associated to a single tab, so, if you want to display more than one tab in a single view (For example, ' UML ' and ' Profile ' in the UML property view), you will need at least two sections in that view (One for each tab). Another (advanced) case is described in ' Dynamic sections '. A section has a name, a tab, and a Composite.

 *	Composite: this is the actual presentation element. The composite is a widget which can contain other widgets. A composite has a type, and a list of widgets.

-*	Layout: all composites need a layout. The default is � PropertiesLayout �, which is a variant of the SWT standard GridLayout. A PropertiesLayout has a number of columns. The default is one column.

+*	Layout: all composites need a layout. The default is ' PropertiesLayout ', which is a variant of the SWT standard GridLayout. A PropertiesLayout has a number of columns. The default is one column.

 *	Property Editor: a property editor is a widget which is used to edit a single property of the selected object. You will typically have one Property editor for each property that you want to edit in the property view. The property editor has a property, and a widget to edit that property.

 *	Standard Widget: a widget from the standard SWT Library. Few of them are currently available, because they are rarely needed.

 The Tree allows reordering or removing easily the elements (Through drag & drop, delete). The editor also supports the Undo/Redo commands.

 

 ==== Preview ====

 

-The preview displays a real-time overview of the selected View. However, some widgets can only be computed at runtime, which prevents a pertinent preview. This is the case of the �Enum Radio� widget, for example, as the enumerated values are only known at runtime.

+The preview displays a real-time overview of the selected View. However, some widgets can only be computed at runtime, which prevents a pertinent preview. This is the case of the 'Enum Radio' widget, for example, as the enumerated values are only known at runtime.

 

 ==== Property view ====

 

 The property view is used to edit the properties of the element selected in the tree. The property view uses the Papyrus Property View framework, thus can be customized just the same way you would customize any other property view.

 

-[[File:fig4.png| the three panes of the Property view editor]]

+[[File:images/fig4.png| the three panes of the Property view editor]]

 

 === Priorities between views ===

-When more than one view match a selection, a priority mechanism will determine which one(s) should be displayed. The priorities are defined at the level of the view�s constraints, i.e. if the constraint for a View A overrides a constraint for the View B, the View B won�t be displayed. For example, a UML Class from a Class Diagram will match many views (The list is not exhaustive):

+When more than one view match a selection, a priority mechanism will determine which one(s) should be displayed. The priorities are defined at the level of the view's constraints, i.e. if the constraint for a View A overrides a constraint for the View B, the View B won't be displayed. For example, a UML Class from a Class Diagram will match many views (The list is not exhaustive):

 

 *	SingleClass (From UML)

-*	MultipleClass (As the -1 multiplicity actually means �any number of elements�)

+*	MultipleClass (As the -1 multiplicity actually means 'any number of elements')

 *	SingleElement (And MultipleElement)

 *	SingleClassifier (And MultipleClassifier)

 *	*Style (From GMF Notation model)

@@ -82,22 +82,22 @@ The priorities are computed in two ways:
 *	Automatic, according to the Java constraints implementations

 *	Statically, according to the property view configuration

 

-When the �isOverrideable� property is set to false for a Constraint (In the property view model), only the static rules will be taken into account.

+When the 'isOverrideable' property is set to false for a Constraint (In the property view model), only the static rules will be taken into account.

 

-[[File:fig5.png|The constraint cannot be dynamically overridden]]

+[[File:images/fig5.png|The constraint cannot be dynamically overridden]]

 

 The automatic rules are the following:

 

-*	A constraint with a multiplicity of 1 always overrides the same constraint with a multiplicity of -1 (Or >1). Thus, �MultipleClass� won�t be displayed, because �SingleClass� also matches our selection.

-*	An EMF (Or UML) �Instance of� constraint always overrides a constraint matching a supertype. Thus, �SingleClassifier� won�t be displayed, because a Class is more specific than a Classifier. However, �SingleElement� *will be* displayed, because it is not overrideable (isOverrideable=false).

-*	A stereotype constraint (HasStereotype) will *not* override its UML �Instance of� constraint. However, a specific implementation of this constraint has been provided for Scade, which *will* override the UML metaclass (i.e., a Block will override a Class� property view, hiding the UML tab).

-*	For CompositeConstraints: if a composite constraint is a superset of another constraint, it will override it (It is more specific). For example, a Composite Constraint �isA and isB� will override a constraint �isB�, but will not override a constraint �isB and isC�.

+*	A constraint with a multiplicity of 1 always overrides the same constraint with a multiplicity of -1 (Or >1). Thus, 'MultipleClass' won't be displayed, because 'SingleClass' also matches our selection.

+*	An EMF (Or UML) 'Instance of' constraint always overrides a constraint matching a supertype. Thus, 'SingleClassifier' won't be displayed, because a Class is more specific than a Classifier. However, 'SingleElement' *will be* displayed, because it is not overrideable (isOverrideable=false).

+*	A stereotype constraint (HasStereotype) will *not* override its UML 'Instance of' constraint. However, a specific implementation of this constraint has been provided for Scade, which *will* override the UML metaclass (i.e., a Block will override a Class' property view, hiding the UML tab).

+*	For CompositeConstraints: if a composite constraint is a superset of another constraint, it will override it (It is more specific). For example, a Composite Constraint 'isA and isB' will override a constraint 'isB', but will not override a constraint 'isB and isC'.

 

 Please note that each constraint has its own implementation of the overrides() method. See the advanced chapter for more information

 

-The static rule is simple: when a Constraint explicitly overrides another constraint, it will always override it. This is especially useful when you�ve marked a constraint as �overrideable=false�, but still want to override it in a specific case (Remember that overrideable=false only applies to *automatic* constraint resolution).

+The static rule is simple: when a Constraint explicitly overrides another constraint, it will always override it. This is especially useful when you've marked a constraint as 'overrideable=false', but still want to override it in a specific case (Remember that overrideable=false only applies to *automatic* constraint resolution).

 

-[[File:fig6.png|Force this constraint to override another constraint]]

+[[File:images/fig6.png|Force this constraint to override another constraint]]

 

 

 Finally, in the previous example, the following views will be displayed:

@@ -111,7 +111,7 @@ Finally, in the previous example, the following views will be displayed:
 

 When you make a copy of a property view, it is not automatically activated. Thus, the modifications brought to the copy are not immediately visible on your property view. To activate a property view, you need to open the Papyrus preferences, from Window > Preferences.

 

-[[File:fig7.png|Preferences]]

+[[File:images/fig7.png|Preferences]]

 

 When making a copy of an existing configuration, you should uncheck the default one, and check the new one.

 

@@ -123,9 +123,9 @@ The property view framework is much more powerful, but this requires some Java d
 

 === The Environment model ===

 

-To associate Java implementations with the property view model, you need to declare an Environment model. You can create a new Environment model with the �Environment Model� wizard in �Example EMF Model Creation Wizards� category. Select �Environment� as the Model Object.

+To associate Java implementations with the property view model, you need to declare an Environment model. You can create a new Environment model with the 'Environment Model' wizard in 'Example EMF Model Creation Wizards' category. Select 'Environment' as the Model Object.

 

-Once you�ve added your Java class declarations, you should register the environment model so that the property view knows about it. Add an extension to org.eclipse.papyrus.properties.environment, and select your model file.

+Once you've added your Java class declarations, you should register the environment model so that the property view knows about it. Add an extension to org.eclipse.papyrus.properties.environment, and select your model file.

 

 === Create a new widget === 

 

@@ -153,7 +153,7 @@ Adding a Constraint is similar to creating a new Widget. You have two options to
 *	Implement the Constraint interface (From org.eclipse.papyrus.properties.constraints)

 *	Extend the AbstractConstraint class (From org.eclipse.papyrus.properties.constraints)

 

-The important methods are the following (depending on whether you�re implement Constraint or extending AbstractConstraint):

+The important methods are the following (depending on whether you're implement Constraint or extending AbstractConstraint):

 

 *	setDescriptor/setConstraintDescriptor: 

 **	Configures the constraint.

@@ -165,7 +165,7 @@ The important methods are the following (depending on whether you�re implement C
 **	This is only used by AbstractConstraint. Two constraints are equivalent if they have the same parameters (ConstraintDescriptor). Two equivalent constraints can have different multiplicities.

 

 The equivalent() and overrides() methods are used to automatically resolve constraints conflicts (Two different constraints matching the same element).

-Once the Constraint is implemented, don�t forget to register it in your environment model.

+Once the Constraint is implemented, don't forget to register it in your environment model.

 

 ===ModelElement===

 

@@ -179,15 +179,15 @@ This method returns an IObservable which will be used to read and write a single
 

 *	getContentProvider(String) :

 

-This method is only used for reference and enumerated properties. It should return a list of values which can be set to the edited property. Unlike IStructuredContentProvider, this provider will not rely on a StructuredViewer to retrieve an input object: the method getElement() will be called without any parameter, so the implementation should be able to retrieve its own typically. This will typically be achieved by passing a context object in the provider�s constructor.

+This method is only used for reference and enumerated properties. It should return a list of values which can be set to the edited property. Unlike IStructuredContentProvider, this provider will not rely on a StructuredViewer to retrieve an input object: the method getElement() will be called without any parameter, so the implementation should be able to retrieve its own typically. This will typically be achieved by passing a context object in the provider's constructor.

 

 *	getLabelProvider(String) :

 

-This method is used to display an element�s label for a few widgets. Note that the same instance of label provider can be used by more than one Viewer for a given property. For example, the MultiReference widget will display three viewers, each using the same label provider. Each viewer will try to dispose the LabelProvider as soon as they are themselves disposed (For example, when closing the selection dialog from MultiReference). Thus, you should probably not implement the dispose() method, to avoid inconsistent providers.

+This method is used to display an element's label for a few widgets. Note that the same instance of label provider can be used by more than one Viewer for a given property. For example, the MultiReference widget will display three viewers, each using the same label provider. Each viewer will try to dispose the LabelProvider as soon as they are themselves disposed (For example, when closing the selection dialog from MultiReference). Thus, you should probably not implement the dispose() method, to avoid inconsistent providers.

 

 *	getValidator(String) : 

 

-This method returns an IValidator, if there�s one which is set up for the current property. 

+This method returns an IValidator, if there's one which is set up for the current property. 

 

 === ModelElement Factory ===

 

@@ -195,29 +195,29 @@ The ModelElements are associated to DataContextElements through a ModelElementFa
 

 To add a new ModelElement, you should also create a new ModelElementFactory, and register it in your Environment model. Then, you can set this factory to your DataContextRoot.

 

-Note: to display the Data contexts, you need to check the toggle button on top of the editor: [[File:fig8.png]]

+Note: to display the Data contexts, you need to check the toggle button on top of the editor: [[File:images/fig8.png]]

 

-[[File:fig9.png|The UML DataContextRoots, with their own factories]]

+[[File:images/fig9.png|The UML DataContextRoots, with their own factories]]

 

 === Content Providers and Widgets ===

 

 Note: The ContentProviders have been refactored in Papyrus 0.9, to be simplified. However, most of this chapter should remain true.

 

-The ContentProvider is a complex features, which often evolves in the Papyrus property view. The ModelElement has been designed to be compatible with many kinds of different widgets (Combo-box, Tree-based dialogs�). The problem is that these widgets typically use different kinds of JFace ContentProvider (IStructuredContentProvider for flat display, ITreeContentProvider for Tree display). In the Property view, we needed to unify these providers.

+The ContentProvider is a complex features, which often evolves in the Papyrus property view. The ModelElement has been designed to be compatible with many kinds of different widgets (Combo-box, Tree-based dialogs'). The problem is that these widgets typically use different kinds of JFace ContentProvider (IStructuredContentProvider for flat display, ITreeContentProvider for Tree display). In the Property view, we needed to unify these providers.

 

 Thus, it is recommended to use a IHierarchicContentProvider, which extends ITreeContentProvider, with an additional method: isValidValue(Object). In a Tree, we typically have two kinds of elements: the elements which can potentially be selected, and their containers, which often cannot. The isValidValue() method is used to distinguish between these values.

 

-When a flat widget (e.g. ReferenceCombo) is used, only the valid values will be displayed. When a tree-based widget (e.g. ReferenceDialog) is used, a sub-tree will be displayed, excluding the sub-trees which don�t contain any valid value. Moreover, the invalid values won�t be selectable (For example, in the ReferenceDialog, the �ok� button will be grayed).

+When a flat widget (e.g. ReferenceCombo) is used, only the valid values will be displayed. When a tree-based widget (e.g. ReferenceDialog) is used, a sub-tree will be displayed, excluding the sub-trees which don't contain any valid value. Moreover, the invalid values won't be selectable (For example, in the ReferenceDialog, the 'ok' button will be grayed).

 

-[[File:fig10.png|IHierarchicContentProvider at runtime]]

+[[File:images/fig10.png|IHierarchicContentProvider at runtime]]

 

 === Dynamic sections === 

 

 Sometimes, the property view should not depend on a selection, but on a specific property of the selected element. In such a case, it is frequent that this specific property might be edited by the property view itself. However, the property view is only refreshed when the selection changes.

 

-To overcome this problem, Papyrus offers a �Dynamic section� feature, which allows refreshing dynamically one or more sections of the property view. For example, when you�re editing a View�s constraint in the Property view Editor, the constraint�s properties directly depend on the constraint�s type. When you select an UML constraint, the constraint�s parameter is the name of a UML Metaclass. When you select an EMF constraint, the constraint has two parameters: Namespace URI of the Metamodel, and the name of the Metaclass. Changing the constraint type should also change the constraint�s parameters editors.

+To overcome this problem, Papyrus offers a 'Dynamic section' feature, which allows refreshing dynamically one or more sections of the property view. For example, when you're editing a View's constraint in the Property view Editor, the constraint's properties directly depend on the constraint's type. When you select an UML constraint, the constraint's parameter is the name of a UML Metaclass. When you select an EMF constraint, the constraint has two parameters: Namespace URI of the Metamodel, and the name of the Metaclass. Changing the constraint type should also change the constraint's parameters editors.

 

-[[File:fig11.png|A view with a static and a dynamic section]]

+[[File:images/fig11.png|A view with a static and a dynamic section]]

 

 This can be achieved with dynamic sections, i.e. a section with a constraint. The constraint will be executed once at the beginning, and once again each time a property from the property view changes. If the constraint is matched, the section will be displayed. Otherwise, it will be hidden.

 A view with dynamic sections will typically look like the following:

@@ -225,17 +225,17 @@ A view with dynamic sections will typically look like the following:
 *	A single unconstrained section containing the common parameters

 *	One dynamic (i.e. constrained) section for each specific case

 

-[[File:fig12.png|Dynamic sections configuration]]

+[[File:images/fig12.png|Dynamic sections configuration]]

 

-Please note that tabs cannot be added nor removed dynamically. For example, when you apply a stereotype on a UML Element, the tab associated to the stereotype�s property view cannot be displayed until you select the element again.

+Please note that tabs cannot be added nor removed dynamically. For example, when you apply a stereotype on a UML Element, the tab associated to the stereotype's property view cannot be displayed until you select the element again.

 

 === Property view Header ===

-The Eclipse Tabbed Property View offers an extension point to define the label provider for the property view header. However, this label provider will be specific to the editor. For generic editors, it is not always possible to provide a pertinent label provider: they will always be too generic, and won�t be able to handle specific elements. For example, a generic EMF Model Editor with the customizable property view will only be able to display standard EMF labels and icons. To overcome this problem, Papyrus offers a configurable label provider for the header: org.eclipse.papyrus.properties.provider.SelectionLabelProvider

+The Eclipse Tabbed Property View offers an extension point to define the label provider for the property view header. However, this label provider will be specific to the editor. For generic editors, it is not always possible to provide a pertinent label provider: they will always be too generic, and won't be able to handle specific elements. For example, a generic EMF Model Editor with the customizable property view will only be able to display standard EMF labels and icons. To overcome this problem, Papyrus offers a configurable label provider for the header: org.eclipse.papyrus.properties.provider.SelectionLabelProvider

 

 This label provider uses the selected element to find the most appropriate label provider, then dispatches the getText and getIcon calls to it. This label provider can be configured through an extension point: org.eclipse.papyrus.properties.labelprovider

 

 This extension point takes an implementation of IFilteredLabelProvider and a priority. The IFilteredLabelProvider is a label provider with an additional method: boolean accept(IStructuredSelection). For each selection, the label provider accepting the selection, and having the highest priority will be used to display a header for it. It will then be possible to define a generic label provider for all java objects, with the lowest priority; another generic label provider for all EMF Objects, and a really specific label provider for a given metamodel (with the highest priority).

-In Papyrus, we have such an example for UML. The Papyrus UML Diagrams use the GMF model, which doesn�t have icons. We wanted to have a different icon for each type of Diagram: this is not possible with a standard EMF label provider, which associates an icon to an EClass, independently of its instances� attributes.

+In Papyrus, we have such an example for UML. The Papyrus UML Diagrams use the GMF model, which doesn't have icons. We wanted to have a different icon for each type of Diagram: this is not possible with a standard EMF label provider, which associates an icon to an EClass, independently of its instances' attributes.

 

 So, we registered the standard EMF Label Provider with a medium priority, which can handle any kind of EObject, and a UML Label Provider, which can only handle UML Elements and GMF Diagrams, with a higher priority.

 

@@ -258,18 +258,18 @@ View Properties support JFace Databinding, which connects our UI to our model. F
 

 If there are errors during the binding a control decoration is shown next to the widget. It also supports three level of severity (Ok, Warning, Error).

 

-[[File:fig13.png|Example of binding with a model validator and warning severity result]]

+[[File:images/fig13.png|Example of binding with a model validator and warning severity result]]

 

 === Field coloration ===

 

-Properties views have fields� coloration. If you modify a value the background of the field will be orange, when you validate a change the background will turn green for couple of seconds if the synchronization was successful, it will turn red otherwise. 

+Properties views have fields' coloration. If you modify a value the background of the field will be orange, when you validate a change the background will turn green for couple of seconds if the synchronization was successful, it will turn red otherwise. 

 

-[[File:fig14.png|Example of a field being modified]]

+[[File:images/fig14.png|Example of a field being modified]]

 

 == GENERATION TOOL ==

 

-Editing an existing property view can be useful, but most of the time, you�ll want a brand new configuration for your own profile or meta-model. Thus, the framework provides a tool to automatically generate the initial property view, which you can then customize using the customization tool.

-The generator can create a property view configuration from either a UML Profile or an Ecore Meta-model. The wizard is available in the Papyrus category: File -> New -> Other� -> Papyrus/Property view configuration.

+Editing an existing property view can be useful, but most of the time, you'll want a brand new configuration for your own profile or meta-model. Thus, the framework provides a tool to automatically generate the initial property view, which you can then customize using the customization tool.

+The generator can create a property view configuration from either a UML Profile or an Ecore Meta-model. The wizard is available in the Papyrus category: File -> New -> Other' -> Papyrus/Property view configuration.

 

 The wizard provides two default generators:

 

@@ -297,7 +297,7 @@ Press finish: two files or more files according to the chosen strategy and a fol
 

 *	The *.ctx file, corresponding to your property view configuration

 *	The ui/ folder, containing a set of XWT files, which contain the graphical information of your property views

-*	The *FieldSelection.xmi file, which reminds the choices you�ve made about displaying each property. This file is currently unused.

+*	The *FieldSelection.xmi file, which reminds the choices you've made about displaying each property. This file is currently unused.

 

 You can now open the *.ctx file and customize your property view.

 

diff --git a/plugins/doc/pom.xml b/plugins/doc/pom.xml
new file mode 100644
index 00000000000..ce1cdda668b
--- /dev/null
+++ b/plugins/doc/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../../releng/top-pom-main.xml</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.plugins.doc</artifactId>
+	<packaging>pom</packaging>
+	<modules>
+		<module>org.eclipse.papyrus.cdo.ui.doc</module>
+		<module>org.eclipse.papyrus.copypaste.ui.doc</module>
+		<module>org.eclipse.papyrus.dsml.validation.doc</module>
+		<module>org.eclipse.papyrus.infra.doc</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.common.doc</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.css.doc</module>
+		<module>org.eclipse.papyrus.infra.nattable.doc</module>
+		<module>org.eclipse.papyrus.infra.newchild.doc</module>
+		<module>org.eclipse.papyrus.infra.services.controlmode.doc</module>
+		<module>org.eclipse.papyrus.infra.viewpoints.doc</module>
+		<module>org.eclipse.papyrus.layers.documentation</module>
+		<module>org.eclipse.papyrus.moka.doc</module>
+		<module>org.eclipse.papyrus.req.reqif.doc</module>
+		<module>org.eclipse.papyrus.uml.decoratormodel.doc</module>
+		<module>org.eclipse.papyrus.uml.diagram.common.doc</module>
+		<module>org.eclipse.papyrus.uml.diagram.profile.doc</module>
+		<module>org.eclipse.papyrus.uml.doc</module>
+		<module>org.eclipse.papyrus.uml.modelrepair.doc</module>
+		<module>org.eclipse.papyrus.uml.profile.assistants.doc</module>
+		<module>org.eclipse.papyrus.uml.search.ui.doc</module>
+		<module>org.eclipse.papyrus.views.properties.doc</module>
+	</modules>
+
+</project>
\ No newline at end of file
diff --git a/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF
index c233d353a00..5717c6bb66f 100644
--- a/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF
+++ b/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

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

- com.google.guava;bundle-version="11.0.0"

+ com.google.guava;bundle-version="11.0.0",

+ org.eclipse.papyrus.infra.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.1.0.qualifier

diff --git a/plugins/editor/org.eclipse.papyrus.editor/plugin.xml b/plugins/editor/org.eclipse.papyrus.editor/plugin.xml
index 7c29634428c..e93975eabfb 100644
--- a/plugins/editor/org.eclipse.papyrus.editor/plugin.xml
+++ b/plugins/editor/org.eclipse.papyrus.editor/plugin.xml
@@ -14,25 +14,6 @@
       </editor>

    </extension>

    <extension

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

-      <menuContribution

-            locationURI="menu:org.eclipse.ui.main.menu?after=navigate">

-         <menu

-               id="org.eclipse.papyrus.ui.menu"

-               label="Papyrus"

-               tooltip="Papyrus Editor Menu">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </menu>

-      </menuContribution>

-   </extension>

-   <extension

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

       <category

             description="this a category of papyrus commands"

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/Activator.java
index 2aa20a090c1..5325e2936f3 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/Activator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.embeddededitor/src/org/eclipse/papyrus/infra/emf/embeddededitor/Activator.java
@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

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

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf.embeddededitor"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

@@ -36,7 +36,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 *

+	 * 

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

 	 */

 	@Override

@@ -48,7 +48,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 *

+	 * 

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

 	 */

 	@Override

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/SemanticEMFContentProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/SemanticEMFContentProvider.java
index ffecbefc9fe..ab94a10c59c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/SemanticEMFContentProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/SemanticEMFContentProvider.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.IDisposable;
 import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.TreeElement;
 import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedTreeContentProvider;
 import org.eclipse.papyrus.infra.emf.Activator;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
@@ -140,6 +141,21 @@ public class SemanticEMFContentProvider extends CustomizedTreeContentProvider im
 		return roots;
 	}
 
+	@Override
+	public Object[] getChildren(Object parentElement) {
+		// Sometimes, the ContentProvider is wrapped in a provider which adds new children (Not EMF-Facet compliant)
+		if (parentElement instanceof TreeElement) {
+			return super.getChildren(parentElement);
+		}
+
+		if (parentElement instanceof EObject) {
+			return super.getChildren(createEObjectProxy(parentElement, null));
+		}
+
+		return new Object[0];
+	}
+
+	@Override
 	public Object getAdaptedValue(Object containerElement) {
 		return EMFHelper.getEObject(containerElement);
 	}
@@ -151,6 +167,7 @@ public class SemanticEMFContentProvider extends CustomizedTreeContentProvider im
 		return children != null && children.length > 0;
 	}
 
+	@Override
 	public boolean isValidValue(Object containerElement) {
 		// get the semantic object form the element
 		Object semanticObject = getAdaptedValue(containerElement);
@@ -203,6 +220,7 @@ public class SemanticEMFContentProvider extends CustomizedTreeContentProvider im
 		this.notWantedMetaclasses = notWantedMetaclasses;
 	}
 
+	@Override
 	public Object[] getElements() {
 		return super.getElements(null);
 	}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.classpath b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.classpath
index 2d1a4302f04..098194ca4b7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.classpath
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

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

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

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

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..9ca8e68231b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1

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

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

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

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

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

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

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

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

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

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF
index ca46471ed48..a28e83e4d52 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
  org.eclipse.gmf.runtime.draw2d.ui;bundle-version="1.5.0",
  org.eclipse.draw2d;bundle-version="3.8.0",
@@ -20,7 +19,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.e4.ui.css.core;bundle-version="0.10.2",
  org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",
  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",
- org.eclipse.xtext.common.types
+ org.eclipse.xtext.common.types,
+ org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.1.0"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.1.0.qualifier
@@ -30,5 +30,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.configuration.
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.configurati
  on;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleDialog.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleDialog.java
index a95c96b1579..39b2d141631 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleDialog.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleDialog.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler;
 

 import static org.eclipse.papyrus.infra.gmfdiag.css.configuration.helper.DiagramTypeHelper.getDiagramType;

 

+import java.util.List;

 import java.util.Map;

 import java.util.Map.Entry;

 

@@ -25,19 +26,19 @@ import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.TrayDialog;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

-import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

-import org.eclipse.papyrus.infra.gmfdiag.css.HexColor;

-import org.eclipse.papyrus.infra.gmfdiag.css.Name;

-import org.eclipse.papyrus.infra.gmfdiag.css.Number;

-import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;

-import org.eclipse.papyrus.infra.gmfdiag.css.StringValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;

-import org.eclipse.papyrus.infra.gmfdiag.css.Term;

 import org.eclipse.papyrus.infra.gmfdiag.css.converters.ColorToGMFConverter;

-import org.eclipse.papyrus.infra.gmfdiag.css.util.CssSwitch;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.util.CSSSwitch;

 import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

 import org.eclipse.papyrus.infra.widgets.editors.BooleanCheckbox;

 import org.eclipse.papyrus.infra.widgets.editors.EnumRadio;

@@ -63,9 +64,9 @@ import org.w3c.dom.css.RGBColor;
 

 public abstract class AbstractStyleDialog extends TrayDialog {

 

-	protected final Map<Attribute, Boolean> conditions;

+	protected final Map<AttributeSelector, Boolean> conditions;

 

-	protected final Map<Declaration, Boolean> declarations;

+	protected final Map<css_declaration, Boolean> declarations;

 

 	protected final String selectorName;

 

@@ -87,7 +88,7 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 

 	protected Composite declarationsContainer;

 

-	public AbstractStyleDialog(Shell shell, Map<Attribute, Boolean> conditions, Map<Declaration, Boolean> declarations, String selectorName, View context) {

+	public AbstractStyleDialog(Shell shell, Map<AttributeSelector, Boolean> conditions, Map<css_declaration, Boolean> declarations, String selectorName, View context) {

 		super(shell);

 		this.conditions = conditions;

 		this.declarations = declarations;

@@ -221,6 +222,7 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 		diagramRestrictionWidget.setValue(this.diagramRestriction);

 		diagramRestrictionWidget.addCommitListener(new ICommitListener() {

 

+			@Override

 			public void commit(AbstractEditor editor) {

 				diagramRestriction = (Boolean) ((EnumRadio) editor).getValue();

 				updateSelectorLabel();

@@ -243,6 +245,7 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 		selectorNameWidget.setValue(this.useSelectorName);

 		selectorNameWidget.addCommitListener(new ICommitListener() {

 

+			@Override

 			public void commit(AbstractEditor editor) {

 				useSelectorName = (Boolean) ((EnumRadio) editor).getValue();

 				updateSelectorLabel();

@@ -259,12 +262,10 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 		detailLabel.setText("If the following properties are matched:");

 		detailLabel.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false, 3, 1));

 

-		for (SelectorCondition condition : conditions.keySet()) {

-			final Attribute currentCondition = (Attribute) condition;

-

+		for (final AttributeSelector currentCondition : conditions.keySet()) {

 			String attributeLabel = currentCondition.getName();

 			if (currentCondition.getValue() != null) {

-				attributeLabel += " " + currentCondition.getValue().getOperator() + " " + currentCondition.getValue().getValue();

+				attributeLabel += " " + currentCondition.getOp() + " " + currentCondition.getValue();

 			}

 

 			BooleanCheckbox checkbox = new BooleanCheckbox(parent, SWT.NONE, attributeLabel);

@@ -272,6 +273,7 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 

 			checkbox.addCommitListener(new ICommitListener() {

 

+				@Override

 				public void commit(AbstractEditor editor) {

 					conditions.put(currentCondition, ((BooleanCheckbox) editor).getValue());

 					updateSelectorLabel();

@@ -293,6 +295,7 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 		styleNameEditor.setValue(cssClass);

 		styleNameEditor.addCommitListener(new ICommitListener() {

 

+			@Override

 			public void commit(AbstractEditor editor) {

 				cssClass = (String) ((StringEditor) editor).getValue();

 				updateSelectorLabel();

@@ -308,7 +311,7 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 		declarationsLabel.setText("Select the properties you want to set. Unchecked properties will keep their default value\n (Which might be inherited from another style).");

 		declarationsLabel.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false, 3, 1));

 

-		for (Declaration declaration : declarations.keySet()) {

+		for (css_declaration declaration : declarations.keySet()) {

 			// Separate checkbox and label (Checkbox - Label) - (Checkbox - Label) - (Checkbox - Label)

 			// This is required to paint a custom foreground color on non-classic windows Theme

 			// Checkboxes do not support foreground color on Windows, except for the Classic theme

@@ -319,7 +322,7 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 			propertyComposite.setLayout(compositeLayout);

 			propertyComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));

 

-			String label = declaration.getProperty() + ": " + getLabel(declaration.getExpression());

+			String label = declaration.getProperty().getName() + ": " + getLabel(declaration.getValueTokens());

 			final BooleanCheckbox checkbox = new BooleanCheckbox(propertyComposite, SWT.NONE);

 			checkbox.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));

 

@@ -337,16 +340,17 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 			propertyComposite.addMouseListener(listener);

 			labelWidget.addMouseListener(listener);

 

-			Color[] colors = getColors(declaration.getExpression());

+			Color[] colors = getColors(declaration.getValueTokens());

 			propertyComposite.setBackground(colors[0]);

 			labelWidget.setForeground(colors[1]);

 

-			final Declaration currentDeclaration = declaration;

+			final css_declaration currentDeclaration = declaration;

 

 			checkbox.setValue(declarations.get(currentDeclaration));

 

 			checkbox.addCommitListener(new ICommitListener() {

 

+				@Override

 				public void commit(AbstractEditor editor) {

 					boolean value = ((BooleanCheckbox) editor).getValue();

 					declarations.put(currentDeclaration, value);

@@ -358,23 +362,17 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 		}

 	}

 

-	protected Color[] getColors(Expression expression) {

-		Term term = expression.getTerms();

-		if (term instanceof HexColor) {

-			HexColor hexColor = (HexColor) term;

-			return getColors(hexColor);

-		}

-

-		for (Subterm subterm : expression.getSubterms()) {

-			if (subterm.getTerm() instanceof HexColor) {

-				return getColors((HexColor) subterm.getTerm());

+	protected Color[] getColors(List<CssTok> expression) {

+		for (CssTok subterm : expression) {

+			if (subterm instanceof ColorTok) {

+				return getColors((ColorTok) subterm);

 			}

 		}

 

 		return new Color[] { Display.getDefault().getSystemColor(SWT.COLOR_WHITE), Display.getDefault().getSystemColor(SWT.COLOR_BLACK), };

 	}

 

-	protected Color[] getColors(HexColor hexColor) {

+	protected Color[] getColors(ColorTok hexColor) {

 		Color[] colors = new Color[] { Display.getDefault().getSystemColor(SWT.COLOR_WHITE), Display.getDefault().getSystemColor(SWT.COLOR_BLACK), };

 

 		Color color = getColor(hexColor);

@@ -395,8 +393,8 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 		return L;

 	}

 

-	protected Color getColor(HexColor color) {

-		RGBColor rgbColor = CSS2ColorHelper.getRGBColor("#" + color.getValue());

+	protected Color getColor(ColorTok color) {

+		RGBColor rgbColor = CSS2ColorHelper.getRGBColor(color.getValue());

 		int intColor = ColorToGMFConverter.getIntColor(rgbColor);

 		return ColorRegistry.getInstance().getColor(intColor);

 	}

@@ -408,47 +406,54 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 		return null;

 	}

 

-	protected String getLabel(Expression expression) {

-		if (expression == null) {

+	protected String getLabel(List<CssTok> expression) {

+		if (expression == null || expression.isEmpty()) {

 			return "";

 		}

-		String label = getLabel(expression.getTerms());

-		for (Subterm subTerm : expression.getSubterms()) {

-			if (subTerm.getOperator() != null) {

-				label += subTerm.getOperator();

+

+		String label = "";

+		for (CssTok token : expression) {

+			if (token instanceof SymbolTok) {

+				label += ((SymbolTok) token).getSymbol();

+			} else {

+				label += " " + getLabel(token);

 			}

-			label += " " + getLabel(subTerm.getTerm());

 		}

-		return label;

+

+		return label.trim().replaceAll("[ ]+", " ");

 	}

 

-	protected String getLabel(Term term) {

-		return (new CssSwitch<String>() {

+	protected String getLabel(CssTok term) {

+		return (new CSSSwitch<String>() {

 

 			@Override

-			public String caseHexColor(HexColor term) {

-				return '#' + term.getValue();

+			public String caseColorTok(ColorTok token) {

+				return token.getValue();

 			}

 

 			@Override

-			public String caseName(Name term) {

-				return term.getValue();

+			public String caseIdentifierTok(IdentifierTok token) {

+				return token.getName();

 			}

 

 			@Override

-			public String caseStringValue(StringValue term) {

-				return "\"" + term.getValue() + "\"";

+			public String caseStringTok(StringTok token) {

+				return token.getValue();

 			}

 

 			@Override

-			public String caseNumber(Number term) {

-				String label = "";

-				if (term.getOp() != null) {

-					label += term.getOp().getOperator();

-				}

-				label += term.getValue();

+			public String caseNumberTok(NumberTok token) {

+				return Double.toString(token.getVal());

+			}

+

+			@Override

+			public String caseUrlTok(UrlTok token) {

+				String label = "url('";

+				label += token.getUrl().getUrl();

+				label += "')";

 				return label;

 			}

+

 		}).doSwitch(term);

 	}

 

@@ -461,12 +466,11 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 

 		selectorText += useSelectorName ? selectorName : "*";

 

-		for (Entry<Attribute, Boolean> selectorEntry : conditions.entrySet()) {

+		for (Entry<AttributeSelector, Boolean> selectorEntry : conditions.entrySet()) {

 			if (selectorEntry.getValue()) {

-				Attribute condition = selectorEntry.getKey();

-				Attribute attribute = condition;

-				AttributeValue value = attribute.getValue();

-				selectorText += "[" + attribute.getName() + value.getOperator() + value.getValue() + "]";

+				AttributeSelector condition = selectorEntry.getKey();

+

+				selectorText += "[" + condition.getName() + condition.getOp() + condition.getValue() + "]";

 			}

 		}

 

@@ -496,5 +500,16 @@ public abstract class AbstractStyleDialog extends TrayDialog {
 		return diagramRestriction;

 	}

 

+	protected final boolean equals(css_property p1, css_property p2) {

+		return p1.getName().equals(p2.getName());

+	}

+

+	protected final String getElementName(simple_selector simpleSelector) {

+		if (simpleSelector.getElement() != null) {

+			return simpleSelector.getElement().getName();

+		} else {

+			return "*";

+		}

+	}

 

 }

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleHandler.java
index a433250fa35..5b1ae8f64d8 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleHandler.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleHandler.java
@@ -17,6 +17,7 @@ import java.io.IOException;
 import java.util.Collections;

 import java.util.HashMap;

 import java.util.LinkedHashMap;

+import java.util.List;

 import java.util.Map;

 

 import org.eclipse.core.commands.AbstractHandler;

@@ -44,20 +45,22 @@ import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusC
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;

 import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;

 import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP;

-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

-import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssFactory;

-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;

-import org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet;

 import org.eclipse.papyrus.infra.gmfdiag.css.configuration.Activator;

 import org.eclipse.papyrus.infra.gmfdiag.css.engine.BaseCSSEngine;

 import org.eclipse.papyrus.infra.gmfdiag.css.provider.CustomStyle;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSFactory;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.widgets.Event;

@@ -66,6 +69,7 @@ import org.eclipse.swt.widgets.Shell;
 

 public abstract class AbstractStyleHandler extends AbstractHandler {

 

+	@Override

 	public Object execute(ExecutionEvent event) {

 		ISelection selection;

 		try {

@@ -98,8 +102,8 @@ public abstract class AbstractStyleHandler extends AbstractHandler {
 			return null;

 		}

 

-		Map<Declaration, Boolean> declarations = handleStyles(view);

-		Map<Attribute, Boolean> conditions = handleSemantic(view);

+		Map<css_declaration, Boolean> declarations = handleStyles(view);

+		Map<AttributeSelector, Boolean> conditions = handleSemantic(view);

 

 		String selectorName = view.getElement().eClass().getName();

 

@@ -109,49 +113,47 @@ public abstract class AbstractStyleHandler extends AbstractHandler {
 			return null;

 		}

 

-		Ruleset ruleset = getRuleset(dialog);

-		SimpleSelector selector = CssFactory.eINSTANCE.createSimpleSelector();

+		ruleset ruleset = getRuleset(dialog);

+		selector baseSelector = CSSFactory.eINSTANCE.createselector();

+		simple_selector simple_selector = createSimpleElementSelector(selectorName, dialog.useSelectorName());

 

-		if (dialog.useSelectorName()) {

-			selector.setElementName(selectorName);

-		} else {

-			selector.setElementName("*"); //$NON-NLS-1$

-		}

+		baseSelector.getSimpleselectors().add(simple_selector);

 

 		if (dialog.getDiagramRestriction()) {

 			String diagramType = getDiagramType(view.getDiagram());

-			CompositeSelector compositeSelector = CssFactory.eINSTANCE.createCompositeSelector();

-			compositeSelector.setRight(selector);

+			selector compositeSelector = CSSFactory.eINSTANCE.createselector();

+			compositeSelector.setSelector(baseSelector);

+

 

-			SimpleSelector diagramSelector = CssFactory.eINSTANCE.createSimpleSelector();

-			diagramSelector.setElementName(diagramType);

-			compositeSelector.setLeft(diagramSelector);

+			simple_selector diagramSelector = createSimpleElementSelector(diagramType, false);

+

+			compositeSelector.getSimpleselectors().add(diagramSelector);

 

 			ruleset.getSelectors().add(compositeSelector);

 		} else {

-			ruleset.getSelectors().add(selector);

+			ruleset.getSelectors().add(baseSelector);

 		}

 

 		if (dialog.getCSSClass() != null) {

 			String cssClass = dialog.getCSSClass();

-			org.eclipse.papyrus.infra.gmfdiag.css.Class classCondition = CssFactory.eINSTANCE.createClass();

-			classCondition.setClass(cssClass);

-			selector.getCondition().add(classCondition);

+			ClassSelector classCondition = CSSFactory.eINSTANCE.createClassSelector();

+			classCondition.setName(cssClass);

+			simple_selector.getSubSelectors().add(classCondition);

 		}

 

-		for (SelectorCondition condition : conditions.keySet()) {

+		for (CssSelector condition : conditions.keySet()) {

 			if (conditions.get(condition)) {

-				selector.getCondition().add(condition);

+				simple_selector.getSubSelectors().add(condition);

 			}

 		}

 

-		for (Declaration declaration : declarations.keySet()) {

+		for (css_declaration declaration : declarations.keySet()) {

 			if (declarations.get(declaration)) {

-				ruleset.getProperties().add(declaration);

+				ruleset.getDeclarations().add(declaration);

 			}

 		}

 

-		Stylesheet xtextStylesheet = getStyleSheet(dialog, view);

+		stylesheet xtextStylesheet = getStyleSheet(dialog, view);

 

 		if (xtextStylesheet == null) {

 			return null;

@@ -159,8 +161,8 @@ public abstract class AbstractStyleHandler extends AbstractHandler {
 

 		Resource resource = xtextStylesheet.eResource();

 

-		if (!xtextStylesheet.getContents().contains(ruleset)) {

-			xtextStylesheet.getContents().add(ruleset);

+		if (!xtextStylesheet.getRuleset().contains(ruleset)) {

+			xtextStylesheet.getRuleset().add(ruleset);

 		}

 

 		try {

@@ -179,14 +181,28 @@ public abstract class AbstractStyleHandler extends AbstractHandler {
 		return null;

 	}

 

-	protected abstract AbstractStyleDialog createStyleDialog(Shell shell, Map<Declaration, Boolean> declarations, Map<Attribute, Boolean> conditions, String selectorName, View context);

+	protected simple_selector createSimpleElementSelector(String elementName, boolean universal) {

+		simple_selector simple_selector = CSSFactory.eINSTANCE.createsimple_selector();

 

-	protected abstract Ruleset getRuleset(AbstractStyleDialog dialog);

+		if (universal) {

+			simple_selector.setUniversal(CSSFactory.eINSTANCE.createUniversalSelector());

+		} else {

+			ElementSelector elementSelector = CSSFactory.eINSTANCE.createElementSelector();

+			elementSelector.setName(elementName);

+			simple_selector.setElement(elementSelector);

+		}

 

-	protected abstract Stylesheet getStyleSheet(AbstractStyleDialog dialog, View contextView);

+		return simple_selector;

+	}

+

+	protected abstract AbstractStyleDialog createStyleDialog(Shell shell, Map<css_declaration, Boolean> declarations, Map<AttributeSelector, Boolean> conditions, String selectorName, View context);

+

+	protected abstract ruleset getRuleset(AbstractStyleDialog dialog);

 

-	protected Map<Declaration, Boolean> handleStyles(View view) {

-		Map<Declaration, Boolean> declarations = new LinkedHashMap<Declaration, Boolean>();

+	protected abstract stylesheet getStyleSheet(AbstractStyleDialog dialog, View contextView);

+

+	protected Map<css_declaration, Boolean> handleStyles(View view) {

+		Map<css_declaration, Boolean> declarations = new LinkedHashMap<css_declaration, Boolean>();

 

 		for (Object styleObject : view.getStyles()) {

 			Style style = (Style) styleObject;

@@ -204,20 +220,18 @@ public abstract class AbstractStyleHandler extends AbstractHandler {
 		return declarations;

 	}

 

-	protected Map<Attribute, Boolean> handleSemantic(View view) {

-		Map<Attribute, Boolean> result = new LinkedHashMap<Attribute, Boolean>();

+	protected Map<AttributeSelector, Boolean> handleSemantic(View view) {

+		Map<AttributeSelector, Boolean> result = new LinkedHashMap<AttributeSelector, Boolean>();

 

 		EObject semanticElement = view.getElement();

 

 		for (EStructuralFeature feature : semanticElement.eClass().getEAllStructuralFeatures()) {

 			if (isBoolean(feature) || isInteger(feature) || feature.getEType() instanceof EEnum) {

-				Attribute attributeCondition = CssFactory.eINSTANCE.createAttribute();

-				attributeCondition.setName(feature.getName());

+				AttributeSelector attributeCondition = CSSFactory.eINSTANCE.createAttributeSelector();

 

-				AttributeValue attributeValue = CssFactory.eINSTANCE.createAttributeValue();

-				attributeValue.setOperator(ATTRIBUTE_OP.EQUALS);

-				attributeValue.setValue(semanticElement.eGet(feature).toString());

-				attributeCondition.setValue(attributeValue);

+				attributeCondition.setName(feature.getName());

+				attributeCondition.setOp("=");

+				attributeCondition.setValue(semanticElement.eGet(feature).toString());

 

 				boolean check = semanticElement.eGet(feature) != feature.getDefaultValue();

 

@@ -258,12 +272,12 @@ public abstract class AbstractStyleHandler extends AbstractHandler {
 		return false;

 	}

 

-	protected Map<Declaration, Boolean> handleStyle(Style style) {

+	protected Map<css_declaration, Boolean> handleStyle(Style style) {

 		if (style instanceof NamedStyle) {

 			return Collections.emptyMap();

 		}

 

-		Map<Declaration, Boolean> declarations = new LinkedHashMap<Declaration, Boolean>();

+		Map<css_declaration, Boolean> declarations = new LinkedHashMap<css_declaration, Boolean>();

 

 		for (EStructuralFeature feature : style.eClass().getEAllStructuralFeatures()) {

 			if (NotationPackage.eINSTANCE.getStyle().isSuperTypeOf(feature.getEContainingClass())) {

@@ -271,8 +285,8 @@ public abstract class AbstractStyleHandler extends AbstractHandler {
 				Object defaultValue = feature.getDefaultValue();

 				boolean check = currentValue == null ? currentValue != defaultValue : !currentValue.equals(defaultValue);

 

-				Declaration declaration = handleStyleFeature(style, feature);

-				if (declaration.getExpression() != null) { // If expression is null, the type of this property is not supported

+				css_declaration declaration = handleStyleFeature(style, feature);

+				if (!declaration.getValueTokens().isEmpty()) { // If expression is null, the type of this property is not supported

 					declarations.put(declaration, check);

 				}

 			}

@@ -283,8 +297,8 @@ public abstract class AbstractStyleHandler extends AbstractHandler {
 

 	// FIXME: Use constants for the CSS Properties names

 	// FIXME: Use a helper to determine whether the custom styles are computed or forced

-	protected Map<Declaration, Boolean> handleCustomStyle(CustomStyle customStyle, View view) {

-		Map<Declaration, Boolean> declarations = new LinkedHashMap<Declaration, Boolean>();

+	protected Map<css_declaration, Boolean> handleCustomStyle(CustomStyle customStyle, View view) {

+		Map<css_declaration, Boolean> declarations = new LinkedHashMap<css_declaration, Boolean>();

 

 		GMFToCSSConverter converter = GMFToCSSConverter.instance;

 

@@ -295,48 +309,67 @@ public abstract class AbstractStyleHandler extends AbstractHandler {
 		return declarations;

 	}

 

-	protected void handleCustomStyle(View view, String cssProperty, String eAnnotationName, Map<Declaration, Boolean> result, Expression value) {

-		Declaration cssDeclaration = CssFactory.eINSTANCE.createDeclaration();

-		cssDeclaration.setProperty(cssProperty);

-		cssDeclaration.setExpression(value);

+	protected void handleCustomStyle(View view, String cssProperty, String eAnnotationName, Map<css_declaration, Boolean> result, List<CssTok> expression) {

+		css_declaration cssDeclaration = CSSFactory.eINSTANCE.createcss_declaration();

+

+		setProperty(cssDeclaration, cssProperty);

+

+		setValueTokens(cssDeclaration, expression);

 

 		boolean check = view.getEAnnotation(eAnnotationName) != null;

 		result.put(cssDeclaration, check);

 	}

 

-	protected Declaration handleStyleFeature(Style style, EStructuralFeature feature) {

-		Declaration declaration = CssFactory.eINSTANCE.createDeclaration();

-		declaration.setProperty(feature.getName());

+	protected css_declaration handleStyleFeature(Style style, EStructuralFeature feature) {

+		css_declaration declaration = CSSFactory.eINSTANCE.createcss_declaration();

+

+		setProperty(declaration, feature.getName());

 

 		GMFToCSSConverter converter = GMFToCSSConverter.instance;

 

 		if (isString(feature)) {

-			declaration.setExpression(converter.convert((String) style.eGet(feature)));

+			setValueTokens(declaration, converter.convert((String) style.eGet(feature)));

 		}

 

 		if (isInteger(feature)) {

 			if (feature.getName().endsWith("Color")) {

 				Color color = FigureUtilities.integerToColor((Integer) style.eGet(feature));

-				declaration.setExpression(converter.convert(color));

+				setValueTokens(declaration, converter.convert(color));

 				color.dispose();

 			} else {

-				declaration.setExpression(converter.convert((Integer) style.eGet(feature)));

+				setValueTokens(declaration, converter.convert((Integer) style.eGet(feature)));

 			}

 		}

 

 		if (feature.getEType() == NotationPackage.eINSTANCE.getGradientData()) {

-			declaration.setExpression(converter.convert((GradientData) style.eGet(feature)));

+			setValueTokens(declaration, converter.convert((GradientData) style.eGet(feature)));

 		}

 

 		if (feature.getEType() instanceof EEnum) {

-			declaration.setExpression(converter.convert((Enumerator) style.eGet(feature)));

+			setValueTokens(declaration, converter.convert((Enumerator) style.eGet(feature)));

 		}

 

 		if (isBoolean(feature)) {

-			declaration.setExpression(converter.convert((Boolean) style.eGet(feature)));

+			setValueTokens(declaration, converter.convert((Boolean) style.eGet(feature)));

 		}

 

 		return declaration;

 	}

 

+	protected final void setProperty(css_declaration declaration, String property) {

+		css_property cssProperty = CSSFactory.eINSTANCE.createcss_property();

+		cssProperty.setName(property);

+		declaration.setProperty(cssProperty);

+	}

+

+	protected final void setValueTokens(css_declaration declaration, List<CssTok> tokens) {

+		declaration.getValueTokens().clear();

+		declaration.getValueTokens().addAll(tokens);

+	}

+

+	protected final void setCharset(stylesheet stylesheet, String charset) {

+		charset cssCharset = CSSFactory.eINSTANCE.createcharset();

+		cssCharset.setCharset(charset);

+	}

+

 }

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/CreateStyleHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/CreateStyleHandler.java
index 7fb52426147..6cf970b662d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/CreateStyleHandler.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/CreateStyleHandler.java
@@ -16,14 +16,14 @@ import java.util.Map;
 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssFactory;

-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet;

 import org.eclipse.papyrus.infra.gmfdiag.css.configuration.helper.XtextStylesheetHelper;

 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;

 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSFactory;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Shell;

 

@@ -31,17 +31,17 @@ import org.eclipse.swt.widgets.Shell;
 public class CreateStyleHandler extends AbstractStyleHandler {

 

 	@Override

-	protected AbstractStyleDialog createStyleDialog(Shell shell, Map<Declaration, Boolean> declarations, Map<Attribute, Boolean> conditions, String selectorName, View context) {

+	protected AbstractStyleDialog createStyleDialog(Shell shell, Map<css_declaration, Boolean> declarations, Map<AttributeSelector, Boolean> conditions, String selectorName, View context) {

 		return new StyleCreationDialog(shell, conditions, declarations, selectorName, context);

 	}

 

 	@Override

-	protected Ruleset getRuleset(AbstractStyleDialog dialog) {

-		return CssFactory.eINSTANCE.createRuleset();

+	protected ruleset getRuleset(AbstractStyleDialog dialog) {

+		return CSSFactory.eINSTANCE.createruleset();

 	}

 

 	@Override

-	protected Stylesheet getStyleSheet(AbstractStyleDialog dialog, View contextView) {

+	protected stylesheet getStyleSheet(AbstractStyleDialog dialog, View contextView) {

 		StyleSheet styleSheet = ((StyleCreationDialog) dialog).getStyleSheet();

 

 		if (styleSheet == null) {

@@ -61,14 +61,14 @@ public class CreateStyleHandler extends AbstractStyleHandler {
 			return null;

 		}

 

-		Stylesheet xtextStylesheet;

+		stylesheet xtextStylesheet;

 

 		if (resource.getContents().isEmpty()) {

-			xtextStylesheet = CssFactory.eINSTANCE.createStylesheet();

-			xtextStylesheet.setCharset("UTF-8");

+			xtextStylesheet = CSSFactory.eINSTANCE.createstylesheet();

+			setCharset(xtextStylesheet, "UTF-8");

 			resource.getContents().add(xtextStylesheet);

 		} else {

-			xtextStylesheet = (Stylesheet) resource.getContents().get(0);

+			xtextStylesheet = (stylesheet) resource.getContents().get(0);

 		}

 

 		return xtextStylesheet;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/EditStyleHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/EditStyleHandler.java
index a7c4d66f481..a38ee96831e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/EditStyleHandler.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/EditStyleHandler.java
@@ -14,30 +14,30 @@ package org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler;
 import java.util.Map;

 

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;

 import org.eclipse.swt.widgets.Shell;

 

 

 public class EditStyleHandler extends AbstractStyleHandler {

 

 	@Override

-	protected AbstractStyleDialog createStyleDialog(Shell shell, Map<Declaration, Boolean> declarations, Map<Attribute, Boolean> conditions, String selectorName, View context) {

+	protected AbstractStyleDialog createStyleDialog(Shell shell, Map<css_declaration, Boolean> declarations, Map<AttributeSelector, Boolean> conditions, String selectorName, View context) {

 		return new StyleEditionDialog(shell, conditions, declarations, selectorName, context);

 	}

 

 	@Override

-	protected Ruleset getRuleset(AbstractStyleDialog dialog) {

-		Ruleset ruleset = ((StyleEditionDialog) dialog).getSelectedRuleset();

+	protected ruleset getRuleset(AbstractStyleDialog dialog) {

+		ruleset ruleset = ((StyleEditionDialog) dialog).getSelectedRuleset();

 		ruleset.getSelectors().clear();

-		ruleset.getProperties().clear();

+		ruleset.getDeclarations().clear();

 		return ruleset;

 	}

 

 	@Override

-	protected Stylesheet getStyleSheet(AbstractStyleDialog dialog, View contextView) {

+	protected stylesheet getStyleSheet(AbstractStyleDialog dialog, View contextView) {

 		return ((StyleEditionDialog) dialog).getStylesheet();

 	}

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/GMFToCSSConverter.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/GMFToCSSConverter.java
index 315e3e65de5..d9935897fe3 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/GMFToCSSConverter.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/GMFToCSSConverter.java
@@ -11,20 +11,19 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler;

 

+import java.util.LinkedList;

+import java.util.List;

+

 import org.eclipse.emf.common.util.Enumerator;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

 import org.eclipse.gmf.runtime.notation.GradientStyle;

 import org.eclipse.gmf.runtime.notation.datatype.GradientData;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssFactory;

-import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

-import org.eclipse.papyrus.infra.gmfdiag.css.HexColor;

-import org.eclipse.papyrus.infra.gmfdiag.css.Name;

-import org.eclipse.papyrus.infra.gmfdiag.css.Number;

-import org.eclipse.papyrus.infra.gmfdiag.css.StringValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;

-import org.eclipse.papyrus.infra.gmfdiag.css.Term;

-import org.eclipse.papyrus.infra.gmfdiag.css.UNARY;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSFactory;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok;

 import org.eclipse.swt.graphics.Color;

 

 

@@ -36,22 +35,22 @@ public class GMFToCSSConverter {
 

 	}

 

-	public Expression convert(Color color) {

-		HexColor hexColor = getColor(color);

+	public List<CssTok> convert(Color color) {

+		ColorTok hexColor = getColor(color);

 		return getExpression(hexColor);

 	}

 

-	private HexColor getColor(Color color) {

-		HexColor hexColor = CssFactory.eINSTANCE.createHexColor();

+	private ColorTok getColor(Color color) {

+		ColorTok hexColor = CSSFactory.eINSTANCE.createColorTok();

 

 		String hexString = twoDigitsHexString(color.getRed()) + twoDigitsHexString(color.getGreen()) + twoDigitsHexString(color.getBlue());

-		hexColor.setValue(hexString.toUpperCase());

+		hexColor.setValue("#" + hexString.toUpperCase());

 		return hexColor;

 	}

 

-	private HexColor getColor(int color) {

+	private ColorTok getColor(int color) {

 		Color swtColor = FigureUtilities.integerToColor(color);

-		HexColor result = getColor(swtColor);

+		ColorTok result = getColor(swtColor);

 		swtColor.dispose();

 		return result;

 	}

@@ -64,73 +63,67 @@ public class GMFToCSSConverter {
 		return hexString;

 	}

 

-	public Expression convert(GradientData gradient) {

+	public List<CssTok> convert(GradientData gradient) {

 		if (gradient == null) {

-			Name noGradient = CssFactory.eINSTANCE.createName();

-			noGradient.setValue("none");

+			IdentifierTok noGradient = CSSFactory.eINSTANCE.createIdentifierTok();

+			noGradient.setName("none");

 			return getExpression(noGradient);

 		}

 

-		HexColor gradientColor = getColor(gradient.getGradientColor1());

+		ColorTok gradientColor = getColor(gradient.getGradientColor1());

 

-		Name gradientStyle = CssFactory.eINSTANCE.createName();

+		IdentifierTok gradientStyle = CSSFactory.eINSTANCE.createIdentifierTok();

 		int style = gradient.getGradientStyle();

 

 		if (style == GradientStyle.HORIZONTAL) {

-			gradientStyle.setValue("horizontal");

+			gradientStyle.setName("horizontal");

 		} else {

-			gradientStyle.setValue("vertical");

+			gradientStyle.setName("vertical");

 		}

 

 		return getExpression(gradientColor, gradientStyle);

 	}

 

-	public Expression convert(String string) {

-		StringValue stringValue = CssFactory.eINSTANCE.createStringValue();

-		stringValue.setValue(string);

+	public List<CssTok> convert(String string) {

+		StringTok stringValue = CSSFactory.eINSTANCE.createStringTok();

+		stringValue.setValue("\"" + string + "\"");

 		return getExpression(stringValue);

 	}

 

-	public Expression convert(Integer intValue) {

-		Number numberValue = CssFactory.eINSTANCE.createNumber();

-		numberValue.setValue(Integer.toString(Math.abs(intValue)));

-		if (intValue < 0) {

-			UnaryOperator operator = CssFactory.eINSTANCE.createUnaryOperator();

-			operator.setOperator(UNARY.NEG);

-			numberValue.setOp(operator);

-		}

+	public List<CssTok> convert(Integer intValue) {

+		NumberTok numberValue = CSSFactory.eINSTANCE.createNumberTok();

+		numberValue.setVal(intValue);

+		// if (intValue < 0) {

+		// UnaryOperator operator = CssFactory.eINSTANCE.createUnaryOperator();

+		// operator.setOperator(UNARY.NEG);

+		// numberValue.setOp(operator);

+		// }

 

 		return getExpression(numberValue);

 	}

 

-	public Expression convert(Enumerator enumerated) {

-		Name literalValue = CssFactory.eINSTANCE.createName();

+	public List<CssTok> convert(Enumerator enumerated) {

+		IdentifierTok literalValue = CSSFactory.eINSTANCE.createIdentifierTok();

 

-		literalValue.setValue(enumerated.getName());

+		literalValue.setName(enumerated.getName());

 

 		return getExpression(literalValue);

 	}

 

-	private Expression getExpression(Term... values) {

-		if (values.length == 0) {

-			throw new IllegalArgumentException("An expression must contain at least one value");

-		}

-

-		Expression result = CssFactory.eINSTANCE.createExpression();

-		result.setTerms(values[0]);

-

-		for (int i = 1; i < values.length; i++) {

-			Subterm subterm = CssFactory.eINSTANCE.createSubterm();

-			subterm.setTerm(values[i]);

-			result.getSubterms().add(subterm);

+	private List<CssTok> getExpression(CssTok... values) {

+		List<CssTok> result = new LinkedList<CssTok>();

+		for (CssTok value : values) {

+			if (!result.isEmpty()) {

+				result.add(CSSFactory.eINSTANCE.createWSTok());

+			}

+			result.add(value);

 		}

-

 		return result;

 	}

 

-	public Expression convert(boolean booleanValue) {

-		Name nameValue = CssFactory.eINSTANCE.createName();

-		nameValue.setValue(booleanValue ? "true" : "false");

+	public List<CssTok> convert(boolean booleanValue) {

+		IdentifierTok nameValue = CSSFactory.eINSTANCE.createIdentifierTok();

+		nameValue.setName(booleanValue ? "true" : "false");

 		return getExpression(nameValue);

 	}

 }

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleCreationDialog.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleCreationDialog.java
index 017a8d46c46..8a991ac6fc7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleCreationDialog.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleCreationDialog.java
@@ -14,14 +14,14 @@ package org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler;
 import java.util.Map;

 

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

 import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetContentProvider;

 import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetLabelProvider;

 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;

 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;

 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

 import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

 import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

 import org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog;

@@ -59,7 +59,7 @@ public class StyleCreationDialog extends AbstractStyleDialog {
 	 *            inout

 	 * @param selectorName

 	 */

-	public StyleCreationDialog(Shell shell, Map<Attribute, Boolean> conditions, Map<Declaration, Boolean> declarations, String selectorName, View context) {

+	public StyleCreationDialog(Shell shell, Map<AttributeSelector, Boolean> conditions, Map<css_declaration, Boolean> declarations, String selectorName, View context) {

 		super(shell, conditions, declarations, selectorName, context);

 	}

 

@@ -116,6 +116,7 @@ public class StyleCreationDialog extends AbstractStyleDialog {
 		externalStylesheetEditor.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));

 		externalStylesheetEditor.addCommitListener(new ICommitListener() {

 

+			@Override

 			public void commit(AbstractEditor editor) {

 				String path = (String) ((StringEditor) editor).getValue();

 

@@ -150,6 +151,7 @@ public class StyleCreationDialog extends AbstractStyleDialog {
 		embeddedStylesheetEditor.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));

 		embeddedStylesheetEditor.addCommitListener(new ICommitListener() {

 

+			@Override

 			public void commit(AbstractEditor editor) {

 				// TODO: Check empty names & set the stylesheet to null when the name is null/empty

 				String name = (String) ((StringEditor) editor).getValue();

@@ -173,6 +175,7 @@ public class StyleCreationDialog extends AbstractStyleDialog {
 		appliedStylesheetEditor.setLabelProvider(new CSSStyleSheetLabelProvider());

 		appliedStylesheetEditor.addCommitListener(new ICommitListener() {

 

+			@Override

 			public void commit(AbstractEditor editor) {

 				StyleSheet value = (StyleSheet) ((ReferenceDialog) editor).getValue();

 				if (!(ignoreEvents && value == null)) {

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleEditionDialog.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleEditionDialog.java
index 2ad53e45167..18adf894298 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleEditionDialog.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleEditionDialog.java
@@ -22,17 +22,16 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

 import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

-import org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css.Selector;

-import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;

-import org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet;

 import org.eclipse.papyrus.infra.gmfdiag.css.configuration.providers.ExistingStyleContentProvider;

 import org.eclipse.papyrus.infra.gmfdiag.css.configuration.providers.StylesheetLabelProvider;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.custom.SashForm;

 import org.eclipse.swt.layout.GridData;

@@ -60,7 +59,7 @@ public class StyleEditionDialog extends AbstractStyleDialog implements ISelectio
 

 	protected Composite styleEditionPanel;

 

-	protected Ruleset ruleset;

+	protected ruleset ruleset;

 

 	/**

 	 *

@@ -71,7 +70,7 @@ public class StyleEditionDialog extends AbstractStyleDialog implements ISelectio
 	 *            inout

 	 * @param selectorName

 	 */

-	public StyleEditionDialog(Shell shell, Map<Attribute, Boolean> conditions, Map<Declaration, Boolean> declarations, String selectorName, View context) {

+	public StyleEditionDialog(Shell shell, Map<AttributeSelector, Boolean> conditions, Map<css_declaration, Boolean> declarations, String selectorName, View context) {

 		super(shell, conditions, declarations, selectorName, context);

 	}

 

@@ -126,17 +125,18 @@ public class StyleEditionDialog extends AbstractStyleDialog implements ISelectio
 		styleSelectionPanel.getParent().layout();

 	}

 

-	protected Stylesheet getStylesheet() {

+	protected stylesheet getStylesheet() {

 		if (ruleset != null) {

-			return (Stylesheet) ruleset.eContainer();

+			return (stylesheet) ruleset.eContainer();

 		}

 		return null;

 	}

 

-	public Ruleset getSelectedRuleset() {

+	public ruleset getSelectedRuleset() {

 		return ruleset;

 	}

 

+	@Override

 	public void selectionChanged(SelectionChangedEvent event) {

 		ISelection selection = event.getSelection();

 		if (selection.isEmpty()) {

@@ -146,8 +146,8 @@ public class StyleEditionDialog extends AbstractStyleDialog implements ISelectio
 		if (selection instanceof IStructuredSelection) {

 			IStructuredSelection sSelection = (IStructuredSelection) selection;

 			Object selectedElement = sSelection.getFirstElement();

-			if (selectedElement instanceof Ruleset) {

-				handleSelectionChanged((Ruleset) selectedElement);

+			if (selectedElement instanceof ruleset) {

+				handleSelectionChanged((ruleset) selectedElement);

 			} else {

 				ruleset = null;

 			}

@@ -156,16 +156,16 @@ public class StyleEditionDialog extends AbstractStyleDialog implements ISelectio
 		updateButtons();

 	}

 

-	protected void handleSelectionChanged(Ruleset selectedRuleset) {

+	protected void handleSelectionChanged(ruleset selectedRuleset) {

 		this.ruleset = selectedRuleset;

 

 		// Sets all conditions to false. They will be set to true if the selected style contains the same condition

-		for (Attribute attribute : conditions.keySet()) {

+		for (AttributeSelector attribute : conditions.keySet()) {

 			conditions.put(attribute, false);

 		}

 

 		// Sets all properties to false. They will be set to true if the selected style contains the same property

-		for (Declaration declaration : declarations.keySet()) {

+		for (css_declaration declaration : declarations.keySet()) {

 			declarations.put(declaration, false);

 		}

 

@@ -175,20 +175,20 @@ public class StyleEditionDialog extends AbstractStyleDialog implements ISelectio
 

 		cssClass = null;

 

-		for (Selector selector : selectedRuleset.getSelectors()) {

+		for (selector selector : selectedRuleset.getSelectors()) {

 			handleSelector(selector);

 		}

 

-		handleDeclarations(selectedRuleset.getProperties());

+		handleDeclarations(selectedRuleset.getDeclarations());

 

 		updateContents();

 		updateSelectorLabel();

 	}

 

-	protected void handleDeclarations(List<Declaration> declarations) {

-		for (Declaration declaration : declarations) {

-			for (Declaration currentDeclaration : this.declarations.keySet()) {

-				if (currentDeclaration.getProperty().equals(declaration.getProperty())) {

+	protected void handleDeclarations(List<css_declaration> declarations) {

+		for (css_declaration declaration : declarations) {

+			for (css_declaration currentDeclaration : this.declarations.keySet()) {

+				if (equals(currentDeclaration.getProperty(), declaration.getProperty())) {

 					this.declarations.put(currentDeclaration, true);

 					break;

 				}

@@ -196,34 +196,26 @@ public class StyleEditionDialog extends AbstractStyleDialog implements ISelectio
 		}

 	}

 

-	protected void handleSelector(Selector selector) {

-		if (selector instanceof SimpleSelector) {

-			handleSelector((SimpleSelector) selector);

-		} else if (selector instanceof CompositeSelector) {

-			handleSelector((CompositeSelector) selector);

-		}

-	}

-

-	protected void handleSelector(SimpleSelector selector) {

-		if (getDiagramType(contextView.getDiagram()).equals(selector.getElementName())) {

+	protected void handleSelector(simple_selector selector) {

+		if (getDiagramType(contextView.getDiagram()).equals(getElementName(selector))) {

 			diagramRestriction = true;

 		}

 

-		if (contextView.getElement().eClass().getName().equals(selector.getElementName())) {

+		if (contextView.getElement().eClass().getName().equals(getElementName(selector))) {

 			useSelectorName = true;

 		}

 

-		for (SelectorCondition condition : selector.getCondition()) {

-			if (condition instanceof Attribute) {

-				Attribute existingAttribute = (Attribute) condition;

-				for (Attribute selectedAttribute : conditions.keySet()) {

+		for (CssSelector condition : selector.getSubSelectors()) {

+			if (condition instanceof AttributeSelector) {

+				AttributeSelector existingAttribute = (AttributeSelector) condition;

+				for (AttributeSelector selectedAttribute : conditions.keySet()) {

 					if (existingAttribute.getName().equals(selectedAttribute.getName())) {

 						conditions.put(selectedAttribute, true);

 						break;

 					}

 				}

-			} else if (condition.eClass() == CssPackage.eINSTANCE.getClass_()) {

-				cssClass = ((org.eclipse.papyrus.infra.gmfdiag.css.Class) condition).getClass_();

+			} else if (condition instanceof ClassSelector) {

+				cssClass = ((ClassSelector) condition).getName();

 			}

 		}

 	}

@@ -247,9 +239,16 @@ public class StyleEditionDialog extends AbstractStyleDialog implements ISelectio
 		}

 	}

 

-	protected void handleSelector(CompositeSelector selector) {

-		handleSelector(selector.getLeft());

-		handleSelector(selector.getRight());

+	protected void handleSelector(selector selector) {

+		if (selector == null) {

+			return;

+		}

+

+		for (simple_selector simpleSelector : selector.getSimpleselectors()) {

+			handleSelector(simpleSelector);

+		}

+

+		handleSelector(selector.getSelector());

 	}

 

 	@Override

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/ExistingStyleContentProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/ExistingStyleContentProvider.java
index fb54c330335..c4fc5919385 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/ExistingStyleContentProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/ExistingStyleContentProvider.java
@@ -13,7 +13,6 @@ package org.eclipse.papyrus.infra.gmfdiag.css.configuration.providers;
 

 import java.util.Collection;

 import java.util.LinkedHashMap;

-import java.util.LinkedList;

 import java.util.List;

 import java.util.Map;

 

@@ -21,20 +20,19 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.gmfdiag.css.Content;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet;

 import org.eclipse.papyrus.infra.gmfdiag.css.configuration.helper.XtextStylesheetHelper;

 import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;

 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;

 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;

 import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;

 

 

 public class ExistingStyleContentProvider implements IHierarchicContentProvider {

 

-	protected Map<StyleSheet, Stylesheet> stylesheets;

+	protected Map<StyleSheet, stylesheet> stylesheets;

 

 	protected final View context;

 

@@ -42,6 +40,7 @@ public class ExistingStyleContentProvider implements IHierarchicContentProvider
 		this.context = context;

 	}

 

+	@Override

 	public Object[] getElements(Object inputElement) {

 		Collection<StyleSheet> stylesheets = getStyleSheets();

 		if (stylesheets.isEmpty()) {

@@ -51,55 +50,53 @@ public class ExistingStyleContentProvider implements IHierarchicContentProvider
 		return stylesheets.toArray();

 	}

 

+	@Override

 	public Object[] getChildren(Object parentElement) {

 		if (parentElement instanceof StyleSheet) {

-			Stylesheet xtextStylesheet = stylesheets.get(parentElement);

+			stylesheet xtextStylesheet = stylesheets.get(parentElement);

 

-			List<Ruleset> result = new LinkedList<Ruleset>();

-

-			for (Content stylesheetElement : xtextStylesheet.getContents()) {

-				if (stylesheetElement instanceof Ruleset) {

-					result.add((Ruleset) stylesheetElement);

-				}

-			}

-

-			return result.toArray();

+			return xtextStylesheet.getRuleset().toArray();

 		} else {

 			return new Object[0];

 		}

 	}

 

+	@Override

 	public Object getParent(Object element) {

-		if (element instanceof Stylesheet) {

+		if (element instanceof stylesheet) {

 			return null;

 		}

 

-		if (element instanceof Ruleset) {

-			return ((Ruleset) element).eContainer();

+		if (element instanceof ruleset) {

+			return ((ruleset) element).eContainer();

 		}

 

 		return null;

 	}

 

+	@Override

 	public boolean hasChildren(Object element) {

 		return getChildren(element).length > 0;

 	}

 

+	@Override

 	public void dispose() {

 

 	}

 

+	@Override

 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

 

 	}

 

+	@Override

 	public boolean isValidValue(Object element) {

-		return element instanceof Ruleset;

+		return element instanceof ruleset;

 	}

 

 	protected Collection<StyleSheet> getStyleSheets() {

 		if (stylesheets == null) {

-			stylesheets = new LinkedHashMap<StyleSheet, Stylesheet>();

+			stylesheets = new LinkedHashMap<StyleSheet, stylesheet>();

 			if (context.getDiagram() instanceof CSSDiagram) {

 				CSSDiagram diagram = (CSSDiagram) context.getDiagram();

 				parseStyleSheets(diagram.getStyleSheets());

@@ -125,8 +122,8 @@ public class ExistingStyleContentProvider implements IHierarchicContentProvider
 		}

 

 		for (EObject rootElement : resource.getContents()) {

-			if (rootElement instanceof Stylesheet) {

-				stylesheets.put(stylesheet, (Stylesheet) rootElement);

+			if (rootElement instanceof stylesheet) {

+				stylesheets.put(stylesheet, (stylesheet) rootElement);

 			}

 		}

 	}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/StylesheetLabelProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/StylesheetLabelProvider.java
index 976617b27e6..cd5f351fbd5 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/StylesheetLabelProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/StylesheetLabelProvider.java
@@ -12,10 +12,10 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.configuration.providers;

 

 import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider;

-import org.eclipse.papyrus.infra.gmfdiag.CSSRuntimeModule;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;

 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

+import org.eclipse.papyrus.infra.gmfdiag.css3.CSSRuntimeModule;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Image;

@@ -40,8 +40,8 @@ public class StylesheetLabelProvider extends EMFLabelProvider {
 

 	@Override

 	public String getText(Object element) {

-		if (element instanceof Ruleset) {

-			return getText((Ruleset) element);

+		if (element instanceof ruleset) {

+			return getText((ruleset) element);

 		}

 

 		if (element instanceof StyleSheetReference) {

@@ -55,7 +55,7 @@ public class StylesheetLabelProvider extends EMFLabelProvider {
 		return super.getText(element);

 	}

 

-	public String getText(Ruleset ruleset) {

+	public String getText(ruleset ruleset) {

 		// Delegate the label to XText serialization

 		String label = "";

 

@@ -80,7 +80,7 @@ public class StylesheetLabelProvider extends EMFLabelProvider {
 

 	@Override

 	public Color getForeground(Object element) {

-		if (!(element instanceof Ruleset)) {

+		if (!(element instanceof ruleset)) {

 			return Display.getCurrent().getSystemColor(SWT.COLOR_DARK_GRAY);

 		}

 		return super.getForeground(element);

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/.classpath b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/.classpath
index 2d1a4302f04..098194ca4b7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/.classpath
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

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

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

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

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..9ca8e68231b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1

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

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

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

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

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

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

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

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

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

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
index 3b4ce82cfd4..14940e3378a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
@@ -12,9 +12,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.e4.ui.css.core;bundle-version="0.10.2",

  org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.draw2d.ui;bundle-version="1.7.0",

- org.eclipse.draw2d;bundle-version="3.9.0"

+ org.eclipse.draw2d;bundle-version="3.9.0",

+ org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.0.0"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.1.0.qualifier

@@ -24,5 +24,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.debug.Activato
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.debug;singl

  eton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/src/org/eclipse/papyrus/infra/gmfdiag/css/debug/views/CSSDebugView.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/src/org/eclipse/papyrus/infra/gmfdiag/css/debug/views/CSSDebugView.java
index 0005e36680f..b61b31dddba 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/src/org/eclipse/papyrus/infra/gmfdiag/css/debug/views/CSSDebugView.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/src/org/eclipse/papyrus/infra/gmfdiag/css/debug/views/CSSDebugView.java
@@ -42,19 +42,19 @@ import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.ViewerCell;

 import org.eclipse.papyrus.infra.emf.Activator;

 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

-import org.eclipse.papyrus.infra.gmfdiag.css.HexColor;

-import org.eclipse.papyrus.infra.gmfdiag.css.Name;

-import org.eclipse.papyrus.infra.gmfdiag.css.Number;

-import org.eclipse.papyrus.infra.gmfdiag.css.StringValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;

-import org.eclipse.papyrus.infra.gmfdiag.css.Term;

 import org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler.GMFToCSSConverter;

 import org.eclipse.papyrus.infra.gmfdiag.css.dom.GMFElementAdapter;

 import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

 import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

 import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.util.CssSwitch;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.util.CSSSwitch;

 import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;

 import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;

 import org.eclipse.swt.SWT;

@@ -178,6 +178,7 @@ public class CSSDebugView extends ViewPart implements ISelectionListener, ISelec
 		// Nothing

 	}

 

+	@Override

 	public void selectionChanged(IWorkbenchPart part, ISelection selection) {

 		if (selection instanceof IStructuredSelection) {

 			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

@@ -246,6 +247,7 @@ public class CSSDebugView extends ViewPart implements ISelectionListener, ISelec
 		return view;

 	}

 

+	@Override

 	public void selectionChanged(SelectionChangedEvent event) {

 		ISelection selection = event.getSelection();

 		if (selection.isEmpty()) {

@@ -382,6 +384,7 @@ public class CSSDebugView extends ViewPart implements ISelectionListener, ISelec
 

 		public static FeatureComparator instance = new FeatureComparator();

 

+		@Override

 		public int compare(EStructuralFeature o1, EStructuralFeature o2) {

 			return Collator.getInstance().compare(o1.getName(), o2.getName());

 		}

@@ -500,47 +503,55 @@ public class CSSDebugView extends ViewPart implements ISelectionListener, ISelec
 		}

 	}

 

-	protected String getLabel(Expression expression) {

-		if (expression == null) {

+	protected String getLabel(List<CssTok> expression) {

+		if (expression == null || expression.isEmpty()) {

 			return "";

 		}

-		String label = getLabel(expression.getTerms());

-		for (Subterm subTerm : expression.getSubterms()) {

-			if (subTerm.getOperator() != null) {

-				label += subTerm.getOperator();

+

+

+		String label = "";

+		for (CssTok token : expression) {

+			if (token instanceof SymbolTok) {

+				label += token;

+			} else {

+				label += " " + getLabel(token);

 			}

-			label += " " + getLabel(subTerm.getTerm());

 		}

-		return label;

+

+		return label.trim().replaceAll("[ ]+", " ");

 	}

 

-	protected String getLabel(Term term) {

-		return (new CssSwitch<String>() {

+	protected String getLabel(CssTok term) {

+		return (new CSSSwitch<String>() {

 

 			@Override

-			public String caseHexColor(HexColor term) {

-				return '#' + term.getValue();

+			public String caseColorTok(ColorTok token) {

+				return token.getValue();

 			}

 

 			@Override

-			public String caseName(Name term) {

-				return term.getValue();

+			public String caseIdentifierTok(IdentifierTok token) {

+				return token.getName();

 			}

 

 			@Override

-			public String caseStringValue(StringValue term) {

-				return "\"" + term.getValue() + "\"";

+			public String caseStringTok(StringTok token) {

+				return token.getValue();

 			}

 

 			@Override

-			public String caseNumber(Number term) {

-				String label = "";

-				if (term.getOp() != null) {

-					label += term.getOp().getOperator();

-				}

-				label += term.getValue();

+			public String caseNumberTok(NumberTok token) {

+				return Double.toString(token.getVal());

+			}

+

+			@Override

+			public String caseUrlTok(UrlTok token) {

+				String label = "url('";

+				label += token.getUrl().getUrl();

+				label += "')";

 				return label;

 			}

+

 		}).doSwitch(term);

 	}

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 0b6f182917f..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.ui.contentassist,

- org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr,

- org.eclipse.papyrus.infra.gmfdiag.ui.internal,

- org.eclipse.papyrus.infra.gmfdiag.ui.quickfix

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.1.0",

- org.eclipse.xtext.ui,

- org.eclipse.ui.editors;bundle-version="3.5.0",

- org.eclipse.ui.ide;bundle-version="3.5.0",

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui,

- org.eclipse.xtext.builder,

- org.antlr.runtime,

- org.eclipse.xtext.common.types.ui,

- org.eclipse.xtext.ui.codetemplates.ui,

- org.eclipse.compare,

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.e4.ui.css.core;bundle-version="0.10.0",

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

- org.eclipse.gmf.runtime.notation;bundle-version="1.8.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.1.0.qualifier

-Bundle-Name: CSS Editor UI

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.ui.internal.CSSAct

- ivator

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui;si

- ngleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/plugin.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/plugin.xml
deleted file mode 100644
index 7af6bd21c08..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/plugin.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-    <extension
-            point="org.eclipse.ui.editors">
-        <editor
-              class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
-              contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
-              default="false"
-              extensions="css"
-              icon="icons/sourceEditor.gif"
-              id="org.eclipse.papyrus.infra.gmfdiag.CSS"
-              name="Papyrus CSS Editor">
-           <contentTypeBinding
-                 contentTypeId="org.eclipse.wst.css.core.csssource">
-           </contentTypeBinding>
-        </editor>
-    </extension>
-    <extension
-        point="org.eclipse.ui.handlers">
-        <handler
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
-            commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
-            <activeWhen>
-                <reference
-                    definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-                </reference>
-            </activeWhen>
-        </handler>
-        <handler
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
-            commandId="org.eclipse.papyrus.infra.gmfdiag.CSS.validate">
-         <activeWhen>
-            <reference
-                    definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-            </reference>
-         </activeWhen>
-      </handler>
-    </extension>
-    <extension point="org.eclipse.core.expressions.definitions">
-        <definition id="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-            <and>
-                <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
-                <with variable="activeEditor">
-                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 
-                        value="org.eclipse.papyrus.infra.gmfdiag.CSS" 
-                        forcePluginActivation="true"/>
-                </with>        
-            </and>
-        </definition>
-    </extension>
-    <extension
-            point="org.eclipse.ui.preferencePages">
-        <page
-              category="org.eclipse.papyrus.embeddededitors"
-              class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
-              id="org.eclipse.papyrus.infra.gmfdiag.CSS"
-              name="CSS">
-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-        </page>
-        <page
-            category="org.eclipse.papyrus.infra.gmfdiag.CSS"
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS.coloring"
-            name="Syntax Coloring">
-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-        </page>
-        <page
-            category="org.eclipse.papyrus.infra.gmfdiag.CSS"
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS.templates"
-            name="Templates">
-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-        </page>
-    </extension>
-    <extension
-            point="org.eclipse.ui.propertyPages">
-        <page
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS"
-            name="CSS">
-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-            <enabledWhen>
-	            <adapt type="org.eclipse.core.resources.IProject"/>
-			</enabledWhen>
-	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
-        </page>
-    </extension>
-    <extension
-        point="org.eclipse.ui.keywords">
-        <keyword
-            id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"
-            label="CSS"/>
-    </extension>
-    <extension
-         point="org.eclipse.ui.commands">
-      <command
-            description="Trigger expensive validation"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS.validate"
-            name="Validate">
-      </command>
-    </extension>
-    <extension point="org.eclipse.ui.menus">
-        <menuContribution
-            locationURI="popup:#TextEditorContext?after=group.edit">
-             <command
-                 commandId="org.eclipse.papyrus.infra.gmfdiag.CSS.validate"
-                 style="push"
-                 tooltip="Trigger expensive validation">
-            <visibleWhen checkEnabled="false">
-                <reference
-                    definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-                </reference>
-            </visibleWhen>
-         </command>  
-         </menuContribution>
-    </extension>
-    <extension point="org.eclipse.ui.menus">
-		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
-			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">
-				<visibleWhen checkEnabled="false">
-                	<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-                	</reference>
-            	</visibleWhen>
-			</command>
-		</menuContribution>
-	</extension>
-	<extension point="org.eclipse.ui.handlers">
-	    <handler
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
-            commandId="org.eclipse.xtext.ui.editor.FindReferences">
-            <activeWhen>
-                <reference
-                    definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-                </reference>
-            </activeWhen>
-        </handler>
-    </extension>   
-
-<!-- adding resource factories -->
-
-	<extension
-		point="org.eclipse.emf.ecore.extension_parser">
-		<parser
-			class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"
-			type="css">
-		</parser>
-	</extension>
-	<extension point="org.eclipse.xtext.extension_resourceServiceProvider">
-        <resourceServiceProvider
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
-            uriExtension="css">
-        </resourceServiceProvider>
-    </extension>
-
-
-
-   <extension
-         point="org.eclipse.xtext.builder.participant">
-      <participant
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant">
-      </participant>
-   </extension>
-   <extension
-            point="org.eclipse.ui.preferencePages">
-        <page
-            category="org.eclipse.papyrus.infra.gmfdiag.CSS"
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS.compiler.preferencePage"
-            name="Compiler">
-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-        </page>
-    </extension>
-    <extension
-            point="org.eclipse.ui.propertyPages">
-        <page
-            category="org.eclipse.papyrus.infra.gmfdiag.CSS"
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS.compiler.propertyPage"
-            name="Compiler">
-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-            <enabledWhen>
-	            <adapt type="org.eclipse.core.resources.IProject"/>
-			</enabledWhen>
-	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
-        </page>
-    </extension>
-
-	<!-- Quick Outline -->
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler 
-			class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
-			commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
-			<activeWhen>
-				<reference
-					definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
-	<extension
-		point="org.eclipse.ui.commands">
-		<command
-			description="Open the quick outline."
-			id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
-			name="Quick Outline">
-		</command>
-	</extension>
-	<extension point="org.eclipse.ui.menus">
-		<menuContribution
-			locationURI="popup:#TextEditorContext?after=group.open">
-			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
-				style="push"
-				tooltip="Open Quick Outline">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened"/>
-				</visibleWhen>
-			</command>
-		</menuContribution>
-	</extension>
-   <!-- quickfix marker resolution generator -->
-   <extension
-         point="org.eclipse.ui.ide.markerResolution">
-      <markerResolutionGenerator
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator">
-      </markerResolutionGenerator>
-   </extension>
-   	<!-- Rename Refactoring -->
-	<extension point="org.eclipse.ui.handlers">
-		<handler 
-			class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.IRenameElementHandler"
-			commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
-			<activeWhen>
-				<reference
-					definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
-    <extension point="org.eclipse.ui.menus">
-         <menuContribution
-            locationURI="popup:#TextEditorContext?after=group.edit">
-         <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"
-               style="push">
-            <visibleWhen checkEnabled="false">
-               <reference
-                     definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-               </reference>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-   <extension point="org.eclipse.ui.preferencePages">
-	    <page
-	        category="org.eclipse.papyrus.infra.gmfdiag.CSS"
-	        class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"
-	        id="org.eclipse.papyrus.infra.gmfdiag.CSS.refactoring"
-	        name="Refactoring">
-	        <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-	    </page>
-	</extension>
-
-  <extension point="org.eclipse.compare.contentViewers">
-    <viewer id="org.eclipse.papyrus.infra.gmfdiag.CSS.compare.contentViewers"
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
-            extensions="css">
-    </viewer>
-  </extension>
-  <extension point="org.eclipse.compare.contentMergeViewers">
-    <viewer id="org.eclipse.papyrus.infra.gmfdiag.CSS.compare.contentMergeViewers"
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
-            extensions="css" label="CSS Compare">
-     </viewer>
-  </extension>
-
-</plugin>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/plugin.xml_gen b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/plugin.xml_gen
deleted file mode 100644
index 3dd149544a2..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/plugin.xml_gen
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-    <extension
-            point="org.eclipse.ui.editors">
-        <editor
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
-            contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
-            default="true"
-            extensions="css"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS"
-            name="CSS Editor">
-        </editor>
-    </extension>
-    <extension
-        point="org.eclipse.ui.handlers">
-        <handler
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
-            commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
-            <activeWhen>
-                <reference
-                    definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-                </reference>
-            </activeWhen>
-        </handler>
-        <handler
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
-            commandId="org.eclipse.papyrus.infra.gmfdiag.CSS.validate">
-         <activeWhen>
-            <reference
-                    definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-            </reference>
-         </activeWhen>
-      </handler>
-    </extension>
-    <extension point="org.eclipse.core.expressions.definitions">
-        <definition id="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-            <and>
-                <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
-                <with variable="activeEditor">
-                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 
-                        value="org.eclipse.papyrus.infra.gmfdiag.CSS" 
-                        forcePluginActivation="true"/>
-                </with>        
-            </and>
-        </definition>
-    </extension>
-    <extension
-            point="org.eclipse.ui.preferencePages">
-        <page
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS"
-            name="CSS">
-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-        </page>
-        <page
-            category="org.eclipse.papyrus.infra.gmfdiag.CSS"
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS.coloring"
-            name="Syntax Coloring">
-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-        </page>
-        <page
-            category="org.eclipse.papyrus.infra.gmfdiag.CSS"
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS.templates"
-            name="Templates">
-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-        </page>
-    </extension>
-    <extension
-            point="org.eclipse.ui.propertyPages">
-        <page
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS"
-            name="CSS">
-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-            <enabledWhen>
-	            <adapt type="org.eclipse.core.resources.IProject"/>
-			</enabledWhen>
-	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
-        </page>
-    </extension>
-    <extension
-        point="org.eclipse.ui.keywords">
-        <keyword
-            id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"
-            label="CSS"/>
-    </extension>
-    <extension
-         point="org.eclipse.ui.commands">
-      <command
-            description="Trigger expensive validation"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS.validate"
-            name="Validate">
-      </command>
-    </extension>
-    <extension point="org.eclipse.ui.menus">
-        <menuContribution
-            locationURI="popup:#TextEditorContext?after=group.edit">
-             <command
-                 commandId="org.eclipse.papyrus.infra.gmfdiag.CSS.validate"
-                 style="push"
-                 tooltip="Trigger expensive validation">
-            <visibleWhen checkEnabled="false">
-                <reference
-                    definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-                </reference>
-            </visibleWhen>
-         </command>  
-         </menuContribution>
-    </extension>
-    <extension point="org.eclipse.ui.menus">
-		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
-			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">
-				<visibleWhen checkEnabled="false">
-                	<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-                	</reference>
-            	</visibleWhen>
-			</command>
-		</menuContribution>
-	</extension>
-	<extension point="org.eclipse.ui.handlers">
-	    <handler
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
-            commandId="org.eclipse.xtext.ui.editor.FindReferences">
-            <activeWhen>
-                <reference
-                    definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-                </reference>
-            </activeWhen>
-        </handler>
-    </extension>   
-
-<!-- adding resource factories -->
-
-	<extension
-		point="org.eclipse.emf.ecore.extension_parser">
-		<parser
-			class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"
-			type="css">
-		</parser>
-	</extension>
-	<extension point="org.eclipse.xtext.extension_resourceServiceProvider">
-        <resourceServiceProvider
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
-            uriExtension="css">
-        </resourceServiceProvider>
-    </extension>
-
-
-    <!-- marker definitions for org.eclipse.papyrus.infra.gmfdiag.CSS -->
-    <extension
-            id="css.check.fast"
-            name="CSS Problem"
-            point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.xtext.ui.check.fast"/>
-        <persistent value="true"/>
-    </extension>
-    <extension
-            id="css.check.normal"
-            name="CSS Problem"
-            point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.xtext.ui.check.normal"/>
-        <persistent value="true"/>
-    </extension>
-    <extension
-            id="css.check.expensive"
-            name="CSS Problem"
-            point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.xtext.ui.check.expensive"/>
-        <persistent value="true"/>
-    </extension>
-
-   <extension
-         point="org.eclipse.xtext.builder.participant">
-      <participant
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant">
-      </participant>
-   </extension>
-   <extension
-            point="org.eclipse.ui.preferencePages">
-        <page
-            category="org.eclipse.papyrus.infra.gmfdiag.CSS"
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS.compiler.preferencePage"
-            name="Compiler">
-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-        </page>
-    </extension>
-    <extension
-            point="org.eclipse.ui.propertyPages">
-        <page
-            category="org.eclipse.papyrus.infra.gmfdiag.CSS"
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
-            id="org.eclipse.papyrus.infra.gmfdiag.CSS.compiler.propertyPage"
-            name="Compiler">
-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-            <enabledWhen>
-	            <adapt type="org.eclipse.core.resources.IProject"/>
-			</enabledWhen>
-	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
-        </page>
-    </extension>
-
-	<!-- Quick Outline -->
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler 
-			class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
-			commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
-			<activeWhen>
-				<reference
-					definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
-	<extension
-		point="org.eclipse.ui.commands">
-		<command
-			description="Open the quick outline."
-			id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
-			name="Quick Outline">
-		</command>
-	</extension>
-	<extension point="org.eclipse.ui.menus">
-		<menuContribution
-			locationURI="popup:#TextEditorContext?after=group.open">
-			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
-				style="push"
-				tooltip="Open Quick Outline">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened"/>
-				</visibleWhen>
-			</command>
-		</menuContribution>
-	</extension>
-    <!-- quickfix marker resolution generator for org.eclipse.papyrus.infra.gmfdiag.CSS -->
-    <extension
-            point="org.eclipse.ui.ide.markerResolution">
-        <markerResolutionGenerator
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
-            markerType="org.eclipse.papyrus.infra.gmfdiag.ui.css.check.fast">
-            <attribute
-                name="FIXABLE_KEY"
-                value="true">
-            </attribute>
-        </markerResolutionGenerator>
-        <markerResolutionGenerator
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
-            markerType="org.eclipse.papyrus.infra.gmfdiag.ui.css.check.normal">
-            <attribute
-                name="FIXABLE_KEY"
-                value="true">
-            </attribute>
-        </markerResolutionGenerator>
-        <markerResolutionGenerator
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
-            markerType="org.eclipse.papyrus.infra.gmfdiag.ui.css.check.expensive">
-            <attribute
-                name="FIXABLE_KEY"
-                value="true">
-            </attribute>
-        </markerResolutionGenerator>
-    </extension>
-   	<!-- Rename Refactoring -->
-	<extension point="org.eclipse.ui.handlers">
-		<handler 
-			class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
-			commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
-			<activeWhen>
-				<reference
-					definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
-    <extension point="org.eclipse.ui.menus">
-         <menuContribution
-            locationURI="popup:#TextEditorContext?after=group.edit">
-         <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"
-               style="push">
-            <visibleWhen checkEnabled="false">
-               <reference
-                     definitionId="org.eclipse.papyrus.infra.gmfdiag.CSS.Editor.opened">
-               </reference>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-   <extension point="org.eclipse.ui.preferencePages">
-	    <page
-	        category="org.eclipse.papyrus.infra.gmfdiag.CSS"
-	        class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"
-	        id="org.eclipse.papyrus.infra.gmfdiag.CSS.refactoring"
-	        name="Refactoring">
-	        <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.ui.keyword_CSS"/>
-	    </page>
-	</extension>
-
-  <extension point="org.eclipse.compare.contentViewers">
-    <viewer id="org.eclipse.papyrus.infra.gmfdiag.CSS.compare.contentViewers"
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
-            extensions="css">
-    </viewer>
-  </extension>
-  <extension point="org.eclipse.compare.contentMergeViewers">
-    <viewer id="org.eclipse.papyrus.infra.gmfdiag.CSS.compare.contentMergeViewers"
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
-            extensions="css" label="CSS Compare">
-     </viewer>
-  </extension>
-  <extension point="org.eclipse.ui.editors.documentProviders">
-    <provider id="org.eclipse.papyrus.infra.gmfdiag.CSS.editors.documentProviders"
-            class="org.eclipse.papyrus.infra.gmfdiag.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"
-            extensions="css">
-    </provider>
-  </extension>
-
-</plugin>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/CSSExecutableExtensionFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/CSSExecutableExtensionFactory.java
deleted file mode 100644
index 63ea6f822a0..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/CSSExecutableExtensionFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.ui;
-
-import org.eclipse.papyrus.infra.gmfdiag.ui.internal.CSSActivator;
-import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
-import org.osgi.framework.Bundle;
-
-import com.google.inject.Injector;
-
-/**
- * This class was generated. Customizations should only happen in a newly
- * introduced subclass.
- */
-public class CSSExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
-
-	@Override
-	protected Bundle getBundle() {
-		return CSSActivator.getInstance().getBundle();
-	}
-
-	@Override
-	protected Injector getInjector() {
-		return CSSActivator.getInstance().getInjector(CSSActivator.ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS);
-	}
-
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/CSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/CSSParser.java
deleted file mode 100644
index f1c5e0673f6..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/CSSParser.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.antlr.runtime.RecognitionException;
-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
-import org.eclipse.xtext.AbstractElement;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.AbstractContentAssistParser;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
-
-import com.google.inject.Inject;
-
-public class CSSParser extends AbstractContentAssistParser {
-
-	@Inject
-	private CSSGrammarAccess grammarAccess;
-
-	private Map<AbstractElement, String> nameMappings;
-
-	@Override
-	protected org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal.InternalCSSParser createParser() {
-		org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal.InternalCSSParser result = new org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal.InternalCSSParser(null);
-		result.setGrammarAccess(grammarAccess);
-		return result;
-	}
-
-	@Override
-	protected String getRuleName(AbstractElement element) {
-		if (nameMappings == null) {
-			nameMappings = new HashMap<AbstractElement, String>() {
-				private static final long serialVersionUID = 1L;
-				{
-					put(grammarAccess.getStylesheetAccess().getAlternatives_1(), "rule__Stylesheet__Alternatives_1");
-					put(grammarAccess.getStylesheetAccess().getAlternatives_2_1(), "rule__Stylesheet__Alternatives_2_1");
-					put(grammarAccess.getStylesheetAccess().getAlternatives_3_1(), "rule__Stylesheet__Alternatives_3_1");
-					put(grammarAccess.getContentAccess().getAlternatives(), "rule__Content__Alternatives");
-					put(grammarAccess.getImportAccess().getAlternatives_1(), "rule__Import__Alternatives_1");
-					put(grammarAccess.getSelectorAccess().getAlternatives(), "rule__Selector__Alternatives");
-					put(grammarAccess.getCompositeSelectorAccess().getAlternatives_1(), "rule__CompositeSelector__Alternatives_1");
-					put(grammarAccess.getSimpleSelectorAccess().getAlternatives(), "rule__SimpleSelector__Alternatives");
-					put(grammarAccess.getSimpleSelectorAccess().getElementNameAlternatives_0_0_0(), "rule__SimpleSelector__ElementNameAlternatives_0_0_0");
-					put(grammarAccess.getSelectorConditionAccess().getAlternatives(), "rule__SelectorCondition__Alternatives");
-					put(grammarAccess.getTermAccess().getAlternatives_0(), "rule__Term__Alternatives_0");
-					put(grammarAccess.getOperatorAccess().getAlternatives(), "rule__Operator__Alternatives");
-					put(grammarAccess.getAttributeValueAccess().getValueAlternatives_2_0(), "rule__AttributeValue__ValueAlternatives_2_0");
-					put(grammarAccess.getPseudoAccess().getAlternatives_1(), "rule__Pseudo__Alternatives_1");
-					put(grammarAccess.getUNARYAccess().getAlternatives(), "rule__UNARY__Alternatives");
-					put(grammarAccess.getKINDAccess().getAlternatives(), "rule__KIND__Alternatives");
-					put(grammarAccess.getATTRIBUTE_OPAccess().getAlternatives(), "rule__ATTRIBUTE_OP__Alternatives");
-					put(grammarAccess.getStylesheetAccess().getGroup(), "rule__Stylesheet__Group__0");
-					put(grammarAccess.getStylesheetAccess().getGroup_0(), "rule__Stylesheet__Group_0__0");
-					put(grammarAccess.getStylesheetAccess().getGroup_2(), "rule__Stylesheet__Group_2__0");
-					put(grammarAccess.getStylesheetAccess().getGroup_2_1_0(), "rule__Stylesheet__Group_2_1_0__0");
-					put(grammarAccess.getStylesheetAccess().getGroup_2_1_1(), "rule__Stylesheet__Group_2_1_1__0");
-					put(grammarAccess.getStylesheetAccess().getGroup_3(), "rule__Stylesheet__Group_3__0");
-					put(grammarAccess.getStylesheetAccess().getGroup_3_1_0(), "rule__Stylesheet__Group_3_1_0__0");
-					put(grammarAccess.getStylesheetAccess().getGroup_3_1_1(), "rule__Stylesheet__Group_3_1_1__0");
-					put(grammarAccess.getImportAccess().getGroup(), "rule__Import__Group__0");
-					put(grammarAccess.getImportAccess().getGroup_1_0(), "rule__Import__Group_1_0__0");
-					put(grammarAccess.getImportAccess().getGroup_1_1(), "rule__Import__Group_1_1__0");
-					put(grammarAccess.getImportAccess().getGroup_3(), "rule__Import__Group_3__0");
-					put(grammarAccess.getImportAccess().getGroup_3_2(), "rule__Import__Group_3_2__0");
-					put(grammarAccess.getMediaAccess().getGroup(), "rule__Media__Group__0");
-					put(grammarAccess.getMediaAccess().getGroup_4(), "rule__Media__Group_4__0");
-					put(grammarAccess.getPageAccess().getGroup(), "rule__Page__Group__0");
-					put(grammarAccess.getPageAccess().getGroup_7(), "rule__Page__Group_7__0");
-					put(grammarAccess.getPseudoPageAccess().getGroup(), "rule__PseudoPage__Group__0");
-					put(grammarAccess.getRulesetAccess().getGroup(), "rule__Ruleset__Group__0");
-					put(grammarAccess.getRulesetAccess().getGroup_1(), "rule__Ruleset__Group_1__0");
-					put(grammarAccess.getRulesetAccess().getGroup_5(), "rule__Ruleset__Group_5__0");
-					put(grammarAccess.getSelectorAccess().getGroup_0(), "rule__Selector__Group_0__0");
-					put(grammarAccess.getCompositeSelectorAccess().getGroup(), "rule__CompositeSelector__Group__0");
-					put(grammarAccess.getCompositeSelectorAccess().getGroup_1_1(), "rule__CompositeSelector__Group_1_1__0");
-					put(grammarAccess.getSimpleSelectorAccess().getGroup_0(), "rule__SimpleSelector__Group_0__0");
-					put(grammarAccess.getCombinatorAccess().getGroup(), "rule__Combinator__Group__0");
-					put(grammarAccess.getDeclarationAccess().getGroup(), "rule__Declaration__Group__0");
-					put(grammarAccess.getDeclarationAccess().getGroup_5(), "rule__Declaration__Group_5__0");
-					put(grammarAccess.getExpressionAccess().getGroup(), "rule__Expression__Group__0");
-					put(grammarAccess.getSubtermAccess().getGroup(), "rule__Subterm__Group__0");
-					put(grammarAccess.getTermAccess().getGroup(), "rule__Term__Group__0");
-					put(grammarAccess.getFunctionAccess().getGroup(), "rule__Function__Group__0");
-					put(grammarAccess.getNumberAccess().getGroup(), "rule__Number__Group__0");
-					put(grammarAccess.getPercentageAccess().getGroup(), "rule__Percentage__Group__0");
-					put(grammarAccess.getLengthAccess().getGroup(), "rule__Length__Group__0");
-					put(grammarAccess.getEmsAccess().getGroup(), "rule__Ems__Group__0");
-					put(grammarAccess.getExsAccess().getGroup(), "rule__Exs__Group__0");
-					put(grammarAccess.getAngleAccess().getGroup(), "rule__Angle__Group__0");
-					put(grammarAccess.getTimeAccess().getGroup(), "rule__Time__Group__0");
-					put(grammarAccess.getFrequencyAccess().getGroup(), "rule__Frequency__Group__0");
-					put(grammarAccess.getUriAccess().getGroup(), "rule__Uri__Group__0");
-					put(grammarAccess.getOperatorAccess().getGroup_0(), "rule__Operator__Group_0__0");
-					put(grammarAccess.getOperatorAccess().getGroup_1(), "rule__Operator__Group_1__0");
-					put(grammarAccess.getAttributeAccess().getGroup(), "rule__Attribute__Group__0");
-					put(grammarAccess.getAttributeValueAccess().getGroup(), "rule__AttributeValue__Group__0");
-					put(grammarAccess.getPseudoAccess().getGroup(), "rule__Pseudo__Group__0");
-					put(grammarAccess.getPseudoAccess().getGroup_1_1(), "rule__Pseudo__Group_1_1__0");
-					put(grammarAccess.getPseudoAccess().getGroup_1_1_3(), "rule__Pseudo__Group_1_1_3__0");
-					put(grammarAccess.getStylesheetAccess().getCharsetAssignment_0_1(), "rule__Stylesheet__CharsetAssignment_0_1");
-					put(grammarAccess.getStylesheetAccess().getImportsAssignment_2_0(), "rule__Stylesheet__ImportsAssignment_2_0");
-					put(grammarAccess.getStylesheetAccess().getContentsAssignment_3_0(), "rule__Stylesheet__ContentsAssignment_3_0");
-					put(grammarAccess.getImportAccess().getStringAssignment_1_0_1(), "rule__Import__StringAssignment_1_0_1");
-					put(grammarAccess.getImportAccess().getUriAssignment_1_1_1(), "rule__Import__UriAssignment_1_1_1");
-					put(grammarAccess.getImportAccess().getMediaAssignment_3_0(), "rule__Import__MediaAssignment_3_0");
-					put(grammarAccess.getImportAccess().getMediaAssignment_3_2_2(), "rule__Import__MediaAssignment_3_2_2");
-					put(grammarAccess.getMediaAccess().getMediaAssignment_2(), "rule__Media__MediaAssignment_2");
-					put(grammarAccess.getMediaAccess().getMediaAssignment_4_2(), "rule__Media__MediaAssignment_4_2");
-					put(grammarAccess.getMediaAccess().getRulesAssignment_7(), "rule__Media__RulesAssignment_7");
-					put(grammarAccess.getPageAccess().getPseudoAssignment_3(), "rule__Page__PseudoAssignment_3");
-					put(grammarAccess.getPageAccess().getDeclarationsAssignment_6(), "rule__Page__DeclarationsAssignment_6");
-					put(grammarAccess.getPageAccess().getDeclarationsAssignment_7_2(), "rule__Page__DeclarationsAssignment_7_2");
-					put(grammarAccess.getPseudoPageAccess().getIdAssignment_1(), "rule__PseudoPage__IdAssignment_1");
-					put(grammarAccess.getRulesetAccess().getSelectorsAssignment_0(), "rule__Ruleset__SelectorsAssignment_0");
-					put(grammarAccess.getRulesetAccess().getSelectorsAssignment_1_2(), "rule__Ruleset__SelectorsAssignment_1_2");
-					put(grammarAccess.getRulesetAccess().getPropertiesAssignment_4(), "rule__Ruleset__PropertiesAssignment_4");
-					put(grammarAccess.getRulesetAccess().getPropertiesAssignment_5_2(), "rule__Ruleset__PropertiesAssignment_5_2");
-					put(grammarAccess.getCompositeSelectorAccess().getLeftAssignment_0(), "rule__CompositeSelector__LeftAssignment_0");
-					put(grammarAccess.getCompositeSelectorAccess().getCombinatorAssignment_1_1_1(), "rule__CompositeSelector__CombinatorAssignment_1_1_1");
-					put(grammarAccess.getCompositeSelectorAccess().getRightAssignment_2(), "rule__CompositeSelector__RightAssignment_2");
-					put(grammarAccess.getSimpleSelectorAccess().getElementNameAssignment_0_0(), "rule__SimpleSelector__ElementNameAssignment_0_0");
-					put(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_0_1(), "rule__SimpleSelector__ConditionAssignment_0_1");
-					put(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_1(), "rule__SimpleSelector__ConditionAssignment_1");
-					put(grammarAccess.getCombinatorAccess().getKindAssignment_0(), "rule__Combinator__KindAssignment_0");
-					put(grammarAccess.getDeclarationAccess().getPropertyAssignment_0(), "rule__Declaration__PropertyAssignment_0");
-					put(grammarAccess.getDeclarationAccess().getExpressionAssignment_4(), "rule__Declaration__ExpressionAssignment_4");
-					put(grammarAccess.getDeclarationAccess().getImportantAssignment_5_0(), "rule__Declaration__ImportantAssignment_5_0");
-					put(grammarAccess.getExpressionAccess().getTermsAssignment_0(), "rule__Expression__TermsAssignment_0");
-					put(grammarAccess.getExpressionAccess().getSubtermsAssignment_1(), "rule__Expression__SubtermsAssignment_1");
-					put(grammarAccess.getSubtermAccess().getOperatorAssignment_0(), "rule__Subterm__OperatorAssignment_0");
-					put(grammarAccess.getSubtermAccess().getTermAssignment_1(), "rule__Subterm__TermAssignment_1");
-					put(grammarAccess.getFunctionAccess().getNameAssignment_0(), "rule__Function__NameAssignment_0");
-					put(grammarAccess.getFunctionAccess().getArgsAssignment_3(), "rule__Function__ArgsAssignment_3");
-					put(grammarAccess.getNameAccess().getValueAssignment(), "rule__Name__ValueAssignment");
-					put(grammarAccess.getNumberAccess().getOpAssignment_0(), "rule__Number__OpAssignment_0");
-					put(grammarAccess.getNumberAccess().getValueAssignment_1(), "rule__Number__ValueAssignment_1");
-					put(grammarAccess.getPercentageAccess().getOpAssignment_0(), "rule__Percentage__OpAssignment_0");
-					put(grammarAccess.getPercentageAccess().getValueAssignment_1(), "rule__Percentage__ValueAssignment_1");
-					put(grammarAccess.getPercentageAccess().getUnitAssignment_2(), "rule__Percentage__UnitAssignment_2");
-					put(grammarAccess.getLengthAccess().getOpAssignment_0(), "rule__Length__OpAssignment_0");
-					put(grammarAccess.getLengthAccess().getValueAssignment_1(), "rule__Length__ValueAssignment_1");
-					put(grammarAccess.getLengthAccess().getUnitAssignment_2(), "rule__Length__UnitAssignment_2");
-					put(grammarAccess.getEmsAccess().getOpAssignment_0(), "rule__Ems__OpAssignment_0");
-					put(grammarAccess.getEmsAccess().getValueAssignment_1(), "rule__Ems__ValueAssignment_1");
-					put(grammarAccess.getEmsAccess().getUnitAssignment_2(), "rule__Ems__UnitAssignment_2");
-					put(grammarAccess.getExsAccess().getOpAssignment_0(), "rule__Exs__OpAssignment_0");
-					put(grammarAccess.getExsAccess().getValueAssignment_1(), "rule__Exs__ValueAssignment_1");
-					put(grammarAccess.getExsAccess().getUnitAssignment_2(), "rule__Exs__UnitAssignment_2");
-					put(grammarAccess.getAngleAccess().getOpAssignment_0(), "rule__Angle__OpAssignment_0");
-					put(grammarAccess.getAngleAccess().getValueAssignment_1(), "rule__Angle__ValueAssignment_1");
-					put(grammarAccess.getAngleAccess().getUnitAssignment_2(), "rule__Angle__UnitAssignment_2");
-					put(grammarAccess.getTimeAccess().getOpAssignment_0(), "rule__Time__OpAssignment_0");
-					put(grammarAccess.getTimeAccess().getValueAssignment_1(), "rule__Time__ValueAssignment_1");
-					put(grammarAccess.getTimeAccess().getUnitAssignment_2(), "rule__Time__UnitAssignment_2");
-					put(grammarAccess.getFrequencyAccess().getOpAssignment_0(), "rule__Frequency__OpAssignment_0");
-					put(grammarAccess.getFrequencyAccess().getValueAssignment_1(), "rule__Frequency__ValueAssignment_1");
-					put(grammarAccess.getFrequencyAccess().getUnitAssignment_2(), "rule__Frequency__UnitAssignment_2");
-					put(grammarAccess.getUriAccess().getValueAssignment_2(), "rule__Uri__ValueAssignment_2");
-					put(grammarAccess.getStringValueAccess().getValueAssignment(), "rule__StringValue__ValueAssignment");
-					put(grammarAccess.getHexColorAccess().getValueAssignment(), "rule__HexColor__ValueAssignment");
-					put(grammarAccess.getClassAccess().getClassAssignment(), "rule__Class__ClassAssignment");
-					put(grammarAccess.getAttributeAccess().getNameAssignment_2(), "rule__Attribute__NameAssignment_2");
-					put(grammarAccess.getAttributeAccess().getValueAssignment_4(), "rule__Attribute__ValueAssignment_4");
-					put(grammarAccess.getAttributeValueAccess().getOperatorAssignment_0(), "rule__AttributeValue__OperatorAssignment_0");
-					put(grammarAccess.getAttributeValueAccess().getValueAssignment_2(), "rule__AttributeValue__ValueAssignment_2");
-					put(grammarAccess.getPseudoAccess().getPseudoAssignment_1_0(), "rule__Pseudo__PseudoAssignment_1_0");
-					put(grammarAccess.getPseudoAccess().getPseudoAssignment_1_1_0(), "rule__Pseudo__PseudoAssignment_1_1_0");
-					put(grammarAccess.getPseudoAccess().getArgsAssignment_1_1_3_0(), "rule__Pseudo__ArgsAssignment_1_1_3_0");
-					put(grammarAccess.getCSSIdAccess().getValueAssignment(), "rule__CSSId__ValueAssignment");
-					put(grammarAccess.getUnaryOperatorAccess().getOperatorAssignment(), "rule__UnaryOperator__OperatorAssignment");
-				}
-			};
-		}
-		return nameMappings.get(element);
-	}
-
-	@Override
-	protected Collection<FollowElement> getFollowElements(AbstractInternalContentAssistParser parser) {
-		try {
-			org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal.InternalCSSParser typedParser = (org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal.InternalCSSParser) parser;
-			typedParser.entryRuleStylesheet();
-			return typedParser.getFollowElements();
-		} catch (RecognitionException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
-	@Override
-	protected String[] getInitialHiddenTokens() {
-		return new String[] { "RULE_ML_COMMENT" };
-	}
-
-	public CSSGrammarAccess getGrammarAccess() {
-		return this.grammarAccess;
-	}
-
-	public void setGrammarAccess(CSSGrammarAccess grammarAccess) {
-		this.grammarAccess = grammarAccess;
-	}
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g
deleted file mode 100644
index dde80e79835..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g
+++ /dev/null
@@ -1,7668 +0,0 @@
-/*
-* generated by Xtext
-*/
-grammar InternalCSS;
-
-options {
-	superClass=AbstractInternalContentAssistParser;
-	
-}
-
-@lexer::header {
-package org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal;
-
-// Hack: Use our own Lexer superclass by means of import. 
-// Currently there is no other way to specify the superclass for the lexer.
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;
-}
-
-@parser::header {
-package org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal; 
-
-import java.io.InputStream;
-import org.eclipse.xtext.*;
-import org.eclipse.xtext.parser.*;
-import org.eclipse.xtext.parser.impl.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.DFA;
-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
-
-}
-
-@parser::members {
- 
- 	private CSSGrammarAccess grammarAccess;
- 	
-    public void setGrammarAccess(CSSGrammarAccess grammarAccess) {
-    	this.grammarAccess = grammarAccess;
-    }
-    
-    @Override
-    protected Grammar getGrammar() {
-    	return grammarAccess.getGrammar();
-    }
-    
-    @Override
-    protected String getValueForTokenName(String tokenName) {
-    	return tokenName;
-    }
-
-}
-
-
-
-
-// Entry rule entryRuleStylesheet
-entryRuleStylesheet 
-:
-{ before(grammarAccess.getStylesheetRule()); }
-	 ruleStylesheet
-{ after(grammarAccess.getStylesheetRule()); } 
-	 EOF 
-;
-
-// Rule Stylesheet
-ruleStylesheet
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getStylesheetAccess().getGroup()); }
-(rule__Stylesheet__Group__0)
-{ after(grammarAccess.getStylesheetAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleContent
-entryRuleContent 
-:
-{ before(grammarAccess.getContentRule()); }
-	 ruleContent
-{ after(grammarAccess.getContentRule()); } 
-	 EOF 
-;
-
-// Rule Content
-ruleContent
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getContentAccess().getAlternatives()); }
-(rule__Content__Alternatives)
-{ after(grammarAccess.getContentAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleImport
-entryRuleImport 
-:
-{ before(grammarAccess.getImportRule()); }
-	 ruleImport
-{ after(grammarAccess.getImportRule()); } 
-	 EOF 
-;
-
-// Rule Import
-ruleImport
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getImportAccess().getGroup()); }
-(rule__Import__Group__0)
-{ after(grammarAccess.getImportAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleMedia
-entryRuleMedia 
-:
-{ before(grammarAccess.getMediaRule()); }
-	 ruleMedia
-{ after(grammarAccess.getMediaRule()); } 
-	 EOF 
-;
-
-// Rule Media
-ruleMedia
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getMediaAccess().getGroup()); }
-(rule__Media__Group__0)
-{ after(grammarAccess.getMediaAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRulePage
-entryRulePage 
-:
-{ before(grammarAccess.getPageRule()); }
-	 rulePage
-{ after(grammarAccess.getPageRule()); } 
-	 EOF 
-;
-
-// Rule Page
-rulePage
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getPageAccess().getGroup()); }
-(rule__Page__Group__0)
-{ after(grammarAccess.getPageAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRulePseudoPage
-entryRulePseudoPage 
-:
-{ before(grammarAccess.getPseudoPageRule()); }
-	 rulePseudoPage
-{ after(grammarAccess.getPseudoPageRule()); } 
-	 EOF 
-;
-
-// Rule PseudoPage
-rulePseudoPage
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getPseudoPageAccess().getGroup()); }
-(rule__PseudoPage__Group__0)
-{ after(grammarAccess.getPseudoPageAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleRuleset
-entryRuleRuleset 
-:
-{ before(grammarAccess.getRulesetRule()); }
-	 ruleRuleset
-{ after(grammarAccess.getRulesetRule()); } 
-	 EOF 
-;
-
-// Rule Ruleset
-ruleRuleset
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getRulesetAccess().getGroup()); }
-(rule__Ruleset__Group__0)
-{ after(grammarAccess.getRulesetAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleSelector
-entryRuleSelector 
-:
-{ before(grammarAccess.getSelectorRule()); }
-	 ruleSelector
-{ after(grammarAccess.getSelectorRule()); } 
-	 EOF 
-;
-
-// Rule Selector
-ruleSelector
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getSelectorAccess().getAlternatives()); }
-(rule__Selector__Alternatives)
-{ after(grammarAccess.getSelectorAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleCompositeSelector
-entryRuleCompositeSelector 
-:
-{ before(grammarAccess.getCompositeSelectorRule()); }
-	 ruleCompositeSelector
-{ after(grammarAccess.getCompositeSelectorRule()); } 
-	 EOF 
-;
-
-// Rule CompositeSelector
-ruleCompositeSelector
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getCompositeSelectorAccess().getGroup()); }
-(rule__CompositeSelector__Group__0)
-{ after(grammarAccess.getCompositeSelectorAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleSimpleSelector
-entryRuleSimpleSelector 
-:
-{ before(grammarAccess.getSimpleSelectorRule()); }
-	 ruleSimpleSelector
-{ after(grammarAccess.getSimpleSelectorRule()); } 
-	 EOF 
-;
-
-// Rule SimpleSelector
-ruleSimpleSelector
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getSimpleSelectorAccess().getAlternatives()); }
-(rule__SimpleSelector__Alternatives)
-{ after(grammarAccess.getSimpleSelectorAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleSelectorCondition
-entryRuleSelectorCondition 
-:
-{ before(grammarAccess.getSelectorConditionRule()); }
-	 ruleSelectorCondition
-{ after(grammarAccess.getSelectorConditionRule()); } 
-	 EOF 
-;
-
-// Rule SelectorCondition
-ruleSelectorCondition
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getSelectorConditionAccess().getAlternatives()); }
-(rule__SelectorCondition__Alternatives)
-{ after(grammarAccess.getSelectorConditionAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleCombinator
-entryRuleCombinator 
-:
-{ before(grammarAccess.getCombinatorRule()); }
-	 ruleCombinator
-{ after(grammarAccess.getCombinatorRule()); } 
-	 EOF 
-;
-
-// Rule Combinator
-ruleCombinator
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getCombinatorAccess().getGroup()); }
-(rule__Combinator__Group__0)
-{ after(grammarAccess.getCombinatorAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleDeclaration
-entryRuleDeclaration 
-:
-{ before(grammarAccess.getDeclarationRule()); }
-	 ruleDeclaration
-{ after(grammarAccess.getDeclarationRule()); } 
-	 EOF 
-;
-
-// Rule Declaration
-ruleDeclaration
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getDeclarationAccess().getGroup()); }
-(rule__Declaration__Group__0)
-{ after(grammarAccess.getDeclarationAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleExpression
-entryRuleExpression 
-:
-{ before(grammarAccess.getExpressionRule()); }
-	 ruleExpression
-{ after(grammarAccess.getExpressionRule()); } 
-	 EOF 
-;
-
-// Rule Expression
-ruleExpression
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getExpressionAccess().getGroup()); }
-(rule__Expression__Group__0)
-{ after(grammarAccess.getExpressionAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleSubterm
-entryRuleSubterm 
-:
-{ before(grammarAccess.getSubtermRule()); }
-	 ruleSubterm
-{ after(grammarAccess.getSubtermRule()); } 
-	 EOF 
-;
-
-// Rule Subterm
-ruleSubterm
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getSubtermAccess().getGroup()); }
-(rule__Subterm__Group__0)
-{ after(grammarAccess.getSubtermAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleTerm
-entryRuleTerm 
-:
-{ before(grammarAccess.getTermRule()); }
-	 ruleTerm
-{ after(grammarAccess.getTermRule()); } 
-	 EOF 
-;
-
-// Rule Term
-ruleTerm
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getTermAccess().getGroup()); }
-(rule__Term__Group__0)
-{ after(grammarAccess.getTermAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleFunction
-entryRuleFunction 
-:
-{ before(grammarAccess.getFunctionRule()); }
-	 ruleFunction
-{ after(grammarAccess.getFunctionRule()); } 
-	 EOF 
-;
-
-// Rule Function
-ruleFunction
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getFunctionAccess().getGroup()); }
-(rule__Function__Group__0)
-{ after(grammarAccess.getFunctionAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleName
-entryRuleName 
-:
-{ before(grammarAccess.getNameRule()); }
-	 ruleName
-{ after(grammarAccess.getNameRule()); } 
-	 EOF 
-;
-
-// Rule Name
-ruleName
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getNameAccess().getValueAssignment()); }
-(rule__Name__ValueAssignment)
-{ after(grammarAccess.getNameAccess().getValueAssignment()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleNumber
-entryRuleNumber 
-:
-{ before(grammarAccess.getNumberRule()); }
-	 ruleNumber
-{ after(grammarAccess.getNumberRule()); } 
-	 EOF 
-;
-
-// Rule Number
-ruleNumber
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getNumberAccess().getGroup()); }
-(rule__Number__Group__0)
-{ after(grammarAccess.getNumberAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRulePercentage
-entryRulePercentage 
-:
-{ before(grammarAccess.getPercentageRule()); }
-	 rulePercentage
-{ after(grammarAccess.getPercentageRule()); } 
-	 EOF 
-;
-
-// Rule Percentage
-rulePercentage
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getPercentageAccess().getGroup()); }
-(rule__Percentage__Group__0)
-{ after(grammarAccess.getPercentageAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleLength
-entryRuleLength 
-:
-{ before(grammarAccess.getLengthRule()); }
-	 ruleLength
-{ after(grammarAccess.getLengthRule()); } 
-	 EOF 
-;
-
-// Rule Length
-ruleLength
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getLengthAccess().getGroup()); }
-(rule__Length__Group__0)
-{ after(grammarAccess.getLengthAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleEms
-entryRuleEms 
-:
-{ before(grammarAccess.getEmsRule()); }
-	 ruleEms
-{ after(grammarAccess.getEmsRule()); } 
-	 EOF 
-;
-
-// Rule Ems
-ruleEms
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getEmsAccess().getGroup()); }
-(rule__Ems__Group__0)
-{ after(grammarAccess.getEmsAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleExs
-entryRuleExs 
-:
-{ before(grammarAccess.getExsRule()); }
-	 ruleExs
-{ after(grammarAccess.getExsRule()); } 
-	 EOF 
-;
-
-// Rule Exs
-ruleExs
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getExsAccess().getGroup()); }
-(rule__Exs__Group__0)
-{ after(grammarAccess.getExsAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleAngle
-entryRuleAngle 
-:
-{ before(grammarAccess.getAngleRule()); }
-	 ruleAngle
-{ after(grammarAccess.getAngleRule()); } 
-	 EOF 
-;
-
-// Rule Angle
-ruleAngle
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getAngleAccess().getGroup()); }
-(rule__Angle__Group__0)
-{ after(grammarAccess.getAngleAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleTime
-entryRuleTime 
-:
-{ before(grammarAccess.getTimeRule()); }
-	 ruleTime
-{ after(grammarAccess.getTimeRule()); } 
-	 EOF 
-;
-
-// Rule Time
-ruleTime
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getTimeAccess().getGroup()); }
-(rule__Time__Group__0)
-{ after(grammarAccess.getTimeAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleFrequency
-entryRuleFrequency 
-:
-{ before(grammarAccess.getFrequencyRule()); }
-	 ruleFrequency
-{ after(grammarAccess.getFrequencyRule()); } 
-	 EOF 
-;
-
-// Rule Frequency
-ruleFrequency
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getFrequencyAccess().getGroup()); }
-(rule__Frequency__Group__0)
-{ after(grammarAccess.getFrequencyAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleUri
-entryRuleUri 
-:
-{ before(grammarAccess.getUriRule()); }
-	 ruleUri
-{ after(grammarAccess.getUriRule()); } 
-	 EOF 
-;
-
-// Rule Uri
-ruleUri
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getUriAccess().getGroup()); }
-(rule__Uri__Group__0)
-{ after(grammarAccess.getUriAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleStringValue
-entryRuleStringValue 
-:
-{ before(grammarAccess.getStringValueRule()); }
-	 ruleStringValue
-{ after(grammarAccess.getStringValueRule()); } 
-	 EOF 
-;
-
-// Rule StringValue
-ruleStringValue
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getStringValueAccess().getValueAssignment()); }
-(rule__StringValue__ValueAssignment)
-{ after(grammarAccess.getStringValueAccess().getValueAssignment()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleHexColor
-entryRuleHexColor 
-:
-{ before(grammarAccess.getHexColorRule()); }
-	 ruleHexColor
-{ after(grammarAccess.getHexColorRule()); } 
-	 EOF 
-;
-
-// Rule HexColor
-ruleHexColor
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getHexColorAccess().getValueAssignment()); }
-(rule__HexColor__ValueAssignment)
-{ after(grammarAccess.getHexColorAccess().getValueAssignment()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleOperator
-entryRuleOperator 
-:
-{ before(grammarAccess.getOperatorRule()); }
-	 ruleOperator
-{ after(grammarAccess.getOperatorRule()); } 
-	 EOF 
-;
-
-// Rule Operator
-ruleOperator
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getOperatorAccess().getAlternatives()); }
-(rule__Operator__Alternatives)
-{ after(grammarAccess.getOperatorAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleClass
-entryRuleClass 
-:
-{ before(grammarAccess.getClassRule()); }
-	 ruleClass
-{ after(grammarAccess.getClassRule()); } 
-	 EOF 
-;
-
-// Rule Class
-ruleClass
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getClassAccess().getClassAssignment()); }
-(rule__Class__ClassAssignment)
-{ after(grammarAccess.getClassAccess().getClassAssignment()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleAttribute
-entryRuleAttribute 
-:
-{ before(grammarAccess.getAttributeRule()); }
-	 ruleAttribute
-{ after(grammarAccess.getAttributeRule()); } 
-	 EOF 
-;
-
-// Rule Attribute
-ruleAttribute
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getAttributeAccess().getGroup()); }
-(rule__Attribute__Group__0)
-{ after(grammarAccess.getAttributeAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleAttributeValue
-entryRuleAttributeValue 
-:
-{ before(grammarAccess.getAttributeValueRule()); }
-	 ruleAttributeValue
-{ after(grammarAccess.getAttributeValueRule()); } 
-	 EOF 
-;
-
-// Rule AttributeValue
-ruleAttributeValue
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getAttributeValueAccess().getGroup()); }
-(rule__AttributeValue__Group__0)
-{ after(grammarAccess.getAttributeValueAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRulePseudo
-entryRulePseudo 
-:
-{ before(grammarAccess.getPseudoRule()); }
-	 rulePseudo
-{ after(grammarAccess.getPseudoRule()); } 
-	 EOF 
-;
-
-// Rule Pseudo
-rulePseudo
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getPseudoAccess().getGroup()); }
-(rule__Pseudo__Group__0)
-{ after(grammarAccess.getPseudoAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleCSSId
-entryRuleCSSId 
-:
-{ before(grammarAccess.getCSSIdRule()); }
-	 ruleCSSId
-{ after(grammarAccess.getCSSIdRule()); } 
-	 EOF 
-;
-
-// Rule CSSId
-ruleCSSId
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getCSSIdAccess().getValueAssignment()); }
-(rule__CSSId__ValueAssignment)
-{ after(grammarAccess.getCSSIdAccess().getValueAssignment()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleUnaryOperator
-entryRuleUnaryOperator 
-:
-{ before(grammarAccess.getUnaryOperatorRule()); }
-	 ruleUnaryOperator
-{ after(grammarAccess.getUnaryOperatorRule()); } 
-	 EOF 
-;
-
-// Rule UnaryOperator
-ruleUnaryOperator
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getUnaryOperatorAccess().getOperatorAssignment()); }
-(rule__UnaryOperator__OperatorAssignment)
-{ after(grammarAccess.getUnaryOperatorAccess().getOperatorAssignment()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-// Rule UNARY
-ruleUNARY
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getUNARYAccess().getAlternatives()); }
-(rule__UNARY__Alternatives)
-{ after(grammarAccess.getUNARYAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Rule KIND
-ruleKIND
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getKINDAccess().getAlternatives()); }
-(rule__KIND__Alternatives)
-{ after(grammarAccess.getKINDAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Rule ATTRIBUTE_OP
-ruleATTRIBUTE_OP
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getATTRIBUTE_OPAccess().getAlternatives()); }
-(rule__ATTRIBUTE_OP__Alternatives)
-{ after(grammarAccess.getATTRIBUTE_OPAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-rule__Stylesheet__Alternatives_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_1_0()); }
-	RULE_WS
-{ after(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_1_0()); }
-)
-
-    |(
-{ before(grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_1_1()); }
-	RULE_CDO
-{ after(grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_1_1()); }
-)
-
-    |(
-{ before(grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_1_2()); }
-	RULE_CDC
-{ after(grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_1_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Alternatives_2_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getGroup_2_1_0()); }
-(rule__Stylesheet__Group_2_1_0__0)
-{ after(grammarAccess.getStylesheetAccess().getGroup_2_1_0()); }
-)
-
-    |(
-{ before(grammarAccess.getStylesheetAccess().getGroup_2_1_1()); }
-(rule__Stylesheet__Group_2_1_1__0)
-{ after(grammarAccess.getStylesheetAccess().getGroup_2_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Alternatives_3_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getGroup_3_1_0()); }
-(rule__Stylesheet__Group_3_1_0__0)
-{ after(grammarAccess.getStylesheetAccess().getGroup_3_1_0()); }
-)
-
-    |(
-{ before(grammarAccess.getStylesheetAccess().getGroup_3_1_1()); }
-(rule__Stylesheet__Group_3_1_1__0)
-{ after(grammarAccess.getStylesheetAccess().getGroup_3_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Content__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getContentAccess().getRulesetParserRuleCall_0()); }
-	ruleRuleset
-{ after(grammarAccess.getContentAccess().getRulesetParserRuleCall_0()); }
-)
-
-    |(
-{ before(grammarAccess.getContentAccess().getMediaParserRuleCall_1()); }
-	ruleMedia
-{ after(grammarAccess.getContentAccess().getMediaParserRuleCall_1()); }
-)
-
-    |(
-{ before(grammarAccess.getContentAccess().getPageParserRuleCall_2()); }
-	rulePage
-{ after(grammarAccess.getContentAccess().getPageParserRuleCall_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Alternatives_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getGroup_1_0()); }
-(rule__Import__Group_1_0__0)
-{ after(grammarAccess.getImportAccess().getGroup_1_0()); }
-)
-
-    |(
-{ before(grammarAccess.getImportAccess().getGroup_1_1()); }
-(rule__Import__Group_1_1__0)
-{ after(grammarAccess.getImportAccess().getGroup_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Selector__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSelectorAccess().getGroup_0()); }
-(rule__Selector__Group_0__0)
-{ after(grammarAccess.getSelectorAccess().getGroup_0()); }
-)
-
-    |(
-{ before(grammarAccess.getSelectorAccess().getCompositeSelectorParserRuleCall_1()); }
-	ruleCompositeSelector
-{ after(grammarAccess.getSelectorAccess().getCompositeSelectorParserRuleCall_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CompositeSelector__Alternatives_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-(
-{ before(grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_0()); }
-(	RULE_WS)
-{ after(grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_0()); }
-)
-(
-{ before(grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_0()); }
-(	RULE_WS)*
-{ after(grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_0()); }
-)
-)
-
-    |(
-{ before(grammarAccess.getCompositeSelectorAccess().getGroup_1_1()); }
-(rule__CompositeSelector__Group_1_1__0)
-{ after(grammarAccess.getCompositeSelectorAccess().getGroup_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__SimpleSelector__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSimpleSelectorAccess().getGroup_0()); }
-(rule__SimpleSelector__Group_0__0)
-{ after(grammarAccess.getSimpleSelectorAccess().getGroup_0()); }
-)
-
-    |(
-(
-{ before(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_1()); }
-(rule__SimpleSelector__ConditionAssignment_1)
-{ after(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_1()); }
-)
-(
-{ before(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_1()); }
-(rule__SimpleSelector__ConditionAssignment_1)*
-{ after(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_1()); }
-)
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__SimpleSelector__ElementNameAlternatives_0_0_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSimpleSelectorAccess().getElementNameIDTerminalRuleCall_0_0_0_0()); }
-	RULE_ID
-{ after(grammarAccess.getSimpleSelectorAccess().getElementNameIDTerminalRuleCall_0_0_0_0()); }
-)
-
-    |(
-{ before(grammarAccess.getSimpleSelectorAccess().getElementNameAsteriskKeyword_0_0_0_1()); }
-
-	'*' 
-
-{ after(grammarAccess.getSimpleSelectorAccess().getElementNameAsteriskKeyword_0_0_0_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__SelectorCondition__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSelectorConditionAccess().getCSSIdParserRuleCall_0()); }
-	ruleCSSId
-{ after(grammarAccess.getSelectorConditionAccess().getCSSIdParserRuleCall_0()); }
-)
-
-    |(
-{ before(grammarAccess.getSelectorConditionAccess().getClassParserRuleCall_1()); }
-	ruleClass
-{ after(grammarAccess.getSelectorConditionAccess().getClassParserRuleCall_1()); }
-)
-
-    |(
-{ before(grammarAccess.getSelectorConditionAccess().getAttributeParserRuleCall_2()); }
-	ruleAttribute
-{ after(grammarAccess.getSelectorConditionAccess().getAttributeParserRuleCall_2()); }
-)
-
-    |(
-{ before(grammarAccess.getSelectorConditionAccess().getPseudoParserRuleCall_3()); }
-	rulePseudo
-{ after(grammarAccess.getSelectorConditionAccess().getPseudoParserRuleCall_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Term__Alternatives_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getTermAccess().getNumberParserRuleCall_0_0()); }
-	ruleNumber
-{ after(grammarAccess.getTermAccess().getNumberParserRuleCall_0_0()); }
-)
-
-    |(
-{ before(grammarAccess.getTermAccess().getPercentageParserRuleCall_0_1()); }
-	rulePercentage
-{ after(grammarAccess.getTermAccess().getPercentageParserRuleCall_0_1()); }
-)
-
-    |(
-{ before(grammarAccess.getTermAccess().getLengthParserRuleCall_0_2()); }
-	ruleLength
-{ after(grammarAccess.getTermAccess().getLengthParserRuleCall_0_2()); }
-)
-
-    |(
-{ before(grammarAccess.getTermAccess().getEmsParserRuleCall_0_3()); }
-	ruleEms
-{ after(grammarAccess.getTermAccess().getEmsParserRuleCall_0_3()); }
-)
-
-    |(
-{ before(grammarAccess.getTermAccess().getExsParserRuleCall_0_4()); }
-	ruleExs
-{ after(grammarAccess.getTermAccess().getExsParserRuleCall_0_4()); }
-)
-
-    |(
-{ before(grammarAccess.getTermAccess().getAngleParserRuleCall_0_5()); }
-	ruleAngle
-{ after(grammarAccess.getTermAccess().getAngleParserRuleCall_0_5()); }
-)
-
-    |(
-{ before(grammarAccess.getTermAccess().getTimeParserRuleCall_0_6()); }
-	ruleTime
-{ after(grammarAccess.getTermAccess().getTimeParserRuleCall_0_6()); }
-)
-
-    |(
-{ before(grammarAccess.getTermAccess().getFrequencyParserRuleCall_0_7()); }
-	ruleFrequency
-{ after(grammarAccess.getTermAccess().getFrequencyParserRuleCall_0_7()); }
-)
-
-    |(
-{ before(grammarAccess.getTermAccess().getNameParserRuleCall_0_8()); }
-	ruleName
-{ after(grammarAccess.getTermAccess().getNameParserRuleCall_0_8()); }
-)
-
-    |(
-{ before(grammarAccess.getTermAccess().getStringValueParserRuleCall_0_9()); }
-	ruleStringValue
-{ after(grammarAccess.getTermAccess().getStringValueParserRuleCall_0_9()); }
-)
-
-    |(
-{ before(grammarAccess.getTermAccess().getUriParserRuleCall_0_10()); }
-	ruleUri
-{ after(grammarAccess.getTermAccess().getUriParserRuleCall_0_10()); }
-)
-
-    |(
-{ before(grammarAccess.getTermAccess().getHexColorParserRuleCall_0_11()); }
-	ruleHexColor
-{ after(grammarAccess.getTermAccess().getHexColorParserRuleCall_0_11()); }
-)
-
-    |(
-{ before(grammarAccess.getTermAccess().getFunctionParserRuleCall_0_12()); }
-	ruleFunction
-{ after(grammarAccess.getTermAccess().getFunctionParserRuleCall_0_12()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Operator__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOperatorAccess().getGroup_0()); }
-(rule__Operator__Group_0__0)
-{ after(grammarAccess.getOperatorAccess().getGroup_0()); }
-)
-
-    |(
-{ before(grammarAccess.getOperatorAccess().getGroup_1()); }
-(rule__Operator__Group_1__0)
-{ after(grammarAccess.getOperatorAccess().getGroup_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__AttributeValue__ValueAlternatives_2_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeValueAccess().getValueIDTerminalRuleCall_2_0_0()); }
-	RULE_ID
-{ after(grammarAccess.getAttributeValueAccess().getValueIDTerminalRuleCall_2_0_0()); }
-)
-
-    |(
-{ before(grammarAccess.getAttributeValueAccess().getValueSTRINGTerminalRuleCall_2_0_1()); }
-	RULE_STRING
-{ after(grammarAccess.getAttributeValueAccess().getValueSTRINGTerminalRuleCall_2_0_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Pseudo__Alternatives_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoAccess().getPseudoAssignment_1_0()); }
-(rule__Pseudo__PseudoAssignment_1_0)
-{ after(grammarAccess.getPseudoAccess().getPseudoAssignment_1_0()); }
-)
-
-    |(
-{ before(grammarAccess.getPseudoAccess().getGroup_1_1()); }
-(rule__Pseudo__Group_1_1__0)
-{ after(grammarAccess.getPseudoAccess().getGroup_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__UNARY__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getUNARYAccess().getNEGEnumLiteralDeclaration_0()); }
-(	'-' 
-)
-{ after(grammarAccess.getUNARYAccess().getNEGEnumLiteralDeclaration_0()); }
-)
-
-    |(
-{ before(grammarAccess.getUNARYAccess().getPLUSEnumLiteralDeclaration_1()); }
-(	'+' 
-)
-{ after(grammarAccess.getUNARYAccess().getPLUSEnumLiteralDeclaration_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__KIND__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getKINDAccess().getFIRST_CHILDEnumLiteralDeclaration_0()); }
-(	'>' 
-)
-{ after(grammarAccess.getKINDAccess().getFIRST_CHILDEnumLiteralDeclaration_0()); }
-)
-
-    |(
-{ before(grammarAccess.getKINDAccess().getSIBLINGEnumLiteralDeclaration_1()); }
-(	'+' 
-)
-{ after(grammarAccess.getKINDAccess().getSIBLINGEnumLiteralDeclaration_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ATTRIBUTE_OP__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getATTRIBUTE_OPAccess().getEQUALSEnumLiteralDeclaration_0()); }
-(	'=' 
-)
-{ after(grammarAccess.getATTRIBUTE_OPAccess().getEQUALSEnumLiteralDeclaration_0()); }
-)
-
-    |(
-{ before(grammarAccess.getATTRIBUTE_OPAccess().getCONTAINSEnumLiteralDeclaration_1()); }
-(	'~=' 
-)
-{ after(grammarAccess.getATTRIBUTE_OPAccess().getCONTAINSEnumLiteralDeclaration_1()); }
-)
-
-    |(
-{ before(grammarAccess.getATTRIBUTE_OPAccess().getUNEQUALSEnumLiteralDeclaration_2()); }
-(	'!=' 
-)
-{ after(grammarAccess.getATTRIBUTE_OPAccess().getUNEQUALSEnumLiteralDeclaration_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-rule__Stylesheet__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group__0__Impl
-	rule__Stylesheet__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getGroup_0()); }
-(rule__Stylesheet__Group_0__0)?
-{ after(grammarAccess.getStylesheetAccess().getGroup_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Stylesheet__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group__1__Impl
-	rule__Stylesheet__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getAlternatives_1()); }
-(rule__Stylesheet__Alternatives_1)*
-{ after(grammarAccess.getStylesheetAccess().getAlternatives_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Stylesheet__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group__2__Impl
-	rule__Stylesheet__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getGroup_2()); }
-(rule__Stylesheet__Group_2__0)*
-{ after(grammarAccess.getStylesheetAccess().getGroup_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Stylesheet__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group__3__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getGroup_3()); }
-(rule__Stylesheet__Group_3__0)*
-{ after(grammarAccess.getStylesheetAccess().getGroup_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-rule__Stylesheet__Group_0__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_0__0__Impl
-	rule__Stylesheet__Group_0__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_0__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getCharsetKeyword_0_0()); }
-
-	'@charset ' 
-
-{ after(grammarAccess.getStylesheetAccess().getCharsetKeyword_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Stylesheet__Group_0__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_0__1__Impl
-	rule__Stylesheet__Group_0__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_0__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getCharsetAssignment_0_1()); }
-(rule__Stylesheet__CharsetAssignment_0_1)
-{ after(grammarAccess.getStylesheetAccess().getCharsetAssignment_0_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Stylesheet__Group_0__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_0__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_0__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getSemicolonKeyword_0_2()); }
-
-	';' 
-
-{ after(grammarAccess.getStylesheetAccess().getSemicolonKeyword_0_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Stylesheet__Group_2__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_2__0__Impl
-	rule__Stylesheet__Group_2__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_2__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getImportsAssignment_2_0()); }
-(rule__Stylesheet__ImportsAssignment_2_0)
-{ after(grammarAccess.getStylesheetAccess().getImportsAssignment_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Stylesheet__Group_2__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_2__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_2__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getAlternatives_2_1()); }
-(rule__Stylesheet__Alternatives_2_1)*
-{ after(grammarAccess.getStylesheetAccess().getAlternatives_2_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Stylesheet__Group_2_1_0__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_2_1_0__0__Impl
-	rule__Stylesheet__Group_2_1_0__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_2_1_0__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_2_1_0_0()); }
-	RULE_CDO
-{ after(grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_2_1_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Stylesheet__Group_2_1_0__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_2_1_0__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_2_1_0__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_0_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_0_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Stylesheet__Group_2_1_1__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_2_1_1__0__Impl
-	rule__Stylesheet__Group_2_1_1__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_2_1_1__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_2_1_1_0()); }
-	RULE_CDC
-{ after(grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_2_1_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Stylesheet__Group_2_1_1__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_2_1_1__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_2_1_1__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_1_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Stylesheet__Group_3__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_3__0__Impl
-	rule__Stylesheet__Group_3__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_3__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getContentsAssignment_3_0()); }
-(rule__Stylesheet__ContentsAssignment_3_0)
-{ after(grammarAccess.getStylesheetAccess().getContentsAssignment_3_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Stylesheet__Group_3__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_3__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_3__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getAlternatives_3_1()); }
-(rule__Stylesheet__Alternatives_3_1)*
-{ after(grammarAccess.getStylesheetAccess().getAlternatives_3_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Stylesheet__Group_3_1_0__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_3_1_0__0__Impl
-	rule__Stylesheet__Group_3_1_0__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_3_1_0__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_3_1_0_0()); }
-	RULE_CDO
-{ after(grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_3_1_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Stylesheet__Group_3_1_0__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_3_1_0__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_3_1_0__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_0_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_0_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Stylesheet__Group_3_1_1__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_3_1_1__0__Impl
-	rule__Stylesheet__Group_3_1_1__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_3_1_1__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_3_1_1_0()); }
-	RULE_CDC
-{ after(grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_3_1_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Stylesheet__Group_3_1_1__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Stylesheet__Group_3_1_1__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__Group_3_1_1__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_1_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Import__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group__0__Impl
-	rule__Import__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getImportKeyword_0()); }
-
-	'@import' 
-
-{ after(grammarAccess.getImportAccess().getImportKeyword_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Import__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group__1__Impl
-	rule__Import__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getAlternatives_1()); }
-(rule__Import__Alternatives_1)
-{ after(grammarAccess.getImportAccess().getAlternatives_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Import__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group__2__Impl
-	rule__Import__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getWSTerminalRuleCall_2()); }
-(	RULE_WS)*
-{ after(grammarAccess.getImportAccess().getWSTerminalRuleCall_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Import__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group__3__Impl
-	rule__Import__Group__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getGroup_3()); }
-(rule__Import__Group_3__0)?
-{ after(grammarAccess.getImportAccess().getGroup_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Import__Group__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group__4__Impl
-	rule__Import__Group__5
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group__4__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getSemicolonKeyword_4()); }
-
-	';' 
-
-{ after(grammarAccess.getImportAccess().getSemicolonKeyword_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Import__Group__5
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group__5__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group__5__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getWSTerminalRuleCall_5()); }
-(	RULE_WS)*
-{ after(grammarAccess.getImportAccess().getWSTerminalRuleCall_5()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-rule__Import__Group_1_0__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group_1_0__0__Impl
-	rule__Import__Group_1_0__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group_1_0__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getWSTerminalRuleCall_1_0_0()); }
-(	RULE_WS)*
-{ after(grammarAccess.getImportAccess().getWSTerminalRuleCall_1_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Import__Group_1_0__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group_1_0__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group_1_0__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getStringAssignment_1_0_1()); }
-(rule__Import__StringAssignment_1_0_1)
-{ after(grammarAccess.getImportAccess().getStringAssignment_1_0_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Import__Group_1_1__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group_1_1__0__Impl
-	rule__Import__Group_1_1__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group_1_1__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getWSTerminalRuleCall_1_1_0()); }
-	RULE_WS
-{ after(grammarAccess.getImportAccess().getWSTerminalRuleCall_1_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Import__Group_1_1__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group_1_1__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group_1_1__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getUriAssignment_1_1_1()); }
-(rule__Import__UriAssignment_1_1_1)
-{ after(grammarAccess.getImportAccess().getUriAssignment_1_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Import__Group_3__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group_3__0__Impl
-	rule__Import__Group_3__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group_3__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getMediaAssignment_3_0()); }
-(rule__Import__MediaAssignment_3_0)
-{ after(grammarAccess.getImportAccess().getMediaAssignment_3_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Import__Group_3__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group_3__1__Impl
-	rule__Import__Group_3__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group_3__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getWSTerminalRuleCall_3_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getImportAccess().getWSTerminalRuleCall_3_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Import__Group_3__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group_3__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group_3__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getGroup_3_2()); }
-(rule__Import__Group_3_2__0)*
-{ after(grammarAccess.getImportAccess().getGroup_3_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Import__Group_3_2__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group_3_2__0__Impl
-	rule__Import__Group_3_2__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group_3_2__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getCommaKeyword_3_2_0()); }
-
-	',' 
-
-{ after(grammarAccess.getImportAccess().getCommaKeyword_3_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Import__Group_3_2__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group_3_2__1__Impl
-	rule__Import__Group_3_2__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group_3_2__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getWSTerminalRuleCall_3_2_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getImportAccess().getWSTerminalRuleCall_3_2_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Import__Group_3_2__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Import__Group_3_2__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__Group_3_2__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getMediaAssignment_3_2_2()); }
-(rule__Import__MediaAssignment_3_2_2)
-{ after(grammarAccess.getImportAccess().getMediaAssignment_3_2_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Media__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Media__Group__0__Impl
-	rule__Media__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getMediaKeyword_0()); }
-
-	'@media' 
-
-{ after(grammarAccess.getMediaAccess().getMediaKeyword_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Media__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Media__Group__1__Impl
-	rule__Media__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getWSTerminalRuleCall_1()); }
-	RULE_WS
-{ after(grammarAccess.getMediaAccess().getWSTerminalRuleCall_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Media__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Media__Group__2__Impl
-	rule__Media__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getMediaAssignment_2()); }
-(rule__Media__MediaAssignment_2)
-{ after(grammarAccess.getMediaAccess().getMediaAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Media__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Media__Group__3__Impl
-	rule__Media__Group__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getWSTerminalRuleCall_3()); }
-(	RULE_WS)*
-{ after(grammarAccess.getMediaAccess().getWSTerminalRuleCall_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Media__Group__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Media__Group__4__Impl
-	rule__Media__Group__5
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__Group__4__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getGroup_4()); }
-(rule__Media__Group_4__0)*
-{ after(grammarAccess.getMediaAccess().getGroup_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Media__Group__5
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Media__Group__5__Impl
-	rule__Media__Group__6
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__Group__5__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_5()); }
-
-	'{' 
-
-{ after(grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_5()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Media__Group__6
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Media__Group__6__Impl
-	rule__Media__Group__7
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__Group__6__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getWSTerminalRuleCall_6()); }
-(	RULE_WS)*
-{ after(grammarAccess.getMediaAccess().getWSTerminalRuleCall_6()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Media__Group__7
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Media__Group__7__Impl
-	rule__Media__Group__8
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__Group__7__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getRulesAssignment_7()); }
-(rule__Media__RulesAssignment_7)*
-{ after(grammarAccess.getMediaAccess().getRulesAssignment_7()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Media__Group__8
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Media__Group__8__Impl
-	rule__Media__Group__9
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__Group__8__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_8()); }
-
-	'}' 
-
-{ after(grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_8()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Media__Group__9
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Media__Group__9__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__Group__9__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getWSTerminalRuleCall_9()); }
-(	RULE_WS)*
-{ after(grammarAccess.getMediaAccess().getWSTerminalRuleCall_9()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-rule__Media__Group_4__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Media__Group_4__0__Impl
-	rule__Media__Group_4__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__Group_4__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getCommaKeyword_4_0()); }
-
-	',' 
-
-{ after(grammarAccess.getMediaAccess().getCommaKeyword_4_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Media__Group_4__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Media__Group_4__1__Impl
-	rule__Media__Group_4__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__Group_4__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getWSTerminalRuleCall_4_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getMediaAccess().getWSTerminalRuleCall_4_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Media__Group_4__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Media__Group_4__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__Group_4__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getMediaAssignment_4_2()); }
-(rule__Media__MediaAssignment_4_2)
-{ after(grammarAccess.getMediaAccess().getMediaAssignment_4_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Page__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Page__Group__0__Impl
-	rule__Page__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getPageAction_0()); }
-(
-
-)
-{ after(grammarAccess.getPageAccess().getPageAction_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Page__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Page__Group__1__Impl
-	rule__Page__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getPageKeyword_1()); }
-
-	'@page' 
-
-{ after(grammarAccess.getPageAccess().getPageKeyword_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Page__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Page__Group__2__Impl
-	rule__Page__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getWSTerminalRuleCall_2()); }
-(	RULE_WS)*
-{ after(grammarAccess.getPageAccess().getWSTerminalRuleCall_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Page__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Page__Group__3__Impl
-	rule__Page__Group__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getPseudoAssignment_3()); }
-(rule__Page__PseudoAssignment_3)?
-{ after(grammarAccess.getPageAccess().getPseudoAssignment_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Page__Group__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Page__Group__4__Impl
-	rule__Page__Group__5
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__Group__4__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_4()); }
-
-	'{' 
-
-{ after(grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Page__Group__5
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Page__Group__5__Impl
-	rule__Page__Group__6
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__Group__5__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getWSTerminalRuleCall_5()); }
-(	RULE_WS)*
-{ after(grammarAccess.getPageAccess().getWSTerminalRuleCall_5()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Page__Group__6
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Page__Group__6__Impl
-	rule__Page__Group__7
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__Group__6__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getDeclarationsAssignment_6()); }
-(rule__Page__DeclarationsAssignment_6)?
-{ after(grammarAccess.getPageAccess().getDeclarationsAssignment_6()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Page__Group__7
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Page__Group__7__Impl
-	rule__Page__Group__8
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__Group__7__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getGroup_7()); }
-(rule__Page__Group_7__0)*
-{ after(grammarAccess.getPageAccess().getGroup_7()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Page__Group__8
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Page__Group__8__Impl
-	rule__Page__Group__9
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__Group__8__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getRightCurlyBracketKeyword_8()); }
-
-	'}' 
-
-{ after(grammarAccess.getPageAccess().getRightCurlyBracketKeyword_8()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Page__Group__9
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Page__Group__9__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__Group__9__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getWSTerminalRuleCall_9()); }
-(	RULE_WS)*
-{ after(grammarAccess.getPageAccess().getWSTerminalRuleCall_9()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-rule__Page__Group_7__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Page__Group_7__0__Impl
-	rule__Page__Group_7__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__Group_7__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getSemicolonKeyword_7_0()); }
-
-	';' 
-
-{ after(grammarAccess.getPageAccess().getSemicolonKeyword_7_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Page__Group_7__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Page__Group_7__1__Impl
-	rule__Page__Group_7__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__Group_7__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getWSTerminalRuleCall_7_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getPageAccess().getWSTerminalRuleCall_7_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Page__Group_7__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Page__Group_7__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__Group_7__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getDeclarationsAssignment_7_2()); }
-(rule__Page__DeclarationsAssignment_7_2)?
-{ after(grammarAccess.getPageAccess().getDeclarationsAssignment_7_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__PseudoPage__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__PseudoPage__Group__0__Impl
-	rule__PseudoPage__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__PseudoPage__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoPageAccess().getColonKeyword_0()); }
-
-	':' 
-
-{ after(grammarAccess.getPseudoPageAccess().getColonKeyword_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__PseudoPage__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__PseudoPage__Group__1__Impl
-	rule__PseudoPage__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__PseudoPage__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoPageAccess().getIdAssignment_1()); }
-(rule__PseudoPage__IdAssignment_1)
-{ after(grammarAccess.getPseudoPageAccess().getIdAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__PseudoPage__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__PseudoPage__Group__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__PseudoPage__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoPageAccess().getWSTerminalRuleCall_2()); }
-(	RULE_WS)*
-{ after(grammarAccess.getPseudoPageAccess().getWSTerminalRuleCall_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Ruleset__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group__0__Impl
-	rule__Ruleset__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getSelectorsAssignment_0()); }
-(rule__Ruleset__SelectorsAssignment_0)
-{ after(grammarAccess.getRulesetAccess().getSelectorsAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Ruleset__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group__1__Impl
-	rule__Ruleset__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getGroup_1()); }
-(rule__Ruleset__Group_1__0)*
-{ after(grammarAccess.getRulesetAccess().getGroup_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Ruleset__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group__2__Impl
-	rule__Ruleset__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_2()); }
-
-	'{' 
-
-{ after(grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Ruleset__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group__3__Impl
-	rule__Ruleset__Group__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_3()); }
-(	RULE_WS)*
-{ after(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Ruleset__Group__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group__4__Impl
-	rule__Ruleset__Group__5
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group__4__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getPropertiesAssignment_4()); }
-(rule__Ruleset__PropertiesAssignment_4)?
-{ after(grammarAccess.getRulesetAccess().getPropertiesAssignment_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Ruleset__Group__5
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group__5__Impl
-	rule__Ruleset__Group__6
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group__5__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getGroup_5()); }
-(rule__Ruleset__Group_5__0)*
-{ after(grammarAccess.getRulesetAccess().getGroup_5()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Ruleset__Group__6
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group__6__Impl
-	rule__Ruleset__Group__7
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group__6__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_6()); }
-
-	'}' 
-
-{ after(grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_6()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Ruleset__Group__7
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group__7__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group__7__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_7()); }
-(	RULE_WS)*
-{ after(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_7()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-rule__Ruleset__Group_1__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group_1__0__Impl
-	rule__Ruleset__Group_1__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group_1__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getCommaKeyword_1_0()); }
-
-	',' 
-
-{ after(grammarAccess.getRulesetAccess().getCommaKeyword_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Ruleset__Group_1__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group_1__1__Impl
-	rule__Ruleset__Group_1__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group_1__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Ruleset__Group_1__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group_1__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group_1__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getSelectorsAssignment_1_2()); }
-(rule__Ruleset__SelectorsAssignment_1_2)
-{ after(grammarAccess.getRulesetAccess().getSelectorsAssignment_1_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Ruleset__Group_5__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group_5__0__Impl
-	rule__Ruleset__Group_5__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group_5__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getSemicolonKeyword_5_0()); }
-
-	';' 
-
-{ after(grammarAccess.getRulesetAccess().getSemicolonKeyword_5_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Ruleset__Group_5__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group_5__1__Impl
-	rule__Ruleset__Group_5__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group_5__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_5_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_5_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Ruleset__Group_5__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ruleset__Group_5__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__Group_5__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getPropertiesAssignment_5_2()); }
-(rule__Ruleset__PropertiesAssignment_5_2)?
-{ after(grammarAccess.getRulesetAccess().getPropertiesAssignment_5_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Selector__Group_0__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Selector__Group_0__0__Impl
-	rule__Selector__Group_0__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Selector__Group_0__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSelectorAccess().getSimpleSelectorParserRuleCall_0_0()); }
-	ruleSimpleSelector
-{ after(grammarAccess.getSelectorAccess().getSimpleSelectorParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Selector__Group_0__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Selector__Group_0__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Selector__Group_0__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_0_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_0_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__CompositeSelector__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__CompositeSelector__Group__0__Impl
-	rule__CompositeSelector__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CompositeSelector__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCompositeSelectorAccess().getLeftAssignment_0()); }
-(rule__CompositeSelector__LeftAssignment_0)
-{ after(grammarAccess.getCompositeSelectorAccess().getLeftAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__CompositeSelector__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__CompositeSelector__Group__1__Impl
-	rule__CompositeSelector__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CompositeSelector__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCompositeSelectorAccess().getAlternatives_1()); }
-(rule__CompositeSelector__Alternatives_1)
-{ after(grammarAccess.getCompositeSelectorAccess().getAlternatives_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__CompositeSelector__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__CompositeSelector__Group__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CompositeSelector__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCompositeSelectorAccess().getRightAssignment_2()); }
-(rule__CompositeSelector__RightAssignment_2)
-{ after(grammarAccess.getCompositeSelectorAccess().getRightAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__CompositeSelector__Group_1_1__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__CompositeSelector__Group_1_1__0__Impl
-	rule__CompositeSelector__Group_1_1__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CompositeSelector__Group_1_1__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_1_0()); }
-(	RULE_WS)*
-{ after(grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__CompositeSelector__Group_1_1__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__CompositeSelector__Group_1_1__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CompositeSelector__Group_1_1__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCompositeSelectorAccess().getCombinatorAssignment_1_1_1()); }
-(rule__CompositeSelector__CombinatorAssignment_1_1_1)
-{ after(grammarAccess.getCompositeSelectorAccess().getCombinatorAssignment_1_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__SimpleSelector__Group_0__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__SimpleSelector__Group_0__0__Impl
-	rule__SimpleSelector__Group_0__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__SimpleSelector__Group_0__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSimpleSelectorAccess().getElementNameAssignment_0_0()); }
-(rule__SimpleSelector__ElementNameAssignment_0_0)
-{ after(grammarAccess.getSimpleSelectorAccess().getElementNameAssignment_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__SimpleSelector__Group_0__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__SimpleSelector__Group_0__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__SimpleSelector__Group_0__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_0_1()); }
-(rule__SimpleSelector__ConditionAssignment_0_1)*
-{ after(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_0_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Combinator__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Combinator__Group__0__Impl
-	rule__Combinator__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Combinator__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCombinatorAccess().getKindAssignment_0()); }
-(rule__Combinator__KindAssignment_0)
-{ after(grammarAccess.getCombinatorAccess().getKindAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Combinator__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Combinator__Group__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Combinator__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCombinatorAccess().getWSTerminalRuleCall_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getCombinatorAccess().getWSTerminalRuleCall_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Declaration__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Declaration__Group__0__Impl
-	rule__Declaration__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Declaration__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDeclarationAccess().getPropertyAssignment_0()); }
-(rule__Declaration__PropertyAssignment_0)
-{ after(grammarAccess.getDeclarationAccess().getPropertyAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Declaration__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Declaration__Group__1__Impl
-	rule__Declaration__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Declaration__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Declaration__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Declaration__Group__2__Impl
-	rule__Declaration__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Declaration__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDeclarationAccess().getColonKeyword_2()); }
-
-	':' 
-
-{ after(grammarAccess.getDeclarationAccess().getColonKeyword_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Declaration__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Declaration__Group__3__Impl
-	rule__Declaration__Group__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Declaration__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_3()); }
-(	RULE_WS)*
-{ after(grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Declaration__Group__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Declaration__Group__4__Impl
-	rule__Declaration__Group__5
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Declaration__Group__4__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDeclarationAccess().getExpressionAssignment_4()); }
-(rule__Declaration__ExpressionAssignment_4)
-{ after(grammarAccess.getDeclarationAccess().getExpressionAssignment_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Declaration__Group__5
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Declaration__Group__5__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Declaration__Group__5__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDeclarationAccess().getGroup_5()); }
-(rule__Declaration__Group_5__0)?
-{ after(grammarAccess.getDeclarationAccess().getGroup_5()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-rule__Declaration__Group_5__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Declaration__Group_5__0__Impl
-	rule__Declaration__Group_5__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Declaration__Group_5__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDeclarationAccess().getImportantAssignment_5_0()); }
-(rule__Declaration__ImportantAssignment_5_0)
-{ after(grammarAccess.getDeclarationAccess().getImportantAssignment_5_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Declaration__Group_5__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Declaration__Group_5__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Declaration__Group_5__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_5_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_5_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Expression__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Expression__Group__0__Impl
-	rule__Expression__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Expression__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExpressionAccess().getTermsAssignment_0()); }
-(rule__Expression__TermsAssignment_0)
-{ after(grammarAccess.getExpressionAccess().getTermsAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Expression__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Expression__Group__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Expression__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExpressionAccess().getSubtermsAssignment_1()); }
-(rule__Expression__SubtermsAssignment_1)*
-{ after(grammarAccess.getExpressionAccess().getSubtermsAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Subterm__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Subterm__Group__0__Impl
-	rule__Subterm__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Subterm__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSubtermAccess().getOperatorAssignment_0()); }
-(rule__Subterm__OperatorAssignment_0)?
-{ after(grammarAccess.getSubtermAccess().getOperatorAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Subterm__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Subterm__Group__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Subterm__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSubtermAccess().getTermAssignment_1()); }
-(rule__Subterm__TermAssignment_1)
-{ after(grammarAccess.getSubtermAccess().getTermAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Term__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Term__Group__0__Impl
-	rule__Term__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Term__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getTermAccess().getAlternatives_0()); }
-(rule__Term__Alternatives_0)
-{ after(grammarAccess.getTermAccess().getAlternatives_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Term__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Term__Group__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Term__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getTermAccess().getWSTerminalRuleCall_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getTermAccess().getWSTerminalRuleCall_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Function__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Function__Group__0__Impl
-	rule__Function__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Function__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFunctionAccess().getNameAssignment_0()); }
-(rule__Function__NameAssignment_0)
-{ after(grammarAccess.getFunctionAccess().getNameAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Function__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Function__Group__1__Impl
-	rule__Function__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Function__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFunctionAccess().getLeftParenthesisKeyword_1()); }
-
-	'(' 
-
-{ after(grammarAccess.getFunctionAccess().getLeftParenthesisKeyword_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Function__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Function__Group__2__Impl
-	rule__Function__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Function__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFunctionAccess().getWSTerminalRuleCall_2()); }
-(	RULE_WS)*
-{ after(grammarAccess.getFunctionAccess().getWSTerminalRuleCall_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Function__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Function__Group__3__Impl
-	rule__Function__Group__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Function__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFunctionAccess().getArgsAssignment_3()); }
-(rule__Function__ArgsAssignment_3)
-{ after(grammarAccess.getFunctionAccess().getArgsAssignment_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Function__Group__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Function__Group__4__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Function__Group__4__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFunctionAccess().getRightParenthesisKeyword_4()); }
-
-	')' 
-
-{ after(grammarAccess.getFunctionAccess().getRightParenthesisKeyword_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-rule__Number__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Number__Group__0__Impl
-	rule__Number__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Number__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getNumberAccess().getOpAssignment_0()); }
-(rule__Number__OpAssignment_0)?
-{ after(grammarAccess.getNumberAccess().getOpAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Number__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Number__Group__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Number__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getNumberAccess().getValueAssignment_1()); }
-(rule__Number__ValueAssignment_1)
-{ after(grammarAccess.getNumberAccess().getValueAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Percentage__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Percentage__Group__0__Impl
-	rule__Percentage__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Percentage__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPercentageAccess().getOpAssignment_0()); }
-(rule__Percentage__OpAssignment_0)?
-{ after(grammarAccess.getPercentageAccess().getOpAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Percentage__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Percentage__Group__1__Impl
-	rule__Percentage__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Percentage__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPercentageAccess().getValueAssignment_1()); }
-(rule__Percentage__ValueAssignment_1)
-{ after(grammarAccess.getPercentageAccess().getValueAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Percentage__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Percentage__Group__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Percentage__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPercentageAccess().getUnitAssignment_2()); }
-(rule__Percentage__UnitAssignment_2)
-{ after(grammarAccess.getPercentageAccess().getUnitAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Length__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Length__Group__0__Impl
-	rule__Length__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Length__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getLengthAccess().getOpAssignment_0()); }
-(rule__Length__OpAssignment_0)?
-{ after(grammarAccess.getLengthAccess().getOpAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Length__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Length__Group__1__Impl
-	rule__Length__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Length__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getLengthAccess().getValueAssignment_1()); }
-(rule__Length__ValueAssignment_1)
-{ after(grammarAccess.getLengthAccess().getValueAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Length__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Length__Group__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Length__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getLengthAccess().getUnitAssignment_2()); }
-(rule__Length__UnitAssignment_2)
-{ after(grammarAccess.getLengthAccess().getUnitAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Ems__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ems__Group__0__Impl
-	rule__Ems__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ems__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getEmsAccess().getOpAssignment_0()); }
-(rule__Ems__OpAssignment_0)?
-{ after(grammarAccess.getEmsAccess().getOpAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Ems__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ems__Group__1__Impl
-	rule__Ems__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ems__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getEmsAccess().getValueAssignment_1()); }
-(rule__Ems__ValueAssignment_1)
-{ after(grammarAccess.getEmsAccess().getValueAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Ems__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Ems__Group__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ems__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getEmsAccess().getUnitAssignment_2()); }
-(rule__Ems__UnitAssignment_2)
-{ after(grammarAccess.getEmsAccess().getUnitAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Exs__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Exs__Group__0__Impl
-	rule__Exs__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Exs__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExsAccess().getOpAssignment_0()); }
-(rule__Exs__OpAssignment_0)?
-{ after(grammarAccess.getExsAccess().getOpAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Exs__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Exs__Group__1__Impl
-	rule__Exs__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Exs__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExsAccess().getValueAssignment_1()); }
-(rule__Exs__ValueAssignment_1)
-{ after(grammarAccess.getExsAccess().getValueAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Exs__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Exs__Group__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Exs__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExsAccess().getUnitAssignment_2()); }
-(rule__Exs__UnitAssignment_2)
-{ after(grammarAccess.getExsAccess().getUnitAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Angle__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Angle__Group__0__Impl
-	rule__Angle__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Angle__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAngleAccess().getOpAssignment_0()); }
-(rule__Angle__OpAssignment_0)?
-{ after(grammarAccess.getAngleAccess().getOpAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Angle__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Angle__Group__1__Impl
-	rule__Angle__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Angle__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAngleAccess().getValueAssignment_1()); }
-(rule__Angle__ValueAssignment_1)
-{ after(grammarAccess.getAngleAccess().getValueAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Angle__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Angle__Group__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Angle__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAngleAccess().getUnitAssignment_2()); }
-(rule__Angle__UnitAssignment_2)
-{ after(grammarAccess.getAngleAccess().getUnitAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Time__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Time__Group__0__Impl
-	rule__Time__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Time__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getTimeAccess().getOpAssignment_0()); }
-(rule__Time__OpAssignment_0)?
-{ after(grammarAccess.getTimeAccess().getOpAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Time__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Time__Group__1__Impl
-	rule__Time__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Time__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getTimeAccess().getValueAssignment_1()); }
-(rule__Time__ValueAssignment_1)
-{ after(grammarAccess.getTimeAccess().getValueAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Time__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Time__Group__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Time__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getTimeAccess().getUnitAssignment_2()); }
-(rule__Time__UnitAssignment_2)
-{ after(grammarAccess.getTimeAccess().getUnitAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Frequency__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Frequency__Group__0__Impl
-	rule__Frequency__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Frequency__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFrequencyAccess().getOpAssignment_0()); }
-(rule__Frequency__OpAssignment_0)?
-{ after(grammarAccess.getFrequencyAccess().getOpAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Frequency__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Frequency__Group__1__Impl
-	rule__Frequency__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Frequency__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFrequencyAccess().getValueAssignment_1()); }
-(rule__Frequency__ValueAssignment_1)
-{ after(grammarAccess.getFrequencyAccess().getValueAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Frequency__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Frequency__Group__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Frequency__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFrequencyAccess().getUnitAssignment_2()); }
-(rule__Frequency__UnitAssignment_2)
-{ after(grammarAccess.getFrequencyAccess().getUnitAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__Uri__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Uri__Group__0__Impl
-	rule__Uri__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Uri__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getUriAccess().getUrlKeyword_0()); }
-
-	'url(' 
-
-{ after(grammarAccess.getUriAccess().getUrlKeyword_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Uri__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Uri__Group__1__Impl
-	rule__Uri__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Uri__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getUriAccess().getWSTerminalRuleCall_1()); }
-(	RULE_WS)?
-{ after(grammarAccess.getUriAccess().getWSTerminalRuleCall_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Uri__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Uri__Group__2__Impl
-	rule__Uri__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Uri__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getUriAccess().getValueAssignment_2()); }
-(rule__Uri__ValueAssignment_2)
-{ after(grammarAccess.getUriAccess().getValueAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Uri__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Uri__Group__3__Impl
-	rule__Uri__Group__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Uri__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getUriAccess().getWSTerminalRuleCall_3()); }
-(	RULE_WS)?
-{ after(grammarAccess.getUriAccess().getWSTerminalRuleCall_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Uri__Group__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Uri__Group__4__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Uri__Group__4__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getUriAccess().getRightParenthesisKeyword_4()); }
-
-	')' 
-
-{ after(grammarAccess.getUriAccess().getRightParenthesisKeyword_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-rule__Operator__Group_0__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Operator__Group_0__0__Impl
-	rule__Operator__Group_0__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Operator__Group_0__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOperatorAccess().getSolidusKeyword_0_0()); }
-
-	'/' 
-
-{ after(grammarAccess.getOperatorAccess().getSolidusKeyword_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Operator__Group_0__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Operator__Group_0__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Operator__Group_0__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOperatorAccess().getWSTerminalRuleCall_0_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getOperatorAccess().getWSTerminalRuleCall_0_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Operator__Group_1__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Operator__Group_1__0__Impl
-	rule__Operator__Group_1__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Operator__Group_1__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOperatorAccess().getCommaKeyword_1_0()); }
-
-	',' 
-
-{ after(grammarAccess.getOperatorAccess().getCommaKeyword_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Operator__Group_1__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Operator__Group_1__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Operator__Group_1__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOperatorAccess().getWSTerminalRuleCall_1_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getOperatorAccess().getWSTerminalRuleCall_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Attribute__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Attribute__Group__0__Impl
-	rule__Attribute__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Attribute__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeAccess().getLeftSquareBracketKeyword_0()); }
-
-	'[' 
-
-{ after(grammarAccess.getAttributeAccess().getLeftSquareBracketKeyword_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Attribute__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Attribute__Group__1__Impl
-	rule__Attribute__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Attribute__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeAccess().getWSTerminalRuleCall_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getAttributeAccess().getWSTerminalRuleCall_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Attribute__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Attribute__Group__2__Impl
-	rule__Attribute__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Attribute__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeAccess().getNameAssignment_2()); }
-(rule__Attribute__NameAssignment_2)
-{ after(grammarAccess.getAttributeAccess().getNameAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Attribute__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Attribute__Group__3__Impl
-	rule__Attribute__Group__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Attribute__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeAccess().getWSTerminalRuleCall_3()); }
-(	RULE_WS)*
-{ after(grammarAccess.getAttributeAccess().getWSTerminalRuleCall_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Attribute__Group__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Attribute__Group__4__Impl
-	rule__Attribute__Group__5
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Attribute__Group__4__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeAccess().getValueAssignment_4()); }
-(rule__Attribute__ValueAssignment_4)?
-{ after(grammarAccess.getAttributeAccess().getValueAssignment_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Attribute__Group__5
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Attribute__Group__5__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Attribute__Group__5__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeAccess().getRightSquareBracketKeyword_5()); }
-
-	']' 
-
-{ after(grammarAccess.getAttributeAccess().getRightSquareBracketKeyword_5()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-rule__AttributeValue__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__AttributeValue__Group__0__Impl
-	rule__AttributeValue__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__AttributeValue__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeValueAccess().getOperatorAssignment_0()); }
-(rule__AttributeValue__OperatorAssignment_0)
-{ after(grammarAccess.getAttributeValueAccess().getOperatorAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__AttributeValue__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__AttributeValue__Group__1__Impl
-	rule__AttributeValue__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__AttributeValue__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__AttributeValue__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__AttributeValue__Group__2__Impl
-	rule__AttributeValue__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__AttributeValue__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeValueAccess().getValueAssignment_2()); }
-(rule__AttributeValue__ValueAssignment_2)
-{ after(grammarAccess.getAttributeValueAccess().getValueAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__AttributeValue__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__AttributeValue__Group__3__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__AttributeValue__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_3()); }
-(	RULE_WS)*
-{ after(grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-rule__Pseudo__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Pseudo__Group__0__Impl
-	rule__Pseudo__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Pseudo__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoAccess().getColonKeyword_0()); }
-
-	':' 
-
-{ after(grammarAccess.getPseudoAccess().getColonKeyword_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Pseudo__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Pseudo__Group__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Pseudo__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoAccess().getAlternatives_1()); }
-(rule__Pseudo__Alternatives_1)
-{ after(grammarAccess.getPseudoAccess().getAlternatives_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Pseudo__Group_1_1__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Pseudo__Group_1_1__0__Impl
-	rule__Pseudo__Group_1_1__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Pseudo__Group_1_1__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoAccess().getPseudoAssignment_1_1_0()); }
-(rule__Pseudo__PseudoAssignment_1_1_0)
-{ after(grammarAccess.getPseudoAccess().getPseudoAssignment_1_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Pseudo__Group_1_1__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Pseudo__Group_1_1__1__Impl
-	rule__Pseudo__Group_1_1__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Pseudo__Group_1_1__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoAccess().getLeftParenthesisKeyword_1_1_1()); }
-
-	'(' 
-
-{ after(grammarAccess.getPseudoAccess().getLeftParenthesisKeyword_1_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Pseudo__Group_1_1__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Pseudo__Group_1_1__2__Impl
-	rule__Pseudo__Group_1_1__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Pseudo__Group_1_1__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_2()); }
-(	RULE_WS)*
-{ after(grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Pseudo__Group_1_1__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Pseudo__Group_1_1__3__Impl
-	rule__Pseudo__Group_1_1__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Pseudo__Group_1_1__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoAccess().getGroup_1_1_3()); }
-(rule__Pseudo__Group_1_1_3__0)?
-{ after(grammarAccess.getPseudoAccess().getGroup_1_1_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Pseudo__Group_1_1__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Pseudo__Group_1_1__4__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Pseudo__Group_1_1__4__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoAccess().getRightParenthesisKeyword_1_1_4()); }
-
-	')' 
-
-{ after(grammarAccess.getPseudoAccess().getRightParenthesisKeyword_1_1_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-rule__Pseudo__Group_1_1_3__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Pseudo__Group_1_1_3__0__Impl
-	rule__Pseudo__Group_1_1_3__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Pseudo__Group_1_1_3__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoAccess().getArgsAssignment_1_1_3_0()); }
-(rule__Pseudo__ArgsAssignment_1_1_3_0)
-{ after(grammarAccess.getPseudoAccess().getArgsAssignment_1_1_3_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Pseudo__Group_1_1_3__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Pseudo__Group_1_1_3__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Pseudo__Group_1_1_3__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_3_1()); }
-(	RULE_WS)*
-{ after(grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_3_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-rule__Stylesheet__CharsetAssignment_0_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getCharsetSTRINGTerminalRuleCall_0_1_0()); }
-	RULE_STRING{ after(grammarAccess.getStylesheetAccess().getCharsetSTRINGTerminalRuleCall_0_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__ImportsAssignment_2_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getImportsImportParserRuleCall_2_0_0()); }
-	ruleImport{ after(grammarAccess.getStylesheetAccess().getImportsImportParserRuleCall_2_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Stylesheet__ContentsAssignment_3_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStylesheetAccess().getContentsContentParserRuleCall_3_0_0()); }
-	ruleContent{ after(grammarAccess.getStylesheetAccess().getContentsContentParserRuleCall_3_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__StringAssignment_1_0_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getStringSTRINGTerminalRuleCall_1_0_1_0()); }
-	RULE_STRING{ after(grammarAccess.getImportAccess().getStringSTRINGTerminalRuleCall_1_0_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__UriAssignment_1_1_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getUriUriParserRuleCall_1_1_1_0()); }
-	ruleUri{ after(grammarAccess.getImportAccess().getUriUriParserRuleCall_1_1_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__MediaAssignment_3_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getMediaIDTerminalRuleCall_3_0_0()); }
-	RULE_ID{ after(grammarAccess.getImportAccess().getMediaIDTerminalRuleCall_3_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Import__MediaAssignment_3_2_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImportAccess().getMediaIDTerminalRuleCall_3_2_2_0()); }
-	RULE_ID{ after(grammarAccess.getImportAccess().getMediaIDTerminalRuleCall_3_2_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__MediaAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getMediaIDTerminalRuleCall_2_0()); }
-	RULE_ID{ after(grammarAccess.getMediaAccess().getMediaIDTerminalRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__MediaAssignment_4_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getMediaIDTerminalRuleCall_4_2_0()); }
-	RULE_ID{ after(grammarAccess.getMediaAccess().getMediaIDTerminalRuleCall_4_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Media__RulesAssignment_7
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMediaAccess().getRulesRulesetParserRuleCall_7_0()); }
-	ruleRuleset{ after(grammarAccess.getMediaAccess().getRulesRulesetParserRuleCall_7_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__PseudoAssignment_3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getPseudoPseudoPageParserRuleCall_3_0()); }
-	rulePseudoPage{ after(grammarAccess.getPageAccess().getPseudoPseudoPageParserRuleCall_3_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__DeclarationsAssignment_6
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getDeclarationsDeclarationParserRuleCall_6_0()); }
-	ruleDeclaration{ after(grammarAccess.getPageAccess().getDeclarationsDeclarationParserRuleCall_6_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Page__DeclarationsAssignment_7_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPageAccess().getDeclarationsDeclarationParserRuleCall_7_2_0()); }
-	ruleDeclaration{ after(grammarAccess.getPageAccess().getDeclarationsDeclarationParserRuleCall_7_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__PseudoPage__IdAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoPageAccess().getIdIDTerminalRuleCall_1_0()); }
-	RULE_ID{ after(grammarAccess.getPseudoPageAccess().getIdIDTerminalRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__SelectorsAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0()); }
-	ruleSelector{ after(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__SelectorsAssignment_1_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0()); }
-	ruleSelector{ after(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__PropertiesAssignment_4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getPropertiesDeclarationParserRuleCall_4_0()); }
-	ruleDeclaration{ after(grammarAccess.getRulesetAccess().getPropertiesDeclarationParserRuleCall_4_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ruleset__PropertiesAssignment_5_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRulesetAccess().getPropertiesDeclarationParserRuleCall_5_2_0()); }
-	ruleDeclaration{ after(grammarAccess.getRulesetAccess().getPropertiesDeclarationParserRuleCall_5_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CompositeSelector__LeftAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCompositeSelectorAccess().getLeftSimpleSelectorParserRuleCall_0_0()); }
-	ruleSimpleSelector{ after(grammarAccess.getCompositeSelectorAccess().getLeftSimpleSelectorParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CompositeSelector__CombinatorAssignment_1_1_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCompositeSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0()); }
-	ruleCombinator{ after(grammarAccess.getCompositeSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CompositeSelector__RightAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCompositeSelectorAccess().getRightSelectorParserRuleCall_2_0()); }
-	ruleSelector{ after(grammarAccess.getCompositeSelectorAccess().getRightSelectorParserRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__SimpleSelector__ElementNameAssignment_0_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSimpleSelectorAccess().getElementNameAlternatives_0_0_0()); }
-(rule__SimpleSelector__ElementNameAlternatives_0_0_0)
-{ after(grammarAccess.getSimpleSelectorAccess().getElementNameAlternatives_0_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__SimpleSelector__ConditionAssignment_0_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSimpleSelectorAccess().getConditionSelectorConditionParserRuleCall_0_1_0()); }
-	ruleSelectorCondition{ after(grammarAccess.getSimpleSelectorAccess().getConditionSelectorConditionParserRuleCall_0_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__SimpleSelector__ConditionAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSimpleSelectorAccess().getConditionSelectorConditionParserRuleCall_1_0()); }
-	ruleSelectorCondition{ after(grammarAccess.getSimpleSelectorAccess().getConditionSelectorConditionParserRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Combinator__KindAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCombinatorAccess().getKindKINDEnumRuleCall_0_0()); }
-	ruleKIND{ after(grammarAccess.getCombinatorAccess().getKindKINDEnumRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Declaration__PropertyAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDeclarationAccess().getPropertyIDTerminalRuleCall_0_0()); }
-	RULE_ID{ after(grammarAccess.getDeclarationAccess().getPropertyIDTerminalRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Declaration__ExpressionAssignment_4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDeclarationAccess().getExpressionExpressionParserRuleCall_4_0()); }
-	ruleExpression{ after(grammarAccess.getDeclarationAccess().getExpressionExpressionParserRuleCall_4_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Declaration__ImportantAssignment_5_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDeclarationAccess().getImportantT_IMPORTANTTerminalRuleCall_5_0_0()); }
-	RULE_T_IMPORTANT{ after(grammarAccess.getDeclarationAccess().getImportantT_IMPORTANTTerminalRuleCall_5_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Expression__TermsAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExpressionAccess().getTermsTermParserRuleCall_0_0()); }
-	ruleTerm{ after(grammarAccess.getExpressionAccess().getTermsTermParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Expression__SubtermsAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExpressionAccess().getSubtermsSubtermParserRuleCall_1_0()); }
-	ruleSubterm{ after(grammarAccess.getExpressionAccess().getSubtermsSubtermParserRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Subterm__OperatorAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSubtermAccess().getOperatorOperatorParserRuleCall_0_0()); }
-	ruleOperator{ after(grammarAccess.getSubtermAccess().getOperatorOperatorParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Subterm__TermAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getSubtermAccess().getTermTermParserRuleCall_1_0()); }
-	ruleTerm{ after(grammarAccess.getSubtermAccess().getTermTermParserRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Function__NameAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFunctionAccess().getNameIDTerminalRuleCall_0_0()); }
-	RULE_ID{ after(grammarAccess.getFunctionAccess().getNameIDTerminalRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Function__ArgsAssignment_3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFunctionAccess().getArgsExpressionParserRuleCall_3_0()); }
-	ruleExpression{ after(grammarAccess.getFunctionAccess().getArgsExpressionParserRuleCall_3_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Name__ValueAssignment
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getNameAccess().getValueIDTerminalRuleCall_0()); }
-	RULE_ID{ after(grammarAccess.getNameAccess().getValueIDTerminalRuleCall_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Number__OpAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getNumberAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-	ruleUnaryOperator{ after(grammarAccess.getNumberAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Number__ValueAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getNumberAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-	RULE_T_NUM{ after(grammarAccess.getNumberAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Percentage__OpAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPercentageAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-	ruleUnaryOperator{ after(grammarAccess.getPercentageAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Percentage__ValueAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPercentageAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-	RULE_T_NUM{ after(grammarAccess.getPercentageAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Percentage__UnitAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPercentageAccess().getUnitPC_UNITTerminalRuleCall_2_0()); }
-	RULE_PC_UNIT{ after(grammarAccess.getPercentageAccess().getUnitPC_UNITTerminalRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Length__OpAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getLengthAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-	ruleUnaryOperator{ after(grammarAccess.getLengthAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Length__ValueAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getLengthAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-	RULE_T_NUM{ after(grammarAccess.getLengthAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Length__UnitAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getLengthAccess().getUnitLEN_UNITTerminalRuleCall_2_0()); }
-	RULE_LEN_UNIT{ after(grammarAccess.getLengthAccess().getUnitLEN_UNITTerminalRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ems__OpAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getEmsAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-	ruleUnaryOperator{ after(grammarAccess.getEmsAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ems__ValueAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getEmsAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-	RULE_T_NUM{ after(grammarAccess.getEmsAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Ems__UnitAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getEmsAccess().getUnitEM_UNITTerminalRuleCall_2_0()); }
-	RULE_EM_UNIT{ after(grammarAccess.getEmsAccess().getUnitEM_UNITTerminalRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Exs__OpAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExsAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-	ruleUnaryOperator{ after(grammarAccess.getExsAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Exs__ValueAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExsAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-	RULE_T_NUM{ after(grammarAccess.getExsAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Exs__UnitAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExsAccess().getUnitEX_UNITTerminalRuleCall_2_0()); }
-	RULE_EX_UNIT{ after(grammarAccess.getExsAccess().getUnitEX_UNITTerminalRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Angle__OpAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAngleAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-	ruleUnaryOperator{ after(grammarAccess.getAngleAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Angle__ValueAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAngleAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-	RULE_T_NUM{ after(grammarAccess.getAngleAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Angle__UnitAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAngleAccess().getUnitANGLE_UNITTerminalRuleCall_2_0()); }
-	RULE_ANGLE_UNIT{ after(grammarAccess.getAngleAccess().getUnitANGLE_UNITTerminalRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Time__OpAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getTimeAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-	ruleUnaryOperator{ after(grammarAccess.getTimeAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Time__ValueAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getTimeAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-	RULE_T_NUM{ after(grammarAccess.getTimeAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Time__UnitAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getTimeAccess().getUnitTIME_UNITTerminalRuleCall_2_0()); }
-	RULE_TIME_UNIT{ after(grammarAccess.getTimeAccess().getUnitTIME_UNITTerminalRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Frequency__OpAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFrequencyAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-	ruleUnaryOperator{ after(grammarAccess.getFrequencyAccess().getOpUnaryOperatorParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Frequency__ValueAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFrequencyAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-	RULE_T_NUM{ after(grammarAccess.getFrequencyAccess().getValueT_NUMTerminalRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Frequency__UnitAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFrequencyAccess().getUnitFREQ_UNITTerminalRuleCall_2_0()); }
-	RULE_FREQ_UNIT{ after(grammarAccess.getFrequencyAccess().getUnitFREQ_UNITTerminalRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Uri__ValueAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getUriAccess().getValueSTRINGTerminalRuleCall_2_0()); }
-	RULE_STRING{ after(grammarAccess.getUriAccess().getValueSTRINGTerminalRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__StringValue__ValueAssignment
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getStringValueAccess().getValueSTRINGTerminalRuleCall_0()); }
-	RULE_STRING{ after(grammarAccess.getStringValueAccess().getValueSTRINGTerminalRuleCall_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__HexColor__ValueAssignment
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getHexColorAccess().getValueHASHTerminalRuleCall_0()); }
-	RULE_HASH{ after(grammarAccess.getHexColorAccess().getValueHASHTerminalRuleCall_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Class__ClassAssignment
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getClassAccess().getClassT_CLASSTerminalRuleCall_0()); }
-	RULE_T_CLASS{ after(grammarAccess.getClassAccess().getClassT_CLASSTerminalRuleCall_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Attribute__NameAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeAccess().getNameIDTerminalRuleCall_2_0()); }
-	RULE_ID{ after(grammarAccess.getAttributeAccess().getNameIDTerminalRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Attribute__ValueAssignment_4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeAccess().getValueAttributeValueParserRuleCall_4_0()); }
-	ruleAttributeValue{ after(grammarAccess.getAttributeAccess().getValueAttributeValueParserRuleCall_4_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__AttributeValue__OperatorAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeValueAccess().getOperatorATTRIBUTE_OPEnumRuleCall_0_0()); }
-	ruleATTRIBUTE_OP{ after(grammarAccess.getAttributeValueAccess().getOperatorATTRIBUTE_OPEnumRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__AttributeValue__ValueAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAttributeValueAccess().getValueAlternatives_2_0()); }
-(rule__AttributeValue__ValueAlternatives_2_0)
-{ after(grammarAccess.getAttributeValueAccess().getValueAlternatives_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Pseudo__PseudoAssignment_1_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoAccess().getPseudoIDTerminalRuleCall_1_0_0()); }
-	RULE_ID{ after(grammarAccess.getPseudoAccess().getPseudoIDTerminalRuleCall_1_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Pseudo__PseudoAssignment_1_1_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoAccess().getPseudoIDTerminalRuleCall_1_1_0_0()); }
-	RULE_ID{ after(grammarAccess.getPseudoAccess().getPseudoIDTerminalRuleCall_1_1_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Pseudo__ArgsAssignment_1_1_3_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getPseudoAccess().getArgsIDTerminalRuleCall_1_1_3_0_0()); }
-	RULE_ID{ after(grammarAccess.getPseudoAccess().getArgsIDTerminalRuleCall_1_1_3_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CSSId__ValueAssignment
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCSSIdAccess().getValueHASHTerminalRuleCall_0()); }
-	RULE_HASH{ after(grammarAccess.getCSSIdAccess().getValueHASHTerminalRuleCall_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__UnaryOperator__OperatorAssignment
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getUnaryOperatorAccess().getOperatorUNARYEnumRuleCall_0()); }
-	ruleUNARY{ after(grammarAccess.getUnaryOperatorAccess().getOperatorUNARYEnumRuleCall_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-RULE_HASH : '#' ('A'..'Z'|'a'..'z'|'0'..'9')+;
-
-RULE_T_CLASS : '.' RULE_ID;
-
-RULE_T_IMPORTANT : '!important';
-
-RULE_PC_UNIT : '%';
-
-RULE_LEN_UNIT : ('px'|'cm'|'mm'|'in'|'pt'|'pc');
-
-RULE_EM_UNIT : 'em';
-
-RULE_EX_UNIT : 'ex';
-
-RULE_ANGLE_UNIT : ('deg'|'rad'|'grad');
-
-RULE_TIME_UNIT : ('s'|'ms');
-
-RULE_FREQ_UNIT : ('hz'|'mhz');
-
-RULE_T_NUM : (('0'..'9')+|('0'..'9')* '.' ('0'..'9')+);
-
-RULE_ID : '-'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'-')*;
-
-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
-
-RULE_CDO : '<!--';
-
-RULE_CDC : '-->';
-
-RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-
-RULE_WS : (' '|'\t'|'\r'|'\n')+;
-
-RULE_ANY_OTHER : .;
-
-
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.tokens b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.tokens
deleted file mode 100644
index 8c80dd262bb..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.tokens
+++ /dev/null
@@ -1,62 +0,0 @@
-RULE_ID=7

-T__29=29

-T__28=28

-T__27=27

-T__26=26

-T__25=25

-T__24=24

-T__23=23

-RULE_PC_UNIT=11

-T__22=22

-RULE_ANY_OTHER=21

-RULE_T_CLASS=19

-RULE_CDC=6

-T__42=42

-RULE_CDO=5

-T__43=43

-T__40=40

-T__41=41

-RULE_FREQ_UNIT=17

-RULE_T_IMPORTANT=9

-RULE_HASH=18

-RULE_ML_COMMENT=20

-T__30=30

-RULE_TIME_UNIT=16

-T__31=31

-RULE_LEN_UNIT=12

-T__32=32

-RULE_STRING=8

-T__33=33

-T__34=34

-T__35=35

-T__36=36

-T__37=37

-T__38=38

-T__39=39

-RULE_T_NUM=10

-RULE_ANGLE_UNIT=15

-RULE_EX_UNIT=14

-RULE_WS=4

-RULE_EM_UNIT=13

-'}'=35

-'/'=41

-'url('=40

-'>'=25

-'{'=34

-'~='=27

-'@charset '=29

-'@media'=33

-';'=30

-'!='=28

-'@import'=31

-'='=26

-'('=38

-':'=37

-'['=42

-'*'=22

-'-'=23

-'+'=24

-','=32

-')'=39

-']'=43

-'@page'=36

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSLexer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSLexer.java
deleted file mode 100644
index 921247b130e..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSLexer.java
+++ /dev/null
@@ -1,2296 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal;

-

-// Hack: Use our own Lexer superclass by means of import.

-// Currently there is no other way to specify the superclass for the lexer.

-import org.antlr.runtime.BaseRecognizer;

-import org.antlr.runtime.CharStream;

-import org.antlr.runtime.DFA;

-import org.antlr.runtime.EarlyExitException;

-import org.antlr.runtime.IntStream;

-import org.antlr.runtime.MismatchedSetException;

-import org.antlr.runtime.NoViableAltException;

-import org.antlr.runtime.RecognitionException;

-import org.antlr.runtime.RecognizerSharedState;

-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;

-

-@SuppressWarnings("all")

-public class InternalCSSLexer extends Lexer {

-	public static final int RULE_ID = 7;

-	public static final int T__29 = 29;

-	public static final int T__28 = 28;

-	public static final int T__27 = 27;

-	public static final int T__26 = 26;

-	public static final int T__25 = 25;

-	public static final int T__24 = 24;

-	public static final int RULE_PC_UNIT = 11;

-	public static final int T__23 = 23;

-	public static final int T__22 = 22;

-	public static final int RULE_ANY_OTHER = 21;

-	public static final int RULE_T_CLASS = 19;

-	public static final int EOF = -1;

-	public static final int RULE_CDC = 6;

-	public static final int RULE_CDO = 5;

-	public static final int T__42 = 42;

-	public static final int T__43 = 43;

-	public static final int T__40 = 40;

-	public static final int T__41 = 41;

-	public static final int RULE_FREQ_UNIT = 17;

-	public static final int RULE_T_IMPORTANT = 9;

-	public static final int RULE_HASH = 18;

-	public static final int RULE_ML_COMMENT = 20;

-	public static final int T__30 = 30;

-	public static final int RULE_TIME_UNIT = 16;

-	public static final int T__31 = 31;

-	public static final int RULE_LEN_UNIT = 12;

-	public static final int T__32 = 32;

-	public static final int RULE_STRING = 8;

-	public static final int T__33 = 33;

-	public static final int T__34 = 34;

-	public static final int T__35 = 35;

-	public static final int T__36 = 36;

-	public static final int T__37 = 37;

-	public static final int T__38 = 38;

-	public static final int T__39 = 39;

-	public static final int RULE_T_NUM = 10;

-	public static final int RULE_ANGLE_UNIT = 15;

-	public static final int RULE_EX_UNIT = 14;

-	public static final int RULE_WS = 4;

-	public static final int RULE_EM_UNIT = 13;

-

-	// delegates

-	// delegators

-

-	public InternalCSSLexer() {

-		;

-	}

-

-	public InternalCSSLexer(CharStream input) {

-		this(input, new RecognizerSharedState());

-	}

-

-	public InternalCSSLexer(CharStream input, RecognizerSharedState state) {

-		super(input, state);

-

-	}

-

-	@Override

-	public String getGrammarFileName() {

-		return "../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g";

-	}

-

-	// $ANTLR start "T__22"

-	public final void mT__22() throws RecognitionException {

-		try {

-			int _type = T__22;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:11:7: ( '*' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:11:9: '*'

-			{

-				match('*');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__22"

-

-	// $ANTLR start "T__23"

-	public final void mT__23() throws RecognitionException {

-		try {

-			int _type = T__23;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:12:7: ( '-' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:12:9: '-'

-			{

-				match('-');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__23"

-

-	// $ANTLR start "T__24"

-	public final void mT__24() throws RecognitionException {

-		try {

-			int _type = T__24;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:13:7: ( '+' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:13:9: '+'

-			{

-				match('+');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__24"

-

-	// $ANTLR start "T__25"

-	public final void mT__25() throws RecognitionException {

-		try {

-			int _type = T__25;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:14:7: ( '>' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:14:9: '>'

-			{

-				match('>');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__25"

-

-	// $ANTLR start "T__26"

-	public final void mT__26() throws RecognitionException {

-		try {

-			int _type = T__26;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:15:7: ( '=' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:15:9: '='

-			{

-				match('=');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__26"

-

-	// $ANTLR start "T__27"

-	public final void mT__27() throws RecognitionException {

-		try {

-			int _type = T__27;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:16:7: ( '~=' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:16:9: '~='

-			{

-				match("~=");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__27"

-

-	// $ANTLR start "T__28"

-	public final void mT__28() throws RecognitionException {

-		try {

-			int _type = T__28;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:17:7: ( '!=' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:17:9: '!='

-			{

-				match("!=");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__28"

-

-	// $ANTLR start "T__29"

-	public final void mT__29() throws RecognitionException {

-		try {

-			int _type = T__29;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:18:7: ( '@charset ' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:18:9: '@charset '

-			{

-				match("@charset ");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__29"

-

-	// $ANTLR start "T__30"

-	public final void mT__30() throws RecognitionException {

-		try {

-			int _type = T__30;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:19:7: ( ';' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:19:9: ';'

-			{

-				match(';');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__30"

-

-	// $ANTLR start "T__31"

-	public final void mT__31() throws RecognitionException {

-		try {

-			int _type = T__31;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:20:7: ( '@import' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:20:9: '@import'

-			{

-				match("@import");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__31"

-

-	// $ANTLR start "T__32"

-	public final void mT__32() throws RecognitionException {

-		try {

-			int _type = T__32;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:21:7: ( ',' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:21:9: ','

-			{

-				match(',');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__32"

-

-	// $ANTLR start "T__33"

-	public final void mT__33() throws RecognitionException {

-		try {

-			int _type = T__33;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:22:7: ( '@media' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:22:9: '@media'

-			{

-				match("@media");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__33"

-

-	// $ANTLR start "T__34"

-	public final void mT__34() throws RecognitionException {

-		try {

-			int _type = T__34;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:23:7: ( '{' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:23:9: '{'

-			{

-				match('{');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__34"

-

-	// $ANTLR start "T__35"

-	public final void mT__35() throws RecognitionException {

-		try {

-			int _type = T__35;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:24:7: ( '}' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:24:9: '}'

-			{

-				match('}');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__35"

-

-	// $ANTLR start "T__36"

-	public final void mT__36() throws RecognitionException {

-		try {

-			int _type = T__36;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:25:7: ( '@page' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:25:9: '@page'

-			{

-				match("@page");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__36"

-

-	// $ANTLR start "T__37"

-	public final void mT__37() throws RecognitionException {

-		try {

-			int _type = T__37;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:26:7: ( ':' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:26:9: ':'

-			{

-				match(':');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__37"

-

-	// $ANTLR start "T__38"

-	public final void mT__38() throws RecognitionException {

-		try {

-			int _type = T__38;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:27:7: ( '(' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:27:9: '('

-			{

-				match('(');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__38"

-

-	// $ANTLR start "T__39"

-	public final void mT__39() throws RecognitionException {

-		try {

-			int _type = T__39;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:28:7: ( ')' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:28:9: ')'

-			{

-				match(')');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__39"

-

-	// $ANTLR start "T__40"

-	public final void mT__40() throws RecognitionException {

-		try {

-			int _type = T__40;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:29:7: ( 'url(' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:29:9: 'url('

-			{

-				match("url(");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__40"

-

-	// $ANTLR start "T__41"

-	public final void mT__41() throws RecognitionException {

-		try {

-			int _type = T__41;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:30:7: ( '/' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:30:9: '/'

-			{

-				match('/');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__41"

-

-	// $ANTLR start "T__42"

-	public final void mT__42() throws RecognitionException {

-		try {

-			int _type = T__42;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:31:7: ( '[' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:31:9: '['

-			{

-				match('[');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__42"

-

-	// $ANTLR start "T__43"

-	public final void mT__43() throws RecognitionException {

-		try {

-			int _type = T__43;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:32:7: ( ']' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:32:9: ']'

-			{

-				match(']');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__43"

-

-	// $ANTLR start "RULE_HASH"

-	public final void mRULE_HASH() throws RecognitionException {

-		try {

-			int _type = RULE_HASH;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7632:11: ( '#' ( 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' )+ )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7632:13: '#' ( 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' )+

-			{

-				match('#');

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7632:17: ( 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' )+

-				int cnt1 = 0;

-				loop1: do {

-					int alt1 = 2;

-					int LA1_0 = input.LA(1);

-

-					if (((LA1_0 >= '0' && LA1_0 <= '9') || (LA1_0 >= 'A' && LA1_0 <= 'Z') || (LA1_0 >= 'a' && LA1_0 <= 'z'))) {

-						alt1 = 1;

-					}

-

-

-					switch (alt1) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:

-					{

-						if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'Z') || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {

-							input.consume();

-

-						}

-						else {

-							MismatchedSetException mse = new MismatchedSetException(null, input);

-							recover(mse);

-							throw mse;

-						}

-

-

-					}

-						break;

-

-					default:

-						if (cnt1 >= 1) {

-							break loop1;

-						}

-						EarlyExitException eee =

-								new EarlyExitException(1, input);

-						throw eee;

-					}

-					cnt1++;

-				} while (true);

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_HASH"

-

-	// $ANTLR start "RULE_T_CLASS"

-	public final void mRULE_T_CLASS() throws RecognitionException {

-		try {

-			int _type = RULE_T_CLASS;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7634:14: ( '.' RULE_ID )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7634:16: '.' RULE_ID

-			{

-				match('.');

-				mRULE_ID();

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_T_CLASS"

-

-	// $ANTLR start "RULE_T_IMPORTANT"

-	public final void mRULE_T_IMPORTANT() throws RecognitionException {

-		try {

-			int _type = RULE_T_IMPORTANT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7636:18: ( '!important' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7636:20: '!important'

-			{

-				match("!important");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_T_IMPORTANT"

-

-	// $ANTLR start "RULE_PC_UNIT"

-	public final void mRULE_PC_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_PC_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7638:14: ( '%' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7638:16: '%'

-			{

-				match('%');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_PC_UNIT"

-

-	// $ANTLR start "RULE_LEN_UNIT"

-	public final void mRULE_LEN_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_LEN_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7640:15: ( ( 'px' | 'cm' | 'mm' | 'in' | 'pt' | 'pc' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7640:17: ( 'px' | 'cm' | 'mm' | 'in' | 'pt' | 'pc' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7640:17: ( 'px' | 'cm' | 'mm' | 'in' | 'pt' | 'pc' )

-				int alt2 = 6;

-				switch (input.LA(1)) {

-				case 'p': {

-					switch (input.LA(2)) {

-					case 'x': {

-						alt2 = 1;

-					}

-						break;

-					case 't': {

-						alt2 = 5;

-					}

-						break;

-					case 'c': {

-						alt2 = 6;

-					}

-						break;

-					default:

-						NoViableAltException nvae =

-								new NoViableAltException("", 2, 1, input);

-

-						throw nvae;

-					}

-

-				}

-					break;

-				case 'c': {

-					alt2 = 2;

-				}

-					break;

-				case 'm': {

-					alt2 = 3;

-				}

-					break;

-				case 'i': {

-					alt2 = 4;

-				}

-					break;

-				default:

-					NoViableAltException nvae =

-							new NoViableAltException("", 2, 0, input);

-

-					throw nvae;

-				}

-

-				switch (alt2) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7640:18: 'px'

-				{

-					match("px");

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7640:23: 'cm'

-				{

-					match("cm");

-

-

-				}

-					break;

-				case 3:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7640:28: 'mm'

-				{

-					match("mm");

-

-

-				}

-					break;

-				case 4:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7640:33: 'in'

-				{

-					match("in");

-

-

-				}

-					break;

-				case 5:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7640:38: 'pt'

-				{

-					match("pt");

-

-

-				}

-					break;

-				case 6:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7640:43: 'pc'

-				{

-					match("pc");

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_LEN_UNIT"

-

-	// $ANTLR start "RULE_EM_UNIT"

-	public final void mRULE_EM_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_EM_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7642:14: ( 'em' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7642:16: 'em'

-			{

-				match("em");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_EM_UNIT"

-

-	// $ANTLR start "RULE_EX_UNIT"

-	public final void mRULE_EX_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_EX_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7644:14: ( 'ex' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7644:16: 'ex'

-			{

-				match("ex");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_EX_UNIT"

-

-	// $ANTLR start "RULE_ANGLE_UNIT"

-	public final void mRULE_ANGLE_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_ANGLE_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7646:17: ( ( 'deg' | 'rad' | 'grad' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7646:19: ( 'deg' | 'rad' | 'grad' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7646:19: ( 'deg' | 'rad' | 'grad' )

-				int alt3 = 3;

-				switch (input.LA(1)) {

-				case 'd': {

-					alt3 = 1;

-				}

-					break;

-				case 'r': {

-					alt3 = 2;

-				}

-					break;

-				case 'g': {

-					alt3 = 3;

-				}

-					break;

-				default:

-					NoViableAltException nvae =

-							new NoViableAltException("", 3, 0, input);

-

-					throw nvae;

-				}

-

-				switch (alt3) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7646:20: 'deg'

-				{

-					match("deg");

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7646:26: 'rad'

-				{

-					match("rad");

-

-

-				}

-					break;

-				case 3:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7646:32: 'grad'

-				{

-					match("grad");

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_ANGLE_UNIT"

-

-	// $ANTLR start "RULE_TIME_UNIT"

-	public final void mRULE_TIME_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_TIME_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7648:16: ( ( 's' | 'ms' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7648:18: ( 's' | 'ms' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7648:18: ( 's' | 'ms' )

-				int alt4 = 2;

-				int LA4_0 = input.LA(1);

-

-				if ((LA4_0 == 's')) {

-					alt4 = 1;

-				}

-				else if ((LA4_0 == 'm')) {

-					alt4 = 2;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 4, 0, input);

-

-					throw nvae;

-				}

-				switch (alt4) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7648:19: 's'

-				{

-					match('s');

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7648:23: 'ms'

-				{

-					match("ms");

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_TIME_UNIT"

-

-	// $ANTLR start "RULE_FREQ_UNIT"

-	public final void mRULE_FREQ_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_FREQ_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7650:16: ( ( 'hz' | 'mhz' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7650:18: ( 'hz' | 'mhz' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7650:18: ( 'hz' | 'mhz' )

-				int alt5 = 2;

-				int LA5_0 = input.LA(1);

-

-				if ((LA5_0 == 'h')) {

-					alt5 = 1;

-				}

-				else if ((LA5_0 == 'm')) {

-					alt5 = 2;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 5, 0, input);

-

-					throw nvae;

-				}

-				switch (alt5) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7650:19: 'hz'

-				{

-					match("hz");

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7650:24: 'mhz'

-				{

-					match("mhz");

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_FREQ_UNIT"

-

-	// $ANTLR start "RULE_T_NUM"

-	public final void mRULE_T_NUM() throws RecognitionException {

-		try {

-			int _type = RULE_T_NUM;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7652:12: ( ( ( '0' .. '9' )+ | ( '0' .. '9' )* '.' ( '0' .. '9' )+ ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7652:14: ( ( '0' .. '9' )+ | ( '0' .. '9' )* '.' ( '0' .. '9' )+ )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7652:14: ( ( '0' .. '9' )+ | ( '0' .. '9' )* '.' ( '0' .. '9' )+ )

-				int alt9 = 2;

-				alt9 = dfa9.predict(input);

-				switch (alt9) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7652:15: ( '0' .. '9' )+

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7652:15: ( '0' .. '9' )+

-					int cnt6 = 0;

-					loop6: do {

-						int alt6 = 2;

-						int LA6_0 = input.LA(1);

-

-						if (((LA6_0 >= '0' && LA6_0 <= '9'))) {

-							alt6 = 1;

-						}

-

-

-						switch (alt6) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7652:16: '0' .. '9'

-						{

-							matchRange('0', '9');

-

-						}

-							break;

-

-						default:

-							if (cnt6 >= 1) {

-								break loop6;

-							}

-							EarlyExitException eee =

-									new EarlyExitException(6, input);

-							throw eee;

-						}

-						cnt6++;

-					} while (true);

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7652:27: ( '0' .. '9' )* '.' ( '0' .. '9' )+

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7652:27: ( '0' .. '9' )*

-					loop7: do {

-						int alt7 = 2;

-						int LA7_0 = input.LA(1);

-

-						if (((LA7_0 >= '0' && LA7_0 <= '9'))) {

-							alt7 = 1;

-						}

-

-

-						switch (alt7) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7652:28: '0' .. '9'

-						{

-							matchRange('0', '9');

-

-						}

-							break;

-

-						default:

-							break loop7;

-						}

-					} while (true);

-

-					match('.');

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7652:43: ( '0' .. '9' )+

-					int cnt8 = 0;

-					loop8: do {

-						int alt8 = 2;

-						int LA8_0 = input.LA(1);

-

-						if (((LA8_0 >= '0' && LA8_0 <= '9'))) {

-							alt8 = 1;

-						}

-

-

-						switch (alt8) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7652:44: '0' .. '9'

-						{

-							matchRange('0', '9');

-

-						}

-							break;

-

-						default:

-							if (cnt8 >= 1) {

-								break loop8;

-							}

-							EarlyExitException eee =

-									new EarlyExitException(8, input);

-							throw eee;

-						}

-						cnt8++;

-					} while (true);

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_T_NUM"

-

-	// $ANTLR start "RULE_ID"

-	public final void mRULE_ID() throws RecognitionException {

-		try {

-			int _type = RULE_ID;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7654:9: ( ( '-' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )*

-			// )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7654:11: ( '-' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )*

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7654:11: ( '-' )?

-				int alt10 = 2;

-				int LA10_0 = input.LA(1);

-

-				if ((LA10_0 == '-')) {

-					alt10 = 1;

-				}

-				switch (alt10) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7654:11: '-'

-				{

-					match('-');

-

-				}

-					break;

-

-				}

-

-				if ((input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {

-					input.consume();

-

-				}

-				else {

-					MismatchedSetException mse = new MismatchedSetException(null, input);

-					recover(mse);

-					throw mse;

-				}

-

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7654:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )*

-				loop11: do {

-					int alt11 = 2;

-					int LA11_0 = input.LA(1);

-

-					if ((LA11_0 == '-' || (LA11_0 >= '0' && LA11_0 <= '9') || (LA11_0 >= 'A' && LA11_0 <= 'Z') || LA11_0 == '_' || (LA11_0 >= 'a' && LA11_0 <= 'z'))) {

-						alt11 = 1;

-					}

-

-

-					switch (alt11) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:

-					{

-						if (input.LA(1) == '-' || (input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {

-							input.consume();

-

-						}

-						else {

-							MismatchedSetException mse = new MismatchedSetException(null, input);

-							recover(mse);

-							throw mse;

-						}

-

-

-					}

-						break;

-

-					default:

-						break loop11;

-					}

-				} while (true);

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_ID"

-

-	// $ANTLR start "RULE_STRING"

-	public final void mRULE_STRING() throws RecognitionException {

-		try {

-			int _type = RULE_STRING;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' |

-			// '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' |

-			// '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' |

-				// '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

-				int alt14 = 2;

-				int LA14_0 = input.LA(1);

-

-				if ((LA14_0 == '\"')) {

-					alt14 = 1;

-				}

-				else if ((LA14_0 == '\'')) {

-					alt14 = 2;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 14, 0, input);

-

-					throw nvae;

-				}

-				switch (alt14) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' |

-				// '\"' ) ) )* '\"'

-				{

-					match('\"');

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' |

-					// '\"' ) ) )*

-					loop12: do {

-						int alt12 = 3;

-						int LA12_0 = input.LA(1);

-

-						if ((LA12_0 == '\\')) {

-							alt12 = 1;

-						}

-						else if (((LA12_0 >= '\u0000' && LA12_0 <= '!') || (LA12_0 >= '#' && LA12_0 <= '[') || (LA12_0 >= ']' && LA12_0 <= '\uFFFF'))) {

-							alt12 = 2;

-						}

-

-

-						switch (alt12) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )

-						{

-							match('\\');

-							if (input.LA(1) == '\"' || input.LA(1) == '\'' || input.LA(1) == '\\' || input.LA(1) == 'b' || input.LA(1) == 'f' || input.LA(1) == 'n' || input.LA(1) == 'r' || (input.LA(1) >= 't' && input.LA(1) <= 'u')) {

-								input.consume();

-

-							}

-							else {

-								MismatchedSetException mse = new MismatchedSetException(null, input);

-								recover(mse);

-								throw mse;

-							}

-

-

-						}

-							break;

-						case 2:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:66: ~ ( ( '\\\\' | '\"' ) )

-						{

-							if ((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) {

-								input.consume();

-

-							}

-							else {

-								MismatchedSetException mse = new MismatchedSetException(null, input);

-								recover(mse);

-								throw mse;

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop12;

-						}

-					} while (true);

-

-					match('\"');

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' |

-				// '\\'' ) ) )* '\\''

-				{

-					match('\'');

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' |

-					// '\\'' ) ) )*

-					loop13: do {

-						int alt13 = 3;

-						int LA13_0 = input.LA(1);

-

-						if ((LA13_0 == '\\')) {

-							alt13 = 1;

-						}

-						else if (((LA13_0 >= '\u0000' && LA13_0 <= '&') || (LA13_0 >= '(' && LA13_0 <= '[') || (LA13_0 >= ']' && LA13_0 <= '\uFFFF'))) {

-							alt13 = 2;

-						}

-

-

-						switch (alt13) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )

-						{

-							match('\\');

-							if (input.LA(1) == '\"' || input.LA(1) == '\'' || input.LA(1) == '\\' || input.LA(1) == 'b' || input.LA(1) == 'f' || input.LA(1) == 'n' || input.LA(1) == 'r' || (input.LA(1) >= 't' && input.LA(1) <= 'u')) {

-								input.consume();

-

-							}

-							else {

-								MismatchedSetException mse = new MismatchedSetException(null, input);

-								recover(mse);

-								throw mse;

-							}

-

-

-						}

-							break;

-						case 2:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7656:137: ~ ( ( '\\\\' | '\\'' ) )

-						{

-							if ((input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) {

-								input.consume();

-

-							}

-							else {

-								MismatchedSetException mse = new MismatchedSetException(null, input);

-								recover(mse);

-								throw mse;

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop13;

-						}

-					} while (true);

-

-					match('\'');

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_STRING"

-

-	// $ANTLR start "RULE_CDO"

-	public final void mRULE_CDO() throws RecognitionException {

-		try {

-			int _type = RULE_CDO;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7658:10: ( '<!--' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7658:12: '<!--'

-			{

-				match("<!--");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_CDO"

-

-	// $ANTLR start "RULE_CDC"

-	public final void mRULE_CDC() throws RecognitionException {

-		try {

-			int _type = RULE_CDC;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7660:10: ( '-->' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7660:12: '-->'

-			{

-				match("-->");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_CDC"

-

-	// $ANTLR start "RULE_ML_COMMENT"

-	public final void mRULE_ML_COMMENT() throws RecognitionException {

-		try {

-			int _type = RULE_ML_COMMENT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7662:17: ( '/*' ( options {greedy=false; } : . )* '*/' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7662:19: '/*' ( options {greedy=false; } : . )* '*/'

-			{

-				match("/*");

-

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7662:24: ( options {greedy=false; } : . )*

-				loop15: do {

-					int alt15 = 2;

-					int LA15_0 = input.LA(1);

-

-					if ((LA15_0 == '*')) {

-						int LA15_1 = input.LA(2);

-

-						if ((LA15_1 == '/')) {

-							alt15 = 2;

-						}

-						else if (((LA15_1 >= '\u0000' && LA15_1 <= '.') || (LA15_1 >= '0' && LA15_1 <= '\uFFFF'))) {

-							alt15 = 1;

-						}

-

-

-					}

-					else if (((LA15_0 >= '\u0000' && LA15_0 <= ')') || (LA15_0 >= '+' && LA15_0 <= '\uFFFF'))) {

-						alt15 = 1;

-					}

-

-

-					switch (alt15) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7662:52: .

-					{

-						matchAny();

-

-					}

-						break;

-

-					default:

-						break loop15;

-					}

-				} while (true);

-

-				match("*/");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_ML_COMMENT"

-

-	// $ANTLR start "RULE_WS"

-	public final void mRULE_WS() throws RecognitionException {

-		try {

-			int _type = RULE_WS;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7664:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7664:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7664:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

-				int cnt16 = 0;

-				loop16: do {

-					int alt16 = 2;

-					int LA16_0 = input.LA(1);

-

-					if (((LA16_0 >= '\t' && LA16_0 <= '\n') || LA16_0 == '\r' || LA16_0 == ' ')) {

-						alt16 = 1;

-					}

-

-

-					switch (alt16) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:

-					{

-						if ((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') {

-							input.consume();

-

-						}

-						else {

-							MismatchedSetException mse = new MismatchedSetException(null, input);

-							recover(mse);

-							throw mse;

-						}

-

-

-					}

-						break;

-

-					default:

-						if (cnt16 >= 1) {

-							break loop16;

-						}

-						EarlyExitException eee =

-								new EarlyExitException(16, input);

-						throw eee;

-					}

-					cnt16++;

-				} while (true);

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_WS"

-

-	// $ANTLR start "RULE_ANY_OTHER"

-	public final void mRULE_ANY_OTHER() throws RecognitionException {

-		try {

-			int _type = RULE_ANY_OTHER;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7666:16: ( . )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7666:18: .

-			{

-				matchAny();

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_ANY_OTHER"

-

-	@Override

-	public void mTokens() throws RecognitionException {

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:8: ( T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 |

-		// T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_HASH | RULE_T_CLASS | RULE_T_IMPORTANT | RULE_PC_UNIT | RULE_LEN_UNIT | RULE_EM_UNIT | RULE_EX_UNIT | RULE_ANGLE_UNIT | RULE_TIME_UNIT | RULE_FREQ_UNIT | RULE_T_NUM |

-		// RULE_ID | RULE_STRING | RULE_CDO | RULE_CDC | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER )

-		int alt17 = 40;

-		alt17 = dfa17.predict(input);

-		switch (alt17) {

-		case 1:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:10: T__22

-		{

-			mT__22();

-

-		}

-			break;

-		case 2:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:16: T__23

-		{

-			mT__23();

-

-		}

-			break;

-		case 3:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:22: T__24

-		{

-			mT__24();

-

-		}

-			break;

-		case 4:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:28: T__25

-		{

-			mT__25();

-

-		}

-			break;

-		case 5:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:34: T__26

-		{

-			mT__26();

-

-		}

-			break;

-		case 6:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:40: T__27

-		{

-			mT__27();

-

-		}

-			break;

-		case 7:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:46: T__28

-		{

-			mT__28();

-

-		}

-			break;

-		case 8:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:52: T__29

-		{

-			mT__29();

-

-		}

-			break;

-		case 9:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:58: T__30

-		{

-			mT__30();

-

-		}

-			break;

-		case 10:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:64: T__31

-		{

-			mT__31();

-

-		}

-			break;

-		case 11:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:70: T__32

-		{

-			mT__32();

-

-		}

-			break;

-		case 12:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:76: T__33

-		{

-			mT__33();

-

-		}

-			break;

-		case 13:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:82: T__34

-		{

-			mT__34();

-

-		}

-			break;

-		case 14:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:88: T__35

-		{

-			mT__35();

-

-		}

-			break;

-		case 15:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:94: T__36

-		{

-			mT__36();

-

-		}

-			break;

-		case 16:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:100: T__37

-		{

-			mT__37();

-

-		}

-			break;

-		case 17:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:106: T__38

-		{

-			mT__38();

-

-		}

-			break;

-		case 18:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:112: T__39

-		{

-			mT__39();

-

-		}

-			break;

-		case 19:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:118: T__40

-		{

-			mT__40();

-

-		}

-			break;

-		case 20:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:124: T__41

-		{

-			mT__41();

-

-		}

-			break;

-		case 21:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:130: T__42

-		{

-			mT__42();

-

-		}

-			break;

-		case 22:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:136: T__43

-		{

-			mT__43();

-

-		}

-			break;

-		case 23:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:142: RULE_HASH

-		{

-			mRULE_HASH();

-

-		}

-			break;

-		case 24:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:152: RULE_T_CLASS

-		{

-			mRULE_T_CLASS();

-

-		}

-			break;

-		case 25:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:165: RULE_T_IMPORTANT

-		{

-			mRULE_T_IMPORTANT();

-

-		}

-			break;

-		case 26:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:182: RULE_PC_UNIT

-		{

-			mRULE_PC_UNIT();

-

-		}

-			break;

-		case 27:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:195: RULE_LEN_UNIT

-		{

-			mRULE_LEN_UNIT();

-

-		}

-			break;

-		case 28:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:209: RULE_EM_UNIT

-		{

-			mRULE_EM_UNIT();

-

-		}

-			break;

-		case 29:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:222: RULE_EX_UNIT

-		{

-			mRULE_EX_UNIT();

-

-		}

-			break;

-		case 30:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:235: RULE_ANGLE_UNIT

-		{

-			mRULE_ANGLE_UNIT();

-

-		}

-			break;

-		case 31:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:251: RULE_TIME_UNIT

-		{

-			mRULE_TIME_UNIT();

-

-		}

-			break;

-		case 32:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:266: RULE_FREQ_UNIT

-		{

-			mRULE_FREQ_UNIT();

-

-		}

-			break;

-		case 33:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:281: RULE_T_NUM

-		{

-			mRULE_T_NUM();

-

-		}

-			break;

-		case 34:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:292: RULE_ID

-		{

-			mRULE_ID();

-

-		}

-			break;

-		case 35:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:300: RULE_STRING

-		{

-			mRULE_STRING();

-

-		}

-			break;

-		case 36:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:312: RULE_CDO

-		{

-			mRULE_CDO();

-

-		}

-			break;

-		case 37:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:321: RULE_CDC

-		{

-			mRULE_CDC();

-

-		}

-			break;

-		case 38:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:330: RULE_ML_COMMENT

-		{

-			mRULE_ML_COMMENT();

-

-		}

-			break;

-		case 39:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:346: RULE_WS

-		{

-			mRULE_WS();

-

-		}

-			break;

-		case 40:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1:354: RULE_ANY_OTHER

-		{

-			mRULE_ANY_OTHER();

-

-		}

-			break;

-

-		}

-

-	}

-

-

-	protected DFA9 dfa9 = new DFA9(this);

-	protected DFA17 dfa17 = new DFA17(this);

-	static final String DFA9_eotS =

-			"\1\uffff\1\3\2\uffff";

-	static final String DFA9_eofS =

-			"\4\uffff";

-	static final String DFA9_minS =

-			"\2\56\2\uffff";

-	static final String DFA9_maxS =

-			"\2\71\2\uffff";

-	static final String DFA9_acceptS =

-			"\2\uffff\1\2\1\1";

-	static final String DFA9_specialS =

-			"\4\uffff}>";

-	static final String[] DFA9_transitionS = {

-			"\1\2\1\uffff\12\1",

-			"\1\2\1\uffff\12\1",

-			"",

-			""

-	};

-

-	static final short[] DFA9_eot = DFA.unpackEncodedString(DFA9_eotS);

-	static final short[] DFA9_eof = DFA.unpackEncodedString(DFA9_eofS);

-	static final char[] DFA9_min = DFA.unpackEncodedStringToUnsignedChars(DFA9_minS);

-	static final char[] DFA9_max = DFA.unpackEncodedStringToUnsignedChars(DFA9_maxS);

-	static final short[] DFA9_accept = DFA.unpackEncodedString(DFA9_acceptS);

-	static final short[] DFA9_special = DFA.unpackEncodedString(DFA9_specialS);

-	static final short[][] DFA9_transition;

-

-	static {

-		int numStates = DFA9_transitionS.length;

-		DFA9_transition = new short[numStates][];

-		for (int i = 0; i < numStates; i++) {

-			DFA9_transition[i] = DFA.unpackEncodedString(DFA9_transitionS[i]);

-		}

-	}

-

-	class DFA9 extends DFA {

-

-		public DFA9(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 9;

-			this.eot = DFA9_eot;

-			this.eof = DFA9_eof;

-			this.min = DFA9_min;

-			this.max = DFA9_max;

-			this.accept = DFA9_accept;

-			this.special = DFA9_special;

-			this.transition = DFA9_transition;

-		}

-

-		@Override

-		public String getDescription() {

-			return "7652:14: ( ( '0' .. '9' )+ | ( '0' .. '9' )* '.' ( '0' .. '9' )+ )";

-		}

-	}

-

-	static final String DFA17_eotS =

-			"\2\uffff\1\52\3\uffff\3\47\7\uffff\1\53\1\77\2\uffff\2\47\1\uffff" +

-					"\10\53\1\123\1\53\2\uffff\3\47\27\uffff\1\53\10\uffff\5\131\1\123" +

-					"\1\53\1\131\1\133\1\134\3\53\1\uffff\1\140\3\uffff\1\53\1\uffff" +

-					"\1\140\2\uffff\2\142\1\53\3\uffff\1\142";

-	static final String DFA17_eofS =

-			"\144\uffff";

-	static final String DFA17_minS =

-			"\1\0\1\uffff\1\55\3\uffff\2\75\1\143\7\uffff\1\162\1\52\2\uffff" +

-					"\1\60\1\55\1\uffff\1\143\1\155\1\150\1\156\1\155\1\145\1\141\1\162" +

-					"\1\55\1\172\2\uffff\2\0\1\41\27\uffff\1\154\10\uffff\6\55\1\172" +

-					"\3\55\1\147\1\144\1\141\1\uffff\1\55\3\uffff\1\50\1\uffff\1\55\2" +

-					"\uffff\2\55\1\144\3\uffff\1\55";

-	static final String DFA17_maxS =

-			"\1\uffff\1\uffff\1\172\3\uffff\1\75\1\151\1\160\7\uffff\1\162\1" +

-					"\52\2\uffff\2\172\1\uffff\1\170\1\155\1\163\1\156\1\170\1\145\1" +

-					"\141\1\162\2\172\2\uffff\2\uffff\1\41\27\uffff\1\154\10\uffff\12" +

-					"\172\1\147\1\144\1\141\1\uffff\1\172\3\uffff\1\50\1\uffff\1\172" +

-					"\2\uffff\2\172\1\144\3\uffff\1\172";

-	static final String DFA17_acceptS =

-			"\1\uffff\1\1\1\uffff\1\3\1\4\1\5\3\uffff\1\11\1\13\1\15\1\16\1" +

-					"\20\1\21\1\22\2\uffff\1\25\1\26\2\uffff\1\32\12\uffff\1\41\1\42" +

-					"\3\uffff\1\47\1\50\1\1\1\45\1\2\1\42\1\3\1\4\1\5\1\6\1\7\1\31\1" +

-					"\10\1\12\1\14\1\17\1\11\1\13\1\15\1\16\1\20\1\21\1\22\1\uffff\1" +

-					"\46\1\24\1\25\1\26\1\27\1\41\1\30\1\32\15\uffff\1\37\1\uffff\1\43" +

-					"\1\44\1\47\1\uffff\1\33\1\uffff\1\34\1\35\3\uffff\1\40\1\23\1\36" +

-					"\1\uffff";

-	static final String DFA17_specialS =

-			"\1\1\42\uffff\1\2\1\0\77\uffff}>";

-	static final String[] DFA17_transitionS = {

-			"\11\47\2\46\2\47\1\46\22\47\1\46\1\7\1\43\1\24\1\47\1\26\1" +

-					"\47\1\44\1\16\1\17\1\1\1\3\1\12\1\2\1\25\1\21\12\41\1\15\1\11" +

-					"\1\45\1\5\1\4\1\47\1\10\32\42\1\22\1\47\1\23\1\47\1\42\1\47" +

-					"\2\42\1\30\1\34\1\33\1\42\1\36\1\40\1\32\3\42\1\31\2\42\1\27" +

-					"\1\42\1\35\1\37\1\42\1\20\5\42\1\13\1\47\1\14\1\6\uff81\47",

-			"",

-			"\1\51\23\uffff\32\53\4\uffff\1\53\1\uffff\32\53",

-			"",

-			"",

-			"",

-			"\1\57",

-			"\1\60\53\uffff\1\61",

-			"\1\62\5\uffff\1\63\3\uffff\1\64\2\uffff\1\65",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\1\75",

-			"\1\76",

-			"",

-			"",

-			"\12\102\7\uffff\32\102\6\uffff\32\102",

-			"\1\104\2\uffff\12\103\7\uffff\32\104\4\uffff\1\104\1\uffff" +

-					"\32\104",

-			"",

-			"\1\110\20\uffff\1\107\3\uffff\1\106",

-			"\1\111",

-			"\1\114\4\uffff\1\112\5\uffff\1\113",

-			"\1\115",

-			"\1\116\12\uffff\1\117",

-			"\1\120",

-			"\1\121",

-			"\1\122",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"\1\124",

-			"",

-			"",

-			"\0\125",

-			"\0\125",

-			"\1\126",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\1\130",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"\1\132",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"\1\135",

-			"\1\136",

-			"\1\137",

-			"",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"",

-			"",

-			"",

-			"\1\141",

-			"",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"",

-			"",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53",

-			"\1\143",

-			"",

-			"",

-			"",

-			"\1\53\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32" +

-					"\53"

-	};

-

-	static final short[] DFA17_eot = DFA.unpackEncodedString(DFA17_eotS);

-	static final short[] DFA17_eof = DFA.unpackEncodedString(DFA17_eofS);

-	static final char[] DFA17_min = DFA.unpackEncodedStringToUnsignedChars(DFA17_minS);

-	static final char[] DFA17_max = DFA.unpackEncodedStringToUnsignedChars(DFA17_maxS);

-	static final short[] DFA17_accept = DFA.unpackEncodedString(DFA17_acceptS);

-	static final short[] DFA17_special = DFA.unpackEncodedString(DFA17_specialS);

-	static final short[][] DFA17_transition;

-

-	static {

-		int numStates = DFA17_transitionS.length;

-		DFA17_transition = new short[numStates][];

-		for (int i = 0; i < numStates; i++) {

-			DFA17_transition[i] = DFA.unpackEncodedString(DFA17_transitionS[i]);

-		}

-	}

-

-	class DFA17 extends DFA {

-

-		public DFA17(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 17;

-			this.eot = DFA17_eot;

-			this.eof = DFA17_eof;

-			this.min = DFA17_min;

-			this.max = DFA17_max;

-			this.accept = DFA17_accept;

-			this.special = DFA17_special;

-			this.transition = DFA17_transition;

-		}

-

-		@Override

-		public String getDescription() {

-			return "1:1: Tokens : ( T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_HASH | RULE_T_CLASS | RULE_T_IMPORTANT | RULE_PC_UNIT | RULE_LEN_UNIT | RULE_EM_UNIT | RULE_EX_UNIT | RULE_ANGLE_UNIT | RULE_TIME_UNIT | RULE_FREQ_UNIT | RULE_T_NUM | RULE_ID | RULE_STRING | RULE_CDO | RULE_CDC | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER );";

-		}

-

-		@Override

-		public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {

-			IntStream input = _input;

-			int _s = s;

-			switch (s) {

-			case 0:

-				int LA17_36 = input.LA(1);

-

-				s = -1;

-				if (((LA17_36 >= '\u0000' && LA17_36 <= '\uFFFF'))) {

-					s = 85;

-				} else {

-					s = 39;

-				}

-

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 1:

-				int LA17_0 = input.LA(1);

-

-				s = -1;

-				if ((LA17_0 == '*')) {

-					s = 1;

-				}

-

-				else if ((LA17_0 == '-')) {

-					s = 2;

-				}

-

-				else if ((LA17_0 == '+')) {

-					s = 3;

-				}

-

-				else if ((LA17_0 == '>')) {

-					s = 4;

-				}

-

-				else if ((LA17_0 == '=')) {

-					s = 5;

-				}

-

-				else if ((LA17_0 == '~')) {

-					s = 6;

-				}

-

-				else if ((LA17_0 == '!')) {

-					s = 7;

-				}

-

-				else if ((LA17_0 == '@')) {

-					s = 8;

-				}

-

-				else if ((LA17_0 == ';')) {

-					s = 9;

-				}

-

-				else if ((LA17_0 == ',')) {

-					s = 10;

-				}

-

-				else if ((LA17_0 == '{')) {

-					s = 11;

-				}

-

-				else if ((LA17_0 == '}')) {

-					s = 12;

-				}

-

-				else if ((LA17_0 == ':')) {

-					s = 13;

-				}

-

-				else if ((LA17_0 == '(')) {

-					s = 14;

-				}

-

-				else if ((LA17_0 == ')')) {

-					s = 15;

-				}

-

-				else if ((LA17_0 == 'u')) {

-					s = 16;

-				}

-

-				else if ((LA17_0 == '/')) {

-					s = 17;

-				}

-

-				else if ((LA17_0 == '[')) {

-					s = 18;

-				}

-

-				else if ((LA17_0 == ']')) {

-					s = 19;

-				}

-

-				else if ((LA17_0 == '#')) {

-					s = 20;

-				}

-

-				else if ((LA17_0 == '.')) {

-					s = 21;

-				}

-

-				else if ((LA17_0 == '%')) {

-					s = 22;

-				}

-

-				else if ((LA17_0 == 'p')) {

-					s = 23;

-				}

-

-				else if ((LA17_0 == 'c')) {

-					s = 24;

-				}

-

-				else if ((LA17_0 == 'm')) {

-					s = 25;

-				}

-

-				else if ((LA17_0 == 'i')) {

-					s = 26;

-				}

-

-				else if ((LA17_0 == 'e')) {

-					s = 27;

-				}

-

-				else if ((LA17_0 == 'd')) {

-					s = 28;

-				}

-

-				else if ((LA17_0 == 'r')) {

-					s = 29;

-				}

-

-				else if ((LA17_0 == 'g')) {

-					s = 30;

-				}

-

-				else if ((LA17_0 == 's')) {

-					s = 31;

-				}

-

-				else if ((LA17_0 == 'h')) {

-					s = 32;

-				}

-

-				else if (((LA17_0 >= '0' && LA17_0 <= '9'))) {

-					s = 33;

-				}

-

-				else if (((LA17_0 >= 'A' && LA17_0 <= 'Z') || LA17_0 == '_' || (LA17_0 >= 'a' && LA17_0 <= 'b') || LA17_0 == 'f' || (LA17_0 >= 'j' && LA17_0 <= 'l') || (LA17_0 >= 'n' && LA17_0 <= 'o') || LA17_0 == 'q' || LA17_0 == 't' || (LA17_0 >= 'v' && LA17_0 <= 'z'))) {

-					s = 34;

-				}

-

-				else if ((LA17_0 == '\"')) {

-					s = 35;

-				}

-

-				else if ((LA17_0 == '\'')) {

-					s = 36;

-				}

-

-				else if ((LA17_0 == '<')) {

-					s = 37;

-				}

-

-				else if (((LA17_0 >= '\t' && LA17_0 <= '\n') || LA17_0 == '\r' || LA17_0 == ' ')) {

-					s = 38;

-				}

-

-				else if (((LA17_0 >= '\u0000' && LA17_0 <= '\b') || (LA17_0 >= '\u000B' && LA17_0 <= '\f') || (LA17_0 >= '\u000E' && LA17_0 <= '\u001F') || LA17_0 == '$' || LA17_0 == '&' || LA17_0 == '?' || LA17_0 == '\\' || LA17_0 == '^' || LA17_0 == '`'

-						|| LA17_0 == '|' || (LA17_0 >= '\u007F' && LA17_0 <= '\uFFFF'))) {

-					s = 39;

-				}

-

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 2:

-				int LA17_35 = input.LA(1);

-

-				s = -1;

-				if (((LA17_35 >= '\u0000' && LA17_35 <= '\uFFFF'))) {

-					s = 85;

-				} else {

-					s = 39;

-				}

-

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			}

-			NoViableAltException nvae =

-					new NoViableAltException(getDescription(), 17, _s, input);

-			error(nvae);

-			throw nvae;

-		}

-	}

-

-

-}
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSParser.java
deleted file mode 100644
index 6505bf88a16..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSSParser.java
+++ /dev/null
@@ -1,21955 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal;

-

-import org.antlr.runtime.BaseRecognizer;

-import org.antlr.runtime.BitSet;

-import org.antlr.runtime.NoViableAltException;

-import org.antlr.runtime.RecognitionException;

-import org.antlr.runtime.RecognizerSharedState;

-import org.antlr.runtime.TokenStream;

-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;

-import org.eclipse.xtext.Grammar;

-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;

-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.DFA;

-

-@SuppressWarnings("all")

-public class InternalCSSParser extends AbstractInternalContentAssistParser {

-	public static final String[] tokenNames = new String[] {

-			"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_WS", "RULE_CDO", "RULE_CDC", "RULE_ID", "RULE_STRING", "RULE_T_IMPORTANT", "RULE_T_NUM", "RULE_PC_UNIT", "RULE_LEN_UNIT", "RULE_EM_UNIT", "RULE_EX_UNIT", "RULE_ANGLE_UNIT", "RULE_TIME_UNIT",

-			"RULE_FREQ_UNIT", "RULE_HASH", "RULE_T_CLASS", "RULE_ML_COMMENT", "RULE_ANY_OTHER", "'*'", "'-'", "'+'", "'>'", "'='", "'~='", "'!='", "'@charset '", "';'", "'@import'", "','", "'@media'", "'{'", "'}'", "'@page'", "':'", "'('", "')'", "'url('",

-			"'/'", "'['", "']'"

-	};

-	public static final int RULE_ID = 7;

-	public static final int T__29 = 29;

-	public static final int T__28 = 28;

-	public static final int T__27 = 27;

-	public static final int T__26 = 26;

-	public static final int T__25 = 25;

-	public static final int T__24 = 24;

-	public static final int T__23 = 23;

-	public static final int RULE_PC_UNIT = 11;

-	public static final int T__22 = 22;

-	public static final int RULE_ANY_OTHER = 21;

-	public static final int RULE_T_CLASS = 19;

-	public static final int EOF = -1;

-	public static final int RULE_CDC = 6;

-	public static final int T__42 = 42;

-	public static final int RULE_CDO = 5;

-	public static final int T__43 = 43;

-	public static final int T__40 = 40;

-	public static final int T__41 = 41;

-	public static final int RULE_FREQ_UNIT = 17;

-	public static final int RULE_T_IMPORTANT = 9;

-	public static final int RULE_HASH = 18;

-	public static final int RULE_ML_COMMENT = 20;

-	public static final int T__30 = 30;

-	public static final int RULE_TIME_UNIT = 16;

-	public static final int T__31 = 31;

-	public static final int RULE_LEN_UNIT = 12;

-	public static final int T__32 = 32;

-	public static final int RULE_STRING = 8;

-	public static final int T__33 = 33;

-	public static final int T__34 = 34;

-	public static final int T__35 = 35;

-	public static final int T__36 = 36;

-	public static final int T__37 = 37;

-	public static final int T__38 = 38;

-	public static final int T__39 = 39;

-	public static final int RULE_T_NUM = 10;

-	public static final int RULE_ANGLE_UNIT = 15;

-	public static final int RULE_EX_UNIT = 14;

-	public static final int RULE_WS = 4;

-	public static final int RULE_EM_UNIT = 13;

-

-	// delegates

-	// delegators

-

-

-	public InternalCSSParser(TokenStream input) {

-		this(input, new RecognizerSharedState());

-	}

-

-	public InternalCSSParser(TokenStream input, RecognizerSharedState state) {

-		super(input, state);

-

-	}

-

-

-	@Override

-	public String[] getTokenNames() {

-		return InternalCSSParser.tokenNames;

-	}

-

-	@Override

-	public String getGrammarFileName() {

-		return "../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g";

-	}

-

-

-

-	private CSSGrammarAccess grammarAccess;

-

-	public void setGrammarAccess(CSSGrammarAccess grammarAccess) {

-		this.grammarAccess = grammarAccess;

-	}

-

-	@Override

-	protected Grammar getGrammar() {

-		return grammarAccess.getGrammar();

-	}

-

-	@Override

-	protected String getValueForTokenName(String tokenName) {

-		return tokenName;

-	}

-

-

-

-

-	// $ANTLR start "entryRuleStylesheet"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:60:1: entryRuleStylesheet : ruleStylesheet EOF ;

-	public final void entryRuleStylesheet() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:61:1: ( ruleStylesheet EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:62:1: ruleStylesheet EOF

-			{

-				before(grammarAccess.getStylesheetRule());

-				pushFollow(FOLLOW_ruleStylesheet_in_entryRuleStylesheet61);

-				ruleStylesheet();

-

-				state._fsp--;

-

-				after(grammarAccess.getStylesheetRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleStylesheet68);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleStylesheet"

-

-

-	// $ANTLR start "ruleStylesheet"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:69:1: ruleStylesheet : ( ( rule__Stylesheet__Group__0 ) ) ;

-	public final void ruleStylesheet() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:73:2: ( ( ( rule__Stylesheet__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:74:1: ( ( rule__Stylesheet__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:74:1: ( ( rule__Stylesheet__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:75:1: ( rule__Stylesheet__Group__0 )

-				{

-					before(grammarAccess.getStylesheetAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:76:1: ( rule__Stylesheet__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:76:2: rule__Stylesheet__Group__0

-					{

-						pushFollow(FOLLOW_rule__Stylesheet__Group__0_in_ruleStylesheet94);

-						rule__Stylesheet__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getStylesheetAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleStylesheet"

-

-

-	// $ANTLR start "entryRuleContent"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:88:1: entryRuleContent : ruleContent EOF ;

-	public final void entryRuleContent() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:89:1: ( ruleContent EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:90:1: ruleContent EOF

-			{

-				before(grammarAccess.getContentRule());

-				pushFollow(FOLLOW_ruleContent_in_entryRuleContent121);

-				ruleContent();

-

-				state._fsp--;

-

-				after(grammarAccess.getContentRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleContent128);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleContent"

-

-

-	// $ANTLR start "ruleContent"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:97:1: ruleContent : ( ( rule__Content__Alternatives ) ) ;

-	public final void ruleContent() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:101:2: ( ( ( rule__Content__Alternatives ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:102:1: ( ( rule__Content__Alternatives ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:102:1: ( ( rule__Content__Alternatives ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:103:1: ( rule__Content__Alternatives )

-				{

-					before(grammarAccess.getContentAccess().getAlternatives());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:104:1: ( rule__Content__Alternatives )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:104:2: rule__Content__Alternatives

-					{

-						pushFollow(FOLLOW_rule__Content__Alternatives_in_ruleContent154);

-						rule__Content__Alternatives();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getContentAccess().getAlternatives());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleContent"

-

-

-	// $ANTLR start "entryRuleImport"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:116:1: entryRuleImport : ruleImport EOF ;

-	public final void entryRuleImport() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:117:1: ( ruleImport EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:118:1: ruleImport EOF

-			{

-				before(grammarAccess.getImportRule());

-				pushFollow(FOLLOW_ruleImport_in_entryRuleImport181);

-				ruleImport();

-

-				state._fsp--;

-

-				after(grammarAccess.getImportRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleImport188);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleImport"

-

-

-	// $ANTLR start "ruleImport"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:125:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;

-	public final void ruleImport() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:129:2: ( ( ( rule__Import__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:130:1: ( ( rule__Import__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:130:1: ( ( rule__Import__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:131:1: ( rule__Import__Group__0 )

-				{

-					before(grammarAccess.getImportAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:132:1: ( rule__Import__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:132:2: rule__Import__Group__0

-					{

-						pushFollow(FOLLOW_rule__Import__Group__0_in_ruleImport214);

-						rule__Import__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getImportAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleImport"

-

-

-	// $ANTLR start "entryRuleMedia"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:144:1: entryRuleMedia : ruleMedia EOF ;

-	public final void entryRuleMedia() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:145:1: ( ruleMedia EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:146:1: ruleMedia EOF

-			{

-				before(grammarAccess.getMediaRule());

-				pushFollow(FOLLOW_ruleMedia_in_entryRuleMedia241);

-				ruleMedia();

-

-				state._fsp--;

-

-				after(grammarAccess.getMediaRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleMedia248);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleMedia"

-

-

-	// $ANTLR start "ruleMedia"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:153:1: ruleMedia : ( ( rule__Media__Group__0 ) ) ;

-	public final void ruleMedia() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:157:2: ( ( ( rule__Media__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:158:1: ( ( rule__Media__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:158:1: ( ( rule__Media__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:159:1: ( rule__Media__Group__0 )

-				{

-					before(grammarAccess.getMediaAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:160:1: ( rule__Media__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:160:2: rule__Media__Group__0

-					{

-						pushFollow(FOLLOW_rule__Media__Group__0_in_ruleMedia274);

-						rule__Media__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getMediaAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleMedia"

-

-

-	// $ANTLR start "entryRulePage"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:172:1: entryRulePage : rulePage EOF ;

-	public final void entryRulePage() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:173:1: ( rulePage EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:174:1: rulePage EOF

-			{

-				before(grammarAccess.getPageRule());

-				pushFollow(FOLLOW_rulePage_in_entryRulePage301);

-				rulePage();

-

-				state._fsp--;

-

-				after(grammarAccess.getPageRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRulePage308);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRulePage"

-

-

-	// $ANTLR start "rulePage"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:181:1: rulePage : ( ( rule__Page__Group__0 ) ) ;

-	public final void rulePage() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:185:2: ( ( ( rule__Page__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:186:1: ( ( rule__Page__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:186:1: ( ( rule__Page__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:187:1: ( rule__Page__Group__0 )

-				{

-					before(grammarAccess.getPageAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:188:1: ( rule__Page__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:188:2: rule__Page__Group__0

-					{

-						pushFollow(FOLLOW_rule__Page__Group__0_in_rulePage334);

-						rule__Page__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getPageAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rulePage"

-

-

-	// $ANTLR start "entryRulePseudoPage"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:200:1: entryRulePseudoPage : rulePseudoPage EOF ;

-	public final void entryRulePseudoPage() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:201:1: ( rulePseudoPage EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:202:1: rulePseudoPage EOF

-			{

-				before(grammarAccess.getPseudoPageRule());

-				pushFollow(FOLLOW_rulePseudoPage_in_entryRulePseudoPage361);

-				rulePseudoPage();

-

-				state._fsp--;

-

-				after(grammarAccess.getPseudoPageRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRulePseudoPage368);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRulePseudoPage"

-

-

-	// $ANTLR start "rulePseudoPage"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:209:1: rulePseudoPage : ( ( rule__PseudoPage__Group__0 ) ) ;

-	public final void rulePseudoPage() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:213:2: ( ( ( rule__PseudoPage__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:214:1: ( ( rule__PseudoPage__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:214:1: ( ( rule__PseudoPage__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:215:1: ( rule__PseudoPage__Group__0 )

-				{

-					before(grammarAccess.getPseudoPageAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:216:1: ( rule__PseudoPage__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:216:2: rule__PseudoPage__Group__0

-					{

-						pushFollow(FOLLOW_rule__PseudoPage__Group__0_in_rulePseudoPage394);

-						rule__PseudoPage__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getPseudoPageAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rulePseudoPage"

-

-

-	// $ANTLR start "entryRuleRuleset"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:228:1: entryRuleRuleset : ruleRuleset EOF ;

-	public final void entryRuleRuleset() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:229:1: ( ruleRuleset EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:230:1: ruleRuleset EOF

-			{

-				before(grammarAccess.getRulesetRule());

-				pushFollow(FOLLOW_ruleRuleset_in_entryRuleRuleset421);

-				ruleRuleset();

-

-				state._fsp--;

-

-				after(grammarAccess.getRulesetRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleRuleset428);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleRuleset"

-

-

-	// $ANTLR start "ruleRuleset"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:237:1: ruleRuleset : ( ( rule__Ruleset__Group__0 ) ) ;

-	public final void ruleRuleset() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:241:2: ( ( ( rule__Ruleset__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:242:1: ( ( rule__Ruleset__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:242:1: ( ( rule__Ruleset__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:243:1: ( rule__Ruleset__Group__0 )

-				{

-					before(grammarAccess.getRulesetAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:244:1: ( rule__Ruleset__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:244:2: rule__Ruleset__Group__0

-					{

-						pushFollow(FOLLOW_rule__Ruleset__Group__0_in_ruleRuleset454);

-						rule__Ruleset__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getRulesetAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleRuleset"

-

-

-	// $ANTLR start "entryRuleSelector"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:256:1: entryRuleSelector : ruleSelector EOF ;

-	public final void entryRuleSelector() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:257:1: ( ruleSelector EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:258:1: ruleSelector EOF

-			{

-				before(grammarAccess.getSelectorRule());

-				pushFollow(FOLLOW_ruleSelector_in_entryRuleSelector481);

-				ruleSelector();

-

-				state._fsp--;

-

-				after(grammarAccess.getSelectorRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleSelector488);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleSelector"

-

-

-	// $ANTLR start "ruleSelector"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:265:1: ruleSelector : ( ( rule__Selector__Alternatives ) ) ;

-	public final void ruleSelector() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:269:2: ( ( ( rule__Selector__Alternatives ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:270:1: ( ( rule__Selector__Alternatives ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:270:1: ( ( rule__Selector__Alternatives ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:271:1: ( rule__Selector__Alternatives )

-				{

-					before(grammarAccess.getSelectorAccess().getAlternatives());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:272:1: ( rule__Selector__Alternatives )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:272:2: rule__Selector__Alternatives

-					{

-						pushFollow(FOLLOW_rule__Selector__Alternatives_in_ruleSelector514);

-						rule__Selector__Alternatives();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getSelectorAccess().getAlternatives());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleSelector"

-

-

-	// $ANTLR start "entryRuleCompositeSelector"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:284:1: entryRuleCompositeSelector : ruleCompositeSelector EOF ;

-	public final void entryRuleCompositeSelector() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:285:1: ( ruleCompositeSelector EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:286:1: ruleCompositeSelector EOF

-			{

-				before(grammarAccess.getCompositeSelectorRule());

-				pushFollow(FOLLOW_ruleCompositeSelector_in_entryRuleCompositeSelector541);

-				ruleCompositeSelector();

-

-				state._fsp--;

-

-				after(grammarAccess.getCompositeSelectorRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleCompositeSelector548);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleCompositeSelector"

-

-

-	// $ANTLR start "ruleCompositeSelector"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:293:1: ruleCompositeSelector : ( ( rule__CompositeSelector__Group__0 ) ) ;

-	public final void ruleCompositeSelector() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:297:2: ( ( ( rule__CompositeSelector__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:298:1: ( ( rule__CompositeSelector__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:298:1: ( ( rule__CompositeSelector__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:299:1: ( rule__CompositeSelector__Group__0 )

-				{

-					before(grammarAccess.getCompositeSelectorAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:300:1: ( rule__CompositeSelector__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:300:2: rule__CompositeSelector__Group__0

-					{

-						pushFollow(FOLLOW_rule__CompositeSelector__Group__0_in_ruleCompositeSelector574);

-						rule__CompositeSelector__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getCompositeSelectorAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleCompositeSelector"

-

-

-	// $ANTLR start "entryRuleSimpleSelector"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:312:1: entryRuleSimpleSelector : ruleSimpleSelector EOF ;

-	public final void entryRuleSimpleSelector() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:313:1: ( ruleSimpleSelector EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:314:1: ruleSimpleSelector EOF

-			{

-				before(grammarAccess.getSimpleSelectorRule());

-				pushFollow(FOLLOW_ruleSimpleSelector_in_entryRuleSimpleSelector601);

-				ruleSimpleSelector();

-

-				state._fsp--;

-

-				after(grammarAccess.getSimpleSelectorRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleSimpleSelector608);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleSimpleSelector"

-

-

-	// $ANTLR start "ruleSimpleSelector"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:321:1: ruleSimpleSelector : ( ( rule__SimpleSelector__Alternatives ) ) ;

-	public final void ruleSimpleSelector() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:325:2: ( ( ( rule__SimpleSelector__Alternatives ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:326:1: ( ( rule__SimpleSelector__Alternatives ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:326:1: ( ( rule__SimpleSelector__Alternatives ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:327:1: ( rule__SimpleSelector__Alternatives )

-				{

-					before(grammarAccess.getSimpleSelectorAccess().getAlternatives());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:328:1: ( rule__SimpleSelector__Alternatives )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:328:2: rule__SimpleSelector__Alternatives

-					{

-						pushFollow(FOLLOW_rule__SimpleSelector__Alternatives_in_ruleSimpleSelector634);

-						rule__SimpleSelector__Alternatives();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getSimpleSelectorAccess().getAlternatives());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleSimpleSelector"

-

-

-	// $ANTLR start "entryRuleSelectorCondition"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:340:1: entryRuleSelectorCondition : ruleSelectorCondition EOF ;

-	public final void entryRuleSelectorCondition() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:341:1: ( ruleSelectorCondition EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:342:1: ruleSelectorCondition EOF

-			{

-				before(grammarAccess.getSelectorConditionRule());

-				pushFollow(FOLLOW_ruleSelectorCondition_in_entryRuleSelectorCondition661);

-				ruleSelectorCondition();

-

-				state._fsp--;

-

-				after(grammarAccess.getSelectorConditionRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleSelectorCondition668);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleSelectorCondition"

-

-

-	// $ANTLR start "ruleSelectorCondition"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:349:1: ruleSelectorCondition : ( ( rule__SelectorCondition__Alternatives ) ) ;

-	public final void ruleSelectorCondition() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:353:2: ( ( ( rule__SelectorCondition__Alternatives ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:354:1: ( ( rule__SelectorCondition__Alternatives ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:354:1: ( ( rule__SelectorCondition__Alternatives ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:355:1: ( rule__SelectorCondition__Alternatives )

-				{

-					before(grammarAccess.getSelectorConditionAccess().getAlternatives());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:356:1: ( rule__SelectorCondition__Alternatives )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:356:2: rule__SelectorCondition__Alternatives

-					{

-						pushFollow(FOLLOW_rule__SelectorCondition__Alternatives_in_ruleSelectorCondition694);

-						rule__SelectorCondition__Alternatives();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getSelectorConditionAccess().getAlternatives());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleSelectorCondition"

-

-

-	// $ANTLR start "entryRuleCombinator"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:368:1: entryRuleCombinator : ruleCombinator EOF ;

-	public final void entryRuleCombinator() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:369:1: ( ruleCombinator EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:370:1: ruleCombinator EOF

-			{

-				before(grammarAccess.getCombinatorRule());

-				pushFollow(FOLLOW_ruleCombinator_in_entryRuleCombinator721);

-				ruleCombinator();

-

-				state._fsp--;

-

-				after(grammarAccess.getCombinatorRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleCombinator728);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleCombinator"

-

-

-	// $ANTLR start "ruleCombinator"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:377:1: ruleCombinator : ( ( rule__Combinator__Group__0 ) ) ;

-	public final void ruleCombinator() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:381:2: ( ( ( rule__Combinator__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:382:1: ( ( rule__Combinator__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:382:1: ( ( rule__Combinator__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:383:1: ( rule__Combinator__Group__0 )

-				{

-					before(grammarAccess.getCombinatorAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:384:1: ( rule__Combinator__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:384:2: rule__Combinator__Group__0

-					{

-						pushFollow(FOLLOW_rule__Combinator__Group__0_in_ruleCombinator754);

-						rule__Combinator__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getCombinatorAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleCombinator"

-

-

-	// $ANTLR start "entryRuleDeclaration"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:396:1: entryRuleDeclaration : ruleDeclaration EOF ;

-	public final void entryRuleDeclaration() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:397:1: ( ruleDeclaration EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:398:1: ruleDeclaration EOF

-			{

-				before(grammarAccess.getDeclarationRule());

-				pushFollow(FOLLOW_ruleDeclaration_in_entryRuleDeclaration781);

-				ruleDeclaration();

-

-				state._fsp--;

-

-				after(grammarAccess.getDeclarationRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleDeclaration788);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleDeclaration"

-

-

-	// $ANTLR start "ruleDeclaration"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:405:1: ruleDeclaration : ( ( rule__Declaration__Group__0 ) ) ;

-	public final void ruleDeclaration() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:409:2: ( ( ( rule__Declaration__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:410:1: ( ( rule__Declaration__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:410:1: ( ( rule__Declaration__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:411:1: ( rule__Declaration__Group__0 )

-				{

-					before(grammarAccess.getDeclarationAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:412:1: ( rule__Declaration__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:412:2: rule__Declaration__Group__0

-					{

-						pushFollow(FOLLOW_rule__Declaration__Group__0_in_ruleDeclaration814);

-						rule__Declaration__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getDeclarationAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleDeclaration"

-

-

-	// $ANTLR start "entryRuleExpression"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:424:1: entryRuleExpression : ruleExpression EOF ;

-	public final void entryRuleExpression() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:425:1: ( ruleExpression EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:426:1: ruleExpression EOF

-			{

-				before(grammarAccess.getExpressionRule());

-				pushFollow(FOLLOW_ruleExpression_in_entryRuleExpression841);

-				ruleExpression();

-

-				state._fsp--;

-

-				after(grammarAccess.getExpressionRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleExpression848);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleExpression"

-

-

-	// $ANTLR start "ruleExpression"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:433:1: ruleExpression : ( ( rule__Expression__Group__0 ) ) ;

-	public final void ruleExpression() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:437:2: ( ( ( rule__Expression__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:438:1: ( ( rule__Expression__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:438:1: ( ( rule__Expression__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:439:1: ( rule__Expression__Group__0 )

-				{

-					before(grammarAccess.getExpressionAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:440:1: ( rule__Expression__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:440:2: rule__Expression__Group__0

-					{

-						pushFollow(FOLLOW_rule__Expression__Group__0_in_ruleExpression874);

-						rule__Expression__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getExpressionAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleExpression"

-

-

-	// $ANTLR start "entryRuleSubterm"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:452:1: entryRuleSubterm : ruleSubterm EOF ;

-	public final void entryRuleSubterm() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:453:1: ( ruleSubterm EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:454:1: ruleSubterm EOF

-			{

-				before(grammarAccess.getSubtermRule());

-				pushFollow(FOLLOW_ruleSubterm_in_entryRuleSubterm901);

-				ruleSubterm();

-

-				state._fsp--;

-

-				after(grammarAccess.getSubtermRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleSubterm908);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleSubterm"

-

-

-	// $ANTLR start "ruleSubterm"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:461:1: ruleSubterm : ( ( rule__Subterm__Group__0 ) ) ;

-	public final void ruleSubterm() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:465:2: ( ( ( rule__Subterm__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:466:1: ( ( rule__Subterm__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:466:1: ( ( rule__Subterm__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:467:1: ( rule__Subterm__Group__0 )

-				{

-					before(grammarAccess.getSubtermAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:468:1: ( rule__Subterm__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:468:2: rule__Subterm__Group__0

-					{

-						pushFollow(FOLLOW_rule__Subterm__Group__0_in_ruleSubterm934);

-						rule__Subterm__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getSubtermAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleSubterm"

-

-

-	// $ANTLR start "entryRuleTerm"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:480:1: entryRuleTerm : ruleTerm EOF ;

-	public final void entryRuleTerm() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:481:1: ( ruleTerm EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:482:1: ruleTerm EOF

-			{

-				before(grammarAccess.getTermRule());

-				pushFollow(FOLLOW_ruleTerm_in_entryRuleTerm961);

-				ruleTerm();

-

-				state._fsp--;

-

-				after(grammarAccess.getTermRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleTerm968);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleTerm"

-

-

-	// $ANTLR start "ruleTerm"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:489:1: ruleTerm : ( ( rule__Term__Group__0 ) ) ;

-	public final void ruleTerm() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:493:2: ( ( ( rule__Term__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:494:1: ( ( rule__Term__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:494:1: ( ( rule__Term__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:495:1: ( rule__Term__Group__0 )

-				{

-					before(grammarAccess.getTermAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:496:1: ( rule__Term__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:496:2: rule__Term__Group__0

-					{

-						pushFollow(FOLLOW_rule__Term__Group__0_in_ruleTerm994);

-						rule__Term__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getTermAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleTerm"

-

-

-	// $ANTLR start "entryRuleFunction"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:508:1: entryRuleFunction : ruleFunction EOF ;

-	public final void entryRuleFunction() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:509:1: ( ruleFunction EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:510:1: ruleFunction EOF

-			{

-				before(grammarAccess.getFunctionRule());

-				pushFollow(FOLLOW_ruleFunction_in_entryRuleFunction1021);

-				ruleFunction();

-

-				state._fsp--;

-

-				after(grammarAccess.getFunctionRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleFunction1028);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleFunction"

-

-

-	// $ANTLR start "ruleFunction"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:517:1: ruleFunction : ( ( rule__Function__Group__0 ) ) ;

-	public final void ruleFunction() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:521:2: ( ( ( rule__Function__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:522:1: ( ( rule__Function__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:522:1: ( ( rule__Function__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:523:1: ( rule__Function__Group__0 )

-				{

-					before(grammarAccess.getFunctionAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:524:1: ( rule__Function__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:524:2: rule__Function__Group__0

-					{

-						pushFollow(FOLLOW_rule__Function__Group__0_in_ruleFunction1054);

-						rule__Function__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getFunctionAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleFunction"

-

-

-	// $ANTLR start "entryRuleName"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:536:1: entryRuleName : ruleName EOF ;

-	public final void entryRuleName() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:537:1: ( ruleName EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:538:1: ruleName EOF

-			{

-				before(grammarAccess.getNameRule());

-				pushFollow(FOLLOW_ruleName_in_entryRuleName1081);

-				ruleName();

-

-				state._fsp--;

-

-				after(grammarAccess.getNameRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleName1088);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleName"

-

-

-	// $ANTLR start "ruleName"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:545:1: ruleName : ( ( rule__Name__ValueAssignment ) ) ;

-	public final void ruleName() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:549:2: ( ( ( rule__Name__ValueAssignment ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:550:1: ( ( rule__Name__ValueAssignment ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:550:1: ( ( rule__Name__ValueAssignment ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:551:1: ( rule__Name__ValueAssignment )

-				{

-					before(grammarAccess.getNameAccess().getValueAssignment());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:552:1: ( rule__Name__ValueAssignment )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:552:2: rule__Name__ValueAssignment

-					{

-						pushFollow(FOLLOW_rule__Name__ValueAssignment_in_ruleName1114);

-						rule__Name__ValueAssignment();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getNameAccess().getValueAssignment());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleName"

-

-

-	// $ANTLR start "entryRuleNumber"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:564:1: entryRuleNumber : ruleNumber EOF ;

-	public final void entryRuleNumber() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:565:1: ( ruleNumber EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:566:1: ruleNumber EOF

-			{

-				before(grammarAccess.getNumberRule());

-				pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber1141);

-				ruleNumber();

-

-				state._fsp--;

-

-				after(grammarAccess.getNumberRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleNumber1148);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleNumber"

-

-

-	// $ANTLR start "ruleNumber"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:573:1: ruleNumber : ( ( rule__Number__Group__0 ) ) ;

-	public final void ruleNumber() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:577:2: ( ( ( rule__Number__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:578:1: ( ( rule__Number__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:578:1: ( ( rule__Number__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:579:1: ( rule__Number__Group__0 )

-				{

-					before(grammarAccess.getNumberAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:580:1: ( rule__Number__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:580:2: rule__Number__Group__0

-					{

-						pushFollow(FOLLOW_rule__Number__Group__0_in_ruleNumber1174);

-						rule__Number__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getNumberAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleNumber"

-

-

-	// $ANTLR start "entryRulePercentage"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:592:1: entryRulePercentage : rulePercentage EOF ;

-	public final void entryRulePercentage() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:593:1: ( rulePercentage EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:594:1: rulePercentage EOF

-			{

-				before(grammarAccess.getPercentageRule());

-				pushFollow(FOLLOW_rulePercentage_in_entryRulePercentage1201);

-				rulePercentage();

-

-				state._fsp--;

-

-				after(grammarAccess.getPercentageRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRulePercentage1208);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRulePercentage"

-

-

-	// $ANTLR start "rulePercentage"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:601:1: rulePercentage : ( ( rule__Percentage__Group__0 ) ) ;

-	public final void rulePercentage() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:605:2: ( ( ( rule__Percentage__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:606:1: ( ( rule__Percentage__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:606:1: ( ( rule__Percentage__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:607:1: ( rule__Percentage__Group__0 )

-				{

-					before(grammarAccess.getPercentageAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:608:1: ( rule__Percentage__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:608:2: rule__Percentage__Group__0

-					{

-						pushFollow(FOLLOW_rule__Percentage__Group__0_in_rulePercentage1234);

-						rule__Percentage__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getPercentageAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rulePercentage"

-

-

-	// $ANTLR start "entryRuleLength"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:620:1: entryRuleLength : ruleLength EOF ;

-	public final void entryRuleLength() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:621:1: ( ruleLength EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:622:1: ruleLength EOF

-			{

-				before(grammarAccess.getLengthRule());

-				pushFollow(FOLLOW_ruleLength_in_entryRuleLength1261);

-				ruleLength();

-

-				state._fsp--;

-

-				after(grammarAccess.getLengthRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleLength1268);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleLength"

-

-

-	// $ANTLR start "ruleLength"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:629:1: ruleLength : ( ( rule__Length__Group__0 ) ) ;

-	public final void ruleLength() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:633:2: ( ( ( rule__Length__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:634:1: ( ( rule__Length__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:634:1: ( ( rule__Length__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:635:1: ( rule__Length__Group__0 )

-				{

-					before(grammarAccess.getLengthAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:636:1: ( rule__Length__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:636:2: rule__Length__Group__0

-					{

-						pushFollow(FOLLOW_rule__Length__Group__0_in_ruleLength1294);

-						rule__Length__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getLengthAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleLength"

-

-

-	// $ANTLR start "entryRuleEms"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:648:1: entryRuleEms : ruleEms EOF ;

-	public final void entryRuleEms() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:649:1: ( ruleEms EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:650:1: ruleEms EOF

-			{

-				before(grammarAccess.getEmsRule());

-				pushFollow(FOLLOW_ruleEms_in_entryRuleEms1321);

-				ruleEms();

-

-				state._fsp--;

-

-				after(grammarAccess.getEmsRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleEms1328);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleEms"

-

-

-	// $ANTLR start "ruleEms"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:657:1: ruleEms : ( ( rule__Ems__Group__0 ) ) ;

-	public final void ruleEms() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:661:2: ( ( ( rule__Ems__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:662:1: ( ( rule__Ems__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:662:1: ( ( rule__Ems__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:663:1: ( rule__Ems__Group__0 )

-				{

-					before(grammarAccess.getEmsAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:664:1: ( rule__Ems__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:664:2: rule__Ems__Group__0

-					{

-						pushFollow(FOLLOW_rule__Ems__Group__0_in_ruleEms1354);

-						rule__Ems__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getEmsAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleEms"

-

-

-	// $ANTLR start "entryRuleExs"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:676:1: entryRuleExs : ruleExs EOF ;

-	public final void entryRuleExs() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:677:1: ( ruleExs EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:678:1: ruleExs EOF

-			{

-				before(grammarAccess.getExsRule());

-				pushFollow(FOLLOW_ruleExs_in_entryRuleExs1381);

-				ruleExs();

-

-				state._fsp--;

-

-				after(grammarAccess.getExsRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleExs1388);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleExs"

-

-

-	// $ANTLR start "ruleExs"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:685:1: ruleExs : ( ( rule__Exs__Group__0 ) ) ;

-	public final void ruleExs() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:689:2: ( ( ( rule__Exs__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:690:1: ( ( rule__Exs__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:690:1: ( ( rule__Exs__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:691:1: ( rule__Exs__Group__0 )

-				{

-					before(grammarAccess.getExsAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:692:1: ( rule__Exs__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:692:2: rule__Exs__Group__0

-					{

-						pushFollow(FOLLOW_rule__Exs__Group__0_in_ruleExs1414);

-						rule__Exs__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getExsAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleExs"

-

-

-	// $ANTLR start "entryRuleAngle"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:704:1: entryRuleAngle : ruleAngle EOF ;

-	public final void entryRuleAngle() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:705:1: ( ruleAngle EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:706:1: ruleAngle EOF

-			{

-				before(grammarAccess.getAngleRule());

-				pushFollow(FOLLOW_ruleAngle_in_entryRuleAngle1441);

-				ruleAngle();

-

-				state._fsp--;

-

-				after(grammarAccess.getAngleRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleAngle1448);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleAngle"

-

-

-	// $ANTLR start "ruleAngle"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:713:1: ruleAngle : ( ( rule__Angle__Group__0 ) ) ;

-	public final void ruleAngle() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:717:2: ( ( ( rule__Angle__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:718:1: ( ( rule__Angle__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:718:1: ( ( rule__Angle__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:719:1: ( rule__Angle__Group__0 )

-				{

-					before(grammarAccess.getAngleAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:720:1: ( rule__Angle__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:720:2: rule__Angle__Group__0

-					{

-						pushFollow(FOLLOW_rule__Angle__Group__0_in_ruleAngle1474);

-						rule__Angle__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getAngleAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleAngle"

-

-

-	// $ANTLR start "entryRuleTime"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:732:1: entryRuleTime : ruleTime EOF ;

-	public final void entryRuleTime() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:733:1: ( ruleTime EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:734:1: ruleTime EOF

-			{

-				before(grammarAccess.getTimeRule());

-				pushFollow(FOLLOW_ruleTime_in_entryRuleTime1501);

-				ruleTime();

-

-				state._fsp--;

-

-				after(grammarAccess.getTimeRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleTime1508);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleTime"

-

-

-	// $ANTLR start "ruleTime"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:741:1: ruleTime : ( ( rule__Time__Group__0 ) ) ;

-	public final void ruleTime() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:745:2: ( ( ( rule__Time__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:746:1: ( ( rule__Time__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:746:1: ( ( rule__Time__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:747:1: ( rule__Time__Group__0 )

-				{

-					before(grammarAccess.getTimeAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:748:1: ( rule__Time__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:748:2: rule__Time__Group__0

-					{

-						pushFollow(FOLLOW_rule__Time__Group__0_in_ruleTime1534);

-						rule__Time__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getTimeAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleTime"

-

-

-	// $ANTLR start "entryRuleFrequency"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:760:1: entryRuleFrequency : ruleFrequency EOF ;

-	public final void entryRuleFrequency() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:761:1: ( ruleFrequency EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:762:1: ruleFrequency EOF

-			{

-				before(grammarAccess.getFrequencyRule());

-				pushFollow(FOLLOW_ruleFrequency_in_entryRuleFrequency1561);

-				ruleFrequency();

-

-				state._fsp--;

-

-				after(grammarAccess.getFrequencyRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleFrequency1568);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleFrequency"

-

-

-	// $ANTLR start "ruleFrequency"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:769:1: ruleFrequency : ( ( rule__Frequency__Group__0 ) ) ;

-	public final void ruleFrequency() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:773:2: ( ( ( rule__Frequency__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:774:1: ( ( rule__Frequency__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:774:1: ( ( rule__Frequency__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:775:1: ( rule__Frequency__Group__0 )

-				{

-					before(grammarAccess.getFrequencyAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:776:1: ( rule__Frequency__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:776:2: rule__Frequency__Group__0

-					{

-						pushFollow(FOLLOW_rule__Frequency__Group__0_in_ruleFrequency1594);

-						rule__Frequency__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getFrequencyAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleFrequency"

-

-

-	// $ANTLR start "entryRuleUri"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:788:1: entryRuleUri : ruleUri EOF ;

-	public final void entryRuleUri() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:789:1: ( ruleUri EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:790:1: ruleUri EOF

-			{

-				before(grammarAccess.getUriRule());

-				pushFollow(FOLLOW_ruleUri_in_entryRuleUri1621);

-				ruleUri();

-

-				state._fsp--;

-

-				after(grammarAccess.getUriRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleUri1628);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleUri"

-

-

-	// $ANTLR start "ruleUri"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:797:1: ruleUri : ( ( rule__Uri__Group__0 ) ) ;

-	public final void ruleUri() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:801:2: ( ( ( rule__Uri__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:802:1: ( ( rule__Uri__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:802:1: ( ( rule__Uri__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:803:1: ( rule__Uri__Group__0 )

-				{

-					before(grammarAccess.getUriAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:804:1: ( rule__Uri__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:804:2: rule__Uri__Group__0

-					{

-						pushFollow(FOLLOW_rule__Uri__Group__0_in_ruleUri1654);

-						rule__Uri__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getUriAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleUri"

-

-

-	// $ANTLR start "entryRuleStringValue"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:816:1: entryRuleStringValue : ruleStringValue EOF ;

-	public final void entryRuleStringValue() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:817:1: ( ruleStringValue EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:818:1: ruleStringValue EOF

-			{

-				before(grammarAccess.getStringValueRule());

-				pushFollow(FOLLOW_ruleStringValue_in_entryRuleStringValue1681);

-				ruleStringValue();

-

-				state._fsp--;

-

-				after(grammarAccess.getStringValueRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleStringValue1688);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleStringValue"

-

-

-	// $ANTLR start "ruleStringValue"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:825:1: ruleStringValue : ( ( rule__StringValue__ValueAssignment ) ) ;

-	public final void ruleStringValue() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:829:2: ( ( ( rule__StringValue__ValueAssignment ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:830:1: ( ( rule__StringValue__ValueAssignment ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:830:1: ( ( rule__StringValue__ValueAssignment ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:831:1: ( rule__StringValue__ValueAssignment )

-				{

-					before(grammarAccess.getStringValueAccess().getValueAssignment());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:832:1: ( rule__StringValue__ValueAssignment )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:832:2: rule__StringValue__ValueAssignment

-					{

-						pushFollow(FOLLOW_rule__StringValue__ValueAssignment_in_ruleStringValue1714);

-						rule__StringValue__ValueAssignment();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getStringValueAccess().getValueAssignment());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleStringValue"

-

-

-	// $ANTLR start "entryRuleHexColor"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:844:1: entryRuleHexColor : ruleHexColor EOF ;

-	public final void entryRuleHexColor() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:845:1: ( ruleHexColor EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:846:1: ruleHexColor EOF

-			{

-				before(grammarAccess.getHexColorRule());

-				pushFollow(FOLLOW_ruleHexColor_in_entryRuleHexColor1741);

-				ruleHexColor();

-

-				state._fsp--;

-

-				after(grammarAccess.getHexColorRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleHexColor1748);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleHexColor"

-

-

-	// $ANTLR start "ruleHexColor"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:853:1: ruleHexColor : ( ( rule__HexColor__ValueAssignment ) ) ;

-	public final void ruleHexColor() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:857:2: ( ( ( rule__HexColor__ValueAssignment ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:858:1: ( ( rule__HexColor__ValueAssignment ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:858:1: ( ( rule__HexColor__ValueAssignment ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:859:1: ( rule__HexColor__ValueAssignment )

-				{

-					before(grammarAccess.getHexColorAccess().getValueAssignment());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:860:1: ( rule__HexColor__ValueAssignment )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:860:2: rule__HexColor__ValueAssignment

-					{

-						pushFollow(FOLLOW_rule__HexColor__ValueAssignment_in_ruleHexColor1774);

-						rule__HexColor__ValueAssignment();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getHexColorAccess().getValueAssignment());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleHexColor"

-

-

-	// $ANTLR start "entryRuleOperator"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:872:1: entryRuleOperator : ruleOperator EOF ;

-	public final void entryRuleOperator() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:873:1: ( ruleOperator EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:874:1: ruleOperator EOF

-			{

-				before(grammarAccess.getOperatorRule());

-				pushFollow(FOLLOW_ruleOperator_in_entryRuleOperator1801);

-				ruleOperator();

-

-				state._fsp--;

-

-				after(grammarAccess.getOperatorRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleOperator1808);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleOperator"

-

-

-	// $ANTLR start "ruleOperator"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:881:1: ruleOperator : ( ( rule__Operator__Alternatives ) ) ;

-	public final void ruleOperator() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:885:2: ( ( ( rule__Operator__Alternatives ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:886:1: ( ( rule__Operator__Alternatives ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:886:1: ( ( rule__Operator__Alternatives ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:887:1: ( rule__Operator__Alternatives )

-				{

-					before(grammarAccess.getOperatorAccess().getAlternatives());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:888:1: ( rule__Operator__Alternatives )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:888:2: rule__Operator__Alternatives

-					{

-						pushFollow(FOLLOW_rule__Operator__Alternatives_in_ruleOperator1834);

-						rule__Operator__Alternatives();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getOperatorAccess().getAlternatives());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleOperator"

-

-

-	// $ANTLR start "entryRuleClass"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:900:1: entryRuleClass : ruleClass EOF ;

-	public final void entryRuleClass() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:901:1: ( ruleClass EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:902:1: ruleClass EOF

-			{

-				before(grammarAccess.getClassRule());

-				pushFollow(FOLLOW_ruleClass_in_entryRuleClass1861);

-				ruleClass();

-

-				state._fsp--;

-

-				after(grammarAccess.getClassRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleClass1868);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleClass"

-

-

-	// $ANTLR start "ruleClass"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:909:1: ruleClass : ( ( rule__Class__ClassAssignment ) ) ;

-	public final void ruleClass() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:913:2: ( ( ( rule__Class__ClassAssignment ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:914:1: ( ( rule__Class__ClassAssignment ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:914:1: ( ( rule__Class__ClassAssignment ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:915:1: ( rule__Class__ClassAssignment )

-				{

-					before(grammarAccess.getClassAccess().getClassAssignment());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:916:1: ( rule__Class__ClassAssignment )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:916:2: rule__Class__ClassAssignment

-					{

-						pushFollow(FOLLOW_rule__Class__ClassAssignment_in_ruleClass1894);

-						rule__Class__ClassAssignment();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getClassAccess().getClassAssignment());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleClass"

-

-

-	// $ANTLR start "entryRuleAttribute"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:928:1: entryRuleAttribute : ruleAttribute EOF ;

-	public final void entryRuleAttribute() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:929:1: ( ruleAttribute EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:930:1: ruleAttribute EOF

-			{

-				before(grammarAccess.getAttributeRule());

-				pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute1921);

-				ruleAttribute();

-

-				state._fsp--;

-

-				after(grammarAccess.getAttributeRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleAttribute1928);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleAttribute"

-

-

-	// $ANTLR start "ruleAttribute"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:937:1: ruleAttribute : ( ( rule__Attribute__Group__0 ) ) ;

-	public final void ruleAttribute() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:941:2: ( ( ( rule__Attribute__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:942:1: ( ( rule__Attribute__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:942:1: ( ( rule__Attribute__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:943:1: ( rule__Attribute__Group__0 )

-				{

-					before(grammarAccess.getAttributeAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:944:1: ( rule__Attribute__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:944:2: rule__Attribute__Group__0

-					{

-						pushFollow(FOLLOW_rule__Attribute__Group__0_in_ruleAttribute1954);

-						rule__Attribute__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getAttributeAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleAttribute"

-

-

-	// $ANTLR start "entryRuleAttributeValue"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:956:1: entryRuleAttributeValue : ruleAttributeValue EOF ;

-	public final void entryRuleAttributeValue() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:957:1: ( ruleAttributeValue EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:958:1: ruleAttributeValue EOF

-			{

-				before(grammarAccess.getAttributeValueRule());

-				pushFollow(FOLLOW_ruleAttributeValue_in_entryRuleAttributeValue1981);

-				ruleAttributeValue();

-

-				state._fsp--;

-

-				after(grammarAccess.getAttributeValueRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleAttributeValue1988);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleAttributeValue"

-

-

-	// $ANTLR start "ruleAttributeValue"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:965:1: ruleAttributeValue : ( ( rule__AttributeValue__Group__0 ) ) ;

-	public final void ruleAttributeValue() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:969:2: ( ( ( rule__AttributeValue__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:970:1: ( ( rule__AttributeValue__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:970:1: ( ( rule__AttributeValue__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:971:1: ( rule__AttributeValue__Group__0 )

-				{

-					before(grammarAccess.getAttributeValueAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:972:1: ( rule__AttributeValue__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:972:2: rule__AttributeValue__Group__0

-					{

-						pushFollow(FOLLOW_rule__AttributeValue__Group__0_in_ruleAttributeValue2014);

-						rule__AttributeValue__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getAttributeValueAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleAttributeValue"

-

-

-	// $ANTLR start "entryRulePseudo"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:984:1: entryRulePseudo : rulePseudo EOF ;

-	public final void entryRulePseudo() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:985:1: ( rulePseudo EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:986:1: rulePseudo EOF

-			{

-				before(grammarAccess.getPseudoRule());

-				pushFollow(FOLLOW_rulePseudo_in_entryRulePseudo2041);

-				rulePseudo();

-

-				state._fsp--;

-

-				after(grammarAccess.getPseudoRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRulePseudo2048);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRulePseudo"

-

-

-	// $ANTLR start "rulePseudo"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:993:1: rulePseudo : ( ( rule__Pseudo__Group__0 ) ) ;

-	public final void rulePseudo() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:997:2: ( ( ( rule__Pseudo__Group__0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:998:1: ( ( rule__Pseudo__Group__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:998:1: ( ( rule__Pseudo__Group__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:999:1: ( rule__Pseudo__Group__0 )

-				{

-					before(grammarAccess.getPseudoAccess().getGroup());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1000:1: ( rule__Pseudo__Group__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1000:2: rule__Pseudo__Group__0

-					{

-						pushFollow(FOLLOW_rule__Pseudo__Group__0_in_rulePseudo2074);

-						rule__Pseudo__Group__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getPseudoAccess().getGroup());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rulePseudo"

-

-

-	// $ANTLR start "entryRuleCSSId"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1012:1: entryRuleCSSId : ruleCSSId EOF ;

-	public final void entryRuleCSSId() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1013:1: ( ruleCSSId EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1014:1: ruleCSSId EOF

-			{

-				before(grammarAccess.getCSSIdRule());

-				pushFollow(FOLLOW_ruleCSSId_in_entryRuleCSSId2101);

-				ruleCSSId();

-

-				state._fsp--;

-

-				after(grammarAccess.getCSSIdRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleCSSId2108);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleCSSId"

-

-

-	// $ANTLR start "ruleCSSId"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1021:1: ruleCSSId : ( ( rule__CSSId__ValueAssignment ) ) ;

-	public final void ruleCSSId() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1025:2: ( ( ( rule__CSSId__ValueAssignment ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1026:1: ( ( rule__CSSId__ValueAssignment ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1026:1: ( ( rule__CSSId__ValueAssignment ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1027:1: ( rule__CSSId__ValueAssignment )

-				{

-					before(grammarAccess.getCSSIdAccess().getValueAssignment());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1028:1: ( rule__CSSId__ValueAssignment )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1028:2: rule__CSSId__ValueAssignment

-					{

-						pushFollow(FOLLOW_rule__CSSId__ValueAssignment_in_ruleCSSId2134);

-						rule__CSSId__ValueAssignment();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getCSSIdAccess().getValueAssignment());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleCSSId"

-

-

-	// $ANTLR start "entryRuleUnaryOperator"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1040:1: entryRuleUnaryOperator : ruleUnaryOperator EOF ;

-	public final void entryRuleUnaryOperator() throws RecognitionException {

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1041:1: ( ruleUnaryOperator EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1042:1: ruleUnaryOperator EOF

-			{

-				before(grammarAccess.getUnaryOperatorRule());

-				pushFollow(FOLLOW_ruleUnaryOperator_in_entryRuleUnaryOperator2161);

-				ruleUnaryOperator();

-

-				state._fsp--;

-

-				after(grammarAccess.getUnaryOperatorRule());

-				match(input, EOF, FOLLOW_EOF_in_entryRuleUnaryOperator2168);

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-		}

-		return;

-	}

-

-	// $ANTLR end "entryRuleUnaryOperator"

-

-

-	// $ANTLR start "ruleUnaryOperator"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1049:1: ruleUnaryOperator : ( ( rule__UnaryOperator__OperatorAssignment ) ) ;

-	public final void ruleUnaryOperator() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1053:2: ( ( ( rule__UnaryOperator__OperatorAssignment ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1054:1: ( ( rule__UnaryOperator__OperatorAssignment ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1054:1: ( ( rule__UnaryOperator__OperatorAssignment ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1055:1: ( rule__UnaryOperator__OperatorAssignment )

-				{

-					before(grammarAccess.getUnaryOperatorAccess().getOperatorAssignment());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1056:1: ( rule__UnaryOperator__OperatorAssignment )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1056:2: rule__UnaryOperator__OperatorAssignment

-					{

-						pushFollow(FOLLOW_rule__UnaryOperator__OperatorAssignment_in_ruleUnaryOperator2194);

-						rule__UnaryOperator__OperatorAssignment();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getUnaryOperatorAccess().getOperatorAssignment());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleUnaryOperator"

-

-

-	// $ANTLR start "ruleUNARY"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1069:1: ruleUNARY : ( ( rule__UNARY__Alternatives ) ) ;

-	public final void ruleUNARY() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1073:1: ( ( ( rule__UNARY__Alternatives ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1074:1: ( ( rule__UNARY__Alternatives ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1074:1: ( ( rule__UNARY__Alternatives ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1075:1: ( rule__UNARY__Alternatives )

-				{

-					before(grammarAccess.getUNARYAccess().getAlternatives());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1076:1: ( rule__UNARY__Alternatives )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1076:2: rule__UNARY__Alternatives

-					{

-						pushFollow(FOLLOW_rule__UNARY__Alternatives_in_ruleUNARY2231);

-						rule__UNARY__Alternatives();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getUNARYAccess().getAlternatives());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleUNARY"

-

-

-	// $ANTLR start "ruleKIND"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1088:1: ruleKIND : ( ( rule__KIND__Alternatives ) ) ;

-	public final void ruleKIND() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1092:1: ( ( ( rule__KIND__Alternatives ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1093:1: ( ( rule__KIND__Alternatives ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1093:1: ( ( rule__KIND__Alternatives ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1094:1: ( rule__KIND__Alternatives )

-				{

-					before(grammarAccess.getKINDAccess().getAlternatives());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1095:1: ( rule__KIND__Alternatives )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1095:2: rule__KIND__Alternatives

-					{

-						pushFollow(FOLLOW_rule__KIND__Alternatives_in_ruleKIND2267);

-						rule__KIND__Alternatives();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getKINDAccess().getAlternatives());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleKIND"

-

-

-	// $ANTLR start "ruleATTRIBUTE_OP"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1107:1: ruleATTRIBUTE_OP : ( ( rule__ATTRIBUTE_OP__Alternatives ) ) ;

-	public final void ruleATTRIBUTE_OP() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1111:1: ( ( ( rule__ATTRIBUTE_OP__Alternatives ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1112:1: ( ( rule__ATTRIBUTE_OP__Alternatives ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1112:1: ( ( rule__ATTRIBUTE_OP__Alternatives ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1113:1: ( rule__ATTRIBUTE_OP__Alternatives )

-				{

-					before(grammarAccess.getATTRIBUTE_OPAccess().getAlternatives());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1114:1: ( rule__ATTRIBUTE_OP__Alternatives )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1114:2: rule__ATTRIBUTE_OP__Alternatives

-					{

-						pushFollow(FOLLOW_rule__ATTRIBUTE_OP__Alternatives_in_ruleATTRIBUTE_OP2303);

-						rule__ATTRIBUTE_OP__Alternatives();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getATTRIBUTE_OPAccess().getAlternatives());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "ruleATTRIBUTE_OP"

-

-

-	// $ANTLR start "rule__Stylesheet__Alternatives_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1125:1: rule__Stylesheet__Alternatives_1 : ( ( RULE_WS ) | ( RULE_CDO ) | ( RULE_CDC ) );

-	public final void rule__Stylesheet__Alternatives_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1129:1: ( ( RULE_WS ) | ( RULE_CDO ) | ( RULE_CDC ) )

-			int alt1 = 3;

-			switch (input.LA(1)) {

-			case RULE_WS: {

-				alt1 = 1;

-			}

-				break;

-			case RULE_CDO: {

-				alt1 = 2;

-			}

-				break;

-			case RULE_CDC: {

-				alt1 = 3;

-			}

-				break;

-			default:

-				NoViableAltException nvae =

-						new NoViableAltException("", 1, 0, input);

-

-				throw nvae;

-			}

-

-			switch (alt1) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1130:1: ( RULE_WS )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1130:1: ( RULE_WS )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1131:1: RULE_WS

-				{

-					before(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_1_0());

-					match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Stylesheet__Alternatives_12338);

-					after(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_1_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1136:6: ( RULE_CDO )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1136:6: ( RULE_CDO )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1137:1: RULE_CDO

-				{

-					before(grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_1_1());

-					match(input, RULE_CDO, FOLLOW_RULE_CDO_in_rule__Stylesheet__Alternatives_12355);

-					after(grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_1_1());

-

-				}

-

-

-			}

-				break;

-			case 3:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1142:6: ( RULE_CDC )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1142:6: ( RULE_CDC )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1143:1: RULE_CDC

-				{

-					before(grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_1_2());

-					match(input, RULE_CDC, FOLLOW_RULE_CDC_in_rule__Stylesheet__Alternatives_12372);

-					after(grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_1_2());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Alternatives_1"

-

-

-	// $ANTLR start "rule__Stylesheet__Alternatives_2_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1153:1: rule__Stylesheet__Alternatives_2_1 : ( ( ( rule__Stylesheet__Group_2_1_0__0 ) ) | ( (

-	// rule__Stylesheet__Group_2_1_1__0 ) ) );

-	public final void rule__Stylesheet__Alternatives_2_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1157:1: ( ( ( rule__Stylesheet__Group_2_1_0__0 ) ) | ( ( rule__Stylesheet__Group_2_1_1__0 ) ) )

-			int alt2 = 2;

-			int LA2_0 = input.LA(1);

-

-			if ((LA2_0 == RULE_CDO)) {

-				alt2 = 1;

-			}

-			else if ((LA2_0 == RULE_CDC)) {

-				alt2 = 2;

-			}

-			else {

-				NoViableAltException nvae =

-						new NoViableAltException("", 2, 0, input);

-

-				throw nvae;

-			}

-			switch (alt2) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1158:1: ( ( rule__Stylesheet__Group_2_1_0__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1158:1: ( ( rule__Stylesheet__Group_2_1_0__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1159:1: ( rule__Stylesheet__Group_2_1_0__0 )

-				{

-					before(grammarAccess.getStylesheetAccess().getGroup_2_1_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1160:1: ( rule__Stylesheet__Group_2_1_0__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1160:2: rule__Stylesheet__Group_2_1_0__0

-					{

-						pushFollow(FOLLOW_rule__Stylesheet__Group_2_1_0__0_in_rule__Stylesheet__Alternatives_2_12404);

-						rule__Stylesheet__Group_2_1_0__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getStylesheetAccess().getGroup_2_1_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1164:6: ( ( rule__Stylesheet__Group_2_1_1__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1164:6: ( ( rule__Stylesheet__Group_2_1_1__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1165:1: ( rule__Stylesheet__Group_2_1_1__0 )

-				{

-					before(grammarAccess.getStylesheetAccess().getGroup_2_1_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1166:1: ( rule__Stylesheet__Group_2_1_1__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1166:2: rule__Stylesheet__Group_2_1_1__0

-					{

-						pushFollow(FOLLOW_rule__Stylesheet__Group_2_1_1__0_in_rule__Stylesheet__Alternatives_2_12422);

-						rule__Stylesheet__Group_2_1_1__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getStylesheetAccess().getGroup_2_1_1());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Alternatives_2_1"

-

-

-	// $ANTLR start "rule__Stylesheet__Alternatives_3_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1175:1: rule__Stylesheet__Alternatives_3_1 : ( ( ( rule__Stylesheet__Group_3_1_0__0 ) ) | ( (

-	// rule__Stylesheet__Group_3_1_1__0 ) ) );

-	public final void rule__Stylesheet__Alternatives_3_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1179:1: ( ( ( rule__Stylesheet__Group_3_1_0__0 ) ) | ( ( rule__Stylesheet__Group_3_1_1__0 ) ) )

-			int alt3 = 2;

-			int LA3_0 = input.LA(1);

-

-			if ((LA3_0 == RULE_CDO)) {

-				alt3 = 1;

-			}

-			else if ((LA3_0 == RULE_CDC)) {

-				alt3 = 2;

-			}

-			else {

-				NoViableAltException nvae =

-						new NoViableAltException("", 3, 0, input);

-

-				throw nvae;

-			}

-			switch (alt3) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1180:1: ( ( rule__Stylesheet__Group_3_1_0__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1180:1: ( ( rule__Stylesheet__Group_3_1_0__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1181:1: ( rule__Stylesheet__Group_3_1_0__0 )

-				{

-					before(grammarAccess.getStylesheetAccess().getGroup_3_1_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1182:1: ( rule__Stylesheet__Group_3_1_0__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1182:2: rule__Stylesheet__Group_3_1_0__0

-					{

-						pushFollow(FOLLOW_rule__Stylesheet__Group_3_1_0__0_in_rule__Stylesheet__Alternatives_3_12455);

-						rule__Stylesheet__Group_3_1_0__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getStylesheetAccess().getGroup_3_1_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1186:6: ( ( rule__Stylesheet__Group_3_1_1__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1186:6: ( ( rule__Stylesheet__Group_3_1_1__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1187:1: ( rule__Stylesheet__Group_3_1_1__0 )

-				{

-					before(grammarAccess.getStylesheetAccess().getGroup_3_1_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1188:1: ( rule__Stylesheet__Group_3_1_1__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1188:2: rule__Stylesheet__Group_3_1_1__0

-					{

-						pushFollow(FOLLOW_rule__Stylesheet__Group_3_1_1__0_in_rule__Stylesheet__Alternatives_3_12473);

-						rule__Stylesheet__Group_3_1_1__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getStylesheetAccess().getGroup_3_1_1());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Alternatives_3_1"

-

-

-	// $ANTLR start "rule__Content__Alternatives"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1197:1: rule__Content__Alternatives : ( ( ruleRuleset ) | ( ruleMedia ) | ( rulePage ) );

-	public final void rule__Content__Alternatives() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1201:1: ( ( ruleRuleset ) | ( ruleMedia ) | ( rulePage ) )

-			int alt4 = 3;

-			switch (input.LA(1)) {

-			case RULE_ID:

-			case RULE_HASH:

-			case RULE_T_CLASS:

-			case 22:

-			case 37:

-			case 42: {

-				alt4 = 1;

-			}

-				break;

-			case 33: {

-				alt4 = 2;

-			}

-				break;

-			case 36: {

-				alt4 = 3;

-			}

-				break;

-			default:

-				NoViableAltException nvae =

-						new NoViableAltException("", 4, 0, input);

-

-				throw nvae;

-			}

-

-			switch (alt4) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1202:1: ( ruleRuleset )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1202:1: ( ruleRuleset )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1203:1: ruleRuleset

-				{

-					before(grammarAccess.getContentAccess().getRulesetParserRuleCall_0());

-					pushFollow(FOLLOW_ruleRuleset_in_rule__Content__Alternatives2506);

-					ruleRuleset();

-

-					state._fsp--;

-

-					after(grammarAccess.getContentAccess().getRulesetParserRuleCall_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1208:6: ( ruleMedia )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1208:6: ( ruleMedia )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1209:1: ruleMedia

-				{

-					before(grammarAccess.getContentAccess().getMediaParserRuleCall_1());

-					pushFollow(FOLLOW_ruleMedia_in_rule__Content__Alternatives2523);

-					ruleMedia();

-

-					state._fsp--;

-

-					after(grammarAccess.getContentAccess().getMediaParserRuleCall_1());

-

-				}

-

-

-			}

-				break;

-			case 3:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1214:6: ( rulePage )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1214:6: ( rulePage )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1215:1: rulePage

-				{

-					before(grammarAccess.getContentAccess().getPageParserRuleCall_2());

-					pushFollow(FOLLOW_rulePage_in_rule__Content__Alternatives2540);

-					rulePage();

-

-					state._fsp--;

-

-					after(grammarAccess.getContentAccess().getPageParserRuleCall_2());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Content__Alternatives"

-

-

-	// $ANTLR start "rule__Import__Alternatives_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1225:1: rule__Import__Alternatives_1 : ( ( ( rule__Import__Group_1_0__0 ) ) | ( ( rule__Import__Group_1_1__0 ) ) );

-	public final void rule__Import__Alternatives_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1229:1: ( ( ( rule__Import__Group_1_0__0 ) ) | ( ( rule__Import__Group_1_1__0 ) ) )

-			int alt5 = 2;

-			int LA5_0 = input.LA(1);

-

-			if ((LA5_0 == RULE_WS)) {

-				int LA5_1 = input.LA(2);

-

-				if ((LA5_1 == 40)) {

-					alt5 = 2;

-				}

-				else if ((LA5_1 == RULE_WS || LA5_1 == RULE_STRING)) {

-					alt5 = 1;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 5, 1, input);

-

-					throw nvae;

-				}

-			}

-			else if ((LA5_0 == RULE_STRING)) {

-				alt5 = 1;

-			}

-			else {

-				NoViableAltException nvae =

-						new NoViableAltException("", 5, 0, input);

-

-				throw nvae;

-			}

-			switch (alt5) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1230:1: ( ( rule__Import__Group_1_0__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1230:1: ( ( rule__Import__Group_1_0__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1231:1: ( rule__Import__Group_1_0__0 )

-				{

-					before(grammarAccess.getImportAccess().getGroup_1_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1232:1: ( rule__Import__Group_1_0__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1232:2: rule__Import__Group_1_0__0

-					{

-						pushFollow(FOLLOW_rule__Import__Group_1_0__0_in_rule__Import__Alternatives_12572);

-						rule__Import__Group_1_0__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getImportAccess().getGroup_1_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1236:6: ( ( rule__Import__Group_1_1__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1236:6: ( ( rule__Import__Group_1_1__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1237:1: ( rule__Import__Group_1_1__0 )

-				{

-					before(grammarAccess.getImportAccess().getGroup_1_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1238:1: ( rule__Import__Group_1_1__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1238:2: rule__Import__Group_1_1__0

-					{

-						pushFollow(FOLLOW_rule__Import__Group_1_1__0_in_rule__Import__Alternatives_12590);

-						rule__Import__Group_1_1__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getImportAccess().getGroup_1_1());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Alternatives_1"

-

-

-	// $ANTLR start "rule__Selector__Alternatives"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1247:1: rule__Selector__Alternatives : ( ( ( rule__Selector__Group_0__0 ) ) | ( ruleCompositeSelector ) );

-	public final void rule__Selector__Alternatives() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1251:1: ( ( ( rule__Selector__Group_0__0 ) ) | ( ruleCompositeSelector ) )

-			int alt6 = 2;

-			alt6 = dfa6.predict(input);

-			switch (alt6) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1252:1: ( ( rule__Selector__Group_0__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1252:1: ( ( rule__Selector__Group_0__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1253:1: ( rule__Selector__Group_0__0 )

-				{

-					before(grammarAccess.getSelectorAccess().getGroup_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1254:1: ( rule__Selector__Group_0__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1254:2: rule__Selector__Group_0__0

-					{

-						pushFollow(FOLLOW_rule__Selector__Group_0__0_in_rule__Selector__Alternatives2623);

-						rule__Selector__Group_0__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getSelectorAccess().getGroup_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1258:6: ( ruleCompositeSelector )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1258:6: ( ruleCompositeSelector )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1259:1: ruleCompositeSelector

-				{

-					before(grammarAccess.getSelectorAccess().getCompositeSelectorParserRuleCall_1());

-					pushFollow(FOLLOW_ruleCompositeSelector_in_rule__Selector__Alternatives2641);

-					ruleCompositeSelector();

-

-					state._fsp--;

-

-					after(grammarAccess.getSelectorAccess().getCompositeSelectorParserRuleCall_1());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Selector__Alternatives"

-

-

-	// $ANTLR start "rule__CompositeSelector__Alternatives_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1269:1: rule__CompositeSelector__Alternatives_1 : ( ( ( ( RULE_WS ) ) ( ( RULE_WS )* ) ) | ( (

-	// rule__CompositeSelector__Group_1_1__0 ) ) );

-	public final void rule__CompositeSelector__Alternatives_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1273:1: ( ( ( ( RULE_WS ) ) ( ( RULE_WS )* ) ) | ( ( rule__CompositeSelector__Group_1_1__0 ) ) )

-			int alt8 = 2;

-			alt8 = dfa8.predict(input);

-			switch (alt8) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1274:1: ( ( ( RULE_WS ) ) ( ( RULE_WS )* ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1274:1: ( ( ( RULE_WS ) ) ( ( RULE_WS )* ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1275:1: ( ( RULE_WS ) ) ( ( RULE_WS )* )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1275:1: ( ( RULE_WS ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1276:1: ( RULE_WS )

-					{

-						before(grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_0());

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1277:1: ( RULE_WS )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1277:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__CompositeSelector__Alternatives_12676);

-

-						}

-

-						after(grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_0());

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1280:1: ( ( RULE_WS )* )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1281:1: ( RULE_WS )*

-					{

-						before(grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_0());

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1282:1: ( RULE_WS )*

-						loop7: do {

-							int alt7 = 2;

-							int LA7_0 = input.LA(1);

-

-							if ((LA7_0 == RULE_WS)) {

-								alt7 = 1;

-							}

-

-

-							switch (alt7) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1282:3: RULE_WS

-							{

-								match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__CompositeSelector__Alternatives_12689);

-

-							}

-								break;

-

-							default:

-								break loop7;

-							}

-						} while (true);

-

-						after(grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_0());

-

-					}

-

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1287:6: ( ( rule__CompositeSelector__Group_1_1__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1287:6: ( ( rule__CompositeSelector__Group_1_1__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1288:1: ( rule__CompositeSelector__Group_1_1__0 )

-				{

-					before(grammarAccess.getCompositeSelectorAccess().getGroup_1_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1289:1: ( rule__CompositeSelector__Group_1_1__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1289:2: rule__CompositeSelector__Group_1_1__0

-					{

-						pushFollow(FOLLOW_rule__CompositeSelector__Group_1_1__0_in_rule__CompositeSelector__Alternatives_12710);

-						rule__CompositeSelector__Group_1_1__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getCompositeSelectorAccess().getGroup_1_1());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__Alternatives_1"

-

-

-	// $ANTLR start "rule__SimpleSelector__Alternatives"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1298:1: rule__SimpleSelector__Alternatives : ( ( ( rule__SimpleSelector__Group_0__0 ) ) | ( ( (

-	// rule__SimpleSelector__ConditionAssignment_1 ) ) ( ( rule__SimpleSelector__ConditionAssignment_1 )* ) ) );

-	public final void rule__SimpleSelector__Alternatives() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1302:1: ( ( ( rule__SimpleSelector__Group_0__0 ) ) | ( ( ( rule__SimpleSelector__ConditionAssignment_1 ) )

-			// ( ( rule__SimpleSelector__ConditionAssignment_1 )* ) ) )

-			int alt10 = 2;

-			int LA10_0 = input.LA(1);

-

-			if ((LA10_0 == RULE_ID || LA10_0 == 22)) {

-				alt10 = 1;

-			}

-			else if (((LA10_0 >= RULE_HASH && LA10_0 <= RULE_T_CLASS) || LA10_0 == 37 || LA10_0 == 42)) {

-				alt10 = 2;

-			}

-			else {

-				NoViableAltException nvae =

-						new NoViableAltException("", 10, 0, input);

-

-				throw nvae;

-			}

-			switch (alt10) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1303:1: ( ( rule__SimpleSelector__Group_0__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1303:1: ( ( rule__SimpleSelector__Group_0__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1304:1: ( rule__SimpleSelector__Group_0__0 )

-				{

-					before(grammarAccess.getSimpleSelectorAccess().getGroup_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1305:1: ( rule__SimpleSelector__Group_0__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1305:2: rule__SimpleSelector__Group_0__0

-					{

-						pushFollow(FOLLOW_rule__SimpleSelector__Group_0__0_in_rule__SimpleSelector__Alternatives2743);

-						rule__SimpleSelector__Group_0__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getSimpleSelectorAccess().getGroup_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1309:6: ( ( ( rule__SimpleSelector__ConditionAssignment_1 ) ) ( (

-			// rule__SimpleSelector__ConditionAssignment_1 )* ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1309:6: ( ( ( rule__SimpleSelector__ConditionAssignment_1 ) ) ( (

-				// rule__SimpleSelector__ConditionAssignment_1 )* ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1310:1: ( ( rule__SimpleSelector__ConditionAssignment_1 ) ) ( (

-				// rule__SimpleSelector__ConditionAssignment_1 )* )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1310:1: ( ( rule__SimpleSelector__ConditionAssignment_1 ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1311:1: ( rule__SimpleSelector__ConditionAssignment_1 )

-					{

-						before(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_1());

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1312:1: ( rule__SimpleSelector__ConditionAssignment_1 )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1312:2: rule__SimpleSelector__ConditionAssignment_1

-						{

-							pushFollow(FOLLOW_rule__SimpleSelector__ConditionAssignment_1_in_rule__SimpleSelector__Alternatives2763);

-							rule__SimpleSelector__ConditionAssignment_1();

-

-							state._fsp--;

-

-

-						}

-

-						after(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_1());

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1315:1: ( ( rule__SimpleSelector__ConditionAssignment_1 )* )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1316:1: ( rule__SimpleSelector__ConditionAssignment_1 )*

-					{

-						before(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_1());

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1317:1: ( rule__SimpleSelector__ConditionAssignment_1 )*

-						loop9: do {

-							int alt9 = 2;

-							int LA9_0 = input.LA(1);

-

-							if (((LA9_0 >= RULE_HASH && LA9_0 <= RULE_T_CLASS) || LA9_0 == 37 || LA9_0 == 42)) {

-								alt9 = 1;

-							}

-

-

-							switch (alt9) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1317:2: rule__SimpleSelector__ConditionAssignment_1

-							{

-								pushFollow(FOLLOW_rule__SimpleSelector__ConditionAssignment_1_in_rule__SimpleSelector__Alternatives2775);

-								rule__SimpleSelector__ConditionAssignment_1();

-

-								state._fsp--;

-

-

-							}

-								break;

-

-							default:

-								break loop9;

-							}

-						} while (true);

-

-						after(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_1());

-

-					}

-

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SimpleSelector__Alternatives"

-

-

-	// $ANTLR start "rule__SimpleSelector__ElementNameAlternatives_0_0_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1327:1: rule__SimpleSelector__ElementNameAlternatives_0_0_0 : ( ( RULE_ID ) | ( '*' ) );

-	public final void rule__SimpleSelector__ElementNameAlternatives_0_0_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1331:1: ( ( RULE_ID ) | ( '*' ) )

-			int alt11 = 2;

-			int LA11_0 = input.LA(1);

-

-			if ((LA11_0 == RULE_ID)) {

-				alt11 = 1;

-			}

-			else if ((LA11_0 == 22)) {

-				alt11 = 2;

-			}

-			else {

-				NoViableAltException nvae =

-						new NoViableAltException("", 11, 0, input);

-

-				throw nvae;

-			}

-			switch (alt11) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1332:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1332:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1333:1: RULE_ID

-				{

-					before(grammarAccess.getSimpleSelectorAccess().getElementNameIDTerminalRuleCall_0_0_0_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__SimpleSelector__ElementNameAlternatives_0_0_02811);

-					after(grammarAccess.getSimpleSelectorAccess().getElementNameIDTerminalRuleCall_0_0_0_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1338:6: ( '*' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1338:6: ( '*' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1339:1: '*'

-				{

-					before(grammarAccess.getSimpleSelectorAccess().getElementNameAsteriskKeyword_0_0_0_1());

-					match(input, 22, FOLLOW_22_in_rule__SimpleSelector__ElementNameAlternatives_0_0_02829);

-					after(grammarAccess.getSimpleSelectorAccess().getElementNameAsteriskKeyword_0_0_0_1());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SimpleSelector__ElementNameAlternatives_0_0_0"

-

-

-	// $ANTLR start "rule__SelectorCondition__Alternatives"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1351:1: rule__SelectorCondition__Alternatives : ( ( ruleCSSId ) | ( ruleClass ) | ( ruleAttribute ) | ( rulePseudo

-	// ) );

-	public final void rule__SelectorCondition__Alternatives() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1355:1: ( ( ruleCSSId ) | ( ruleClass ) | ( ruleAttribute ) | ( rulePseudo ) )

-			int alt12 = 4;

-			switch (input.LA(1)) {

-			case RULE_HASH: {

-				alt12 = 1;

-			}

-				break;

-			case RULE_T_CLASS: {

-				alt12 = 2;

-			}

-				break;

-			case 42: {

-				alt12 = 3;

-			}

-				break;

-			case 37: {

-				alt12 = 4;

-			}

-				break;

-			default:

-				NoViableAltException nvae =

-						new NoViableAltException("", 12, 0, input);

-

-				throw nvae;

-			}

-

-			switch (alt12) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1356:1: ( ruleCSSId )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1356:1: ( ruleCSSId )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1357:1: ruleCSSId

-				{

-					before(grammarAccess.getSelectorConditionAccess().getCSSIdParserRuleCall_0());

-					pushFollow(FOLLOW_ruleCSSId_in_rule__SelectorCondition__Alternatives2863);

-					ruleCSSId();

-

-					state._fsp--;

-

-					after(grammarAccess.getSelectorConditionAccess().getCSSIdParserRuleCall_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1362:6: ( ruleClass )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1362:6: ( ruleClass )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1363:1: ruleClass

-				{

-					before(grammarAccess.getSelectorConditionAccess().getClassParserRuleCall_1());

-					pushFollow(FOLLOW_ruleClass_in_rule__SelectorCondition__Alternatives2880);

-					ruleClass();

-

-					state._fsp--;

-

-					after(grammarAccess.getSelectorConditionAccess().getClassParserRuleCall_1());

-

-				}

-

-

-			}

-				break;

-			case 3:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1368:6: ( ruleAttribute )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1368:6: ( ruleAttribute )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1369:1: ruleAttribute

-				{

-					before(grammarAccess.getSelectorConditionAccess().getAttributeParserRuleCall_2());

-					pushFollow(FOLLOW_ruleAttribute_in_rule__SelectorCondition__Alternatives2897);

-					ruleAttribute();

-

-					state._fsp--;

-

-					after(grammarAccess.getSelectorConditionAccess().getAttributeParserRuleCall_2());

-

-				}

-

-

-			}

-				break;

-			case 4:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1374:6: ( rulePseudo )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1374:6: ( rulePseudo )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1375:1: rulePseudo

-				{

-					before(grammarAccess.getSelectorConditionAccess().getPseudoParserRuleCall_3());

-					pushFollow(FOLLOW_rulePseudo_in_rule__SelectorCondition__Alternatives2914);

-					rulePseudo();

-

-					state._fsp--;

-

-					after(grammarAccess.getSelectorConditionAccess().getPseudoParserRuleCall_3());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SelectorCondition__Alternatives"

-

-

-	// $ANTLR start "rule__Term__Alternatives_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1385:1: rule__Term__Alternatives_0 : ( ( ruleNumber ) | ( rulePercentage ) | ( ruleLength ) | ( ruleEms ) | (

-	// ruleExs ) | ( ruleAngle ) | ( ruleTime ) | ( ruleFrequency ) | ( ruleName ) | ( ruleStringValue ) | ( ruleUri ) | ( ruleHexColor ) | ( ruleFunction ) );

-	public final void rule__Term__Alternatives_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1389:1: ( ( ruleNumber ) | ( rulePercentage ) | ( ruleLength ) | ( ruleEms ) | ( ruleExs ) | ( ruleAngle )

-			// | ( ruleTime ) | ( ruleFrequency ) | ( ruleName ) | ( ruleStringValue ) | ( ruleUri ) | ( ruleHexColor ) | ( ruleFunction ) )

-			int alt13 = 13;

-			alt13 = dfa13.predict(input);

-			switch (alt13) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1390:1: ( ruleNumber )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1390:1: ( ruleNumber )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1391:1: ruleNumber

-				{

-					before(grammarAccess.getTermAccess().getNumberParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleNumber_in_rule__Term__Alternatives_02946);

-					ruleNumber();

-

-					state._fsp--;

-

-					after(grammarAccess.getTermAccess().getNumberParserRuleCall_0_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1396:6: ( rulePercentage )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1396:6: ( rulePercentage )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1397:1: rulePercentage

-				{

-					before(grammarAccess.getTermAccess().getPercentageParserRuleCall_0_1());

-					pushFollow(FOLLOW_rulePercentage_in_rule__Term__Alternatives_02963);

-					rulePercentage();

-

-					state._fsp--;

-

-					after(grammarAccess.getTermAccess().getPercentageParserRuleCall_0_1());

-

-				}

-

-

-			}

-				break;

-			case 3:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1402:6: ( ruleLength )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1402:6: ( ruleLength )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1403:1: ruleLength

-				{

-					before(grammarAccess.getTermAccess().getLengthParserRuleCall_0_2());

-					pushFollow(FOLLOW_ruleLength_in_rule__Term__Alternatives_02980);

-					ruleLength();

-

-					state._fsp--;

-

-					after(grammarAccess.getTermAccess().getLengthParserRuleCall_0_2());

-

-				}

-

-

-			}

-				break;

-			case 4:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1408:6: ( ruleEms )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1408:6: ( ruleEms )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1409:1: ruleEms

-				{

-					before(grammarAccess.getTermAccess().getEmsParserRuleCall_0_3());

-					pushFollow(FOLLOW_ruleEms_in_rule__Term__Alternatives_02997);

-					ruleEms();

-

-					state._fsp--;

-

-					after(grammarAccess.getTermAccess().getEmsParserRuleCall_0_3());

-

-				}

-

-

-			}

-				break;

-			case 5:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1414:6: ( ruleExs )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1414:6: ( ruleExs )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1415:1: ruleExs

-				{

-					before(grammarAccess.getTermAccess().getExsParserRuleCall_0_4());

-					pushFollow(FOLLOW_ruleExs_in_rule__Term__Alternatives_03014);

-					ruleExs();

-

-					state._fsp--;

-

-					after(grammarAccess.getTermAccess().getExsParserRuleCall_0_4());

-

-				}

-

-

-			}

-				break;

-			case 6:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1420:6: ( ruleAngle )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1420:6: ( ruleAngle )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1421:1: ruleAngle

-				{

-					before(grammarAccess.getTermAccess().getAngleParserRuleCall_0_5());

-					pushFollow(FOLLOW_ruleAngle_in_rule__Term__Alternatives_03031);

-					ruleAngle();

-

-					state._fsp--;

-

-					after(grammarAccess.getTermAccess().getAngleParserRuleCall_0_5());

-

-				}

-

-

-			}

-				break;

-			case 7:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1426:6: ( ruleTime )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1426:6: ( ruleTime )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1427:1: ruleTime

-				{

-					before(grammarAccess.getTermAccess().getTimeParserRuleCall_0_6());

-					pushFollow(FOLLOW_ruleTime_in_rule__Term__Alternatives_03048);

-					ruleTime();

-

-					state._fsp--;

-

-					after(grammarAccess.getTermAccess().getTimeParserRuleCall_0_6());

-

-				}

-

-

-			}

-				break;

-			case 8:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1432:6: ( ruleFrequency )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1432:6: ( ruleFrequency )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1433:1: ruleFrequency

-				{

-					before(grammarAccess.getTermAccess().getFrequencyParserRuleCall_0_7());

-					pushFollow(FOLLOW_ruleFrequency_in_rule__Term__Alternatives_03065);

-					ruleFrequency();

-

-					state._fsp--;

-

-					after(grammarAccess.getTermAccess().getFrequencyParserRuleCall_0_7());

-

-				}

-

-

-			}

-				break;

-			case 9:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1438:6: ( ruleName )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1438:6: ( ruleName )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1439:1: ruleName

-				{

-					before(grammarAccess.getTermAccess().getNameParserRuleCall_0_8());

-					pushFollow(FOLLOW_ruleName_in_rule__Term__Alternatives_03082);

-					ruleName();

-

-					state._fsp--;

-

-					after(grammarAccess.getTermAccess().getNameParserRuleCall_0_8());

-

-				}

-

-

-			}

-				break;

-			case 10:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1444:6: ( ruleStringValue )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1444:6: ( ruleStringValue )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1445:1: ruleStringValue

-				{

-					before(grammarAccess.getTermAccess().getStringValueParserRuleCall_0_9());

-					pushFollow(FOLLOW_ruleStringValue_in_rule__Term__Alternatives_03099);

-					ruleStringValue();

-

-					state._fsp--;

-

-					after(grammarAccess.getTermAccess().getStringValueParserRuleCall_0_9());

-

-				}

-

-

-			}

-				break;

-			case 11:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1450:6: ( ruleUri )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1450:6: ( ruleUri )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1451:1: ruleUri

-				{

-					before(grammarAccess.getTermAccess().getUriParserRuleCall_0_10());

-					pushFollow(FOLLOW_ruleUri_in_rule__Term__Alternatives_03116);

-					ruleUri();

-

-					state._fsp--;

-

-					after(grammarAccess.getTermAccess().getUriParserRuleCall_0_10());

-

-				}

-

-

-			}

-				break;

-			case 12:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1456:6: ( ruleHexColor )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1456:6: ( ruleHexColor )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1457:1: ruleHexColor

-				{

-					before(grammarAccess.getTermAccess().getHexColorParserRuleCall_0_11());

-					pushFollow(FOLLOW_ruleHexColor_in_rule__Term__Alternatives_03133);

-					ruleHexColor();

-

-					state._fsp--;

-

-					after(grammarAccess.getTermAccess().getHexColorParserRuleCall_0_11());

-

-				}

-

-

-			}

-				break;

-			case 13:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1462:6: ( ruleFunction )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1462:6: ( ruleFunction )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1463:1: ruleFunction

-				{

-					before(grammarAccess.getTermAccess().getFunctionParserRuleCall_0_12());

-					pushFollow(FOLLOW_ruleFunction_in_rule__Term__Alternatives_03150);

-					ruleFunction();

-

-					state._fsp--;

-

-					after(grammarAccess.getTermAccess().getFunctionParserRuleCall_0_12());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Term__Alternatives_0"

-

-

-	// $ANTLR start "rule__Operator__Alternatives"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1473:1: rule__Operator__Alternatives : ( ( ( rule__Operator__Group_0__0 ) ) | ( ( rule__Operator__Group_1__0 ) ) );

-	public final void rule__Operator__Alternatives() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1477:1: ( ( ( rule__Operator__Group_0__0 ) ) | ( ( rule__Operator__Group_1__0 ) ) )

-			int alt14 = 2;

-			int LA14_0 = input.LA(1);

-

-			if ((LA14_0 == 41)) {

-				alt14 = 1;

-			}

-			else if ((LA14_0 == 32)) {

-				alt14 = 2;

-			}

-			else {

-				NoViableAltException nvae =

-						new NoViableAltException("", 14, 0, input);

-

-				throw nvae;

-			}

-			switch (alt14) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1478:1: ( ( rule__Operator__Group_0__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1478:1: ( ( rule__Operator__Group_0__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1479:1: ( rule__Operator__Group_0__0 )

-				{

-					before(grammarAccess.getOperatorAccess().getGroup_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1480:1: ( rule__Operator__Group_0__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1480:2: rule__Operator__Group_0__0

-					{

-						pushFollow(FOLLOW_rule__Operator__Group_0__0_in_rule__Operator__Alternatives3182);

-						rule__Operator__Group_0__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getOperatorAccess().getGroup_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1484:6: ( ( rule__Operator__Group_1__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1484:6: ( ( rule__Operator__Group_1__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1485:1: ( rule__Operator__Group_1__0 )

-				{

-					before(grammarAccess.getOperatorAccess().getGroup_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1486:1: ( rule__Operator__Group_1__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1486:2: rule__Operator__Group_1__0

-					{

-						pushFollow(FOLLOW_rule__Operator__Group_1__0_in_rule__Operator__Alternatives3200);

-						rule__Operator__Group_1__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getOperatorAccess().getGroup_1());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Operator__Alternatives"

-

-

-	// $ANTLR start "rule__AttributeValue__ValueAlternatives_2_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1495:1: rule__AttributeValue__ValueAlternatives_2_0 : ( ( RULE_ID ) | ( RULE_STRING ) );

-	public final void rule__AttributeValue__ValueAlternatives_2_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1499:1: ( ( RULE_ID ) | ( RULE_STRING ) )

-			int alt15 = 2;

-			int LA15_0 = input.LA(1);

-

-			if ((LA15_0 == RULE_ID)) {

-				alt15 = 1;

-			}

-			else if ((LA15_0 == RULE_STRING)) {

-				alt15 = 2;

-			}

-			else {

-				NoViableAltException nvae =

-						new NoViableAltException("", 15, 0, input);

-

-				throw nvae;

-			}

-			switch (alt15) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1500:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1500:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1501:1: RULE_ID

-				{

-					before(grammarAccess.getAttributeValueAccess().getValueIDTerminalRuleCall_2_0_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__AttributeValue__ValueAlternatives_2_03233);

-					after(grammarAccess.getAttributeValueAccess().getValueIDTerminalRuleCall_2_0_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1506:6: ( RULE_STRING )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1506:6: ( RULE_STRING )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1507:1: RULE_STRING

-				{

-					before(grammarAccess.getAttributeValueAccess().getValueSTRINGTerminalRuleCall_2_0_1());

-					match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__AttributeValue__ValueAlternatives_2_03250);

-					after(grammarAccess.getAttributeValueAccess().getValueSTRINGTerminalRuleCall_2_0_1());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__AttributeValue__ValueAlternatives_2_0"

-

-

-	// $ANTLR start "rule__Pseudo__Alternatives_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1517:1: rule__Pseudo__Alternatives_1 : ( ( ( rule__Pseudo__PseudoAssignment_1_0 ) ) | ( (

-	// rule__Pseudo__Group_1_1__0 ) ) );

-	public final void rule__Pseudo__Alternatives_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1521:1: ( ( ( rule__Pseudo__PseudoAssignment_1_0 ) ) | ( ( rule__Pseudo__Group_1_1__0 ) ) )

-			int alt16 = 2;

-			int LA16_0 = input.LA(1);

-

-			if ((LA16_0 == RULE_ID)) {

-				int LA16_1 = input.LA(2);

-

-				if ((LA16_1 == 38)) {

-					alt16 = 2;

-				}

-				else if ((LA16_1 == EOF || LA16_1 == RULE_WS || (LA16_1 >= RULE_HASH && LA16_1 <= RULE_T_CLASS) || (LA16_1 >= 24 && LA16_1 <= 25) || LA16_1 == 32 || LA16_1 == 34 || LA16_1 == 37 || LA16_1 == 42)) {

-					alt16 = 1;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 16, 1, input);

-

-					throw nvae;

-				}

-			}

-			else {

-				NoViableAltException nvae =

-						new NoViableAltException("", 16, 0, input);

-

-				throw nvae;

-			}

-			switch (alt16) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1522:1: ( ( rule__Pseudo__PseudoAssignment_1_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1522:1: ( ( rule__Pseudo__PseudoAssignment_1_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1523:1: ( rule__Pseudo__PseudoAssignment_1_0 )

-				{

-					before(grammarAccess.getPseudoAccess().getPseudoAssignment_1_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1524:1: ( rule__Pseudo__PseudoAssignment_1_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1524:2: rule__Pseudo__PseudoAssignment_1_0

-					{

-						pushFollow(FOLLOW_rule__Pseudo__PseudoAssignment_1_0_in_rule__Pseudo__Alternatives_13282);

-						rule__Pseudo__PseudoAssignment_1_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getPseudoAccess().getPseudoAssignment_1_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1528:6: ( ( rule__Pseudo__Group_1_1__0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1528:6: ( ( rule__Pseudo__Group_1_1__0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1529:1: ( rule__Pseudo__Group_1_1__0 )

-				{

-					before(grammarAccess.getPseudoAccess().getGroup_1_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1530:1: ( rule__Pseudo__Group_1_1__0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1530:2: rule__Pseudo__Group_1_1__0

-					{

-						pushFollow(FOLLOW_rule__Pseudo__Group_1_1__0_in_rule__Pseudo__Alternatives_13300);

-						rule__Pseudo__Group_1_1__0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getPseudoAccess().getGroup_1_1());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Alternatives_1"

-

-

-	// $ANTLR start "rule__UNARY__Alternatives"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1539:1: rule__UNARY__Alternatives : ( ( ( '-' ) ) | ( ( '+' ) ) );

-	public final void rule__UNARY__Alternatives() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1543:1: ( ( ( '-' ) ) | ( ( '+' ) ) )

-			int alt17 = 2;

-			int LA17_0 = input.LA(1);

-

-			if ((LA17_0 == 23)) {

-				alt17 = 1;

-			}

-			else if ((LA17_0 == 24)) {

-				alt17 = 2;

-			}

-			else {

-				NoViableAltException nvae =

-						new NoViableAltException("", 17, 0, input);

-

-				throw nvae;

-			}

-			switch (alt17) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1544:1: ( ( '-' ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1544:1: ( ( '-' ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1545:1: ( '-' )

-				{

-					before(grammarAccess.getUNARYAccess().getNEGEnumLiteralDeclaration_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1546:1: ( '-' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1546:3: '-'

-					{

-						match(input, 23, FOLLOW_23_in_rule__UNARY__Alternatives3334);

-

-					}

-

-					after(grammarAccess.getUNARYAccess().getNEGEnumLiteralDeclaration_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1551:6: ( ( '+' ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1551:6: ( ( '+' ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1552:1: ( '+' )

-				{

-					before(grammarAccess.getUNARYAccess().getPLUSEnumLiteralDeclaration_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1553:1: ( '+' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1553:3: '+'

-					{

-						match(input, 24, FOLLOW_24_in_rule__UNARY__Alternatives3355);

-

-					}

-

-					after(grammarAccess.getUNARYAccess().getPLUSEnumLiteralDeclaration_1());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__UNARY__Alternatives"

-

-

-	// $ANTLR start "rule__KIND__Alternatives"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1563:1: rule__KIND__Alternatives : ( ( ( '>' ) ) | ( ( '+' ) ) );

-	public final void rule__KIND__Alternatives() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1567:1: ( ( ( '>' ) ) | ( ( '+' ) ) )

-			int alt18 = 2;

-			int LA18_0 = input.LA(1);

-

-			if ((LA18_0 == 25)) {

-				alt18 = 1;

-			}

-			else if ((LA18_0 == 24)) {

-				alt18 = 2;

-			}

-			else {

-				NoViableAltException nvae =

-						new NoViableAltException("", 18, 0, input);

-

-				throw nvae;

-			}

-			switch (alt18) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1568:1: ( ( '>' ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1568:1: ( ( '>' ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1569:1: ( '>' )

-				{

-					before(grammarAccess.getKINDAccess().getFIRST_CHILDEnumLiteralDeclaration_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1570:1: ( '>' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1570:3: '>'

-					{

-						match(input, 25, FOLLOW_25_in_rule__KIND__Alternatives3391);

-

-					}

-

-					after(grammarAccess.getKINDAccess().getFIRST_CHILDEnumLiteralDeclaration_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1575:6: ( ( '+' ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1575:6: ( ( '+' ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1576:1: ( '+' )

-				{

-					before(grammarAccess.getKINDAccess().getSIBLINGEnumLiteralDeclaration_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1577:1: ( '+' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1577:3: '+'

-					{

-						match(input, 24, FOLLOW_24_in_rule__KIND__Alternatives3412);

-

-					}

-

-					after(grammarAccess.getKINDAccess().getSIBLINGEnumLiteralDeclaration_1());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__KIND__Alternatives"

-

-

-	// $ANTLR start "rule__ATTRIBUTE_OP__Alternatives"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1587:1: rule__ATTRIBUTE_OP__Alternatives : ( ( ( '=' ) ) | ( ( '~=' ) ) | ( ( '!=' ) ) );

-	public final void rule__ATTRIBUTE_OP__Alternatives() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1591:1: ( ( ( '=' ) ) | ( ( '~=' ) ) | ( ( '!=' ) ) )

-			int alt19 = 3;

-			switch (input.LA(1)) {

-			case 26: {

-				alt19 = 1;

-			}

-				break;

-			case 27: {

-				alt19 = 2;

-			}

-				break;

-			case 28: {

-				alt19 = 3;

-			}

-				break;

-			default:

-				NoViableAltException nvae =

-						new NoViableAltException("", 19, 0, input);

-

-				throw nvae;

-			}

-

-			switch (alt19) {

-			case 1:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1592:1: ( ( '=' ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1592:1: ( ( '=' ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1593:1: ( '=' )

-				{

-					before(grammarAccess.getATTRIBUTE_OPAccess().getEQUALSEnumLiteralDeclaration_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1594:1: ( '=' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1594:3: '='

-					{

-						match(input, 26, FOLLOW_26_in_rule__ATTRIBUTE_OP__Alternatives3448);

-

-					}

-

-					after(grammarAccess.getATTRIBUTE_OPAccess().getEQUALSEnumLiteralDeclaration_0());

-

-				}

-

-

-			}

-				break;

-			case 2:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1599:6: ( ( '~=' ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1599:6: ( ( '~=' ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1600:1: ( '~=' )

-				{

-					before(grammarAccess.getATTRIBUTE_OPAccess().getCONTAINSEnumLiteralDeclaration_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1601:1: ( '~=' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1601:3: '~='

-					{

-						match(input, 27, FOLLOW_27_in_rule__ATTRIBUTE_OP__Alternatives3469);

-

-					}

-

-					after(grammarAccess.getATTRIBUTE_OPAccess().getCONTAINSEnumLiteralDeclaration_1());

-

-				}

-

-

-			}

-				break;

-			case 3:

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1606:6: ( ( '!=' ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1606:6: ( ( '!=' ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1607:1: ( '!=' )

-				{

-					before(grammarAccess.getATTRIBUTE_OPAccess().getUNEQUALSEnumLiteralDeclaration_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1608:1: ( '!=' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1608:3: '!='

-					{

-						match(input, 28, FOLLOW_28_in_rule__ATTRIBUTE_OP__Alternatives3490);

-

-					}

-

-					after(grammarAccess.getATTRIBUTE_OPAccess().getUNEQUALSEnumLiteralDeclaration_2());

-

-				}

-

-

-			}

-				break;

-

-			}

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__ATTRIBUTE_OP__Alternatives"

-

-

-	// $ANTLR start "rule__Stylesheet__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1620:1: rule__Stylesheet__Group__0 : rule__Stylesheet__Group__0__Impl rule__Stylesheet__Group__1 ;

-	public final void rule__Stylesheet__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1624:1: ( rule__Stylesheet__Group__0__Impl rule__Stylesheet__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1625:2: rule__Stylesheet__Group__0__Impl rule__Stylesheet__Group__1

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group__0__Impl_in_rule__Stylesheet__Group__03523);

-				rule__Stylesheet__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Stylesheet__Group__1_in_rule__Stylesheet__Group__03526);

-				rule__Stylesheet__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group__0"

-

-

-	// $ANTLR start "rule__Stylesheet__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1632:1: rule__Stylesheet__Group__0__Impl : ( ( rule__Stylesheet__Group_0__0 )? ) ;

-	public final void rule__Stylesheet__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1636:1: ( ( ( rule__Stylesheet__Group_0__0 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1637:1: ( ( rule__Stylesheet__Group_0__0 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1637:1: ( ( rule__Stylesheet__Group_0__0 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1638:1: ( rule__Stylesheet__Group_0__0 )?

-				{

-					before(grammarAccess.getStylesheetAccess().getGroup_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1639:1: ( rule__Stylesheet__Group_0__0 )?

-					int alt20 = 2;

-					int LA20_0 = input.LA(1);

-

-					if ((LA20_0 == 29)) {

-						alt20 = 1;

-					}

-					switch (alt20) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1639:2: rule__Stylesheet__Group_0__0

-					{

-						pushFollow(FOLLOW_rule__Stylesheet__Group_0__0_in_rule__Stylesheet__Group__0__Impl3553);

-						rule__Stylesheet__Group_0__0();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getStylesheetAccess().getGroup_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1649:1: rule__Stylesheet__Group__1 : rule__Stylesheet__Group__1__Impl rule__Stylesheet__Group__2 ;

-	public final void rule__Stylesheet__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1653:1: ( rule__Stylesheet__Group__1__Impl rule__Stylesheet__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1654:2: rule__Stylesheet__Group__1__Impl rule__Stylesheet__Group__2

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group__1__Impl_in_rule__Stylesheet__Group__13584);

-				rule__Stylesheet__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Stylesheet__Group__2_in_rule__Stylesheet__Group__13587);

-				rule__Stylesheet__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group__1"

-

-

-	// $ANTLR start "rule__Stylesheet__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1661:1: rule__Stylesheet__Group__1__Impl : ( ( rule__Stylesheet__Alternatives_1 )* ) ;

-	public final void rule__Stylesheet__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1665:1: ( ( ( rule__Stylesheet__Alternatives_1 )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1666:1: ( ( rule__Stylesheet__Alternatives_1 )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1666:1: ( ( rule__Stylesheet__Alternatives_1 )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1667:1: ( rule__Stylesheet__Alternatives_1 )*

-				{

-					before(grammarAccess.getStylesheetAccess().getAlternatives_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1668:1: ( rule__Stylesheet__Alternatives_1 )*

-					loop21: do {

-						int alt21 = 2;

-						int LA21_0 = input.LA(1);

-

-						if (((LA21_0 >= RULE_WS && LA21_0 <= RULE_CDC))) {

-							alt21 = 1;

-						}

-

-

-						switch (alt21) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1668:2: rule__Stylesheet__Alternatives_1

-						{

-							pushFollow(FOLLOW_rule__Stylesheet__Alternatives_1_in_rule__Stylesheet__Group__1__Impl3614);

-							rule__Stylesheet__Alternatives_1();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop21;

-						}

-					} while (true);

-

-					after(grammarAccess.getStylesheetAccess().getAlternatives_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1678:1: rule__Stylesheet__Group__2 : rule__Stylesheet__Group__2__Impl rule__Stylesheet__Group__3 ;

-	public final void rule__Stylesheet__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1682:1: ( rule__Stylesheet__Group__2__Impl rule__Stylesheet__Group__3 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1683:2: rule__Stylesheet__Group__2__Impl rule__Stylesheet__Group__3

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group__2__Impl_in_rule__Stylesheet__Group__23645);

-				rule__Stylesheet__Group__2__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Stylesheet__Group__3_in_rule__Stylesheet__Group__23648);

-				rule__Stylesheet__Group__3();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group__2"

-

-

-	// $ANTLR start "rule__Stylesheet__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1690:1: rule__Stylesheet__Group__2__Impl : ( ( rule__Stylesheet__Group_2__0 )* ) ;

-	public final void rule__Stylesheet__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1694:1: ( ( ( rule__Stylesheet__Group_2__0 )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1695:1: ( ( rule__Stylesheet__Group_2__0 )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1695:1: ( ( rule__Stylesheet__Group_2__0 )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1696:1: ( rule__Stylesheet__Group_2__0 )*

-				{

-					before(grammarAccess.getStylesheetAccess().getGroup_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1697:1: ( rule__Stylesheet__Group_2__0 )*

-					loop22: do {

-						int alt22 = 2;

-						int LA22_0 = input.LA(1);

-

-						if ((LA22_0 == 31)) {

-							alt22 = 1;

-						}

-

-

-						switch (alt22) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1697:2: rule__Stylesheet__Group_2__0

-						{

-							pushFollow(FOLLOW_rule__Stylesheet__Group_2__0_in_rule__Stylesheet__Group__2__Impl3675);

-							rule__Stylesheet__Group_2__0();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop22;

-						}

-					} while (true);

-

-					after(grammarAccess.getStylesheetAccess().getGroup_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group__3"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1707:1: rule__Stylesheet__Group__3 : rule__Stylesheet__Group__3__Impl ;

-	public final void rule__Stylesheet__Group__3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1711:1: ( rule__Stylesheet__Group__3__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1712:2: rule__Stylesheet__Group__3__Impl

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group__3__Impl_in_rule__Stylesheet__Group__33706);

-				rule__Stylesheet__Group__3__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group__3"

-

-

-	// $ANTLR start "rule__Stylesheet__Group__3__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1718:1: rule__Stylesheet__Group__3__Impl : ( ( rule__Stylesheet__Group_3__0 )* ) ;

-	public final void rule__Stylesheet__Group__3__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1722:1: ( ( ( rule__Stylesheet__Group_3__0 )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1723:1: ( ( rule__Stylesheet__Group_3__0 )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1723:1: ( ( rule__Stylesheet__Group_3__0 )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1724:1: ( rule__Stylesheet__Group_3__0 )*

-				{

-					before(grammarAccess.getStylesheetAccess().getGroup_3());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1725:1: ( rule__Stylesheet__Group_3__0 )*

-					loop23: do {

-						int alt23 = 2;

-						int LA23_0 = input.LA(1);

-

-						if ((LA23_0 == RULE_ID || (LA23_0 >= RULE_HASH && LA23_0 <= RULE_T_CLASS) || LA23_0 == 22 || LA23_0 == 33 || (LA23_0 >= 36 && LA23_0 <= 37) || LA23_0 == 42)) {

-							alt23 = 1;

-						}

-

-

-						switch (alt23) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1725:2: rule__Stylesheet__Group_3__0

-						{

-							pushFollow(FOLLOW_rule__Stylesheet__Group_3__0_in_rule__Stylesheet__Group__3__Impl3733);

-							rule__Stylesheet__Group_3__0();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop23;

-						}

-					} while (true);

-

-					after(grammarAccess.getStylesheetAccess().getGroup_3());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group__3__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_0__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1743:1: rule__Stylesheet__Group_0__0 : rule__Stylesheet__Group_0__0__Impl rule__Stylesheet__Group_0__1 ;

-	public final void rule__Stylesheet__Group_0__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1747:1: ( rule__Stylesheet__Group_0__0__Impl rule__Stylesheet__Group_0__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1748:2: rule__Stylesheet__Group_0__0__Impl rule__Stylesheet__Group_0__1

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_0__0__Impl_in_rule__Stylesheet__Group_0__03772);

-				rule__Stylesheet__Group_0__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Stylesheet__Group_0__1_in_rule__Stylesheet__Group_0__03775);

-				rule__Stylesheet__Group_0__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_0__0"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_0__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1755:1: rule__Stylesheet__Group_0__0__Impl : ( '@charset ' ) ;

-	public final void rule__Stylesheet__Group_0__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1759:1: ( ( '@charset ' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1760:1: ( '@charset ' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1760:1: ( '@charset ' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1761:1: '@charset '

-				{

-					before(grammarAccess.getStylesheetAccess().getCharsetKeyword_0_0());

-					match(input, 29, FOLLOW_29_in_rule__Stylesheet__Group_0__0__Impl3803);

-					after(grammarAccess.getStylesheetAccess().getCharsetKeyword_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_0__0__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_0__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1774:1: rule__Stylesheet__Group_0__1 : rule__Stylesheet__Group_0__1__Impl rule__Stylesheet__Group_0__2 ;

-	public final void rule__Stylesheet__Group_0__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1778:1: ( rule__Stylesheet__Group_0__1__Impl rule__Stylesheet__Group_0__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1779:2: rule__Stylesheet__Group_0__1__Impl rule__Stylesheet__Group_0__2

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_0__1__Impl_in_rule__Stylesheet__Group_0__13834);

-				rule__Stylesheet__Group_0__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Stylesheet__Group_0__2_in_rule__Stylesheet__Group_0__13837);

-				rule__Stylesheet__Group_0__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_0__1"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_0__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1786:1: rule__Stylesheet__Group_0__1__Impl : ( ( rule__Stylesheet__CharsetAssignment_0_1 ) ) ;

-	public final void rule__Stylesheet__Group_0__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1790:1: ( ( ( rule__Stylesheet__CharsetAssignment_0_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1791:1: ( ( rule__Stylesheet__CharsetAssignment_0_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1791:1: ( ( rule__Stylesheet__CharsetAssignment_0_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1792:1: ( rule__Stylesheet__CharsetAssignment_0_1 )

-				{

-					before(grammarAccess.getStylesheetAccess().getCharsetAssignment_0_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1793:1: ( rule__Stylesheet__CharsetAssignment_0_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1793:2: rule__Stylesheet__CharsetAssignment_0_1

-					{

-						pushFollow(FOLLOW_rule__Stylesheet__CharsetAssignment_0_1_in_rule__Stylesheet__Group_0__1__Impl3864);

-						rule__Stylesheet__CharsetAssignment_0_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getStylesheetAccess().getCharsetAssignment_0_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_0__1__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_0__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1803:1: rule__Stylesheet__Group_0__2 : rule__Stylesheet__Group_0__2__Impl ;

-	public final void rule__Stylesheet__Group_0__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1807:1: ( rule__Stylesheet__Group_0__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1808:2: rule__Stylesheet__Group_0__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_0__2__Impl_in_rule__Stylesheet__Group_0__23894);

-				rule__Stylesheet__Group_0__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_0__2"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_0__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1814:1: rule__Stylesheet__Group_0__2__Impl : ( ';' ) ;

-	public final void rule__Stylesheet__Group_0__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1818:1: ( ( ';' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1819:1: ( ';' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1819:1: ( ';' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1820:1: ';'

-				{

-					before(grammarAccess.getStylesheetAccess().getSemicolonKeyword_0_2());

-					match(input, 30, FOLLOW_30_in_rule__Stylesheet__Group_0__2__Impl3922);

-					after(grammarAccess.getStylesheetAccess().getSemicolonKeyword_0_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_0__2__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_2__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1839:1: rule__Stylesheet__Group_2__0 : rule__Stylesheet__Group_2__0__Impl rule__Stylesheet__Group_2__1 ;

-	public final void rule__Stylesheet__Group_2__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1843:1: ( rule__Stylesheet__Group_2__0__Impl rule__Stylesheet__Group_2__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1844:2: rule__Stylesheet__Group_2__0__Impl rule__Stylesheet__Group_2__1

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_2__0__Impl_in_rule__Stylesheet__Group_2__03959);

-				rule__Stylesheet__Group_2__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Stylesheet__Group_2__1_in_rule__Stylesheet__Group_2__03962);

-				rule__Stylesheet__Group_2__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_2__0"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_2__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1851:1: rule__Stylesheet__Group_2__0__Impl : ( ( rule__Stylesheet__ImportsAssignment_2_0 ) ) ;

-	public final void rule__Stylesheet__Group_2__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1855:1: ( ( ( rule__Stylesheet__ImportsAssignment_2_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1856:1: ( ( rule__Stylesheet__ImportsAssignment_2_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1856:1: ( ( rule__Stylesheet__ImportsAssignment_2_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1857:1: ( rule__Stylesheet__ImportsAssignment_2_0 )

-				{

-					before(grammarAccess.getStylesheetAccess().getImportsAssignment_2_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1858:1: ( rule__Stylesheet__ImportsAssignment_2_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1858:2: rule__Stylesheet__ImportsAssignment_2_0

-					{

-						pushFollow(FOLLOW_rule__Stylesheet__ImportsAssignment_2_0_in_rule__Stylesheet__Group_2__0__Impl3989);

-						rule__Stylesheet__ImportsAssignment_2_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getStylesheetAccess().getImportsAssignment_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_2__0__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_2__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1868:1: rule__Stylesheet__Group_2__1 : rule__Stylesheet__Group_2__1__Impl ;

-	public final void rule__Stylesheet__Group_2__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1872:1: ( rule__Stylesheet__Group_2__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1873:2: rule__Stylesheet__Group_2__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_2__1__Impl_in_rule__Stylesheet__Group_2__14019);

-				rule__Stylesheet__Group_2__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_2__1"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_2__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1879:1: rule__Stylesheet__Group_2__1__Impl : ( ( rule__Stylesheet__Alternatives_2_1 )* ) ;

-	public final void rule__Stylesheet__Group_2__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1883:1: ( ( ( rule__Stylesheet__Alternatives_2_1 )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1884:1: ( ( rule__Stylesheet__Alternatives_2_1 )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1884:1: ( ( rule__Stylesheet__Alternatives_2_1 )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1885:1: ( rule__Stylesheet__Alternatives_2_1 )*

-				{

-					before(grammarAccess.getStylesheetAccess().getAlternatives_2_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1886:1: ( rule__Stylesheet__Alternatives_2_1 )*

-					loop24: do {

-						int alt24 = 2;

-						int LA24_0 = input.LA(1);

-

-						if (((LA24_0 >= RULE_CDO && LA24_0 <= RULE_CDC))) {

-							alt24 = 1;

-						}

-

-

-						switch (alt24) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1886:2: rule__Stylesheet__Alternatives_2_1

-						{

-							pushFollow(FOLLOW_rule__Stylesheet__Alternatives_2_1_in_rule__Stylesheet__Group_2__1__Impl4046);

-							rule__Stylesheet__Alternatives_2_1();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop24;

-						}

-					} while (true);

-

-					after(grammarAccess.getStylesheetAccess().getAlternatives_2_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_2__1__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_2_1_0__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1900:1: rule__Stylesheet__Group_2_1_0__0 : rule__Stylesheet__Group_2_1_0__0__Impl rule__Stylesheet__Group_2_1_0__1

-	// ;

-	public final void rule__Stylesheet__Group_2_1_0__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1904:1: ( rule__Stylesheet__Group_2_1_0__0__Impl rule__Stylesheet__Group_2_1_0__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1905:2: rule__Stylesheet__Group_2_1_0__0__Impl rule__Stylesheet__Group_2_1_0__1

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_2_1_0__0__Impl_in_rule__Stylesheet__Group_2_1_0__04081);

-				rule__Stylesheet__Group_2_1_0__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Stylesheet__Group_2_1_0__1_in_rule__Stylesheet__Group_2_1_0__04084);

-				rule__Stylesheet__Group_2_1_0__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_2_1_0__0"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_2_1_0__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1912:1: rule__Stylesheet__Group_2_1_0__0__Impl : ( RULE_CDO ) ;

-	public final void rule__Stylesheet__Group_2_1_0__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1916:1: ( ( RULE_CDO ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1917:1: ( RULE_CDO )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1917:1: ( RULE_CDO )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1918:1: RULE_CDO

-				{

-					before(grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_2_1_0_0());

-					match(input, RULE_CDO, FOLLOW_RULE_CDO_in_rule__Stylesheet__Group_2_1_0__0__Impl4111);

-					after(grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_2_1_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_2_1_0__0__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_2_1_0__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1929:1: rule__Stylesheet__Group_2_1_0__1 : rule__Stylesheet__Group_2_1_0__1__Impl ;

-	public final void rule__Stylesheet__Group_2_1_0__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1933:1: ( rule__Stylesheet__Group_2_1_0__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1934:2: rule__Stylesheet__Group_2_1_0__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_2_1_0__1__Impl_in_rule__Stylesheet__Group_2_1_0__14140);

-				rule__Stylesheet__Group_2_1_0__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_2_1_0__1"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_2_1_0__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1940:1: rule__Stylesheet__Group_2_1_0__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Stylesheet__Group_2_1_0__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1944:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1945:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1945:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1946:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_0_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1947:1: ( RULE_WS )*

-					loop25: do {

-						int alt25 = 2;

-						int LA25_0 = input.LA(1);

-

-						if ((LA25_0 == RULE_WS)) {

-							alt25 = 1;

-						}

-

-

-						switch (alt25) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1947:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Stylesheet__Group_2_1_0__1__Impl4168);

-

-						}

-							break;

-

-						default:

-							break loop25;

-						}

-					} while (true);

-

-					after(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_0_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_2_1_0__1__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_2_1_1__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1961:1: rule__Stylesheet__Group_2_1_1__0 : rule__Stylesheet__Group_2_1_1__0__Impl rule__Stylesheet__Group_2_1_1__1

-	// ;

-	public final void rule__Stylesheet__Group_2_1_1__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1965:1: ( rule__Stylesheet__Group_2_1_1__0__Impl rule__Stylesheet__Group_2_1_1__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1966:2: rule__Stylesheet__Group_2_1_1__0__Impl rule__Stylesheet__Group_2_1_1__1

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_2_1_1__0__Impl_in_rule__Stylesheet__Group_2_1_1__04203);

-				rule__Stylesheet__Group_2_1_1__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Stylesheet__Group_2_1_1__1_in_rule__Stylesheet__Group_2_1_1__04206);

-				rule__Stylesheet__Group_2_1_1__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_2_1_1__0"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_2_1_1__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1973:1: rule__Stylesheet__Group_2_1_1__0__Impl : ( RULE_CDC ) ;

-	public final void rule__Stylesheet__Group_2_1_1__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1977:1: ( ( RULE_CDC ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1978:1: ( RULE_CDC )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1978:1: ( RULE_CDC )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1979:1: RULE_CDC

-				{

-					before(grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_2_1_1_0());

-					match(input, RULE_CDC, FOLLOW_RULE_CDC_in_rule__Stylesheet__Group_2_1_1__0__Impl4233);

-					after(grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_2_1_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_2_1_1__0__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_2_1_1__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1990:1: rule__Stylesheet__Group_2_1_1__1 : rule__Stylesheet__Group_2_1_1__1__Impl ;

-	public final void rule__Stylesheet__Group_2_1_1__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1994:1: ( rule__Stylesheet__Group_2_1_1__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:1995:2: rule__Stylesheet__Group_2_1_1__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_2_1_1__1__Impl_in_rule__Stylesheet__Group_2_1_1__14262);

-				rule__Stylesheet__Group_2_1_1__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_2_1_1__1"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_2_1_1__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2001:1: rule__Stylesheet__Group_2_1_1__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Stylesheet__Group_2_1_1__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2005:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2006:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2006:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2007:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_1_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2008:1: ( RULE_WS )*

-					loop26: do {

-						int alt26 = 2;

-						int LA26_0 = input.LA(1);

-

-						if ((LA26_0 == RULE_WS)) {

-							alt26 = 1;

-						}

-

-

-						switch (alt26) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2008:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Stylesheet__Group_2_1_1__1__Impl4290);

-

-						}

-							break;

-

-						default:

-							break loop26;

-						}

-					} while (true);

-

-					after(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_1_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_2_1_1__1__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_3__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2022:1: rule__Stylesheet__Group_3__0 : rule__Stylesheet__Group_3__0__Impl rule__Stylesheet__Group_3__1 ;

-	public final void rule__Stylesheet__Group_3__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2026:1: ( rule__Stylesheet__Group_3__0__Impl rule__Stylesheet__Group_3__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2027:2: rule__Stylesheet__Group_3__0__Impl rule__Stylesheet__Group_3__1

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_3__0__Impl_in_rule__Stylesheet__Group_3__04325);

-				rule__Stylesheet__Group_3__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Stylesheet__Group_3__1_in_rule__Stylesheet__Group_3__04328);

-				rule__Stylesheet__Group_3__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_3__0"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_3__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2034:1: rule__Stylesheet__Group_3__0__Impl : ( ( rule__Stylesheet__ContentsAssignment_3_0 ) ) ;

-	public final void rule__Stylesheet__Group_3__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2038:1: ( ( ( rule__Stylesheet__ContentsAssignment_3_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2039:1: ( ( rule__Stylesheet__ContentsAssignment_3_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2039:1: ( ( rule__Stylesheet__ContentsAssignment_3_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2040:1: ( rule__Stylesheet__ContentsAssignment_3_0 )

-				{

-					before(grammarAccess.getStylesheetAccess().getContentsAssignment_3_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2041:1: ( rule__Stylesheet__ContentsAssignment_3_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2041:2: rule__Stylesheet__ContentsAssignment_3_0

-					{

-						pushFollow(FOLLOW_rule__Stylesheet__ContentsAssignment_3_0_in_rule__Stylesheet__Group_3__0__Impl4355);

-						rule__Stylesheet__ContentsAssignment_3_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getStylesheetAccess().getContentsAssignment_3_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_3__0__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_3__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2051:1: rule__Stylesheet__Group_3__1 : rule__Stylesheet__Group_3__1__Impl ;

-	public final void rule__Stylesheet__Group_3__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2055:1: ( rule__Stylesheet__Group_3__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2056:2: rule__Stylesheet__Group_3__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_3__1__Impl_in_rule__Stylesheet__Group_3__14385);

-				rule__Stylesheet__Group_3__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_3__1"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_3__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2062:1: rule__Stylesheet__Group_3__1__Impl : ( ( rule__Stylesheet__Alternatives_3_1 )* ) ;

-	public final void rule__Stylesheet__Group_3__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2066:1: ( ( ( rule__Stylesheet__Alternatives_3_1 )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2067:1: ( ( rule__Stylesheet__Alternatives_3_1 )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2067:1: ( ( rule__Stylesheet__Alternatives_3_1 )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2068:1: ( rule__Stylesheet__Alternatives_3_1 )*

-				{

-					before(grammarAccess.getStylesheetAccess().getAlternatives_3_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2069:1: ( rule__Stylesheet__Alternatives_3_1 )*

-					loop27: do {

-						int alt27 = 2;

-						int LA27_0 = input.LA(1);

-

-						if (((LA27_0 >= RULE_CDO && LA27_0 <= RULE_CDC))) {

-							alt27 = 1;

-						}

-

-

-						switch (alt27) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2069:2: rule__Stylesheet__Alternatives_3_1

-						{

-							pushFollow(FOLLOW_rule__Stylesheet__Alternatives_3_1_in_rule__Stylesheet__Group_3__1__Impl4412);

-							rule__Stylesheet__Alternatives_3_1();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop27;

-						}

-					} while (true);

-

-					after(grammarAccess.getStylesheetAccess().getAlternatives_3_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_3__1__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_3_1_0__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2083:1: rule__Stylesheet__Group_3_1_0__0 : rule__Stylesheet__Group_3_1_0__0__Impl rule__Stylesheet__Group_3_1_0__1

-	// ;

-	public final void rule__Stylesheet__Group_3_1_0__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2087:1: ( rule__Stylesheet__Group_3_1_0__0__Impl rule__Stylesheet__Group_3_1_0__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2088:2: rule__Stylesheet__Group_3_1_0__0__Impl rule__Stylesheet__Group_3_1_0__1

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_3_1_0__0__Impl_in_rule__Stylesheet__Group_3_1_0__04447);

-				rule__Stylesheet__Group_3_1_0__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Stylesheet__Group_3_1_0__1_in_rule__Stylesheet__Group_3_1_0__04450);

-				rule__Stylesheet__Group_3_1_0__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_3_1_0__0"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_3_1_0__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2095:1: rule__Stylesheet__Group_3_1_0__0__Impl : ( RULE_CDO ) ;

-	public final void rule__Stylesheet__Group_3_1_0__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2099:1: ( ( RULE_CDO ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2100:1: ( RULE_CDO )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2100:1: ( RULE_CDO )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2101:1: RULE_CDO

-				{

-					before(grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_3_1_0_0());

-					match(input, RULE_CDO, FOLLOW_RULE_CDO_in_rule__Stylesheet__Group_3_1_0__0__Impl4477);

-					after(grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_3_1_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_3_1_0__0__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_3_1_0__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2112:1: rule__Stylesheet__Group_3_1_0__1 : rule__Stylesheet__Group_3_1_0__1__Impl ;

-	public final void rule__Stylesheet__Group_3_1_0__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2116:1: ( rule__Stylesheet__Group_3_1_0__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2117:2: rule__Stylesheet__Group_3_1_0__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_3_1_0__1__Impl_in_rule__Stylesheet__Group_3_1_0__14506);

-				rule__Stylesheet__Group_3_1_0__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_3_1_0__1"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_3_1_0__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2123:1: rule__Stylesheet__Group_3_1_0__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Stylesheet__Group_3_1_0__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2127:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2128:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2128:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2129:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_0_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2130:1: ( RULE_WS )*

-					loop28: do {

-						int alt28 = 2;

-						int LA28_0 = input.LA(1);

-

-						if ((LA28_0 == RULE_WS)) {

-							alt28 = 1;

-						}

-

-

-						switch (alt28) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2130:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Stylesheet__Group_3_1_0__1__Impl4534);

-

-						}

-							break;

-

-						default:

-							break loop28;

-						}

-					} while (true);

-

-					after(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_0_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_3_1_0__1__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_3_1_1__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2144:1: rule__Stylesheet__Group_3_1_1__0 : rule__Stylesheet__Group_3_1_1__0__Impl rule__Stylesheet__Group_3_1_1__1

-	// ;

-	public final void rule__Stylesheet__Group_3_1_1__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2148:1: ( rule__Stylesheet__Group_3_1_1__0__Impl rule__Stylesheet__Group_3_1_1__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2149:2: rule__Stylesheet__Group_3_1_1__0__Impl rule__Stylesheet__Group_3_1_1__1

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_3_1_1__0__Impl_in_rule__Stylesheet__Group_3_1_1__04569);

-				rule__Stylesheet__Group_3_1_1__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Stylesheet__Group_3_1_1__1_in_rule__Stylesheet__Group_3_1_1__04572);

-				rule__Stylesheet__Group_3_1_1__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_3_1_1__0"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_3_1_1__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2156:1: rule__Stylesheet__Group_3_1_1__0__Impl : ( RULE_CDC ) ;

-	public final void rule__Stylesheet__Group_3_1_1__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2160:1: ( ( RULE_CDC ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2161:1: ( RULE_CDC )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2161:1: ( RULE_CDC )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2162:1: RULE_CDC

-				{

-					before(grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_3_1_1_0());

-					match(input, RULE_CDC, FOLLOW_RULE_CDC_in_rule__Stylesheet__Group_3_1_1__0__Impl4599);

-					after(grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_3_1_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_3_1_1__0__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_3_1_1__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2173:1: rule__Stylesheet__Group_3_1_1__1 : rule__Stylesheet__Group_3_1_1__1__Impl ;

-	public final void rule__Stylesheet__Group_3_1_1__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2177:1: ( rule__Stylesheet__Group_3_1_1__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2178:2: rule__Stylesheet__Group_3_1_1__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Stylesheet__Group_3_1_1__1__Impl_in_rule__Stylesheet__Group_3_1_1__14628);

-				rule__Stylesheet__Group_3_1_1__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_3_1_1__1"

-

-

-	// $ANTLR start "rule__Stylesheet__Group_3_1_1__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2184:1: rule__Stylesheet__Group_3_1_1__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Stylesheet__Group_3_1_1__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2188:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2189:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2189:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2190:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_1_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2191:1: ( RULE_WS )*

-					loop29: do {

-						int alt29 = 2;

-						int LA29_0 = input.LA(1);

-

-						if ((LA29_0 == RULE_WS)) {

-							alt29 = 1;

-						}

-

-

-						switch (alt29) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2191:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Stylesheet__Group_3_1_1__1__Impl4656);

-

-						}

-							break;

-

-						default:

-							break loop29;

-						}

-					} while (true);

-

-					after(grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_1_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__Group_3_1_1__1__Impl"

-

-

-	// $ANTLR start "rule__Import__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2205:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;

-	public final void rule__Import__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2209:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2210:2: rule__Import__Group__0__Impl rule__Import__Group__1

-			{

-				pushFollow(FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__04691);

-				rule__Import__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Import__Group__1_in_rule__Import__Group__04694);

-				rule__Import__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group__0"

-

-

-	// $ANTLR start "rule__Import__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2217:1: rule__Import__Group__0__Impl : ( '@import' ) ;

-	public final void rule__Import__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2221:1: ( ( '@import' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2222:1: ( '@import' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2222:1: ( '@import' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2223:1: '@import'

-				{

-					before(grammarAccess.getImportAccess().getImportKeyword_0());

-					match(input, 31, FOLLOW_31_in_rule__Import__Group__0__Impl4722);

-					after(grammarAccess.getImportAccess().getImportKeyword_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Import__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2236:1: rule__Import__Group__1 : rule__Import__Group__1__Impl rule__Import__Group__2 ;

-	public final void rule__Import__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2240:1: ( rule__Import__Group__1__Impl rule__Import__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2241:2: rule__Import__Group__1__Impl rule__Import__Group__2

-			{

-				pushFollow(FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__14753);

-				rule__Import__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Import__Group__2_in_rule__Import__Group__14756);

-				rule__Import__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group__1"

-

-

-	// $ANTLR start "rule__Import__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2248:1: rule__Import__Group__1__Impl : ( ( rule__Import__Alternatives_1 ) ) ;

-	public final void rule__Import__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2252:1: ( ( ( rule__Import__Alternatives_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2253:1: ( ( rule__Import__Alternatives_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2253:1: ( ( rule__Import__Alternatives_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2254:1: ( rule__Import__Alternatives_1 )

-				{

-					before(grammarAccess.getImportAccess().getAlternatives_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2255:1: ( rule__Import__Alternatives_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2255:2: rule__Import__Alternatives_1

-					{

-						pushFollow(FOLLOW_rule__Import__Alternatives_1_in_rule__Import__Group__1__Impl4783);

-						rule__Import__Alternatives_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getImportAccess().getAlternatives_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Import__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2265:1: rule__Import__Group__2 : rule__Import__Group__2__Impl rule__Import__Group__3 ;

-	public final void rule__Import__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2269:1: ( rule__Import__Group__2__Impl rule__Import__Group__3 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2270:2: rule__Import__Group__2__Impl rule__Import__Group__3

-			{

-				pushFollow(FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__24813);

-				rule__Import__Group__2__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Import__Group__3_in_rule__Import__Group__24816);

-				rule__Import__Group__3();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group__2"

-

-

-	// $ANTLR start "rule__Import__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2277:1: rule__Import__Group__2__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Import__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2281:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2282:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2282:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2283:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getImportAccess().getWSTerminalRuleCall_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2284:1: ( RULE_WS )*

-					loop30: do {

-						int alt30 = 2;

-						int LA30_0 = input.LA(1);

-

-						if ((LA30_0 == RULE_WS)) {

-							alt30 = 1;

-						}

-

-

-						switch (alt30) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2284:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Import__Group__2__Impl4844);

-

-						}

-							break;

-

-						default:

-							break loop30;

-						}

-					} while (true);

-

-					after(grammarAccess.getImportAccess().getWSTerminalRuleCall_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Import__Group__3"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2294:1: rule__Import__Group__3 : rule__Import__Group__3__Impl rule__Import__Group__4 ;

-	public final void rule__Import__Group__3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2298:1: ( rule__Import__Group__3__Impl rule__Import__Group__4 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2299:2: rule__Import__Group__3__Impl rule__Import__Group__4

-			{

-				pushFollow(FOLLOW_rule__Import__Group__3__Impl_in_rule__Import__Group__34875);

-				rule__Import__Group__3__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Import__Group__4_in_rule__Import__Group__34878);

-				rule__Import__Group__4();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group__3"

-

-

-	// $ANTLR start "rule__Import__Group__3__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2306:1: rule__Import__Group__3__Impl : ( ( rule__Import__Group_3__0 )? ) ;

-	public final void rule__Import__Group__3__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2310:1: ( ( ( rule__Import__Group_3__0 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2311:1: ( ( rule__Import__Group_3__0 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2311:1: ( ( rule__Import__Group_3__0 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2312:1: ( rule__Import__Group_3__0 )?

-				{

-					before(grammarAccess.getImportAccess().getGroup_3());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2313:1: ( rule__Import__Group_3__0 )?

-					int alt31 = 2;

-					int LA31_0 = input.LA(1);

-

-					if ((LA31_0 == RULE_ID)) {

-						alt31 = 1;

-					}

-					switch (alt31) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2313:2: rule__Import__Group_3__0

-					{

-						pushFollow(FOLLOW_rule__Import__Group_3__0_in_rule__Import__Group__3__Impl4905);

-						rule__Import__Group_3__0();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getImportAccess().getGroup_3());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group__3__Impl"

-

-

-	// $ANTLR start "rule__Import__Group__4"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2323:1: rule__Import__Group__4 : rule__Import__Group__4__Impl rule__Import__Group__5 ;

-	public final void rule__Import__Group__4() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2327:1: ( rule__Import__Group__4__Impl rule__Import__Group__5 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2328:2: rule__Import__Group__4__Impl rule__Import__Group__5

-			{

-				pushFollow(FOLLOW_rule__Import__Group__4__Impl_in_rule__Import__Group__44936);

-				rule__Import__Group__4__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Import__Group__5_in_rule__Import__Group__44939);

-				rule__Import__Group__5();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group__4"

-

-

-	// $ANTLR start "rule__Import__Group__4__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2335:1: rule__Import__Group__4__Impl : ( ';' ) ;

-	public final void rule__Import__Group__4__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2339:1: ( ( ';' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2340:1: ( ';' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2340:1: ( ';' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2341:1: ';'

-				{

-					before(grammarAccess.getImportAccess().getSemicolonKeyword_4());

-					match(input, 30, FOLLOW_30_in_rule__Import__Group__4__Impl4967);

-					after(grammarAccess.getImportAccess().getSemicolonKeyword_4());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group__4__Impl"

-

-

-	// $ANTLR start "rule__Import__Group__5"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2354:1: rule__Import__Group__5 : rule__Import__Group__5__Impl ;

-	public final void rule__Import__Group__5() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2358:1: ( rule__Import__Group__5__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2359:2: rule__Import__Group__5__Impl

-			{

-				pushFollow(FOLLOW_rule__Import__Group__5__Impl_in_rule__Import__Group__54998);

-				rule__Import__Group__5__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group__5"

-

-

-	// $ANTLR start "rule__Import__Group__5__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2365:1: rule__Import__Group__5__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Import__Group__5__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2369:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2370:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2370:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2371:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getImportAccess().getWSTerminalRuleCall_5());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2372:1: ( RULE_WS )*

-					loop32: do {

-						int alt32 = 2;

-						int LA32_0 = input.LA(1);

-

-						if ((LA32_0 == RULE_WS)) {

-							alt32 = 1;

-						}

-

-

-						switch (alt32) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2372:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Import__Group__5__Impl5026);

-

-						}

-							break;

-

-						default:

-							break loop32;

-						}

-					} while (true);

-

-					after(grammarAccess.getImportAccess().getWSTerminalRuleCall_5());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group__5__Impl"

-

-

-	// $ANTLR start "rule__Import__Group_1_0__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2394:1: rule__Import__Group_1_0__0 : rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 ;

-	public final void rule__Import__Group_1_0__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2398:1: ( rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2399:2: rule__Import__Group_1_0__0__Impl rule__Import__Group_1_0__1

-			{

-				pushFollow(FOLLOW_rule__Import__Group_1_0__0__Impl_in_rule__Import__Group_1_0__05069);

-				rule__Import__Group_1_0__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Import__Group_1_0__1_in_rule__Import__Group_1_0__05072);

-				rule__Import__Group_1_0__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_1_0__0"

-

-

-	// $ANTLR start "rule__Import__Group_1_0__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2406:1: rule__Import__Group_1_0__0__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Import__Group_1_0__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2410:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2411:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2411:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2412:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getImportAccess().getWSTerminalRuleCall_1_0_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2413:1: ( RULE_WS )*

-					loop33: do {

-						int alt33 = 2;

-						int LA33_0 = input.LA(1);

-

-						if ((LA33_0 == RULE_WS)) {

-							alt33 = 1;

-						}

-

-

-						switch (alt33) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2413:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Import__Group_1_0__0__Impl5100);

-

-						}

-							break;

-

-						default:

-							break loop33;

-						}

-					} while (true);

-

-					after(grammarAccess.getImportAccess().getWSTerminalRuleCall_1_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_1_0__0__Impl"

-

-

-	// $ANTLR start "rule__Import__Group_1_0__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2423:1: rule__Import__Group_1_0__1 : rule__Import__Group_1_0__1__Impl ;

-	public final void rule__Import__Group_1_0__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2427:1: ( rule__Import__Group_1_0__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2428:2: rule__Import__Group_1_0__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Import__Group_1_0__1__Impl_in_rule__Import__Group_1_0__15131);

-				rule__Import__Group_1_0__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_1_0__1"

-

-

-	// $ANTLR start "rule__Import__Group_1_0__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2434:1: rule__Import__Group_1_0__1__Impl : ( ( rule__Import__StringAssignment_1_0_1 ) ) ;

-	public final void rule__Import__Group_1_0__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2438:1: ( ( ( rule__Import__StringAssignment_1_0_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2439:1: ( ( rule__Import__StringAssignment_1_0_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2439:1: ( ( rule__Import__StringAssignment_1_0_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2440:1: ( rule__Import__StringAssignment_1_0_1 )

-				{

-					before(grammarAccess.getImportAccess().getStringAssignment_1_0_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2441:1: ( rule__Import__StringAssignment_1_0_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2441:2: rule__Import__StringAssignment_1_0_1

-					{

-						pushFollow(FOLLOW_rule__Import__StringAssignment_1_0_1_in_rule__Import__Group_1_0__1__Impl5158);

-						rule__Import__StringAssignment_1_0_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getImportAccess().getStringAssignment_1_0_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_1_0__1__Impl"

-

-

-	// $ANTLR start "rule__Import__Group_1_1__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2455:1: rule__Import__Group_1_1__0 : rule__Import__Group_1_1__0__Impl rule__Import__Group_1_1__1 ;

-	public final void rule__Import__Group_1_1__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2459:1: ( rule__Import__Group_1_1__0__Impl rule__Import__Group_1_1__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2460:2: rule__Import__Group_1_1__0__Impl rule__Import__Group_1_1__1

-			{

-				pushFollow(FOLLOW_rule__Import__Group_1_1__0__Impl_in_rule__Import__Group_1_1__05192);

-				rule__Import__Group_1_1__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Import__Group_1_1__1_in_rule__Import__Group_1_1__05195);

-				rule__Import__Group_1_1__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_1_1__0"

-

-

-	// $ANTLR start "rule__Import__Group_1_1__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2467:1: rule__Import__Group_1_1__0__Impl : ( RULE_WS ) ;

-	public final void rule__Import__Group_1_1__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2471:1: ( ( RULE_WS ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2472:1: ( RULE_WS )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2472:1: ( RULE_WS )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2473:1: RULE_WS

-				{

-					before(grammarAccess.getImportAccess().getWSTerminalRuleCall_1_1_0());

-					match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Import__Group_1_1__0__Impl5222);

-					after(grammarAccess.getImportAccess().getWSTerminalRuleCall_1_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_1_1__0__Impl"

-

-

-	// $ANTLR start "rule__Import__Group_1_1__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2484:1: rule__Import__Group_1_1__1 : rule__Import__Group_1_1__1__Impl ;

-	public final void rule__Import__Group_1_1__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2488:1: ( rule__Import__Group_1_1__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2489:2: rule__Import__Group_1_1__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Import__Group_1_1__1__Impl_in_rule__Import__Group_1_1__15251);

-				rule__Import__Group_1_1__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_1_1__1"

-

-

-	// $ANTLR start "rule__Import__Group_1_1__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2495:1: rule__Import__Group_1_1__1__Impl : ( ( rule__Import__UriAssignment_1_1_1 ) ) ;

-	public final void rule__Import__Group_1_1__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2499:1: ( ( ( rule__Import__UriAssignment_1_1_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2500:1: ( ( rule__Import__UriAssignment_1_1_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2500:1: ( ( rule__Import__UriAssignment_1_1_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2501:1: ( rule__Import__UriAssignment_1_1_1 )

-				{

-					before(grammarAccess.getImportAccess().getUriAssignment_1_1_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2502:1: ( rule__Import__UriAssignment_1_1_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2502:2: rule__Import__UriAssignment_1_1_1

-					{

-						pushFollow(FOLLOW_rule__Import__UriAssignment_1_1_1_in_rule__Import__Group_1_1__1__Impl5278);

-						rule__Import__UriAssignment_1_1_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getImportAccess().getUriAssignment_1_1_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_1_1__1__Impl"

-

-

-	// $ANTLR start "rule__Import__Group_3__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2516:1: rule__Import__Group_3__0 : rule__Import__Group_3__0__Impl rule__Import__Group_3__1 ;

-	public final void rule__Import__Group_3__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2520:1: ( rule__Import__Group_3__0__Impl rule__Import__Group_3__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2521:2: rule__Import__Group_3__0__Impl rule__Import__Group_3__1

-			{

-				pushFollow(FOLLOW_rule__Import__Group_3__0__Impl_in_rule__Import__Group_3__05312);

-				rule__Import__Group_3__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Import__Group_3__1_in_rule__Import__Group_3__05315);

-				rule__Import__Group_3__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_3__0"

-

-

-	// $ANTLR start "rule__Import__Group_3__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2528:1: rule__Import__Group_3__0__Impl : ( ( rule__Import__MediaAssignment_3_0 ) ) ;

-	public final void rule__Import__Group_3__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2532:1: ( ( ( rule__Import__MediaAssignment_3_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2533:1: ( ( rule__Import__MediaAssignment_3_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2533:1: ( ( rule__Import__MediaAssignment_3_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2534:1: ( rule__Import__MediaAssignment_3_0 )

-				{

-					before(grammarAccess.getImportAccess().getMediaAssignment_3_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2535:1: ( rule__Import__MediaAssignment_3_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2535:2: rule__Import__MediaAssignment_3_0

-					{

-						pushFollow(FOLLOW_rule__Import__MediaAssignment_3_0_in_rule__Import__Group_3__0__Impl5342);

-						rule__Import__MediaAssignment_3_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getImportAccess().getMediaAssignment_3_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_3__0__Impl"

-

-

-	// $ANTLR start "rule__Import__Group_3__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2545:1: rule__Import__Group_3__1 : rule__Import__Group_3__1__Impl rule__Import__Group_3__2 ;

-	public final void rule__Import__Group_3__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2549:1: ( rule__Import__Group_3__1__Impl rule__Import__Group_3__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2550:2: rule__Import__Group_3__1__Impl rule__Import__Group_3__2

-			{

-				pushFollow(FOLLOW_rule__Import__Group_3__1__Impl_in_rule__Import__Group_3__15372);

-				rule__Import__Group_3__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Import__Group_3__2_in_rule__Import__Group_3__15375);

-				rule__Import__Group_3__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_3__1"

-

-

-	// $ANTLR start "rule__Import__Group_3__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2557:1: rule__Import__Group_3__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Import__Group_3__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2561:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2562:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2562:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2563:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getImportAccess().getWSTerminalRuleCall_3_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2564:1: ( RULE_WS )*

-					loop34: do {

-						int alt34 = 2;

-						int LA34_0 = input.LA(1);

-

-						if ((LA34_0 == RULE_WS)) {

-							alt34 = 1;

-						}

-

-

-						switch (alt34) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2564:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Import__Group_3__1__Impl5403);

-

-						}

-							break;

-

-						default:

-							break loop34;

-						}

-					} while (true);

-

-					after(grammarAccess.getImportAccess().getWSTerminalRuleCall_3_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_3__1__Impl"

-

-

-	// $ANTLR start "rule__Import__Group_3__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2574:1: rule__Import__Group_3__2 : rule__Import__Group_3__2__Impl ;

-	public final void rule__Import__Group_3__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2578:1: ( rule__Import__Group_3__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2579:2: rule__Import__Group_3__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Import__Group_3__2__Impl_in_rule__Import__Group_3__25434);

-				rule__Import__Group_3__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_3__2"

-

-

-	// $ANTLR start "rule__Import__Group_3__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2585:1: rule__Import__Group_3__2__Impl : ( ( rule__Import__Group_3_2__0 )* ) ;

-	public final void rule__Import__Group_3__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2589:1: ( ( ( rule__Import__Group_3_2__0 )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2590:1: ( ( rule__Import__Group_3_2__0 )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2590:1: ( ( rule__Import__Group_3_2__0 )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2591:1: ( rule__Import__Group_3_2__0 )*

-				{

-					before(grammarAccess.getImportAccess().getGroup_3_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2592:1: ( rule__Import__Group_3_2__0 )*

-					loop35: do {

-						int alt35 = 2;

-						int LA35_0 = input.LA(1);

-

-						if ((LA35_0 == 32)) {

-							alt35 = 1;

-						}

-

-

-						switch (alt35) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2592:2: rule__Import__Group_3_2__0

-						{

-							pushFollow(FOLLOW_rule__Import__Group_3_2__0_in_rule__Import__Group_3__2__Impl5461);

-							rule__Import__Group_3_2__0();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop35;

-						}

-					} while (true);

-

-					after(grammarAccess.getImportAccess().getGroup_3_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_3__2__Impl"

-

-

-	// $ANTLR start "rule__Import__Group_3_2__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2608:1: rule__Import__Group_3_2__0 : rule__Import__Group_3_2__0__Impl rule__Import__Group_3_2__1 ;

-	public final void rule__Import__Group_3_2__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2612:1: ( rule__Import__Group_3_2__0__Impl rule__Import__Group_3_2__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2613:2: rule__Import__Group_3_2__0__Impl rule__Import__Group_3_2__1

-			{

-				pushFollow(FOLLOW_rule__Import__Group_3_2__0__Impl_in_rule__Import__Group_3_2__05498);

-				rule__Import__Group_3_2__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Import__Group_3_2__1_in_rule__Import__Group_3_2__05501);

-				rule__Import__Group_3_2__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_3_2__0"

-

-

-	// $ANTLR start "rule__Import__Group_3_2__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2620:1: rule__Import__Group_3_2__0__Impl : ( ',' ) ;

-	public final void rule__Import__Group_3_2__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2624:1: ( ( ',' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2625:1: ( ',' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2625:1: ( ',' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2626:1: ','

-				{

-					before(grammarAccess.getImportAccess().getCommaKeyword_3_2_0());

-					match(input, 32, FOLLOW_32_in_rule__Import__Group_3_2__0__Impl5529);

-					after(grammarAccess.getImportAccess().getCommaKeyword_3_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_3_2__0__Impl"

-

-

-	// $ANTLR start "rule__Import__Group_3_2__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2639:1: rule__Import__Group_3_2__1 : rule__Import__Group_3_2__1__Impl rule__Import__Group_3_2__2 ;

-	public final void rule__Import__Group_3_2__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2643:1: ( rule__Import__Group_3_2__1__Impl rule__Import__Group_3_2__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2644:2: rule__Import__Group_3_2__1__Impl rule__Import__Group_3_2__2

-			{

-				pushFollow(FOLLOW_rule__Import__Group_3_2__1__Impl_in_rule__Import__Group_3_2__15560);

-				rule__Import__Group_3_2__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Import__Group_3_2__2_in_rule__Import__Group_3_2__15563);

-				rule__Import__Group_3_2__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_3_2__1"

-

-

-	// $ANTLR start "rule__Import__Group_3_2__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2651:1: rule__Import__Group_3_2__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Import__Group_3_2__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2655:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2656:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2656:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2657:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getImportAccess().getWSTerminalRuleCall_3_2_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2658:1: ( RULE_WS )*

-					loop36: do {

-						int alt36 = 2;

-						int LA36_0 = input.LA(1);

-

-						if ((LA36_0 == RULE_WS)) {

-							alt36 = 1;

-						}

-

-

-						switch (alt36) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2658:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Import__Group_3_2__1__Impl5591);

-

-						}

-							break;

-

-						default:

-							break loop36;

-						}

-					} while (true);

-

-					after(grammarAccess.getImportAccess().getWSTerminalRuleCall_3_2_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_3_2__1__Impl"

-

-

-	// $ANTLR start "rule__Import__Group_3_2__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2668:1: rule__Import__Group_3_2__2 : rule__Import__Group_3_2__2__Impl ;

-	public final void rule__Import__Group_3_2__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2672:1: ( rule__Import__Group_3_2__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2673:2: rule__Import__Group_3_2__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Import__Group_3_2__2__Impl_in_rule__Import__Group_3_2__25622);

-				rule__Import__Group_3_2__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_3_2__2"

-

-

-	// $ANTLR start "rule__Import__Group_3_2__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2679:1: rule__Import__Group_3_2__2__Impl : ( ( rule__Import__MediaAssignment_3_2_2 ) ) ;

-	public final void rule__Import__Group_3_2__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2683:1: ( ( ( rule__Import__MediaAssignment_3_2_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2684:1: ( ( rule__Import__MediaAssignment_3_2_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2684:1: ( ( rule__Import__MediaAssignment_3_2_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2685:1: ( rule__Import__MediaAssignment_3_2_2 )

-				{

-					before(grammarAccess.getImportAccess().getMediaAssignment_3_2_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2686:1: ( rule__Import__MediaAssignment_3_2_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2686:2: rule__Import__MediaAssignment_3_2_2

-					{

-						pushFollow(FOLLOW_rule__Import__MediaAssignment_3_2_2_in_rule__Import__Group_3_2__2__Impl5649);

-						rule__Import__MediaAssignment_3_2_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getImportAccess().getMediaAssignment_3_2_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__Group_3_2__2__Impl"

-

-

-	// $ANTLR start "rule__Media__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2702:1: rule__Media__Group__0 : rule__Media__Group__0__Impl rule__Media__Group__1 ;

-	public final void rule__Media__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2706:1: ( rule__Media__Group__0__Impl rule__Media__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2707:2: rule__Media__Group__0__Impl rule__Media__Group__1

-			{

-				pushFollow(FOLLOW_rule__Media__Group__0__Impl_in_rule__Media__Group__05685);

-				rule__Media__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Media__Group__1_in_rule__Media__Group__05688);

-				rule__Media__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__0"

-

-

-	// $ANTLR start "rule__Media__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2714:1: rule__Media__Group__0__Impl : ( '@media' ) ;

-	public final void rule__Media__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2718:1: ( ( '@media' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2719:1: ( '@media' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2719:1: ( '@media' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2720:1: '@media'

-				{

-					before(grammarAccess.getMediaAccess().getMediaKeyword_0());

-					match(input, 33, FOLLOW_33_in_rule__Media__Group__0__Impl5716);

-					after(grammarAccess.getMediaAccess().getMediaKeyword_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Media__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2733:1: rule__Media__Group__1 : rule__Media__Group__1__Impl rule__Media__Group__2 ;

-	public final void rule__Media__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2737:1: ( rule__Media__Group__1__Impl rule__Media__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2738:2: rule__Media__Group__1__Impl rule__Media__Group__2

-			{

-				pushFollow(FOLLOW_rule__Media__Group__1__Impl_in_rule__Media__Group__15747);

-				rule__Media__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Media__Group__2_in_rule__Media__Group__15750);

-				rule__Media__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__1"

-

-

-	// $ANTLR start "rule__Media__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2745:1: rule__Media__Group__1__Impl : ( RULE_WS ) ;

-	public final void rule__Media__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2749:1: ( ( RULE_WS ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2750:1: ( RULE_WS )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2750:1: ( RULE_WS )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2751:1: RULE_WS

-				{

-					before(grammarAccess.getMediaAccess().getWSTerminalRuleCall_1());

-					match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Media__Group__1__Impl5777);

-					after(grammarAccess.getMediaAccess().getWSTerminalRuleCall_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Media__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2762:1: rule__Media__Group__2 : rule__Media__Group__2__Impl rule__Media__Group__3 ;

-	public final void rule__Media__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2766:1: ( rule__Media__Group__2__Impl rule__Media__Group__3 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2767:2: rule__Media__Group__2__Impl rule__Media__Group__3

-			{

-				pushFollow(FOLLOW_rule__Media__Group__2__Impl_in_rule__Media__Group__25806);

-				rule__Media__Group__2__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Media__Group__3_in_rule__Media__Group__25809);

-				rule__Media__Group__3();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__2"

-

-

-	// $ANTLR start "rule__Media__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2774:1: rule__Media__Group__2__Impl : ( ( rule__Media__MediaAssignment_2 ) ) ;

-	public final void rule__Media__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2778:1: ( ( ( rule__Media__MediaAssignment_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2779:1: ( ( rule__Media__MediaAssignment_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2779:1: ( ( rule__Media__MediaAssignment_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2780:1: ( rule__Media__MediaAssignment_2 )

-				{

-					before(grammarAccess.getMediaAccess().getMediaAssignment_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2781:1: ( rule__Media__MediaAssignment_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2781:2: rule__Media__MediaAssignment_2

-					{

-						pushFollow(FOLLOW_rule__Media__MediaAssignment_2_in_rule__Media__Group__2__Impl5836);

-						rule__Media__MediaAssignment_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getMediaAccess().getMediaAssignment_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Media__Group__3"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2791:1: rule__Media__Group__3 : rule__Media__Group__3__Impl rule__Media__Group__4 ;

-	public final void rule__Media__Group__3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2795:1: ( rule__Media__Group__3__Impl rule__Media__Group__4 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2796:2: rule__Media__Group__3__Impl rule__Media__Group__4

-			{

-				pushFollow(FOLLOW_rule__Media__Group__3__Impl_in_rule__Media__Group__35866);

-				rule__Media__Group__3__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Media__Group__4_in_rule__Media__Group__35869);

-				rule__Media__Group__4();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__3"

-

-

-	// $ANTLR start "rule__Media__Group__3__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2803:1: rule__Media__Group__3__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Media__Group__3__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2807:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2808:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2808:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2809:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getMediaAccess().getWSTerminalRuleCall_3());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2810:1: ( RULE_WS )*

-					loop37: do {

-						int alt37 = 2;

-						int LA37_0 = input.LA(1);

-

-						if ((LA37_0 == RULE_WS)) {

-							alt37 = 1;

-						}

-

-

-						switch (alt37) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2810:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Media__Group__3__Impl5897);

-

-						}

-							break;

-

-						default:

-							break loop37;

-						}

-					} while (true);

-

-					after(grammarAccess.getMediaAccess().getWSTerminalRuleCall_3());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__3__Impl"

-

-

-	// $ANTLR start "rule__Media__Group__4"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2820:1: rule__Media__Group__4 : rule__Media__Group__4__Impl rule__Media__Group__5 ;

-	public final void rule__Media__Group__4() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2824:1: ( rule__Media__Group__4__Impl rule__Media__Group__5 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2825:2: rule__Media__Group__4__Impl rule__Media__Group__5

-			{

-				pushFollow(FOLLOW_rule__Media__Group__4__Impl_in_rule__Media__Group__45928);

-				rule__Media__Group__4__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Media__Group__5_in_rule__Media__Group__45931);

-				rule__Media__Group__5();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__4"

-

-

-	// $ANTLR start "rule__Media__Group__4__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2832:1: rule__Media__Group__4__Impl : ( ( rule__Media__Group_4__0 )* ) ;

-	public final void rule__Media__Group__4__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2836:1: ( ( ( rule__Media__Group_4__0 )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2837:1: ( ( rule__Media__Group_4__0 )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2837:1: ( ( rule__Media__Group_4__0 )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2838:1: ( rule__Media__Group_4__0 )*

-				{

-					before(grammarAccess.getMediaAccess().getGroup_4());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2839:1: ( rule__Media__Group_4__0 )*

-					loop38: do {

-						int alt38 = 2;

-						int LA38_0 = input.LA(1);

-

-						if ((LA38_0 == 32)) {

-							alt38 = 1;

-						}

-

-

-						switch (alt38) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2839:2: rule__Media__Group_4__0

-						{

-							pushFollow(FOLLOW_rule__Media__Group_4__0_in_rule__Media__Group__4__Impl5958);

-							rule__Media__Group_4__0();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop38;

-						}

-					} while (true);

-

-					after(grammarAccess.getMediaAccess().getGroup_4());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__4__Impl"

-

-

-	// $ANTLR start "rule__Media__Group__5"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2849:1: rule__Media__Group__5 : rule__Media__Group__5__Impl rule__Media__Group__6 ;

-	public final void rule__Media__Group__5() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2853:1: ( rule__Media__Group__5__Impl rule__Media__Group__6 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2854:2: rule__Media__Group__5__Impl rule__Media__Group__6

-			{

-				pushFollow(FOLLOW_rule__Media__Group__5__Impl_in_rule__Media__Group__55989);

-				rule__Media__Group__5__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Media__Group__6_in_rule__Media__Group__55992);

-				rule__Media__Group__6();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__5"

-

-

-	// $ANTLR start "rule__Media__Group__5__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2861:1: rule__Media__Group__5__Impl : ( '{' ) ;

-	public final void rule__Media__Group__5__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2865:1: ( ( '{' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2866:1: ( '{' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2866:1: ( '{' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2867:1: '{'

-				{

-					before(grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_5());

-					match(input, 34, FOLLOW_34_in_rule__Media__Group__5__Impl6020);

-					after(grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_5());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__5__Impl"

-

-

-	// $ANTLR start "rule__Media__Group__6"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2880:1: rule__Media__Group__6 : rule__Media__Group__6__Impl rule__Media__Group__7 ;

-	public final void rule__Media__Group__6() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2884:1: ( rule__Media__Group__6__Impl rule__Media__Group__7 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2885:2: rule__Media__Group__6__Impl rule__Media__Group__7

-			{

-				pushFollow(FOLLOW_rule__Media__Group__6__Impl_in_rule__Media__Group__66051);

-				rule__Media__Group__6__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Media__Group__7_in_rule__Media__Group__66054);

-				rule__Media__Group__7();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__6"

-

-

-	// $ANTLR start "rule__Media__Group__6__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2892:1: rule__Media__Group__6__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Media__Group__6__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2896:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2897:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2897:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2898:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getMediaAccess().getWSTerminalRuleCall_6());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2899:1: ( RULE_WS )*

-					loop39: do {

-						int alt39 = 2;

-						int LA39_0 = input.LA(1);

-

-						if ((LA39_0 == RULE_WS)) {

-							alt39 = 1;

-						}

-

-

-						switch (alt39) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2899:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Media__Group__6__Impl6082);

-

-						}

-							break;

-

-						default:

-							break loop39;

-						}

-					} while (true);

-

-					after(grammarAccess.getMediaAccess().getWSTerminalRuleCall_6());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__6__Impl"

-

-

-	// $ANTLR start "rule__Media__Group__7"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2909:1: rule__Media__Group__7 : rule__Media__Group__7__Impl rule__Media__Group__8 ;

-	public final void rule__Media__Group__7() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2913:1: ( rule__Media__Group__7__Impl rule__Media__Group__8 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2914:2: rule__Media__Group__7__Impl rule__Media__Group__8

-			{

-				pushFollow(FOLLOW_rule__Media__Group__7__Impl_in_rule__Media__Group__76113);

-				rule__Media__Group__7__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Media__Group__8_in_rule__Media__Group__76116);

-				rule__Media__Group__8();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__7"

-

-

-	// $ANTLR start "rule__Media__Group__7__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2921:1: rule__Media__Group__7__Impl : ( ( rule__Media__RulesAssignment_7 )* ) ;

-	public final void rule__Media__Group__7__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2925:1: ( ( ( rule__Media__RulesAssignment_7 )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2926:1: ( ( rule__Media__RulesAssignment_7 )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2926:1: ( ( rule__Media__RulesAssignment_7 )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2927:1: ( rule__Media__RulesAssignment_7 )*

-				{

-					before(grammarAccess.getMediaAccess().getRulesAssignment_7());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2928:1: ( rule__Media__RulesAssignment_7 )*

-					loop40: do {

-						int alt40 = 2;

-						int LA40_0 = input.LA(1);

-

-						if ((LA40_0 == RULE_ID || (LA40_0 >= RULE_HASH && LA40_0 <= RULE_T_CLASS) || LA40_0 == 22 || LA40_0 == 37 || LA40_0 == 42)) {

-							alt40 = 1;

-						}

-

-

-						switch (alt40) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2928:2: rule__Media__RulesAssignment_7

-						{

-							pushFollow(FOLLOW_rule__Media__RulesAssignment_7_in_rule__Media__Group__7__Impl6143);

-							rule__Media__RulesAssignment_7();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop40;

-						}

-					} while (true);

-

-					after(grammarAccess.getMediaAccess().getRulesAssignment_7());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__7__Impl"

-

-

-	// $ANTLR start "rule__Media__Group__8"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2938:1: rule__Media__Group__8 : rule__Media__Group__8__Impl rule__Media__Group__9 ;

-	public final void rule__Media__Group__8() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2942:1: ( rule__Media__Group__8__Impl rule__Media__Group__9 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2943:2: rule__Media__Group__8__Impl rule__Media__Group__9

-			{

-				pushFollow(FOLLOW_rule__Media__Group__8__Impl_in_rule__Media__Group__86174);

-				rule__Media__Group__8__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Media__Group__9_in_rule__Media__Group__86177);

-				rule__Media__Group__9();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__8"

-

-

-	// $ANTLR start "rule__Media__Group__8__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2950:1: rule__Media__Group__8__Impl : ( '}' ) ;

-	public final void rule__Media__Group__8__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2954:1: ( ( '}' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2955:1: ( '}' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2955:1: ( '}' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2956:1: '}'

-				{

-					before(grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_8());

-					match(input, 35, FOLLOW_35_in_rule__Media__Group__8__Impl6205);

-					after(grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_8());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__8__Impl"

-

-

-	// $ANTLR start "rule__Media__Group__9"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2969:1: rule__Media__Group__9 : rule__Media__Group__9__Impl ;

-	public final void rule__Media__Group__9() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2973:1: ( rule__Media__Group__9__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2974:2: rule__Media__Group__9__Impl

-			{

-				pushFollow(FOLLOW_rule__Media__Group__9__Impl_in_rule__Media__Group__96236);

-				rule__Media__Group__9__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__9"

-

-

-	// $ANTLR start "rule__Media__Group__9__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2980:1: rule__Media__Group__9__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Media__Group__9__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2984:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2985:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2985:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2986:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getMediaAccess().getWSTerminalRuleCall_9());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2987:1: ( RULE_WS )*

-					loop41: do {

-						int alt41 = 2;

-						int LA41_0 = input.LA(1);

-

-						if ((LA41_0 == RULE_WS)) {

-							alt41 = 1;

-						}

-

-

-						switch (alt41) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:2987:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Media__Group__9__Impl6264);

-

-						}

-							break;

-

-						default:

-							break loop41;

-						}

-					} while (true);

-

-					after(grammarAccess.getMediaAccess().getWSTerminalRuleCall_9());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group__9__Impl"

-

-

-	// $ANTLR start "rule__Media__Group_4__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3017:1: rule__Media__Group_4__0 : rule__Media__Group_4__0__Impl rule__Media__Group_4__1 ;

-	public final void rule__Media__Group_4__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3021:1: ( rule__Media__Group_4__0__Impl rule__Media__Group_4__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3022:2: rule__Media__Group_4__0__Impl rule__Media__Group_4__1

-			{

-				pushFollow(FOLLOW_rule__Media__Group_4__0__Impl_in_rule__Media__Group_4__06315);

-				rule__Media__Group_4__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Media__Group_4__1_in_rule__Media__Group_4__06318);

-				rule__Media__Group_4__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group_4__0"

-

-

-	// $ANTLR start "rule__Media__Group_4__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3029:1: rule__Media__Group_4__0__Impl : ( ',' ) ;

-	public final void rule__Media__Group_4__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3033:1: ( ( ',' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3034:1: ( ',' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3034:1: ( ',' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3035:1: ','

-				{

-					before(grammarAccess.getMediaAccess().getCommaKeyword_4_0());

-					match(input, 32, FOLLOW_32_in_rule__Media__Group_4__0__Impl6346);

-					after(grammarAccess.getMediaAccess().getCommaKeyword_4_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group_4__0__Impl"

-

-

-	// $ANTLR start "rule__Media__Group_4__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3048:1: rule__Media__Group_4__1 : rule__Media__Group_4__1__Impl rule__Media__Group_4__2 ;

-	public final void rule__Media__Group_4__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3052:1: ( rule__Media__Group_4__1__Impl rule__Media__Group_4__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3053:2: rule__Media__Group_4__1__Impl rule__Media__Group_4__2

-			{

-				pushFollow(FOLLOW_rule__Media__Group_4__1__Impl_in_rule__Media__Group_4__16377);

-				rule__Media__Group_4__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Media__Group_4__2_in_rule__Media__Group_4__16380);

-				rule__Media__Group_4__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group_4__1"

-

-

-	// $ANTLR start "rule__Media__Group_4__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3060:1: rule__Media__Group_4__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Media__Group_4__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3064:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3065:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3065:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3066:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getMediaAccess().getWSTerminalRuleCall_4_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3067:1: ( RULE_WS )*

-					loop42: do {

-						int alt42 = 2;

-						int LA42_0 = input.LA(1);

-

-						if ((LA42_0 == RULE_WS)) {

-							alt42 = 1;

-						}

-

-

-						switch (alt42) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3067:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Media__Group_4__1__Impl6408);

-

-						}

-							break;

-

-						default:

-							break loop42;

-						}

-					} while (true);

-

-					after(grammarAccess.getMediaAccess().getWSTerminalRuleCall_4_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group_4__1__Impl"

-

-

-	// $ANTLR start "rule__Media__Group_4__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3077:1: rule__Media__Group_4__2 : rule__Media__Group_4__2__Impl ;

-	public final void rule__Media__Group_4__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3081:1: ( rule__Media__Group_4__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3082:2: rule__Media__Group_4__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Media__Group_4__2__Impl_in_rule__Media__Group_4__26439);

-				rule__Media__Group_4__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group_4__2"

-

-

-	// $ANTLR start "rule__Media__Group_4__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3088:1: rule__Media__Group_4__2__Impl : ( ( rule__Media__MediaAssignment_4_2 ) ) ;

-	public final void rule__Media__Group_4__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3092:1: ( ( ( rule__Media__MediaAssignment_4_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3093:1: ( ( rule__Media__MediaAssignment_4_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3093:1: ( ( rule__Media__MediaAssignment_4_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3094:1: ( rule__Media__MediaAssignment_4_2 )

-				{

-					before(grammarAccess.getMediaAccess().getMediaAssignment_4_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3095:1: ( rule__Media__MediaAssignment_4_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3095:2: rule__Media__MediaAssignment_4_2

-					{

-						pushFollow(FOLLOW_rule__Media__MediaAssignment_4_2_in_rule__Media__Group_4__2__Impl6466);

-						rule__Media__MediaAssignment_4_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getMediaAccess().getMediaAssignment_4_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__Group_4__2__Impl"

-

-

-	// $ANTLR start "rule__Page__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3111:1: rule__Page__Group__0 : rule__Page__Group__0__Impl rule__Page__Group__1 ;

-	public final void rule__Page__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3115:1: ( rule__Page__Group__0__Impl rule__Page__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3116:2: rule__Page__Group__0__Impl rule__Page__Group__1

-			{

-				pushFollow(FOLLOW_rule__Page__Group__0__Impl_in_rule__Page__Group__06502);

-				rule__Page__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Page__Group__1_in_rule__Page__Group__06505);

-				rule__Page__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__0"

-

-

-	// $ANTLR start "rule__Page__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3123:1: rule__Page__Group__0__Impl : ( () ) ;

-	public final void rule__Page__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3127:1: ( ( () ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3128:1: ( () )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3128:1: ( () )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3129:1: ()

-				{

-					before(grammarAccess.getPageAccess().getPageAction_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3130:1: ()

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3132:1:

-					{

-					}

-

-					after(grammarAccess.getPageAccess().getPageAction_0());

-

-				}

-

-

-			}

-

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Page__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3142:1: rule__Page__Group__1 : rule__Page__Group__1__Impl rule__Page__Group__2 ;

-	public final void rule__Page__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3146:1: ( rule__Page__Group__1__Impl rule__Page__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3147:2: rule__Page__Group__1__Impl rule__Page__Group__2

-			{

-				pushFollow(FOLLOW_rule__Page__Group__1__Impl_in_rule__Page__Group__16563);

-				rule__Page__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Page__Group__2_in_rule__Page__Group__16566);

-				rule__Page__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__1"

-

-

-	// $ANTLR start "rule__Page__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3154:1: rule__Page__Group__1__Impl : ( '@page' ) ;

-	public final void rule__Page__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3158:1: ( ( '@page' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3159:1: ( '@page' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3159:1: ( '@page' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3160:1: '@page'

-				{

-					before(grammarAccess.getPageAccess().getPageKeyword_1());

-					match(input, 36, FOLLOW_36_in_rule__Page__Group__1__Impl6594);

-					after(grammarAccess.getPageAccess().getPageKeyword_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Page__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3173:1: rule__Page__Group__2 : rule__Page__Group__2__Impl rule__Page__Group__3 ;

-	public final void rule__Page__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3177:1: ( rule__Page__Group__2__Impl rule__Page__Group__3 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3178:2: rule__Page__Group__2__Impl rule__Page__Group__3

-			{

-				pushFollow(FOLLOW_rule__Page__Group__2__Impl_in_rule__Page__Group__26625);

-				rule__Page__Group__2__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Page__Group__3_in_rule__Page__Group__26628);

-				rule__Page__Group__3();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__2"

-

-

-	// $ANTLR start "rule__Page__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3185:1: rule__Page__Group__2__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Page__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3189:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3190:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3190:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3191:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getPageAccess().getWSTerminalRuleCall_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3192:1: ( RULE_WS )*

-					loop43: do {

-						int alt43 = 2;

-						int LA43_0 = input.LA(1);

-

-						if ((LA43_0 == RULE_WS)) {

-							alt43 = 1;

-						}

-

-

-						switch (alt43) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3192:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Page__Group__2__Impl6656);

-

-						}

-							break;

-

-						default:

-							break loop43;

-						}

-					} while (true);

-

-					after(grammarAccess.getPageAccess().getWSTerminalRuleCall_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Page__Group__3"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3202:1: rule__Page__Group__3 : rule__Page__Group__3__Impl rule__Page__Group__4 ;

-	public final void rule__Page__Group__3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3206:1: ( rule__Page__Group__3__Impl rule__Page__Group__4 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3207:2: rule__Page__Group__3__Impl rule__Page__Group__4

-			{

-				pushFollow(FOLLOW_rule__Page__Group__3__Impl_in_rule__Page__Group__36687);

-				rule__Page__Group__3__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Page__Group__4_in_rule__Page__Group__36690);

-				rule__Page__Group__4();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__3"

-

-

-	// $ANTLR start "rule__Page__Group__3__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3214:1: rule__Page__Group__3__Impl : ( ( rule__Page__PseudoAssignment_3 )? ) ;

-	public final void rule__Page__Group__3__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3218:1: ( ( ( rule__Page__PseudoAssignment_3 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3219:1: ( ( rule__Page__PseudoAssignment_3 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3219:1: ( ( rule__Page__PseudoAssignment_3 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3220:1: ( rule__Page__PseudoAssignment_3 )?

-				{

-					before(grammarAccess.getPageAccess().getPseudoAssignment_3());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3221:1: ( rule__Page__PseudoAssignment_3 )?

-					int alt44 = 2;

-					int LA44_0 = input.LA(1);

-

-					if ((LA44_0 == 37)) {

-						alt44 = 1;

-					}

-					switch (alt44) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3221:2: rule__Page__PseudoAssignment_3

-					{

-						pushFollow(FOLLOW_rule__Page__PseudoAssignment_3_in_rule__Page__Group__3__Impl6717);

-						rule__Page__PseudoAssignment_3();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getPageAccess().getPseudoAssignment_3());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__3__Impl"

-

-

-	// $ANTLR start "rule__Page__Group__4"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3231:1: rule__Page__Group__4 : rule__Page__Group__4__Impl rule__Page__Group__5 ;

-	public final void rule__Page__Group__4() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3235:1: ( rule__Page__Group__4__Impl rule__Page__Group__5 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3236:2: rule__Page__Group__4__Impl rule__Page__Group__5

-			{

-				pushFollow(FOLLOW_rule__Page__Group__4__Impl_in_rule__Page__Group__46748);

-				rule__Page__Group__4__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Page__Group__5_in_rule__Page__Group__46751);

-				rule__Page__Group__5();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__4"

-

-

-	// $ANTLR start "rule__Page__Group__4__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3243:1: rule__Page__Group__4__Impl : ( '{' ) ;

-	public final void rule__Page__Group__4__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3247:1: ( ( '{' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3248:1: ( '{' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3248:1: ( '{' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3249:1: '{'

-				{

-					before(grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_4());

-					match(input, 34, FOLLOW_34_in_rule__Page__Group__4__Impl6779);

-					after(grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_4());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__4__Impl"

-

-

-	// $ANTLR start "rule__Page__Group__5"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3262:1: rule__Page__Group__5 : rule__Page__Group__5__Impl rule__Page__Group__6 ;

-	public final void rule__Page__Group__5() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3266:1: ( rule__Page__Group__5__Impl rule__Page__Group__6 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3267:2: rule__Page__Group__5__Impl rule__Page__Group__6

-			{

-				pushFollow(FOLLOW_rule__Page__Group__5__Impl_in_rule__Page__Group__56810);

-				rule__Page__Group__5__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Page__Group__6_in_rule__Page__Group__56813);

-				rule__Page__Group__6();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__5"

-

-

-	// $ANTLR start "rule__Page__Group__5__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3274:1: rule__Page__Group__5__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Page__Group__5__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3278:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3279:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3279:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3280:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getPageAccess().getWSTerminalRuleCall_5());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3281:1: ( RULE_WS )*

-					loop45: do {

-						int alt45 = 2;

-						int LA45_0 = input.LA(1);

-

-						if ((LA45_0 == RULE_WS)) {

-							alt45 = 1;

-						}

-

-

-						switch (alt45) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3281:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Page__Group__5__Impl6841);

-

-						}

-							break;

-

-						default:

-							break loop45;

-						}

-					} while (true);

-

-					after(grammarAccess.getPageAccess().getWSTerminalRuleCall_5());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__5__Impl"

-

-

-	// $ANTLR start "rule__Page__Group__6"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3291:1: rule__Page__Group__6 : rule__Page__Group__6__Impl rule__Page__Group__7 ;

-	public final void rule__Page__Group__6() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3295:1: ( rule__Page__Group__6__Impl rule__Page__Group__7 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3296:2: rule__Page__Group__6__Impl rule__Page__Group__7

-			{

-				pushFollow(FOLLOW_rule__Page__Group__6__Impl_in_rule__Page__Group__66872);

-				rule__Page__Group__6__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Page__Group__7_in_rule__Page__Group__66875);

-				rule__Page__Group__7();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__6"

-

-

-	// $ANTLR start "rule__Page__Group__6__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3303:1: rule__Page__Group__6__Impl : ( ( rule__Page__DeclarationsAssignment_6 )? ) ;

-	public final void rule__Page__Group__6__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3307:1: ( ( ( rule__Page__DeclarationsAssignment_6 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3308:1: ( ( rule__Page__DeclarationsAssignment_6 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3308:1: ( ( rule__Page__DeclarationsAssignment_6 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3309:1: ( rule__Page__DeclarationsAssignment_6 )?

-				{

-					before(grammarAccess.getPageAccess().getDeclarationsAssignment_6());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3310:1: ( rule__Page__DeclarationsAssignment_6 )?

-					int alt46 = 2;

-					int LA46_0 = input.LA(1);

-

-					if ((LA46_0 == RULE_ID)) {

-						alt46 = 1;

-					}

-					switch (alt46) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3310:2: rule__Page__DeclarationsAssignment_6

-					{

-						pushFollow(FOLLOW_rule__Page__DeclarationsAssignment_6_in_rule__Page__Group__6__Impl6902);

-						rule__Page__DeclarationsAssignment_6();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getPageAccess().getDeclarationsAssignment_6());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__6__Impl"

-

-

-	// $ANTLR start "rule__Page__Group__7"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3320:1: rule__Page__Group__7 : rule__Page__Group__7__Impl rule__Page__Group__8 ;

-	public final void rule__Page__Group__7() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3324:1: ( rule__Page__Group__7__Impl rule__Page__Group__8 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3325:2: rule__Page__Group__7__Impl rule__Page__Group__8

-			{

-				pushFollow(FOLLOW_rule__Page__Group__7__Impl_in_rule__Page__Group__76933);

-				rule__Page__Group__7__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Page__Group__8_in_rule__Page__Group__76936);

-				rule__Page__Group__8();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__7"

-

-

-	// $ANTLR start "rule__Page__Group__7__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3332:1: rule__Page__Group__7__Impl : ( ( rule__Page__Group_7__0 )* ) ;

-	public final void rule__Page__Group__7__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3336:1: ( ( ( rule__Page__Group_7__0 )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3337:1: ( ( rule__Page__Group_7__0 )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3337:1: ( ( rule__Page__Group_7__0 )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3338:1: ( rule__Page__Group_7__0 )*

-				{

-					before(grammarAccess.getPageAccess().getGroup_7());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3339:1: ( rule__Page__Group_7__0 )*

-					loop47: do {

-						int alt47 = 2;

-						int LA47_0 = input.LA(1);

-

-						if ((LA47_0 == 30)) {

-							alt47 = 1;

-						}

-

-

-						switch (alt47) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3339:2: rule__Page__Group_7__0

-						{

-							pushFollow(FOLLOW_rule__Page__Group_7__0_in_rule__Page__Group__7__Impl6963);

-							rule__Page__Group_7__0();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop47;

-						}

-					} while (true);

-

-					after(grammarAccess.getPageAccess().getGroup_7());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__7__Impl"

-

-

-	// $ANTLR start "rule__Page__Group__8"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3349:1: rule__Page__Group__8 : rule__Page__Group__8__Impl rule__Page__Group__9 ;

-	public final void rule__Page__Group__8() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3353:1: ( rule__Page__Group__8__Impl rule__Page__Group__9 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3354:2: rule__Page__Group__8__Impl rule__Page__Group__9

-			{

-				pushFollow(FOLLOW_rule__Page__Group__8__Impl_in_rule__Page__Group__86994);

-				rule__Page__Group__8__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Page__Group__9_in_rule__Page__Group__86997);

-				rule__Page__Group__9();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__8"

-

-

-	// $ANTLR start "rule__Page__Group__8__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3361:1: rule__Page__Group__8__Impl : ( '}' ) ;

-	public final void rule__Page__Group__8__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3365:1: ( ( '}' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3366:1: ( '}' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3366:1: ( '}' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3367:1: '}'

-				{

-					before(grammarAccess.getPageAccess().getRightCurlyBracketKeyword_8());

-					match(input, 35, FOLLOW_35_in_rule__Page__Group__8__Impl7025);

-					after(grammarAccess.getPageAccess().getRightCurlyBracketKeyword_8());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__8__Impl"

-

-

-	// $ANTLR start "rule__Page__Group__9"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3380:1: rule__Page__Group__9 : rule__Page__Group__9__Impl ;

-	public final void rule__Page__Group__9() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3384:1: ( rule__Page__Group__9__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3385:2: rule__Page__Group__9__Impl

-			{

-				pushFollow(FOLLOW_rule__Page__Group__9__Impl_in_rule__Page__Group__97056);

-				rule__Page__Group__9__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__9"

-

-

-	// $ANTLR start "rule__Page__Group__9__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3391:1: rule__Page__Group__9__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Page__Group__9__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3395:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3396:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3396:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3397:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getPageAccess().getWSTerminalRuleCall_9());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3398:1: ( RULE_WS )*

-					loop48: do {

-						int alt48 = 2;

-						int LA48_0 = input.LA(1);

-

-						if ((LA48_0 == RULE_WS)) {

-							alt48 = 1;

-						}

-

-

-						switch (alt48) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3398:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Page__Group__9__Impl7084);

-

-						}

-							break;

-

-						default:

-							break loop48;

-						}

-					} while (true);

-

-					after(grammarAccess.getPageAccess().getWSTerminalRuleCall_9());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group__9__Impl"

-

-

-	// $ANTLR start "rule__Page__Group_7__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3428:1: rule__Page__Group_7__0 : rule__Page__Group_7__0__Impl rule__Page__Group_7__1 ;

-	public final void rule__Page__Group_7__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3432:1: ( rule__Page__Group_7__0__Impl rule__Page__Group_7__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3433:2: rule__Page__Group_7__0__Impl rule__Page__Group_7__1

-			{

-				pushFollow(FOLLOW_rule__Page__Group_7__0__Impl_in_rule__Page__Group_7__07135);

-				rule__Page__Group_7__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Page__Group_7__1_in_rule__Page__Group_7__07138);

-				rule__Page__Group_7__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group_7__0"

-

-

-	// $ANTLR start "rule__Page__Group_7__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3440:1: rule__Page__Group_7__0__Impl : ( ';' ) ;

-	public final void rule__Page__Group_7__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3444:1: ( ( ';' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3445:1: ( ';' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3445:1: ( ';' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3446:1: ';'

-				{

-					before(grammarAccess.getPageAccess().getSemicolonKeyword_7_0());

-					match(input, 30, FOLLOW_30_in_rule__Page__Group_7__0__Impl7166);

-					after(grammarAccess.getPageAccess().getSemicolonKeyword_7_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group_7__0__Impl"

-

-

-	// $ANTLR start "rule__Page__Group_7__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3459:1: rule__Page__Group_7__1 : rule__Page__Group_7__1__Impl rule__Page__Group_7__2 ;

-	public final void rule__Page__Group_7__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3463:1: ( rule__Page__Group_7__1__Impl rule__Page__Group_7__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3464:2: rule__Page__Group_7__1__Impl rule__Page__Group_7__2

-			{

-				pushFollow(FOLLOW_rule__Page__Group_7__1__Impl_in_rule__Page__Group_7__17197);

-				rule__Page__Group_7__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Page__Group_7__2_in_rule__Page__Group_7__17200);

-				rule__Page__Group_7__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group_7__1"

-

-

-	// $ANTLR start "rule__Page__Group_7__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3471:1: rule__Page__Group_7__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Page__Group_7__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3475:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3476:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3476:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3477:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getPageAccess().getWSTerminalRuleCall_7_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3478:1: ( RULE_WS )*

-					loop49: do {

-						int alt49 = 2;

-						int LA49_0 = input.LA(1);

-

-						if ((LA49_0 == RULE_WS)) {

-							alt49 = 1;

-						}

-

-

-						switch (alt49) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3478:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Page__Group_7__1__Impl7228);

-

-						}

-							break;

-

-						default:

-							break loop49;

-						}

-					} while (true);

-

-					after(grammarAccess.getPageAccess().getWSTerminalRuleCall_7_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group_7__1__Impl"

-

-

-	// $ANTLR start "rule__Page__Group_7__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3488:1: rule__Page__Group_7__2 : rule__Page__Group_7__2__Impl ;

-	public final void rule__Page__Group_7__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3492:1: ( rule__Page__Group_7__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3493:2: rule__Page__Group_7__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Page__Group_7__2__Impl_in_rule__Page__Group_7__27259);

-				rule__Page__Group_7__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group_7__2"

-

-

-	// $ANTLR start "rule__Page__Group_7__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3499:1: rule__Page__Group_7__2__Impl : ( ( rule__Page__DeclarationsAssignment_7_2 )? ) ;

-	public final void rule__Page__Group_7__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3503:1: ( ( ( rule__Page__DeclarationsAssignment_7_2 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3504:1: ( ( rule__Page__DeclarationsAssignment_7_2 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3504:1: ( ( rule__Page__DeclarationsAssignment_7_2 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3505:1: ( rule__Page__DeclarationsAssignment_7_2 )?

-				{

-					before(grammarAccess.getPageAccess().getDeclarationsAssignment_7_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3506:1: ( rule__Page__DeclarationsAssignment_7_2 )?

-					int alt50 = 2;

-					int LA50_0 = input.LA(1);

-

-					if ((LA50_0 == RULE_ID)) {

-						alt50 = 1;

-					}

-					switch (alt50) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3506:2: rule__Page__DeclarationsAssignment_7_2

-					{

-						pushFollow(FOLLOW_rule__Page__DeclarationsAssignment_7_2_in_rule__Page__Group_7__2__Impl7286);

-						rule__Page__DeclarationsAssignment_7_2();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getPageAccess().getDeclarationsAssignment_7_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__Group_7__2__Impl"

-

-

-	// $ANTLR start "rule__PseudoPage__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3522:1: rule__PseudoPage__Group__0 : rule__PseudoPage__Group__0__Impl rule__PseudoPage__Group__1 ;

-	public final void rule__PseudoPage__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3526:1: ( rule__PseudoPage__Group__0__Impl rule__PseudoPage__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3527:2: rule__PseudoPage__Group__0__Impl rule__PseudoPage__Group__1

-			{

-				pushFollow(FOLLOW_rule__PseudoPage__Group__0__Impl_in_rule__PseudoPage__Group__07323);

-				rule__PseudoPage__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__PseudoPage__Group__1_in_rule__PseudoPage__Group__07326);

-				rule__PseudoPage__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__PseudoPage__Group__0"

-

-

-	// $ANTLR start "rule__PseudoPage__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3534:1: rule__PseudoPage__Group__0__Impl : ( ':' ) ;

-	public final void rule__PseudoPage__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3538:1: ( ( ':' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3539:1: ( ':' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3539:1: ( ':' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3540:1: ':'

-				{

-					before(grammarAccess.getPseudoPageAccess().getColonKeyword_0());

-					match(input, 37, FOLLOW_37_in_rule__PseudoPage__Group__0__Impl7354);

-					after(grammarAccess.getPseudoPageAccess().getColonKeyword_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__PseudoPage__Group__0__Impl"

-

-

-	// $ANTLR start "rule__PseudoPage__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3553:1: rule__PseudoPage__Group__1 : rule__PseudoPage__Group__1__Impl rule__PseudoPage__Group__2 ;

-	public final void rule__PseudoPage__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3557:1: ( rule__PseudoPage__Group__1__Impl rule__PseudoPage__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3558:2: rule__PseudoPage__Group__1__Impl rule__PseudoPage__Group__2

-			{

-				pushFollow(FOLLOW_rule__PseudoPage__Group__1__Impl_in_rule__PseudoPage__Group__17385);

-				rule__PseudoPage__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__PseudoPage__Group__2_in_rule__PseudoPage__Group__17388);

-				rule__PseudoPage__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__PseudoPage__Group__1"

-

-

-	// $ANTLR start "rule__PseudoPage__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3565:1: rule__PseudoPage__Group__1__Impl : ( ( rule__PseudoPage__IdAssignment_1 ) ) ;

-	public final void rule__PseudoPage__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3569:1: ( ( ( rule__PseudoPage__IdAssignment_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3570:1: ( ( rule__PseudoPage__IdAssignment_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3570:1: ( ( rule__PseudoPage__IdAssignment_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3571:1: ( rule__PseudoPage__IdAssignment_1 )

-				{

-					before(grammarAccess.getPseudoPageAccess().getIdAssignment_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3572:1: ( rule__PseudoPage__IdAssignment_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3572:2: rule__PseudoPage__IdAssignment_1

-					{

-						pushFollow(FOLLOW_rule__PseudoPage__IdAssignment_1_in_rule__PseudoPage__Group__1__Impl7415);

-						rule__PseudoPage__IdAssignment_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getPseudoPageAccess().getIdAssignment_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__PseudoPage__Group__1__Impl"

-

-

-	// $ANTLR start "rule__PseudoPage__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3582:1: rule__PseudoPage__Group__2 : rule__PseudoPage__Group__2__Impl ;

-	public final void rule__PseudoPage__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3586:1: ( rule__PseudoPage__Group__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3587:2: rule__PseudoPage__Group__2__Impl

-			{

-				pushFollow(FOLLOW_rule__PseudoPage__Group__2__Impl_in_rule__PseudoPage__Group__27445);

-				rule__PseudoPage__Group__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__PseudoPage__Group__2"

-

-

-	// $ANTLR start "rule__PseudoPage__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3593:1: rule__PseudoPage__Group__2__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__PseudoPage__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3597:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3598:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3598:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3599:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getPseudoPageAccess().getWSTerminalRuleCall_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3600:1: ( RULE_WS )*

-					loop51: do {

-						int alt51 = 2;

-						int LA51_0 = input.LA(1);

-

-						if ((LA51_0 == RULE_WS)) {

-							alt51 = 1;

-						}

-

-

-						switch (alt51) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3600:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__PseudoPage__Group__2__Impl7473);

-

-						}

-							break;

-

-						default:

-							break loop51;

-						}

-					} while (true);

-

-					after(grammarAccess.getPseudoPageAccess().getWSTerminalRuleCall_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__PseudoPage__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3616:1: rule__Ruleset__Group__0 : rule__Ruleset__Group__0__Impl rule__Ruleset__Group__1 ;

-	public final void rule__Ruleset__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3620:1: ( rule__Ruleset__Group__0__Impl rule__Ruleset__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3621:2: rule__Ruleset__Group__0__Impl rule__Ruleset__Group__1

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group__0__Impl_in_rule__Ruleset__Group__07510);

-				rule__Ruleset__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Ruleset__Group__1_in_rule__Ruleset__Group__07513);

-				rule__Ruleset__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__0"

-

-

-	// $ANTLR start "rule__Ruleset__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3628:1: rule__Ruleset__Group__0__Impl : ( ( rule__Ruleset__SelectorsAssignment_0 ) ) ;

-	public final void rule__Ruleset__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3632:1: ( ( ( rule__Ruleset__SelectorsAssignment_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3633:1: ( ( rule__Ruleset__SelectorsAssignment_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3633:1: ( ( rule__Ruleset__SelectorsAssignment_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3634:1: ( rule__Ruleset__SelectorsAssignment_0 )

-				{

-					before(grammarAccess.getRulesetAccess().getSelectorsAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3635:1: ( rule__Ruleset__SelectorsAssignment_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3635:2: rule__Ruleset__SelectorsAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Ruleset__SelectorsAssignment_0_in_rule__Ruleset__Group__0__Impl7540);

-						rule__Ruleset__SelectorsAssignment_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getRulesetAccess().getSelectorsAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3645:1: rule__Ruleset__Group__1 : rule__Ruleset__Group__1__Impl rule__Ruleset__Group__2 ;

-	public final void rule__Ruleset__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3649:1: ( rule__Ruleset__Group__1__Impl rule__Ruleset__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3650:2: rule__Ruleset__Group__1__Impl rule__Ruleset__Group__2

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group__1__Impl_in_rule__Ruleset__Group__17570);

-				rule__Ruleset__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Ruleset__Group__2_in_rule__Ruleset__Group__17573);

-				rule__Ruleset__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__1"

-

-

-	// $ANTLR start "rule__Ruleset__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3657:1: rule__Ruleset__Group__1__Impl : ( ( rule__Ruleset__Group_1__0 )* ) ;

-	public final void rule__Ruleset__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3661:1: ( ( ( rule__Ruleset__Group_1__0 )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3662:1: ( ( rule__Ruleset__Group_1__0 )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3662:1: ( ( rule__Ruleset__Group_1__0 )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3663:1: ( rule__Ruleset__Group_1__0 )*

-				{

-					before(grammarAccess.getRulesetAccess().getGroup_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3664:1: ( rule__Ruleset__Group_1__0 )*

-					loop52: do {

-						int alt52 = 2;

-						int LA52_0 = input.LA(1);

-

-						if ((LA52_0 == 32)) {

-							alt52 = 1;

-						}

-

-

-						switch (alt52) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3664:2: rule__Ruleset__Group_1__0

-						{

-							pushFollow(FOLLOW_rule__Ruleset__Group_1__0_in_rule__Ruleset__Group__1__Impl7600);

-							rule__Ruleset__Group_1__0();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop52;

-						}

-					} while (true);

-

-					after(grammarAccess.getRulesetAccess().getGroup_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3674:1: rule__Ruleset__Group__2 : rule__Ruleset__Group__2__Impl rule__Ruleset__Group__3 ;

-	public final void rule__Ruleset__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3678:1: ( rule__Ruleset__Group__2__Impl rule__Ruleset__Group__3 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3679:2: rule__Ruleset__Group__2__Impl rule__Ruleset__Group__3

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group__2__Impl_in_rule__Ruleset__Group__27631);

-				rule__Ruleset__Group__2__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Ruleset__Group__3_in_rule__Ruleset__Group__27634);

-				rule__Ruleset__Group__3();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__2"

-

-

-	// $ANTLR start "rule__Ruleset__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3686:1: rule__Ruleset__Group__2__Impl : ( '{' ) ;

-	public final void rule__Ruleset__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3690:1: ( ( '{' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3691:1: ( '{' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3691:1: ( '{' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3692:1: '{'

-				{

-					before(grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_2());

-					match(input, 34, FOLLOW_34_in_rule__Ruleset__Group__2__Impl7662);

-					after(grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group__3"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3705:1: rule__Ruleset__Group__3 : rule__Ruleset__Group__3__Impl rule__Ruleset__Group__4 ;

-	public final void rule__Ruleset__Group__3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3709:1: ( rule__Ruleset__Group__3__Impl rule__Ruleset__Group__4 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3710:2: rule__Ruleset__Group__3__Impl rule__Ruleset__Group__4

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group__3__Impl_in_rule__Ruleset__Group__37693);

-				rule__Ruleset__Group__3__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Ruleset__Group__4_in_rule__Ruleset__Group__37696);

-				rule__Ruleset__Group__4();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__3"

-

-

-	// $ANTLR start "rule__Ruleset__Group__3__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3717:1: rule__Ruleset__Group__3__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Ruleset__Group__3__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3721:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3722:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3722:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3723:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_3());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3724:1: ( RULE_WS )*

-					loop53: do {

-						int alt53 = 2;

-						int LA53_0 = input.LA(1);

-

-						if ((LA53_0 == RULE_WS)) {

-							alt53 = 1;

-						}

-

-

-						switch (alt53) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3724:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Ruleset__Group__3__Impl7724);

-

-						}

-							break;

-

-						default:

-							break loop53;

-						}

-					} while (true);

-

-					after(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_3());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__3__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group__4"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3734:1: rule__Ruleset__Group__4 : rule__Ruleset__Group__4__Impl rule__Ruleset__Group__5 ;

-	public final void rule__Ruleset__Group__4() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3738:1: ( rule__Ruleset__Group__4__Impl rule__Ruleset__Group__5 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3739:2: rule__Ruleset__Group__4__Impl rule__Ruleset__Group__5

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group__4__Impl_in_rule__Ruleset__Group__47755);

-				rule__Ruleset__Group__4__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Ruleset__Group__5_in_rule__Ruleset__Group__47758);

-				rule__Ruleset__Group__5();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__4"

-

-

-	// $ANTLR start "rule__Ruleset__Group__4__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3746:1: rule__Ruleset__Group__4__Impl : ( ( rule__Ruleset__PropertiesAssignment_4 )? ) ;

-	public final void rule__Ruleset__Group__4__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3750:1: ( ( ( rule__Ruleset__PropertiesAssignment_4 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3751:1: ( ( rule__Ruleset__PropertiesAssignment_4 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3751:1: ( ( rule__Ruleset__PropertiesAssignment_4 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3752:1: ( rule__Ruleset__PropertiesAssignment_4 )?

-				{

-					before(grammarAccess.getRulesetAccess().getPropertiesAssignment_4());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3753:1: ( rule__Ruleset__PropertiesAssignment_4 )?

-					int alt54 = 2;

-					int LA54_0 = input.LA(1);

-

-					if ((LA54_0 == RULE_ID)) {

-						alt54 = 1;

-					}

-					switch (alt54) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3753:2: rule__Ruleset__PropertiesAssignment_4

-					{

-						pushFollow(FOLLOW_rule__Ruleset__PropertiesAssignment_4_in_rule__Ruleset__Group__4__Impl7785);

-						rule__Ruleset__PropertiesAssignment_4();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getRulesetAccess().getPropertiesAssignment_4());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__4__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group__5"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3763:1: rule__Ruleset__Group__5 : rule__Ruleset__Group__5__Impl rule__Ruleset__Group__6 ;

-	public final void rule__Ruleset__Group__5() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3767:1: ( rule__Ruleset__Group__5__Impl rule__Ruleset__Group__6 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3768:2: rule__Ruleset__Group__5__Impl rule__Ruleset__Group__6

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group__5__Impl_in_rule__Ruleset__Group__57816);

-				rule__Ruleset__Group__5__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Ruleset__Group__6_in_rule__Ruleset__Group__57819);

-				rule__Ruleset__Group__6();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__5"

-

-

-	// $ANTLR start "rule__Ruleset__Group__5__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3775:1: rule__Ruleset__Group__5__Impl : ( ( rule__Ruleset__Group_5__0 )* ) ;

-	public final void rule__Ruleset__Group__5__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3779:1: ( ( ( rule__Ruleset__Group_5__0 )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3780:1: ( ( rule__Ruleset__Group_5__0 )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3780:1: ( ( rule__Ruleset__Group_5__0 )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3781:1: ( rule__Ruleset__Group_5__0 )*

-				{

-					before(grammarAccess.getRulesetAccess().getGroup_5());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3782:1: ( rule__Ruleset__Group_5__0 )*

-					loop55: do {

-						int alt55 = 2;

-						int LA55_0 = input.LA(1);

-

-						if ((LA55_0 == 30)) {

-							alt55 = 1;

-						}

-

-

-						switch (alt55) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3782:2: rule__Ruleset__Group_5__0

-						{

-							pushFollow(FOLLOW_rule__Ruleset__Group_5__0_in_rule__Ruleset__Group__5__Impl7846);

-							rule__Ruleset__Group_5__0();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop55;

-						}

-					} while (true);

-

-					after(grammarAccess.getRulesetAccess().getGroup_5());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__5__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group__6"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3792:1: rule__Ruleset__Group__6 : rule__Ruleset__Group__6__Impl rule__Ruleset__Group__7 ;

-	public final void rule__Ruleset__Group__6() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3796:1: ( rule__Ruleset__Group__6__Impl rule__Ruleset__Group__7 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3797:2: rule__Ruleset__Group__6__Impl rule__Ruleset__Group__7

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group__6__Impl_in_rule__Ruleset__Group__67877);

-				rule__Ruleset__Group__6__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Ruleset__Group__7_in_rule__Ruleset__Group__67880);

-				rule__Ruleset__Group__7();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__6"

-

-

-	// $ANTLR start "rule__Ruleset__Group__6__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3804:1: rule__Ruleset__Group__6__Impl : ( '}' ) ;

-	public final void rule__Ruleset__Group__6__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3808:1: ( ( '}' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3809:1: ( '}' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3809:1: ( '}' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3810:1: '}'

-				{

-					before(grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_6());

-					match(input, 35, FOLLOW_35_in_rule__Ruleset__Group__6__Impl7908);

-					after(grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_6());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__6__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group__7"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3823:1: rule__Ruleset__Group__7 : rule__Ruleset__Group__7__Impl ;

-	public final void rule__Ruleset__Group__7() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3827:1: ( rule__Ruleset__Group__7__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3828:2: rule__Ruleset__Group__7__Impl

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group__7__Impl_in_rule__Ruleset__Group__77939);

-				rule__Ruleset__Group__7__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__7"

-

-

-	// $ANTLR start "rule__Ruleset__Group__7__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3834:1: rule__Ruleset__Group__7__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Ruleset__Group__7__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3838:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3839:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3839:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3840:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_7());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3841:1: ( RULE_WS )*

-					loop56: do {

-						int alt56 = 2;

-						int LA56_0 = input.LA(1);

-

-						if ((LA56_0 == RULE_WS)) {

-							alt56 = 1;

-						}

-

-

-						switch (alt56) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3841:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Ruleset__Group__7__Impl7967);

-

-						}

-							break;

-

-						default:

-							break loop56;

-						}

-					} while (true);

-

-					after(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_7());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group__7__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group_1__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3867:1: rule__Ruleset__Group_1__0 : rule__Ruleset__Group_1__0__Impl rule__Ruleset__Group_1__1 ;

-	public final void rule__Ruleset__Group_1__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3871:1: ( rule__Ruleset__Group_1__0__Impl rule__Ruleset__Group_1__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3872:2: rule__Ruleset__Group_1__0__Impl rule__Ruleset__Group_1__1

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group_1__0__Impl_in_rule__Ruleset__Group_1__08014);

-				rule__Ruleset__Group_1__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Ruleset__Group_1__1_in_rule__Ruleset__Group_1__08017);

-				rule__Ruleset__Group_1__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group_1__0"

-

-

-	// $ANTLR start "rule__Ruleset__Group_1__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3879:1: rule__Ruleset__Group_1__0__Impl : ( ',' ) ;

-	public final void rule__Ruleset__Group_1__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3883:1: ( ( ',' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3884:1: ( ',' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3884:1: ( ',' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3885:1: ','

-				{

-					before(grammarAccess.getRulesetAccess().getCommaKeyword_1_0());

-					match(input, 32, FOLLOW_32_in_rule__Ruleset__Group_1__0__Impl8045);

-					after(grammarAccess.getRulesetAccess().getCommaKeyword_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group_1__0__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group_1__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3898:1: rule__Ruleset__Group_1__1 : rule__Ruleset__Group_1__1__Impl rule__Ruleset__Group_1__2 ;

-	public final void rule__Ruleset__Group_1__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3902:1: ( rule__Ruleset__Group_1__1__Impl rule__Ruleset__Group_1__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3903:2: rule__Ruleset__Group_1__1__Impl rule__Ruleset__Group_1__2

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group_1__1__Impl_in_rule__Ruleset__Group_1__18076);

-				rule__Ruleset__Group_1__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Ruleset__Group_1__2_in_rule__Ruleset__Group_1__18079);

-				rule__Ruleset__Group_1__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group_1__1"

-

-

-	// $ANTLR start "rule__Ruleset__Group_1__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3910:1: rule__Ruleset__Group_1__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Ruleset__Group_1__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3914:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3915:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3915:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3916:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3917:1: ( RULE_WS )*

-					loop57: do {

-						int alt57 = 2;

-						int LA57_0 = input.LA(1);

-

-						if ((LA57_0 == RULE_WS)) {

-							alt57 = 1;

-						}

-

-

-						switch (alt57) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3917:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Ruleset__Group_1__1__Impl8107);

-

-						}

-							break;

-

-						default:

-							break loop57;

-						}

-					} while (true);

-

-					after(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group_1__1__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group_1__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3927:1: rule__Ruleset__Group_1__2 : rule__Ruleset__Group_1__2__Impl ;

-	public final void rule__Ruleset__Group_1__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3931:1: ( rule__Ruleset__Group_1__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3932:2: rule__Ruleset__Group_1__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group_1__2__Impl_in_rule__Ruleset__Group_1__28138);

-				rule__Ruleset__Group_1__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group_1__2"

-

-

-	// $ANTLR start "rule__Ruleset__Group_1__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3938:1: rule__Ruleset__Group_1__2__Impl : ( ( rule__Ruleset__SelectorsAssignment_1_2 ) ) ;

-	public final void rule__Ruleset__Group_1__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3942:1: ( ( ( rule__Ruleset__SelectorsAssignment_1_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3943:1: ( ( rule__Ruleset__SelectorsAssignment_1_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3943:1: ( ( rule__Ruleset__SelectorsAssignment_1_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3944:1: ( rule__Ruleset__SelectorsAssignment_1_2 )

-				{

-					before(grammarAccess.getRulesetAccess().getSelectorsAssignment_1_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3945:1: ( rule__Ruleset__SelectorsAssignment_1_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3945:2: rule__Ruleset__SelectorsAssignment_1_2

-					{

-						pushFollow(FOLLOW_rule__Ruleset__SelectorsAssignment_1_2_in_rule__Ruleset__Group_1__2__Impl8165);

-						rule__Ruleset__SelectorsAssignment_1_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getRulesetAccess().getSelectorsAssignment_1_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group_1__2__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group_5__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3961:1: rule__Ruleset__Group_5__0 : rule__Ruleset__Group_5__0__Impl rule__Ruleset__Group_5__1 ;

-	public final void rule__Ruleset__Group_5__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3965:1: ( rule__Ruleset__Group_5__0__Impl rule__Ruleset__Group_5__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3966:2: rule__Ruleset__Group_5__0__Impl rule__Ruleset__Group_5__1

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group_5__0__Impl_in_rule__Ruleset__Group_5__08201);

-				rule__Ruleset__Group_5__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Ruleset__Group_5__1_in_rule__Ruleset__Group_5__08204);

-				rule__Ruleset__Group_5__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group_5__0"

-

-

-	// $ANTLR start "rule__Ruleset__Group_5__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3973:1: rule__Ruleset__Group_5__0__Impl : ( ';' ) ;

-	public final void rule__Ruleset__Group_5__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3977:1: ( ( ';' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3978:1: ( ';' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3978:1: ( ';' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3979:1: ';'

-				{

-					before(grammarAccess.getRulesetAccess().getSemicolonKeyword_5_0());

-					match(input, 30, FOLLOW_30_in_rule__Ruleset__Group_5__0__Impl8232);

-					after(grammarAccess.getRulesetAccess().getSemicolonKeyword_5_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group_5__0__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group_5__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3992:1: rule__Ruleset__Group_5__1 : rule__Ruleset__Group_5__1__Impl rule__Ruleset__Group_5__2 ;

-	public final void rule__Ruleset__Group_5__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3996:1: ( rule__Ruleset__Group_5__1__Impl rule__Ruleset__Group_5__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:3997:2: rule__Ruleset__Group_5__1__Impl rule__Ruleset__Group_5__2

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group_5__1__Impl_in_rule__Ruleset__Group_5__18263);

-				rule__Ruleset__Group_5__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Ruleset__Group_5__2_in_rule__Ruleset__Group_5__18266);

-				rule__Ruleset__Group_5__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group_5__1"

-

-

-	// $ANTLR start "rule__Ruleset__Group_5__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4004:1: rule__Ruleset__Group_5__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Ruleset__Group_5__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4008:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4009:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4009:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4010:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_5_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4011:1: ( RULE_WS )*

-					loop58: do {

-						int alt58 = 2;

-						int LA58_0 = input.LA(1);

-

-						if ((LA58_0 == RULE_WS)) {

-							alt58 = 1;

-						}

-

-

-						switch (alt58) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4011:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Ruleset__Group_5__1__Impl8294);

-

-						}

-							break;

-

-						default:

-							break loop58;

-						}

-					} while (true);

-

-					after(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_5_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group_5__1__Impl"

-

-

-	// $ANTLR start "rule__Ruleset__Group_5__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4021:1: rule__Ruleset__Group_5__2 : rule__Ruleset__Group_5__2__Impl ;

-	public final void rule__Ruleset__Group_5__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4025:1: ( rule__Ruleset__Group_5__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4026:2: rule__Ruleset__Group_5__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Ruleset__Group_5__2__Impl_in_rule__Ruleset__Group_5__28325);

-				rule__Ruleset__Group_5__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group_5__2"

-

-

-	// $ANTLR start "rule__Ruleset__Group_5__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4032:1: rule__Ruleset__Group_5__2__Impl : ( ( rule__Ruleset__PropertiesAssignment_5_2 )? ) ;

-	public final void rule__Ruleset__Group_5__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4036:1: ( ( ( rule__Ruleset__PropertiesAssignment_5_2 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4037:1: ( ( rule__Ruleset__PropertiesAssignment_5_2 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4037:1: ( ( rule__Ruleset__PropertiesAssignment_5_2 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4038:1: ( rule__Ruleset__PropertiesAssignment_5_2 )?

-				{

-					before(grammarAccess.getRulesetAccess().getPropertiesAssignment_5_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4039:1: ( rule__Ruleset__PropertiesAssignment_5_2 )?

-					int alt59 = 2;

-					int LA59_0 = input.LA(1);

-

-					if ((LA59_0 == RULE_ID)) {

-						alt59 = 1;

-					}

-					switch (alt59) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4039:2: rule__Ruleset__PropertiesAssignment_5_2

-					{

-						pushFollow(FOLLOW_rule__Ruleset__PropertiesAssignment_5_2_in_rule__Ruleset__Group_5__2__Impl8352);

-						rule__Ruleset__PropertiesAssignment_5_2();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getRulesetAccess().getPropertiesAssignment_5_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__Group_5__2__Impl"

-

-

-	// $ANTLR start "rule__Selector__Group_0__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4055:1: rule__Selector__Group_0__0 : rule__Selector__Group_0__0__Impl rule__Selector__Group_0__1 ;

-	public final void rule__Selector__Group_0__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4059:1: ( rule__Selector__Group_0__0__Impl rule__Selector__Group_0__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4060:2: rule__Selector__Group_0__0__Impl rule__Selector__Group_0__1

-			{

-				pushFollow(FOLLOW_rule__Selector__Group_0__0__Impl_in_rule__Selector__Group_0__08389);

-				rule__Selector__Group_0__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Selector__Group_0__1_in_rule__Selector__Group_0__08392);

-				rule__Selector__Group_0__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Selector__Group_0__0"

-

-

-	// $ANTLR start "rule__Selector__Group_0__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4067:1: rule__Selector__Group_0__0__Impl : ( ruleSimpleSelector ) ;

-	public final void rule__Selector__Group_0__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4071:1: ( ( ruleSimpleSelector ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4072:1: ( ruleSimpleSelector )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4072:1: ( ruleSimpleSelector )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4073:1: ruleSimpleSelector

-				{

-					before(grammarAccess.getSelectorAccess().getSimpleSelectorParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleSimpleSelector_in_rule__Selector__Group_0__0__Impl8419);

-					ruleSimpleSelector();

-

-					state._fsp--;

-

-					after(grammarAccess.getSelectorAccess().getSimpleSelectorParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Selector__Group_0__0__Impl"

-

-

-	// $ANTLR start "rule__Selector__Group_0__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4084:1: rule__Selector__Group_0__1 : rule__Selector__Group_0__1__Impl ;

-	public final void rule__Selector__Group_0__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4088:1: ( rule__Selector__Group_0__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4089:2: rule__Selector__Group_0__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Selector__Group_0__1__Impl_in_rule__Selector__Group_0__18448);

-				rule__Selector__Group_0__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Selector__Group_0__1"

-

-

-	// $ANTLR start "rule__Selector__Group_0__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4095:1: rule__Selector__Group_0__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Selector__Group_0__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4099:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4100:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4100:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4101:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_0_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4102:1: ( RULE_WS )*

-					loop60: do {

-						int alt60 = 2;

-						int LA60_0 = input.LA(1);

-

-						if ((LA60_0 == RULE_WS)) {

-							alt60 = 1;

-						}

-

-

-						switch (alt60) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4102:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Selector__Group_0__1__Impl8476);

-

-						}

-							break;

-

-						default:

-							break loop60;

-						}

-					} while (true);

-

-					after(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_0_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Selector__Group_0__1__Impl"

-

-

-	// $ANTLR start "rule__CompositeSelector__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4116:1: rule__CompositeSelector__Group__0 : rule__CompositeSelector__Group__0__Impl

-	// rule__CompositeSelector__Group__1 ;

-	public final void rule__CompositeSelector__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4120:1: ( rule__CompositeSelector__Group__0__Impl rule__CompositeSelector__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4121:2: rule__CompositeSelector__Group__0__Impl rule__CompositeSelector__Group__1

-			{

-				pushFollow(FOLLOW_rule__CompositeSelector__Group__0__Impl_in_rule__CompositeSelector__Group__08511);

-				rule__CompositeSelector__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__CompositeSelector__Group__1_in_rule__CompositeSelector__Group__08514);

-				rule__CompositeSelector__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__Group__0"

-

-

-	// $ANTLR start "rule__CompositeSelector__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4128:1: rule__CompositeSelector__Group__0__Impl : ( ( rule__CompositeSelector__LeftAssignment_0 ) ) ;

-	public final void rule__CompositeSelector__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4132:1: ( ( ( rule__CompositeSelector__LeftAssignment_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4133:1: ( ( rule__CompositeSelector__LeftAssignment_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4133:1: ( ( rule__CompositeSelector__LeftAssignment_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4134:1: ( rule__CompositeSelector__LeftAssignment_0 )

-				{

-					before(grammarAccess.getCompositeSelectorAccess().getLeftAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4135:1: ( rule__CompositeSelector__LeftAssignment_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4135:2: rule__CompositeSelector__LeftAssignment_0

-					{

-						pushFollow(FOLLOW_rule__CompositeSelector__LeftAssignment_0_in_rule__CompositeSelector__Group__0__Impl8541);

-						rule__CompositeSelector__LeftAssignment_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getCompositeSelectorAccess().getLeftAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__Group__0__Impl"

-

-

-	// $ANTLR start "rule__CompositeSelector__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4145:1: rule__CompositeSelector__Group__1 : rule__CompositeSelector__Group__1__Impl

-	// rule__CompositeSelector__Group__2 ;

-	public final void rule__CompositeSelector__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4149:1: ( rule__CompositeSelector__Group__1__Impl rule__CompositeSelector__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4150:2: rule__CompositeSelector__Group__1__Impl rule__CompositeSelector__Group__2

-			{

-				pushFollow(FOLLOW_rule__CompositeSelector__Group__1__Impl_in_rule__CompositeSelector__Group__18571);

-				rule__CompositeSelector__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__CompositeSelector__Group__2_in_rule__CompositeSelector__Group__18574);

-				rule__CompositeSelector__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__Group__1"

-

-

-	// $ANTLR start "rule__CompositeSelector__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4157:1: rule__CompositeSelector__Group__1__Impl : ( ( rule__CompositeSelector__Alternatives_1 ) ) ;

-	public final void rule__CompositeSelector__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4161:1: ( ( ( rule__CompositeSelector__Alternatives_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4162:1: ( ( rule__CompositeSelector__Alternatives_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4162:1: ( ( rule__CompositeSelector__Alternatives_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4163:1: ( rule__CompositeSelector__Alternatives_1 )

-				{

-					before(grammarAccess.getCompositeSelectorAccess().getAlternatives_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4164:1: ( rule__CompositeSelector__Alternatives_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4164:2: rule__CompositeSelector__Alternatives_1

-					{

-						pushFollow(FOLLOW_rule__CompositeSelector__Alternatives_1_in_rule__CompositeSelector__Group__1__Impl8601);

-						rule__CompositeSelector__Alternatives_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getCompositeSelectorAccess().getAlternatives_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__Group__1__Impl"

-

-

-	// $ANTLR start "rule__CompositeSelector__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4174:1: rule__CompositeSelector__Group__2 : rule__CompositeSelector__Group__2__Impl ;

-	public final void rule__CompositeSelector__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4178:1: ( rule__CompositeSelector__Group__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4179:2: rule__CompositeSelector__Group__2__Impl

-			{

-				pushFollow(FOLLOW_rule__CompositeSelector__Group__2__Impl_in_rule__CompositeSelector__Group__28631);

-				rule__CompositeSelector__Group__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__Group__2"

-

-

-	// $ANTLR start "rule__CompositeSelector__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4185:1: rule__CompositeSelector__Group__2__Impl : ( ( rule__CompositeSelector__RightAssignment_2 ) ) ;

-	public final void rule__CompositeSelector__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4189:1: ( ( ( rule__CompositeSelector__RightAssignment_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4190:1: ( ( rule__CompositeSelector__RightAssignment_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4190:1: ( ( rule__CompositeSelector__RightAssignment_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4191:1: ( rule__CompositeSelector__RightAssignment_2 )

-				{

-					before(grammarAccess.getCompositeSelectorAccess().getRightAssignment_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4192:1: ( rule__CompositeSelector__RightAssignment_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4192:2: rule__CompositeSelector__RightAssignment_2

-					{

-						pushFollow(FOLLOW_rule__CompositeSelector__RightAssignment_2_in_rule__CompositeSelector__Group__2__Impl8658);

-						rule__CompositeSelector__RightAssignment_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getCompositeSelectorAccess().getRightAssignment_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__Group__2__Impl"

-

-

-	// $ANTLR start "rule__CompositeSelector__Group_1_1__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4208:1: rule__CompositeSelector__Group_1_1__0 : rule__CompositeSelector__Group_1_1__0__Impl

-	// rule__CompositeSelector__Group_1_1__1 ;

-	public final void rule__CompositeSelector__Group_1_1__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4212:1: ( rule__CompositeSelector__Group_1_1__0__Impl rule__CompositeSelector__Group_1_1__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4213:2: rule__CompositeSelector__Group_1_1__0__Impl rule__CompositeSelector__Group_1_1__1

-			{

-				pushFollow(FOLLOW_rule__CompositeSelector__Group_1_1__0__Impl_in_rule__CompositeSelector__Group_1_1__08694);

-				rule__CompositeSelector__Group_1_1__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__CompositeSelector__Group_1_1__1_in_rule__CompositeSelector__Group_1_1__08697);

-				rule__CompositeSelector__Group_1_1__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__Group_1_1__0"

-

-

-	// $ANTLR start "rule__CompositeSelector__Group_1_1__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4220:1: rule__CompositeSelector__Group_1_1__0__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__CompositeSelector__Group_1_1__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4224:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4225:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4225:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4226:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_1_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4227:1: ( RULE_WS )*

-					loop61: do {

-						int alt61 = 2;

-						int LA61_0 = input.LA(1);

-

-						if ((LA61_0 == RULE_WS)) {

-							alt61 = 1;

-						}

-

-

-						switch (alt61) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4227:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__CompositeSelector__Group_1_1__0__Impl8725);

-

-						}

-							break;

-

-						default:

-							break loop61;

-						}

-					} while (true);

-

-					after(grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__Group_1_1__0__Impl"

-

-

-	// $ANTLR start "rule__CompositeSelector__Group_1_1__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4237:1: rule__CompositeSelector__Group_1_1__1 : rule__CompositeSelector__Group_1_1__1__Impl ;

-	public final void rule__CompositeSelector__Group_1_1__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4241:1: ( rule__CompositeSelector__Group_1_1__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4242:2: rule__CompositeSelector__Group_1_1__1__Impl

-			{

-				pushFollow(FOLLOW_rule__CompositeSelector__Group_1_1__1__Impl_in_rule__CompositeSelector__Group_1_1__18756);

-				rule__CompositeSelector__Group_1_1__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__Group_1_1__1"

-

-

-	// $ANTLR start "rule__CompositeSelector__Group_1_1__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4248:1: rule__CompositeSelector__Group_1_1__1__Impl : ( ( rule__CompositeSelector__CombinatorAssignment_1_1_1 ) ) ;

-	public final void rule__CompositeSelector__Group_1_1__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4252:1: ( ( ( rule__CompositeSelector__CombinatorAssignment_1_1_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4253:1: ( ( rule__CompositeSelector__CombinatorAssignment_1_1_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4253:1: ( ( rule__CompositeSelector__CombinatorAssignment_1_1_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4254:1: ( rule__CompositeSelector__CombinatorAssignment_1_1_1 )

-				{

-					before(grammarAccess.getCompositeSelectorAccess().getCombinatorAssignment_1_1_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4255:1: ( rule__CompositeSelector__CombinatorAssignment_1_1_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4255:2: rule__CompositeSelector__CombinatorAssignment_1_1_1

-					{

-						pushFollow(FOLLOW_rule__CompositeSelector__CombinatorAssignment_1_1_1_in_rule__CompositeSelector__Group_1_1__1__Impl8783);

-						rule__CompositeSelector__CombinatorAssignment_1_1_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getCompositeSelectorAccess().getCombinatorAssignment_1_1_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__Group_1_1__1__Impl"

-

-

-	// $ANTLR start "rule__SimpleSelector__Group_0__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4269:1: rule__SimpleSelector__Group_0__0 : rule__SimpleSelector__Group_0__0__Impl rule__SimpleSelector__Group_0__1

-	// ;

-	public final void rule__SimpleSelector__Group_0__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4273:1: ( rule__SimpleSelector__Group_0__0__Impl rule__SimpleSelector__Group_0__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4274:2: rule__SimpleSelector__Group_0__0__Impl rule__SimpleSelector__Group_0__1

-			{

-				pushFollow(FOLLOW_rule__SimpleSelector__Group_0__0__Impl_in_rule__SimpleSelector__Group_0__08817);

-				rule__SimpleSelector__Group_0__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__SimpleSelector__Group_0__1_in_rule__SimpleSelector__Group_0__08820);

-				rule__SimpleSelector__Group_0__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SimpleSelector__Group_0__0"

-

-

-	// $ANTLR start "rule__SimpleSelector__Group_0__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4281:1: rule__SimpleSelector__Group_0__0__Impl : ( ( rule__SimpleSelector__ElementNameAssignment_0_0 ) ) ;

-	public final void rule__SimpleSelector__Group_0__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4285:1: ( ( ( rule__SimpleSelector__ElementNameAssignment_0_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4286:1: ( ( rule__SimpleSelector__ElementNameAssignment_0_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4286:1: ( ( rule__SimpleSelector__ElementNameAssignment_0_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4287:1: ( rule__SimpleSelector__ElementNameAssignment_0_0 )

-				{

-					before(grammarAccess.getSimpleSelectorAccess().getElementNameAssignment_0_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4288:1: ( rule__SimpleSelector__ElementNameAssignment_0_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4288:2: rule__SimpleSelector__ElementNameAssignment_0_0

-					{

-						pushFollow(FOLLOW_rule__SimpleSelector__ElementNameAssignment_0_0_in_rule__SimpleSelector__Group_0__0__Impl8847);

-						rule__SimpleSelector__ElementNameAssignment_0_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getSimpleSelectorAccess().getElementNameAssignment_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SimpleSelector__Group_0__0__Impl"

-

-

-	// $ANTLR start "rule__SimpleSelector__Group_0__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4298:1: rule__SimpleSelector__Group_0__1 : rule__SimpleSelector__Group_0__1__Impl ;

-	public final void rule__SimpleSelector__Group_0__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4302:1: ( rule__SimpleSelector__Group_0__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4303:2: rule__SimpleSelector__Group_0__1__Impl

-			{

-				pushFollow(FOLLOW_rule__SimpleSelector__Group_0__1__Impl_in_rule__SimpleSelector__Group_0__18877);

-				rule__SimpleSelector__Group_0__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SimpleSelector__Group_0__1"

-

-

-	// $ANTLR start "rule__SimpleSelector__Group_0__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4309:1: rule__SimpleSelector__Group_0__1__Impl : ( ( rule__SimpleSelector__ConditionAssignment_0_1 )* ) ;

-	public final void rule__SimpleSelector__Group_0__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4313:1: ( ( ( rule__SimpleSelector__ConditionAssignment_0_1 )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4314:1: ( ( rule__SimpleSelector__ConditionAssignment_0_1 )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4314:1: ( ( rule__SimpleSelector__ConditionAssignment_0_1 )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4315:1: ( rule__SimpleSelector__ConditionAssignment_0_1 )*

-				{

-					before(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_0_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4316:1: ( rule__SimpleSelector__ConditionAssignment_0_1 )*

-					loop62: do {

-						int alt62 = 2;

-						int LA62_0 = input.LA(1);

-

-						if (((LA62_0 >= RULE_HASH && LA62_0 <= RULE_T_CLASS) || LA62_0 == 37 || LA62_0 == 42)) {

-							alt62 = 1;

-						}

-

-

-						switch (alt62) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4316:2: rule__SimpleSelector__ConditionAssignment_0_1

-						{

-							pushFollow(FOLLOW_rule__SimpleSelector__ConditionAssignment_0_1_in_rule__SimpleSelector__Group_0__1__Impl8904);

-							rule__SimpleSelector__ConditionAssignment_0_1();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop62;

-						}

-					} while (true);

-

-					after(grammarAccess.getSimpleSelectorAccess().getConditionAssignment_0_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SimpleSelector__Group_0__1__Impl"

-

-

-	// $ANTLR start "rule__Combinator__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4330:1: rule__Combinator__Group__0 : rule__Combinator__Group__0__Impl rule__Combinator__Group__1 ;

-	public final void rule__Combinator__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4334:1: ( rule__Combinator__Group__0__Impl rule__Combinator__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4335:2: rule__Combinator__Group__0__Impl rule__Combinator__Group__1

-			{

-				pushFollow(FOLLOW_rule__Combinator__Group__0__Impl_in_rule__Combinator__Group__08939);

-				rule__Combinator__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Combinator__Group__1_in_rule__Combinator__Group__08942);

-				rule__Combinator__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Combinator__Group__0"

-

-

-	// $ANTLR start "rule__Combinator__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4342:1: rule__Combinator__Group__0__Impl : ( ( rule__Combinator__KindAssignment_0 ) ) ;

-	public final void rule__Combinator__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4346:1: ( ( ( rule__Combinator__KindAssignment_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4347:1: ( ( rule__Combinator__KindAssignment_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4347:1: ( ( rule__Combinator__KindAssignment_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4348:1: ( rule__Combinator__KindAssignment_0 )

-				{

-					before(grammarAccess.getCombinatorAccess().getKindAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4349:1: ( rule__Combinator__KindAssignment_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4349:2: rule__Combinator__KindAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Combinator__KindAssignment_0_in_rule__Combinator__Group__0__Impl8969);

-						rule__Combinator__KindAssignment_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getCombinatorAccess().getKindAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Combinator__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Combinator__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4359:1: rule__Combinator__Group__1 : rule__Combinator__Group__1__Impl ;

-	public final void rule__Combinator__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4363:1: ( rule__Combinator__Group__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4364:2: rule__Combinator__Group__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Combinator__Group__1__Impl_in_rule__Combinator__Group__18999);

-				rule__Combinator__Group__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Combinator__Group__1"

-

-

-	// $ANTLR start "rule__Combinator__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4370:1: rule__Combinator__Group__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Combinator__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4374:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4375:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4375:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4376:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getCombinatorAccess().getWSTerminalRuleCall_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4377:1: ( RULE_WS )*

-					loop63: do {

-						int alt63 = 2;

-						int LA63_0 = input.LA(1);

-

-						if ((LA63_0 == RULE_WS)) {

-							alt63 = 1;

-						}

-

-

-						switch (alt63) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4377:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Combinator__Group__1__Impl9027);

-

-						}

-							break;

-

-						default:

-							break loop63;

-						}

-					} while (true);

-

-					after(grammarAccess.getCombinatorAccess().getWSTerminalRuleCall_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Combinator__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Declaration__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4391:1: rule__Declaration__Group__0 : rule__Declaration__Group__0__Impl rule__Declaration__Group__1 ;

-	public final void rule__Declaration__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4395:1: ( rule__Declaration__Group__0__Impl rule__Declaration__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4396:2: rule__Declaration__Group__0__Impl rule__Declaration__Group__1

-			{

-				pushFollow(FOLLOW_rule__Declaration__Group__0__Impl_in_rule__Declaration__Group__09062);

-				rule__Declaration__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Declaration__Group__1_in_rule__Declaration__Group__09065);

-				rule__Declaration__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group__0"

-

-

-	// $ANTLR start "rule__Declaration__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4403:1: rule__Declaration__Group__0__Impl : ( ( rule__Declaration__PropertyAssignment_0 ) ) ;

-	public final void rule__Declaration__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4407:1: ( ( ( rule__Declaration__PropertyAssignment_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4408:1: ( ( rule__Declaration__PropertyAssignment_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4408:1: ( ( rule__Declaration__PropertyAssignment_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4409:1: ( rule__Declaration__PropertyAssignment_0 )

-				{

-					before(grammarAccess.getDeclarationAccess().getPropertyAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4410:1: ( rule__Declaration__PropertyAssignment_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4410:2: rule__Declaration__PropertyAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Declaration__PropertyAssignment_0_in_rule__Declaration__Group__0__Impl9092);

-						rule__Declaration__PropertyAssignment_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getDeclarationAccess().getPropertyAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Declaration__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4420:1: rule__Declaration__Group__1 : rule__Declaration__Group__1__Impl rule__Declaration__Group__2 ;

-	public final void rule__Declaration__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4424:1: ( rule__Declaration__Group__1__Impl rule__Declaration__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4425:2: rule__Declaration__Group__1__Impl rule__Declaration__Group__2

-			{

-				pushFollow(FOLLOW_rule__Declaration__Group__1__Impl_in_rule__Declaration__Group__19122);

-				rule__Declaration__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Declaration__Group__2_in_rule__Declaration__Group__19125);

-				rule__Declaration__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group__1"

-

-

-	// $ANTLR start "rule__Declaration__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4432:1: rule__Declaration__Group__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Declaration__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4436:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4437:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4437:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4438:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4439:1: ( RULE_WS )*

-					loop64: do {

-						int alt64 = 2;

-						int LA64_0 = input.LA(1);

-

-						if ((LA64_0 == RULE_WS)) {

-							alt64 = 1;

-						}

-

-

-						switch (alt64) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4439:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Declaration__Group__1__Impl9153);

-

-						}

-							break;

-

-						default:

-							break loop64;

-						}

-					} while (true);

-

-					after(grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Declaration__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4449:1: rule__Declaration__Group__2 : rule__Declaration__Group__2__Impl rule__Declaration__Group__3 ;

-	public final void rule__Declaration__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4453:1: ( rule__Declaration__Group__2__Impl rule__Declaration__Group__3 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4454:2: rule__Declaration__Group__2__Impl rule__Declaration__Group__3

-			{

-				pushFollow(FOLLOW_rule__Declaration__Group__2__Impl_in_rule__Declaration__Group__29184);

-				rule__Declaration__Group__2__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Declaration__Group__3_in_rule__Declaration__Group__29187);

-				rule__Declaration__Group__3();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group__2"

-

-

-	// $ANTLR start "rule__Declaration__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4461:1: rule__Declaration__Group__2__Impl : ( ':' ) ;

-	public final void rule__Declaration__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4465:1: ( ( ':' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4466:1: ( ':' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4466:1: ( ':' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4467:1: ':'

-				{

-					before(grammarAccess.getDeclarationAccess().getColonKeyword_2());

-					match(input, 37, FOLLOW_37_in_rule__Declaration__Group__2__Impl9215);

-					after(grammarAccess.getDeclarationAccess().getColonKeyword_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Declaration__Group__3"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4480:1: rule__Declaration__Group__3 : rule__Declaration__Group__3__Impl rule__Declaration__Group__4 ;

-	public final void rule__Declaration__Group__3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4484:1: ( rule__Declaration__Group__3__Impl rule__Declaration__Group__4 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4485:2: rule__Declaration__Group__3__Impl rule__Declaration__Group__4

-			{

-				pushFollow(FOLLOW_rule__Declaration__Group__3__Impl_in_rule__Declaration__Group__39246);

-				rule__Declaration__Group__3__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Declaration__Group__4_in_rule__Declaration__Group__39249);

-				rule__Declaration__Group__4();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group__3"

-

-

-	// $ANTLR start "rule__Declaration__Group__3__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4492:1: rule__Declaration__Group__3__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Declaration__Group__3__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4496:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4497:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4497:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4498:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_3());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4499:1: ( RULE_WS )*

-					loop65: do {

-						int alt65 = 2;

-						int LA65_0 = input.LA(1);

-

-						if ((LA65_0 == RULE_WS)) {

-							alt65 = 1;

-						}

-

-

-						switch (alt65) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4499:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Declaration__Group__3__Impl9277);

-

-						}

-							break;

-

-						default:

-							break loop65;

-						}

-					} while (true);

-

-					after(grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_3());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group__3__Impl"

-

-

-	// $ANTLR start "rule__Declaration__Group__4"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4509:1: rule__Declaration__Group__4 : rule__Declaration__Group__4__Impl rule__Declaration__Group__5 ;

-	public final void rule__Declaration__Group__4() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4513:1: ( rule__Declaration__Group__4__Impl rule__Declaration__Group__5 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4514:2: rule__Declaration__Group__4__Impl rule__Declaration__Group__5

-			{

-				pushFollow(FOLLOW_rule__Declaration__Group__4__Impl_in_rule__Declaration__Group__49308);

-				rule__Declaration__Group__4__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Declaration__Group__5_in_rule__Declaration__Group__49311);

-				rule__Declaration__Group__5();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group__4"

-

-

-	// $ANTLR start "rule__Declaration__Group__4__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4521:1: rule__Declaration__Group__4__Impl : ( ( rule__Declaration__ExpressionAssignment_4 ) ) ;

-	public final void rule__Declaration__Group__4__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4525:1: ( ( ( rule__Declaration__ExpressionAssignment_4 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4526:1: ( ( rule__Declaration__ExpressionAssignment_4 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4526:1: ( ( rule__Declaration__ExpressionAssignment_4 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4527:1: ( rule__Declaration__ExpressionAssignment_4 )

-				{

-					before(grammarAccess.getDeclarationAccess().getExpressionAssignment_4());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4528:1: ( rule__Declaration__ExpressionAssignment_4 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4528:2: rule__Declaration__ExpressionAssignment_4

-					{

-						pushFollow(FOLLOW_rule__Declaration__ExpressionAssignment_4_in_rule__Declaration__Group__4__Impl9338);

-						rule__Declaration__ExpressionAssignment_4();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getDeclarationAccess().getExpressionAssignment_4());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group__4__Impl"

-

-

-	// $ANTLR start "rule__Declaration__Group__5"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4538:1: rule__Declaration__Group__5 : rule__Declaration__Group__5__Impl ;

-	public final void rule__Declaration__Group__5() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4542:1: ( rule__Declaration__Group__5__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4543:2: rule__Declaration__Group__5__Impl

-			{

-				pushFollow(FOLLOW_rule__Declaration__Group__5__Impl_in_rule__Declaration__Group__59368);

-				rule__Declaration__Group__5__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group__5"

-

-

-	// $ANTLR start "rule__Declaration__Group__5__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4549:1: rule__Declaration__Group__5__Impl : ( ( rule__Declaration__Group_5__0 )? ) ;

-	public final void rule__Declaration__Group__5__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4553:1: ( ( ( rule__Declaration__Group_5__0 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4554:1: ( ( rule__Declaration__Group_5__0 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4554:1: ( ( rule__Declaration__Group_5__0 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4555:1: ( rule__Declaration__Group_5__0 )?

-				{

-					before(grammarAccess.getDeclarationAccess().getGroup_5());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4556:1: ( rule__Declaration__Group_5__0 )?

-					int alt66 = 2;

-					int LA66_0 = input.LA(1);

-

-					if ((LA66_0 == RULE_T_IMPORTANT)) {

-						alt66 = 1;

-					}

-					switch (alt66) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4556:2: rule__Declaration__Group_5__0

-					{

-						pushFollow(FOLLOW_rule__Declaration__Group_5__0_in_rule__Declaration__Group__5__Impl9395);

-						rule__Declaration__Group_5__0();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getDeclarationAccess().getGroup_5());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group__5__Impl"

-

-

-	// $ANTLR start "rule__Declaration__Group_5__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4578:1: rule__Declaration__Group_5__0 : rule__Declaration__Group_5__0__Impl rule__Declaration__Group_5__1 ;

-	public final void rule__Declaration__Group_5__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4582:1: ( rule__Declaration__Group_5__0__Impl rule__Declaration__Group_5__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4583:2: rule__Declaration__Group_5__0__Impl rule__Declaration__Group_5__1

-			{

-				pushFollow(FOLLOW_rule__Declaration__Group_5__0__Impl_in_rule__Declaration__Group_5__09438);

-				rule__Declaration__Group_5__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Declaration__Group_5__1_in_rule__Declaration__Group_5__09441);

-				rule__Declaration__Group_5__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group_5__0"

-

-

-	// $ANTLR start "rule__Declaration__Group_5__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4590:1: rule__Declaration__Group_5__0__Impl : ( ( rule__Declaration__ImportantAssignment_5_0 ) ) ;

-	public final void rule__Declaration__Group_5__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4594:1: ( ( ( rule__Declaration__ImportantAssignment_5_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4595:1: ( ( rule__Declaration__ImportantAssignment_5_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4595:1: ( ( rule__Declaration__ImportantAssignment_5_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4596:1: ( rule__Declaration__ImportantAssignment_5_0 )

-				{

-					before(grammarAccess.getDeclarationAccess().getImportantAssignment_5_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4597:1: ( rule__Declaration__ImportantAssignment_5_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4597:2: rule__Declaration__ImportantAssignment_5_0

-					{

-						pushFollow(FOLLOW_rule__Declaration__ImportantAssignment_5_0_in_rule__Declaration__Group_5__0__Impl9468);

-						rule__Declaration__ImportantAssignment_5_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getDeclarationAccess().getImportantAssignment_5_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group_5__0__Impl"

-

-

-	// $ANTLR start "rule__Declaration__Group_5__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4607:1: rule__Declaration__Group_5__1 : rule__Declaration__Group_5__1__Impl ;

-	public final void rule__Declaration__Group_5__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4611:1: ( rule__Declaration__Group_5__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4612:2: rule__Declaration__Group_5__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Declaration__Group_5__1__Impl_in_rule__Declaration__Group_5__19498);

-				rule__Declaration__Group_5__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group_5__1"

-

-

-	// $ANTLR start "rule__Declaration__Group_5__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4618:1: rule__Declaration__Group_5__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Declaration__Group_5__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4622:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4623:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4623:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4624:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_5_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4625:1: ( RULE_WS )*

-					loop67: do {

-						int alt67 = 2;

-						int LA67_0 = input.LA(1);

-

-						if ((LA67_0 == RULE_WS)) {

-							alt67 = 1;

-						}

-

-

-						switch (alt67) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4625:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Declaration__Group_5__1__Impl9526);

-

-						}

-							break;

-

-						default:

-							break loop67;

-						}

-					} while (true);

-

-					after(grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_5_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__Group_5__1__Impl"

-

-

-	// $ANTLR start "rule__Expression__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4639:1: rule__Expression__Group__0 : rule__Expression__Group__0__Impl rule__Expression__Group__1 ;

-	public final void rule__Expression__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4643:1: ( rule__Expression__Group__0__Impl rule__Expression__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4644:2: rule__Expression__Group__0__Impl rule__Expression__Group__1

-			{

-				pushFollow(FOLLOW_rule__Expression__Group__0__Impl_in_rule__Expression__Group__09561);

-				rule__Expression__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Expression__Group__1_in_rule__Expression__Group__09564);

-				rule__Expression__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Expression__Group__0"

-

-

-	// $ANTLR start "rule__Expression__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4651:1: rule__Expression__Group__0__Impl : ( ( rule__Expression__TermsAssignment_0 ) ) ;

-	public final void rule__Expression__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4655:1: ( ( ( rule__Expression__TermsAssignment_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4656:1: ( ( rule__Expression__TermsAssignment_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4656:1: ( ( rule__Expression__TermsAssignment_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4657:1: ( rule__Expression__TermsAssignment_0 )

-				{

-					before(grammarAccess.getExpressionAccess().getTermsAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4658:1: ( rule__Expression__TermsAssignment_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4658:2: rule__Expression__TermsAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Expression__TermsAssignment_0_in_rule__Expression__Group__0__Impl9591);

-						rule__Expression__TermsAssignment_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getExpressionAccess().getTermsAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Expression__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Expression__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4668:1: rule__Expression__Group__1 : rule__Expression__Group__1__Impl ;

-	public final void rule__Expression__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4672:1: ( rule__Expression__Group__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4673:2: rule__Expression__Group__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Expression__Group__1__Impl_in_rule__Expression__Group__19621);

-				rule__Expression__Group__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Expression__Group__1"

-

-

-	// $ANTLR start "rule__Expression__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4679:1: rule__Expression__Group__1__Impl : ( ( rule__Expression__SubtermsAssignment_1 )* ) ;

-	public final void rule__Expression__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4683:1: ( ( ( rule__Expression__SubtermsAssignment_1 )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4684:1: ( ( rule__Expression__SubtermsAssignment_1 )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4684:1: ( ( rule__Expression__SubtermsAssignment_1 )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4685:1: ( rule__Expression__SubtermsAssignment_1 )*

-				{

-					before(grammarAccess.getExpressionAccess().getSubtermsAssignment_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4686:1: ( rule__Expression__SubtermsAssignment_1 )*

-					loop68: do {

-						int alt68 = 2;

-						int LA68_0 = input.LA(1);

-

-						if (((LA68_0 >= RULE_ID && LA68_0 <= RULE_STRING) || LA68_0 == RULE_T_NUM || LA68_0 == RULE_HASH || (LA68_0 >= 23 && LA68_0 <= 24) || LA68_0 == 32 || (LA68_0 >= 40 && LA68_0 <= 41))) {

-							alt68 = 1;

-						}

-

-

-						switch (alt68) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4686:2: rule__Expression__SubtermsAssignment_1

-						{

-							pushFollow(FOLLOW_rule__Expression__SubtermsAssignment_1_in_rule__Expression__Group__1__Impl9648);

-							rule__Expression__SubtermsAssignment_1();

-

-							state._fsp--;

-

-

-						}

-							break;

-

-						default:

-							break loop68;

-						}

-					} while (true);

-

-					after(grammarAccess.getExpressionAccess().getSubtermsAssignment_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Expression__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Subterm__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4700:1: rule__Subterm__Group__0 : rule__Subterm__Group__0__Impl rule__Subterm__Group__1 ;

-	public final void rule__Subterm__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4704:1: ( rule__Subterm__Group__0__Impl rule__Subterm__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4705:2: rule__Subterm__Group__0__Impl rule__Subterm__Group__1

-			{

-				pushFollow(FOLLOW_rule__Subterm__Group__0__Impl_in_rule__Subterm__Group__09683);

-				rule__Subterm__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Subterm__Group__1_in_rule__Subterm__Group__09686);

-				rule__Subterm__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Subterm__Group__0"

-

-

-	// $ANTLR start "rule__Subterm__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4712:1: rule__Subterm__Group__0__Impl : ( ( rule__Subterm__OperatorAssignment_0 )? ) ;

-	public final void rule__Subterm__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4716:1: ( ( ( rule__Subterm__OperatorAssignment_0 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4717:1: ( ( rule__Subterm__OperatorAssignment_0 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4717:1: ( ( rule__Subterm__OperatorAssignment_0 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4718:1: ( rule__Subterm__OperatorAssignment_0 )?

-				{

-					before(grammarAccess.getSubtermAccess().getOperatorAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4719:1: ( rule__Subterm__OperatorAssignment_0 )?

-					int alt69 = 2;

-					int LA69_0 = input.LA(1);

-

-					if ((LA69_0 == 32 || LA69_0 == 41)) {

-						alt69 = 1;

-					}

-					switch (alt69) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4719:2: rule__Subterm__OperatorAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Subterm__OperatorAssignment_0_in_rule__Subterm__Group__0__Impl9713);

-						rule__Subterm__OperatorAssignment_0();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getSubtermAccess().getOperatorAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Subterm__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Subterm__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4729:1: rule__Subterm__Group__1 : rule__Subterm__Group__1__Impl ;

-	public final void rule__Subterm__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4733:1: ( rule__Subterm__Group__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4734:2: rule__Subterm__Group__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Subterm__Group__1__Impl_in_rule__Subterm__Group__19744);

-				rule__Subterm__Group__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Subterm__Group__1"

-

-

-	// $ANTLR start "rule__Subterm__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4740:1: rule__Subterm__Group__1__Impl : ( ( rule__Subterm__TermAssignment_1 ) ) ;

-	public final void rule__Subterm__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4744:1: ( ( ( rule__Subterm__TermAssignment_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4745:1: ( ( rule__Subterm__TermAssignment_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4745:1: ( ( rule__Subterm__TermAssignment_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4746:1: ( rule__Subterm__TermAssignment_1 )

-				{

-					before(grammarAccess.getSubtermAccess().getTermAssignment_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4747:1: ( rule__Subterm__TermAssignment_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4747:2: rule__Subterm__TermAssignment_1

-					{

-						pushFollow(FOLLOW_rule__Subterm__TermAssignment_1_in_rule__Subterm__Group__1__Impl9771);

-						rule__Subterm__TermAssignment_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getSubtermAccess().getTermAssignment_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Subterm__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Term__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4761:1: rule__Term__Group__0 : rule__Term__Group__0__Impl rule__Term__Group__1 ;

-	public final void rule__Term__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4765:1: ( rule__Term__Group__0__Impl rule__Term__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4766:2: rule__Term__Group__0__Impl rule__Term__Group__1

-			{

-				pushFollow(FOLLOW_rule__Term__Group__0__Impl_in_rule__Term__Group__09805);

-				rule__Term__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Term__Group__1_in_rule__Term__Group__09808);

-				rule__Term__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Term__Group__0"

-

-

-	// $ANTLR start "rule__Term__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4773:1: rule__Term__Group__0__Impl : ( ( rule__Term__Alternatives_0 ) ) ;

-	public final void rule__Term__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4777:1: ( ( ( rule__Term__Alternatives_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4778:1: ( ( rule__Term__Alternatives_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4778:1: ( ( rule__Term__Alternatives_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4779:1: ( rule__Term__Alternatives_0 )

-				{

-					before(grammarAccess.getTermAccess().getAlternatives_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4780:1: ( rule__Term__Alternatives_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4780:2: rule__Term__Alternatives_0

-					{

-						pushFollow(FOLLOW_rule__Term__Alternatives_0_in_rule__Term__Group__0__Impl9835);

-						rule__Term__Alternatives_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getTermAccess().getAlternatives_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Term__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Term__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4790:1: rule__Term__Group__1 : rule__Term__Group__1__Impl ;

-	public final void rule__Term__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4794:1: ( rule__Term__Group__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4795:2: rule__Term__Group__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Term__Group__1__Impl_in_rule__Term__Group__19865);

-				rule__Term__Group__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Term__Group__1"

-

-

-	// $ANTLR start "rule__Term__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4801:1: rule__Term__Group__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Term__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4805:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4806:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4806:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4807:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getTermAccess().getWSTerminalRuleCall_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4808:1: ( RULE_WS )*

-					loop70: do {

-						int alt70 = 2;

-						int LA70_0 = input.LA(1);

-

-						if ((LA70_0 == RULE_WS)) {

-							alt70 = 1;

-						}

-

-

-						switch (alt70) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4808:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Term__Group__1__Impl9893);

-

-						}

-							break;

-

-						default:

-							break loop70;

-						}

-					} while (true);

-

-					after(grammarAccess.getTermAccess().getWSTerminalRuleCall_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Term__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Function__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4822:1: rule__Function__Group__0 : rule__Function__Group__0__Impl rule__Function__Group__1 ;

-	public final void rule__Function__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4826:1: ( rule__Function__Group__0__Impl rule__Function__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4827:2: rule__Function__Group__0__Impl rule__Function__Group__1

-			{

-				pushFollow(FOLLOW_rule__Function__Group__0__Impl_in_rule__Function__Group__09928);

-				rule__Function__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Function__Group__1_in_rule__Function__Group__09931);

-				rule__Function__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Function__Group__0"

-

-

-	// $ANTLR start "rule__Function__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4834:1: rule__Function__Group__0__Impl : ( ( rule__Function__NameAssignment_0 ) ) ;

-	public final void rule__Function__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4838:1: ( ( ( rule__Function__NameAssignment_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4839:1: ( ( rule__Function__NameAssignment_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4839:1: ( ( rule__Function__NameAssignment_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4840:1: ( rule__Function__NameAssignment_0 )

-				{

-					before(grammarAccess.getFunctionAccess().getNameAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4841:1: ( rule__Function__NameAssignment_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4841:2: rule__Function__NameAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Function__NameAssignment_0_in_rule__Function__Group__0__Impl9958);

-						rule__Function__NameAssignment_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getFunctionAccess().getNameAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Function__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Function__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4851:1: rule__Function__Group__1 : rule__Function__Group__1__Impl rule__Function__Group__2 ;

-	public final void rule__Function__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4855:1: ( rule__Function__Group__1__Impl rule__Function__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4856:2: rule__Function__Group__1__Impl rule__Function__Group__2

-			{

-				pushFollow(FOLLOW_rule__Function__Group__1__Impl_in_rule__Function__Group__19988);

-				rule__Function__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Function__Group__2_in_rule__Function__Group__19991);

-				rule__Function__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Function__Group__1"

-

-

-	// $ANTLR start "rule__Function__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4863:1: rule__Function__Group__1__Impl : ( '(' ) ;

-	public final void rule__Function__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4867:1: ( ( '(' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4868:1: ( '(' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4868:1: ( '(' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4869:1: '('

-				{

-					before(grammarAccess.getFunctionAccess().getLeftParenthesisKeyword_1());

-					match(input, 38, FOLLOW_38_in_rule__Function__Group__1__Impl10019);

-					after(grammarAccess.getFunctionAccess().getLeftParenthesisKeyword_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Function__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Function__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4882:1: rule__Function__Group__2 : rule__Function__Group__2__Impl rule__Function__Group__3 ;

-	public final void rule__Function__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4886:1: ( rule__Function__Group__2__Impl rule__Function__Group__3 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4887:2: rule__Function__Group__2__Impl rule__Function__Group__3

-			{

-				pushFollow(FOLLOW_rule__Function__Group__2__Impl_in_rule__Function__Group__210050);

-				rule__Function__Group__2__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Function__Group__3_in_rule__Function__Group__210053);

-				rule__Function__Group__3();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Function__Group__2"

-

-

-	// $ANTLR start "rule__Function__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4894:1: rule__Function__Group__2__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Function__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4898:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4899:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4899:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4900:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getFunctionAccess().getWSTerminalRuleCall_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4901:1: ( RULE_WS )*

-					loop71: do {

-						int alt71 = 2;

-						int LA71_0 = input.LA(1);

-

-						if ((LA71_0 == RULE_WS)) {

-							alt71 = 1;

-						}

-

-

-						switch (alt71) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4901:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Function__Group__2__Impl10081);

-

-						}

-							break;

-

-						default:

-							break loop71;

-						}

-					} while (true);

-

-					after(grammarAccess.getFunctionAccess().getWSTerminalRuleCall_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Function__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Function__Group__3"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4911:1: rule__Function__Group__3 : rule__Function__Group__3__Impl rule__Function__Group__4 ;

-	public final void rule__Function__Group__3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4915:1: ( rule__Function__Group__3__Impl rule__Function__Group__4 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4916:2: rule__Function__Group__3__Impl rule__Function__Group__4

-			{

-				pushFollow(FOLLOW_rule__Function__Group__3__Impl_in_rule__Function__Group__310112);

-				rule__Function__Group__3__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Function__Group__4_in_rule__Function__Group__310115);

-				rule__Function__Group__4();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Function__Group__3"

-

-

-	// $ANTLR start "rule__Function__Group__3__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4923:1: rule__Function__Group__3__Impl : ( ( rule__Function__ArgsAssignment_3 ) ) ;

-	public final void rule__Function__Group__3__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4927:1: ( ( ( rule__Function__ArgsAssignment_3 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4928:1: ( ( rule__Function__ArgsAssignment_3 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4928:1: ( ( rule__Function__ArgsAssignment_3 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4929:1: ( rule__Function__ArgsAssignment_3 )

-				{

-					before(grammarAccess.getFunctionAccess().getArgsAssignment_3());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4930:1: ( rule__Function__ArgsAssignment_3 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4930:2: rule__Function__ArgsAssignment_3

-					{

-						pushFollow(FOLLOW_rule__Function__ArgsAssignment_3_in_rule__Function__Group__3__Impl10142);

-						rule__Function__ArgsAssignment_3();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getFunctionAccess().getArgsAssignment_3());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Function__Group__3__Impl"

-

-

-	// $ANTLR start "rule__Function__Group__4"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4940:1: rule__Function__Group__4 : rule__Function__Group__4__Impl ;

-	public final void rule__Function__Group__4() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4944:1: ( rule__Function__Group__4__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4945:2: rule__Function__Group__4__Impl

-			{

-				pushFollow(FOLLOW_rule__Function__Group__4__Impl_in_rule__Function__Group__410172);

-				rule__Function__Group__4__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Function__Group__4"

-

-

-	// $ANTLR start "rule__Function__Group__4__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4951:1: rule__Function__Group__4__Impl : ( ')' ) ;

-	public final void rule__Function__Group__4__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4955:1: ( ( ')' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4956:1: ( ')' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4956:1: ( ')' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4957:1: ')'

-				{

-					before(grammarAccess.getFunctionAccess().getRightParenthesisKeyword_4());

-					match(input, 39, FOLLOW_39_in_rule__Function__Group__4__Impl10200);

-					after(grammarAccess.getFunctionAccess().getRightParenthesisKeyword_4());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Function__Group__4__Impl"

-

-

-	// $ANTLR start "rule__Number__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4980:1: rule__Number__Group__0 : rule__Number__Group__0__Impl rule__Number__Group__1 ;

-	public final void rule__Number__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4984:1: ( rule__Number__Group__0__Impl rule__Number__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4985:2: rule__Number__Group__0__Impl rule__Number__Group__1

-			{

-				pushFollow(FOLLOW_rule__Number__Group__0__Impl_in_rule__Number__Group__010241);

-				rule__Number__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Number__Group__1_in_rule__Number__Group__010244);

-				rule__Number__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Number__Group__0"

-

-

-	// $ANTLR start "rule__Number__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4992:1: rule__Number__Group__0__Impl : ( ( rule__Number__OpAssignment_0 )? ) ;

-	public final void rule__Number__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4996:1: ( ( ( rule__Number__OpAssignment_0 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4997:1: ( ( rule__Number__OpAssignment_0 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4997:1: ( ( rule__Number__OpAssignment_0 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4998:1: ( rule__Number__OpAssignment_0 )?

-				{

-					before(grammarAccess.getNumberAccess().getOpAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4999:1: ( rule__Number__OpAssignment_0 )?

-					int alt72 = 2;

-					int LA72_0 = input.LA(1);

-

-					if (((LA72_0 >= 23 && LA72_0 <= 24))) {

-						alt72 = 1;

-					}

-					switch (alt72) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:4999:2: rule__Number__OpAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Number__OpAssignment_0_in_rule__Number__Group__0__Impl10271);

-						rule__Number__OpAssignment_0();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getNumberAccess().getOpAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Number__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Number__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5009:1: rule__Number__Group__1 : rule__Number__Group__1__Impl ;

-	public final void rule__Number__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5013:1: ( rule__Number__Group__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5014:2: rule__Number__Group__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Number__Group__1__Impl_in_rule__Number__Group__110302);

-				rule__Number__Group__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Number__Group__1"

-

-

-	// $ANTLR start "rule__Number__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5020:1: rule__Number__Group__1__Impl : ( ( rule__Number__ValueAssignment_1 ) ) ;

-	public final void rule__Number__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5024:1: ( ( ( rule__Number__ValueAssignment_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5025:1: ( ( rule__Number__ValueAssignment_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5025:1: ( ( rule__Number__ValueAssignment_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5026:1: ( rule__Number__ValueAssignment_1 )

-				{

-					before(grammarAccess.getNumberAccess().getValueAssignment_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5027:1: ( rule__Number__ValueAssignment_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5027:2: rule__Number__ValueAssignment_1

-					{

-						pushFollow(FOLLOW_rule__Number__ValueAssignment_1_in_rule__Number__Group__1__Impl10329);

-						rule__Number__ValueAssignment_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getNumberAccess().getValueAssignment_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Number__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Percentage__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5041:1: rule__Percentage__Group__0 : rule__Percentage__Group__0__Impl rule__Percentage__Group__1 ;

-	public final void rule__Percentage__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5045:1: ( rule__Percentage__Group__0__Impl rule__Percentage__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5046:2: rule__Percentage__Group__0__Impl rule__Percentage__Group__1

-			{

-				pushFollow(FOLLOW_rule__Percentage__Group__0__Impl_in_rule__Percentage__Group__010363);

-				rule__Percentage__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Percentage__Group__1_in_rule__Percentage__Group__010366);

-				rule__Percentage__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Percentage__Group__0"

-

-

-	// $ANTLR start "rule__Percentage__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5053:1: rule__Percentage__Group__0__Impl : ( ( rule__Percentage__OpAssignment_0 )? ) ;

-	public final void rule__Percentage__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5057:1: ( ( ( rule__Percentage__OpAssignment_0 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5058:1: ( ( rule__Percentage__OpAssignment_0 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5058:1: ( ( rule__Percentage__OpAssignment_0 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5059:1: ( rule__Percentage__OpAssignment_0 )?

-				{

-					before(grammarAccess.getPercentageAccess().getOpAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5060:1: ( rule__Percentage__OpAssignment_0 )?

-					int alt73 = 2;

-					int LA73_0 = input.LA(1);

-

-					if (((LA73_0 >= 23 && LA73_0 <= 24))) {

-						alt73 = 1;

-					}

-					switch (alt73) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5060:2: rule__Percentage__OpAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Percentage__OpAssignment_0_in_rule__Percentage__Group__0__Impl10393);

-						rule__Percentage__OpAssignment_0();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getPercentageAccess().getOpAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Percentage__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Percentage__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5070:1: rule__Percentage__Group__1 : rule__Percentage__Group__1__Impl rule__Percentage__Group__2 ;

-	public final void rule__Percentage__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5074:1: ( rule__Percentage__Group__1__Impl rule__Percentage__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5075:2: rule__Percentage__Group__1__Impl rule__Percentage__Group__2

-			{

-				pushFollow(FOLLOW_rule__Percentage__Group__1__Impl_in_rule__Percentage__Group__110424);

-				rule__Percentage__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Percentage__Group__2_in_rule__Percentage__Group__110427);

-				rule__Percentage__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Percentage__Group__1"

-

-

-	// $ANTLR start "rule__Percentage__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5082:1: rule__Percentage__Group__1__Impl : ( ( rule__Percentage__ValueAssignment_1 ) ) ;

-	public final void rule__Percentage__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5086:1: ( ( ( rule__Percentage__ValueAssignment_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5087:1: ( ( rule__Percentage__ValueAssignment_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5087:1: ( ( rule__Percentage__ValueAssignment_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5088:1: ( rule__Percentage__ValueAssignment_1 )

-				{

-					before(grammarAccess.getPercentageAccess().getValueAssignment_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5089:1: ( rule__Percentage__ValueAssignment_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5089:2: rule__Percentage__ValueAssignment_1

-					{

-						pushFollow(FOLLOW_rule__Percentage__ValueAssignment_1_in_rule__Percentage__Group__1__Impl10454);

-						rule__Percentage__ValueAssignment_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getPercentageAccess().getValueAssignment_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Percentage__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Percentage__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5099:1: rule__Percentage__Group__2 : rule__Percentage__Group__2__Impl ;

-	public final void rule__Percentage__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5103:1: ( rule__Percentage__Group__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5104:2: rule__Percentage__Group__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Percentage__Group__2__Impl_in_rule__Percentage__Group__210484);

-				rule__Percentage__Group__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Percentage__Group__2"

-

-

-	// $ANTLR start "rule__Percentage__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5110:1: rule__Percentage__Group__2__Impl : ( ( rule__Percentage__UnitAssignment_2 ) ) ;

-	public final void rule__Percentage__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5114:1: ( ( ( rule__Percentage__UnitAssignment_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5115:1: ( ( rule__Percentage__UnitAssignment_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5115:1: ( ( rule__Percentage__UnitAssignment_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5116:1: ( rule__Percentage__UnitAssignment_2 )

-				{

-					before(grammarAccess.getPercentageAccess().getUnitAssignment_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5117:1: ( rule__Percentage__UnitAssignment_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5117:2: rule__Percentage__UnitAssignment_2

-					{

-						pushFollow(FOLLOW_rule__Percentage__UnitAssignment_2_in_rule__Percentage__Group__2__Impl10511);

-						rule__Percentage__UnitAssignment_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getPercentageAccess().getUnitAssignment_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Percentage__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Length__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5133:1: rule__Length__Group__0 : rule__Length__Group__0__Impl rule__Length__Group__1 ;

-	public final void rule__Length__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5137:1: ( rule__Length__Group__0__Impl rule__Length__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5138:2: rule__Length__Group__0__Impl rule__Length__Group__1

-			{

-				pushFollow(FOLLOW_rule__Length__Group__0__Impl_in_rule__Length__Group__010547);

-				rule__Length__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Length__Group__1_in_rule__Length__Group__010550);

-				rule__Length__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Length__Group__0"

-

-

-	// $ANTLR start "rule__Length__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5145:1: rule__Length__Group__0__Impl : ( ( rule__Length__OpAssignment_0 )? ) ;

-	public final void rule__Length__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5149:1: ( ( ( rule__Length__OpAssignment_0 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5150:1: ( ( rule__Length__OpAssignment_0 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5150:1: ( ( rule__Length__OpAssignment_0 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5151:1: ( rule__Length__OpAssignment_0 )?

-				{

-					before(grammarAccess.getLengthAccess().getOpAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5152:1: ( rule__Length__OpAssignment_0 )?

-					int alt74 = 2;

-					int LA74_0 = input.LA(1);

-

-					if (((LA74_0 >= 23 && LA74_0 <= 24))) {

-						alt74 = 1;

-					}

-					switch (alt74) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5152:2: rule__Length__OpAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Length__OpAssignment_0_in_rule__Length__Group__0__Impl10577);

-						rule__Length__OpAssignment_0();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getLengthAccess().getOpAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Length__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Length__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5162:1: rule__Length__Group__1 : rule__Length__Group__1__Impl rule__Length__Group__2 ;

-	public final void rule__Length__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5166:1: ( rule__Length__Group__1__Impl rule__Length__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5167:2: rule__Length__Group__1__Impl rule__Length__Group__2

-			{

-				pushFollow(FOLLOW_rule__Length__Group__1__Impl_in_rule__Length__Group__110608);

-				rule__Length__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Length__Group__2_in_rule__Length__Group__110611);

-				rule__Length__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Length__Group__1"

-

-

-	// $ANTLR start "rule__Length__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5174:1: rule__Length__Group__1__Impl : ( ( rule__Length__ValueAssignment_1 ) ) ;

-	public final void rule__Length__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5178:1: ( ( ( rule__Length__ValueAssignment_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5179:1: ( ( rule__Length__ValueAssignment_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5179:1: ( ( rule__Length__ValueAssignment_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5180:1: ( rule__Length__ValueAssignment_1 )

-				{

-					before(grammarAccess.getLengthAccess().getValueAssignment_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5181:1: ( rule__Length__ValueAssignment_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5181:2: rule__Length__ValueAssignment_1

-					{

-						pushFollow(FOLLOW_rule__Length__ValueAssignment_1_in_rule__Length__Group__1__Impl10638);

-						rule__Length__ValueAssignment_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getLengthAccess().getValueAssignment_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Length__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Length__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5191:1: rule__Length__Group__2 : rule__Length__Group__2__Impl ;

-	public final void rule__Length__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5195:1: ( rule__Length__Group__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5196:2: rule__Length__Group__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Length__Group__2__Impl_in_rule__Length__Group__210668);

-				rule__Length__Group__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Length__Group__2"

-

-

-	// $ANTLR start "rule__Length__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5202:1: rule__Length__Group__2__Impl : ( ( rule__Length__UnitAssignment_2 ) ) ;

-	public final void rule__Length__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5206:1: ( ( ( rule__Length__UnitAssignment_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5207:1: ( ( rule__Length__UnitAssignment_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5207:1: ( ( rule__Length__UnitAssignment_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5208:1: ( rule__Length__UnitAssignment_2 )

-				{

-					before(grammarAccess.getLengthAccess().getUnitAssignment_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5209:1: ( rule__Length__UnitAssignment_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5209:2: rule__Length__UnitAssignment_2

-					{

-						pushFollow(FOLLOW_rule__Length__UnitAssignment_2_in_rule__Length__Group__2__Impl10695);

-						rule__Length__UnitAssignment_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getLengthAccess().getUnitAssignment_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Length__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Ems__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5225:1: rule__Ems__Group__0 : rule__Ems__Group__0__Impl rule__Ems__Group__1 ;

-	public final void rule__Ems__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5229:1: ( rule__Ems__Group__0__Impl rule__Ems__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5230:2: rule__Ems__Group__0__Impl rule__Ems__Group__1

-			{

-				pushFollow(FOLLOW_rule__Ems__Group__0__Impl_in_rule__Ems__Group__010731);

-				rule__Ems__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Ems__Group__1_in_rule__Ems__Group__010734);

-				rule__Ems__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ems__Group__0"

-

-

-	// $ANTLR start "rule__Ems__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5237:1: rule__Ems__Group__0__Impl : ( ( rule__Ems__OpAssignment_0 )? ) ;

-	public final void rule__Ems__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5241:1: ( ( ( rule__Ems__OpAssignment_0 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5242:1: ( ( rule__Ems__OpAssignment_0 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5242:1: ( ( rule__Ems__OpAssignment_0 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5243:1: ( rule__Ems__OpAssignment_0 )?

-				{

-					before(grammarAccess.getEmsAccess().getOpAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5244:1: ( rule__Ems__OpAssignment_0 )?

-					int alt75 = 2;

-					int LA75_0 = input.LA(1);

-

-					if (((LA75_0 >= 23 && LA75_0 <= 24))) {

-						alt75 = 1;

-					}

-					switch (alt75) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5244:2: rule__Ems__OpAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Ems__OpAssignment_0_in_rule__Ems__Group__0__Impl10761);

-						rule__Ems__OpAssignment_0();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getEmsAccess().getOpAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ems__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Ems__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5254:1: rule__Ems__Group__1 : rule__Ems__Group__1__Impl rule__Ems__Group__2 ;

-	public final void rule__Ems__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5258:1: ( rule__Ems__Group__1__Impl rule__Ems__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5259:2: rule__Ems__Group__1__Impl rule__Ems__Group__2

-			{

-				pushFollow(FOLLOW_rule__Ems__Group__1__Impl_in_rule__Ems__Group__110792);

-				rule__Ems__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Ems__Group__2_in_rule__Ems__Group__110795);

-				rule__Ems__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ems__Group__1"

-

-

-	// $ANTLR start "rule__Ems__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5266:1: rule__Ems__Group__1__Impl : ( ( rule__Ems__ValueAssignment_1 ) ) ;

-	public final void rule__Ems__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5270:1: ( ( ( rule__Ems__ValueAssignment_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5271:1: ( ( rule__Ems__ValueAssignment_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5271:1: ( ( rule__Ems__ValueAssignment_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5272:1: ( rule__Ems__ValueAssignment_1 )

-				{

-					before(grammarAccess.getEmsAccess().getValueAssignment_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5273:1: ( rule__Ems__ValueAssignment_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5273:2: rule__Ems__ValueAssignment_1

-					{

-						pushFollow(FOLLOW_rule__Ems__ValueAssignment_1_in_rule__Ems__Group__1__Impl10822);

-						rule__Ems__ValueAssignment_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getEmsAccess().getValueAssignment_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ems__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Ems__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5283:1: rule__Ems__Group__2 : rule__Ems__Group__2__Impl ;

-	public final void rule__Ems__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5287:1: ( rule__Ems__Group__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5288:2: rule__Ems__Group__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Ems__Group__2__Impl_in_rule__Ems__Group__210852);

-				rule__Ems__Group__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ems__Group__2"

-

-

-	// $ANTLR start "rule__Ems__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5294:1: rule__Ems__Group__2__Impl : ( ( rule__Ems__UnitAssignment_2 ) ) ;

-	public final void rule__Ems__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5298:1: ( ( ( rule__Ems__UnitAssignment_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5299:1: ( ( rule__Ems__UnitAssignment_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5299:1: ( ( rule__Ems__UnitAssignment_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5300:1: ( rule__Ems__UnitAssignment_2 )

-				{

-					before(grammarAccess.getEmsAccess().getUnitAssignment_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5301:1: ( rule__Ems__UnitAssignment_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5301:2: rule__Ems__UnitAssignment_2

-					{

-						pushFollow(FOLLOW_rule__Ems__UnitAssignment_2_in_rule__Ems__Group__2__Impl10879);

-						rule__Ems__UnitAssignment_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getEmsAccess().getUnitAssignment_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ems__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Exs__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5317:1: rule__Exs__Group__0 : rule__Exs__Group__0__Impl rule__Exs__Group__1 ;

-	public final void rule__Exs__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5321:1: ( rule__Exs__Group__0__Impl rule__Exs__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5322:2: rule__Exs__Group__0__Impl rule__Exs__Group__1

-			{

-				pushFollow(FOLLOW_rule__Exs__Group__0__Impl_in_rule__Exs__Group__010915);

-				rule__Exs__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Exs__Group__1_in_rule__Exs__Group__010918);

-				rule__Exs__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Exs__Group__0"

-

-

-	// $ANTLR start "rule__Exs__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5329:1: rule__Exs__Group__0__Impl : ( ( rule__Exs__OpAssignment_0 )? ) ;

-	public final void rule__Exs__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5333:1: ( ( ( rule__Exs__OpAssignment_0 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5334:1: ( ( rule__Exs__OpAssignment_0 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5334:1: ( ( rule__Exs__OpAssignment_0 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5335:1: ( rule__Exs__OpAssignment_0 )?

-				{

-					before(grammarAccess.getExsAccess().getOpAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5336:1: ( rule__Exs__OpAssignment_0 )?

-					int alt76 = 2;

-					int LA76_0 = input.LA(1);

-

-					if (((LA76_0 >= 23 && LA76_0 <= 24))) {

-						alt76 = 1;

-					}

-					switch (alt76) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5336:2: rule__Exs__OpAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Exs__OpAssignment_0_in_rule__Exs__Group__0__Impl10945);

-						rule__Exs__OpAssignment_0();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getExsAccess().getOpAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Exs__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Exs__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5346:1: rule__Exs__Group__1 : rule__Exs__Group__1__Impl rule__Exs__Group__2 ;

-	public final void rule__Exs__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5350:1: ( rule__Exs__Group__1__Impl rule__Exs__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5351:2: rule__Exs__Group__1__Impl rule__Exs__Group__2

-			{

-				pushFollow(FOLLOW_rule__Exs__Group__1__Impl_in_rule__Exs__Group__110976);

-				rule__Exs__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Exs__Group__2_in_rule__Exs__Group__110979);

-				rule__Exs__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Exs__Group__1"

-

-

-	// $ANTLR start "rule__Exs__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5358:1: rule__Exs__Group__1__Impl : ( ( rule__Exs__ValueAssignment_1 ) ) ;

-	public final void rule__Exs__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5362:1: ( ( ( rule__Exs__ValueAssignment_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5363:1: ( ( rule__Exs__ValueAssignment_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5363:1: ( ( rule__Exs__ValueAssignment_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5364:1: ( rule__Exs__ValueAssignment_1 )

-				{

-					before(grammarAccess.getExsAccess().getValueAssignment_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5365:1: ( rule__Exs__ValueAssignment_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5365:2: rule__Exs__ValueAssignment_1

-					{

-						pushFollow(FOLLOW_rule__Exs__ValueAssignment_1_in_rule__Exs__Group__1__Impl11006);

-						rule__Exs__ValueAssignment_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getExsAccess().getValueAssignment_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Exs__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Exs__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5375:1: rule__Exs__Group__2 : rule__Exs__Group__2__Impl ;

-	public final void rule__Exs__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5379:1: ( rule__Exs__Group__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5380:2: rule__Exs__Group__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Exs__Group__2__Impl_in_rule__Exs__Group__211036);

-				rule__Exs__Group__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Exs__Group__2"

-

-

-	// $ANTLR start "rule__Exs__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5386:1: rule__Exs__Group__2__Impl : ( ( rule__Exs__UnitAssignment_2 ) ) ;

-	public final void rule__Exs__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5390:1: ( ( ( rule__Exs__UnitAssignment_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5391:1: ( ( rule__Exs__UnitAssignment_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5391:1: ( ( rule__Exs__UnitAssignment_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5392:1: ( rule__Exs__UnitAssignment_2 )

-				{

-					before(grammarAccess.getExsAccess().getUnitAssignment_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5393:1: ( rule__Exs__UnitAssignment_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5393:2: rule__Exs__UnitAssignment_2

-					{

-						pushFollow(FOLLOW_rule__Exs__UnitAssignment_2_in_rule__Exs__Group__2__Impl11063);

-						rule__Exs__UnitAssignment_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getExsAccess().getUnitAssignment_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Exs__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Angle__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5409:1: rule__Angle__Group__0 : rule__Angle__Group__0__Impl rule__Angle__Group__1 ;

-	public final void rule__Angle__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5413:1: ( rule__Angle__Group__0__Impl rule__Angle__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5414:2: rule__Angle__Group__0__Impl rule__Angle__Group__1

-			{

-				pushFollow(FOLLOW_rule__Angle__Group__0__Impl_in_rule__Angle__Group__011099);

-				rule__Angle__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Angle__Group__1_in_rule__Angle__Group__011102);

-				rule__Angle__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Angle__Group__0"

-

-

-	// $ANTLR start "rule__Angle__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5421:1: rule__Angle__Group__0__Impl : ( ( rule__Angle__OpAssignment_0 )? ) ;

-	public final void rule__Angle__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5425:1: ( ( ( rule__Angle__OpAssignment_0 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5426:1: ( ( rule__Angle__OpAssignment_0 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5426:1: ( ( rule__Angle__OpAssignment_0 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5427:1: ( rule__Angle__OpAssignment_0 )?

-				{

-					before(grammarAccess.getAngleAccess().getOpAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5428:1: ( rule__Angle__OpAssignment_0 )?

-					int alt77 = 2;

-					int LA77_0 = input.LA(1);

-

-					if (((LA77_0 >= 23 && LA77_0 <= 24))) {

-						alt77 = 1;

-					}

-					switch (alt77) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5428:2: rule__Angle__OpAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Angle__OpAssignment_0_in_rule__Angle__Group__0__Impl11129);

-						rule__Angle__OpAssignment_0();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getAngleAccess().getOpAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Angle__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Angle__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5438:1: rule__Angle__Group__1 : rule__Angle__Group__1__Impl rule__Angle__Group__2 ;

-	public final void rule__Angle__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5442:1: ( rule__Angle__Group__1__Impl rule__Angle__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5443:2: rule__Angle__Group__1__Impl rule__Angle__Group__2

-			{

-				pushFollow(FOLLOW_rule__Angle__Group__1__Impl_in_rule__Angle__Group__111160);

-				rule__Angle__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Angle__Group__2_in_rule__Angle__Group__111163);

-				rule__Angle__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Angle__Group__1"

-

-

-	// $ANTLR start "rule__Angle__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5450:1: rule__Angle__Group__1__Impl : ( ( rule__Angle__ValueAssignment_1 ) ) ;

-	public final void rule__Angle__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5454:1: ( ( ( rule__Angle__ValueAssignment_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5455:1: ( ( rule__Angle__ValueAssignment_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5455:1: ( ( rule__Angle__ValueAssignment_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5456:1: ( rule__Angle__ValueAssignment_1 )

-				{

-					before(grammarAccess.getAngleAccess().getValueAssignment_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5457:1: ( rule__Angle__ValueAssignment_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5457:2: rule__Angle__ValueAssignment_1

-					{

-						pushFollow(FOLLOW_rule__Angle__ValueAssignment_1_in_rule__Angle__Group__1__Impl11190);

-						rule__Angle__ValueAssignment_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getAngleAccess().getValueAssignment_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Angle__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Angle__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5467:1: rule__Angle__Group__2 : rule__Angle__Group__2__Impl ;

-	public final void rule__Angle__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5471:1: ( rule__Angle__Group__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5472:2: rule__Angle__Group__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Angle__Group__2__Impl_in_rule__Angle__Group__211220);

-				rule__Angle__Group__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Angle__Group__2"

-

-

-	// $ANTLR start "rule__Angle__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5478:1: rule__Angle__Group__2__Impl : ( ( rule__Angle__UnitAssignment_2 ) ) ;

-	public final void rule__Angle__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5482:1: ( ( ( rule__Angle__UnitAssignment_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5483:1: ( ( rule__Angle__UnitAssignment_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5483:1: ( ( rule__Angle__UnitAssignment_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5484:1: ( rule__Angle__UnitAssignment_2 )

-				{

-					before(grammarAccess.getAngleAccess().getUnitAssignment_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5485:1: ( rule__Angle__UnitAssignment_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5485:2: rule__Angle__UnitAssignment_2

-					{

-						pushFollow(FOLLOW_rule__Angle__UnitAssignment_2_in_rule__Angle__Group__2__Impl11247);

-						rule__Angle__UnitAssignment_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getAngleAccess().getUnitAssignment_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Angle__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Time__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5501:1: rule__Time__Group__0 : rule__Time__Group__0__Impl rule__Time__Group__1 ;

-	public final void rule__Time__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5505:1: ( rule__Time__Group__0__Impl rule__Time__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5506:2: rule__Time__Group__0__Impl rule__Time__Group__1

-			{

-				pushFollow(FOLLOW_rule__Time__Group__0__Impl_in_rule__Time__Group__011283);

-				rule__Time__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Time__Group__1_in_rule__Time__Group__011286);

-				rule__Time__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Time__Group__0"

-

-

-	// $ANTLR start "rule__Time__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5513:1: rule__Time__Group__0__Impl : ( ( rule__Time__OpAssignment_0 )? ) ;

-	public final void rule__Time__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5517:1: ( ( ( rule__Time__OpAssignment_0 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5518:1: ( ( rule__Time__OpAssignment_0 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5518:1: ( ( rule__Time__OpAssignment_0 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5519:1: ( rule__Time__OpAssignment_0 )?

-				{

-					before(grammarAccess.getTimeAccess().getOpAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5520:1: ( rule__Time__OpAssignment_0 )?

-					int alt78 = 2;

-					int LA78_0 = input.LA(1);

-

-					if (((LA78_0 >= 23 && LA78_0 <= 24))) {

-						alt78 = 1;

-					}

-					switch (alt78) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5520:2: rule__Time__OpAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Time__OpAssignment_0_in_rule__Time__Group__0__Impl11313);

-						rule__Time__OpAssignment_0();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getTimeAccess().getOpAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Time__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Time__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5530:1: rule__Time__Group__1 : rule__Time__Group__1__Impl rule__Time__Group__2 ;

-	public final void rule__Time__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5534:1: ( rule__Time__Group__1__Impl rule__Time__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5535:2: rule__Time__Group__1__Impl rule__Time__Group__2

-			{

-				pushFollow(FOLLOW_rule__Time__Group__1__Impl_in_rule__Time__Group__111344);

-				rule__Time__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Time__Group__2_in_rule__Time__Group__111347);

-				rule__Time__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Time__Group__1"

-

-

-	// $ANTLR start "rule__Time__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5542:1: rule__Time__Group__1__Impl : ( ( rule__Time__ValueAssignment_1 ) ) ;

-	public final void rule__Time__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5546:1: ( ( ( rule__Time__ValueAssignment_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5547:1: ( ( rule__Time__ValueAssignment_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5547:1: ( ( rule__Time__ValueAssignment_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5548:1: ( rule__Time__ValueAssignment_1 )

-				{

-					before(grammarAccess.getTimeAccess().getValueAssignment_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5549:1: ( rule__Time__ValueAssignment_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5549:2: rule__Time__ValueAssignment_1

-					{

-						pushFollow(FOLLOW_rule__Time__ValueAssignment_1_in_rule__Time__Group__1__Impl11374);

-						rule__Time__ValueAssignment_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getTimeAccess().getValueAssignment_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Time__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Time__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5559:1: rule__Time__Group__2 : rule__Time__Group__2__Impl ;

-	public final void rule__Time__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5563:1: ( rule__Time__Group__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5564:2: rule__Time__Group__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Time__Group__2__Impl_in_rule__Time__Group__211404);

-				rule__Time__Group__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Time__Group__2"

-

-

-	// $ANTLR start "rule__Time__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5570:1: rule__Time__Group__2__Impl : ( ( rule__Time__UnitAssignment_2 ) ) ;

-	public final void rule__Time__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5574:1: ( ( ( rule__Time__UnitAssignment_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5575:1: ( ( rule__Time__UnitAssignment_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5575:1: ( ( rule__Time__UnitAssignment_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5576:1: ( rule__Time__UnitAssignment_2 )

-				{

-					before(grammarAccess.getTimeAccess().getUnitAssignment_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5577:1: ( rule__Time__UnitAssignment_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5577:2: rule__Time__UnitAssignment_2

-					{

-						pushFollow(FOLLOW_rule__Time__UnitAssignment_2_in_rule__Time__Group__2__Impl11431);

-						rule__Time__UnitAssignment_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getTimeAccess().getUnitAssignment_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Time__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Frequency__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5593:1: rule__Frequency__Group__0 : rule__Frequency__Group__0__Impl rule__Frequency__Group__1 ;

-	public final void rule__Frequency__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5597:1: ( rule__Frequency__Group__0__Impl rule__Frequency__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5598:2: rule__Frequency__Group__0__Impl rule__Frequency__Group__1

-			{

-				pushFollow(FOLLOW_rule__Frequency__Group__0__Impl_in_rule__Frequency__Group__011467);

-				rule__Frequency__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Frequency__Group__1_in_rule__Frequency__Group__011470);

-				rule__Frequency__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Frequency__Group__0"

-

-

-	// $ANTLR start "rule__Frequency__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5605:1: rule__Frequency__Group__0__Impl : ( ( rule__Frequency__OpAssignment_0 )? ) ;

-	public final void rule__Frequency__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5609:1: ( ( ( rule__Frequency__OpAssignment_0 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5610:1: ( ( rule__Frequency__OpAssignment_0 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5610:1: ( ( rule__Frequency__OpAssignment_0 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5611:1: ( rule__Frequency__OpAssignment_0 )?

-				{

-					before(grammarAccess.getFrequencyAccess().getOpAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5612:1: ( rule__Frequency__OpAssignment_0 )?

-					int alt79 = 2;

-					int LA79_0 = input.LA(1);

-

-					if (((LA79_0 >= 23 && LA79_0 <= 24))) {

-						alt79 = 1;

-					}

-					switch (alt79) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5612:2: rule__Frequency__OpAssignment_0

-					{

-						pushFollow(FOLLOW_rule__Frequency__OpAssignment_0_in_rule__Frequency__Group__0__Impl11497);

-						rule__Frequency__OpAssignment_0();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getFrequencyAccess().getOpAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Frequency__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Frequency__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5622:1: rule__Frequency__Group__1 : rule__Frequency__Group__1__Impl rule__Frequency__Group__2 ;

-	public final void rule__Frequency__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5626:1: ( rule__Frequency__Group__1__Impl rule__Frequency__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5627:2: rule__Frequency__Group__1__Impl rule__Frequency__Group__2

-			{

-				pushFollow(FOLLOW_rule__Frequency__Group__1__Impl_in_rule__Frequency__Group__111528);

-				rule__Frequency__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Frequency__Group__2_in_rule__Frequency__Group__111531);

-				rule__Frequency__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Frequency__Group__1"

-

-

-	// $ANTLR start "rule__Frequency__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5634:1: rule__Frequency__Group__1__Impl : ( ( rule__Frequency__ValueAssignment_1 ) ) ;

-	public final void rule__Frequency__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5638:1: ( ( ( rule__Frequency__ValueAssignment_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5639:1: ( ( rule__Frequency__ValueAssignment_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5639:1: ( ( rule__Frequency__ValueAssignment_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5640:1: ( rule__Frequency__ValueAssignment_1 )

-				{

-					before(grammarAccess.getFrequencyAccess().getValueAssignment_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5641:1: ( rule__Frequency__ValueAssignment_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5641:2: rule__Frequency__ValueAssignment_1

-					{

-						pushFollow(FOLLOW_rule__Frequency__ValueAssignment_1_in_rule__Frequency__Group__1__Impl11558);

-						rule__Frequency__ValueAssignment_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getFrequencyAccess().getValueAssignment_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Frequency__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Frequency__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5651:1: rule__Frequency__Group__2 : rule__Frequency__Group__2__Impl ;

-	public final void rule__Frequency__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5655:1: ( rule__Frequency__Group__2__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5656:2: rule__Frequency__Group__2__Impl

-			{

-				pushFollow(FOLLOW_rule__Frequency__Group__2__Impl_in_rule__Frequency__Group__211588);

-				rule__Frequency__Group__2__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Frequency__Group__2"

-

-

-	// $ANTLR start "rule__Frequency__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5662:1: rule__Frequency__Group__2__Impl : ( ( rule__Frequency__UnitAssignment_2 ) ) ;

-	public final void rule__Frequency__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5666:1: ( ( ( rule__Frequency__UnitAssignment_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5667:1: ( ( rule__Frequency__UnitAssignment_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5667:1: ( ( rule__Frequency__UnitAssignment_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5668:1: ( rule__Frequency__UnitAssignment_2 )

-				{

-					before(grammarAccess.getFrequencyAccess().getUnitAssignment_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5669:1: ( rule__Frequency__UnitAssignment_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5669:2: rule__Frequency__UnitAssignment_2

-					{

-						pushFollow(FOLLOW_rule__Frequency__UnitAssignment_2_in_rule__Frequency__Group__2__Impl11615);

-						rule__Frequency__UnitAssignment_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getFrequencyAccess().getUnitAssignment_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Frequency__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Uri__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5685:1: rule__Uri__Group__0 : rule__Uri__Group__0__Impl rule__Uri__Group__1 ;

-	public final void rule__Uri__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5689:1: ( rule__Uri__Group__0__Impl rule__Uri__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5690:2: rule__Uri__Group__0__Impl rule__Uri__Group__1

-			{

-				pushFollow(FOLLOW_rule__Uri__Group__0__Impl_in_rule__Uri__Group__011651);

-				rule__Uri__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Uri__Group__1_in_rule__Uri__Group__011654);

-				rule__Uri__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Uri__Group__0"

-

-

-	// $ANTLR start "rule__Uri__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5697:1: rule__Uri__Group__0__Impl : ( 'url(' ) ;

-	public final void rule__Uri__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5701:1: ( ( 'url(' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5702:1: ( 'url(' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5702:1: ( 'url(' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5703:1: 'url('

-				{

-					before(grammarAccess.getUriAccess().getUrlKeyword_0());

-					match(input, 40, FOLLOW_40_in_rule__Uri__Group__0__Impl11682);

-					after(grammarAccess.getUriAccess().getUrlKeyword_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Uri__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Uri__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5716:1: rule__Uri__Group__1 : rule__Uri__Group__1__Impl rule__Uri__Group__2 ;

-	public final void rule__Uri__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5720:1: ( rule__Uri__Group__1__Impl rule__Uri__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5721:2: rule__Uri__Group__1__Impl rule__Uri__Group__2

-			{

-				pushFollow(FOLLOW_rule__Uri__Group__1__Impl_in_rule__Uri__Group__111713);

-				rule__Uri__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Uri__Group__2_in_rule__Uri__Group__111716);

-				rule__Uri__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Uri__Group__1"

-

-

-	// $ANTLR start "rule__Uri__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5728:1: rule__Uri__Group__1__Impl : ( ( RULE_WS )? ) ;

-	public final void rule__Uri__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5732:1: ( ( ( RULE_WS )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5733:1: ( ( RULE_WS )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5733:1: ( ( RULE_WS )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5734:1: ( RULE_WS )?

-				{

-					before(grammarAccess.getUriAccess().getWSTerminalRuleCall_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5735:1: ( RULE_WS )?

-					int alt80 = 2;

-					int LA80_0 = input.LA(1);

-

-					if ((LA80_0 == RULE_WS)) {

-						alt80 = 1;

-					}

-					switch (alt80) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5735:3: RULE_WS

-					{

-						match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Uri__Group__1__Impl11744);

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getUriAccess().getWSTerminalRuleCall_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Uri__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Uri__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5745:1: rule__Uri__Group__2 : rule__Uri__Group__2__Impl rule__Uri__Group__3 ;

-	public final void rule__Uri__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5749:1: ( rule__Uri__Group__2__Impl rule__Uri__Group__3 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5750:2: rule__Uri__Group__2__Impl rule__Uri__Group__3

-			{

-				pushFollow(FOLLOW_rule__Uri__Group__2__Impl_in_rule__Uri__Group__211775);

-				rule__Uri__Group__2__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Uri__Group__3_in_rule__Uri__Group__211778);

-				rule__Uri__Group__3();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Uri__Group__2"

-

-

-	// $ANTLR start "rule__Uri__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5757:1: rule__Uri__Group__2__Impl : ( ( rule__Uri__ValueAssignment_2 ) ) ;

-	public final void rule__Uri__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5761:1: ( ( ( rule__Uri__ValueAssignment_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5762:1: ( ( rule__Uri__ValueAssignment_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5762:1: ( ( rule__Uri__ValueAssignment_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5763:1: ( rule__Uri__ValueAssignment_2 )

-				{

-					before(grammarAccess.getUriAccess().getValueAssignment_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5764:1: ( rule__Uri__ValueAssignment_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5764:2: rule__Uri__ValueAssignment_2

-					{

-						pushFollow(FOLLOW_rule__Uri__ValueAssignment_2_in_rule__Uri__Group__2__Impl11805);

-						rule__Uri__ValueAssignment_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getUriAccess().getValueAssignment_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Uri__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Uri__Group__3"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5774:1: rule__Uri__Group__3 : rule__Uri__Group__3__Impl rule__Uri__Group__4 ;

-	public final void rule__Uri__Group__3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5778:1: ( rule__Uri__Group__3__Impl rule__Uri__Group__4 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5779:2: rule__Uri__Group__3__Impl rule__Uri__Group__4

-			{

-				pushFollow(FOLLOW_rule__Uri__Group__3__Impl_in_rule__Uri__Group__311835);

-				rule__Uri__Group__3__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Uri__Group__4_in_rule__Uri__Group__311838);

-				rule__Uri__Group__4();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Uri__Group__3"

-

-

-	// $ANTLR start "rule__Uri__Group__3__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5786:1: rule__Uri__Group__3__Impl : ( ( RULE_WS )? ) ;

-	public final void rule__Uri__Group__3__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5790:1: ( ( ( RULE_WS )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5791:1: ( ( RULE_WS )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5791:1: ( ( RULE_WS )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5792:1: ( RULE_WS )?

-				{

-					before(grammarAccess.getUriAccess().getWSTerminalRuleCall_3());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5793:1: ( RULE_WS )?

-					int alt81 = 2;

-					int LA81_0 = input.LA(1);

-

-					if ((LA81_0 == RULE_WS)) {

-						alt81 = 1;

-					}

-					switch (alt81) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5793:3: RULE_WS

-					{

-						match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Uri__Group__3__Impl11866);

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getUriAccess().getWSTerminalRuleCall_3());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Uri__Group__3__Impl"

-

-

-	// $ANTLR start "rule__Uri__Group__4"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5803:1: rule__Uri__Group__4 : rule__Uri__Group__4__Impl ;

-	public final void rule__Uri__Group__4() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5807:1: ( rule__Uri__Group__4__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5808:2: rule__Uri__Group__4__Impl

-			{

-				pushFollow(FOLLOW_rule__Uri__Group__4__Impl_in_rule__Uri__Group__411897);

-				rule__Uri__Group__4__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Uri__Group__4"

-

-

-	// $ANTLR start "rule__Uri__Group__4__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5814:1: rule__Uri__Group__4__Impl : ( ')' ) ;

-	public final void rule__Uri__Group__4__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5818:1: ( ( ')' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5819:1: ( ')' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5819:1: ( ')' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5820:1: ')'

-				{

-					before(grammarAccess.getUriAccess().getRightParenthesisKeyword_4());

-					match(input, 39, FOLLOW_39_in_rule__Uri__Group__4__Impl11925);

-					after(grammarAccess.getUriAccess().getRightParenthesisKeyword_4());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Uri__Group__4__Impl"

-

-

-	// $ANTLR start "rule__Operator__Group_0__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5843:1: rule__Operator__Group_0__0 : rule__Operator__Group_0__0__Impl rule__Operator__Group_0__1 ;

-	public final void rule__Operator__Group_0__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5847:1: ( rule__Operator__Group_0__0__Impl rule__Operator__Group_0__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5848:2: rule__Operator__Group_0__0__Impl rule__Operator__Group_0__1

-			{

-				pushFollow(FOLLOW_rule__Operator__Group_0__0__Impl_in_rule__Operator__Group_0__011966);

-				rule__Operator__Group_0__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Operator__Group_0__1_in_rule__Operator__Group_0__011969);

-				rule__Operator__Group_0__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Operator__Group_0__0"

-

-

-	// $ANTLR start "rule__Operator__Group_0__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5855:1: rule__Operator__Group_0__0__Impl : ( '/' ) ;

-	public final void rule__Operator__Group_0__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5859:1: ( ( '/' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5860:1: ( '/' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5860:1: ( '/' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5861:1: '/'

-				{

-					before(grammarAccess.getOperatorAccess().getSolidusKeyword_0_0());

-					match(input, 41, FOLLOW_41_in_rule__Operator__Group_0__0__Impl11997);

-					after(grammarAccess.getOperatorAccess().getSolidusKeyword_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Operator__Group_0__0__Impl"

-

-

-	// $ANTLR start "rule__Operator__Group_0__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5874:1: rule__Operator__Group_0__1 : rule__Operator__Group_0__1__Impl ;

-	public final void rule__Operator__Group_0__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5878:1: ( rule__Operator__Group_0__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5879:2: rule__Operator__Group_0__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Operator__Group_0__1__Impl_in_rule__Operator__Group_0__112028);

-				rule__Operator__Group_0__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Operator__Group_0__1"

-

-

-	// $ANTLR start "rule__Operator__Group_0__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5885:1: rule__Operator__Group_0__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Operator__Group_0__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5889:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5890:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5890:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5891:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getOperatorAccess().getWSTerminalRuleCall_0_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5892:1: ( RULE_WS )*

-					loop82: do {

-						int alt82 = 2;

-						int LA82_0 = input.LA(1);

-

-						if ((LA82_0 == RULE_WS)) {

-							alt82 = 1;

-						}

-

-

-						switch (alt82) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5892:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Operator__Group_0__1__Impl12056);

-

-						}

-							break;

-

-						default:

-							break loop82;

-						}

-					} while (true);

-

-					after(grammarAccess.getOperatorAccess().getWSTerminalRuleCall_0_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Operator__Group_0__1__Impl"

-

-

-	// $ANTLR start "rule__Operator__Group_1__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5906:1: rule__Operator__Group_1__0 : rule__Operator__Group_1__0__Impl rule__Operator__Group_1__1 ;

-	public final void rule__Operator__Group_1__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5910:1: ( rule__Operator__Group_1__0__Impl rule__Operator__Group_1__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5911:2: rule__Operator__Group_1__0__Impl rule__Operator__Group_1__1

-			{

-				pushFollow(FOLLOW_rule__Operator__Group_1__0__Impl_in_rule__Operator__Group_1__012091);

-				rule__Operator__Group_1__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Operator__Group_1__1_in_rule__Operator__Group_1__012094);

-				rule__Operator__Group_1__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Operator__Group_1__0"

-

-

-	// $ANTLR start "rule__Operator__Group_1__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5918:1: rule__Operator__Group_1__0__Impl : ( ',' ) ;

-	public final void rule__Operator__Group_1__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5922:1: ( ( ',' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5923:1: ( ',' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5923:1: ( ',' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5924:1: ','

-				{

-					before(grammarAccess.getOperatorAccess().getCommaKeyword_1_0());

-					match(input, 32, FOLLOW_32_in_rule__Operator__Group_1__0__Impl12122);

-					after(grammarAccess.getOperatorAccess().getCommaKeyword_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Operator__Group_1__0__Impl"

-

-

-	// $ANTLR start "rule__Operator__Group_1__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5937:1: rule__Operator__Group_1__1 : rule__Operator__Group_1__1__Impl ;

-	public final void rule__Operator__Group_1__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5941:1: ( rule__Operator__Group_1__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5942:2: rule__Operator__Group_1__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Operator__Group_1__1__Impl_in_rule__Operator__Group_1__112153);

-				rule__Operator__Group_1__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Operator__Group_1__1"

-

-

-	// $ANTLR start "rule__Operator__Group_1__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5948:1: rule__Operator__Group_1__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Operator__Group_1__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5952:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5953:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5953:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5954:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getOperatorAccess().getWSTerminalRuleCall_1_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5955:1: ( RULE_WS )*

-					loop83: do {

-						int alt83 = 2;

-						int LA83_0 = input.LA(1);

-

-						if ((LA83_0 == RULE_WS)) {

-							alt83 = 1;

-						}

-

-

-						switch (alt83) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5955:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Operator__Group_1__1__Impl12181);

-

-						}

-							break;

-

-						default:

-							break loop83;

-						}

-					} while (true);

-

-					after(grammarAccess.getOperatorAccess().getWSTerminalRuleCall_1_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Operator__Group_1__1__Impl"

-

-

-	// $ANTLR start "rule__Attribute__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5969:1: rule__Attribute__Group__0 : rule__Attribute__Group__0__Impl rule__Attribute__Group__1 ;

-	public final void rule__Attribute__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5973:1: ( rule__Attribute__Group__0__Impl rule__Attribute__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5974:2: rule__Attribute__Group__0__Impl rule__Attribute__Group__1

-			{

-				pushFollow(FOLLOW_rule__Attribute__Group__0__Impl_in_rule__Attribute__Group__012216);

-				rule__Attribute__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Attribute__Group__1_in_rule__Attribute__Group__012219);

-				rule__Attribute__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__Group__0"

-

-

-	// $ANTLR start "rule__Attribute__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5981:1: rule__Attribute__Group__0__Impl : ( '[' ) ;

-	public final void rule__Attribute__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5985:1: ( ( '[' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5986:1: ( '[' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5986:1: ( '[' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:5987:1: '['

-				{

-					before(grammarAccess.getAttributeAccess().getLeftSquareBracketKeyword_0());

-					match(input, 42, FOLLOW_42_in_rule__Attribute__Group__0__Impl12247);

-					after(grammarAccess.getAttributeAccess().getLeftSquareBracketKeyword_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Attribute__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6000:1: rule__Attribute__Group__1 : rule__Attribute__Group__1__Impl rule__Attribute__Group__2 ;

-	public final void rule__Attribute__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6004:1: ( rule__Attribute__Group__1__Impl rule__Attribute__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6005:2: rule__Attribute__Group__1__Impl rule__Attribute__Group__2

-			{

-				pushFollow(FOLLOW_rule__Attribute__Group__1__Impl_in_rule__Attribute__Group__112278);

-				rule__Attribute__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Attribute__Group__2_in_rule__Attribute__Group__112281);

-				rule__Attribute__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__Group__1"

-

-

-	// $ANTLR start "rule__Attribute__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6012:1: rule__Attribute__Group__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Attribute__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6016:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6017:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6017:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6018:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getAttributeAccess().getWSTerminalRuleCall_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6019:1: ( RULE_WS )*

-					loop84: do {

-						int alt84 = 2;

-						int LA84_0 = input.LA(1);

-

-						if ((LA84_0 == RULE_WS)) {

-							alt84 = 1;

-						}

-

-

-						switch (alt84) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6019:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Attribute__Group__1__Impl12309);

-

-						}

-							break;

-

-						default:

-							break loop84;

-						}

-					} while (true);

-

-					after(grammarAccess.getAttributeAccess().getWSTerminalRuleCall_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Attribute__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6029:1: rule__Attribute__Group__2 : rule__Attribute__Group__2__Impl rule__Attribute__Group__3 ;

-	public final void rule__Attribute__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6033:1: ( rule__Attribute__Group__2__Impl rule__Attribute__Group__3 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6034:2: rule__Attribute__Group__2__Impl rule__Attribute__Group__3

-			{

-				pushFollow(FOLLOW_rule__Attribute__Group__2__Impl_in_rule__Attribute__Group__212340);

-				rule__Attribute__Group__2__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Attribute__Group__3_in_rule__Attribute__Group__212343);

-				rule__Attribute__Group__3();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__Group__2"

-

-

-	// $ANTLR start "rule__Attribute__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6041:1: rule__Attribute__Group__2__Impl : ( ( rule__Attribute__NameAssignment_2 ) ) ;

-	public final void rule__Attribute__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6045:1: ( ( ( rule__Attribute__NameAssignment_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6046:1: ( ( rule__Attribute__NameAssignment_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6046:1: ( ( rule__Attribute__NameAssignment_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6047:1: ( rule__Attribute__NameAssignment_2 )

-				{

-					before(grammarAccess.getAttributeAccess().getNameAssignment_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6048:1: ( rule__Attribute__NameAssignment_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6048:2: rule__Attribute__NameAssignment_2

-					{

-						pushFollow(FOLLOW_rule__Attribute__NameAssignment_2_in_rule__Attribute__Group__2__Impl12370);

-						rule__Attribute__NameAssignment_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getAttributeAccess().getNameAssignment_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__Group__2__Impl"

-

-

-	// $ANTLR start "rule__Attribute__Group__3"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6058:1: rule__Attribute__Group__3 : rule__Attribute__Group__3__Impl rule__Attribute__Group__4 ;

-	public final void rule__Attribute__Group__3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6062:1: ( rule__Attribute__Group__3__Impl rule__Attribute__Group__4 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6063:2: rule__Attribute__Group__3__Impl rule__Attribute__Group__4

-			{

-				pushFollow(FOLLOW_rule__Attribute__Group__3__Impl_in_rule__Attribute__Group__312400);

-				rule__Attribute__Group__3__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Attribute__Group__4_in_rule__Attribute__Group__312403);

-				rule__Attribute__Group__4();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__Group__3"

-

-

-	// $ANTLR start "rule__Attribute__Group__3__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6070:1: rule__Attribute__Group__3__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Attribute__Group__3__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6074:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6075:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6075:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6076:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getAttributeAccess().getWSTerminalRuleCall_3());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6077:1: ( RULE_WS )*

-					loop85: do {

-						int alt85 = 2;

-						int LA85_0 = input.LA(1);

-

-						if ((LA85_0 == RULE_WS)) {

-							alt85 = 1;

-						}

-

-

-						switch (alt85) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6077:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Attribute__Group__3__Impl12431);

-

-						}

-							break;

-

-						default:

-							break loop85;

-						}

-					} while (true);

-

-					after(grammarAccess.getAttributeAccess().getWSTerminalRuleCall_3());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__Group__3__Impl"

-

-

-	// $ANTLR start "rule__Attribute__Group__4"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6087:1: rule__Attribute__Group__4 : rule__Attribute__Group__4__Impl rule__Attribute__Group__5 ;

-	public final void rule__Attribute__Group__4() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6091:1: ( rule__Attribute__Group__4__Impl rule__Attribute__Group__5 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6092:2: rule__Attribute__Group__4__Impl rule__Attribute__Group__5

-			{

-				pushFollow(FOLLOW_rule__Attribute__Group__4__Impl_in_rule__Attribute__Group__412462);

-				rule__Attribute__Group__4__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Attribute__Group__5_in_rule__Attribute__Group__412465);

-				rule__Attribute__Group__5();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__Group__4"

-

-

-	// $ANTLR start "rule__Attribute__Group__4__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6099:1: rule__Attribute__Group__4__Impl : ( ( rule__Attribute__ValueAssignment_4 )? ) ;

-	public final void rule__Attribute__Group__4__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6103:1: ( ( ( rule__Attribute__ValueAssignment_4 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6104:1: ( ( rule__Attribute__ValueAssignment_4 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6104:1: ( ( rule__Attribute__ValueAssignment_4 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6105:1: ( rule__Attribute__ValueAssignment_4 )?

-				{

-					before(grammarAccess.getAttributeAccess().getValueAssignment_4());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6106:1: ( rule__Attribute__ValueAssignment_4 )?

-					int alt86 = 2;

-					int LA86_0 = input.LA(1);

-

-					if (((LA86_0 >= 26 && LA86_0 <= 28))) {

-						alt86 = 1;

-					}

-					switch (alt86) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6106:2: rule__Attribute__ValueAssignment_4

-					{

-						pushFollow(FOLLOW_rule__Attribute__ValueAssignment_4_in_rule__Attribute__Group__4__Impl12492);

-						rule__Attribute__ValueAssignment_4();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getAttributeAccess().getValueAssignment_4());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__Group__4__Impl"

-

-

-	// $ANTLR start "rule__Attribute__Group__5"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6116:1: rule__Attribute__Group__5 : rule__Attribute__Group__5__Impl ;

-	public final void rule__Attribute__Group__5() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6120:1: ( rule__Attribute__Group__5__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6121:2: rule__Attribute__Group__5__Impl

-			{

-				pushFollow(FOLLOW_rule__Attribute__Group__5__Impl_in_rule__Attribute__Group__512523);

-				rule__Attribute__Group__5__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__Group__5"

-

-

-	// $ANTLR start "rule__Attribute__Group__5__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6127:1: rule__Attribute__Group__5__Impl : ( ']' ) ;

-	public final void rule__Attribute__Group__5__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6131:1: ( ( ']' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6132:1: ( ']' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6132:1: ( ']' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6133:1: ']'

-				{

-					before(grammarAccess.getAttributeAccess().getRightSquareBracketKeyword_5());

-					match(input, 43, FOLLOW_43_in_rule__Attribute__Group__5__Impl12551);

-					after(grammarAccess.getAttributeAccess().getRightSquareBracketKeyword_5());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__Group__5__Impl"

-

-

-	// $ANTLR start "rule__AttributeValue__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6158:1: rule__AttributeValue__Group__0 : rule__AttributeValue__Group__0__Impl rule__AttributeValue__Group__1 ;

-	public final void rule__AttributeValue__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6162:1: ( rule__AttributeValue__Group__0__Impl rule__AttributeValue__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6163:2: rule__AttributeValue__Group__0__Impl rule__AttributeValue__Group__1

-			{

-				pushFollow(FOLLOW_rule__AttributeValue__Group__0__Impl_in_rule__AttributeValue__Group__012594);

-				rule__AttributeValue__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__AttributeValue__Group__1_in_rule__AttributeValue__Group__012597);

-				rule__AttributeValue__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__AttributeValue__Group__0"

-

-

-	// $ANTLR start "rule__AttributeValue__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6170:1: rule__AttributeValue__Group__0__Impl : ( ( rule__AttributeValue__OperatorAssignment_0 ) ) ;

-	public final void rule__AttributeValue__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6174:1: ( ( ( rule__AttributeValue__OperatorAssignment_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6175:1: ( ( rule__AttributeValue__OperatorAssignment_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6175:1: ( ( rule__AttributeValue__OperatorAssignment_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6176:1: ( rule__AttributeValue__OperatorAssignment_0 )

-				{

-					before(grammarAccess.getAttributeValueAccess().getOperatorAssignment_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6177:1: ( rule__AttributeValue__OperatorAssignment_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6177:2: rule__AttributeValue__OperatorAssignment_0

-					{

-						pushFollow(FOLLOW_rule__AttributeValue__OperatorAssignment_0_in_rule__AttributeValue__Group__0__Impl12624);

-						rule__AttributeValue__OperatorAssignment_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getAttributeValueAccess().getOperatorAssignment_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__AttributeValue__Group__0__Impl"

-

-

-	// $ANTLR start "rule__AttributeValue__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6187:1: rule__AttributeValue__Group__1 : rule__AttributeValue__Group__1__Impl rule__AttributeValue__Group__2 ;

-	public final void rule__AttributeValue__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6191:1: ( rule__AttributeValue__Group__1__Impl rule__AttributeValue__Group__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6192:2: rule__AttributeValue__Group__1__Impl rule__AttributeValue__Group__2

-			{

-				pushFollow(FOLLOW_rule__AttributeValue__Group__1__Impl_in_rule__AttributeValue__Group__112654);

-				rule__AttributeValue__Group__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__AttributeValue__Group__2_in_rule__AttributeValue__Group__112657);

-				rule__AttributeValue__Group__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__AttributeValue__Group__1"

-

-

-	// $ANTLR start "rule__AttributeValue__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6199:1: rule__AttributeValue__Group__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__AttributeValue__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6203:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6204:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6204:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6205:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6206:1: ( RULE_WS )*

-					loop87: do {

-						int alt87 = 2;

-						int LA87_0 = input.LA(1);

-

-						if ((LA87_0 == RULE_WS)) {

-							alt87 = 1;

-						}

-

-

-						switch (alt87) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6206:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__AttributeValue__Group__1__Impl12685);

-

-						}

-							break;

-

-						default:

-							break loop87;

-						}

-					} while (true);

-

-					after(grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__AttributeValue__Group__1__Impl"

-

-

-	// $ANTLR start "rule__AttributeValue__Group__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6216:1: rule__AttributeValue__Group__2 : rule__AttributeValue__Group__2__Impl rule__AttributeValue__Group__3 ;

-	public final void rule__AttributeValue__Group__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6220:1: ( rule__AttributeValue__Group__2__Impl rule__AttributeValue__Group__3 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6221:2: rule__AttributeValue__Group__2__Impl rule__AttributeValue__Group__3

-			{

-				pushFollow(FOLLOW_rule__AttributeValue__Group__2__Impl_in_rule__AttributeValue__Group__212716);

-				rule__AttributeValue__Group__2__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__AttributeValue__Group__3_in_rule__AttributeValue__Group__212719);

-				rule__AttributeValue__Group__3();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__AttributeValue__Group__2"

-

-

-	// $ANTLR start "rule__AttributeValue__Group__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6228:1: rule__AttributeValue__Group__2__Impl : ( ( rule__AttributeValue__ValueAssignment_2 ) ) ;

-	public final void rule__AttributeValue__Group__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6232:1: ( ( ( rule__AttributeValue__ValueAssignment_2 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6233:1: ( ( rule__AttributeValue__ValueAssignment_2 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6233:1: ( ( rule__AttributeValue__ValueAssignment_2 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6234:1: ( rule__AttributeValue__ValueAssignment_2 )

-				{

-					before(grammarAccess.getAttributeValueAccess().getValueAssignment_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6235:1: ( rule__AttributeValue__ValueAssignment_2 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6235:2: rule__AttributeValue__ValueAssignment_2

-					{

-						pushFollow(FOLLOW_rule__AttributeValue__ValueAssignment_2_in_rule__AttributeValue__Group__2__Impl12746);

-						rule__AttributeValue__ValueAssignment_2();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getAttributeValueAccess().getValueAssignment_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__AttributeValue__Group__2__Impl"

-

-

-	// $ANTLR start "rule__AttributeValue__Group__3"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6245:1: rule__AttributeValue__Group__3 : rule__AttributeValue__Group__3__Impl ;

-	public final void rule__AttributeValue__Group__3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6249:1: ( rule__AttributeValue__Group__3__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6250:2: rule__AttributeValue__Group__3__Impl

-			{

-				pushFollow(FOLLOW_rule__AttributeValue__Group__3__Impl_in_rule__AttributeValue__Group__312776);

-				rule__AttributeValue__Group__3__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__AttributeValue__Group__3"

-

-

-	// $ANTLR start "rule__AttributeValue__Group__3__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6256:1: rule__AttributeValue__Group__3__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__AttributeValue__Group__3__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6260:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6261:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6261:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6262:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_3());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6263:1: ( RULE_WS )*

-					loop88: do {

-						int alt88 = 2;

-						int LA88_0 = input.LA(1);

-

-						if ((LA88_0 == RULE_WS)) {

-							alt88 = 1;

-						}

-

-

-						switch (alt88) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6263:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__AttributeValue__Group__3__Impl12804);

-

-						}

-							break;

-

-						default:

-							break loop88;

-						}

-					} while (true);

-

-					after(grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_3());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__AttributeValue__Group__3__Impl"

-

-

-	// $ANTLR start "rule__Pseudo__Group__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6281:1: rule__Pseudo__Group__0 : rule__Pseudo__Group__0__Impl rule__Pseudo__Group__1 ;

-	public final void rule__Pseudo__Group__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6285:1: ( rule__Pseudo__Group__0__Impl rule__Pseudo__Group__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6286:2: rule__Pseudo__Group__0__Impl rule__Pseudo__Group__1

-			{

-				pushFollow(FOLLOW_rule__Pseudo__Group__0__Impl_in_rule__Pseudo__Group__012843);

-				rule__Pseudo__Group__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Pseudo__Group__1_in_rule__Pseudo__Group__012846);

-				rule__Pseudo__Group__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group__0"

-

-

-	// $ANTLR start "rule__Pseudo__Group__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6293:1: rule__Pseudo__Group__0__Impl : ( ':' ) ;

-	public final void rule__Pseudo__Group__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6297:1: ( ( ':' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6298:1: ( ':' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6298:1: ( ':' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6299:1: ':'

-				{

-					before(grammarAccess.getPseudoAccess().getColonKeyword_0());

-					match(input, 37, FOLLOW_37_in_rule__Pseudo__Group__0__Impl12874);

-					after(grammarAccess.getPseudoAccess().getColonKeyword_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group__0__Impl"

-

-

-	// $ANTLR start "rule__Pseudo__Group__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6312:1: rule__Pseudo__Group__1 : rule__Pseudo__Group__1__Impl ;

-	public final void rule__Pseudo__Group__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6316:1: ( rule__Pseudo__Group__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6317:2: rule__Pseudo__Group__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Pseudo__Group__1__Impl_in_rule__Pseudo__Group__112905);

-				rule__Pseudo__Group__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group__1"

-

-

-	// $ANTLR start "rule__Pseudo__Group__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6323:1: rule__Pseudo__Group__1__Impl : ( ( rule__Pseudo__Alternatives_1 ) ) ;

-	public final void rule__Pseudo__Group__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6327:1: ( ( ( rule__Pseudo__Alternatives_1 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6328:1: ( ( rule__Pseudo__Alternatives_1 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6328:1: ( ( rule__Pseudo__Alternatives_1 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6329:1: ( rule__Pseudo__Alternatives_1 )

-				{

-					before(grammarAccess.getPseudoAccess().getAlternatives_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6330:1: ( rule__Pseudo__Alternatives_1 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6330:2: rule__Pseudo__Alternatives_1

-					{

-						pushFollow(FOLLOW_rule__Pseudo__Alternatives_1_in_rule__Pseudo__Group__1__Impl12932);

-						rule__Pseudo__Alternatives_1();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getPseudoAccess().getAlternatives_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group__1__Impl"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6344:1: rule__Pseudo__Group_1_1__0 : rule__Pseudo__Group_1_1__0__Impl rule__Pseudo__Group_1_1__1 ;

-	public final void rule__Pseudo__Group_1_1__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6348:1: ( rule__Pseudo__Group_1_1__0__Impl rule__Pseudo__Group_1_1__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6349:2: rule__Pseudo__Group_1_1__0__Impl rule__Pseudo__Group_1_1__1

-			{

-				pushFollow(FOLLOW_rule__Pseudo__Group_1_1__0__Impl_in_rule__Pseudo__Group_1_1__012966);

-				rule__Pseudo__Group_1_1__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Pseudo__Group_1_1__1_in_rule__Pseudo__Group_1_1__012969);

-				rule__Pseudo__Group_1_1__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1__0"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6356:1: rule__Pseudo__Group_1_1__0__Impl : ( ( rule__Pseudo__PseudoAssignment_1_1_0 ) ) ;

-	public final void rule__Pseudo__Group_1_1__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6360:1: ( ( ( rule__Pseudo__PseudoAssignment_1_1_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6361:1: ( ( rule__Pseudo__PseudoAssignment_1_1_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6361:1: ( ( rule__Pseudo__PseudoAssignment_1_1_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6362:1: ( rule__Pseudo__PseudoAssignment_1_1_0 )

-				{

-					before(grammarAccess.getPseudoAccess().getPseudoAssignment_1_1_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6363:1: ( rule__Pseudo__PseudoAssignment_1_1_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6363:2: rule__Pseudo__PseudoAssignment_1_1_0

-					{

-						pushFollow(FOLLOW_rule__Pseudo__PseudoAssignment_1_1_0_in_rule__Pseudo__Group_1_1__0__Impl12996);

-						rule__Pseudo__PseudoAssignment_1_1_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getPseudoAccess().getPseudoAssignment_1_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1__0__Impl"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6373:1: rule__Pseudo__Group_1_1__1 : rule__Pseudo__Group_1_1__1__Impl rule__Pseudo__Group_1_1__2 ;

-	public final void rule__Pseudo__Group_1_1__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6377:1: ( rule__Pseudo__Group_1_1__1__Impl rule__Pseudo__Group_1_1__2 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6378:2: rule__Pseudo__Group_1_1__1__Impl rule__Pseudo__Group_1_1__2

-			{

-				pushFollow(FOLLOW_rule__Pseudo__Group_1_1__1__Impl_in_rule__Pseudo__Group_1_1__113026);

-				rule__Pseudo__Group_1_1__1__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Pseudo__Group_1_1__2_in_rule__Pseudo__Group_1_1__113029);

-				rule__Pseudo__Group_1_1__2();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1__1"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6385:1: rule__Pseudo__Group_1_1__1__Impl : ( '(' ) ;

-	public final void rule__Pseudo__Group_1_1__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6389:1: ( ( '(' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6390:1: ( '(' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6390:1: ( '(' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6391:1: '('

-				{

-					before(grammarAccess.getPseudoAccess().getLeftParenthesisKeyword_1_1_1());

-					match(input, 38, FOLLOW_38_in_rule__Pseudo__Group_1_1__1__Impl13057);

-					after(grammarAccess.getPseudoAccess().getLeftParenthesisKeyword_1_1_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1__1__Impl"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1__2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6404:1: rule__Pseudo__Group_1_1__2 : rule__Pseudo__Group_1_1__2__Impl rule__Pseudo__Group_1_1__3 ;

-	public final void rule__Pseudo__Group_1_1__2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6408:1: ( rule__Pseudo__Group_1_1__2__Impl rule__Pseudo__Group_1_1__3 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6409:2: rule__Pseudo__Group_1_1__2__Impl rule__Pseudo__Group_1_1__3

-			{

-				pushFollow(FOLLOW_rule__Pseudo__Group_1_1__2__Impl_in_rule__Pseudo__Group_1_1__213088);

-				rule__Pseudo__Group_1_1__2__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Pseudo__Group_1_1__3_in_rule__Pseudo__Group_1_1__213091);

-				rule__Pseudo__Group_1_1__3();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1__2"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1__2__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6416:1: rule__Pseudo__Group_1_1__2__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Pseudo__Group_1_1__2__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6420:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6421:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6421:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6422:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_2());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6423:1: ( RULE_WS )*

-					loop89: do {

-						int alt89 = 2;

-						int LA89_0 = input.LA(1);

-

-						if ((LA89_0 == RULE_WS)) {

-							alt89 = 1;

-						}

-

-

-						switch (alt89) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6423:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Pseudo__Group_1_1__2__Impl13119);

-

-						}

-							break;

-

-						default:

-							break loop89;

-						}

-					} while (true);

-

-					after(grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_2());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1__2__Impl"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1__3"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6433:1: rule__Pseudo__Group_1_1__3 : rule__Pseudo__Group_1_1__3__Impl rule__Pseudo__Group_1_1__4 ;

-	public final void rule__Pseudo__Group_1_1__3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6437:1: ( rule__Pseudo__Group_1_1__3__Impl rule__Pseudo__Group_1_1__4 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6438:2: rule__Pseudo__Group_1_1__3__Impl rule__Pseudo__Group_1_1__4

-			{

-				pushFollow(FOLLOW_rule__Pseudo__Group_1_1__3__Impl_in_rule__Pseudo__Group_1_1__313150);

-				rule__Pseudo__Group_1_1__3__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Pseudo__Group_1_1__4_in_rule__Pseudo__Group_1_1__313153);

-				rule__Pseudo__Group_1_1__4();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1__3"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1__3__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6445:1: rule__Pseudo__Group_1_1__3__Impl : ( ( rule__Pseudo__Group_1_1_3__0 )? ) ;

-	public final void rule__Pseudo__Group_1_1__3__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6449:1: ( ( ( rule__Pseudo__Group_1_1_3__0 )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6450:1: ( ( rule__Pseudo__Group_1_1_3__0 )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6450:1: ( ( rule__Pseudo__Group_1_1_3__0 )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6451:1: ( rule__Pseudo__Group_1_1_3__0 )?

-				{

-					before(grammarAccess.getPseudoAccess().getGroup_1_1_3());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6452:1: ( rule__Pseudo__Group_1_1_3__0 )?

-					int alt90 = 2;

-					int LA90_0 = input.LA(1);

-

-					if ((LA90_0 == RULE_ID)) {

-						alt90 = 1;

-					}

-					switch (alt90) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6452:2: rule__Pseudo__Group_1_1_3__0

-					{

-						pushFollow(FOLLOW_rule__Pseudo__Group_1_1_3__0_in_rule__Pseudo__Group_1_1__3__Impl13180);

-						rule__Pseudo__Group_1_1_3__0();

-

-						state._fsp--;

-

-

-					}

-						break;

-

-					}

-

-					after(grammarAccess.getPseudoAccess().getGroup_1_1_3());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1__3__Impl"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1__4"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6462:1: rule__Pseudo__Group_1_1__4 : rule__Pseudo__Group_1_1__4__Impl ;

-	public final void rule__Pseudo__Group_1_1__4() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6466:1: ( rule__Pseudo__Group_1_1__4__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6467:2: rule__Pseudo__Group_1_1__4__Impl

-			{

-				pushFollow(FOLLOW_rule__Pseudo__Group_1_1__4__Impl_in_rule__Pseudo__Group_1_1__413211);

-				rule__Pseudo__Group_1_1__4__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1__4"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1__4__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6473:1: rule__Pseudo__Group_1_1__4__Impl : ( ')' ) ;

-	public final void rule__Pseudo__Group_1_1__4__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6477:1: ( ( ')' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6478:1: ( ')' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6478:1: ( ')' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6479:1: ')'

-				{

-					before(grammarAccess.getPseudoAccess().getRightParenthesisKeyword_1_1_4());

-					match(input, 39, FOLLOW_39_in_rule__Pseudo__Group_1_1__4__Impl13239);

-					after(grammarAccess.getPseudoAccess().getRightParenthesisKeyword_1_1_4());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1__4__Impl"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1_3__0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6502:1: rule__Pseudo__Group_1_1_3__0 : rule__Pseudo__Group_1_1_3__0__Impl rule__Pseudo__Group_1_1_3__1 ;

-	public final void rule__Pseudo__Group_1_1_3__0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6506:1: ( rule__Pseudo__Group_1_1_3__0__Impl rule__Pseudo__Group_1_1_3__1 )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6507:2: rule__Pseudo__Group_1_1_3__0__Impl rule__Pseudo__Group_1_1_3__1

-			{

-				pushFollow(FOLLOW_rule__Pseudo__Group_1_1_3__0__Impl_in_rule__Pseudo__Group_1_1_3__013280);

-				rule__Pseudo__Group_1_1_3__0__Impl();

-

-				state._fsp--;

-

-				pushFollow(FOLLOW_rule__Pseudo__Group_1_1_3__1_in_rule__Pseudo__Group_1_1_3__013283);

-				rule__Pseudo__Group_1_1_3__1();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1_3__0"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1_3__0__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6514:1: rule__Pseudo__Group_1_1_3__0__Impl : ( ( rule__Pseudo__ArgsAssignment_1_1_3_0 ) ) ;

-	public final void rule__Pseudo__Group_1_1_3__0__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6518:1: ( ( ( rule__Pseudo__ArgsAssignment_1_1_3_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6519:1: ( ( rule__Pseudo__ArgsAssignment_1_1_3_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6519:1: ( ( rule__Pseudo__ArgsAssignment_1_1_3_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6520:1: ( rule__Pseudo__ArgsAssignment_1_1_3_0 )

-				{

-					before(grammarAccess.getPseudoAccess().getArgsAssignment_1_1_3_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6521:1: ( rule__Pseudo__ArgsAssignment_1_1_3_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6521:2: rule__Pseudo__ArgsAssignment_1_1_3_0

-					{

-						pushFollow(FOLLOW_rule__Pseudo__ArgsAssignment_1_1_3_0_in_rule__Pseudo__Group_1_1_3__0__Impl13310);

-						rule__Pseudo__ArgsAssignment_1_1_3_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getPseudoAccess().getArgsAssignment_1_1_3_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1_3__0__Impl"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1_3__1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6531:1: rule__Pseudo__Group_1_1_3__1 : rule__Pseudo__Group_1_1_3__1__Impl ;

-	public final void rule__Pseudo__Group_1_1_3__1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6535:1: ( rule__Pseudo__Group_1_1_3__1__Impl )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6536:2: rule__Pseudo__Group_1_1_3__1__Impl

-			{

-				pushFollow(FOLLOW_rule__Pseudo__Group_1_1_3__1__Impl_in_rule__Pseudo__Group_1_1_3__113340);

-				rule__Pseudo__Group_1_1_3__1__Impl();

-

-				state._fsp--;

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1_3__1"

-

-

-	// $ANTLR start "rule__Pseudo__Group_1_1_3__1__Impl"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6542:1: rule__Pseudo__Group_1_1_3__1__Impl : ( ( RULE_WS )* ) ;

-	public final void rule__Pseudo__Group_1_1_3__1__Impl() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6546:1: ( ( ( RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6547:1: ( ( RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6547:1: ( ( RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6548:1: ( RULE_WS )*

-				{

-					before(grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_3_1());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6549:1: ( RULE_WS )*

-					loop91: do {

-						int alt91 = 2;

-						int LA91_0 = input.LA(1);

-

-						if ((LA91_0 == RULE_WS)) {

-							alt91 = 1;

-						}

-

-

-						switch (alt91) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6549:3: RULE_WS

-						{

-							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Pseudo__Group_1_1_3__1__Impl13368);

-

-						}

-							break;

-

-						default:

-							break loop91;

-						}

-					} while (true);

-

-					after(grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_3_1());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__Group_1_1_3__1__Impl"

-

-

-	// $ANTLR start "rule__Stylesheet__CharsetAssignment_0_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6564:1: rule__Stylesheet__CharsetAssignment_0_1 : ( RULE_STRING ) ;

-	public final void rule__Stylesheet__CharsetAssignment_0_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6568:1: ( ( RULE_STRING ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6569:1: ( RULE_STRING )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6569:1: ( RULE_STRING )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6570:1: RULE_STRING

-				{

-					before(grammarAccess.getStylesheetAccess().getCharsetSTRINGTerminalRuleCall_0_1_0());

-					match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__Stylesheet__CharsetAssignment_0_113408);

-					after(grammarAccess.getStylesheetAccess().getCharsetSTRINGTerminalRuleCall_0_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__CharsetAssignment_0_1"

-

-

-	// $ANTLR start "rule__Stylesheet__ImportsAssignment_2_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6579:1: rule__Stylesheet__ImportsAssignment_2_0 : ( ruleImport ) ;

-	public final void rule__Stylesheet__ImportsAssignment_2_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6583:1: ( ( ruleImport ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6584:1: ( ruleImport )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6584:1: ( ruleImport )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6585:1: ruleImport

-				{

-					before(grammarAccess.getStylesheetAccess().getImportsImportParserRuleCall_2_0_0());

-					pushFollow(FOLLOW_ruleImport_in_rule__Stylesheet__ImportsAssignment_2_013439);

-					ruleImport();

-

-					state._fsp--;

-

-					after(grammarAccess.getStylesheetAccess().getImportsImportParserRuleCall_2_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__ImportsAssignment_2_0"

-

-

-	// $ANTLR start "rule__Stylesheet__ContentsAssignment_3_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6594:1: rule__Stylesheet__ContentsAssignment_3_0 : ( ruleContent ) ;

-	public final void rule__Stylesheet__ContentsAssignment_3_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6598:1: ( ( ruleContent ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6599:1: ( ruleContent )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6599:1: ( ruleContent )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6600:1: ruleContent

-				{

-					before(grammarAccess.getStylesheetAccess().getContentsContentParserRuleCall_3_0_0());

-					pushFollow(FOLLOW_ruleContent_in_rule__Stylesheet__ContentsAssignment_3_013470);

-					ruleContent();

-

-					state._fsp--;

-

-					after(grammarAccess.getStylesheetAccess().getContentsContentParserRuleCall_3_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Stylesheet__ContentsAssignment_3_0"

-

-

-	// $ANTLR start "rule__Import__StringAssignment_1_0_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6609:1: rule__Import__StringAssignment_1_0_1 : ( RULE_STRING ) ;

-	public final void rule__Import__StringAssignment_1_0_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6613:1: ( ( RULE_STRING ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6614:1: ( RULE_STRING )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6614:1: ( RULE_STRING )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6615:1: RULE_STRING

-				{

-					before(grammarAccess.getImportAccess().getStringSTRINGTerminalRuleCall_1_0_1_0());

-					match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__Import__StringAssignment_1_0_113501);

-					after(grammarAccess.getImportAccess().getStringSTRINGTerminalRuleCall_1_0_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__StringAssignment_1_0_1"

-

-

-	// $ANTLR start "rule__Import__UriAssignment_1_1_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6624:1: rule__Import__UriAssignment_1_1_1 : ( ruleUri ) ;

-	public final void rule__Import__UriAssignment_1_1_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6628:1: ( ( ruleUri ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6629:1: ( ruleUri )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6629:1: ( ruleUri )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6630:1: ruleUri

-				{

-					before(grammarAccess.getImportAccess().getUriUriParserRuleCall_1_1_1_0());

-					pushFollow(FOLLOW_ruleUri_in_rule__Import__UriAssignment_1_1_113532);

-					ruleUri();

-

-					state._fsp--;

-

-					after(grammarAccess.getImportAccess().getUriUriParserRuleCall_1_1_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__UriAssignment_1_1_1"

-

-

-	// $ANTLR start "rule__Import__MediaAssignment_3_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6639:1: rule__Import__MediaAssignment_3_0 : ( RULE_ID ) ;

-	public final void rule__Import__MediaAssignment_3_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6643:1: ( ( RULE_ID ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6644:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6644:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6645:1: RULE_ID

-				{

-					before(grammarAccess.getImportAccess().getMediaIDTerminalRuleCall_3_0_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__Import__MediaAssignment_3_013563);

-					after(grammarAccess.getImportAccess().getMediaIDTerminalRuleCall_3_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__MediaAssignment_3_0"

-

-

-	// $ANTLR start "rule__Import__MediaAssignment_3_2_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6654:1: rule__Import__MediaAssignment_3_2_2 : ( RULE_ID ) ;

-	public final void rule__Import__MediaAssignment_3_2_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6658:1: ( ( RULE_ID ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6659:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6659:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6660:1: RULE_ID

-				{

-					before(grammarAccess.getImportAccess().getMediaIDTerminalRuleCall_3_2_2_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__Import__MediaAssignment_3_2_213594);

-					after(grammarAccess.getImportAccess().getMediaIDTerminalRuleCall_3_2_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Import__MediaAssignment_3_2_2"

-

-

-	// $ANTLR start "rule__Media__MediaAssignment_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6669:1: rule__Media__MediaAssignment_2 : ( RULE_ID ) ;

-	public final void rule__Media__MediaAssignment_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6673:1: ( ( RULE_ID ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6674:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6674:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6675:1: RULE_ID

-				{

-					before(grammarAccess.getMediaAccess().getMediaIDTerminalRuleCall_2_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__Media__MediaAssignment_213625);

-					after(grammarAccess.getMediaAccess().getMediaIDTerminalRuleCall_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__MediaAssignment_2"

-

-

-	// $ANTLR start "rule__Media__MediaAssignment_4_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6684:1: rule__Media__MediaAssignment_4_2 : ( RULE_ID ) ;

-	public final void rule__Media__MediaAssignment_4_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6688:1: ( ( RULE_ID ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6689:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6689:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6690:1: RULE_ID

-				{

-					before(grammarAccess.getMediaAccess().getMediaIDTerminalRuleCall_4_2_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__Media__MediaAssignment_4_213656);

-					after(grammarAccess.getMediaAccess().getMediaIDTerminalRuleCall_4_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__MediaAssignment_4_2"

-

-

-	// $ANTLR start "rule__Media__RulesAssignment_7"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6699:1: rule__Media__RulesAssignment_7 : ( ruleRuleset ) ;

-	public final void rule__Media__RulesAssignment_7() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6703:1: ( ( ruleRuleset ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6704:1: ( ruleRuleset )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6704:1: ( ruleRuleset )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6705:1: ruleRuleset

-				{

-					before(grammarAccess.getMediaAccess().getRulesRulesetParserRuleCall_7_0());

-					pushFollow(FOLLOW_ruleRuleset_in_rule__Media__RulesAssignment_713687);

-					ruleRuleset();

-

-					state._fsp--;

-

-					after(grammarAccess.getMediaAccess().getRulesRulesetParserRuleCall_7_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Media__RulesAssignment_7"

-

-

-	// $ANTLR start "rule__Page__PseudoAssignment_3"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6714:1: rule__Page__PseudoAssignment_3 : ( rulePseudoPage ) ;

-	public final void rule__Page__PseudoAssignment_3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6718:1: ( ( rulePseudoPage ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6719:1: ( rulePseudoPage )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6719:1: ( rulePseudoPage )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6720:1: rulePseudoPage

-				{

-					before(grammarAccess.getPageAccess().getPseudoPseudoPageParserRuleCall_3_0());

-					pushFollow(FOLLOW_rulePseudoPage_in_rule__Page__PseudoAssignment_313718);

-					rulePseudoPage();

-

-					state._fsp--;

-

-					after(grammarAccess.getPageAccess().getPseudoPseudoPageParserRuleCall_3_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__PseudoAssignment_3"

-

-

-	// $ANTLR start "rule__Page__DeclarationsAssignment_6"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6729:1: rule__Page__DeclarationsAssignment_6 : ( ruleDeclaration ) ;

-	public final void rule__Page__DeclarationsAssignment_6() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6733:1: ( ( ruleDeclaration ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6734:1: ( ruleDeclaration )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6734:1: ( ruleDeclaration )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6735:1: ruleDeclaration

-				{

-					before(grammarAccess.getPageAccess().getDeclarationsDeclarationParserRuleCall_6_0());

-					pushFollow(FOLLOW_ruleDeclaration_in_rule__Page__DeclarationsAssignment_613749);

-					ruleDeclaration();

-

-					state._fsp--;

-

-					after(grammarAccess.getPageAccess().getDeclarationsDeclarationParserRuleCall_6_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__DeclarationsAssignment_6"

-

-

-	// $ANTLR start "rule__Page__DeclarationsAssignment_7_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6744:1: rule__Page__DeclarationsAssignment_7_2 : ( ruleDeclaration ) ;

-	public final void rule__Page__DeclarationsAssignment_7_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6748:1: ( ( ruleDeclaration ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6749:1: ( ruleDeclaration )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6749:1: ( ruleDeclaration )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6750:1: ruleDeclaration

-				{

-					before(grammarAccess.getPageAccess().getDeclarationsDeclarationParserRuleCall_7_2_0());

-					pushFollow(FOLLOW_ruleDeclaration_in_rule__Page__DeclarationsAssignment_7_213780);

-					ruleDeclaration();

-

-					state._fsp--;

-

-					after(grammarAccess.getPageAccess().getDeclarationsDeclarationParserRuleCall_7_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Page__DeclarationsAssignment_7_2"

-

-

-	// $ANTLR start "rule__PseudoPage__IdAssignment_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6759:1: rule__PseudoPage__IdAssignment_1 : ( RULE_ID ) ;

-	public final void rule__PseudoPage__IdAssignment_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6763:1: ( ( RULE_ID ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6764:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6764:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6765:1: RULE_ID

-				{

-					before(grammarAccess.getPseudoPageAccess().getIdIDTerminalRuleCall_1_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__PseudoPage__IdAssignment_113811);

-					after(grammarAccess.getPseudoPageAccess().getIdIDTerminalRuleCall_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__PseudoPage__IdAssignment_1"

-

-

-	// $ANTLR start "rule__Ruleset__SelectorsAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6774:1: rule__Ruleset__SelectorsAssignment_0 : ( ruleSelector ) ;

-	public final void rule__Ruleset__SelectorsAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6778:1: ( ( ruleSelector ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6779:1: ( ruleSelector )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6779:1: ( ruleSelector )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6780:1: ruleSelector

-				{

-					before(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleSelector_in_rule__Ruleset__SelectorsAssignment_013842);

-					ruleSelector();

-

-					state._fsp--;

-

-					after(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__SelectorsAssignment_0"

-

-

-	// $ANTLR start "rule__Ruleset__SelectorsAssignment_1_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6789:1: rule__Ruleset__SelectorsAssignment_1_2 : ( ruleSelector ) ;

-	public final void rule__Ruleset__SelectorsAssignment_1_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6793:1: ( ( ruleSelector ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6794:1: ( ruleSelector )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6794:1: ( ruleSelector )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6795:1: ruleSelector

-				{

-					before(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0());

-					pushFollow(FOLLOW_ruleSelector_in_rule__Ruleset__SelectorsAssignment_1_213873);

-					ruleSelector();

-

-					state._fsp--;

-

-					after(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__SelectorsAssignment_1_2"

-

-

-	// $ANTLR start "rule__Ruleset__PropertiesAssignment_4"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6804:1: rule__Ruleset__PropertiesAssignment_4 : ( ruleDeclaration ) ;

-	public final void rule__Ruleset__PropertiesAssignment_4() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6808:1: ( ( ruleDeclaration ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6809:1: ( ruleDeclaration )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6809:1: ( ruleDeclaration )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6810:1: ruleDeclaration

-				{

-					before(grammarAccess.getRulesetAccess().getPropertiesDeclarationParserRuleCall_4_0());

-					pushFollow(FOLLOW_ruleDeclaration_in_rule__Ruleset__PropertiesAssignment_413904);

-					ruleDeclaration();

-

-					state._fsp--;

-

-					after(grammarAccess.getRulesetAccess().getPropertiesDeclarationParserRuleCall_4_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__PropertiesAssignment_4"

-

-

-	// $ANTLR start "rule__Ruleset__PropertiesAssignment_5_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6819:1: rule__Ruleset__PropertiesAssignment_5_2 : ( ruleDeclaration ) ;

-	public final void rule__Ruleset__PropertiesAssignment_5_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6823:1: ( ( ruleDeclaration ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6824:1: ( ruleDeclaration )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6824:1: ( ruleDeclaration )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6825:1: ruleDeclaration

-				{

-					before(grammarAccess.getRulesetAccess().getPropertiesDeclarationParserRuleCall_5_2_0());

-					pushFollow(FOLLOW_ruleDeclaration_in_rule__Ruleset__PropertiesAssignment_5_213935);

-					ruleDeclaration();

-

-					state._fsp--;

-

-					after(grammarAccess.getRulesetAccess().getPropertiesDeclarationParserRuleCall_5_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ruleset__PropertiesAssignment_5_2"

-

-

-	// $ANTLR start "rule__CompositeSelector__LeftAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6834:1: rule__CompositeSelector__LeftAssignment_0 : ( ruleSimpleSelector ) ;

-	public final void rule__CompositeSelector__LeftAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6838:1: ( ( ruleSimpleSelector ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6839:1: ( ruleSimpleSelector )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6839:1: ( ruleSimpleSelector )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6840:1: ruleSimpleSelector

-				{

-					before(grammarAccess.getCompositeSelectorAccess().getLeftSimpleSelectorParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleSimpleSelector_in_rule__CompositeSelector__LeftAssignment_013966);

-					ruleSimpleSelector();

-

-					state._fsp--;

-

-					after(grammarAccess.getCompositeSelectorAccess().getLeftSimpleSelectorParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__LeftAssignment_0"

-

-

-	// $ANTLR start "rule__CompositeSelector__CombinatorAssignment_1_1_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6849:1: rule__CompositeSelector__CombinatorAssignment_1_1_1 : ( ruleCombinator ) ;

-	public final void rule__CompositeSelector__CombinatorAssignment_1_1_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6853:1: ( ( ruleCombinator ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6854:1: ( ruleCombinator )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6854:1: ( ruleCombinator )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6855:1: ruleCombinator

-				{

-					before(grammarAccess.getCompositeSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0());

-					pushFollow(FOLLOW_ruleCombinator_in_rule__CompositeSelector__CombinatorAssignment_1_1_113997);

-					ruleCombinator();

-

-					state._fsp--;

-

-					after(grammarAccess.getCompositeSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__CombinatorAssignment_1_1_1"

-

-

-	// $ANTLR start "rule__CompositeSelector__RightAssignment_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6864:1: rule__CompositeSelector__RightAssignment_2 : ( ruleSelector ) ;

-	public final void rule__CompositeSelector__RightAssignment_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6868:1: ( ( ruleSelector ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6869:1: ( ruleSelector )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6869:1: ( ruleSelector )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6870:1: ruleSelector

-				{

-					before(grammarAccess.getCompositeSelectorAccess().getRightSelectorParserRuleCall_2_0());

-					pushFollow(FOLLOW_ruleSelector_in_rule__CompositeSelector__RightAssignment_214028);

-					ruleSelector();

-

-					state._fsp--;

-

-					after(grammarAccess.getCompositeSelectorAccess().getRightSelectorParserRuleCall_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CompositeSelector__RightAssignment_2"

-

-

-	// $ANTLR start "rule__SimpleSelector__ElementNameAssignment_0_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6879:1: rule__SimpleSelector__ElementNameAssignment_0_0 : ( ( rule__SimpleSelector__ElementNameAlternatives_0_0_0 )

-	// ) ;

-	public final void rule__SimpleSelector__ElementNameAssignment_0_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6883:1: ( ( ( rule__SimpleSelector__ElementNameAlternatives_0_0_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6884:1: ( ( rule__SimpleSelector__ElementNameAlternatives_0_0_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6884:1: ( ( rule__SimpleSelector__ElementNameAlternatives_0_0_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6885:1: ( rule__SimpleSelector__ElementNameAlternatives_0_0_0 )

-				{

-					before(grammarAccess.getSimpleSelectorAccess().getElementNameAlternatives_0_0_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6886:1: ( rule__SimpleSelector__ElementNameAlternatives_0_0_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6886:2: rule__SimpleSelector__ElementNameAlternatives_0_0_0

-					{

-						pushFollow(FOLLOW_rule__SimpleSelector__ElementNameAlternatives_0_0_0_in_rule__SimpleSelector__ElementNameAssignment_0_014059);

-						rule__SimpleSelector__ElementNameAlternatives_0_0_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getSimpleSelectorAccess().getElementNameAlternatives_0_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SimpleSelector__ElementNameAssignment_0_0"

-

-

-	// $ANTLR start "rule__SimpleSelector__ConditionAssignment_0_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6895:1: rule__SimpleSelector__ConditionAssignment_0_1 : ( ruleSelectorCondition ) ;

-	public final void rule__SimpleSelector__ConditionAssignment_0_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6899:1: ( ( ruleSelectorCondition ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6900:1: ( ruleSelectorCondition )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6900:1: ( ruleSelectorCondition )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6901:1: ruleSelectorCondition

-				{

-					before(grammarAccess.getSimpleSelectorAccess().getConditionSelectorConditionParserRuleCall_0_1_0());

-					pushFollow(FOLLOW_ruleSelectorCondition_in_rule__SimpleSelector__ConditionAssignment_0_114092);

-					ruleSelectorCondition();

-

-					state._fsp--;

-

-					after(grammarAccess.getSimpleSelectorAccess().getConditionSelectorConditionParserRuleCall_0_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SimpleSelector__ConditionAssignment_0_1"

-

-

-	// $ANTLR start "rule__SimpleSelector__ConditionAssignment_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6910:1: rule__SimpleSelector__ConditionAssignment_1 : ( ruleSelectorCondition ) ;

-	public final void rule__SimpleSelector__ConditionAssignment_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6914:1: ( ( ruleSelectorCondition ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6915:1: ( ruleSelectorCondition )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6915:1: ( ruleSelectorCondition )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6916:1: ruleSelectorCondition

-				{

-					before(grammarAccess.getSimpleSelectorAccess().getConditionSelectorConditionParserRuleCall_1_0());

-					pushFollow(FOLLOW_ruleSelectorCondition_in_rule__SimpleSelector__ConditionAssignment_114123);

-					ruleSelectorCondition();

-

-					state._fsp--;

-

-					after(grammarAccess.getSimpleSelectorAccess().getConditionSelectorConditionParserRuleCall_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__SimpleSelector__ConditionAssignment_1"

-

-

-	// $ANTLR start "rule__Combinator__KindAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6925:1: rule__Combinator__KindAssignment_0 : ( ruleKIND ) ;

-	public final void rule__Combinator__KindAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6929:1: ( ( ruleKIND ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6930:1: ( ruleKIND )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6930:1: ( ruleKIND )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6931:1: ruleKIND

-				{

-					before(grammarAccess.getCombinatorAccess().getKindKINDEnumRuleCall_0_0());

-					pushFollow(FOLLOW_ruleKIND_in_rule__Combinator__KindAssignment_014154);

-					ruleKIND();

-

-					state._fsp--;

-

-					after(grammarAccess.getCombinatorAccess().getKindKINDEnumRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Combinator__KindAssignment_0"

-

-

-	// $ANTLR start "rule__Declaration__PropertyAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6940:1: rule__Declaration__PropertyAssignment_0 : ( RULE_ID ) ;

-	public final void rule__Declaration__PropertyAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6944:1: ( ( RULE_ID ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6945:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6945:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6946:1: RULE_ID

-				{

-					before(grammarAccess.getDeclarationAccess().getPropertyIDTerminalRuleCall_0_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__Declaration__PropertyAssignment_014185);

-					after(grammarAccess.getDeclarationAccess().getPropertyIDTerminalRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__PropertyAssignment_0"

-

-

-	// $ANTLR start "rule__Declaration__ExpressionAssignment_4"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6955:1: rule__Declaration__ExpressionAssignment_4 : ( ruleExpression ) ;

-	public final void rule__Declaration__ExpressionAssignment_4() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6959:1: ( ( ruleExpression ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6960:1: ( ruleExpression )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6960:1: ( ruleExpression )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6961:1: ruleExpression

-				{

-					before(grammarAccess.getDeclarationAccess().getExpressionExpressionParserRuleCall_4_0());

-					pushFollow(FOLLOW_ruleExpression_in_rule__Declaration__ExpressionAssignment_414216);

-					ruleExpression();

-

-					state._fsp--;

-

-					after(grammarAccess.getDeclarationAccess().getExpressionExpressionParserRuleCall_4_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__ExpressionAssignment_4"

-

-

-	// $ANTLR start "rule__Declaration__ImportantAssignment_5_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6970:1: rule__Declaration__ImportantAssignment_5_0 : ( RULE_T_IMPORTANT ) ;

-	public final void rule__Declaration__ImportantAssignment_5_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6974:1: ( ( RULE_T_IMPORTANT ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6975:1: ( RULE_T_IMPORTANT )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6975:1: ( RULE_T_IMPORTANT )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6976:1: RULE_T_IMPORTANT

-				{

-					before(grammarAccess.getDeclarationAccess().getImportantT_IMPORTANTTerminalRuleCall_5_0_0());

-					match(input, RULE_T_IMPORTANT, FOLLOW_RULE_T_IMPORTANT_in_rule__Declaration__ImportantAssignment_5_014247);

-					after(grammarAccess.getDeclarationAccess().getImportantT_IMPORTANTTerminalRuleCall_5_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Declaration__ImportantAssignment_5_0"

-

-

-	// $ANTLR start "rule__Expression__TermsAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6985:1: rule__Expression__TermsAssignment_0 : ( ruleTerm ) ;

-	public final void rule__Expression__TermsAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6989:1: ( ( ruleTerm ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6990:1: ( ruleTerm )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6990:1: ( ruleTerm )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:6991:1: ruleTerm

-				{

-					before(grammarAccess.getExpressionAccess().getTermsTermParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleTerm_in_rule__Expression__TermsAssignment_014278);

-					ruleTerm();

-

-					state._fsp--;

-

-					after(grammarAccess.getExpressionAccess().getTermsTermParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Expression__TermsAssignment_0"

-

-

-	// $ANTLR start "rule__Expression__SubtermsAssignment_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7000:1: rule__Expression__SubtermsAssignment_1 : ( ruleSubterm ) ;

-	public final void rule__Expression__SubtermsAssignment_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7004:1: ( ( ruleSubterm ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7005:1: ( ruleSubterm )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7005:1: ( ruleSubterm )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7006:1: ruleSubterm

-				{

-					before(grammarAccess.getExpressionAccess().getSubtermsSubtermParserRuleCall_1_0());

-					pushFollow(FOLLOW_ruleSubterm_in_rule__Expression__SubtermsAssignment_114309);

-					ruleSubterm();

-

-					state._fsp--;

-

-					after(grammarAccess.getExpressionAccess().getSubtermsSubtermParserRuleCall_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Expression__SubtermsAssignment_1"

-

-

-	// $ANTLR start "rule__Subterm__OperatorAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7015:1: rule__Subterm__OperatorAssignment_0 : ( ruleOperator ) ;

-	public final void rule__Subterm__OperatorAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7019:1: ( ( ruleOperator ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7020:1: ( ruleOperator )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7020:1: ( ruleOperator )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7021:1: ruleOperator

-				{

-					before(grammarAccess.getSubtermAccess().getOperatorOperatorParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleOperator_in_rule__Subterm__OperatorAssignment_014340);

-					ruleOperator();

-

-					state._fsp--;

-

-					after(grammarAccess.getSubtermAccess().getOperatorOperatorParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Subterm__OperatorAssignment_0"

-

-

-	// $ANTLR start "rule__Subterm__TermAssignment_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7030:1: rule__Subterm__TermAssignment_1 : ( ruleTerm ) ;

-	public final void rule__Subterm__TermAssignment_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7034:1: ( ( ruleTerm ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7035:1: ( ruleTerm )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7035:1: ( ruleTerm )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7036:1: ruleTerm

-				{

-					before(grammarAccess.getSubtermAccess().getTermTermParserRuleCall_1_0());

-					pushFollow(FOLLOW_ruleTerm_in_rule__Subterm__TermAssignment_114371);

-					ruleTerm();

-

-					state._fsp--;

-

-					after(grammarAccess.getSubtermAccess().getTermTermParserRuleCall_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Subterm__TermAssignment_1"

-

-

-	// $ANTLR start "rule__Function__NameAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7045:1: rule__Function__NameAssignment_0 : ( RULE_ID ) ;

-	public final void rule__Function__NameAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7049:1: ( ( RULE_ID ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7050:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7050:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7051:1: RULE_ID

-				{

-					before(grammarAccess.getFunctionAccess().getNameIDTerminalRuleCall_0_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__Function__NameAssignment_014402);

-					after(grammarAccess.getFunctionAccess().getNameIDTerminalRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Function__NameAssignment_0"

-

-

-	// $ANTLR start "rule__Function__ArgsAssignment_3"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7060:1: rule__Function__ArgsAssignment_3 : ( ruleExpression ) ;

-	public final void rule__Function__ArgsAssignment_3() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7064:1: ( ( ruleExpression ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7065:1: ( ruleExpression )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7065:1: ( ruleExpression )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7066:1: ruleExpression

-				{

-					before(grammarAccess.getFunctionAccess().getArgsExpressionParserRuleCall_3_0());

-					pushFollow(FOLLOW_ruleExpression_in_rule__Function__ArgsAssignment_314433);

-					ruleExpression();

-

-					state._fsp--;

-

-					after(grammarAccess.getFunctionAccess().getArgsExpressionParserRuleCall_3_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Function__ArgsAssignment_3"

-

-

-	// $ANTLR start "rule__Name__ValueAssignment"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7075:1: rule__Name__ValueAssignment : ( RULE_ID ) ;

-	public final void rule__Name__ValueAssignment() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7079:1: ( ( RULE_ID ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7080:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7080:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7081:1: RULE_ID

-				{

-					before(grammarAccess.getNameAccess().getValueIDTerminalRuleCall_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__Name__ValueAssignment14464);

-					after(grammarAccess.getNameAccess().getValueIDTerminalRuleCall_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Name__ValueAssignment"

-

-

-	// $ANTLR start "rule__Number__OpAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7090:1: rule__Number__OpAssignment_0 : ( ruleUnaryOperator ) ;

-	public final void rule__Number__OpAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7094:1: ( ( ruleUnaryOperator ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7095:1: ( ruleUnaryOperator )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7095:1: ( ruleUnaryOperator )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7096:1: ruleUnaryOperator

-				{

-					before(grammarAccess.getNumberAccess().getOpUnaryOperatorParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleUnaryOperator_in_rule__Number__OpAssignment_014495);

-					ruleUnaryOperator();

-

-					state._fsp--;

-

-					after(grammarAccess.getNumberAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Number__OpAssignment_0"

-

-

-	// $ANTLR start "rule__Number__ValueAssignment_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7105:1: rule__Number__ValueAssignment_1 : ( RULE_T_NUM ) ;

-	public final void rule__Number__ValueAssignment_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7109:1: ( ( RULE_T_NUM ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7110:1: ( RULE_T_NUM )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7110:1: ( RULE_T_NUM )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7111:1: RULE_T_NUM

-				{

-					before(grammarAccess.getNumberAccess().getValueT_NUMTerminalRuleCall_1_0());

-					match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_rule__Number__ValueAssignment_114526);

-					after(grammarAccess.getNumberAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Number__ValueAssignment_1"

-

-

-	// $ANTLR start "rule__Percentage__OpAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7120:1: rule__Percentage__OpAssignment_0 : ( ruleUnaryOperator ) ;

-	public final void rule__Percentage__OpAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7124:1: ( ( ruleUnaryOperator ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7125:1: ( ruleUnaryOperator )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7125:1: ( ruleUnaryOperator )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7126:1: ruleUnaryOperator

-				{

-					before(grammarAccess.getPercentageAccess().getOpUnaryOperatorParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleUnaryOperator_in_rule__Percentage__OpAssignment_014557);

-					ruleUnaryOperator();

-

-					state._fsp--;

-

-					after(grammarAccess.getPercentageAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Percentage__OpAssignment_0"

-

-

-	// $ANTLR start "rule__Percentage__ValueAssignment_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7135:1: rule__Percentage__ValueAssignment_1 : ( RULE_T_NUM ) ;

-	public final void rule__Percentage__ValueAssignment_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7139:1: ( ( RULE_T_NUM ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7140:1: ( RULE_T_NUM )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7140:1: ( RULE_T_NUM )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7141:1: RULE_T_NUM

-				{

-					before(grammarAccess.getPercentageAccess().getValueT_NUMTerminalRuleCall_1_0());

-					match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_rule__Percentage__ValueAssignment_114588);

-					after(grammarAccess.getPercentageAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Percentage__ValueAssignment_1"

-

-

-	// $ANTLR start "rule__Percentage__UnitAssignment_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7150:1: rule__Percentage__UnitAssignment_2 : ( RULE_PC_UNIT ) ;

-	public final void rule__Percentage__UnitAssignment_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7154:1: ( ( RULE_PC_UNIT ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7155:1: ( RULE_PC_UNIT )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7155:1: ( RULE_PC_UNIT )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7156:1: RULE_PC_UNIT

-				{

-					before(grammarAccess.getPercentageAccess().getUnitPC_UNITTerminalRuleCall_2_0());

-					match(input, RULE_PC_UNIT, FOLLOW_RULE_PC_UNIT_in_rule__Percentage__UnitAssignment_214619);

-					after(grammarAccess.getPercentageAccess().getUnitPC_UNITTerminalRuleCall_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Percentage__UnitAssignment_2"

-

-

-	// $ANTLR start "rule__Length__OpAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7165:1: rule__Length__OpAssignment_0 : ( ruleUnaryOperator ) ;

-	public final void rule__Length__OpAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7169:1: ( ( ruleUnaryOperator ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7170:1: ( ruleUnaryOperator )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7170:1: ( ruleUnaryOperator )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7171:1: ruleUnaryOperator

-				{

-					before(grammarAccess.getLengthAccess().getOpUnaryOperatorParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleUnaryOperator_in_rule__Length__OpAssignment_014650);

-					ruleUnaryOperator();

-

-					state._fsp--;

-

-					after(grammarAccess.getLengthAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Length__OpAssignment_0"

-

-

-	// $ANTLR start "rule__Length__ValueAssignment_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7180:1: rule__Length__ValueAssignment_1 : ( RULE_T_NUM ) ;

-	public final void rule__Length__ValueAssignment_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7184:1: ( ( RULE_T_NUM ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7185:1: ( RULE_T_NUM )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7185:1: ( RULE_T_NUM )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7186:1: RULE_T_NUM

-				{

-					before(grammarAccess.getLengthAccess().getValueT_NUMTerminalRuleCall_1_0());

-					match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_rule__Length__ValueAssignment_114681);

-					after(grammarAccess.getLengthAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Length__ValueAssignment_1"

-

-

-	// $ANTLR start "rule__Length__UnitAssignment_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7195:1: rule__Length__UnitAssignment_2 : ( RULE_LEN_UNIT ) ;

-	public final void rule__Length__UnitAssignment_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7199:1: ( ( RULE_LEN_UNIT ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7200:1: ( RULE_LEN_UNIT )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7200:1: ( RULE_LEN_UNIT )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7201:1: RULE_LEN_UNIT

-				{

-					before(grammarAccess.getLengthAccess().getUnitLEN_UNITTerminalRuleCall_2_0());

-					match(input, RULE_LEN_UNIT, FOLLOW_RULE_LEN_UNIT_in_rule__Length__UnitAssignment_214712);

-					after(grammarAccess.getLengthAccess().getUnitLEN_UNITTerminalRuleCall_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Length__UnitAssignment_2"

-

-

-	// $ANTLR start "rule__Ems__OpAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7210:1: rule__Ems__OpAssignment_0 : ( ruleUnaryOperator ) ;

-	public final void rule__Ems__OpAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7214:1: ( ( ruleUnaryOperator ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7215:1: ( ruleUnaryOperator )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7215:1: ( ruleUnaryOperator )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7216:1: ruleUnaryOperator

-				{

-					before(grammarAccess.getEmsAccess().getOpUnaryOperatorParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleUnaryOperator_in_rule__Ems__OpAssignment_014743);

-					ruleUnaryOperator();

-

-					state._fsp--;

-

-					after(grammarAccess.getEmsAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ems__OpAssignment_0"

-

-

-	// $ANTLR start "rule__Ems__ValueAssignment_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7225:1: rule__Ems__ValueAssignment_1 : ( RULE_T_NUM ) ;

-	public final void rule__Ems__ValueAssignment_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7229:1: ( ( RULE_T_NUM ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7230:1: ( RULE_T_NUM )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7230:1: ( RULE_T_NUM )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7231:1: RULE_T_NUM

-				{

-					before(grammarAccess.getEmsAccess().getValueT_NUMTerminalRuleCall_1_0());

-					match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_rule__Ems__ValueAssignment_114774);

-					after(grammarAccess.getEmsAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ems__ValueAssignment_1"

-

-

-	// $ANTLR start "rule__Ems__UnitAssignment_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7240:1: rule__Ems__UnitAssignment_2 : ( RULE_EM_UNIT ) ;

-	public final void rule__Ems__UnitAssignment_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7244:1: ( ( RULE_EM_UNIT ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7245:1: ( RULE_EM_UNIT )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7245:1: ( RULE_EM_UNIT )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7246:1: RULE_EM_UNIT

-				{

-					before(grammarAccess.getEmsAccess().getUnitEM_UNITTerminalRuleCall_2_0());

-					match(input, RULE_EM_UNIT, FOLLOW_RULE_EM_UNIT_in_rule__Ems__UnitAssignment_214805);

-					after(grammarAccess.getEmsAccess().getUnitEM_UNITTerminalRuleCall_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Ems__UnitAssignment_2"

-

-

-	// $ANTLR start "rule__Exs__OpAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7255:1: rule__Exs__OpAssignment_0 : ( ruleUnaryOperator ) ;

-	public final void rule__Exs__OpAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7259:1: ( ( ruleUnaryOperator ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7260:1: ( ruleUnaryOperator )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7260:1: ( ruleUnaryOperator )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7261:1: ruleUnaryOperator

-				{

-					before(grammarAccess.getExsAccess().getOpUnaryOperatorParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleUnaryOperator_in_rule__Exs__OpAssignment_014836);

-					ruleUnaryOperator();

-

-					state._fsp--;

-

-					after(grammarAccess.getExsAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Exs__OpAssignment_0"

-

-

-	// $ANTLR start "rule__Exs__ValueAssignment_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7270:1: rule__Exs__ValueAssignment_1 : ( RULE_T_NUM ) ;

-	public final void rule__Exs__ValueAssignment_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7274:1: ( ( RULE_T_NUM ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7275:1: ( RULE_T_NUM )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7275:1: ( RULE_T_NUM )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7276:1: RULE_T_NUM

-				{

-					before(grammarAccess.getExsAccess().getValueT_NUMTerminalRuleCall_1_0());

-					match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_rule__Exs__ValueAssignment_114867);

-					after(grammarAccess.getExsAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Exs__ValueAssignment_1"

-

-

-	// $ANTLR start "rule__Exs__UnitAssignment_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7285:1: rule__Exs__UnitAssignment_2 : ( RULE_EX_UNIT ) ;

-	public final void rule__Exs__UnitAssignment_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7289:1: ( ( RULE_EX_UNIT ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7290:1: ( RULE_EX_UNIT )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7290:1: ( RULE_EX_UNIT )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7291:1: RULE_EX_UNIT

-				{

-					before(grammarAccess.getExsAccess().getUnitEX_UNITTerminalRuleCall_2_0());

-					match(input, RULE_EX_UNIT, FOLLOW_RULE_EX_UNIT_in_rule__Exs__UnitAssignment_214898);

-					after(grammarAccess.getExsAccess().getUnitEX_UNITTerminalRuleCall_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Exs__UnitAssignment_2"

-

-

-	// $ANTLR start "rule__Angle__OpAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7300:1: rule__Angle__OpAssignment_0 : ( ruleUnaryOperator ) ;

-	public final void rule__Angle__OpAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7304:1: ( ( ruleUnaryOperator ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7305:1: ( ruleUnaryOperator )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7305:1: ( ruleUnaryOperator )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7306:1: ruleUnaryOperator

-				{

-					before(grammarAccess.getAngleAccess().getOpUnaryOperatorParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleUnaryOperator_in_rule__Angle__OpAssignment_014929);

-					ruleUnaryOperator();

-

-					state._fsp--;

-

-					after(grammarAccess.getAngleAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Angle__OpAssignment_0"

-

-

-	// $ANTLR start "rule__Angle__ValueAssignment_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7315:1: rule__Angle__ValueAssignment_1 : ( RULE_T_NUM ) ;

-	public final void rule__Angle__ValueAssignment_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7319:1: ( ( RULE_T_NUM ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7320:1: ( RULE_T_NUM )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7320:1: ( RULE_T_NUM )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7321:1: RULE_T_NUM

-				{

-					before(grammarAccess.getAngleAccess().getValueT_NUMTerminalRuleCall_1_0());

-					match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_rule__Angle__ValueAssignment_114960);

-					after(grammarAccess.getAngleAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Angle__ValueAssignment_1"

-

-

-	// $ANTLR start "rule__Angle__UnitAssignment_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7330:1: rule__Angle__UnitAssignment_2 : ( RULE_ANGLE_UNIT ) ;

-	public final void rule__Angle__UnitAssignment_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7334:1: ( ( RULE_ANGLE_UNIT ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7335:1: ( RULE_ANGLE_UNIT )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7335:1: ( RULE_ANGLE_UNIT )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7336:1: RULE_ANGLE_UNIT

-				{

-					before(grammarAccess.getAngleAccess().getUnitANGLE_UNITTerminalRuleCall_2_0());

-					match(input, RULE_ANGLE_UNIT, FOLLOW_RULE_ANGLE_UNIT_in_rule__Angle__UnitAssignment_214991);

-					after(grammarAccess.getAngleAccess().getUnitANGLE_UNITTerminalRuleCall_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Angle__UnitAssignment_2"

-

-

-	// $ANTLR start "rule__Time__OpAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7345:1: rule__Time__OpAssignment_0 : ( ruleUnaryOperator ) ;

-	public final void rule__Time__OpAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7349:1: ( ( ruleUnaryOperator ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7350:1: ( ruleUnaryOperator )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7350:1: ( ruleUnaryOperator )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7351:1: ruleUnaryOperator

-				{

-					before(grammarAccess.getTimeAccess().getOpUnaryOperatorParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleUnaryOperator_in_rule__Time__OpAssignment_015022);

-					ruleUnaryOperator();

-

-					state._fsp--;

-

-					after(grammarAccess.getTimeAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Time__OpAssignment_0"

-

-

-	// $ANTLR start "rule__Time__ValueAssignment_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7360:1: rule__Time__ValueAssignment_1 : ( RULE_T_NUM ) ;

-	public final void rule__Time__ValueAssignment_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7364:1: ( ( RULE_T_NUM ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7365:1: ( RULE_T_NUM )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7365:1: ( RULE_T_NUM )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7366:1: RULE_T_NUM

-				{

-					before(grammarAccess.getTimeAccess().getValueT_NUMTerminalRuleCall_1_0());

-					match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_rule__Time__ValueAssignment_115053);

-					after(grammarAccess.getTimeAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Time__ValueAssignment_1"

-

-

-	// $ANTLR start "rule__Time__UnitAssignment_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7375:1: rule__Time__UnitAssignment_2 : ( RULE_TIME_UNIT ) ;

-	public final void rule__Time__UnitAssignment_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7379:1: ( ( RULE_TIME_UNIT ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7380:1: ( RULE_TIME_UNIT )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7380:1: ( RULE_TIME_UNIT )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7381:1: RULE_TIME_UNIT

-				{

-					before(grammarAccess.getTimeAccess().getUnitTIME_UNITTerminalRuleCall_2_0());

-					match(input, RULE_TIME_UNIT, FOLLOW_RULE_TIME_UNIT_in_rule__Time__UnitAssignment_215084);

-					after(grammarAccess.getTimeAccess().getUnitTIME_UNITTerminalRuleCall_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Time__UnitAssignment_2"

-

-

-	// $ANTLR start "rule__Frequency__OpAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7390:1: rule__Frequency__OpAssignment_0 : ( ruleUnaryOperator ) ;

-	public final void rule__Frequency__OpAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7394:1: ( ( ruleUnaryOperator ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7395:1: ( ruleUnaryOperator )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7395:1: ( ruleUnaryOperator )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7396:1: ruleUnaryOperator

-				{

-					before(grammarAccess.getFrequencyAccess().getOpUnaryOperatorParserRuleCall_0_0());

-					pushFollow(FOLLOW_ruleUnaryOperator_in_rule__Frequency__OpAssignment_015115);

-					ruleUnaryOperator();

-

-					state._fsp--;

-

-					after(grammarAccess.getFrequencyAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Frequency__OpAssignment_0"

-

-

-	// $ANTLR start "rule__Frequency__ValueAssignment_1"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7405:1: rule__Frequency__ValueAssignment_1 : ( RULE_T_NUM ) ;

-	public final void rule__Frequency__ValueAssignment_1() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7409:1: ( ( RULE_T_NUM ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7410:1: ( RULE_T_NUM )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7410:1: ( RULE_T_NUM )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7411:1: RULE_T_NUM

-				{

-					before(grammarAccess.getFrequencyAccess().getValueT_NUMTerminalRuleCall_1_0());

-					match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_rule__Frequency__ValueAssignment_115146);

-					after(grammarAccess.getFrequencyAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Frequency__ValueAssignment_1"

-

-

-	// $ANTLR start "rule__Frequency__UnitAssignment_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7420:1: rule__Frequency__UnitAssignment_2 : ( RULE_FREQ_UNIT ) ;

-	public final void rule__Frequency__UnitAssignment_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7424:1: ( ( RULE_FREQ_UNIT ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7425:1: ( RULE_FREQ_UNIT )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7425:1: ( RULE_FREQ_UNIT )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7426:1: RULE_FREQ_UNIT

-				{

-					before(grammarAccess.getFrequencyAccess().getUnitFREQ_UNITTerminalRuleCall_2_0());

-					match(input, RULE_FREQ_UNIT, FOLLOW_RULE_FREQ_UNIT_in_rule__Frequency__UnitAssignment_215177);

-					after(grammarAccess.getFrequencyAccess().getUnitFREQ_UNITTerminalRuleCall_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Frequency__UnitAssignment_2"

-

-

-	// $ANTLR start "rule__Uri__ValueAssignment_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7435:1: rule__Uri__ValueAssignment_2 : ( RULE_STRING ) ;

-	public final void rule__Uri__ValueAssignment_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7439:1: ( ( RULE_STRING ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7440:1: ( RULE_STRING )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7440:1: ( RULE_STRING )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7441:1: RULE_STRING

-				{

-					before(grammarAccess.getUriAccess().getValueSTRINGTerminalRuleCall_2_0());

-					match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__Uri__ValueAssignment_215208);

-					after(grammarAccess.getUriAccess().getValueSTRINGTerminalRuleCall_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Uri__ValueAssignment_2"

-

-

-	// $ANTLR start "rule__StringValue__ValueAssignment"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7450:1: rule__StringValue__ValueAssignment : ( RULE_STRING ) ;

-	public final void rule__StringValue__ValueAssignment() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7454:1: ( ( RULE_STRING ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7455:1: ( RULE_STRING )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7455:1: ( RULE_STRING )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7456:1: RULE_STRING

-				{

-					before(grammarAccess.getStringValueAccess().getValueSTRINGTerminalRuleCall_0());

-					match(input, RULE_STRING, FOLLOW_RULE_STRING_in_rule__StringValue__ValueAssignment15239);

-					after(grammarAccess.getStringValueAccess().getValueSTRINGTerminalRuleCall_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__StringValue__ValueAssignment"

-

-

-	// $ANTLR start "rule__HexColor__ValueAssignment"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7465:1: rule__HexColor__ValueAssignment : ( RULE_HASH ) ;

-	public final void rule__HexColor__ValueAssignment() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7469:1: ( ( RULE_HASH ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7470:1: ( RULE_HASH )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7470:1: ( RULE_HASH )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7471:1: RULE_HASH

-				{

-					before(grammarAccess.getHexColorAccess().getValueHASHTerminalRuleCall_0());

-					match(input, RULE_HASH, FOLLOW_RULE_HASH_in_rule__HexColor__ValueAssignment15270);

-					after(grammarAccess.getHexColorAccess().getValueHASHTerminalRuleCall_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__HexColor__ValueAssignment"

-

-

-	// $ANTLR start "rule__Class__ClassAssignment"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7480:1: rule__Class__ClassAssignment : ( RULE_T_CLASS ) ;

-	public final void rule__Class__ClassAssignment() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7484:1: ( ( RULE_T_CLASS ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7485:1: ( RULE_T_CLASS )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7485:1: ( RULE_T_CLASS )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7486:1: RULE_T_CLASS

-				{

-					before(grammarAccess.getClassAccess().getClassT_CLASSTerminalRuleCall_0());

-					match(input, RULE_T_CLASS, FOLLOW_RULE_T_CLASS_in_rule__Class__ClassAssignment15301);

-					after(grammarAccess.getClassAccess().getClassT_CLASSTerminalRuleCall_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Class__ClassAssignment"

-

-

-	// $ANTLR start "rule__Attribute__NameAssignment_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7495:1: rule__Attribute__NameAssignment_2 : ( RULE_ID ) ;

-	public final void rule__Attribute__NameAssignment_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7499:1: ( ( RULE_ID ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7500:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7500:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7501:1: RULE_ID

-				{

-					before(grammarAccess.getAttributeAccess().getNameIDTerminalRuleCall_2_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__Attribute__NameAssignment_215332);

-					after(grammarAccess.getAttributeAccess().getNameIDTerminalRuleCall_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__NameAssignment_2"

-

-

-	// $ANTLR start "rule__Attribute__ValueAssignment_4"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7510:1: rule__Attribute__ValueAssignment_4 : ( ruleAttributeValue ) ;

-	public final void rule__Attribute__ValueAssignment_4() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7514:1: ( ( ruleAttributeValue ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7515:1: ( ruleAttributeValue )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7515:1: ( ruleAttributeValue )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7516:1: ruleAttributeValue

-				{

-					before(grammarAccess.getAttributeAccess().getValueAttributeValueParserRuleCall_4_0());

-					pushFollow(FOLLOW_ruleAttributeValue_in_rule__Attribute__ValueAssignment_415363);

-					ruleAttributeValue();

-

-					state._fsp--;

-

-					after(grammarAccess.getAttributeAccess().getValueAttributeValueParserRuleCall_4_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Attribute__ValueAssignment_4"

-

-

-	// $ANTLR start "rule__AttributeValue__OperatorAssignment_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7525:1: rule__AttributeValue__OperatorAssignment_0 : ( ruleATTRIBUTE_OP ) ;

-	public final void rule__AttributeValue__OperatorAssignment_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7529:1: ( ( ruleATTRIBUTE_OP ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7530:1: ( ruleATTRIBUTE_OP )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7530:1: ( ruleATTRIBUTE_OP )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7531:1: ruleATTRIBUTE_OP

-				{

-					before(grammarAccess.getAttributeValueAccess().getOperatorATTRIBUTE_OPEnumRuleCall_0_0());

-					pushFollow(FOLLOW_ruleATTRIBUTE_OP_in_rule__AttributeValue__OperatorAssignment_015394);

-					ruleATTRIBUTE_OP();

-

-					state._fsp--;

-

-					after(grammarAccess.getAttributeValueAccess().getOperatorATTRIBUTE_OPEnumRuleCall_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__AttributeValue__OperatorAssignment_0"

-

-

-	// $ANTLR start "rule__AttributeValue__ValueAssignment_2"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7540:1: rule__AttributeValue__ValueAssignment_2 : ( ( rule__AttributeValue__ValueAlternatives_2_0 ) ) ;

-	public final void rule__AttributeValue__ValueAssignment_2() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7544:1: ( ( ( rule__AttributeValue__ValueAlternatives_2_0 ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7545:1: ( ( rule__AttributeValue__ValueAlternatives_2_0 ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7545:1: ( ( rule__AttributeValue__ValueAlternatives_2_0 ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7546:1: ( rule__AttributeValue__ValueAlternatives_2_0 )

-				{

-					before(grammarAccess.getAttributeValueAccess().getValueAlternatives_2_0());

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7547:1: ( rule__AttributeValue__ValueAlternatives_2_0 )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7547:2: rule__AttributeValue__ValueAlternatives_2_0

-					{

-						pushFollow(FOLLOW_rule__AttributeValue__ValueAlternatives_2_0_in_rule__AttributeValue__ValueAssignment_215425);

-						rule__AttributeValue__ValueAlternatives_2_0();

-

-						state._fsp--;

-

-

-					}

-

-					after(grammarAccess.getAttributeValueAccess().getValueAlternatives_2_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__AttributeValue__ValueAssignment_2"

-

-

-	// $ANTLR start "rule__Pseudo__PseudoAssignment_1_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7556:1: rule__Pseudo__PseudoAssignment_1_0 : ( RULE_ID ) ;

-	public final void rule__Pseudo__PseudoAssignment_1_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7560:1: ( ( RULE_ID ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7561:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7561:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7562:1: RULE_ID

-				{

-					before(grammarAccess.getPseudoAccess().getPseudoIDTerminalRuleCall_1_0_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__Pseudo__PseudoAssignment_1_015458);

-					after(grammarAccess.getPseudoAccess().getPseudoIDTerminalRuleCall_1_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__PseudoAssignment_1_0"

-

-

-	// $ANTLR start "rule__Pseudo__PseudoAssignment_1_1_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7571:1: rule__Pseudo__PseudoAssignment_1_1_0 : ( RULE_ID ) ;

-	public final void rule__Pseudo__PseudoAssignment_1_1_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7575:1: ( ( RULE_ID ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7576:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7576:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7577:1: RULE_ID

-				{

-					before(grammarAccess.getPseudoAccess().getPseudoIDTerminalRuleCall_1_1_0_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__Pseudo__PseudoAssignment_1_1_015489);

-					after(grammarAccess.getPseudoAccess().getPseudoIDTerminalRuleCall_1_1_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__PseudoAssignment_1_1_0"

-

-

-	// $ANTLR start "rule__Pseudo__ArgsAssignment_1_1_3_0"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7586:1: rule__Pseudo__ArgsAssignment_1_1_3_0 : ( RULE_ID ) ;

-	public final void rule__Pseudo__ArgsAssignment_1_1_3_0() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7590:1: ( ( RULE_ID ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7591:1: ( RULE_ID )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7591:1: ( RULE_ID )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7592:1: RULE_ID

-				{

-					before(grammarAccess.getPseudoAccess().getArgsIDTerminalRuleCall_1_1_3_0_0());

-					match(input, RULE_ID, FOLLOW_RULE_ID_in_rule__Pseudo__ArgsAssignment_1_1_3_015520);

-					after(grammarAccess.getPseudoAccess().getArgsIDTerminalRuleCall_1_1_3_0_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__Pseudo__ArgsAssignment_1_1_3_0"

-

-

-	// $ANTLR start "rule__CSSId__ValueAssignment"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7601:1: rule__CSSId__ValueAssignment : ( RULE_HASH ) ;

-	public final void rule__CSSId__ValueAssignment() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7605:1: ( ( RULE_HASH ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7606:1: ( RULE_HASH )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7606:1: ( RULE_HASH )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7607:1: RULE_HASH

-				{

-					before(grammarAccess.getCSSIdAccess().getValueHASHTerminalRuleCall_0());

-					match(input, RULE_HASH, FOLLOW_RULE_HASH_in_rule__CSSId__ValueAssignment15551);

-					after(grammarAccess.getCSSIdAccess().getValueHASHTerminalRuleCall_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__CSSId__ValueAssignment"

-

-

-	// $ANTLR start "rule__UnaryOperator__OperatorAssignment"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7616:1: rule__UnaryOperator__OperatorAssignment : ( ruleUNARY ) ;

-	public final void rule__UnaryOperator__OperatorAssignment() throws RecognitionException {

-

-		int stackSize = keepStackSize();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7620:1: ( ( ruleUNARY ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7621:1: ( ruleUNARY )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7621:1: ( ruleUNARY )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/internal/InternalCSS.g:7622:1: ruleUNARY

-				{

-					before(grammarAccess.getUnaryOperatorAccess().getOperatorUNARYEnumRuleCall_0());

-					pushFollow(FOLLOW_ruleUNARY_in_rule__UnaryOperator__OperatorAssignment15582);

-					ruleUNARY();

-

-					state._fsp--;

-

-					after(grammarAccess.getUnaryOperatorAccess().getOperatorUNARYEnumRuleCall_0());

-

-				}

-

-

-			}

-

-		} catch (RecognitionException re) {

-			reportError(re);

-			recover(input, re);

-		} finally {

-

-			restoreStackSize(stackSize);

-

-		}

-		return;

-	}

-

-	// $ANTLR end "rule__UnaryOperator__OperatorAssignment"

-

-	// Delegated rules

-

-

-	protected DFA6 dfa6 = new DFA6(this);

-	protected DFA8 dfa8 = new DFA8(this);

-	protected DFA13 dfa13 = new DFA13(this);

-	static final String DFA6_eotS =

-			"\106\uffff";

-	static final String DFA6_eofS =

-			"\1\uffff\4\15\2\uffff\2\15\2\uffff\1\15\2\uffff\2\15\4\uffff\1" +

-					"\15\2\uffff\2\15\2\uffff\1\15\4\uffff\1\15\5\uffff\1\15\5\uffff" +

-					"\1\15\6\uffff\1\15\5\uffff\1\15\5\uffff\1\15\6\uffff";

-	static final String DFA6_minS =

-			"\1\7\5\4\1\7\3\4\1\7\1\4\2\uffff\3\4\1\7\64\4";

-	static final String DFA6_maxS =

-			"\5\52\2\7\2\52\2\7\1\52\2\uffff\2\52\3\7\1\53\1\52\1\7\1\53\2\52" +

-					"\1\7\1\53\1\52\1\53\3\10\1\52\1\47\1\53\3\10\1\52\1\47\1\53\3\10" +

-					"\1\52\1\47\1\10\2\53\2\47\1\52\1\10\2\53\2\47\1\52\1\10\2\53\2\47" +

-					"\1\52\1\53\1\47\1\53\1\47\1\53\1\47";

-	static final String DFA6_acceptS =

-			"\14\uffff\1\2\1\1\70\uffff";

-	static final String DFA6_specialS =

-			"\106\uffff}>";

-	static final String[] DFA6_transitionS = {

-			"\1\1\12\uffff\1\3\1\4\2\uffff\1\2\16\uffff\1\6\4\uffff\1\5",

-			"\1\13\15\uffff\1\7\1\10\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\12\4\uffff\1\11",

-			"\1\13\15\uffff\1\7\1\10\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\12\4\uffff\1\11",

-			"\1\13\15\uffff\1\16\1\17\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\21\4\uffff\1\20",

-			"\1\13\15\uffff\1\16\1\17\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\21\4\uffff\1\20",

-			"\1\22\2\uffff\1\23",

-			"\1\24",

-			"\1\13\15\uffff\1\7\1\10\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\12\4\uffff\1\11",

-			"\1\13\15\uffff\1\7\1\10\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\12\4\uffff\1\11",

-			"\1\25\2\uffff\1\26",

-			"\1\27",

-			"\1\30\2\uffff\1\14\12\uffff\2\14\2\uffff\1\14\1\uffff\2\14" +

-					"\6\uffff\1\15\1\uffff\1\15\2\uffff\1\14\4\uffff\1\14",

-			"",

-			"",

-			"\1\13\15\uffff\1\16\1\17\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\21\4\uffff\1\20",

-			"\1\13\15\uffff\1\16\1\17\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\21\4\uffff\1\20",

-			"\1\31\2\uffff\1\32",

-			"\1\33",

-			"\1\22\2\uffff\1\23",

-			"\1\34\25\uffff\1\35\1\36\1\37\16\uffff\1\40",

-			"\1\13\15\uffff\1\16\1\17\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\21\1\41\3\uffff\1\20",

-			"\1\25\2\uffff\1\26",

-			"\1\42\25\uffff\1\43\1\44\1\45\16\uffff\1\46",

-			"\1\13\15\uffff\1\7\1\10\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\12\1\47\3\uffff\1\11",

-			"\1\30\2\uffff\1\14\12\uffff\2\14\2\uffff\1\14\1\uffff\2\14" +

-					"\6\uffff\1\15\1\uffff\1\15\2\uffff\1\14\4\uffff\1\14",

-			"\1\31\2\uffff\1\32",

-			"\1\50\25\uffff\1\51\1\52\1\53\16\uffff\1\54",

-			"\1\13\15\uffff\1\16\1\17\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\21\1\55\3\uffff\1\20",

-			"\1\34\25\uffff\1\35\1\36\1\37\16\uffff\1\40",

-			"\1\56\2\uffff\1\57\1\60",

-			"\1\56\2\uffff\1\57\1\60",

-			"\1\56\2\uffff\1\57\1\60",

-			"\1\13\15\uffff\1\16\1\17\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\21\4\uffff\1\20",

-			"\1\61\2\uffff\1\62\37\uffff\1\63",

-			"\1\42\25\uffff\1\43\1\44\1\45\16\uffff\1\46",

-			"\1\64\2\uffff\1\65\1\66",

-			"\1\64\2\uffff\1\65\1\66",

-			"\1\64\2\uffff\1\65\1\66",

-			"\1\13\15\uffff\1\7\1\10\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\12\4\uffff\1\11",

-			"\1\67\2\uffff\1\70\37\uffff\1\71",

-			"\1\50\25\uffff\1\51\1\52\1\53\16\uffff\1\54",

-			"\1\72\2\uffff\1\73\1\74",

-			"\1\72\2\uffff\1\73\1\74",

-			"\1\72\2\uffff\1\73\1\74",

-			"\1\13\15\uffff\1\16\1\17\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\21\4\uffff\1\20",

-			"\1\75\2\uffff\1\76\37\uffff\1\77",

-			"\1\56\2\uffff\1\57\1\60",

-			"\1\100\46\uffff\1\40",

-			"\1\100\46\uffff\1\40",

-			"\1\61\2\uffff\1\62\37\uffff\1\63",

-			"\1\101\42\uffff\1\63",

-			"\1\13\15\uffff\1\16\1\17\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\21\4\uffff\1\20",

-			"\1\64\2\uffff\1\65\1\66",

-			"\1\102\46\uffff\1\46",

-			"\1\102\46\uffff\1\46",

-			"\1\67\2\uffff\1\70\37\uffff\1\71",

-			"\1\103\42\uffff\1\71",

-			"\1\13\15\uffff\1\7\1\10\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\12\4\uffff\1\11",

-			"\1\72\2\uffff\1\73\1\74",

-			"\1\104\46\uffff\1\54",

-			"\1\104\46\uffff\1\54",

-			"\1\75\2\uffff\1\76\37\uffff\1\77",

-			"\1\105\42\uffff\1\77",

-			"\1\13\15\uffff\1\16\1\17\4\uffff\2\14\6\uffff\1\15\1\uffff" +

-					"\1\15\2\uffff\1\21\4\uffff\1\20",

-			"\1\100\46\uffff\1\40",

-			"\1\101\42\uffff\1\63",

-			"\1\102\46\uffff\1\46",

-			"\1\103\42\uffff\1\71",

-			"\1\104\46\uffff\1\54",

-			"\1\105\42\uffff\1\77"

-	};

-

-	static final short[] DFA6_eot = DFA.unpackEncodedString(DFA6_eotS);

-	static final short[] DFA6_eof = DFA.unpackEncodedString(DFA6_eofS);

-	static final char[] DFA6_min = DFA.unpackEncodedStringToUnsignedChars(DFA6_minS);

-	static final char[] DFA6_max = DFA.unpackEncodedStringToUnsignedChars(DFA6_maxS);

-	static final short[] DFA6_accept = DFA.unpackEncodedString(DFA6_acceptS);

-	static final short[] DFA6_special = DFA.unpackEncodedString(DFA6_specialS);

-	static final short[][] DFA6_transition;

-

-	static {

-		int numStates = DFA6_transitionS.length;

-		DFA6_transition = new short[numStates][];

-		for (int i = 0; i < numStates; i++) {

-			DFA6_transition[i] = org.antlr.runtime.DFA.unpackEncodedString(DFA6_transitionS[i]);

-		}

-	}

-

-	class DFA6 extends DFA {

-

-		public DFA6(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 6;

-			this.eot = DFA6_eot;

-			this.eof = DFA6_eof;

-			this.min = DFA6_min;

-			this.max = DFA6_max;

-			this.accept = DFA6_accept;

-			this.special = DFA6_special;

-			this.transition = DFA6_transition;

-		}

-

-		@Override

-		public String getDescription() {

-			return "1247:1: rule__Selector__Alternatives : ( ( ( rule__Selector__Group_0__0 ) ) | ( ruleCompositeSelector ) );";

-		}

-	}

-

-	static final String DFA8_eotS =

-			"\5\uffff";

-	static final String DFA8_eofS =

-			"\5\uffff";

-	static final String DFA8_minS =

-			"\2\4\1\uffff\1\4\1\uffff";

-	static final String DFA8_maxS =

-			"\1\31\1\52\1\uffff\1\52\1\uffff";

-	static final String DFA8_acceptS =

-			"\2\uffff\1\2\1\uffff\1\1";

-	static final String DFA8_specialS =

-			"\5\uffff}>";

-	static final String[] DFA8_transitionS = {

-			"\1\1\23\uffff\2\2",

-			"\1\3\2\uffff\1\4\12\uffff\2\4\2\uffff\1\4\1\uffff\2\2\13\uffff" +

-					"\1\4\4\uffff\1\4",

-			"",

-			"\1\3\2\uffff\1\4\12\uffff\2\4\2\uffff\1\4\1\uffff\2\2\13\uffff" +

-					"\1\4\4\uffff\1\4",

-			""

-	};

-

-	static final short[] DFA8_eot = DFA.unpackEncodedString(DFA8_eotS);

-	static final short[] DFA8_eof = DFA.unpackEncodedString(DFA8_eofS);

-	static final char[] DFA8_min = DFA.unpackEncodedStringToUnsignedChars(DFA8_minS);

-	static final char[] DFA8_max = DFA.unpackEncodedStringToUnsignedChars(DFA8_maxS);

-	static final short[] DFA8_accept = DFA.unpackEncodedString(DFA8_acceptS);

-	static final short[] DFA8_special = DFA.unpackEncodedString(DFA8_specialS);

-	static final short[][] DFA8_transition;

-

-	static {

-		int numStates = DFA8_transitionS.length;

-		DFA8_transition = new short[numStates][];

-		for (int i = 0; i < numStates; i++) {

-			DFA8_transition[i] = org.antlr.runtime.DFA.unpackEncodedString(DFA8_transitionS[i]);

-		}

-	}

-

-	class DFA8 extends DFA {

-

-		public DFA8(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 8;

-			this.eot = DFA8_eot;

-			this.eof = DFA8_eof;

-			this.min = DFA8_min;

-			this.max = DFA8_max;

-			this.accept = DFA8_accept;

-			this.special = DFA8_special;

-			this.transition = DFA8_transition;

-		}

-

-		@Override

-		public String getDescription() {

-			return "1269:1: rule__CompositeSelector__Alternatives_1 : ( ( ( ( RULE_WS ) ) ( ( RULE_WS )* ) ) | ( ( rule__CompositeSelector__Group_1_1__0 ) ) );";

-		}

-	}

-

-	static final String DFA13_eotS =

-			"\22\uffff";

-	static final String DFA13_eofS =

-			"\3\uffff\1\12\1\20\15\uffff";

-	static final String DFA13_minS =

-			"\1\7\2\12\2\4\15\uffff";

-	static final String DFA13_maxS =

-			"\1\50\2\12\2\51\15\uffff";

-	static final String DFA13_acceptS =

-			"\5\uffff\1\12\1\13\1\14\1\10\1\4\1\1\1\2\1\6\1\7\1\5\1\3\1\11\1" +

-					"\15";

-	static final String DFA13_specialS =

-			"\22\uffff}>";

-	static final String[] DFA13_transitionS = {

-			"\1\4\1\5\1\uffff\1\3\7\uffff\1\7\4\uffff\1\1\1\2\17\uffff\1" +

-					"\6",

-			"\1\3",

-			"\1\3",

-			"\1\12\2\uffff\4\12\1\13\1\17\1\11\1\16\1\14\1\15\1\10\1\12" +

-					"\4\uffff\2\12\5\uffff\1\12\1\uffff\1\12\2\uffff\1\12\3\uffff" +

-					"\3\12",

-			"\1\20\2\uffff\4\20\7\uffff\1\20\4\uffff\2\20\5\uffff\1\20" +

-					"\1\uffff\1\20\2\uffff\1\20\2\uffff\1\21\3\20",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			""

-	};

-

-	static final short[] DFA13_eot = DFA.unpackEncodedString(DFA13_eotS);

-	static final short[] DFA13_eof = DFA.unpackEncodedString(DFA13_eofS);

-	static final char[] DFA13_min = DFA.unpackEncodedStringToUnsignedChars(DFA13_minS);

-	static final char[] DFA13_max = DFA.unpackEncodedStringToUnsignedChars(DFA13_maxS);

-	static final short[] DFA13_accept = DFA.unpackEncodedString(DFA13_acceptS);

-	static final short[] DFA13_special = DFA.unpackEncodedString(DFA13_specialS);

-	static final short[][] DFA13_transition;

-

-	static {

-		int numStates = DFA13_transitionS.length;

-		DFA13_transition = new short[numStates][];

-		for (int i = 0; i < numStates; i++) {

-			DFA13_transition[i] = org.antlr.runtime.DFA.unpackEncodedString(DFA13_transitionS[i]);

-		}

-	}

-

-	class DFA13 extends DFA {

-

-		public DFA13(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 13;

-			this.eot = DFA13_eot;

-			this.eof = DFA13_eof;

-			this.min = DFA13_min;

-			this.max = DFA13_max;

-			this.accept = DFA13_accept;

-			this.special = DFA13_special;

-			this.transition = DFA13_transition;

-		}

-

-		@Override

-		public String getDescription() {

-			return "1385:1: rule__Term__Alternatives_0 : ( ( ruleNumber ) | ( rulePercentage ) | ( ruleLength ) | ( ruleEms ) | ( ruleExs ) | ( ruleAngle ) | ( ruleTime ) | ( ruleFrequency ) | ( ruleName ) | ( ruleStringValue ) | ( ruleUri ) | ( ruleHexColor ) | ( ruleFunction ) );";

-		}

-	}

-

-

-	public static final BitSet FOLLOW_ruleStylesheet_in_entryRuleStylesheet61 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleStylesheet68 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group__0_in_ruleStylesheet94 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleContent_in_entryRuleContent121 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleContent128 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Content__Alternatives_in_ruleContent154 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleImport_in_entryRuleImport181 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleImport188 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group__0_in_ruleImport214 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleMedia_in_entryRuleMedia241 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleMedia248 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Media__Group__0_in_ruleMedia274 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rulePage_in_entryRulePage301 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRulePage308 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Page__Group__0_in_rulePage334 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rulePseudoPage_in_entryRulePseudoPage361 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRulePseudoPage368 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__PseudoPage__Group__0_in_rulePseudoPage394 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleRuleset_in_entryRuleRuleset421 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleRuleset428 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__0_in_ruleRuleset454 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSelector_in_entryRuleSelector481 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleSelector488 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Selector__Alternatives_in_ruleSelector514 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleCompositeSelector_in_entryRuleCompositeSelector541 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleCompositeSelector548 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__Group__0_in_ruleCompositeSelector574 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSimpleSelector_in_entryRuleSimpleSelector601 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleSimpleSelector608 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SimpleSelector__Alternatives_in_ruleSimpleSelector634 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSelectorCondition_in_entryRuleSelectorCondition661 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleSelectorCondition668 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SelectorCondition__Alternatives_in_ruleSelectorCondition694 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleCombinator_in_entryRuleCombinator721 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleCombinator728 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Combinator__Group__0_in_ruleCombinator754 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleDeclaration_in_entryRuleDeclaration781 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleDeclaration788 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Declaration__Group__0_in_ruleDeclaration814 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleExpression_in_entryRuleExpression841 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleExpression848 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Expression__Group__0_in_ruleExpression874 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSubterm_in_entryRuleSubterm901 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleSubterm908 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Subterm__Group__0_in_ruleSubterm934 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleTerm_in_entryRuleTerm961 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleTerm968 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Term__Group__0_in_ruleTerm994 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleFunction_in_entryRuleFunction1021 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleFunction1028 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Function__Group__0_in_ruleFunction1054 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleName_in_entryRuleName1081 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleName1088 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Name__ValueAssignment_in_ruleName1114 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleNumber_in_entryRuleNumber1141 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleNumber1148 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Number__Group__0_in_ruleNumber1174 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rulePercentage_in_entryRulePercentage1201 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRulePercentage1208 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Percentage__Group__0_in_rulePercentage1234 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleLength_in_entryRuleLength1261 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleLength1268 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Length__Group__0_in_ruleLength1294 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleEms_in_entryRuleEms1321 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleEms1328 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ems__Group__0_in_ruleEms1354 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleExs_in_entryRuleExs1381 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleExs1388 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Exs__Group__0_in_ruleExs1414 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleAngle_in_entryRuleAngle1441 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleAngle1448 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Angle__Group__0_in_ruleAngle1474 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleTime_in_entryRuleTime1501 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleTime1508 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Time__Group__0_in_ruleTime1534 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleFrequency_in_entryRuleFrequency1561 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleFrequency1568 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Frequency__Group__0_in_ruleFrequency1594 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUri_in_entryRuleUri1621 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleUri1628 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Uri__Group__0_in_ruleUri1654 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleStringValue_in_entryRuleStringValue1681 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleStringValue1688 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__StringValue__ValueAssignment_in_ruleStringValue1714 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleHexColor_in_entryRuleHexColor1741 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleHexColor1748 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__HexColor__ValueAssignment_in_ruleHexColor1774 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleOperator_in_entryRuleOperator1801 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleOperator1808 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Operator__Alternatives_in_ruleOperator1834 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleClass_in_entryRuleClass1861 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleClass1868 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Class__ClassAssignment_in_ruleClass1894 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute1921 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleAttribute1928 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Attribute__Group__0_in_ruleAttribute1954 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleAttributeValue_in_entryRuleAttributeValue1981 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleAttributeValue1988 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__AttributeValue__Group__0_in_ruleAttributeValue2014 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rulePseudo_in_entryRulePseudo2041 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRulePseudo2048 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group__0_in_rulePseudo2074 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleCSSId_in_entryRuleCSSId2101 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleCSSId2108 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__CSSId__ValueAssignment_in_ruleCSSId2134 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_entryRuleUnaryOperator2161 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleUnaryOperator2168 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__UnaryOperator__OperatorAssignment_in_ruleUnaryOperator2194 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__UNARY__Alternatives_in_ruleUNARY2231 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__KIND__Alternatives_in_ruleKIND2267 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__ATTRIBUTE_OP__Alternatives_in_ruleATTRIBUTE_OP2303 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Stylesheet__Alternatives_12338 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_CDO_in_rule__Stylesheet__Alternatives_12355 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_CDC_in_rule__Stylesheet__Alternatives_12372 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_2_1_0__0_in_rule__Stylesheet__Alternatives_2_12404 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_2_1_1__0_in_rule__Stylesheet__Alternatives_2_12422 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_3_1_0__0_in_rule__Stylesheet__Alternatives_3_12455 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_3_1_1__0_in_rule__Stylesheet__Alternatives_3_12473 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleRuleset_in_rule__Content__Alternatives2506 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleMedia_in_rule__Content__Alternatives2523 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rulePage_in_rule__Content__Alternatives2540 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group_1_0__0_in_rule__Import__Alternatives_12572 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group_1_1__0_in_rule__Import__Alternatives_12590 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Selector__Group_0__0_in_rule__Selector__Alternatives2623 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleCompositeSelector_in_rule__Selector__Alternatives2641 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__CompositeSelector__Alternatives_12676 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__CompositeSelector__Alternatives_12689 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__Group_1_1__0_in_rule__CompositeSelector__Alternatives_12710 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SimpleSelector__Group_0__0_in_rule__SimpleSelector__Alternatives2743 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SimpleSelector__ConditionAssignment_1_in_rule__SimpleSelector__Alternatives2763 = new BitSet(new long[] { 0x00000420000C0002L });

-	public static final BitSet FOLLOW_rule__SimpleSelector__ConditionAssignment_1_in_rule__SimpleSelector__Alternatives2775 = new BitSet(new long[] { 0x00000420000C0002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__SimpleSelector__ElementNameAlternatives_0_0_02811 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_22_in_rule__SimpleSelector__ElementNameAlternatives_0_0_02829 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleCSSId_in_rule__SelectorCondition__Alternatives2863 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleClass_in_rule__SelectorCondition__Alternatives2880 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleAttribute_in_rule__SelectorCondition__Alternatives2897 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rulePseudo_in_rule__SelectorCondition__Alternatives2914 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleNumber_in_rule__Term__Alternatives_02946 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rulePercentage_in_rule__Term__Alternatives_02963 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleLength_in_rule__Term__Alternatives_02980 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleEms_in_rule__Term__Alternatives_02997 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleExs_in_rule__Term__Alternatives_03014 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleAngle_in_rule__Term__Alternatives_03031 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleTime_in_rule__Term__Alternatives_03048 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleFrequency_in_rule__Term__Alternatives_03065 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleName_in_rule__Term__Alternatives_03082 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleStringValue_in_rule__Term__Alternatives_03099 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUri_in_rule__Term__Alternatives_03116 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleHexColor_in_rule__Term__Alternatives_03133 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleFunction_in_rule__Term__Alternatives_03150 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Operator__Group_0__0_in_rule__Operator__Alternatives3182 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Operator__Group_1__0_in_rule__Operator__Alternatives3200 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__AttributeValue__ValueAlternatives_2_03233 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_STRING_in_rule__AttributeValue__ValueAlternatives_2_03250 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__PseudoAssignment_1_0_in_rule__Pseudo__Alternatives_13282 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1__0_in_rule__Pseudo__Alternatives_13300 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_23_in_rule__UNARY__Alternatives3334 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_24_in_rule__UNARY__Alternatives3355 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_25_in_rule__KIND__Alternatives3391 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_24_in_rule__KIND__Alternatives3412 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_26_in_rule__ATTRIBUTE_OP__Alternatives3448 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_27_in_rule__ATTRIBUTE_OP__Alternatives3469 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_28_in_rule__ATTRIBUTE_OP__Alternatives3490 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group__0__Impl_in_rule__Stylesheet__Group__03523 = new BitSet(new long[] { 0x00000432804C00F0L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group__1_in_rule__Stylesheet__Group__03526 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_0__0_in_rule__Stylesheet__Group__0__Impl3553 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group__1__Impl_in_rule__Stylesheet__Group__13584 = new BitSet(new long[] { 0x00000432804C00F0L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group__2_in_rule__Stylesheet__Group__13587 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Alternatives_1_in_rule__Stylesheet__Group__1__Impl3614 = new BitSet(new long[] { 0x0000000000000072L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group__2__Impl_in_rule__Stylesheet__Group__23645 = new BitSet(new long[] { 0x00000432804C00F0L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group__3_in_rule__Stylesheet__Group__23648 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_2__0_in_rule__Stylesheet__Group__2__Impl3675 = new BitSet(new long[] { 0x0000000080000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group__3__Impl_in_rule__Stylesheet__Group__33706 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_3__0_in_rule__Stylesheet__Group__3__Impl3733 = new BitSet(new long[] { 0x00000432004C0082L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_0__0__Impl_in_rule__Stylesheet__Group_0__03772 = new BitSet(new long[] { 0x0000000000000100L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_0__1_in_rule__Stylesheet__Group_0__03775 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_29_in_rule__Stylesheet__Group_0__0__Impl3803 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_0__1__Impl_in_rule__Stylesheet__Group_0__13834 = new BitSet(new long[] { 0x0000000040000000L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_0__2_in_rule__Stylesheet__Group_0__13837 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__CharsetAssignment_0_1_in_rule__Stylesheet__Group_0__1__Impl3864 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_0__2__Impl_in_rule__Stylesheet__Group_0__23894 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_30_in_rule__Stylesheet__Group_0__2__Impl3922 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_2__0__Impl_in_rule__Stylesheet__Group_2__03959 = new BitSet(new long[] { 0x0000000000000060L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_2__1_in_rule__Stylesheet__Group_2__03962 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__ImportsAssignment_2_0_in_rule__Stylesheet__Group_2__0__Impl3989 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_2__1__Impl_in_rule__Stylesheet__Group_2__14019 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Alternatives_2_1_in_rule__Stylesheet__Group_2__1__Impl4046 = new BitSet(new long[] { 0x0000000000000062L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_2_1_0__0__Impl_in_rule__Stylesheet__Group_2_1_0__04081 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_2_1_0__1_in_rule__Stylesheet__Group_2_1_0__04084 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_CDO_in_rule__Stylesheet__Group_2_1_0__0__Impl4111 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_2_1_0__1__Impl_in_rule__Stylesheet__Group_2_1_0__14140 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Stylesheet__Group_2_1_0__1__Impl4168 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_2_1_1__0__Impl_in_rule__Stylesheet__Group_2_1_1__04203 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_2_1_1__1_in_rule__Stylesheet__Group_2_1_1__04206 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_CDC_in_rule__Stylesheet__Group_2_1_1__0__Impl4233 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_2_1_1__1__Impl_in_rule__Stylesheet__Group_2_1_1__14262 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Stylesheet__Group_2_1_1__1__Impl4290 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_3__0__Impl_in_rule__Stylesheet__Group_3__04325 = new BitSet(new long[] { 0x0000000000000060L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_3__1_in_rule__Stylesheet__Group_3__04328 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__ContentsAssignment_3_0_in_rule__Stylesheet__Group_3__0__Impl4355 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_3__1__Impl_in_rule__Stylesheet__Group_3__14385 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Alternatives_3_1_in_rule__Stylesheet__Group_3__1__Impl4412 = new BitSet(new long[] { 0x0000000000000062L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_3_1_0__0__Impl_in_rule__Stylesheet__Group_3_1_0__04447 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_3_1_0__1_in_rule__Stylesheet__Group_3_1_0__04450 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_CDO_in_rule__Stylesheet__Group_3_1_0__0__Impl4477 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_3_1_0__1__Impl_in_rule__Stylesheet__Group_3_1_0__14506 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Stylesheet__Group_3_1_0__1__Impl4534 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_3_1_1__0__Impl_in_rule__Stylesheet__Group_3_1_1__04569 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_3_1_1__1_in_rule__Stylesheet__Group_3_1_1__04572 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_CDC_in_rule__Stylesheet__Group_3_1_1__0__Impl4599 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Stylesheet__Group_3_1_1__1__Impl_in_rule__Stylesheet__Group_3_1_1__14628 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Stylesheet__Group_3_1_1__1__Impl4656 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__04691 = new BitSet(new long[] { 0x0000000000000110L });

-	public static final BitSet FOLLOW_rule__Import__Group__1_in_rule__Import__Group__04694 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_31_in_rule__Import__Group__0__Impl4722 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__14753 = new BitSet(new long[] { 0x0000000040000090L });

-	public static final BitSet FOLLOW_rule__Import__Group__2_in_rule__Import__Group__14756 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Alternatives_1_in_rule__Import__Group__1__Impl4783 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__24813 = new BitSet(new long[] { 0x0000000040000090L });

-	public static final BitSet FOLLOW_rule__Import__Group__3_in_rule__Import__Group__24816 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Import__Group__2__Impl4844 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Import__Group__3__Impl_in_rule__Import__Group__34875 = new BitSet(new long[] { 0x0000000040000090L });

-	public static final BitSet FOLLOW_rule__Import__Group__4_in_rule__Import__Group__34878 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group_3__0_in_rule__Import__Group__3__Impl4905 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group__4__Impl_in_rule__Import__Group__44936 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Import__Group__5_in_rule__Import__Group__44939 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_30_in_rule__Import__Group__4__Impl4967 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group__5__Impl_in_rule__Import__Group__54998 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Import__Group__5__Impl5026 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Import__Group_1_0__0__Impl_in_rule__Import__Group_1_0__05069 = new BitSet(new long[] { 0x0000000000000110L });

-	public static final BitSet FOLLOW_rule__Import__Group_1_0__1_in_rule__Import__Group_1_0__05072 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Import__Group_1_0__0__Impl5100 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Import__Group_1_0__1__Impl_in_rule__Import__Group_1_0__15131 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__StringAssignment_1_0_1_in_rule__Import__Group_1_0__1__Impl5158 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group_1_1__0__Impl_in_rule__Import__Group_1_1__05192 = new BitSet(new long[] { 0x0000010000000000L });

-	public static final BitSet FOLLOW_rule__Import__Group_1_1__1_in_rule__Import__Group_1_1__05195 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Import__Group_1_1__0__Impl5222 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group_1_1__1__Impl_in_rule__Import__Group_1_1__15251 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__UriAssignment_1_1_1_in_rule__Import__Group_1_1__1__Impl5278 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group_3__0__Impl_in_rule__Import__Group_3__05312 = new BitSet(new long[] { 0x0000000100000010L });

-	public static final BitSet FOLLOW_rule__Import__Group_3__1_in_rule__Import__Group_3__05315 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__MediaAssignment_3_0_in_rule__Import__Group_3__0__Impl5342 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group_3__1__Impl_in_rule__Import__Group_3__15372 = new BitSet(new long[] { 0x0000000100000010L });

-	public static final BitSet FOLLOW_rule__Import__Group_3__2_in_rule__Import__Group_3__15375 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Import__Group_3__1__Impl5403 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Import__Group_3__2__Impl_in_rule__Import__Group_3__25434 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group_3_2__0_in_rule__Import__Group_3__2__Impl5461 = new BitSet(new long[] { 0x0000000100000002L });

-	public static final BitSet FOLLOW_rule__Import__Group_3_2__0__Impl_in_rule__Import__Group_3_2__05498 = new BitSet(new long[] { 0x0000000000000090L });

-	public static final BitSet FOLLOW_rule__Import__Group_3_2__1_in_rule__Import__Group_3_2__05501 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_32_in_rule__Import__Group_3_2__0__Impl5529 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__Group_3_2__1__Impl_in_rule__Import__Group_3_2__15560 = new BitSet(new long[] { 0x0000000000000090L });

-	public static final BitSet FOLLOW_rule__Import__Group_3_2__2_in_rule__Import__Group_3_2__15563 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Import__Group_3_2__1__Impl5591 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Import__Group_3_2__2__Impl_in_rule__Import__Group_3_2__25622 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Import__MediaAssignment_3_2_2_in_rule__Import__Group_3_2__2__Impl5649 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Media__Group__0__Impl_in_rule__Media__Group__05685 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Media__Group__1_in_rule__Media__Group__05688 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_33_in_rule__Media__Group__0__Impl5716 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Media__Group__1__Impl_in_rule__Media__Group__15747 = new BitSet(new long[] { 0x0000000000000080L });

-	public static final BitSet FOLLOW_rule__Media__Group__2_in_rule__Media__Group__15750 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Media__Group__1__Impl5777 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Media__Group__2__Impl_in_rule__Media__Group__25806 = new BitSet(new long[] { 0x0000000500000010L });

-	public static final BitSet FOLLOW_rule__Media__Group__3_in_rule__Media__Group__25809 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Media__MediaAssignment_2_in_rule__Media__Group__2__Impl5836 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Media__Group__3__Impl_in_rule__Media__Group__35866 = new BitSet(new long[] { 0x0000000500000010L });

-	public static final BitSet FOLLOW_rule__Media__Group__4_in_rule__Media__Group__35869 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Media__Group__3__Impl5897 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Media__Group__4__Impl_in_rule__Media__Group__45928 = new BitSet(new long[] { 0x0000000500000010L });

-	public static final BitSet FOLLOW_rule__Media__Group__5_in_rule__Media__Group__45931 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Media__Group_4__0_in_rule__Media__Group__4__Impl5958 = new BitSet(new long[] { 0x0000000100000002L });

-	public static final BitSet FOLLOW_rule__Media__Group__5__Impl_in_rule__Media__Group__55989 = new BitSet(new long[] { 0x00000428004C0090L });

-	public static final BitSet FOLLOW_rule__Media__Group__6_in_rule__Media__Group__55992 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_34_in_rule__Media__Group__5__Impl6020 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Media__Group__6__Impl_in_rule__Media__Group__66051 = new BitSet(new long[] { 0x00000428004C0090L });

-	public static final BitSet FOLLOW_rule__Media__Group__7_in_rule__Media__Group__66054 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Media__Group__6__Impl6082 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Media__Group__7__Impl_in_rule__Media__Group__76113 = new BitSet(new long[] { 0x00000428004C0090L });

-	public static final BitSet FOLLOW_rule__Media__Group__8_in_rule__Media__Group__76116 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Media__RulesAssignment_7_in_rule__Media__Group__7__Impl6143 = new BitSet(new long[] { 0x00000420004C0082L });

-	public static final BitSet FOLLOW_rule__Media__Group__8__Impl_in_rule__Media__Group__86174 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Media__Group__9_in_rule__Media__Group__86177 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_35_in_rule__Media__Group__8__Impl6205 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Media__Group__9__Impl_in_rule__Media__Group__96236 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Media__Group__9__Impl6264 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Media__Group_4__0__Impl_in_rule__Media__Group_4__06315 = new BitSet(new long[] { 0x0000000000000090L });

-	public static final BitSet FOLLOW_rule__Media__Group_4__1_in_rule__Media__Group_4__06318 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_32_in_rule__Media__Group_4__0__Impl6346 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Media__Group_4__1__Impl_in_rule__Media__Group_4__16377 = new BitSet(new long[] { 0x0000000000000090L });

-	public static final BitSet FOLLOW_rule__Media__Group_4__2_in_rule__Media__Group_4__16380 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Media__Group_4__1__Impl6408 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Media__Group_4__2__Impl_in_rule__Media__Group_4__26439 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Media__MediaAssignment_4_2_in_rule__Media__Group_4__2__Impl6466 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Page__Group__0__Impl_in_rule__Page__Group__06502 = new BitSet(new long[] { 0x00000432004C0080L });

-	public static final BitSet FOLLOW_rule__Page__Group__1_in_rule__Page__Group__06505 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Page__Group__1__Impl_in_rule__Page__Group__16563 = new BitSet(new long[] { 0x0000002400000010L });

-	public static final BitSet FOLLOW_rule__Page__Group__2_in_rule__Page__Group__16566 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_36_in_rule__Page__Group__1__Impl6594 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Page__Group__2__Impl_in_rule__Page__Group__26625 = new BitSet(new long[] { 0x0000002400000010L });

-	public static final BitSet FOLLOW_rule__Page__Group__3_in_rule__Page__Group__26628 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Page__Group__2__Impl6656 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Page__Group__3__Impl_in_rule__Page__Group__36687 = new BitSet(new long[] { 0x0000002400000010L });

-	public static final BitSet FOLLOW_rule__Page__Group__4_in_rule__Page__Group__36690 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Page__PseudoAssignment_3_in_rule__Page__Group__3__Impl6717 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Page__Group__4__Impl_in_rule__Page__Group__46748 = new BitSet(new long[] { 0x0000000840000090L });

-	public static final BitSet FOLLOW_rule__Page__Group__5_in_rule__Page__Group__46751 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_34_in_rule__Page__Group__4__Impl6779 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Page__Group__5__Impl_in_rule__Page__Group__56810 = new BitSet(new long[] { 0x0000000840000090L });

-	public static final BitSet FOLLOW_rule__Page__Group__6_in_rule__Page__Group__56813 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Page__Group__5__Impl6841 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Page__Group__6__Impl_in_rule__Page__Group__66872 = new BitSet(new long[] { 0x0000000840000090L });

-	public static final BitSet FOLLOW_rule__Page__Group__7_in_rule__Page__Group__66875 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Page__DeclarationsAssignment_6_in_rule__Page__Group__6__Impl6902 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Page__Group__7__Impl_in_rule__Page__Group__76933 = new BitSet(new long[] { 0x0000000840000090L });

-	public static final BitSet FOLLOW_rule__Page__Group__8_in_rule__Page__Group__76936 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Page__Group_7__0_in_rule__Page__Group__7__Impl6963 = new BitSet(new long[] { 0x0000000040000002L });

-	public static final BitSet FOLLOW_rule__Page__Group__8__Impl_in_rule__Page__Group__86994 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Page__Group__9_in_rule__Page__Group__86997 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_35_in_rule__Page__Group__8__Impl7025 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Page__Group__9__Impl_in_rule__Page__Group__97056 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Page__Group__9__Impl7084 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Page__Group_7__0__Impl_in_rule__Page__Group_7__07135 = new BitSet(new long[] { 0x0000000000000090L });

-	public static final BitSet FOLLOW_rule__Page__Group_7__1_in_rule__Page__Group_7__07138 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_30_in_rule__Page__Group_7__0__Impl7166 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Page__Group_7__1__Impl_in_rule__Page__Group_7__17197 = new BitSet(new long[] { 0x0000000000000090L });

-	public static final BitSet FOLLOW_rule__Page__Group_7__2_in_rule__Page__Group_7__17200 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Page__Group_7__1__Impl7228 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Page__Group_7__2__Impl_in_rule__Page__Group_7__27259 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Page__DeclarationsAssignment_7_2_in_rule__Page__Group_7__2__Impl7286 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__PseudoPage__Group__0__Impl_in_rule__PseudoPage__Group__07323 = new BitSet(new long[] { 0x0000000000000080L });

-	public static final BitSet FOLLOW_rule__PseudoPage__Group__1_in_rule__PseudoPage__Group__07326 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_37_in_rule__PseudoPage__Group__0__Impl7354 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__PseudoPage__Group__1__Impl_in_rule__PseudoPage__Group__17385 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__PseudoPage__Group__2_in_rule__PseudoPage__Group__17388 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__PseudoPage__IdAssignment_1_in_rule__PseudoPage__Group__1__Impl7415 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__PseudoPage__Group__2__Impl_in_rule__PseudoPage__Group__27445 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__PseudoPage__Group__2__Impl7473 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__0__Impl_in_rule__Ruleset__Group__07510 = new BitSet(new long[] { 0x0000000500000000L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__1_in_rule__Ruleset__Group__07513 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__SelectorsAssignment_0_in_rule__Ruleset__Group__0__Impl7540 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__1__Impl_in_rule__Ruleset__Group__17570 = new BitSet(new long[] { 0x0000000500000000L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__2_in_rule__Ruleset__Group__17573 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group_1__0_in_rule__Ruleset__Group__1__Impl7600 = new BitSet(new long[] { 0x0000000100000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__2__Impl_in_rule__Ruleset__Group__27631 = new BitSet(new long[] { 0x0000000840000090L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__3_in_rule__Ruleset__Group__27634 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_34_in_rule__Ruleset__Group__2__Impl7662 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__3__Impl_in_rule__Ruleset__Group__37693 = new BitSet(new long[] { 0x0000000840000090L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__4_in_rule__Ruleset__Group__37696 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Ruleset__Group__3__Impl7724 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__4__Impl_in_rule__Ruleset__Group__47755 = new BitSet(new long[] { 0x0000000840000090L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__5_in_rule__Ruleset__Group__47758 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__PropertiesAssignment_4_in_rule__Ruleset__Group__4__Impl7785 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__5__Impl_in_rule__Ruleset__Group__57816 = new BitSet(new long[] { 0x0000000840000090L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__6_in_rule__Ruleset__Group__57819 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group_5__0_in_rule__Ruleset__Group__5__Impl7846 = new BitSet(new long[] { 0x0000000040000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__6__Impl_in_rule__Ruleset__Group__67877 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__7_in_rule__Ruleset__Group__67880 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_35_in_rule__Ruleset__Group__6__Impl7908 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group__7__Impl_in_rule__Ruleset__Group__77939 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Ruleset__Group__7__Impl7967 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group_1__0__Impl_in_rule__Ruleset__Group_1__08014 = new BitSet(new long[] { 0x00000420004C0090L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group_1__1_in_rule__Ruleset__Group_1__08017 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_32_in_rule__Ruleset__Group_1__0__Impl8045 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group_1__1__Impl_in_rule__Ruleset__Group_1__18076 = new BitSet(new long[] { 0x00000420004C0090L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group_1__2_in_rule__Ruleset__Group_1__18079 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Ruleset__Group_1__1__Impl8107 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group_1__2__Impl_in_rule__Ruleset__Group_1__28138 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__SelectorsAssignment_1_2_in_rule__Ruleset__Group_1__2__Impl8165 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group_5__0__Impl_in_rule__Ruleset__Group_5__08201 = new BitSet(new long[] { 0x0000000000000090L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group_5__1_in_rule__Ruleset__Group_5__08204 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_30_in_rule__Ruleset__Group_5__0__Impl8232 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group_5__1__Impl_in_rule__Ruleset__Group_5__18263 = new BitSet(new long[] { 0x0000000000000090L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group_5__2_in_rule__Ruleset__Group_5__18266 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Ruleset__Group_5__1__Impl8294 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Ruleset__Group_5__2__Impl_in_rule__Ruleset__Group_5__28325 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ruleset__PropertiesAssignment_5_2_in_rule__Ruleset__Group_5__2__Impl8352 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Selector__Group_0__0__Impl_in_rule__Selector__Group_0__08389 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Selector__Group_0__1_in_rule__Selector__Group_0__08392 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSimpleSelector_in_rule__Selector__Group_0__0__Impl8419 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Selector__Group_0__1__Impl_in_rule__Selector__Group_0__18448 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Selector__Group_0__1__Impl8476 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__Group__0__Impl_in_rule__CompositeSelector__Group__08511 = new BitSet(new long[] { 0x0000000003000010L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__Group__1_in_rule__CompositeSelector__Group__08514 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__LeftAssignment_0_in_rule__CompositeSelector__Group__0__Impl8541 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__Group__1__Impl_in_rule__CompositeSelector__Group__18571 = new BitSet(new long[] { 0x00000420004C0080L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__Group__2_in_rule__CompositeSelector__Group__18574 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__Alternatives_1_in_rule__CompositeSelector__Group__1__Impl8601 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__Group__2__Impl_in_rule__CompositeSelector__Group__28631 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__RightAssignment_2_in_rule__CompositeSelector__Group__2__Impl8658 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__Group_1_1__0__Impl_in_rule__CompositeSelector__Group_1_1__08694 = new BitSet(new long[] { 0x0000000003000010L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__Group_1_1__1_in_rule__CompositeSelector__Group_1_1__08697 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__CompositeSelector__Group_1_1__0__Impl8725 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__Group_1_1__1__Impl_in_rule__CompositeSelector__Group_1_1__18756 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__CompositeSelector__CombinatorAssignment_1_1_1_in_rule__CompositeSelector__Group_1_1__1__Impl8783 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SimpleSelector__Group_0__0__Impl_in_rule__SimpleSelector__Group_0__08817 = new BitSet(new long[] { 0x00000420000C0000L });

-	public static final BitSet FOLLOW_rule__SimpleSelector__Group_0__1_in_rule__SimpleSelector__Group_0__08820 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SimpleSelector__ElementNameAssignment_0_0_in_rule__SimpleSelector__Group_0__0__Impl8847 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SimpleSelector__Group_0__1__Impl_in_rule__SimpleSelector__Group_0__18877 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SimpleSelector__ConditionAssignment_0_1_in_rule__SimpleSelector__Group_0__1__Impl8904 = new BitSet(new long[] { 0x00000420000C0002L });

-	public static final BitSet FOLLOW_rule__Combinator__Group__0__Impl_in_rule__Combinator__Group__08939 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Combinator__Group__1_in_rule__Combinator__Group__08942 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Combinator__KindAssignment_0_in_rule__Combinator__Group__0__Impl8969 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Combinator__Group__1__Impl_in_rule__Combinator__Group__18999 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Combinator__Group__1__Impl9027 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Declaration__Group__0__Impl_in_rule__Declaration__Group__09062 = new BitSet(new long[] { 0x0000002000000010L });

-	public static final BitSet FOLLOW_rule__Declaration__Group__1_in_rule__Declaration__Group__09065 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Declaration__PropertyAssignment_0_in_rule__Declaration__Group__0__Impl9092 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Declaration__Group__1__Impl_in_rule__Declaration__Group__19122 = new BitSet(new long[] { 0x0000002000000010L });

-	public static final BitSet FOLLOW_rule__Declaration__Group__2_in_rule__Declaration__Group__19125 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Declaration__Group__1__Impl9153 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Declaration__Group__2__Impl_in_rule__Declaration__Group__29184 = new BitSet(new long[] { 0x0000010001840590L });

-	public static final BitSet FOLLOW_rule__Declaration__Group__3_in_rule__Declaration__Group__29187 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_37_in_rule__Declaration__Group__2__Impl9215 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Declaration__Group__3__Impl_in_rule__Declaration__Group__39246 = new BitSet(new long[] { 0x0000010001840590L });

-	public static final BitSet FOLLOW_rule__Declaration__Group__4_in_rule__Declaration__Group__39249 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Declaration__Group__3__Impl9277 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Declaration__Group__4__Impl_in_rule__Declaration__Group__49308 = new BitSet(new long[] { 0x0000000000000200L });

-	public static final BitSet FOLLOW_rule__Declaration__Group__5_in_rule__Declaration__Group__49311 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Declaration__ExpressionAssignment_4_in_rule__Declaration__Group__4__Impl9338 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Declaration__Group__5__Impl_in_rule__Declaration__Group__59368 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Declaration__Group_5__0_in_rule__Declaration__Group__5__Impl9395 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Declaration__Group_5__0__Impl_in_rule__Declaration__Group_5__09438 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Declaration__Group_5__1_in_rule__Declaration__Group_5__09441 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Declaration__ImportantAssignment_5_0_in_rule__Declaration__Group_5__0__Impl9468 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Declaration__Group_5__1__Impl_in_rule__Declaration__Group_5__19498 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Declaration__Group_5__1__Impl9526 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Expression__Group__0__Impl_in_rule__Expression__Group__09561 = new BitSet(new long[] { 0x0000030101840590L });

-	public static final BitSet FOLLOW_rule__Expression__Group__1_in_rule__Expression__Group__09564 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Expression__TermsAssignment_0_in_rule__Expression__Group__0__Impl9591 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Expression__Group__1__Impl_in_rule__Expression__Group__19621 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Expression__SubtermsAssignment_1_in_rule__Expression__Group__1__Impl9648 = new BitSet(new long[] { 0x0000030101840592L });

-	public static final BitSet FOLLOW_rule__Subterm__Group__0__Impl_in_rule__Subterm__Group__09683 = new BitSet(new long[] { 0x0000030101840590L });

-	public static final BitSet FOLLOW_rule__Subterm__Group__1_in_rule__Subterm__Group__09686 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Subterm__OperatorAssignment_0_in_rule__Subterm__Group__0__Impl9713 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Subterm__Group__1__Impl_in_rule__Subterm__Group__19744 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Subterm__TermAssignment_1_in_rule__Subterm__Group__1__Impl9771 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Term__Group__0__Impl_in_rule__Term__Group__09805 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Term__Group__1_in_rule__Term__Group__09808 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Term__Alternatives_0_in_rule__Term__Group__0__Impl9835 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Term__Group__1__Impl_in_rule__Term__Group__19865 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Term__Group__1__Impl9893 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Function__Group__0__Impl_in_rule__Function__Group__09928 = new BitSet(new long[] { 0x0000004000000000L });

-	public static final BitSet FOLLOW_rule__Function__Group__1_in_rule__Function__Group__09931 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Function__NameAssignment_0_in_rule__Function__Group__0__Impl9958 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Function__Group__1__Impl_in_rule__Function__Group__19988 = new BitSet(new long[] { 0x0000010001840590L });

-	public static final BitSet FOLLOW_rule__Function__Group__2_in_rule__Function__Group__19991 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_38_in_rule__Function__Group__1__Impl10019 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Function__Group__2__Impl_in_rule__Function__Group__210050 = new BitSet(new long[] { 0x0000010001840590L });

-	public static final BitSet FOLLOW_rule__Function__Group__3_in_rule__Function__Group__210053 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Function__Group__2__Impl10081 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Function__Group__3__Impl_in_rule__Function__Group__310112 = new BitSet(new long[] { 0x0000008000000000L });

-	public static final BitSet FOLLOW_rule__Function__Group__4_in_rule__Function__Group__310115 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Function__ArgsAssignment_3_in_rule__Function__Group__3__Impl10142 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Function__Group__4__Impl_in_rule__Function__Group__410172 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_39_in_rule__Function__Group__4__Impl10200 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Number__Group__0__Impl_in_rule__Number__Group__010241 = new BitSet(new long[] { 0x0000000001800400L });

-	public static final BitSet FOLLOW_rule__Number__Group__1_in_rule__Number__Group__010244 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Number__OpAssignment_0_in_rule__Number__Group__0__Impl10271 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Number__Group__1__Impl_in_rule__Number__Group__110302 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Number__ValueAssignment_1_in_rule__Number__Group__1__Impl10329 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Percentage__Group__0__Impl_in_rule__Percentage__Group__010363 = new BitSet(new long[] { 0x0000000001800400L });

-	public static final BitSet FOLLOW_rule__Percentage__Group__1_in_rule__Percentage__Group__010366 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Percentage__OpAssignment_0_in_rule__Percentage__Group__0__Impl10393 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Percentage__Group__1__Impl_in_rule__Percentage__Group__110424 = new BitSet(new long[] { 0x0000000000000800L });

-	public static final BitSet FOLLOW_rule__Percentage__Group__2_in_rule__Percentage__Group__110427 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Percentage__ValueAssignment_1_in_rule__Percentage__Group__1__Impl10454 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Percentage__Group__2__Impl_in_rule__Percentage__Group__210484 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Percentage__UnitAssignment_2_in_rule__Percentage__Group__2__Impl10511 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Length__Group__0__Impl_in_rule__Length__Group__010547 = new BitSet(new long[] { 0x0000000001800400L });

-	public static final BitSet FOLLOW_rule__Length__Group__1_in_rule__Length__Group__010550 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Length__OpAssignment_0_in_rule__Length__Group__0__Impl10577 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Length__Group__1__Impl_in_rule__Length__Group__110608 = new BitSet(new long[] { 0x0000000000001000L });

-	public static final BitSet FOLLOW_rule__Length__Group__2_in_rule__Length__Group__110611 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Length__ValueAssignment_1_in_rule__Length__Group__1__Impl10638 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Length__Group__2__Impl_in_rule__Length__Group__210668 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Length__UnitAssignment_2_in_rule__Length__Group__2__Impl10695 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ems__Group__0__Impl_in_rule__Ems__Group__010731 = new BitSet(new long[] { 0x0000000001800400L });

-	public static final BitSet FOLLOW_rule__Ems__Group__1_in_rule__Ems__Group__010734 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ems__OpAssignment_0_in_rule__Ems__Group__0__Impl10761 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ems__Group__1__Impl_in_rule__Ems__Group__110792 = new BitSet(new long[] { 0x0000000000002000L });

-	public static final BitSet FOLLOW_rule__Ems__Group__2_in_rule__Ems__Group__110795 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ems__ValueAssignment_1_in_rule__Ems__Group__1__Impl10822 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ems__Group__2__Impl_in_rule__Ems__Group__210852 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Ems__UnitAssignment_2_in_rule__Ems__Group__2__Impl10879 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Exs__Group__0__Impl_in_rule__Exs__Group__010915 = new BitSet(new long[] { 0x0000000001800400L });

-	public static final BitSet FOLLOW_rule__Exs__Group__1_in_rule__Exs__Group__010918 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Exs__OpAssignment_0_in_rule__Exs__Group__0__Impl10945 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Exs__Group__1__Impl_in_rule__Exs__Group__110976 = new BitSet(new long[] { 0x0000000000004000L });

-	public static final BitSet FOLLOW_rule__Exs__Group__2_in_rule__Exs__Group__110979 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Exs__ValueAssignment_1_in_rule__Exs__Group__1__Impl11006 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Exs__Group__2__Impl_in_rule__Exs__Group__211036 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Exs__UnitAssignment_2_in_rule__Exs__Group__2__Impl11063 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Angle__Group__0__Impl_in_rule__Angle__Group__011099 = new BitSet(new long[] { 0x0000000001800400L });

-	public static final BitSet FOLLOW_rule__Angle__Group__1_in_rule__Angle__Group__011102 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Angle__OpAssignment_0_in_rule__Angle__Group__0__Impl11129 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Angle__Group__1__Impl_in_rule__Angle__Group__111160 = new BitSet(new long[] { 0x0000000000008000L });

-	public static final BitSet FOLLOW_rule__Angle__Group__2_in_rule__Angle__Group__111163 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Angle__ValueAssignment_1_in_rule__Angle__Group__1__Impl11190 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Angle__Group__2__Impl_in_rule__Angle__Group__211220 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Angle__UnitAssignment_2_in_rule__Angle__Group__2__Impl11247 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Time__Group__0__Impl_in_rule__Time__Group__011283 = new BitSet(new long[] { 0x0000000001800400L });

-	public static final BitSet FOLLOW_rule__Time__Group__1_in_rule__Time__Group__011286 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Time__OpAssignment_0_in_rule__Time__Group__0__Impl11313 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Time__Group__1__Impl_in_rule__Time__Group__111344 = new BitSet(new long[] { 0x0000000000010000L });

-	public static final BitSet FOLLOW_rule__Time__Group__2_in_rule__Time__Group__111347 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Time__ValueAssignment_1_in_rule__Time__Group__1__Impl11374 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Time__Group__2__Impl_in_rule__Time__Group__211404 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Time__UnitAssignment_2_in_rule__Time__Group__2__Impl11431 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Frequency__Group__0__Impl_in_rule__Frequency__Group__011467 = new BitSet(new long[] { 0x0000000001800400L });

-	public static final BitSet FOLLOW_rule__Frequency__Group__1_in_rule__Frequency__Group__011470 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Frequency__OpAssignment_0_in_rule__Frequency__Group__0__Impl11497 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Frequency__Group__1__Impl_in_rule__Frequency__Group__111528 = new BitSet(new long[] { 0x0000000000020000L });

-	public static final BitSet FOLLOW_rule__Frequency__Group__2_in_rule__Frequency__Group__111531 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Frequency__ValueAssignment_1_in_rule__Frequency__Group__1__Impl11558 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Frequency__Group__2__Impl_in_rule__Frequency__Group__211588 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Frequency__UnitAssignment_2_in_rule__Frequency__Group__2__Impl11615 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Uri__Group__0__Impl_in_rule__Uri__Group__011651 = new BitSet(new long[] { 0x0000000000000110L });

-	public static final BitSet FOLLOW_rule__Uri__Group__1_in_rule__Uri__Group__011654 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_40_in_rule__Uri__Group__0__Impl11682 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Uri__Group__1__Impl_in_rule__Uri__Group__111713 = new BitSet(new long[] { 0x0000000000000110L });

-	public static final BitSet FOLLOW_rule__Uri__Group__2_in_rule__Uri__Group__111716 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Uri__Group__1__Impl11744 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Uri__Group__2__Impl_in_rule__Uri__Group__211775 = new BitSet(new long[] { 0x0000008000000010L });

-	public static final BitSet FOLLOW_rule__Uri__Group__3_in_rule__Uri__Group__211778 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Uri__ValueAssignment_2_in_rule__Uri__Group__2__Impl11805 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Uri__Group__3__Impl_in_rule__Uri__Group__311835 = new BitSet(new long[] { 0x0000008000000010L });

-	public static final BitSet FOLLOW_rule__Uri__Group__4_in_rule__Uri__Group__311838 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Uri__Group__3__Impl11866 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Uri__Group__4__Impl_in_rule__Uri__Group__411897 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_39_in_rule__Uri__Group__4__Impl11925 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Operator__Group_0__0__Impl_in_rule__Operator__Group_0__011966 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Operator__Group_0__1_in_rule__Operator__Group_0__011969 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_41_in_rule__Operator__Group_0__0__Impl11997 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Operator__Group_0__1__Impl_in_rule__Operator__Group_0__112028 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Operator__Group_0__1__Impl12056 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Operator__Group_1__0__Impl_in_rule__Operator__Group_1__012091 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Operator__Group_1__1_in_rule__Operator__Group_1__012094 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_32_in_rule__Operator__Group_1__0__Impl12122 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Operator__Group_1__1__Impl_in_rule__Operator__Group_1__112153 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Operator__Group_1__1__Impl12181 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Attribute__Group__0__Impl_in_rule__Attribute__Group__012216 = new BitSet(new long[] { 0x0000000000000090L });

-	public static final BitSet FOLLOW_rule__Attribute__Group__1_in_rule__Attribute__Group__012219 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_42_in_rule__Attribute__Group__0__Impl12247 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Attribute__Group__1__Impl_in_rule__Attribute__Group__112278 = new BitSet(new long[] { 0x0000000000000090L });

-	public static final BitSet FOLLOW_rule__Attribute__Group__2_in_rule__Attribute__Group__112281 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Attribute__Group__1__Impl12309 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Attribute__Group__2__Impl_in_rule__Attribute__Group__212340 = new BitSet(new long[] { 0x000008001C000010L });

-	public static final BitSet FOLLOW_rule__Attribute__Group__3_in_rule__Attribute__Group__212343 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Attribute__NameAssignment_2_in_rule__Attribute__Group__2__Impl12370 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Attribute__Group__3__Impl_in_rule__Attribute__Group__312400 = new BitSet(new long[] { 0x000008001C000010L });

-	public static final BitSet FOLLOW_rule__Attribute__Group__4_in_rule__Attribute__Group__312403 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Attribute__Group__3__Impl12431 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Attribute__Group__4__Impl_in_rule__Attribute__Group__412462 = new BitSet(new long[] { 0x000008001C000010L });

-	public static final BitSet FOLLOW_rule__Attribute__Group__5_in_rule__Attribute__Group__412465 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Attribute__ValueAssignment_4_in_rule__Attribute__Group__4__Impl12492 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Attribute__Group__5__Impl_in_rule__Attribute__Group__512523 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_43_in_rule__Attribute__Group__5__Impl12551 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__AttributeValue__Group__0__Impl_in_rule__AttributeValue__Group__012594 = new BitSet(new long[] { 0x0000000000000190L });

-	public static final BitSet FOLLOW_rule__AttributeValue__Group__1_in_rule__AttributeValue__Group__012597 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__AttributeValue__OperatorAssignment_0_in_rule__AttributeValue__Group__0__Impl12624 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__AttributeValue__Group__1__Impl_in_rule__AttributeValue__Group__112654 = new BitSet(new long[] { 0x0000000000000190L });

-	public static final BitSet FOLLOW_rule__AttributeValue__Group__2_in_rule__AttributeValue__Group__112657 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__AttributeValue__Group__1__Impl12685 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__AttributeValue__Group__2__Impl_in_rule__AttributeValue__Group__212716 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__AttributeValue__Group__3_in_rule__AttributeValue__Group__212719 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__AttributeValue__ValueAssignment_2_in_rule__AttributeValue__Group__2__Impl12746 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__AttributeValue__Group__3__Impl_in_rule__AttributeValue__Group__312776 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__AttributeValue__Group__3__Impl12804 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group__0__Impl_in_rule__Pseudo__Group__012843 = new BitSet(new long[] { 0x0000000000000080L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group__1_in_rule__Pseudo__Group__012846 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_37_in_rule__Pseudo__Group__0__Impl12874 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group__1__Impl_in_rule__Pseudo__Group__112905 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__Alternatives_1_in_rule__Pseudo__Group__1__Impl12932 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1__0__Impl_in_rule__Pseudo__Group_1_1__012966 = new BitSet(new long[] { 0x0000004000000000L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1__1_in_rule__Pseudo__Group_1_1__012969 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__PseudoAssignment_1_1_0_in_rule__Pseudo__Group_1_1__0__Impl12996 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1__1__Impl_in_rule__Pseudo__Group_1_1__113026 = new BitSet(new long[] { 0x0000008000000090L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1__2_in_rule__Pseudo__Group_1_1__113029 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_38_in_rule__Pseudo__Group_1_1__1__Impl13057 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1__2__Impl_in_rule__Pseudo__Group_1_1__213088 = new BitSet(new long[] { 0x0000008000000090L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1__3_in_rule__Pseudo__Group_1_1__213091 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Pseudo__Group_1_1__2__Impl13119 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1__3__Impl_in_rule__Pseudo__Group_1_1__313150 = new BitSet(new long[] { 0x0000008000000090L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1__4_in_rule__Pseudo__Group_1_1__313153 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1_3__0_in_rule__Pseudo__Group_1_1__3__Impl13180 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1__4__Impl_in_rule__Pseudo__Group_1_1__413211 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_39_in_rule__Pseudo__Group_1_1__4__Impl13239 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1_3__0__Impl_in_rule__Pseudo__Group_1_1_3__013280 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1_3__1_in_rule__Pseudo__Group_1_1_3__013283 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__ArgsAssignment_1_1_3_0_in_rule__Pseudo__Group_1_1_3__0__Impl13310 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__Pseudo__Group_1_1_3__1__Impl_in_rule__Pseudo__Group_1_1_3__113340 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_WS_in_rule__Pseudo__Group_1_1_3__1__Impl13368 = new BitSet(new long[] { 0x0000000000000012L });

-	public static final BitSet FOLLOW_RULE_STRING_in_rule__Stylesheet__CharsetAssignment_0_113408 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleImport_in_rule__Stylesheet__ImportsAssignment_2_013439 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleContent_in_rule__Stylesheet__ContentsAssignment_3_013470 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_STRING_in_rule__Import__StringAssignment_1_0_113501 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUri_in_rule__Import__UriAssignment_1_1_113532 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__Import__MediaAssignment_3_013563 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__Import__MediaAssignment_3_2_213594 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__Media__MediaAssignment_213625 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__Media__MediaAssignment_4_213656 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleRuleset_in_rule__Media__RulesAssignment_713687 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rulePseudoPage_in_rule__Page__PseudoAssignment_313718 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleDeclaration_in_rule__Page__DeclarationsAssignment_613749 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleDeclaration_in_rule__Page__DeclarationsAssignment_7_213780 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__PseudoPage__IdAssignment_113811 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSelector_in_rule__Ruleset__SelectorsAssignment_013842 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSelector_in_rule__Ruleset__SelectorsAssignment_1_213873 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleDeclaration_in_rule__Ruleset__PropertiesAssignment_413904 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleDeclaration_in_rule__Ruleset__PropertiesAssignment_5_213935 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSimpleSelector_in_rule__CompositeSelector__LeftAssignment_013966 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleCombinator_in_rule__CompositeSelector__CombinatorAssignment_1_1_113997 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSelector_in_rule__CompositeSelector__RightAssignment_214028 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__SimpleSelector__ElementNameAlternatives_0_0_0_in_rule__SimpleSelector__ElementNameAssignment_0_014059 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSelectorCondition_in_rule__SimpleSelector__ConditionAssignment_0_114092 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSelectorCondition_in_rule__SimpleSelector__ConditionAssignment_114123 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleKIND_in_rule__Combinator__KindAssignment_014154 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__Declaration__PropertyAssignment_014185 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleExpression_in_rule__Declaration__ExpressionAssignment_414216 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_T_IMPORTANT_in_rule__Declaration__ImportantAssignment_5_014247 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleTerm_in_rule__Expression__TermsAssignment_014278 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSubterm_in_rule__Expression__SubtermsAssignment_114309 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleOperator_in_rule__Subterm__OperatorAssignment_014340 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleTerm_in_rule__Subterm__TermAssignment_114371 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__Function__NameAssignment_014402 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleExpression_in_rule__Function__ArgsAssignment_314433 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__Name__ValueAssignment14464 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_rule__Number__OpAssignment_014495 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_rule__Number__ValueAssignment_114526 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_rule__Percentage__OpAssignment_014557 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_rule__Percentage__ValueAssignment_114588 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_PC_UNIT_in_rule__Percentage__UnitAssignment_214619 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_rule__Length__OpAssignment_014650 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_rule__Length__ValueAssignment_114681 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_LEN_UNIT_in_rule__Length__UnitAssignment_214712 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_rule__Ems__OpAssignment_014743 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_rule__Ems__ValueAssignment_114774 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_EM_UNIT_in_rule__Ems__UnitAssignment_214805 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_rule__Exs__OpAssignment_014836 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_rule__Exs__ValueAssignment_114867 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_EX_UNIT_in_rule__Exs__UnitAssignment_214898 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_rule__Angle__OpAssignment_014929 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_rule__Angle__ValueAssignment_114960 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ANGLE_UNIT_in_rule__Angle__UnitAssignment_214991 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_rule__Time__OpAssignment_015022 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_rule__Time__ValueAssignment_115053 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_TIME_UNIT_in_rule__Time__UnitAssignment_215084 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_rule__Frequency__OpAssignment_015115 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_rule__Frequency__ValueAssignment_115146 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_FREQ_UNIT_in_rule__Frequency__UnitAssignment_215177 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_STRING_in_rule__Uri__ValueAssignment_215208 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_STRING_in_rule__StringValue__ValueAssignment15239 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_HASH_in_rule__HexColor__ValueAssignment15270 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_T_CLASS_in_rule__Class__ClassAssignment15301 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__Attribute__NameAssignment_215332 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleAttributeValue_in_rule__Attribute__ValueAssignment_415363 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleATTRIBUTE_OP_in_rule__AttributeValue__OperatorAssignment_015394 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rule__AttributeValue__ValueAlternatives_2_0_in_rule__AttributeValue__ValueAssignment_215425 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__Pseudo__PseudoAssignment_1_015458 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__Pseudo__PseudoAssignment_1_1_015489 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rule__Pseudo__ArgsAssignment_1_1_3_015520 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_HASH_in_rule__CSSId__ValueAssignment15551 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUNARY_in_rule__UnaryOperator__OperatorAssignment15582 = new BitSet(new long[] { 0x0000000000000002L });

-

-}
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/color/CSSHighlightingConfiguration.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/color/CSSHighlightingConfiguration.java
deleted file mode 100644
index ba16d9fbff5..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/color/CSSHighlightingConfiguration.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.eclipse.papyrus.infra.gmfdiag.ui.color;

-

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.RGB;

-import org.eclipse.xtext.ui.editor.syntaxcoloring.DefaultHighlightingConfiguration;

-import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightingConfigurationAcceptor;

-import org.eclipse.xtext.ui.editor.utils.TextStyle;

-

-public class CSSHighlightingConfiguration extends DefaultHighlightingConfiguration {

-

-

-	public static final String COLOR = "Color";

-

-	public static final String HEX_COLOR = "HexColor";

-

-	public static final String CSS_ID = "CSSId";

-

-	public static final String CSS_CLASS = "CSSClass";

-

-	public static final String SELECTOR = "Selector";

-

-	public static final String PROPERTY = "Property";

-

-	public static final String ATTRIBUTE = "Attribute";

-

-	public static final String FONT = "Font";

-

-	public static final String FUNCTION = "Function";

-

-	public TextStyle colorTextStyle() {

-		TextStyle textStyle = new TextStyle();

-		textStyle.setColor(new RGB(255, 98, 176));

-		return textStyle;

-	}

-

-	public TextStyle hexColorTextStyle() {

-		TextStyle textStyle = new TextStyle();

-		textStyle.setColor(new RGB(255, 128, 64));

-		return textStyle;

-	}

-

-	public TextStyle idTextStyle() {

-		TextStyle textStyle = new TextStyle();

-		textStyle.setColor(new RGB(84, 0, 235));

-		return textStyle;

-	}

-

-	public TextStyle classTextStyle() {

-		TextStyle textStyle = new TextStyle();

-		textStyle.setColor(new RGB(84, 0, 235));

-		return textStyle;

-	}

-

-	public TextStyle selectorTextStyle() {

-		TextStyle textStyle = new TextStyle();

-		textStyle.setColor(new RGB(63, 127, 127));

-		return textStyle;

-	}

-

-	public TextStyle propertyTextStyle() {

-		TextStyle textStyle = new TextStyle();

-		textStyle.setColor(new RGB(63, 127, 127));

-		return textStyle;

-	}

-

-	public TextStyle functionTextStyle() {

-		TextStyle textStyle = new TextStyle();

-		textStyle.setColor(new RGB(63, 127, 127));

-		return textStyle;

-	}

-

-	public TextStyle attributeTextStyle() {

-		TextStyle textStyle = new TextStyle();

-		textStyle.setColor(new RGB(84, 0, 235));

-		return textStyle;

-	}

-

-	public TextStyle fontTextStyle() {

-		TextStyle textStyle = new TextStyle();

-		textStyle.setColor(new RGB(1, 1, 1));

-		textStyle.setStyle(SWT.ITALIC);

-		return textStyle;

-	}

-

-	@Override

-	public TextStyle stringTextStyle() {

-		TextStyle textStyle = new TextStyle();

-		textStyle.setColor(new RGB(0, 0, 255)); // TODO

-		return textStyle;

-	}

-

-	@Override

-	public TextStyle numberTextStyle() {

-		TextStyle textStyle = new TextStyle();

-		textStyle.setColor(new RGB(128, 0, 255));

-		return textStyle;

-	}

-

-	@Override

-	public void configure(IHighlightingConfigurationAcceptor acceptor) {

-		super.configure(acceptor);

-		acceptor.acceptDefaultHighlighting(COLOR, "Color", colorTextStyle());

-		acceptor.acceptDefaultHighlighting(HEX_COLOR, "Hexa color", hexColorTextStyle());

-		acceptor.acceptDefaultHighlighting(CSS_ID, "Id", idTextStyle());

-		acceptor.acceptDefaultHighlighting(CSS_CLASS, "Class", classTextStyle());

-		acceptor.acceptDefaultHighlighting(SELECTOR, "Selector", selectorTextStyle());

-		acceptor.acceptDefaultHighlighting(PROPERTY, "Property", propertyTextStyle());

-		acceptor.acceptDefaultHighlighting(ATTRIBUTE, "Attribute", attributeTextStyle());

-		acceptor.acceptDefaultHighlighting(FONT, "Font", fontTextStyle());

-		acceptor.acceptDefaultHighlighting(FUNCTION, "Function", functionTextStyle());

-	}

-

-}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/color/CSSSemanticHighlightingCalculator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/color/CSSSemanticHighlightingCalculator.java
deleted file mode 100644
index c53207e096d..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/color/CSSSemanticHighlightingCalculator.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.eclipse.papyrus.infra.gmfdiag.ui.color;

-

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.e4.ui.css.core.css2.CSS2ColorHelper;

-import org.eclipse.swt.graphics.FontData;

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

-import org.eclipse.xtext.RuleCall;

-import org.eclipse.xtext.nodemodel.INode;

-import org.eclipse.xtext.resource.XtextResource;

-import org.eclipse.xtext.ui.editor.syntaxcoloring.DefaultHighlightingConfiguration;

-import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightedPositionAcceptor;

-import org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator;

-

-

-public class CSSSemanticHighlightingCalculator implements ISemanticHighlightingCalculator {

-

-	private final Map<String, String> ruleNameToID = new HashMap<String, String>();

-

-	private final Set<String> fontNames = new HashSet<String>();

-

-	public CSSSemanticHighlightingCalculator() {

-		ruleNameToID.put("CSSId", CSSHighlightingConfiguration.CSS_ID);

-		ruleNameToID.put("Class", CSSHighlightingConfiguration.CSS_CLASS);

-		ruleNameToID.put("Attribute", CSSHighlightingConfiguration.ATTRIBUTE);

-

-		ruleNameToID.put("Selector", CSSHighlightingConfiguration.SELECTOR);

-		ruleNameToID.put("Combinator", CSSHighlightingConfiguration.SELECTOR);

-

-		ruleNameToID.put("Declaration", CSSHighlightingConfiguration.PROPERTY);

-		ruleNameToID.put("Function", CSSHighlightingConfiguration.FUNCTION);

-

-		// Values

-

-		ruleNameToID.put("Name", DefaultHighlightingConfiguration.STRING_ID);

-		ruleNameToID.put("StringValue", DefaultHighlightingConfiguration.STRING_ID);

-		ruleNameToID.put("Uri", DefaultHighlightingConfiguration.STRING_ID);

-

-		ruleNameToID.put("HexColor", CSSHighlightingConfiguration.HEX_COLOR);

-

-		ruleNameToID.put("Length", DefaultHighlightingConfiguration.NUMBER_ID);

-		ruleNameToID.put("Percentage", DefaultHighlightingConfiguration.NUMBER_ID);

-		ruleNameToID.put("Frequency", DefaultHighlightingConfiguration.NUMBER_ID);

-		ruleNameToID.put("Ems", DefaultHighlightingConfiguration.NUMBER_ID);

-		ruleNameToID.put("Exs", DefaultHighlightingConfiguration.NUMBER_ID);

-		ruleNameToID.put("Angle", DefaultHighlightingConfiguration.NUMBER_ID);

-		ruleNameToID.put("Time", DefaultHighlightingConfiguration.NUMBER_ID);

-		ruleNameToID.put("Number", DefaultHighlightingConfiguration.NUMBER_ID);

-

-		// Available fonts

-

-		FontData[] fontData = Display.getCurrent().getFontList(null, true);

-		for (FontData data : fontData) {

-			fontNames.add(data.getName().toLowerCase());

-		}

-	}

-

-	@Override

-	public void provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor) {

-		if (resource == null || resource.getParseResult() == null) {

-			return;

-		}

-

-		INode root = resource.getParseResult().getRootNode();

-		for (INode node : root.getAsTreeIterable()) {

-			if (node.getGrammarElement() instanceof RuleCall) {

-				RuleCall ruleCall = (RuleCall) node.getGrammarElement();

-				String name = ruleCall.getRule().getName();

-

-				String stringOrNameValue = null;

-

-				if ("Name".equals(name)) { // TODO: Strings should also be taken into account

-					// Check the known elements (fonts, colors, ...)

-					stringOrNameValue = node.getText();

-				} else if ("StringValue".equals(name)) {

-					stringOrNameValue = node.getText();

-					stringOrNameValue = stringOrNameValue.substring(1, stringOrNameValue.length() - 1);

-				}

-

-				if (stringOrNameValue != null) {

-					if (isFont(stringOrNameValue)) {

-						acceptor.addPosition(node.getOffset(), node.getLength(), CSSHighlightingConfiguration.FONT);

-						continue;

-					} else if (isColor(stringOrNameValue)) {

-						acceptor.addPosition(node.getOffset(), node.getLength(), CSSHighlightingConfiguration.COLOR);

-						continue;

-					}

-				}

-

-				if (ruleNameToID.containsKey(name)) {

-					acceptor.addPosition(node.getOffset(), node.getLength(), ruleNameToID.get(name));

-				}

-			}

-		}

-	}

-

-	public boolean isFont(String value) {

-		return fontNames.contains(value.toLowerCase());

-	}

-

-	public boolean isColor(String value) {

-		return CSS2ColorHelper.isColorName(value.toLowerCase());

-	}

-}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/color/CSSTokenScanner.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/color/CSSTokenScanner.java
deleted file mode 100644
index 651ba72ed55..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/color/CSSTokenScanner.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.papyrus.infra.gmfdiag.ui.color;

-

-import org.eclipse.xtext.ui.editor.syntaxcoloring.DefaultAntlrTokenToAttributeIdMapper;

-

-

-public class CSSTokenScanner extends DefaultAntlrTokenToAttributeIdMapper {

-

-	@Override

-	protected String calculateId(String tokenName, int tokenType) {

-		return super.calculateId(tokenName, tokenType);

-		// if("RULE_ID".equals(tokenName)) {

-		// return DefaultHighlightingConfiguration.NUMBER_ID;

-		// }

-		// return DefaultHighlightingConfiguration.DEFAULT_ID; //Skip Lexical coloring

-		// if("RULE_STRING".equals(tokenName)) {

-		// return DefaultHighlightingConfiguration.DEFAULT_ID; //Skip parent coloring

-		// }

-		// return super.calculateId(tokenName, tokenType);

-		// return CSSHighlightingConfiguration.DEFAULT_ID;

-	}

-}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/CSSProposalProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/CSSProposalProvider.java
deleted file mode 100644
index d5cdff2f519..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/CSSProposalProvider.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.papyrus.infra.gmfdiag.ui.contentassist;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;
-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
-import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
-
-/**
- * see http://www.eclipse.org/Xtext/documentation/latest/xtext.html#contentAssist on how to customize content assistant
- */
-public class CSSProposalProvider extends AbstractCSSProposalProvider {
-
-	static final Set<String> colorNames = new LinkedHashSet<String>();
-
-	static final Set<String> umlProperties = new LinkedHashSet<String>();
-
-	static {
-		colorNames.add("aliceblue");
-		colorNames.add("aqua");
-		colorNames.add("aquamarine");
-		colorNames.add("azure");
-		colorNames.add("beige");
-		colorNames.add("bisque");
-		colorNames.add("black");
-		colorNames.add("blanchedalmond");
-		colorNames.add("blue");
-		colorNames.add("blueviolet");
-		colorNames.add("brown");
-		colorNames.add("burlywood");
-		colorNames.add("cadetblue");
-		colorNames.add("chartreuse");
-		colorNames.add("chocolate");
-		colorNames.add("coral");
-		colorNames.add("cornflowerblue");
-		colorNames.add("cornsilk");
-		colorNames.add("crimson");
-		colorNames.add("cyan");
-		colorNames.add("darkblue");
-		colorNames.add("darkcyan");
-		colorNames.add("darkgoldenrod");
-		colorNames.add("darkgray");
-		colorNames.add("darkgrey");
-		colorNames.add("darkgreen");
-		colorNames.add("darkkhaki");
-		colorNames.add("darkmagenta");
-		colorNames.add("darkolivegreen");
-		colorNames.add("darkorange");
-		colorNames.add("darkorchid");
-		colorNames.add("darkred");
-		colorNames.add("darksalmon");
-		colorNames.add("darkseagreen");
-		colorNames.add("darkslateblue");
-		colorNames.add("darkslategray");
-		colorNames.add("darkslategrey");
-		colorNames.add("darkturquoise");
-		colorNames.add("darkviolet");
-		colorNames.add("deeppink");
-		colorNames.add("deepskyblue");
-		colorNames.add("dimgray");
-		colorNames.add("dimgrey");
-		colorNames.add("dodgerblue");
-		colorNames.add("firebrick");
-		colorNames.add("floralwhite");
-		colorNames.add("forestgreen");
-		colorNames.add("fuchsia");
-		colorNames.add("gainsboro");
-		colorNames.add("ghostwhite");
-		colorNames.add("gold");
-		colorNames.add("goldenrod");
-		colorNames.add("gray");
-		colorNames.add("grey");
-		colorNames.add("green");
-		colorNames.add("greenyellow");
-		colorNames.add("honeydew");
-		colorNames.add("hotpink");
-		colorNames.add("indianred");
-		colorNames.add("indigo");
-		colorNames.add("ivory");
-		colorNames.add("khaki");
-		colorNames.add("lavender");
-		colorNames.add("lavenderblush");
-		colorNames.add("lawngreen");
-		colorNames.add("lemonchiffon");
-		colorNames.add("lightblue");
-		colorNames.add("lightcoral");
-		colorNames.add("lightcyan");
-		colorNames.add("lightgoldenrodyellow");
-		colorNames.add("lightgray");
-		colorNames.add("lightgrey");
-		colorNames.add("lightgreen");
-		colorNames.add("lightpink");
-		colorNames.add("lightsalmon");
-		colorNames.add("lightseagreen");
-		colorNames.add("lightskyblue");
-		colorNames.add("lightslategray");
-		colorNames.add("lightslategrey");
-		colorNames.add("lightsteelblue");
-		colorNames.add("lightyellow");
-		colorNames.add("lime");
-		colorNames.add("limegreen");
-		colorNames.add("linen");
-		colorNames.add("magenta");
-		colorNames.add("maroon");
-		colorNames.add("mediumaquamarine");
-		colorNames.add("mediumblue");
-		colorNames.add("mediumorchid");
-		colorNames.add("mediumpurple");
-		colorNames.add("mediumseagreen");
-		colorNames.add("mediumslateblue");
-		colorNames.add("mediumspringgreen");
-		colorNames.add("mediumturquoise");
-		colorNames.add("mediumvioletred");
-		colorNames.add("midnightblue");
-		colorNames.add("mintcream");
-		colorNames.add("mistyrose");
-		colorNames.add("moccasin");
-		colorNames.add("navajowhite");
-		colorNames.add("navy");
-		colorNames.add("oldlace");
-		colorNames.add("olive");
-		colorNames.add("olivedrab");
-		colorNames.add("orange");
-		colorNames.add("orangered");
-		colorNames.add("orchid");
-		colorNames.add("palegoldenrod");
-		colorNames.add("palegreen");
-		colorNames.add("paleturquoise");
-		colorNames.add("palevioletred");
-		colorNames.add("papayawhip");
-		colorNames.add("peachpuff");
-		colorNames.add("peru");
-		colorNames.add("pink");
-		colorNames.add("plum");
-		colorNames.add("powderblue");
-		colorNames.add("purple");
-		colorNames.add("red");
-		colorNames.add("rosybrown");
-		colorNames.add("royalblue");
-		colorNames.add("saddlebrown");
-		colorNames.add("salmon");
-		colorNames.add("sandybrown");
-		colorNames.add("seagreen");
-		colorNames.add("seashell");
-		colorNames.add("sienna");
-		colorNames.add("silver");
-		colorNames.add("skyblue");
-		colorNames.add("slateblue");
-		colorNames.add("slategray");
-		colorNames.add("slategrey");
-		colorNames.add("snow");
-		colorNames.add("springgreen");
-		colorNames.add("steelblue");
-		colorNames.add("tan");
-		colorNames.add("teal");
-		colorNames.add("thistle");
-		colorNames.add("tomato");
-		colorNames.add("turquoise");
-		colorNames.add("violet");
-		colorNames.add("wheat");
-		colorNames.add("white");
-		colorNames.add("whitesmoke");
-		colorNames.add("yellow");
-		colorNames.add("yellowgreen");
-	}
-
-	static {
-		for (EClassifier umlMetaclass : UMLPackage.eINSTANCE.getEClassifiers()) {
-			if (umlMetaclass instanceof EClass) {
-				EClass umlClass = (EClass) umlMetaclass;
-				for (EAttribute attribute : umlClass.getEAllAttributes()) {
-					umlProperties.add(attribute.getName());
-				}
-
-				for (EReference reference : umlClass.getEAllReferences()) {
-					EClassifier type = reference.getEType();
-					if (type instanceof EClass) {
-						EClass eType = (EClass) type;
-						if (EMFHelper.isSubclass(eType, UMLPackage.eINSTANCE.getNamedElement())) {
-							umlProperties.add(reference.getName());
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.AbstractCSSProposalProvider#completeDeclaration_Property(org.eclipse.emf.ecore.EObject, org.eclipse.xtext.Assignment, org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext,
-	 *      org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor)
-	 *
-	 * @param model
-	 * @param assignment
-	 * @param context
-	 * @param acceptor
-	 */
-	@Override
-	public void completeDeclaration_Property(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-
-		String prefix = context.getPrefix();
-
-		Set<String> allProperties = new HashSet<String>(getStyleProperties());
-		allProperties.addAll(getCustomProperties());
-
-		Iterator<String> filterIterator = allProperties.iterator();
-		while (filterIterator.hasNext()) {
-			if (!filterIterator.next().contains(prefix)) {
-				filterIterator.remove();
-			}
-		}
-
-		List<String> properties = new LinkedList<String>(allProperties);
-		Collections.sort(properties);
-
-		for (String property : properties) {
-			String proposal = property + ": ";
-			acceptor.accept(buildProposal(proposal, context));
-		}
-	}
-
-	protected CompletionProposal buildProposal(String proposal, ContentAssistContext context) {
-		String prefix = context.getPrefix();
-		return new CompletionProposal(proposal, context.getOffset() - prefix.length(), prefix.length(), proposal.length());
-	}
-
-	protected Collection<String> getStyleProperties() {
-		Set<String> propertiesNames = new HashSet<String>();
-		for (EClass styleClass : EMFHelper.getSubclassesOf(NotationPackage.eINSTANCE.getStyle(), false)) {
-			if (styleClass.getEAllSuperTypes().contains(NotationPackage.eINSTANCE.getNamedStyle())) {
-				continue;
-			}
-
-			for (EStructuralFeature styleFeature : styleClass.getEStructuralFeatures()) {
-				propertiesNames.add(styleFeature.getName());
-			}
-		}
-
-		return propertiesNames;
-	}
-
-	protected Collection<String> getCustomProperties() {
-		String[] properties = new String[] {
-				"visible",
-				"elementIcon",
-				"shadow",
-				"displayBorder",
-				"displayName",
-				"displayTag",
-				"maintainSymbolRatio",
-				"qualifiedNameDepth",
-				"lineStyle",
-				"lineDashLength",
-				"lineDashGap",
-				"targetDecoration",
-				"sourceDecoration",
-				"maskLabel",
-				"svgFile",
-				"followSVGSymbol",
-				"svgCssFile",
-				"svgCssClass",
-		};
-
-		return Arrays.asList(properties);
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.AbstractCSSProposalProvider#complete_Name(org.eclipse.emf.ecore.EObject, org.eclipse.xtext.RuleCall, org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext,
-	 *      org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor)
-	 *
-	 * @param model
-	 * @param ruleCall
-	 * @param context
-	 * @param acceptor
-	 */
-	@Override
-	public void complete_Name(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-
-		super.complete_Name(model, ruleCall, context, acceptor);
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.AbstractCSSProposalProvider#complete_Term(org.eclipse.emf.ecore.EObject, org.eclipse.xtext.RuleCall, org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext,
-	 *      org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor)
-	 *
-	 * @param model
-	 * @param ruleCall
-	 * @param context
-	 * @param acceptor
-	 */
-	@Override
-	public void complete_Term(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		if (model instanceof Declaration) {
-			Declaration declaration = (Declaration) model;
-			String property = declaration.getProperty();
-			if (property != null && (property.contains("color") || property.contains("Color") || property.contains("gradient"))) {
-				for (String colorName : colorNames) {
-					if (colorName.contains(context.getPrefix())) {
-						acceptor.accept(buildProposal(colorName, context));
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.AbstractCSSProposalProvider#complete_Ruleset(org.eclipse.emf.ecore.EObject, org.eclipse.xtext.RuleCall, org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext,
-	 *      org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor)
-	 *
-	 * @param model
-	 * @param ruleCall
-	 * @param context
-	 * @param acceptor
-	 */
-	@Override
-	public void complete_Ruleset(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// complete_Selector(model, ruleCall, context, acceptor);
-	}
-
-
-	/**
-	 * @see org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.AbstractCSSProposalProvider#complete_Selector(org.eclipse.emf.ecore.EObject, org.eclipse.xtext.RuleCall, org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext,
-	 *      org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor)
-	 *
-	 * @param model
-	 * @param ruleCall
-	 * @param context
-	 * @param acceptor
-	 */
-	@Override
-	public void complete_Selector(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		for (EClassifier umlMetaclass : UMLPackage.eINSTANCE.getEClassifiers()) {
-			if (umlMetaclass instanceof EClass) {
-				EClass umlClass = (EClass) umlMetaclass;
-				if (umlClass.getName().contains(context.getPrefix())) {
-					acceptor.accept(buildProposal(umlClass.getName(), context));
-				}
-			}
-		}
-
-		String[] otherSemanticElements = new String[] {
-				"Compartment",
-				"Label"
-		};
-
-		for (String element : otherSemanticElements) {
-			if (element.contains(context.getPrefix())) {
-				acceptor.accept(buildProposal(element, context));
-			}
-		}
-
-		super.complete_Ruleset(model, ruleCall, context, acceptor);
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.AbstractCSSProposalProvider#complete_ID(org.eclipse.emf.ecore.EObject, org.eclipse.xtext.RuleCall, org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext,
-	 *      org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor)
-	 *
-	 * @param model
-	 * @param ruleCall
-	 * @param context
-	 * @param acceptor
-	 */
-	@Override
-	public void complete_ID(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		if (model instanceof Attribute) {
-			String prefix = context.getPrefix();
-			if (prefix.startsWith("[")) {
-				prefix = prefix.substring(1);
-			}
-
-			for (String umlProperty : umlProperties) {
-				if (umlProperty.contains(prefix)) {
-					acceptor.accept(buildProposal(umlProperty, context));
-				}
-			}
-		} else {
-			super.complete_ID(model, ruleCall, context, acceptor);
-		}
-	}
-
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/labeling/CSSDescriptionLabelProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/labeling/CSSDescriptionLabelProvider.java
deleted file mode 100644
index 755c6199d97..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/labeling/CSSDescriptionLabelProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.papyrus.infra.gmfdiag.ui.labeling;
-
-import org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider;
-
-/**
- * Provides labels for a IEObjectDescriptions and IResourceDescriptions.
- *
- * see http://www.eclipse.org/Xtext/documentation/latest/xtext.html#labelProvider
- */
-public class CSSDescriptionLabelProvider extends DefaultDescriptionLabelProvider {
-
-	/*
-	 * //Labels and icons can be computed like this:
-	 *
-	 * String text(IEObjectDescription ele) {
-	 * return "my "+ele.getName();
-	 * }
-	 *
-	 * String image(IEObjectDescription ele) {
-	 * return ele.getEClass().getName() + ".gif";
-	 * }
-	 */
-
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/labeling/CSSLabelProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/labeling/CSSLabelProvider.java
deleted file mode 100644
index 8f778065559..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/labeling/CSSLabelProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.papyrus.infra.gmfdiag.ui.labeling;
-
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider;
-
-import com.google.inject.Inject;
-
-/**
- * Provides labels for a EObjects.
- *
- * see http://www.eclipse.org/Xtext/documentation/latest/xtext.html#labelProvider
- */
-public class CSSLabelProvider extends DefaultEObjectLabelProvider {
-
-	@Inject
-	public CSSLabelProvider(AdapterFactoryLabelProvider delegate) {
-		super(delegate);
-	}
-
-	/*
-	 * //Labels and icons can be computed like this:
-	 *
-	 * String text(MyModel ele) {
-	 * return "my "+ele.getName();
-	 * }
-	 *
-	 * String image(MyModel ele) {
-	 * return "MyModel.gif";
-	 * }
-	 */
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/outline/CSSOutlineTreeProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/outline/CSSOutlineTreeProvider.java
deleted file mode 100644
index d04ad0cf3ce..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/outline/CSSOutlineTreeProvider.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.papyrus.infra.gmfdiag.ui.outline;
-
-import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
-
-/**
- * customization of the default outline structure
- *
- */
-public class CSSOutlineTreeProvider extends DefaultOutlineTreeProvider {
-
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/quickfix/CSSQuickfixProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/quickfix/CSSQuickfixProvider.java
deleted file mode 100644
index 65721928c5c..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/quickfix/CSSQuickfixProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.papyrus.infra.gmfdiag.ui.quickfix;
-
-import org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider;
-
-public class CSSQuickfixProvider extends DefaultQuickfixProvider {
-
-	// @Fix(MyJavaValidator.INVALID_NAME)
-	// public void capitalizeName(final Issue issue, IssueResolutionAcceptor acceptor) {
-	// acceptor.accept(issue, "Capitalize name", "Capitalize the name.", "upcase.png", new IModification() {
-	// public void apply(IModificationContext context) throws BadLocationException {
-	// IXtextDocument xtextDocument = context.getXtextDocument();
-	// String firstLetter = xtextDocument.get(issue.getOffset(), 1);
-	// xtextDocument.replace(issue.getOffset(), 1, firstLetter.toUpperCase());
-	// }
-	// });
-	// }
-
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
deleted file mode 100644
index 387e2826155..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,38 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag,

- org.eclipse.papyrus.infra.gmfdiag.css,

- org.eclipse.papyrus.infra.gmfdiag.css.impl,

- org.eclipse.papyrus.infra.gmfdiag.css.util,

- org.eclipse.papyrus.infra.gmfdiag.formatting,

- org.eclipse.papyrus.infra.gmfdiag.generator,

- org.eclipse.papyrus.infra.gmfdiag.parser.antlr,

- org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal,

- org.eclipse.papyrus.infra.gmfdiag.scoping,

- org.eclipse.papyrus.infra.gmfdiag.serializer,

- org.eclipse.papyrus.infra.gmfdiag.services,

- org.eclipse.papyrus.infra.gmfdiag.validation

-Require-Bundle: org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport,

- org.eclipse.xtext.xbase;bundle-version="2.1.0";resolution:=optional;visibility:=reexport,

- org.apache.log4j;bundle-version="1.2.15",

- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,

- org.eclipse.xtext.generator;resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.eclipse.xtext.common.types,

- org.eclipse.core.commands;bundle-version="3.6.0"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.1.0.qualifier

-Bundle-Name: CSS Editor

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.xbase.lib

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.xtext;singl

- eton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/plugin.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/plugin.xml
deleted file mode 100644
index ce66ca337a8..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http://www.eclipse.org/papyrus/infra/gmfdiag/CSS" 
-       class = "org.eclipse.papyrus.infra.gmfdiag.css.CssPackage"
-       genModel = "org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel" /> 
-	
-  </extension>
-
-
-
-
-</plugin>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/plugin.xml_gen b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/plugin.xml_gen
deleted file mode 100644
index ce66ca337a8..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/plugin.xml_gen
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http://www.eclipse.org/papyrus/infra/gmfdiag/CSS" 
-       class = "org.eclipse.papyrus.infra.gmfdiag.css.CssPackage"
-       genModel = "org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel" /> 
-	
-  </extension>
-
-
-
-
-</plugin>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.ecore b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.ecore
deleted file mode 100644
index b8ba08b9241..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.ecore
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="css" nsURI="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS"

-    nsPrefix="css">

-  <eClassifiers xsi:type="ecore:EClass" name="Stylesheet">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="charset" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"

-        eType="#//Import" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="contents" upperBound="-1"

-        eType="#//Content" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Content"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Import">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="string" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="uri" eType="#//Uri" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="media" unique="false" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Media" eSuperTypes="#//Content">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="media" unique="false" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1"

-        eType="#//Ruleset" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Page" eSuperTypes="#//Content">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="pseudo" eType="#//PseudoPage"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="declarations" upperBound="-1"

-        eType="#//Declaration" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="PseudoPage">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Ruleset" eSuperTypes="#//Content">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="selectors" upperBound="-1"

-        eType="#//Selector" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"

-        eType="#//Declaration" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Selector"/>

-  <eClassifiers xsi:type="ecore:EClass" name="CompositeSelector" eSuperTypes="#//Selector">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="left" eType="#//SimpleSelector"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="combinator" eType="#//Combinator"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="right" eType="#//Selector"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="SimpleSelector" eSuperTypes="#//Selector">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" upperBound="-1"

-        eType="#//SelectorCondition" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="SelectorCondition"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Combinator">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//KIND"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Declaration">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="property" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//Expression"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="important" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Expression">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="terms" eType="#//Term"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="subterms" upperBound="-1"

-        eType="#//Subterm" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Subterm">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="term" eType="#//Term" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Term"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Function" eSuperTypes="#//Term">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="args" eType="#//Expression"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Name" eSuperTypes="#//Term">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Number" eSuperTypes="#//Term">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="op" eType="#//UnaryOperator"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Percentage" eSuperTypes="#//Term">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="op" eType="#//UnaryOperator"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Length" eSuperTypes="#//Term">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="op" eType="#//UnaryOperator"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Ems" eSuperTypes="#//Term">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="op" eType="#//UnaryOperator"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Exs" eSuperTypes="#//Term">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="op" eType="#//UnaryOperator"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Angle" eSuperTypes="#//Term">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="op" eType="#//UnaryOperator"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Time" eSuperTypes="#//Term">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="op" eType="#//UnaryOperator"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Frequency" eSuperTypes="#//Term">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="op" eType="#//UnaryOperator"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Uri" eSuperTypes="#//Term">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="StringValue" eSuperTypes="#//Term">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="HexColor" eSuperTypes="#//Term">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Class" eSuperTypes="#//SelectorCondition">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="class" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Attribute" eSuperTypes="#//SelectorCondition">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//AttributeValue"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AttributeValue">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" eType="#//ATTRIBUTE_OP"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Pseudo" eSuperTypes="#//SelectorCondition">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pseudo" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="args" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="CSSId" eSuperTypes="#//SelectorCondition">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="UnaryOperator">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" eType="#//UNARY"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="UNARY">

-    <eLiterals name="NEG" literal="-"/>

-    <eLiterals name="PLUS" value="1" literal="+"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="KIND">

-    <eLiterals name="FIRST_CHILD" literal=">"/>

-    <eLiterals name="SIBLING" value="1" literal="+"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="ATTRIBUTE_OP">

-    <eLiterals name="EQUALS" literal="="/>

-    <eLiterals name="CONTAINS" value="1" literal="~="/>

-    <eLiterals name="UNEQUALS" value="2" literal="!="/>

-  </eClassifiers>

-</ecore:EPackage>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel
deleted file mode 100644
index 5eed78c5e42..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen"

-    editDirectory="/org.eclipse.papyrus.infra.gmfdiag.css.xtext.edit/src" editorDirectory="/org.eclipse.papyrus.infra.gmfdiag.css.xtext.editor/src"

-    modelPluginID="org.eclipse.papyrus.infra.gmfdiag.css.xtext" forceOverwrite="true"

-    modelName="CSS" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.infra.gmfdiag.css.xtext.edit"

-    editorPluginID="org.eclipse.papyrus.infra.gmfdiag.css.xtext.editor" runtimeVersion="2.9">

-  <genPackages prefix="Css" basePackage="org.eclipse.papyrus.infra.gmfdiag" disposableProviderFactory="true"

-      ecorePackage="CSS.ecore#/">

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="CSS.ecore#//UNARY">

-      <genEnumLiterals ecoreEnumLiteral="CSS.ecore#//UNARY/NEG"/>

-      <genEnumLiterals ecoreEnumLiteral="CSS.ecore#//UNARY/PLUS"/>

-    </genEnums>

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="CSS.ecore#//KIND">

-      <genEnumLiterals ecoreEnumLiteral="CSS.ecore#//KIND/FIRST_CHILD"/>

-      <genEnumLiterals ecoreEnumLiteral="CSS.ecore#//KIND/SIBLING"/>

-    </genEnums>

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="CSS.ecore#//ATTRIBUTE_OP">

-      <genEnumLiterals ecoreEnumLiteral="CSS.ecore#//ATTRIBUTE_OP/EQUALS"/>

-      <genEnumLiterals ecoreEnumLiteral="CSS.ecore#//ATTRIBUTE_OP/CONTAINS"/>

-      <genEnumLiterals ecoreEnumLiteral="CSS.ecore#//ATTRIBUTE_OP/UNEQUALS"/>

-    </genEnums>

-    <genClasses ecoreClass="CSS.ecore#//Stylesheet">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Stylesheet/charset"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Stylesheet/imports"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Stylesheet/contents"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Content"/>

-    <genClasses ecoreClass="CSS.ecore#//Import">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Import/string"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Import/uri"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Import/media"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Media">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Media/media"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Media/rules"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Page">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Page/pseudo"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Page/declarations"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//PseudoPage">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//PseudoPage/id"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Ruleset">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Ruleset/selectors"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Ruleset/properties"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Selector"/>

-    <genClasses ecoreClass="CSS.ecore#//CompositeSelector">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//CompositeSelector/left"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//CompositeSelector/combinator"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//CompositeSelector/right"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//SimpleSelector">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//SimpleSelector/elementName"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//SimpleSelector/condition"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//SelectorCondition"/>

-    <genClasses ecoreClass="CSS.ecore#//Combinator">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Combinator/kind"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Declaration">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Declaration/property"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Declaration/expression"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Declaration/important"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Expression">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Expression/terms"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Expression/subterms"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Subterm">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Subterm/operator"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Subterm/term"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Term"/>

-    <genClasses ecoreClass="CSS.ecore#//Function">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Function/name"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Function/args"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Name">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Name/value"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Number">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Number/op"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Number/value"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Percentage">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Percentage/op"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Percentage/value"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Percentage/unit"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Length">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Length/op"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Length/value"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Length/unit"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Ems">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Ems/op"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Ems/value"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Ems/unit"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Exs">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Exs/op"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Exs/value"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Exs/unit"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Angle">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Angle/op"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Angle/value"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Angle/unit"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Time">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Time/op"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Time/value"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Time/unit"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Frequency">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Frequency/op"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Frequency/value"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Frequency/unit"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Uri">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Uri/value"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//StringValue">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//StringValue/value"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//HexColor">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//HexColor/value"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Class">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Class/class"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Attribute">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Attribute/name"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//Attribute/value"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//AttributeValue">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//AttributeValue/operator"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//AttributeValue/value"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//Pseudo">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Pseudo/pseudo"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//Pseudo/args"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//CSSId">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//CSSId/value"/>

-    </genClasses>

-    <genClasses ecoreClass="CSS.ecore#//UnaryOperator">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//UnaryOperator/operator"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.xmi b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.xmi
deleted file mode 100644
index 37c88bb1387..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.xmi
+++ /dev/null
@@ -1,936 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<xtext:Grammar 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" xmlns:xtext="http://www.eclipse.org/2008/Xtext" name="org.eclipse.papyrus.infra.gmfdiag.CSS" definesHiddenTokens="true" hiddenTokens="//@rules.54">

-  <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore">

-    <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/>

-  </metamodelDeclarations>

-  <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="css">

-    <ePackage href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#/"/>

-  </metamodelDeclarations>

-  <rules xsi:type="xtext:ParserRule" name="Stylesheet">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Stylesheet"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Group" cardinality="?">

-        <elements xsi:type="xtext:Keyword" value="@charset "/>

-        <elements xsi:type="xtext:Assignment" feature="charset" operator="=">

-          <terminal xsi:type="xtext:RuleCall" rule="//@rules.51"/>

-        </elements>

-        <elements xsi:type="xtext:Keyword" value=";"/>

-      </elements>

-      <elements xsi:type="xtext:Alternatives" cardinality="*">

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.55"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.52"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.53"/>

-      </elements>

-      <elements xsi:type="xtext:Group" cardinality="*">

-        <elements xsi:type="xtext:Assignment" feature="imports" operator="+=">

-          <terminal xsi:type="xtext:RuleCall" rule="//@rules.2"/>

-        </elements>

-        <elements xsi:type="xtext:Alternatives" cardinality="*">

-          <elements xsi:type="xtext:Group">

-            <elements xsi:type="xtext:RuleCall" rule="//@rules.52"/>

-            <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-          </elements>

-          <elements xsi:type="xtext:Group">

-            <elements xsi:type="xtext:RuleCall" rule="//@rules.53"/>

-            <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-          </elements>

-        </elements>

-      </elements>

-      <elements xsi:type="xtext:Group" cardinality="*">

-        <elements xsi:type="xtext:Assignment" feature="contents" operator="+=">

-          <terminal xsi:type="xtext:RuleCall" rule="//@rules.1"/>

-        </elements>

-        <elements xsi:type="xtext:Alternatives" cardinality="*">

-          <elements xsi:type="xtext:Group">

-            <elements xsi:type="xtext:RuleCall" rule="//@rules.52"/>

-            <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-          </elements>

-          <elements xsi:type="xtext:Group">

-            <elements xsi:type="xtext:RuleCall" rule="//@rules.53"/>

-            <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-          </elements>

-        </elements>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Content">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Content"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:RuleCall" rule="//@rules.6"/>

-      <elements xsi:type="xtext:RuleCall" rule="//@rules.3"/>

-      <elements xsi:type="xtext:RuleCall" rule="//@rules.4"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Import">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Import"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Keyword" value="@import"/>

-      <elements xsi:type="xtext:Alternatives">

-        <elements xsi:type="xtext:Group">

-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-          <elements xsi:type="xtext:Assignment" feature="string" operator="=">

-            <terminal xsi:type="xtext:RuleCall" rule="//@rules.51"/>

-          </elements>

-        </elements>

-        <elements xsi:type="xtext:Group">

-          <elements xsi:type="xtext:RuleCall" rule="//@rules.55"/>

-          <elements xsi:type="xtext:Assignment" feature="uri" operator="=">

-            <terminal xsi:type="xtext:RuleCall" rule="//@rules.26"/>

-          </elements>

-        </elements>

-      </elements>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Group" cardinality="?">

-        <elements xsi:type="xtext:Assignment" feature="media" operator="+=">

-          <terminal xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-        </elements>

-        <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-        <elements xsi:type="xtext:Group" cardinality="*">

-          <elements xsi:type="xtext:Keyword" value=","/>

-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-          <elements xsi:type="xtext:Assignment" feature="media" operator="+=">

-            <terminal xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-          </elements>

-        </elements>

-      </elements>

-      <elements xsi:type="xtext:Keyword" value=";"/>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Media">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Media"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Keyword" value="@media"/>

-      <elements xsi:type="xtext:RuleCall" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Assignment" feature="media" operator="+=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-      </elements>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Group" cardinality="*">

-        <elements xsi:type="xtext:Keyword" value=","/>

-        <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-        <elements xsi:type="xtext:Assignment" feature="media" operator="+=">

-          <terminal xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-        </elements>

-      </elements>

-      <elements xsi:type="xtext:Keyword" value="{"/>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Assignment" cardinality="*" feature="rules" operator="+=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.6"/>

-      </elements>

-      <elements xsi:type="xtext:Keyword" value="}"/>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Page">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Page"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Action">

-        <type metamodel="//@metamodelDeclarations.1">

-          <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Page"/>

-        </type>

-      </elements>

-      <elements xsi:type="xtext:Keyword" value="@page"/>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Assignment" cardinality="?" feature="pseudo" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.5"/>

-      </elements>

-      <elements xsi:type="xtext:Keyword" value="{"/>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Assignment" cardinality="?" feature="declarations" operator="+=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.12"/>

-      </elements>

-      <elements xsi:type="xtext:Group" cardinality="*">

-        <elements xsi:type="xtext:Keyword" value=";"/>

-        <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-        <elements xsi:type="xtext:Assignment" cardinality="?" feature="declarations" operator="+=">

-          <terminal xsi:type="xtext:RuleCall" rule="//@rules.12"/>

-        </elements>

-      </elements>

-      <elements xsi:type="xtext:Keyword" value="}"/>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="PseudoPage">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//PseudoPage"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Keyword" value=":"/>

-      <elements xsi:type="xtext:Assignment" feature="id" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-      </elements>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Ruleset">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Ruleset"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" feature="selectors" operator="+=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.7"/>

-      </elements>

-      <elements xsi:type="xtext:Group" cardinality="*">

-        <elements xsi:type="xtext:Keyword" value=","/>

-        <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-        <elements xsi:type="xtext:Assignment" feature="selectors" operator="+=">

-          <terminal xsi:type="xtext:RuleCall" rule="//@rules.7"/>

-        </elements>

-      </elements>

-      <elements xsi:type="xtext:Keyword" value="{"/>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Assignment" cardinality="?" feature="properties" operator="+=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.12"/>

-      </elements>

-      <elements xsi:type="xtext:Group" cardinality="*">

-        <elements xsi:type="xtext:Keyword" value=";"/>

-        <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-        <elements xsi:type="xtext:Assignment" cardinality="?" feature="properties" operator="+=">

-          <terminal xsi:type="xtext:RuleCall" rule="//@rules.12"/>

-        </elements>

-      </elements>

-      <elements xsi:type="xtext:Keyword" value="}"/>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Selector">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Selector"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:Group">

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.9"/>

-        <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      </elements>

-      <elements xsi:type="xtext:RuleCall" rule="//@rules.8"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="CompositeSelector">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//CompositeSelector"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" feature="left" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.9"/>

-      </elements>

-      <elements xsi:type="xtext:Alternatives">

-        <elements xsi:type="xtext:RuleCall" cardinality="+" rule="//@rules.55"/>

-        <elements xsi:type="xtext:Group">

-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-          <elements xsi:type="xtext:Assignment" feature="combinator" operator="=">

-            <terminal xsi:type="xtext:RuleCall" rule="//@rules.11"/>

-          </elements>

-        </elements>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="right" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.7"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="SimpleSelector">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//SimpleSelector"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:Group">

-        <elements xsi:type="xtext:Assignment" feature="elementName" operator="=">

-          <terminal xsi:type="xtext:Alternatives">

-            <elements xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-            <elements xsi:type="xtext:Keyword" value="*"/>

-          </terminal>

-        </elements>

-        <elements xsi:type="xtext:Assignment" cardinality="*" feature="condition" operator="+=">

-          <terminal xsi:type="xtext:RuleCall" rule="//@rules.10"/>

-        </elements>

-      </elements>

-      <elements xsi:type="xtext:Assignment" cardinality="+" feature="condition" operator="+=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.10"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="SelectorCondition">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//SelectorCondition"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:RuleCall" rule="//@rules.34"/>

-      <elements xsi:type="xtext:RuleCall" rule="//@rules.30"/>

-      <elements xsi:type="xtext:RuleCall" rule="//@rules.31"/>

-      <elements xsi:type="xtext:RuleCall" rule="//@rules.33"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Combinator">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Combinator"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" feature="kind" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.37"/>

-      </elements>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Declaration">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Declaration"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" feature="property" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-      </elements>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Keyword" value=":"/>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Assignment" feature="expression" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.13"/>

-      </elements>

-      <elements xsi:type="xtext:Group" cardinality="?">

-        <elements xsi:type="xtext:Assignment" feature="important" operator="?=">

-          <terminal xsi:type="xtext:RuleCall" rule="//@rules.41"/>

-        </elements>

-        <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Expression">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Expression"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" feature="terms" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.15"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" cardinality="*" feature="subterms" operator="+=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.14"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Subterm">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Subterm"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" cardinality="?" feature="operator" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.29"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="term" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.15"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Term">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Term"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Alternatives">

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.18"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.19"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.20"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.21"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.22"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.23"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.24"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.25"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.17"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.27"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.26"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.28"/>

-        <elements xsi:type="xtext:RuleCall" rule="//@rules.16"/>

-      </elements>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Function">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Function"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" feature="name" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-      </elements>

-      <elements xsi:type="xtext:Keyword" value="("/>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Assignment" feature="args" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.13"/>

-      </elements>

-      <elements xsi:type="xtext:Keyword" value=")"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Name">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Name"/>

-    </type>

-    <alternatives xsi:type="xtext:Assignment" feature="value" operator="=">

-      <terminal xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Number">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Number"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" cardinality="?" feature="op" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.35"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="value" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.49"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Percentage">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Percentage"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" cardinality="?" feature="op" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.35"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="value" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.49"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="unit" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.42"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Length">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Length"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" cardinality="?" feature="op" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.35"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="value" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.49"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="unit" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.43"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Ems">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Ems"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" cardinality="?" feature="op" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.35"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="value" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.49"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="unit" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.44"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Exs">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Exs"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" cardinality="?" feature="op" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.35"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="value" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.49"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="unit" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.45"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Angle">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Angle"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" cardinality="?" feature="op" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.35"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="value" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.49"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="unit" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.46"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Time">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Time"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" cardinality="?" feature="op" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.35"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="value" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.49"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="unit" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.47"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Frequency">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Frequency"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" cardinality="?" feature="op" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.35"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="value" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.49"/>

-      </elements>

-      <elements xsi:type="xtext:Assignment" feature="unit" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.48"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Uri">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Uri"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Keyword" value="url("/>

-      <elements xsi:type="xtext:RuleCall" cardinality="?" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Assignment" feature="value" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.51"/>

-      </elements>

-      <elements xsi:type="xtext:RuleCall" cardinality="?" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Keyword" value=")"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="StringValue">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//StringValue"/>

-    </type>

-    <alternatives xsi:type="xtext:Assignment" feature="value" operator="=">

-      <terminal xsi:type="xtext:RuleCall" rule="//@rules.51"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="HexColor">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//HexColor"/>

-    </type>

-    <alternatives xsi:type="xtext:Assignment" feature="value" operator="=">

-      <terminal xsi:type="xtext:RuleCall" rule="//@rules.39"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Operator">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:Group">

-        <elements xsi:type="xtext:Keyword" value="/"/>

-        <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      </elements>

-      <elements xsi:type="xtext:Group">

-        <elements xsi:type="xtext:Keyword" value=","/>

-        <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Class">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Class"/>

-    </type>

-    <alternatives xsi:type="xtext:Assignment" feature="class" operator="=">

-      <terminal xsi:type="xtext:RuleCall" rule="//@rules.40"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Attribute">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Attribute"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Keyword" value="["/>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Assignment" feature="name" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-      </elements>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Assignment" cardinality="?" feature="value" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.32"/>

-      </elements>

-      <elements xsi:type="xtext:Keyword" value="]"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="AttributeValue">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//AttributeValue"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Assignment" feature="operator" operator="=">

-        <terminal xsi:type="xtext:RuleCall" rule="//@rules.38"/>

-      </elements>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-      <elements xsi:type="xtext:Assignment" feature="value" operator="=">

-        <terminal xsi:type="xtext:Alternatives">

-          <elements xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-          <elements xsi:type="xtext:RuleCall" rule="//@rules.51"/>

-        </terminal>

-      </elements>

-      <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="Pseudo">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//Pseudo"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Keyword" value=":"/>

-      <elements xsi:type="xtext:Alternatives">

-        <elements xsi:type="xtext:Assignment" feature="pseudo" operator="=">

-          <terminal xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-        </elements>

-        <elements xsi:type="xtext:Group">

-          <elements xsi:type="xtext:Assignment" feature="pseudo" operator="=">

-            <terminal xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-          </elements>

-          <elements xsi:type="xtext:Keyword" value="("/>

-          <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-          <elements xsi:type="xtext:Group" cardinality="?">

-            <elements xsi:type="xtext:Assignment" feature="args" operator="=">

-              <terminal xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-            </elements>

-            <elements xsi:type="xtext:RuleCall" cardinality="*" rule="//@rules.55"/>

-          </elements>

-          <elements xsi:type="xtext:Keyword" value=")"/>

-        </elements>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="CSSId">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//CSSId"/>

-    </type>

-    <alternatives xsi:type="xtext:Assignment" feature="value" operator="=">

-      <terminal xsi:type="xtext:RuleCall" rule="//@rules.39"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:ParserRule" name="UnaryOperator">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//UnaryOperator"/>

-    </type>

-    <alternatives xsi:type="xtext:Assignment" feature="operator" operator="=">

-      <terminal xsi:type="xtext:RuleCall" rule="//@rules.36"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:EnumRule" name="UNARY">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EEnum" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//UNARY"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:EnumLiteralDeclaration">

-        <enumLiteral href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//UNARY/NEG"/>

-        <literal value="-"/>

-      </elements>

-      <elements xsi:type="xtext:EnumLiteralDeclaration">

-        <enumLiteral href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//UNARY/PLUS"/>

-        <literal value="+"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:EnumRule" name="KIND">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EEnum" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//KIND"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:EnumLiteralDeclaration">

-        <enumLiteral href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//KIND/FIRST_CHILD"/>

-        <literal value=">"/>

-      </elements>

-      <elements xsi:type="xtext:EnumLiteralDeclaration">

-        <enumLiteral href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//KIND/SIBLING"/>

-        <literal value="+"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:EnumRule" name="ATTRIBUTE_OP">

-    <type metamodel="//@metamodelDeclarations.1">

-      <classifier xsi:type="ecore:EEnum" href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//ATTRIBUTE_OP"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:EnumLiteralDeclaration">

-        <enumLiteral href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//ATTRIBUTE_OP/EQUALS"/>

-        <literal value="="/>

-      </elements>

-      <elements xsi:type="xtext:EnumLiteralDeclaration">

-        <enumLiteral href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//ATTRIBUTE_OP/CONTAINS"/>

-        <literal value="~="/>

-      </elements>

-      <elements xsi:type="xtext:EnumLiteralDeclaration">

-        <enumLiteral href="http://www.eclipse.org/papyrus/infra/gmfdiag/CSS#//ATTRIBUTE_OP/UNEQUALS"/>

-        <literal value="!="/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="HASH">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Keyword" value="#"/>

-      <elements xsi:type="xtext:Alternatives" cardinality="+">

-        <elements xsi:type="xtext:CharacterRange">

-          <left value="A"/>

-          <right value="Z"/>

-        </elements>

-        <elements xsi:type="xtext:CharacterRange">

-          <left value="a"/>

-          <right value="z"/>

-        </elements>

-        <elements xsi:type="xtext:CharacterRange">

-          <left value="0"/>

-          <right value="9"/>

-        </elements>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="T_CLASS">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Keyword" value="."/>

-      <elements xsi:type="xtext:RuleCall" rule="//@rules.50"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="T_IMPORTANT">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Keyword" value="!important"/>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="PC_UNIT">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Keyword" value="%"/>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="LEN_UNIT">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:Keyword" value="px"/>

-      <elements xsi:type="xtext:Keyword" value="cm"/>

-      <elements xsi:type="xtext:Keyword" value="mm"/>

-      <elements xsi:type="xtext:Keyword" value="in"/>

-      <elements xsi:type="xtext:Keyword" value="pt"/>

-      <elements xsi:type="xtext:Keyword" value="pc"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="EM_UNIT">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Keyword" value="em"/>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="EX_UNIT">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Keyword" value="ex"/>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="ANGLE_UNIT">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:Keyword" value="deg"/>

-      <elements xsi:type="xtext:Keyword" value="rad"/>

-      <elements xsi:type="xtext:Keyword" value="grad"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="TIME_UNIT">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:Keyword" value="s"/>

-      <elements xsi:type="xtext:Keyword" value="ms"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="FREQ_UNIT">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:Keyword" value="hz"/>

-      <elements xsi:type="xtext:Keyword" value="mhz"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="T_NUM">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:CharacterRange" cardinality="+">

-        <left value="0"/>

-        <right value="9"/>

-      </elements>

-      <elements xsi:type="xtext:Group">

-        <elements xsi:type="xtext:CharacterRange" cardinality="*">

-          <left value="0"/>

-          <right value="9"/>

-        </elements>

-        <elements xsi:type="xtext:Keyword" value="."/>

-        <elements xsi:type="xtext:CharacterRange" cardinality="+">

-          <left value="0"/>

-          <right value="9"/>

-        </elements>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="ID">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Keyword" cardinality="?" value="-"/>

-      <elements xsi:type="xtext:Alternatives">

-        <elements xsi:type="xtext:CharacterRange">

-          <left value="a"/>

-          <right value="z"/>

-        </elements>

-        <elements xsi:type="xtext:CharacterRange">

-          <left value="A"/>

-          <right value="Z"/>

-        </elements>

-        <elements xsi:type="xtext:Keyword" value="_"/>

-      </elements>

-      <elements xsi:type="xtext:Alternatives" cardinality="*">

-        <elements xsi:type="xtext:CharacterRange">

-          <left value="a"/>

-          <right value="z"/>

-        </elements>

-        <elements xsi:type="xtext:CharacterRange">

-          <left value="A"/>

-          <right value="Z"/>

-        </elements>

-        <elements xsi:type="xtext:Keyword" value="_"/>

-        <elements xsi:type="xtext:CharacterRange">

-          <left value="0"/>

-          <right value="9"/>

-        </elements>

-        <elements xsi:type="xtext:Keyword" value="-"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="STRING">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives">

-      <elements xsi:type="xtext:Group">

-        <elements xsi:type="xtext:Keyword" value="&quot;"/>

-        <elements xsi:type="xtext:Alternatives" cardinality="*">

-          <elements xsi:type="xtext:Group">

-            <elements xsi:type="xtext:Keyword" value="\"/>

-            <elements xsi:type="xtext:Alternatives">

-              <elements xsi:type="xtext:Keyword" value="b"/>

-              <elements xsi:type="xtext:Keyword" value="t"/>

-              <elements xsi:type="xtext:Keyword" value="n"/>

-              <elements xsi:type="xtext:Keyword" value="f"/>

-              <elements xsi:type="xtext:Keyword" value="r"/>

-              <elements xsi:type="xtext:Keyword" value="u"/>

-              <elements xsi:type="xtext:Keyword" value="&quot;"/>

-              <elements xsi:type="xtext:Keyword" value="'"/>

-              <elements xsi:type="xtext:Keyword" value="\"/>

-            </elements>

-          </elements>

-          <elements xsi:type="xtext:NegatedToken">

-            <terminal xsi:type="xtext:Alternatives">

-              <elements xsi:type="xtext:Keyword" value="\"/>

-              <elements xsi:type="xtext:Keyword" value="&quot;"/>

-            </terminal>

-          </elements>

-        </elements>

-        <elements xsi:type="xtext:Keyword" value="&quot;"/>

-      </elements>

-      <elements xsi:type="xtext:Group">

-        <elements xsi:type="xtext:Keyword" value="'"/>

-        <elements xsi:type="xtext:Alternatives" cardinality="*">

-          <elements xsi:type="xtext:Group">

-            <elements xsi:type="xtext:Keyword" value="\"/>

-            <elements xsi:type="xtext:Alternatives">

-              <elements xsi:type="xtext:Keyword" value="b"/>

-              <elements xsi:type="xtext:Keyword" value="t"/>

-              <elements xsi:type="xtext:Keyword" value="n"/>

-              <elements xsi:type="xtext:Keyword" value="f"/>

-              <elements xsi:type="xtext:Keyword" value="r"/>

-              <elements xsi:type="xtext:Keyword" value="u"/>

-              <elements xsi:type="xtext:Keyword" value="&quot;"/>

-              <elements xsi:type="xtext:Keyword" value="'"/>

-              <elements xsi:type="xtext:Keyword" value="\"/>

-            </elements>

-          </elements>

-          <elements xsi:type="xtext:NegatedToken">

-            <terminal xsi:type="xtext:Alternatives">

-              <elements xsi:type="xtext:Keyword" value="\"/>

-              <elements xsi:type="xtext:Keyword" value="'"/>

-            </terminal>

-          </elements>

-        </elements>

-        <elements xsi:type="xtext:Keyword" value="'"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="CDO">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Keyword" value="&lt;!--"/>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="CDC">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Keyword" value="-->"/>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="ML_COMMENT">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Group">

-      <elements xsi:type="xtext:Keyword" value="/*"/>

-      <elements xsi:type="xtext:UntilToken">

-        <terminal xsi:type="xtext:Keyword" value="*/"/>

-      </elements>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="WS">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Alternatives" cardinality="+">

-      <elements xsi:type="xtext:Keyword" value=" "/>

-      <elements xsi:type="xtext:Keyword" value="&#x9;"/>

-      <elements xsi:type="xtext:Keyword" value="&#xD;"/>

-      <elements xsi:type="xtext:Keyword" value="&#xA;"/>

-    </alternatives>

-  </rules>

-  <rules xsi:type="xtext:TerminalRule" name="ANY_OTHER">

-    <type metamodel="//@metamodelDeclarations.0">

-      <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </type>

-    <alternatives xsi:type="xtext:Wildcard"/>

-  </rules>

-</xtext:Grammar>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/ATTRIBUTE_OP.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/ATTRIBUTE_OP.java
deleted file mode 100644
index ba456517e7e..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/ATTRIBUTE_OP.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>ATTRIBUTE OP</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getATTRIBUTE_OP()

- * @model

- * @generated

- */

-public enum ATTRIBUTE_OP implements Enumerator

-{

-	/**

-	 * The '<em><b>EQUALS</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #EQUALS_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	EQUALS(0, "EQUALS", "="),

-

-	/**

-	 * The '<em><b>CONTAINS</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #CONTAINS_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	CONTAINS(1, "CONTAINS", "~="),

-

-	/**

-	 * The '<em><b>UNEQUALS</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #UNEQUALS_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	UNEQUALS(2, "UNEQUALS", "!=");

-

-	/**

-	 * The '<em><b>EQUALS</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>EQUALS</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #EQUALS

-	 * @model literal="="

-	 * @generated

-	 * @ordered

-	 */

-	public static final int EQUALS_VALUE = 0;

-

-	/**

-	 * The '<em><b>CONTAINS</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>CONTAINS</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #CONTAINS

-	 * @model literal="~="

-	 * @generated

-	 * @ordered

-	 */

-	public static final int CONTAINS_VALUE = 1;

-

-	/**

-	 * The '<em><b>UNEQUALS</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>UNEQUALS</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #UNEQUALS

-	 * @model literal="!="

-	 * @generated

-	 * @ordered

-	 */

-	public static final int UNEQUALS_VALUE = 2;

-

-	/**

-	 * An array of all the '<em><b>ATTRIBUTE OP</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static final ATTRIBUTE_OP[] VALUES_ARRAY =

-			new ATTRIBUTE_OP[]

-			{

-					EQUALS,

-					CONTAINS,

-					UNEQUALS,

-			};

-

-	/**

-	 * A public read-only list of all the '<em><b>ATTRIBUTE OP</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final List<ATTRIBUTE_OP> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>ATTRIBUTE OP</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ATTRIBUTE_OP get(String literal)

-	{

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

-		{

-			ATTRIBUTE_OP result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal))

-			{

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>ATTRIBUTE OP</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ATTRIBUTE_OP getByName(String name)

-	{

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

-		{

-			ATTRIBUTE_OP result = VALUES_ARRAY[i];

-			if (result.getName().equals(name))

-			{

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>ATTRIBUTE OP</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ATTRIBUTE_OP get(int value)

-	{

-		switch (value)

-		{

-		case EQUALS_VALUE:

-			return EQUALS;

-		case CONTAINS_VALUE:

-			return CONTAINS;

-		case UNEQUALS_VALUE:

-			return UNEQUALS;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private ATTRIBUTE_OP(int value, String name, String literal)

-	{

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public int getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName()

-	{

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getLiteral()

-	{

-		return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		return literal;

-	}

-

-} // ATTRIBUTE_OP

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Angle.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Angle.java
deleted file mode 100644
index c17e2675974..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Angle.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Angle</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Angle#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Angle#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Angle#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getAngle()

- * @model

- * @generated

- */

-public interface Angle extends Term

-{

-	/**

-	 * Returns the value of the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Op</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Op</em>' containment reference.

-	 * @see #setOp(UnaryOperator)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getAngle_Op()

-	 * @model containment="true"

-	 * @generated

-	 */

-	UnaryOperator getOp();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Angle#getOp <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Op</em>' containment reference.

-	 * @see #getOp()

-	 * @generated

-	 */

-	void setOp(UnaryOperator value);

-

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getAngle_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Angle#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Unit</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Unit</em>' attribute.

-	 * @see #setUnit(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getAngle_Unit()

-	 * @model

-	 * @generated

-	 */

-	String getUnit();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Angle#getUnit <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Unit</em>' attribute.

-	 * @see #getUnit()

-	 * @generated

-	 */

-	void setUnit(String value);

-

-} // Angle

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Attribute.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Attribute.java
deleted file mode 100644
index 2dd9bddaa54..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Attribute.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Attribute</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Attribute#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Attribute#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getAttribute()

- * @model

- * @generated

- */

-public interface Attribute extends SelectorCondition

-{

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getAttribute_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Attribute#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' containment reference.

-	 * @see #setValue(AttributeValue)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getAttribute_Value()

-	 * @model containment="true"

-	 * @generated

-	 */

-	AttributeValue getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Attribute#getValue <em>Value</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' containment reference.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(AttributeValue value);

-

-} // Attribute

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/AttributeValue.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/AttributeValue.java
deleted file mode 100644
index 706adf50445..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/AttributeValue.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Attribute Value</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue#getOperator <em>Operator</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getAttributeValue()

- * @model

- * @generated

- */

-public interface AttributeValue extends EObject

-{

-	/**

-	 * Returns the value of the '<em><b>Operator</b></em>' attribute.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Operator</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Operator</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP

-	 * @see #setOperator(ATTRIBUTE_OP)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getAttributeValue_Operator()

-	 * @model

-	 * @generated

-	 */

-	ATTRIBUTE_OP getOperator();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue#getOperator <em>Operator</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Operator</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP

-	 * @see #getOperator()

-	 * @generated

-	 */

-	void setOperator(ATTRIBUTE_OP value);

-

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getAttributeValue_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-} // AttributeValue

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSId.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSId.java
deleted file mode 100644
index 1599acd0c26..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSId.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>CSS Id</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.CSSId#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getCSSId()

- * @model

- * @generated

- */

-public interface CSSId extends SelectorCondition

-{

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getCSSId_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.CSSId#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-} // CSSId

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Class.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Class.java
deleted file mode 100644
index 063a80db4d6..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Class.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Class</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Class#getClass_ <em>Class</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getClass_()

- * @model

- * @generated

- */

-public interface Class extends SelectorCondition

-{

-	/**

-	 * Returns the value of the '<em><b>Class</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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.infra.gmfdiag.css.CssPackage#getClass_Class()

-	 * @model

-	 * @generated

-	 */

-	String getClass_();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Class#getClass_ <em>Class</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Class</em>' attribute.

-	 * @see #getClass_()

-	 * @generated

-	 */

-	void setClass(String value);

-

-} // Class

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Combinator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Combinator.java
deleted file mode 100644
index b5c3624e255..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Combinator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Combinator</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Combinator#getKind <em>Kind</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getCombinator()

- * @model

- * @generated

- */

-public interface Combinator extends EObject

-{

-	/**

-	 * Returns the value of the '<em><b>Kind</b></em>' attribute.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.gmfdiag.css.KIND}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Kind</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.KIND

-	 * @see #setKind(KIND)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getCombinator_Kind()

-	 * @model

-	 * @generated

-	 */

-	KIND getKind();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Combinator#getKind <em>Kind</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Kind</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.KIND

-	 * @see #getKind()

-	 * @generated

-	 */

-	void setKind(KIND value);

-

-} // Combinator

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CompositeSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CompositeSelector.java
deleted file mode 100644
index f71b770d366..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CompositeSelector.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Composite Selector</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector#getLeft <em>Left</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector#getCombinator <em>Combinator</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector#getRight <em>Right</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getCompositeSelector()

- * @model

- * @generated

- */

-public interface CompositeSelector extends Selector

-{

-	/**

-	 * Returns the value of the '<em><b>Left</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Left</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Left</em>' containment reference.

-	 * @see #setLeft(SimpleSelector)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getCompositeSelector_Left()

-	 * @model containment="true"

-	 * @generated

-	 */

-	SimpleSelector getLeft();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector#getLeft <em>Left</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Left</em>' containment reference.

-	 * @see #getLeft()

-	 * @generated

-	 */

-	void setLeft(SimpleSelector value);

-

-	/**

-	 * Returns the value of the '<em><b>Combinator</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Combinator</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Combinator</em>' containment reference.

-	 * @see #setCombinator(Combinator)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getCompositeSelector_Combinator()

-	 * @model containment="true"

-	 * @generated

-	 */

-	Combinator getCombinator();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector#getCombinator <em>Combinator</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Combinator</em>' containment reference.

-	 * @see #getCombinator()

-	 * @generated

-	 */

-	void setCombinator(Combinator value);

-

-	/**

-	 * Returns the value of the '<em><b>Right</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Right</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Right</em>' containment reference.

-	 * @see #setRight(Selector)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getCompositeSelector_Right()

-	 * @model containment="true"

-	 * @generated

-	 */

-	Selector getRight();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector#getRight <em>Right</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Right</em>' containment reference.

-	 * @see #getRight()

-	 * @generated

-	 */

-	void setRight(Selector value);

-

-} // CompositeSelector

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Content.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Content.java
deleted file mode 100644
index 69e0f0239d6..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Content.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Content</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getContent()

- * @model

- * @generated

- */

-public interface Content extends EObject

-{

-} // Content

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CssFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CssFactory.java
deleted file mode 100644
index 2a4918e1b9b..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CssFactory.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage

- * @generated

- */

-public interface CssFactory extends EFactory

-{

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	CssFactory eINSTANCE = org.eclipse.papyrus.infra.gmfdiag.css.impl.CssFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Stylesheet</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Stylesheet</em>'.

-	 * @generated

-	 */

-	Stylesheet createStylesheet();

-

-	/**

-	 * Returns a new object of class '<em>Content</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Content</em>'.

-	 * @generated

-	 */

-	Content createContent();

-

-	/**

-	 * Returns a new object of class '<em>Import</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Import</em>'.

-	 * @generated

-	 */

-	Import createImport();

-

-	/**

-	 * Returns a new object of class '<em>Media</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Media</em>'.

-	 * @generated

-	 */

-	Media createMedia();

-

-	/**

-	 * Returns a new object of class '<em>Page</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Page</em>'.

-	 * @generated

-	 */

-	Page createPage();

-

-	/**

-	 * Returns a new object of class '<em>Pseudo Page</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Pseudo Page</em>'.

-	 * @generated

-	 */

-	PseudoPage createPseudoPage();

-

-	/**

-	 * Returns a new object of class '<em>Ruleset</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Ruleset</em>'.

-	 * @generated

-	 */

-	Ruleset createRuleset();

-

-	/**

-	 * Returns a new object of class '<em>Selector</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Selector</em>'.

-	 * @generated

-	 */

-	Selector createSelector();

-

-	/**

-	 * Returns a new object of class '<em>Composite Selector</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Composite Selector</em>'.

-	 * @generated

-	 */

-	CompositeSelector createCompositeSelector();

-

-	/**

-	 * Returns a new object of class '<em>Simple Selector</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Simple Selector</em>'.

-	 * @generated

-	 */

-	SimpleSelector createSimpleSelector();

-

-	/**

-	 * Returns a new object of class '<em>Selector Condition</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Selector Condition</em>'.

-	 * @generated

-	 */

-	SelectorCondition createSelectorCondition();

-

-	/**

-	 * Returns a new object of class '<em>Combinator</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Combinator</em>'.

-	 * @generated

-	 */

-	Combinator createCombinator();

-

-	/**

-	 * Returns a new object of class '<em>Declaration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Declaration</em>'.

-	 * @generated

-	 */

-	Declaration createDeclaration();

-

-	/**

-	 * Returns a new object of class '<em>Expression</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Expression</em>'.

-	 * @generated

-	 */

-	Expression createExpression();

-

-	/**

-	 * Returns a new object of class '<em>Subterm</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Subterm</em>'.

-	 * @generated

-	 */

-	Subterm createSubterm();

-

-	/**

-	 * Returns a new object of class '<em>Term</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Term</em>'.

-	 * @generated

-	 */

-	Term createTerm();

-

-	/**

-	 * Returns a new object of class '<em>Function</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Function</em>'.

-	 * @generated

-	 */

-	Function createFunction();

-

-	/**

-	 * Returns a new object of class '<em>Name</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Name</em>'.

-	 * @generated

-	 */

-	Name createName();

-

-	/**

-	 * Returns a new object of class '<em>Number</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Number</em>'.

-	 * @generated

-	 */

-	Number createNumber();

-

-	/**

-	 * Returns a new object of class '<em>Percentage</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Percentage</em>'.

-	 * @generated

-	 */

-	Percentage createPercentage();

-

-	/**

-	 * Returns a new object of class '<em>Length</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Length</em>'.

-	 * @generated

-	 */

-	Length createLength();

-

-	/**

-	 * Returns a new object of class '<em>Ems</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Ems</em>'.

-	 * @generated

-	 */

-	Ems createEms();

-

-	/**

-	 * Returns a new object of class '<em>Exs</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Exs</em>'.

-	 * @generated

-	 */

-	Exs createExs();

-

-	/**

-	 * Returns a new object of class '<em>Angle</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Angle</em>'.

-	 * @generated

-	 */

-	Angle createAngle();

-

-	/**

-	 * Returns a new object of class '<em>Time</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Time</em>'.

-	 * @generated

-	 */

-	Time createTime();

-

-	/**

-	 * Returns a new object of class '<em>Frequency</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Frequency</em>'.

-	 * @generated

-	 */

-	Frequency createFrequency();

-

-	/**

-	 * Returns a new object of class '<em>Uri</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Uri</em>'.

-	 * @generated

-	 */

-	Uri createUri();

-

-	/**

-	 * Returns a new object of class '<em>String Value</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>String Value</em>'.

-	 * @generated

-	 */

-	StringValue createStringValue();

-

-	/**

-	 * Returns a new object of class '<em>Hex Color</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Hex Color</em>'.

-	 * @generated

-	 */

-	HexColor createHexColor();

-

-	/**

-	 * Returns a new object of class '<em>Class</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Class</em>'.

-	 * @generated

-	 */

-	Class createClass();

-

-	/**

-	 * Returns a new object of class '<em>Attribute</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Attribute</em>'.

-	 * @generated

-	 */

-	Attribute createAttribute();

-

-	/**

-	 * Returns a new object of class '<em>Attribute Value</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Attribute Value</em>'.

-	 * @generated

-	 */

-	AttributeValue createAttributeValue();

-

-	/**

-	 * Returns a new object of class '<em>Pseudo</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Pseudo</em>'.

-	 * @generated

-	 */

-	Pseudo createPseudo();

-

-	/**

-	 * Returns a new object of class '<em>CSS Id</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>CSS Id</em>'.

-	 * @generated

-	 */

-	CSSId createCSSId();

-

-	/**

-	 * Returns a new object of class '<em>Unary Operator</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Unary Operator</em>'.

-	 * @generated

-	 */

-	UnaryOperator createUnaryOperator();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	CssPackage getCssPackage();

-

-} // CssFactory

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CssPackage.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CssPackage.java
deleted file mode 100644
index 777a7ad9c3a..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CssPackage.java
+++ /dev/null
@@ -1,3690 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

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

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

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

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

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssFactory

- * @model kind="package"

- * @generated

- */

-public interface CssPackage extends EPackage

-{

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "css";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/gmfdiag/CSS";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "css";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	CssPackage eINSTANCE = org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.StylesheetImpl <em>Stylesheet</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.StylesheetImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getStylesheet()

-	 * @generated

-	 */

-	int STYLESHEET = 0;

-

-	/**

-	 * The feature id for the '<em><b>Charset</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STYLESHEET__CHARSET = 0;

-

-	/**

-	 * The feature id for the '<em><b>Imports</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STYLESHEET__IMPORTS = 1;

-

-	/**

-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STYLESHEET__CONTENTS = 2;

-

-	/**

-	 * The number of structural features of the '<em>Stylesheet</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STYLESHEET_FEATURE_COUNT = 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ContentImpl <em>Content</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.ContentImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getContent()

-	 * @generated

-	 */

-	int CONTENT = 1;

-

-	/**

-	 * The number of structural features of the '<em>Content</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTENT_FEATURE_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ImportImpl <em>Import</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.ImportImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getImport()

-	 * @generated

-	 */

-	int IMPORT = 2;

-

-	/**

-	 * The feature id for the '<em><b>String</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int IMPORT__STRING = 0;

-

-	/**

-	 * The feature id for the '<em><b>Uri</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int IMPORT__URI = 1;

-

-	/**

-	 * The feature id for the '<em><b>Media</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int IMPORT__MEDIA = 2;

-

-	/**

-	 * The number of structural features of the '<em>Import</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int IMPORT_FEATURE_COUNT = 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.MediaImpl <em>Media</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.MediaImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getMedia()

-	 * @generated

-	 */

-	int MEDIA = 3;

-

-	/**

-	 * The feature id for the '<em><b>Media</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MEDIA__MEDIA = CONTENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Rules</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MEDIA__RULES = CONTENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Media</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MEDIA_FEATURE_COUNT = CONTENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PageImpl <em>Page</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.PageImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getPage()

-	 * @generated

-	 */

-	int PAGE = 4;

-

-	/**

-	 * The feature id for the '<em><b>Pseudo</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PAGE__PSEUDO = CONTENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Declarations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PAGE__DECLARATIONS = CONTENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Page</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PAGE_FEATURE_COUNT = CONTENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PseudoPageImpl <em>Pseudo Page</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.PseudoPageImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getPseudoPage()

-	 * @generated

-	 */

-	int PSEUDO_PAGE = 5;

-

-	/**

-	 * The feature id for the '<em><b>Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PSEUDO_PAGE__ID = 0;

-

-	/**

-	 * The number of structural features of the '<em>Pseudo Page</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PSEUDO_PAGE_FEATURE_COUNT = 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.RulesetImpl <em>Ruleset</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.RulesetImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getRuleset()

-	 * @generated

-	 */

-	int RULESET = 6;

-

-	/**

-	 * The feature id for the '<em><b>Selectors</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RULESET__SELECTORS = CONTENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RULESET__PROPERTIES = CONTENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Ruleset</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RULESET_FEATURE_COUNT = CONTENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.SelectorImpl <em>Selector</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.SelectorImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getSelector()

-	 * @generated

-	 */

-	int SELECTOR = 7;

-

-	/**

-	 * The number of structural features of the '<em>Selector</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SELECTOR_FEATURE_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.CompositeSelectorImpl <em>Composite Selector</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CompositeSelectorImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getCompositeSelector()

-	 * @generated

-	 */

-	int COMPOSITE_SELECTOR = 8;

-

-	/**

-	 * The feature id for the '<em><b>Left</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSITE_SELECTOR__LEFT = SELECTOR_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Combinator</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSITE_SELECTOR__COMBINATOR = SELECTOR_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Right</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSITE_SELECTOR__RIGHT = SELECTOR_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Composite Selector</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSITE_SELECTOR_FEATURE_COUNT = SELECTOR_FEATURE_COUNT + 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.SimpleSelectorImpl <em>Simple Selector</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.SimpleSelectorImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getSimpleSelector()

-	 * @generated

-	 */

-	int SIMPLE_SELECTOR = 9;

-

-	/**

-	 * The feature id for the '<em><b>Element Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SIMPLE_SELECTOR__ELEMENT_NAME = SELECTOR_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Condition</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SIMPLE_SELECTOR__CONDITION = SELECTOR_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Simple Selector</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SIMPLE_SELECTOR_FEATURE_COUNT = SELECTOR_FEATURE_COUNT + 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.SelectorConditionImpl <em>Selector Condition</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.SelectorConditionImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getSelectorCondition()

-	 * @generated

-	 */

-	int SELECTOR_CONDITION = 10;

-

-	/**

-	 * The number of structural features of the '<em>Selector Condition</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SELECTOR_CONDITION_FEATURE_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.CombinatorImpl <em>Combinator</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CombinatorImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getCombinator()

-	 * @generated

-	 */

-	int COMBINATOR = 11;

-

-	/**

-	 * The feature id for the '<em><b>Kind</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMBINATOR__KIND = 0;

-

-	/**

-	 * The number of structural features of the '<em>Combinator</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMBINATOR_FEATURE_COUNT = 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.DeclarationImpl <em>Declaration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.DeclarationImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getDeclaration()

-	 * @generated

-	 */

-	int DECLARATION = 12;

-

-	/**

-	 * The feature id for the '<em><b>Property</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DECLARATION__PROPERTY = 0;

-

-	/**

-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DECLARATION__EXPRESSION = 1;

-

-	/**

-	 * The feature id for the '<em><b>Important</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DECLARATION__IMPORTANT = 2;

-

-	/**

-	 * The number of structural features of the '<em>Declaration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DECLARATION_FEATURE_COUNT = 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ExpressionImpl <em>Expression</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.ExpressionImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getExpression()

-	 * @generated

-	 */

-	int EXPRESSION = 13;

-

-	/**

-	 * The feature id for the '<em><b>Terms</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXPRESSION__TERMS = 0;

-

-	/**

-	 * The feature id for the '<em><b>Subterms</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXPRESSION__SUBTERMS = 1;

-

-	/**

-	 * The number of structural features of the '<em>Expression</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXPRESSION_FEATURE_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.SubtermImpl <em>Subterm</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.SubtermImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getSubterm()

-	 * @generated

-	 */

-	int SUBTERM = 14;

-

-	/**

-	 * The feature id for the '<em><b>Operator</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SUBTERM__OPERATOR = 0;

-

-	/**

-	 * The feature id for the '<em><b>Term</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SUBTERM__TERM = 1;

-

-	/**

-	 * The number of structural features of the '<em>Subterm</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SUBTERM_FEATURE_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.TermImpl <em>Term</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.TermImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getTerm()

-	 * @generated

-	 */

-	int TERM = 15;

-

-	/**

-	 * The number of structural features of the '<em>Term</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int TERM_FEATURE_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.FunctionImpl <em>Function</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.FunctionImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getFunction()

-	 * @generated

-	 */

-	int FUNCTION = 16;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FUNCTION__NAME = TERM_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Args</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FUNCTION__ARGS = TERM_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Function</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FUNCTION_FEATURE_COUNT = TERM_FEATURE_COUNT + 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.NameImpl <em>Name</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.NameImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getName_()

-	 * @generated

-	 */

-	int NAME = 17;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int NAME__VALUE = TERM_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Name</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int NAME_FEATURE_COUNT = TERM_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.NumberImpl <em>Number</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.NumberImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getNumber()

-	 * @generated

-	 */

-	int NUMBER = 18;

-

-	/**

-	 * The feature id for the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int NUMBER__OP = TERM_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int NUMBER__VALUE = TERM_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Number</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int NUMBER_FEATURE_COUNT = TERM_FEATURE_COUNT + 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PercentageImpl <em>Percentage</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.PercentageImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getPercentage()

-	 * @generated

-	 */

-	int PERCENTAGE = 19;

-

-	/**

-	 * The feature id for the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PERCENTAGE__OP = TERM_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PERCENTAGE__VALUE = TERM_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PERCENTAGE__UNIT = TERM_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Percentage</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PERCENTAGE_FEATURE_COUNT = TERM_FEATURE_COUNT + 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.LengthImpl <em>Length</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.LengthImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getLength()

-	 * @generated

-	 */

-	int LENGTH = 20;

-

-	/**

-	 * The feature id for the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int LENGTH__OP = TERM_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int LENGTH__VALUE = TERM_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int LENGTH__UNIT = TERM_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Length</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int LENGTH_FEATURE_COUNT = TERM_FEATURE_COUNT + 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.EmsImpl <em>Ems</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.EmsImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getEms()

-	 * @generated

-	 */

-	int EMS = 21;

-

-	/**

-	 * The feature id for the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EMS__OP = TERM_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EMS__VALUE = TERM_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EMS__UNIT = TERM_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Ems</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EMS_FEATURE_COUNT = TERM_FEATURE_COUNT + 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ExsImpl <em>Exs</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.ExsImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getExs()

-	 * @generated

-	 */

-	int EXS = 22;

-

-	/**

-	 * The feature id for the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXS__OP = TERM_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXS__VALUE = TERM_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXS__UNIT = TERM_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Exs</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXS_FEATURE_COUNT = TERM_FEATURE_COUNT + 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.AngleImpl <em>Angle</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.AngleImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getAngle()

-	 * @generated

-	 */

-	int ANGLE = 23;

-

-	/**

-	 * The feature id for the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ANGLE__OP = TERM_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ANGLE__VALUE = TERM_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ANGLE__UNIT = TERM_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Angle</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ANGLE_FEATURE_COUNT = TERM_FEATURE_COUNT + 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.TimeImpl <em>Time</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.TimeImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getTime()

-	 * @generated

-	 */

-	int TIME = 24;

-

-	/**

-	 * The feature id for the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int TIME__OP = TERM_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int TIME__VALUE = TERM_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int TIME__UNIT = TERM_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Time</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int TIME_FEATURE_COUNT = TERM_FEATURE_COUNT + 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.FrequencyImpl <em>Frequency</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.FrequencyImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getFrequency()

-	 * @generated

-	 */

-	int FREQUENCY = 25;

-

-	/**

-	 * The feature id for the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FREQUENCY__OP = TERM_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FREQUENCY__VALUE = TERM_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FREQUENCY__UNIT = TERM_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Frequency</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FREQUENCY_FEATURE_COUNT = TERM_FEATURE_COUNT + 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.UriImpl <em>Uri</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.UriImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getUri()

-	 * @generated

-	 */

-	int URI = 26;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int URI__VALUE = TERM_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Uri</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int URI_FEATURE_COUNT = TERM_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.StringValueImpl <em>String Value</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.StringValueImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getStringValue()

-	 * @generated

-	 */

-	int STRING_VALUE = 27;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_VALUE__VALUE = TERM_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>String Value</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_VALUE_FEATURE_COUNT = TERM_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.HexColorImpl <em>Hex Color</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.HexColorImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getHexColor()

-	 * @generated

-	 */

-	int HEX_COLOR = 28;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int HEX_COLOR__VALUE = TERM_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Hex Color</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int HEX_COLOR_FEATURE_COUNT = TERM_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ClassImpl <em>Class</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.ClassImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getClass_()

-	 * @generated

-	 */

-	int CLASS = 29;

-

-	/**

-	 * The feature id for the '<em><b>Class</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CLASS__CLASS = SELECTOR_CONDITION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Class</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CLASS_FEATURE_COUNT = SELECTOR_CONDITION_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.AttributeImpl <em>Attribute</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.AttributeImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getAttribute()

-	 * @generated

-	 */

-	int ATTRIBUTE = 30;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ATTRIBUTE__NAME = SELECTOR_CONDITION_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ATTRIBUTE__VALUE = SELECTOR_CONDITION_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Attribute</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ATTRIBUTE_FEATURE_COUNT = SELECTOR_CONDITION_FEATURE_COUNT + 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.AttributeValueImpl <em>Attribute Value</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.AttributeValueImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getAttributeValue()

-	 * @generated

-	 */

-	int ATTRIBUTE_VALUE = 31;

-

-	/**

-	 * The feature id for the '<em><b>Operator</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ATTRIBUTE_VALUE__OPERATOR = 0;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ATTRIBUTE_VALUE__VALUE = 1;

-

-	/**

-	 * The number of structural features of the '<em>Attribute Value</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ATTRIBUTE_VALUE_FEATURE_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PseudoImpl <em>Pseudo</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.PseudoImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getPseudo()

-	 * @generated

-	 */

-	int PSEUDO = 32;

-

-	/**

-	 * The feature id for the '<em><b>Pseudo</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PSEUDO__PSEUDO = SELECTOR_CONDITION_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Args</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PSEUDO__ARGS = SELECTOR_CONDITION_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Pseudo</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PSEUDO_FEATURE_COUNT = SELECTOR_CONDITION_FEATURE_COUNT + 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.CSSIdImpl <em>CSS Id</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CSSIdImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getCSSId()

-	 * @generated

-	 */

-	int CSS_ID = 33;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CSS_ID__VALUE = SELECTOR_CONDITION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>CSS Id</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CSS_ID_FEATURE_COUNT = SELECTOR_CONDITION_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.UnaryOperatorImpl <em>Unary Operator</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.UnaryOperatorImpl

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getUnaryOperator()

-	 * @generated

-	 */

-	int UNARY_OPERATOR = 34;

-

-	/**

-	 * The feature id for the '<em><b>Operator</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int UNARY_OPERATOR__OPERATOR = 0;

-

-	/**

-	 * The number of structural features of the '<em>Unary Operator</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int UNARY_OPERATOR_FEATURE_COUNT = 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.UNARY <em>UNARY</em>}' enum.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.UNARY

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getUNARY()

-	 * @generated

-	 */

-	int UNARY = 35;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.KIND <em>KIND</em>}' enum.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.KIND

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getKIND()

-	 * @generated

-	 */

-	int KIND = 36;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP <em>ATTRIBUTE OP</em>}' enum.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getATTRIBUTE_OP()

-	 * @generated

-	 */

-	int ATTRIBUTE_OP = 37;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet <em>Stylesheet</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Stylesheet</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet

-	 * @generated

-	 */

-	EClass getStylesheet();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet#getCharset <em>Charset</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Charset</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet#getCharset()

-	 * @see #getStylesheet()

-	 * @generated

-	 */

-	EAttribute getStylesheet_Charset();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet#getImports <em>Imports</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Imports</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet#getImports()

-	 * @see #getStylesheet()

-	 * @generated

-	 */

-	EReference getStylesheet_Imports();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet#getContents <em>Contents</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Contents</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet#getContents()

-	 * @see #getStylesheet()

-	 * @generated

-	 */

-	EReference getStylesheet_Contents();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Content <em>Content</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Content</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Content

-	 * @generated

-	 */

-	EClass getContent();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Import <em>Import</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Import</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Import

-	 * @generated

-	 */

-	EClass getImport();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Import#getString <em>String</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>String</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Import#getString()

-	 * @see #getImport()

-	 * @generated

-	 */

-	EAttribute getImport_String();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Import#getUri <em>Uri</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Uri</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Import#getUri()

-	 * @see #getImport()

-	 * @generated

-	 */

-	EReference getImport_Uri();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.gmfdiag.css.Import#getMedia <em>Media</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute list '<em>Media</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Import#getMedia()

-	 * @see #getImport()

-	 * @generated

-	 */

-	EAttribute getImport_Media();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Media <em>Media</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Media</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Media

-	 * @generated

-	 */

-	EClass getMedia();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.gmfdiag.css.Media#getMedia <em>Media</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute list '<em>Media</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Media#getMedia()

-	 * @see #getMedia()

-	 * @generated

-	 */

-	EAttribute getMedia_Media();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css.Media#getRules <em>Rules</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Rules</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Media#getRules()

-	 * @see #getMedia()

-	 * @generated

-	 */

-	EReference getMedia_Rules();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Page <em>Page</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Page</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Page

-	 * @generated

-	 */

-	EClass getPage();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Page#getPseudo <em>Pseudo</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Pseudo</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Page#getPseudo()

-	 * @see #getPage()

-	 * @generated

-	 */

-	EReference getPage_Pseudo();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css.Page#getDeclarations <em>Declarations</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Declarations</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Page#getDeclarations()

-	 * @see #getPage()

-	 * @generated

-	 */

-	EReference getPage_Declarations();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage <em>Pseudo Page</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Pseudo Page</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage

-	 * @generated

-	 */

-	EClass getPseudoPage();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage#getId <em>Id</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Id</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage#getId()

-	 * @see #getPseudoPage()

-	 * @generated

-	 */

-	EAttribute getPseudoPage_Id();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Ruleset <em>Ruleset</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Ruleset</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Ruleset

-	 * @generated

-	 */

-	EClass getRuleset();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css.Ruleset#getSelectors <em>Selectors</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Selectors</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Ruleset#getSelectors()

-	 * @see #getRuleset()

-	 * @generated

-	 */

-	EReference getRuleset_Selectors();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css.Ruleset#getProperties <em>Properties</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Properties</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Ruleset#getProperties()

-	 * @see #getRuleset()

-	 * @generated

-	 */

-	EReference getRuleset_Properties();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Selector <em>Selector</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Selector</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Selector

-	 * @generated

-	 */

-	EClass getSelector();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector <em>Composite Selector</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Composite Selector</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector

-	 * @generated

-	 */

-	EClass getCompositeSelector();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector#getLeft <em>Left</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Left</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector#getLeft()

-	 * @see #getCompositeSelector()

-	 * @generated

-	 */

-	EReference getCompositeSelector_Left();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector#getCombinator <em>Combinator</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Combinator</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector#getCombinator()

-	 * @see #getCompositeSelector()

-	 * @generated

-	 */

-	EReference getCompositeSelector_Combinator();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector#getRight <em>Right</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Right</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector#getRight()

-	 * @see #getCompositeSelector()

-	 * @generated

-	 */

-	EReference getCompositeSelector_Right();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector <em>Simple Selector</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Simple Selector</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector

-	 * @generated

-	 */

-	EClass getSimpleSelector();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector#getElementName <em>Element Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Element Name</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector#getElementName()

-	 * @see #getSimpleSelector()

-	 * @generated

-	 */

-	EAttribute getSimpleSelector_ElementName();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector#getCondition <em>Condition</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Condition</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector#getCondition()

-	 * @see #getSimpleSelector()

-	 * @generated

-	 */

-	EReference getSimpleSelector_Condition();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition <em>Selector Condition</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Selector Condition</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition

-	 * @generated

-	 */

-	EClass getSelectorCondition();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Combinator <em>Combinator</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Combinator</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Combinator

-	 * @generated

-	 */

-	EClass getCombinator();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Combinator#getKind <em>Kind</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Kind</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Combinator#getKind()

-	 * @see #getCombinator()

-	 * @generated

-	 */

-	EAttribute getCombinator_Kind();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Declaration <em>Declaration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Declaration</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Declaration

-	 * @generated

-	 */

-	EClass getDeclaration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Declaration#getProperty <em>Property</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Property</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Declaration#getProperty()

-	 * @see #getDeclaration()

-	 * @generated

-	 */

-	EAttribute getDeclaration_Property();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Declaration#getExpression <em>Expression</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Expression</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Declaration#getExpression()

-	 * @see #getDeclaration()

-	 * @generated

-	 */

-	EReference getDeclaration_Expression();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Declaration#isImportant <em>Important</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Important</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Declaration#isImportant()

-	 * @see #getDeclaration()

-	 * @generated

-	 */

-	EAttribute getDeclaration_Important();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Expression <em>Expression</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Expression</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Expression

-	 * @generated

-	 */

-	EClass getExpression();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Expression#getTerms <em>Terms</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Terms</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Expression#getTerms()

-	 * @see #getExpression()

-	 * @generated

-	 */

-	EReference getExpression_Terms();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css.Expression#getSubterms <em>Subterms</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Subterms</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Expression#getSubterms()

-	 * @see #getExpression()

-	 * @generated

-	 */

-	EReference getExpression_Subterms();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Subterm <em>Subterm</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Subterm</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Subterm

-	 * @generated

-	 */

-	EClass getSubterm();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Subterm#getOperator <em>Operator</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Operator</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Subterm#getOperator()

-	 * @see #getSubterm()

-	 * @generated

-	 */

-	EAttribute getSubterm_Operator();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Subterm#getTerm <em>Term</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Term</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Subterm#getTerm()

-	 * @see #getSubterm()

-	 * @generated

-	 */

-	EReference getSubterm_Term();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Term <em>Term</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Term</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Term

-	 * @generated

-	 */

-	EClass getTerm();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Function <em>Function</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Function</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Function

-	 * @generated

-	 */

-	EClass getFunction();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Function#getName <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Function#getName()

-	 * @see #getFunction()

-	 * @generated

-	 */

-	EAttribute getFunction_Name();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Function#getArgs <em>Args</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Args</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Function#getArgs()

-	 * @see #getFunction()

-	 * @generated

-	 */

-	EReference getFunction_Args();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Name <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Name

-	 * @generated

-	 */

-	EClass getName_();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Name#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Name#getValue()

-	 * @see #getName_()

-	 * @generated

-	 */

-	EAttribute getName_Value();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Number <em>Number</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Number</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Number

-	 * @generated

-	 */

-	EClass getNumber();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Number#getOp <em>Op</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Op</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Number#getOp()

-	 * @see #getNumber()

-	 * @generated

-	 */

-	EReference getNumber_Op();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Number#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Number#getValue()

-	 * @see #getNumber()

-	 * @generated

-	 */

-	EAttribute getNumber_Value();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Percentage <em>Percentage</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Percentage</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Percentage

-	 * @generated

-	 */

-	EClass getPercentage();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Percentage#getOp <em>Op</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Op</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Percentage#getOp()

-	 * @see #getPercentage()

-	 * @generated

-	 */

-	EReference getPercentage_Op();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Percentage#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Percentage#getValue()

-	 * @see #getPercentage()

-	 * @generated

-	 */

-	EAttribute getPercentage_Value();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Percentage#getUnit <em>Unit</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Unit</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Percentage#getUnit()

-	 * @see #getPercentage()

-	 * @generated

-	 */

-	EAttribute getPercentage_Unit();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Length <em>Length</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Length</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Length

-	 * @generated

-	 */

-	EClass getLength();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Length#getOp <em>Op</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Op</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Length#getOp()

-	 * @see #getLength()

-	 * @generated

-	 */

-	EReference getLength_Op();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Length#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Length#getValue()

-	 * @see #getLength()

-	 * @generated

-	 */

-	EAttribute getLength_Value();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Length#getUnit <em>Unit</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Unit</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Length#getUnit()

-	 * @see #getLength()

-	 * @generated

-	 */

-	EAttribute getLength_Unit();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Ems <em>Ems</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Ems</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Ems

-	 * @generated

-	 */

-	EClass getEms();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Ems#getOp <em>Op</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Op</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Ems#getOp()

-	 * @see #getEms()

-	 * @generated

-	 */

-	EReference getEms_Op();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Ems#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Ems#getValue()

-	 * @see #getEms()

-	 * @generated

-	 */

-	EAttribute getEms_Value();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Ems#getUnit <em>Unit</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Unit</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Ems#getUnit()

-	 * @see #getEms()

-	 * @generated

-	 */

-	EAttribute getEms_Unit();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Exs <em>Exs</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Exs</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Exs

-	 * @generated

-	 */

-	EClass getExs();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Exs#getOp <em>Op</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Op</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Exs#getOp()

-	 * @see #getExs()

-	 * @generated

-	 */

-	EReference getExs_Op();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Exs#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Exs#getValue()

-	 * @see #getExs()

-	 * @generated

-	 */

-	EAttribute getExs_Value();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Exs#getUnit <em>Unit</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Unit</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Exs#getUnit()

-	 * @see #getExs()

-	 * @generated

-	 */

-	EAttribute getExs_Unit();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Angle <em>Angle</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Angle</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Angle

-	 * @generated

-	 */

-	EClass getAngle();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Angle#getOp <em>Op</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Op</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Angle#getOp()

-	 * @see #getAngle()

-	 * @generated

-	 */

-	EReference getAngle_Op();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Angle#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Angle#getValue()

-	 * @see #getAngle()

-	 * @generated

-	 */

-	EAttribute getAngle_Value();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Angle#getUnit <em>Unit</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Unit</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Angle#getUnit()

-	 * @see #getAngle()

-	 * @generated

-	 */

-	EAttribute getAngle_Unit();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Time <em>Time</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Time</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Time

-	 * @generated

-	 */

-	EClass getTime();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Time#getOp <em>Op</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Op</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Time#getOp()

-	 * @see #getTime()

-	 * @generated

-	 */

-	EReference getTime_Op();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Time#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Time#getValue()

-	 * @see #getTime()

-	 * @generated

-	 */

-	EAttribute getTime_Value();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Time#getUnit <em>Unit</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Unit</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Time#getUnit()

-	 * @see #getTime()

-	 * @generated

-	 */

-	EAttribute getTime_Unit();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Frequency <em>Frequency</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Frequency</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Frequency

-	 * @generated

-	 */

-	EClass getFrequency();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Frequency#getOp <em>Op</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Op</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Frequency#getOp()

-	 * @see #getFrequency()

-	 * @generated

-	 */

-	EReference getFrequency_Op();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Frequency#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Frequency#getValue()

-	 * @see #getFrequency()

-	 * @generated

-	 */

-	EAttribute getFrequency_Value();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Frequency#getUnit <em>Unit</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Unit</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Frequency#getUnit()

-	 * @see #getFrequency()

-	 * @generated

-	 */

-	EAttribute getFrequency_Unit();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Uri <em>Uri</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Uri</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Uri

-	 * @generated

-	 */

-	EClass getUri();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Uri#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Uri#getValue()

-	 * @see #getUri()

-	 * @generated

-	 */

-	EAttribute getUri_Value();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.StringValue <em>String Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>String Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.StringValue

-	 * @generated

-	 */

-	EClass getStringValue();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.StringValue#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.StringValue#getValue()

-	 * @see #getStringValue()

-	 * @generated

-	 */

-	EAttribute getStringValue_Value();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.HexColor <em>Hex Color</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Hex Color</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.HexColor

-	 * @generated

-	 */

-	EClass getHexColor();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.HexColor#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.HexColor#getValue()

-	 * @see #getHexColor()

-	 * @generated

-	 */

-	EAttribute getHexColor_Value();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Class <em>Class</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Class</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Class

-	 * @generated

-	 */

-	EClass getClass_();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Class#getClass_ <em>Class</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Class</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Class#getClass_()

-	 * @see #getClass_()

-	 * @generated

-	 */

-	EAttribute getClass_Class();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Attribute <em>Attribute</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Attribute</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Attribute

-	 * @generated

-	 */

-	EClass getAttribute();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Attribute#getName <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Attribute#getName()

-	 * @see #getAttribute()

-	 * @generated

-	 */

-	EAttribute getAttribute_Name();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css.Attribute#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Attribute#getValue()

-	 * @see #getAttribute()

-	 * @generated

-	 */

-	EReference getAttribute_Value();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue <em>Attribute Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Attribute Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue

-	 * @generated

-	 */

-	EClass getAttributeValue();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue#getOperator <em>Operator</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Operator</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue#getOperator()

-	 * @see #getAttributeValue()

-	 * @generated

-	 */

-	EAttribute getAttributeValue_Operator();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue#getValue()

-	 * @see #getAttributeValue()

-	 * @generated

-	 */

-	EAttribute getAttributeValue_Value();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Pseudo <em>Pseudo</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Pseudo</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Pseudo

-	 * @generated

-	 */

-	EClass getPseudo();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Pseudo#getPseudo <em>Pseudo</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Pseudo</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Pseudo#getPseudo()

-	 * @see #getPseudo()

-	 * @generated

-	 */

-	EAttribute getPseudo_Pseudo();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.Pseudo#getArgs <em>Args</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Args</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Pseudo#getArgs()

-	 * @see #getPseudo()

-	 * @generated

-	 */

-	EAttribute getPseudo_Args();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.CSSId <em>CSS Id</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>CSS Id</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CSSId

-	 * @generated

-	 */

-	EClass getCSSId();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.CSSId#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CSSId#getValue()

-	 * @see #getCSSId()

-	 * @generated

-	 */

-	EAttribute getCSSId_Value();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator <em>Unary Operator</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Unary Operator</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator

-	 * @generated

-	 */

-	EClass getUnaryOperator();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator#getOperator <em>Operator</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Operator</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator#getOperator()

-	 * @see #getUnaryOperator()

-	 * @generated

-	 */

-	EAttribute getUnaryOperator_Operator();

-

-	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.gmfdiag.css.UNARY <em>UNARY</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for enum '<em>UNARY</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.UNARY

-	 * @generated

-	 */

-	EEnum getUNARY();

-

-	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.gmfdiag.css.KIND <em>KIND</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for enum '<em>KIND</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.KIND

-	 * @generated

-	 */

-	EEnum getKIND();

-

-	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP <em>ATTRIBUTE OP</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for enum '<em>ATTRIBUTE OP</em>'.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP

-	 * @generated

-	 */

-	EEnum getATTRIBUTE_OP();

-

-	/**

-	 * 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

-	 */

-	CssFactory getCssFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	interface Literals

-	{

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.StylesheetImpl <em>Stylesheet</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.StylesheetImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getStylesheet()

-		 * @generated

-		 */

-		EClass STYLESHEET = eINSTANCE.getStylesheet();

-

-		/**

-		 * The meta object literal for the '<em><b>Charset</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute STYLESHEET__CHARSET = eINSTANCE.getStylesheet_Charset();

-

-		/**

-		 * The meta object literal for the '<em><b>Imports</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference STYLESHEET__IMPORTS = eINSTANCE.getStylesheet_Imports();

-

-		/**

-		 * The meta object literal for the '<em><b>Contents</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference STYLESHEET__CONTENTS = eINSTANCE.getStylesheet_Contents();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ContentImpl <em>Content</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.ContentImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getContent()

-		 * @generated

-		 */

-		EClass CONTENT = eINSTANCE.getContent();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ImportImpl <em>Import</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.ImportImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getImport()

-		 * @generated

-		 */

-		EClass IMPORT = eINSTANCE.getImport();

-

-		/**

-		 * The meta object literal for the '<em><b>String</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute IMPORT__STRING = eINSTANCE.getImport_String();

-

-		/**

-		 * The meta object literal for the '<em><b>Uri</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference IMPORT__URI = eINSTANCE.getImport_Uri();

-

-		/**

-		 * The meta object literal for the '<em><b>Media</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute IMPORT__MEDIA = eINSTANCE.getImport_Media();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.MediaImpl <em>Media</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.MediaImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getMedia()

-		 * @generated

-		 */

-		EClass MEDIA = eINSTANCE.getMedia();

-

-		/**

-		 * The meta object literal for the '<em><b>Media</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute MEDIA__MEDIA = eINSTANCE.getMedia_Media();

-

-		/**

-		 * The meta object literal for the '<em><b>Rules</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference MEDIA__RULES = eINSTANCE.getMedia_Rules();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PageImpl <em>Page</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.PageImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getPage()

-		 * @generated

-		 */

-		EClass PAGE = eINSTANCE.getPage();

-

-		/**

-		 * The meta object literal for the '<em><b>Pseudo</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference PAGE__PSEUDO = eINSTANCE.getPage_Pseudo();

-

-		/**

-		 * The meta object literal for the '<em><b>Declarations</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference PAGE__DECLARATIONS = eINSTANCE.getPage_Declarations();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PseudoPageImpl <em>Pseudo Page</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.PseudoPageImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getPseudoPage()

-		 * @generated

-		 */

-		EClass PSEUDO_PAGE = eINSTANCE.getPseudoPage();

-

-		/**

-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute PSEUDO_PAGE__ID = eINSTANCE.getPseudoPage_Id();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.RulesetImpl <em>Ruleset</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.RulesetImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getRuleset()

-		 * @generated

-		 */

-		EClass RULESET = eINSTANCE.getRuleset();

-

-		/**

-		 * The meta object literal for the '<em><b>Selectors</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference RULESET__SELECTORS = eINSTANCE.getRuleset_Selectors();

-

-		/**

-		 * The meta object literal for the '<em><b>Properties</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference RULESET__PROPERTIES = eINSTANCE.getRuleset_Properties();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.SelectorImpl <em>Selector</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.SelectorImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getSelector()

-		 * @generated

-		 */

-		EClass SELECTOR = eINSTANCE.getSelector();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.CompositeSelectorImpl <em>Composite Selector</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CompositeSelectorImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getCompositeSelector()

-		 * @generated

-		 */

-		EClass COMPOSITE_SELECTOR = eINSTANCE.getCompositeSelector();

-

-		/**

-		 * The meta object literal for the '<em><b>Left</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference COMPOSITE_SELECTOR__LEFT = eINSTANCE.getCompositeSelector_Left();

-

-		/**

-		 * The meta object literal for the '<em><b>Combinator</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference COMPOSITE_SELECTOR__COMBINATOR = eINSTANCE.getCompositeSelector_Combinator();

-

-		/**

-		 * The meta object literal for the '<em><b>Right</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference COMPOSITE_SELECTOR__RIGHT = eINSTANCE.getCompositeSelector_Right();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.SimpleSelectorImpl <em>Simple Selector</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.SimpleSelectorImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getSimpleSelector()

-		 * @generated

-		 */

-		EClass SIMPLE_SELECTOR = eINSTANCE.getSimpleSelector();

-

-		/**

-		 * The meta object literal for the '<em><b>Element Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute SIMPLE_SELECTOR__ELEMENT_NAME = eINSTANCE.getSimpleSelector_ElementName();

-

-		/**

-		 * The meta object literal for the '<em><b>Condition</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference SIMPLE_SELECTOR__CONDITION = eINSTANCE.getSimpleSelector_Condition();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.SelectorConditionImpl <em>Selector Condition</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.SelectorConditionImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getSelectorCondition()

-		 * @generated

-		 */

-		EClass SELECTOR_CONDITION = eINSTANCE.getSelectorCondition();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.CombinatorImpl <em>Combinator</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CombinatorImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getCombinator()

-		 * @generated

-		 */

-		EClass COMBINATOR = eINSTANCE.getCombinator();

-

-		/**

-		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute COMBINATOR__KIND = eINSTANCE.getCombinator_Kind();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.DeclarationImpl <em>Declaration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.DeclarationImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getDeclaration()

-		 * @generated

-		 */

-		EClass DECLARATION = eINSTANCE.getDeclaration();

-

-		/**

-		 * The meta object literal for the '<em><b>Property</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute DECLARATION__PROPERTY = eINSTANCE.getDeclaration_Property();

-

-		/**

-		 * The meta object literal for the '<em><b>Expression</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference DECLARATION__EXPRESSION = eINSTANCE.getDeclaration_Expression();

-

-		/**

-		 * The meta object literal for the '<em><b>Important</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute DECLARATION__IMPORTANT = eINSTANCE.getDeclaration_Important();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ExpressionImpl <em>Expression</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.ExpressionImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getExpression()

-		 * @generated

-		 */

-		EClass EXPRESSION = eINSTANCE.getExpression();

-

-		/**

-		 * The meta object literal for the '<em><b>Terms</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference EXPRESSION__TERMS = eINSTANCE.getExpression_Terms();

-

-		/**

-		 * The meta object literal for the '<em><b>Subterms</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference EXPRESSION__SUBTERMS = eINSTANCE.getExpression_Subterms();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.SubtermImpl <em>Subterm</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.SubtermImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getSubterm()

-		 * @generated

-		 */

-		EClass SUBTERM = eINSTANCE.getSubterm();

-

-		/**

-		 * The meta object literal for the '<em><b>Operator</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute SUBTERM__OPERATOR = eINSTANCE.getSubterm_Operator();

-

-		/**

-		 * The meta object literal for the '<em><b>Term</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference SUBTERM__TERM = eINSTANCE.getSubterm_Term();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.TermImpl <em>Term</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.TermImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getTerm()

-		 * @generated

-		 */

-		EClass TERM = eINSTANCE.getTerm();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.FunctionImpl <em>Function</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.FunctionImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getFunction()

-		 * @generated

-		 */

-		EClass FUNCTION = eINSTANCE.getFunction();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute FUNCTION__NAME = eINSTANCE.getFunction_Name();

-

-		/**

-		 * The meta object literal for the '<em><b>Args</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference FUNCTION__ARGS = eINSTANCE.getFunction_Args();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.NameImpl <em>Name</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.NameImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getName_()

-		 * @generated

-		 */

-		EClass NAME = eINSTANCE.getName_();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute NAME__VALUE = eINSTANCE.getName_Value();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.NumberImpl <em>Number</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.NumberImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getNumber()

-		 * @generated

-		 */

-		EClass NUMBER = eINSTANCE.getNumber();

-

-		/**

-		 * The meta object literal for the '<em><b>Op</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference NUMBER__OP = eINSTANCE.getNumber_Op();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute NUMBER__VALUE = eINSTANCE.getNumber_Value();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PercentageImpl <em>Percentage</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.PercentageImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getPercentage()

-		 * @generated

-		 */

-		EClass PERCENTAGE = eINSTANCE.getPercentage();

-

-		/**

-		 * The meta object literal for the '<em><b>Op</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference PERCENTAGE__OP = eINSTANCE.getPercentage_Op();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute PERCENTAGE__VALUE = eINSTANCE.getPercentage_Value();

-

-		/**

-		 * The meta object literal for the '<em><b>Unit</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute PERCENTAGE__UNIT = eINSTANCE.getPercentage_Unit();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.LengthImpl <em>Length</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.LengthImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getLength()

-		 * @generated

-		 */

-		EClass LENGTH = eINSTANCE.getLength();

-

-		/**

-		 * The meta object literal for the '<em><b>Op</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference LENGTH__OP = eINSTANCE.getLength_Op();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute LENGTH__VALUE = eINSTANCE.getLength_Value();

-

-		/**

-		 * The meta object literal for the '<em><b>Unit</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute LENGTH__UNIT = eINSTANCE.getLength_Unit();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.EmsImpl <em>Ems</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.EmsImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getEms()

-		 * @generated

-		 */

-		EClass EMS = eINSTANCE.getEms();

-

-		/**

-		 * The meta object literal for the '<em><b>Op</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference EMS__OP = eINSTANCE.getEms_Op();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute EMS__VALUE = eINSTANCE.getEms_Value();

-

-		/**

-		 * The meta object literal for the '<em><b>Unit</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute EMS__UNIT = eINSTANCE.getEms_Unit();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ExsImpl <em>Exs</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.ExsImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getExs()

-		 * @generated

-		 */

-		EClass EXS = eINSTANCE.getExs();

-

-		/**

-		 * The meta object literal for the '<em><b>Op</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference EXS__OP = eINSTANCE.getExs_Op();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute EXS__VALUE = eINSTANCE.getExs_Value();

-

-		/**

-		 * The meta object literal for the '<em><b>Unit</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute EXS__UNIT = eINSTANCE.getExs_Unit();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.AngleImpl <em>Angle</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.AngleImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getAngle()

-		 * @generated

-		 */

-		EClass ANGLE = eINSTANCE.getAngle();

-

-		/**

-		 * The meta object literal for the '<em><b>Op</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ANGLE__OP = eINSTANCE.getAngle_Op();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute ANGLE__VALUE = eINSTANCE.getAngle_Value();

-

-		/**

-		 * The meta object literal for the '<em><b>Unit</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute ANGLE__UNIT = eINSTANCE.getAngle_Unit();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.TimeImpl <em>Time</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.TimeImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getTime()

-		 * @generated

-		 */

-		EClass TIME = eINSTANCE.getTime();

-

-		/**

-		 * The meta object literal for the '<em><b>Op</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference TIME__OP = eINSTANCE.getTime_Op();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute TIME__VALUE = eINSTANCE.getTime_Value();

-

-		/**

-		 * The meta object literal for the '<em><b>Unit</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute TIME__UNIT = eINSTANCE.getTime_Unit();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.FrequencyImpl <em>Frequency</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.FrequencyImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getFrequency()

-		 * @generated

-		 */

-		EClass FREQUENCY = eINSTANCE.getFrequency();

-

-		/**

-		 * The meta object literal for the '<em><b>Op</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference FREQUENCY__OP = eINSTANCE.getFrequency_Op();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute FREQUENCY__VALUE = eINSTANCE.getFrequency_Value();

-

-		/**

-		 * The meta object literal for the '<em><b>Unit</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute FREQUENCY__UNIT = eINSTANCE.getFrequency_Unit();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.UriImpl <em>Uri</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.UriImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getUri()

-		 * @generated

-		 */

-		EClass URI = eINSTANCE.getUri();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute URI__VALUE = eINSTANCE.getUri_Value();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.StringValueImpl <em>String Value</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.StringValueImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getStringValue()

-		 * @generated

-		 */

-		EClass STRING_VALUE = eINSTANCE.getStringValue();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute STRING_VALUE__VALUE = eINSTANCE.getStringValue_Value();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.HexColorImpl <em>Hex Color</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.HexColorImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getHexColor()

-		 * @generated

-		 */

-		EClass HEX_COLOR = eINSTANCE.getHexColor();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute HEX_COLOR__VALUE = eINSTANCE.getHexColor_Value();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ClassImpl <em>Class</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.ClassImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getClass_()

-		 * @generated

-		 */

-		EClass CLASS = eINSTANCE.getClass_();

-

-		/**

-		 * The meta object literal for the '<em><b>Class</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute CLASS__CLASS = eINSTANCE.getClass_Class();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.AttributeImpl <em>Attribute</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.AttributeImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getAttribute()

-		 * @generated

-		 */

-		EClass ATTRIBUTE = eINSTANCE.getAttribute();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute ATTRIBUTE__NAME = eINSTANCE.getAttribute_Name();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ATTRIBUTE__VALUE = eINSTANCE.getAttribute_Value();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.AttributeValueImpl <em>Attribute Value</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.AttributeValueImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getAttributeValue()

-		 * @generated

-		 */

-		EClass ATTRIBUTE_VALUE = eINSTANCE.getAttributeValue();

-

-		/**

-		 * The meta object literal for the '<em><b>Operator</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute ATTRIBUTE_VALUE__OPERATOR = eINSTANCE.getAttributeValue_Operator();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute ATTRIBUTE_VALUE__VALUE = eINSTANCE.getAttributeValue_Value();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PseudoImpl <em>Pseudo</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.PseudoImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getPseudo()

-		 * @generated

-		 */

-		EClass PSEUDO = eINSTANCE.getPseudo();

-

-		/**

-		 * The meta object literal for the '<em><b>Pseudo</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute PSEUDO__PSEUDO = eINSTANCE.getPseudo_Pseudo();

-

-		/**

-		 * The meta object literal for the '<em><b>Args</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute PSEUDO__ARGS = eINSTANCE.getPseudo_Args();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.CSSIdImpl <em>CSS Id</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CSSIdImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getCSSId()

-		 * @generated

-		 */

-		EClass CSS_ID = eINSTANCE.getCSSId();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute CSS_ID__VALUE = eINSTANCE.getCSSId_Value();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.UnaryOperatorImpl <em>Unary Operator</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.UnaryOperatorImpl

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getUnaryOperator()

-		 * @generated

-		 */

-		EClass UNARY_OPERATOR = eINSTANCE.getUnaryOperator();

-

-		/**

-		 * The meta object literal for the '<em><b>Operator</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute UNARY_OPERATOR__OPERATOR = eINSTANCE.getUnaryOperator_Operator();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.UNARY <em>UNARY</em>}' enum.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.UNARY

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getUNARY()

-		 * @generated

-		 */

-		EEnum UNARY = eINSTANCE.getUNARY();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.KIND <em>KIND</em>}' enum.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.KIND

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getKIND()

-		 * @generated

-		 */

-		EEnum KIND = eINSTANCE.getKIND();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP <em>ATTRIBUTE OP</em>}' enum.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP

-		 * @see org.eclipse.papyrus.infra.gmfdiag.css.impl.CssPackageImpl#getATTRIBUTE_OP()

-		 * @generated

-		 */

-		EEnum ATTRIBUTE_OP = eINSTANCE.getATTRIBUTE_OP();

-

-	}

-

-} // CssPackage

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Declaration.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Declaration.java
deleted file mode 100644
index 9f084868d25..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Declaration.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Declaration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Declaration#getProperty <em>Property</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Declaration#getExpression <em>Expression</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Declaration#isImportant <em>Important</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getDeclaration()

- * @model

- * @generated

- */

-public interface Declaration extends EObject

-{

-	/**

-	 * Returns the value of the '<em><b>Property</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Property</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Property</em>' attribute.

-	 * @see #setProperty(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getDeclaration_Property()

-	 * @model

-	 * @generated

-	 */

-	String getProperty();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Declaration#getProperty <em>Property</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Property</em>' attribute.

-	 * @see #getProperty()

-	 * @generated

-	 */

-	void setProperty(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Expression</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Expression</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Expression</em>' containment reference.

-	 * @see #setExpression(Expression)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getDeclaration_Expression()

-	 * @model containment="true"

-	 * @generated

-	 */

-	Expression getExpression();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Declaration#getExpression <em>Expression</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Expression</em>' containment reference.

-	 * @see #getExpression()

-	 * @generated

-	 */

-	void setExpression(Expression value);

-

-	/**

-	 * Returns the value of the '<em><b>Important</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Important</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Important</em>' attribute.

-	 * @see #setImportant(boolean)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getDeclaration_Important()

-	 * @model

-	 * @generated

-	 */

-	boolean isImportant();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Declaration#isImportant <em>Important</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Important</em>' attribute.

-	 * @see #isImportant()

-	 * @generated

-	 */

-	void setImportant(boolean value);

-

-} // Declaration

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Ems.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Ems.java
deleted file mode 100644
index 4348a9e5974..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Ems.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Ems</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Ems#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Ems#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Ems#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getEms()

- * @model

- * @generated

- */

-public interface Ems extends Term

-{

-	/**

-	 * Returns the value of the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Op</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Op</em>' containment reference.

-	 * @see #setOp(UnaryOperator)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getEms_Op()

-	 * @model containment="true"

-	 * @generated

-	 */

-	UnaryOperator getOp();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Ems#getOp <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Op</em>' containment reference.

-	 * @see #getOp()

-	 * @generated

-	 */

-	void setOp(UnaryOperator value);

-

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getEms_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Ems#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Unit</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Unit</em>' attribute.

-	 * @see #setUnit(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getEms_Unit()

-	 * @model

-	 * @generated

-	 */

-	String getUnit();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Ems#getUnit <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Unit</em>' attribute.

-	 * @see #getUnit()

-	 * @generated

-	 */

-	void setUnit(String value);

-

-} // Ems

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Expression.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Expression.java
deleted file mode 100644
index 28657d53988..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Expression.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Expression</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Expression#getTerms <em>Terms</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Expression#getSubterms <em>Subterms</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getExpression()

- * @model

- * @generated

- */

-public interface Expression extends EObject

-{

-	/**

-	 * Returns the value of the '<em><b>Terms</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Terms</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Terms</em>' containment reference.

-	 * @see #setTerms(Term)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getExpression_Terms()

-	 * @model containment="true"

-	 * @generated

-	 */

-	Term getTerms();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Expression#getTerms <em>Terms</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Terms</em>' containment reference.

-	 * @see #getTerms()

-	 * @generated

-	 */

-	void setTerms(Term value);

-

-	/**

-	 * Returns the value of the '<em><b>Subterms</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css.Subterm}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Subterms</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>Subterms</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getExpression_Subterms()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Subterm> getSubterms();

-

-} // Expression

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Exs.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Exs.java
deleted file mode 100644
index 881a7b1f7a5..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Exs.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Exs</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Exs#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Exs#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Exs#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getExs()

- * @model

- * @generated

- */

-public interface Exs extends Term

-{

-	/**

-	 * Returns the value of the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Op</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Op</em>' containment reference.

-	 * @see #setOp(UnaryOperator)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getExs_Op()

-	 * @model containment="true"

-	 * @generated

-	 */

-	UnaryOperator getOp();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Exs#getOp <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Op</em>' containment reference.

-	 * @see #getOp()

-	 * @generated

-	 */

-	void setOp(UnaryOperator value);

-

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getExs_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Exs#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Unit</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Unit</em>' attribute.

-	 * @see #setUnit(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getExs_Unit()

-	 * @model

-	 * @generated

-	 */

-	String getUnit();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Exs#getUnit <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Unit</em>' attribute.

-	 * @see #getUnit()

-	 * @generated

-	 */

-	void setUnit(String value);

-

-} // Exs

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Frequency.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Frequency.java
deleted file mode 100644
index 3ffb2c0b12f..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Frequency.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Frequency</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Frequency#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Frequency#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Frequency#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getFrequency()

- * @model

- * @generated

- */

-public interface Frequency extends Term

-{

-	/**

-	 * Returns the value of the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Op</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Op</em>' containment reference.

-	 * @see #setOp(UnaryOperator)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getFrequency_Op()

-	 * @model containment="true"

-	 * @generated

-	 */

-	UnaryOperator getOp();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Frequency#getOp <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Op</em>' containment reference.

-	 * @see #getOp()

-	 * @generated

-	 */

-	void setOp(UnaryOperator value);

-

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getFrequency_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Frequency#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Unit</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Unit</em>' attribute.

-	 * @see #setUnit(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getFrequency_Unit()

-	 * @model

-	 * @generated

-	 */

-	String getUnit();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Frequency#getUnit <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Unit</em>' attribute.

-	 * @see #getUnit()

-	 * @generated

-	 */

-	void setUnit(String value);

-

-} // Frequency

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Function.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Function.java
deleted file mode 100644
index d45e94aefc5..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Function.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Function</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Function#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Function#getArgs <em>Args</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getFunction()

- * @model

- * @generated

- */

-public interface Function extends Term

-{

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getFunction_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Function#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Args</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Args</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Args</em>' containment reference.

-	 * @see #setArgs(Expression)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getFunction_Args()

-	 * @model containment="true"

-	 * @generated

-	 */

-	Expression getArgs();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Function#getArgs <em>Args</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Args</em>' containment reference.

-	 * @see #getArgs()

-	 * @generated

-	 */

-	void setArgs(Expression value);

-

-} // Function

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/HexColor.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/HexColor.java
deleted file mode 100644
index 6b673590d13..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/HexColor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Hex Color</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.HexColor#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getHexColor()

- * @model

- * @generated

- */

-public interface HexColor extends Term

-{

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getHexColor_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.HexColor#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-} // HexColor

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Import.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Import.java
deleted file mode 100644
index fccac6b5dc5..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Import.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Import</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Import#getString <em>String</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Import#getUri <em>Uri</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Import#getMedia <em>Media</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getImport()

- * @model

- * @generated

- */

-public interface Import extends EObject

-{

-	/**

-	 * Returns the value of the '<em><b>String</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>String</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>String</em>' attribute.

-	 * @see #setString(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getImport_String()

-	 * @model

-	 * @generated

-	 */

-	String getString();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Import#getString <em>String</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>String</em>' attribute.

-	 * @see #getString()

-	 * @generated

-	 */

-	void setString(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Uri</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Uri</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Uri</em>' containment reference.

-	 * @see #setUri(Uri)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getImport_Uri()

-	 * @model containment="true"

-	 * @generated

-	 */

-	Uri getUri();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Import#getUri <em>Uri</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Uri</em>' containment reference.

-	 * @see #getUri()

-	 * @generated

-	 */

-	void setUri(Uri value);

-

-	/**

-	 * Returns the value of the '<em><b>Media</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Media</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Media</em>' attribute list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getImport_Media()

-	 * @model unique="false"

-	 * @generated

-	 */

-	EList<String> getMedia();

-

-} // Import

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/KIND.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/KIND.java
deleted file mode 100644
index f9e5c6f1dc2..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/KIND.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>KIND</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getKIND()

- * @model

- * @generated

- */

-public enum KIND implements Enumerator

-{

-	/**

-	 * The '<em><b>FIRST CHILD</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #FIRST_CHILD_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	FIRST_CHILD(0, "FIRST_CHILD", ">"),

-

-	/**

-	 * The '<em><b>SIBLING</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #SIBLING_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	SIBLING(1, "SIBLING", "+");

-

-	/**

-	 * The '<em><b>FIRST CHILD</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>FIRST CHILD</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #FIRST_CHILD

-	 * @model literal=">"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int FIRST_CHILD_VALUE = 0;

-

-	/**

-	 * The '<em><b>SIBLING</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>SIBLING</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #SIBLING

-	 * @model literal="+"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int SIBLING_VALUE = 1;

-

-	/**

-	 * An array of all the '<em><b>KIND</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static final KIND[] VALUES_ARRAY =

-			new KIND[]

-			{

-					FIRST_CHILD,

-					SIBLING,

-			};

-

-	/**

-	 * A public read-only list of all the '<em><b>KIND</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final List<KIND> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>KIND</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static KIND get(String literal)

-	{

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

-		{

-			KIND result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal))

-			{

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>KIND</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static KIND getByName(String name)

-	{

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

-		{

-			KIND result = VALUES_ARRAY[i];

-			if (result.getName().equals(name))

-			{

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>KIND</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static KIND get(int value)

-	{

-		switch (value)

-		{

-		case FIRST_CHILD_VALUE:

-			return FIRST_CHILD;

-		case SIBLING_VALUE:

-			return SIBLING;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private KIND(int value, String name, String literal)

-	{

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public int getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName()

-	{

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getLiteral()

-	{

-		return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		return literal;

-	}

-

-} // KIND

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Length.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Length.java
deleted file mode 100644
index b1335e93da0..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Length.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Length</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Length#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Length#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Length#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getLength()

- * @model

- * @generated

- */

-public interface Length extends Term

-{

-	/**

-	 * Returns the value of the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Op</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Op</em>' containment reference.

-	 * @see #setOp(UnaryOperator)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getLength_Op()

-	 * @model containment="true"

-	 * @generated

-	 */

-	UnaryOperator getOp();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Length#getOp <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Op</em>' containment reference.

-	 * @see #getOp()

-	 * @generated

-	 */

-	void setOp(UnaryOperator value);

-

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getLength_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Length#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Unit</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Unit</em>' attribute.

-	 * @see #setUnit(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getLength_Unit()

-	 * @model

-	 * @generated

-	 */

-	String getUnit();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Length#getUnit <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Unit</em>' attribute.

-	 * @see #getUnit()

-	 * @generated

-	 */

-	void setUnit(String value);

-

-} // Length

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Media.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Media.java
deleted file mode 100644
index 7c2922e6a68..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Media.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Media</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Media#getMedia <em>Media</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Media#getRules <em>Rules</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getMedia()

- * @model

- * @generated

- */

-public interface Media extends Content

-{

-	/**

-	 * Returns the value of the '<em><b>Media</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Media</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Media</em>' attribute list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getMedia_Media()

-	 * @model unique="false"

-	 * @generated

-	 */

-	EList<String> getMedia();

-

-	/**

-	 * Returns the value of the '<em><b>Rules</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css.Ruleset}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Rules</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>Rules</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getMedia_Rules()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Ruleset> getRules();

-

-} // Media

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Name.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Name.java
deleted file mode 100644
index e64c325217b..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Name.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Name</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Name#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getName_()

- * @model

- * @generated

- */

-public interface Name extends Term

-{

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getName_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Name#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-} // Name

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Number.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Number.java
deleted file mode 100644
index 0de0db909e9..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Number.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Number</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Number#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Number#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getNumber()

- * @model

- * @generated

- */

-public interface Number extends Term

-{

-	/**

-	 * Returns the value of the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Op</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Op</em>' containment reference.

-	 * @see #setOp(UnaryOperator)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getNumber_Op()

-	 * @model containment="true"

-	 * @generated

-	 */

-	UnaryOperator getOp();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Number#getOp <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Op</em>' containment reference.

-	 * @see #getOp()

-	 * @generated

-	 */

-	void setOp(UnaryOperator value);

-

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getNumber_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Number#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-} // Number

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Page.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Page.java
deleted file mode 100644
index 28558780fcd..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Page.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Page</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Page#getPseudo <em>Pseudo</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Page#getDeclarations <em>Declarations</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getPage()

- * @model

- * @generated

- */

-public interface Page extends Content

-{

-	/**

-	 * Returns the value of the '<em><b>Pseudo</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Pseudo</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Pseudo</em>' containment reference.

-	 * @see #setPseudo(PseudoPage)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getPage_Pseudo()

-	 * @model containment="true"

-	 * @generated

-	 */

-	PseudoPage getPseudo();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Page#getPseudo <em>Pseudo</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Pseudo</em>' containment reference.

-	 * @see #getPseudo()

-	 * @generated

-	 */

-	void setPseudo(PseudoPage value);

-

-	/**

-	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css.Declaration}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Declarations</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>Declarations</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getPage_Declarations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Declaration> getDeclarations();

-

-} // Page

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Percentage.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Percentage.java
deleted file mode 100644
index 425dd6a1801..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Percentage.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Percentage</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Percentage#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Percentage#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Percentage#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getPercentage()

- * @model

- * @generated

- */

-public interface Percentage extends Term

-{

-	/**

-	 * Returns the value of the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Op</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Op</em>' containment reference.

-	 * @see #setOp(UnaryOperator)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getPercentage_Op()

-	 * @model containment="true"

-	 * @generated

-	 */

-	UnaryOperator getOp();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Percentage#getOp <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Op</em>' containment reference.

-	 * @see #getOp()

-	 * @generated

-	 */

-	void setOp(UnaryOperator value);

-

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getPercentage_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Percentage#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Unit</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Unit</em>' attribute.

-	 * @see #setUnit(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getPercentage_Unit()

-	 * @model

-	 * @generated

-	 */

-	String getUnit();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Percentage#getUnit <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Unit</em>' attribute.

-	 * @see #getUnit()

-	 * @generated

-	 */

-	void setUnit(String value);

-

-} // Percentage

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Pseudo.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Pseudo.java
deleted file mode 100644
index 7147706a45e..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Pseudo.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Pseudo</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Pseudo#getPseudo <em>Pseudo</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Pseudo#getArgs <em>Args</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getPseudo()

- * @model

- * @generated

- */

-public interface Pseudo extends SelectorCondition

-{

-	/**

-	 * Returns the value of the '<em><b>Pseudo</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Pseudo</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Pseudo</em>' attribute.

-	 * @see #setPseudo(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getPseudo_Pseudo()

-	 * @model

-	 * @generated

-	 */

-	String getPseudo();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Pseudo#getPseudo <em>Pseudo</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Pseudo</em>' attribute.

-	 * @see #getPseudo()

-	 * @generated

-	 */

-	void setPseudo(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Args</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Args</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Args</em>' attribute.

-	 * @see #setArgs(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getPseudo_Args()

-	 * @model

-	 * @generated

-	 */

-	String getArgs();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Pseudo#getArgs <em>Args</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Args</em>' attribute.

-	 * @see #getArgs()

-	 * @generated

-	 */

-	void setArgs(String value);

-

-} // Pseudo

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/PseudoPage.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/PseudoPage.java
deleted file mode 100644
index a4c81286a8f..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/PseudoPage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Pseudo Page</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage#getId <em>Id</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getPseudoPage()

- * @model

- * @generated

- */

-public interface PseudoPage extends EObject

-{

-	/**

-	 * Returns the value of the '<em><b>Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Id</em>' attribute.

-	 * @see #setId(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getPseudoPage_Id()

-	 * @model

-	 * @generated

-	 */

-	String getId();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage#getId <em>Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Id</em>' attribute.

-	 * @see #getId()

-	 * @generated

-	 */

-	void setId(String value);

-

-} // PseudoPage

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Ruleset.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Ruleset.java
deleted file mode 100644
index 4f8f6a164fe..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Ruleset.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Ruleset</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Ruleset#getSelectors <em>Selectors</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Ruleset#getProperties <em>Properties</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getRuleset()

- * @model

- * @generated

- */

-public interface Ruleset extends Content

-{

-	/**

-	 * Returns the value of the '<em><b>Selectors</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css.Selector}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Selectors</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>Selectors</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getRuleset_Selectors()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Selector> getSelectors();

-

-	/**

-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css.Declaration}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Properties</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Properties</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getRuleset_Properties()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Declaration> getProperties();

-

-} // Ruleset

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Selector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Selector.java
deleted file mode 100644
index 9a633c4fdcb..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Selector.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Selector</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getSelector()

- * @model

- * @generated

- */

-public interface Selector extends EObject

-{

-} // Selector

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/SelectorCondition.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/SelectorCondition.java
deleted file mode 100644
index 756ee33fcee..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/SelectorCondition.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Selector Condition</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getSelectorCondition()

- * @model

- * @generated

- */

-public interface SelectorCondition extends EObject

-{

-} // SelectorCondition

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/SimpleSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/SimpleSelector.java
deleted file mode 100644
index 019d555f5ff..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/SimpleSelector.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Simple Selector</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector#getElementName <em>Element Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector#getCondition <em>Condition</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getSimpleSelector()

- * @model

- * @generated

- */

-public interface SimpleSelector extends Selector

-{

-	/**

-	 * Returns the value of the '<em><b>Element Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Element 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>Element Name</em>' attribute.

-	 * @see #setElementName(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getSimpleSelector_ElementName()

-	 * @model

-	 * @generated

-	 */

-	String getElementName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector#getElementName <em>Element Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Element Name</em>' attribute.

-	 * @see #getElementName()

-	 * @generated

-	 */

-	void setElementName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Condition</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Condition</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>Condition</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getSimpleSelector_Condition()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<SelectorCondition> getCondition();

-

-} // SimpleSelector

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/StringValue.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/StringValue.java
deleted file mode 100644
index e7de088c5f2..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/StringValue.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>String Value</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.StringValue#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getStringValue()

- * @model

- * @generated

- */

-public interface StringValue extends Term

-{

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getStringValue_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.StringValue#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-} // StringValue

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Stylesheet.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Stylesheet.java
deleted file mode 100644
index dd308e058d7..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Stylesheet.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Stylesheet</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet#getCharset <em>Charset</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet#getImports <em>Imports</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet#getContents <em>Contents</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getStylesheet()

- * @model

- * @generated

- */

-public interface Stylesheet extends EObject

-{

-	/**

-	 * Returns the value of the '<em><b>Charset</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Charset</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Charset</em>' attribute.

-	 * @see #setCharset(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getStylesheet_Charset()

-	 * @model

-	 * @generated

-	 */

-	String getCharset();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet#getCharset <em>Charset</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Charset</em>' attribute.

-	 * @see #getCharset()

-	 * @generated

-	 */

-	void setCharset(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Imports</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css.Import}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Imports</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>Imports</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getStylesheet_Imports()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Import> getImports();

-

-	/**

-	 * Returns the value of the '<em><b>Contents</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css.Content}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Contents</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>Contents</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getStylesheet_Contents()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Content> getContents();

-

-} // Stylesheet

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Subterm.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Subterm.java
deleted file mode 100644
index a99fb011a2f..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Subterm.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Subterm</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Subterm#getOperator <em>Operator</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Subterm#getTerm <em>Term</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getSubterm()

- * @model

- * @generated

- */

-public interface Subterm extends EObject

-{

-	/**

-	 * Returns the value of the '<em><b>Operator</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Operator</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Operator</em>' attribute.

-	 * @see #setOperator(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getSubterm_Operator()

-	 * @model

-	 * @generated

-	 */

-	String getOperator();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Subterm#getOperator <em>Operator</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Operator</em>' attribute.

-	 * @see #getOperator()

-	 * @generated

-	 */

-	void setOperator(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Term</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Term</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Term</em>' containment reference.

-	 * @see #setTerm(Term)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getSubterm_Term()

-	 * @model containment="true"

-	 * @generated

-	 */

-	Term getTerm();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Subterm#getTerm <em>Term</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Term</em>' containment reference.

-	 * @see #getTerm()

-	 * @generated

-	 */

-	void setTerm(Term value);

-

-} // Subterm

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Term.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Term.java
deleted file mode 100644
index 64a5a51fd9d..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Term.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Term</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getTerm()

- * @model

- * @generated

- */

-public interface Term extends EObject

-{

-} // Term

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Time.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Time.java
deleted file mode 100644
index be3b02fbcac..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Time.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Time</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Time#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Time#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Time#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getTime()

- * @model

- * @generated

- */

-public interface Time extends Term

-{

-	/**

-	 * Returns the value of the '<em><b>Op</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Op</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Op</em>' containment reference.

-	 * @see #setOp(UnaryOperator)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getTime_Op()

-	 * @model containment="true"

-	 * @generated

-	 */

-	UnaryOperator getOp();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Time#getOp <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Op</em>' containment reference.

-	 * @see #getOp()

-	 * @generated

-	 */

-	void setOp(UnaryOperator value);

-

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getTime_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Time#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Unit</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Unit</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Unit</em>' attribute.

-	 * @see #setUnit(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getTime_Unit()

-	 * @model

-	 * @generated

-	 */

-	String getUnit();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Time#getUnit <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Unit</em>' attribute.

-	 * @see #getUnit()

-	 * @generated

-	 */

-	void setUnit(String value);

-

-} // Time

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/UNARY.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/UNARY.java
deleted file mode 100644
index fe1c940790c..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/UNARY.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>UNARY</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getUNARY()

- * @model

- * @generated

- */

-public enum UNARY implements Enumerator

-{

-	/**

-	 * The '<em><b>NEG</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #NEG_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	NEG(0, "NEG", "-"),

-

-	/**

-	 * The '<em><b>PLUS</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #PLUS_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	PLUS(1, "PLUS", "+");

-

-	/**

-	 * The '<em><b>NEG</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>NEG</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #NEG

-	 * @model literal="-"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int NEG_VALUE = 0;

-

-	/**

-	 * The '<em><b>PLUS</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>PLUS</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #PLUS

-	 * @model literal="+"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int PLUS_VALUE = 1;

-

-	/**

-	 * An array of all the '<em><b>UNARY</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static final UNARY[] VALUES_ARRAY =

-			new UNARY[]

-			{

-					NEG,

-					PLUS,

-			};

-

-	/**

-	 * A public read-only list of all the '<em><b>UNARY</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final List<UNARY> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>UNARY</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static UNARY get(String literal)

-	{

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

-		{

-			UNARY result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal))

-			{

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>UNARY</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static UNARY getByName(String name)

-	{

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

-		{

-			UNARY result = VALUES_ARRAY[i];

-			if (result.getName().equals(name))

-			{

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>UNARY</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static UNARY get(int value)

-	{

-		switch (value)

-		{

-		case NEG_VALUE:

-			return NEG;

-		case PLUS_VALUE:

-			return PLUS;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private UNARY(int value, String name, String literal)

-	{

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public int getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName()

-	{

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getLiteral()

-	{

-		return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		return literal;

-	}

-

-} // UNARY

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/UnaryOperator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/UnaryOperator.java
deleted file mode 100644
index aecfc2d3d0b..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/UnaryOperator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Unary Operator</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator#getOperator <em>Operator</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getUnaryOperator()

- * @model

- * @generated

- */

-public interface UnaryOperator extends EObject

-{

-	/**

-	 * Returns the value of the '<em><b>Operator</b></em>' attribute.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.gmfdiag.css.UNARY}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Operator</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Operator</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.UNARY

-	 * @see #setOperator(UNARY)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getUnaryOperator_Operator()

-	 * @model

-	 * @generated

-	 */

-	UNARY getOperator();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator#getOperator <em>Operator</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Operator</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.UNARY

-	 * @see #getOperator()

-	 * @generated

-	 */

-	void setOperator(UNARY value);

-

-} // UnaryOperator

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Uri.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Uri.java
deleted file mode 100644
index 5fa601c06dd..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Uri.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Uri</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.Uri#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getUri()

- * @model

- * @generated

- */

-public interface Uri extends Term

-{

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#getUri_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css.Uri#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-} // Uri

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AngleImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AngleImpl.java
deleted file mode 100644
index 3d8283d9069..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AngleImpl.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.Angle;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Angle</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.AngleImpl#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.AngleImpl#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.AngleImpl#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class AngleImpl extends TermImpl implements Angle

-{

-	/**

-	 * The cached value of the '{@link #getOp() <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOp()

-	 * @generated

-	 * @ordered

-	 */

-	protected UnaryOperator op;

-

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String UNIT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected String unit = UNIT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AngleImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.ANGLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UnaryOperator getOp()

-	{

-		return op;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetOp(UnaryOperator newOp, NotificationChain msgs)

-	{

-		UnaryOperator oldOp = op;

-		op = newOp;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.ANGLE__OP, oldOp, newOp);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setOp(UnaryOperator newOp)

-	{

-		if (newOp != op)

-		{

-			NotificationChain msgs = null;

-			if (op != null) {

-				msgs = ((InternalEObject) op).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.ANGLE__OP, null, msgs);

-			}

-			if (newOp != null) {

-				msgs = ((InternalEObject) newOp).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.ANGLE__OP, null, msgs);

-			}

-			msgs = basicSetOp(newOp, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.ANGLE__OP, newOp, newOp));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue)

-	{

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.ANGLE__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getUnit()

-	{

-		return unit;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUnit(String newUnit)

-	{

-		String oldUnit = unit;

-		unit = newUnit;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.ANGLE__UNIT, oldUnit, unit));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ANGLE__OP:

-			return basicSetOp(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ANGLE__OP:

-			return getOp();

-		case CssPackage.ANGLE__VALUE:

-			return getValue();

-		case CssPackage.ANGLE__UNIT:

-			return getUnit();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ANGLE__OP:

-			setOp((UnaryOperator) newValue);

-			return;

-		case CssPackage.ANGLE__VALUE:

-			setValue((String) newValue);

-			return;

-		case CssPackage.ANGLE__UNIT:

-			setUnit((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ANGLE__OP:

-			setOp((UnaryOperator) null);

-			return;

-		case CssPackage.ANGLE__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		case CssPackage.ANGLE__UNIT:

-			setUnit(UNIT_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ANGLE__OP:

-			return op != null;

-		case CssPackage.ANGLE__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		case CssPackage.ANGLE__UNIT:

-			return UNIT_EDEFAULT == null ? unit != null : !UNIT_EDEFAULT.equals(unit);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: ");

-		result.append(value);

-		result.append(", unit: ");

-		result.append(unit);

-		result.append(')');

-		return result.toString();

-	}

-

-} // AngleImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeImpl.java
deleted file mode 100644
index ebc6ab74ea6..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeImpl.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

-import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Attribute</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.AttributeImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.AttributeImpl#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class AttributeImpl extends SelectorConditionImpl implements Attribute

-{

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected AttributeValue value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AttributeImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.ATTRIBUTE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName()

-	{

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName)

-	{

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.ATTRIBUTE__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public AttributeValue getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetValue(AttributeValue newValue, NotificationChain msgs)

-	{

-		AttributeValue oldValue = value;

-		value = newValue;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.ATTRIBUTE__VALUE, oldValue, newValue);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(AttributeValue newValue)

-	{

-		if (newValue != value)

-		{

-			NotificationChain msgs = null;

-			if (value != null) {

-				msgs = ((InternalEObject) value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.ATTRIBUTE__VALUE, null, msgs);

-			}

-			if (newValue != null) {

-				msgs = ((InternalEObject) newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.ATTRIBUTE__VALUE, null, msgs);

-			}

-			msgs = basicSetValue(newValue, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.ATTRIBUTE__VALUE, newValue, newValue));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ATTRIBUTE__VALUE:

-			return basicSetValue(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ATTRIBUTE__NAME:

-			return getName();

-		case CssPackage.ATTRIBUTE__VALUE:

-			return getValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ATTRIBUTE__NAME:

-			setName((String) newValue);

-			return;

-		case CssPackage.ATTRIBUTE__VALUE:

-			setValue((AttributeValue) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ATTRIBUTE__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		case CssPackage.ATTRIBUTE__VALUE:

-			setValue((AttributeValue) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ATTRIBUTE__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		case CssPackage.ATTRIBUTE__VALUE:

-			return value != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-

-} // AttributeImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeValueImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeValueImpl.java
deleted file mode 100644
index 2c6afe9528d..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeValueImpl.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP;

-import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Attribute Value</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.AttributeValueImpl#getOperator <em>Operator</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.AttributeValueImpl#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class AttributeValueImpl extends MinimalEObjectImpl.Container implements AttributeValue

-{

-	/**

-	 * The default value of the '{@link #getOperator() <em>Operator</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOperator()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final ATTRIBUTE_OP OPERATOR_EDEFAULT = ATTRIBUTE_OP.EQUALS;

-

-	/**

-	 * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOperator()

-	 * @generated

-	 * @ordered

-	 */

-	protected ATTRIBUTE_OP operator = OPERATOR_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AttributeValueImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.ATTRIBUTE_VALUE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ATTRIBUTE_OP getOperator()

-	{

-		return operator;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setOperator(ATTRIBUTE_OP newOperator)

-	{

-		ATTRIBUTE_OP oldOperator = operator;

-		operator = newOperator == null ? OPERATOR_EDEFAULT : newOperator;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.ATTRIBUTE_VALUE__OPERATOR, oldOperator, operator));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue)

-	{

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.ATTRIBUTE_VALUE__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ATTRIBUTE_VALUE__OPERATOR:

-			return getOperator();

-		case CssPackage.ATTRIBUTE_VALUE__VALUE:

-			return getValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ATTRIBUTE_VALUE__OPERATOR:

-			setOperator((ATTRIBUTE_OP) newValue);

-			return;

-		case CssPackage.ATTRIBUTE_VALUE__VALUE:

-			setValue((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ATTRIBUTE_VALUE__OPERATOR:

-			setOperator(OPERATOR_EDEFAULT);

-			return;

-		case CssPackage.ATTRIBUTE_VALUE__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.ATTRIBUTE_VALUE__OPERATOR:

-			return operator != OPERATOR_EDEFAULT;

-		case CssPackage.ATTRIBUTE_VALUE__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (operator: ");

-		result.append(operator);

-		result.append(", value: ");

-		result.append(value);

-		result.append(')');

-		return result.toString();

-	}

-

-} // AttributeValueImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CompositeSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CompositeSelectorImpl.java
deleted file mode 100644
index 828330e12db..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CompositeSelectorImpl.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.Combinator;

-import org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Selector;

-import org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Composite Selector</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.CompositeSelectorImpl#getLeft <em>Left</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.CompositeSelectorImpl#getCombinator <em>Combinator</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.CompositeSelectorImpl#getRight <em>Right</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class CompositeSelectorImpl extends SelectorImpl implements CompositeSelector

-{

-	/**

-	 * The cached value of the '{@link #getLeft() <em>Left</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getLeft()

-	 * @generated

-	 * @ordered

-	 */

-	protected SimpleSelector left;

-

-	/**

-	 * The cached value of the '{@link #getCombinator() <em>Combinator</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getCombinator()

-	 * @generated

-	 * @ordered

-	 */

-	protected Combinator combinator;

-

-	/**

-	 * The cached value of the '{@link #getRight() <em>Right</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRight()

-	 * @generated

-	 * @ordered

-	 */

-	protected Selector right;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected CompositeSelectorImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.COMPOSITE_SELECTOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public SimpleSelector getLeft()

-	{

-		return left;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetLeft(SimpleSelector newLeft, NotificationChain msgs)

-	{

-		SimpleSelector oldLeft = left;

-		left = newLeft;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.COMPOSITE_SELECTOR__LEFT, oldLeft, newLeft);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setLeft(SimpleSelector newLeft)

-	{

-		if (newLeft != left)

-		{

-			NotificationChain msgs = null;

-			if (left != null) {

-				msgs = ((InternalEObject) left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.COMPOSITE_SELECTOR__LEFT, null, msgs);

-			}

-			if (newLeft != null) {

-				msgs = ((InternalEObject) newLeft).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.COMPOSITE_SELECTOR__LEFT, null, msgs);

-			}

-			msgs = basicSetLeft(newLeft, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.COMPOSITE_SELECTOR__LEFT, newLeft, newLeft));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Combinator getCombinator()

-	{

-		return combinator;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetCombinator(Combinator newCombinator, NotificationChain msgs)

-	{

-		Combinator oldCombinator = combinator;

-		combinator = newCombinator;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.COMPOSITE_SELECTOR__COMBINATOR, oldCombinator, newCombinator);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setCombinator(Combinator newCombinator)

-	{

-		if (newCombinator != combinator)

-		{

-			NotificationChain msgs = null;

-			if (combinator != null) {

-				msgs = ((InternalEObject) combinator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.COMPOSITE_SELECTOR__COMBINATOR, null, msgs);

-			}

-			if (newCombinator != null) {

-				msgs = ((InternalEObject) newCombinator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.COMPOSITE_SELECTOR__COMBINATOR, null, msgs);

-			}

-			msgs = basicSetCombinator(newCombinator, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.COMPOSITE_SELECTOR__COMBINATOR, newCombinator, newCombinator));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Selector getRight()

-	{

-		return right;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetRight(Selector newRight, NotificationChain msgs)

-	{

-		Selector oldRight = right;

-		right = newRight;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.COMPOSITE_SELECTOR__RIGHT, oldRight, newRight);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setRight(Selector newRight)

-	{

-		if (newRight != right)

-		{

-			NotificationChain msgs = null;

-			if (right != null) {

-				msgs = ((InternalEObject) right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.COMPOSITE_SELECTOR__RIGHT, null, msgs);

-			}

-			if (newRight != null) {

-				msgs = ((InternalEObject) newRight).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.COMPOSITE_SELECTOR__RIGHT, null, msgs);

-			}

-			msgs = basicSetRight(newRight, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.COMPOSITE_SELECTOR__RIGHT, newRight, newRight));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.COMPOSITE_SELECTOR__LEFT:

-			return basicSetLeft(null, msgs);

-		case CssPackage.COMPOSITE_SELECTOR__COMBINATOR:

-			return basicSetCombinator(null, msgs);

-		case CssPackage.COMPOSITE_SELECTOR__RIGHT:

-			return basicSetRight(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.COMPOSITE_SELECTOR__LEFT:

-			return getLeft();

-		case CssPackage.COMPOSITE_SELECTOR__COMBINATOR:

-			return getCombinator();

-		case CssPackage.COMPOSITE_SELECTOR__RIGHT:

-			return getRight();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.COMPOSITE_SELECTOR__LEFT:

-			setLeft((SimpleSelector) newValue);

-			return;

-		case CssPackage.COMPOSITE_SELECTOR__COMBINATOR:

-			setCombinator((Combinator) newValue);

-			return;

-		case CssPackage.COMPOSITE_SELECTOR__RIGHT:

-			setRight((Selector) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.COMPOSITE_SELECTOR__LEFT:

-			setLeft((SimpleSelector) null);

-			return;

-		case CssPackage.COMPOSITE_SELECTOR__COMBINATOR:

-			setCombinator((Combinator) null);

-			return;

-		case CssPackage.COMPOSITE_SELECTOR__RIGHT:

-			setRight((Selector) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.COMPOSITE_SELECTOR__LEFT:

-			return left != null;

-		case CssPackage.COMPOSITE_SELECTOR__COMBINATOR:

-			return combinator != null;

-		case CssPackage.COMPOSITE_SELECTOR__RIGHT:

-			return right != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // CompositeSelectorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ContentImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ContentImpl.java
deleted file mode 100644
index dfd51179a9d..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ContentImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

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

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.Content;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Content</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class ContentImpl extends MinimalEObjectImpl.Container implements Content

-{

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ContentImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.CONTENT;

-	}

-

-} // ContentImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssFactoryImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssFactoryImpl.java
deleted file mode 100644
index da301dd6e8e..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssFactoryImpl.java
+++ /dev/null
@@ -1,791 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

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

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

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

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

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

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

-import org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP;

-import org.eclipse.papyrus.infra.gmfdiag.css.Angle;

-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

-import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.CSSId;

-import org.eclipse.papyrus.infra.gmfdiag.css.Combinator;

-import org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.Content;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssFactory;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ems;

-import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

-import org.eclipse.papyrus.infra.gmfdiag.css.Exs;

-import org.eclipse.papyrus.infra.gmfdiag.css.Frequency;

-import org.eclipse.papyrus.infra.gmfdiag.css.Function;

-import org.eclipse.papyrus.infra.gmfdiag.css.HexColor;

-import org.eclipse.papyrus.infra.gmfdiag.css.Import;

-import org.eclipse.papyrus.infra.gmfdiag.css.KIND;

-import org.eclipse.papyrus.infra.gmfdiag.css.Length;

-import org.eclipse.papyrus.infra.gmfdiag.css.Media;

-import org.eclipse.papyrus.infra.gmfdiag.css.Name;

-import org.eclipse.papyrus.infra.gmfdiag.css.Page;

-import org.eclipse.papyrus.infra.gmfdiag.css.Percentage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Pseudo;

-import org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css.Selector;

-import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;

-import org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.StringValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;

-import org.eclipse.papyrus.infra.gmfdiag.css.Term;

-import org.eclipse.papyrus.infra.gmfdiag.css.Time;

-import org.eclipse.papyrus.infra.gmfdiag.css.UNARY;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

-import org.eclipse.papyrus.infra.gmfdiag.css.Uri;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class CssFactoryImpl extends EFactoryImpl implements CssFactory

-{

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static CssFactory init()

-	{

-		try

-		{

-			CssFactory theCssFactory = (CssFactory) EPackage.Registry.INSTANCE.getEFactory(CssPackage.eNS_URI);

-			if (theCssFactory != null)

-			{

-				return theCssFactory;

-			}

-		} catch (Exception exception)

-		{

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new CssFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public CssFactoryImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass)

-	{

-		switch (eClass.getClassifierID())

-		{

-		case CssPackage.STYLESHEET:

-			return createStylesheet();

-		case CssPackage.CONTENT:

-			return createContent();

-		case CssPackage.IMPORT:

-			return createImport();

-		case CssPackage.MEDIA:

-			return createMedia();

-		case CssPackage.PAGE:

-			return createPage();

-		case CssPackage.PSEUDO_PAGE:

-			return createPseudoPage();

-		case CssPackage.RULESET:

-			return createRuleset();

-		case CssPackage.SELECTOR:

-			return createSelector();

-		case CssPackage.COMPOSITE_SELECTOR:

-			return createCompositeSelector();

-		case CssPackage.SIMPLE_SELECTOR:

-			return createSimpleSelector();

-		case CssPackage.SELECTOR_CONDITION:

-			return createSelectorCondition();

-		case CssPackage.COMBINATOR:

-			return createCombinator();

-		case CssPackage.DECLARATION:

-			return createDeclaration();

-		case CssPackage.EXPRESSION:

-			return createExpression();

-		case CssPackage.SUBTERM:

-			return createSubterm();

-		case CssPackage.TERM:

-			return createTerm();

-		case CssPackage.FUNCTION:

-			return createFunction();

-		case CssPackage.NAME:

-			return createName();

-		case CssPackage.NUMBER:

-			return createNumber();

-		case CssPackage.PERCENTAGE:

-			return createPercentage();

-		case CssPackage.LENGTH:

-			return createLength();

-		case CssPackage.EMS:

-			return createEms();

-		case CssPackage.EXS:

-			return createExs();

-		case CssPackage.ANGLE:

-			return createAngle();

-		case CssPackage.TIME:

-			return createTime();

-		case CssPackage.FREQUENCY:

-			return createFrequency();

-		case CssPackage.URI:

-			return createUri();

-		case CssPackage.STRING_VALUE:

-			return createStringValue();

-		case CssPackage.HEX_COLOR:

-			return createHexColor();

-		case CssPackage.CLASS:

-			return createClass();

-		case CssPackage.ATTRIBUTE:

-			return createAttribute();

-		case CssPackage.ATTRIBUTE_VALUE:

-			return createAttributeValue();

-		case CssPackage.PSEUDO:

-			return createPseudo();

-		case CssPackage.CSS_ID:

-			return createCSSId();

-		case CssPackage.UNARY_OPERATOR:

-			return createUnaryOperator();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue)

-	{

-		switch (eDataType.getClassifierID())

-		{

-		case CssPackage.UNARY:

-			return createUNARYFromString(eDataType, initialValue);

-		case CssPackage.KIND:

-			return createKINDFromString(eDataType, initialValue);

-		case CssPackage.ATTRIBUTE_OP:

-			return createATTRIBUTE_OPFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue)

-	{

-		switch (eDataType.getClassifierID())

-		{

-		case CssPackage.UNARY:

-			return convertUNARYToString(eDataType, instanceValue);

-		case CssPackage.KIND:

-			return convertKINDToString(eDataType, instanceValue);

-		case CssPackage.ATTRIBUTE_OP:

-			return convertATTRIBUTE_OPToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Stylesheet createStylesheet()

-	{

-		StylesheetImpl stylesheet = new StylesheetImpl();

-		return stylesheet;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Content createContent()

-	{

-		ContentImpl content = new ContentImpl();

-		return content;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Import createImport()

-	{

-		ImportImpl import_ = new ImportImpl();

-		return import_;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Media createMedia()

-	{

-		MediaImpl media = new MediaImpl();

-		return media;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Page createPage()

-	{

-		PageImpl page = new PageImpl();

-		return page;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public PseudoPage createPseudoPage()

-	{

-		PseudoPageImpl pseudoPage = new PseudoPageImpl();

-		return pseudoPage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Ruleset createRuleset()

-	{

-		RulesetImpl ruleset = new RulesetImpl();

-		return ruleset;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Selector createSelector()

-	{

-		SelectorImpl selector = new SelectorImpl();

-		return selector;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public CompositeSelector createCompositeSelector()

-	{

-		CompositeSelectorImpl compositeSelector = new CompositeSelectorImpl();

-		return compositeSelector;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public SimpleSelector createSimpleSelector()

-	{

-		SimpleSelectorImpl simpleSelector = new SimpleSelectorImpl();

-		return simpleSelector;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public SelectorCondition createSelectorCondition()

-	{

-		SelectorConditionImpl selectorCondition = new SelectorConditionImpl();

-		return selectorCondition;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Combinator createCombinator()

-	{

-		CombinatorImpl combinator = new CombinatorImpl();

-		return combinator;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Declaration createDeclaration()

-	{

-		DeclarationImpl declaration = new DeclarationImpl();

-		return declaration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Expression createExpression()

-	{

-		ExpressionImpl expression = new ExpressionImpl();

-		return expression;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Subterm createSubterm()

-	{

-		SubtermImpl subterm = new SubtermImpl();

-		return subterm;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Term createTerm()

-	{

-		TermImpl term = new TermImpl();

-		return term;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Function createFunction()

-	{

-		FunctionImpl function = new FunctionImpl();

-		return function;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Name createName()

-	{

-		NameImpl name = new NameImpl();

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public org.eclipse.papyrus.infra.gmfdiag.css.Number createNumber()

-	{

-		NumberImpl number = new NumberImpl();

-		return number;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Percentage createPercentage()

-	{

-		PercentageImpl percentage = new PercentageImpl();

-		return percentage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Length createLength()

-	{

-		LengthImpl length = new LengthImpl();

-		return length;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Ems createEms()

-	{

-		EmsImpl ems = new EmsImpl();

-		return ems;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Exs createExs()

-	{

-		ExsImpl exs = new ExsImpl();

-		return exs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Angle createAngle()

-	{

-		AngleImpl angle = new AngleImpl();

-		return angle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Time createTime()

-	{

-		TimeImpl time = new TimeImpl();

-		return time;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Frequency createFrequency()

-	{

-		FrequencyImpl frequency = new FrequencyImpl();

-		return frequency;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Uri createUri()

-	{

-		UriImpl uri = new UriImpl();

-		return uri;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public StringValue createStringValue()

-	{

-		StringValueImpl stringValue = new StringValueImpl();

-		return stringValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public HexColor createHexColor()

-	{

-		HexColorImpl hexColor = new HexColorImpl();

-		return hexColor;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public org.eclipse.papyrus.infra.gmfdiag.css.Class createClass()

-	{

-		ClassImpl class_ = new ClassImpl();

-		return class_;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Attribute createAttribute()

-	{

-		AttributeImpl attribute = new AttributeImpl();

-		return attribute;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public AttributeValue createAttributeValue()

-	{

-		AttributeValueImpl attributeValue = new AttributeValueImpl();

-		return attributeValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Pseudo createPseudo()

-	{

-		PseudoImpl pseudo = new PseudoImpl();

-		return pseudo;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public CSSId createCSSId()

-	{

-		CSSIdImpl cssId = new CSSIdImpl();

-		return cssId;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UnaryOperator createUnaryOperator()

-	{

-		UnaryOperatorImpl unaryOperator = new UnaryOperatorImpl();

-		return unaryOperator;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public UNARY createUNARYFromString(EDataType eDataType, String initialValue)

-	{

-		UNARY result = UNARY.get(initialValue);

-		if (result == null) {

-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

-		}

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String convertUNARYToString(EDataType eDataType, Object instanceValue)

-	{

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public KIND createKINDFromString(EDataType eDataType, String initialValue)

-	{

-		KIND result = KIND.get(initialValue);

-		if (result == null) {

-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

-		}

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String convertKINDToString(EDataType eDataType, Object instanceValue)

-	{

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ATTRIBUTE_OP createATTRIBUTE_OPFromString(EDataType eDataType, String initialValue)

-	{

-		ATTRIBUTE_OP result = ATTRIBUTE_OP.get(initialValue);

-		if (result == null) {

-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

-		}

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String convertATTRIBUTE_OPToString(EDataType eDataType, Object instanceValue)

-	{

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public CssPackage getCssPackage()

-	{

-		return (CssPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static CssPackage getPackage()

-	{

-		return CssPackage.eINSTANCE;

-	}

-

-} // CssFactoryImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssPackageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssPackageImpl.java
deleted file mode 100644
index c359097d6e6..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssPackageImpl.java
+++ /dev/null
@@ -1,2044 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import static org.eclipse.papyrus.infra.gmfdiag.css.CssPackage.CLASS;

-

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

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

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

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

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

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.Angle;

-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

-import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.CSSId;

-import org.eclipse.papyrus.infra.gmfdiag.css.Combinator;

-import org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.Content;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssFactory;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ems;

-import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

-import org.eclipse.papyrus.infra.gmfdiag.css.Exs;

-import org.eclipse.papyrus.infra.gmfdiag.css.Frequency;

-import org.eclipse.papyrus.infra.gmfdiag.css.Function;

-import org.eclipse.papyrus.infra.gmfdiag.css.HexColor;

-import org.eclipse.papyrus.infra.gmfdiag.css.Import;

-import org.eclipse.papyrus.infra.gmfdiag.css.Length;

-import org.eclipse.papyrus.infra.gmfdiag.css.Media;

-import org.eclipse.papyrus.infra.gmfdiag.css.Name;

-import org.eclipse.papyrus.infra.gmfdiag.css.Page;

-import org.eclipse.papyrus.infra.gmfdiag.css.Percentage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Pseudo;

-import org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css.Selector;

-import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;

-import org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.StringValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;

-import org.eclipse.papyrus.infra.gmfdiag.css.Term;

-import org.eclipse.papyrus.infra.gmfdiag.css.Time;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

-import org.eclipse.papyrus.infra.gmfdiag.css.Uri;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class CssPackageImpl extends EPackageImpl implements CssPackage

-{

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass stylesheetEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass contentEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass importEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass mediaEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass pageEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass pseudoPageEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass rulesetEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass selectorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass compositeSelectorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass simpleSelectorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass selectorConditionEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass combinatorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass declarationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass expressionEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass subtermEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass termEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass functionEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass nameEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass numberEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass percentageEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass lengthEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass emsEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass exsEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass angleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass timeEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass frequencyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass uriEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass stringValueEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass hexColorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass classEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass attributeEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass attributeValueEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass pseudoEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass cssIdEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass unaryOperatorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EEnum unaryEEnum = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EEnum kindEEnum = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EEnum attributE_OPEEnum = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private CssPackageImpl()

-	{

-		super(eNS_URI, CssFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link CssPackage#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 CssPackage init()

-	{

-		if (isInited) {

-			return (CssPackage) EPackage.Registry.INSTANCE.getEPackage(CssPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		CssPackageImpl theCssPackage = (CssPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CssPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CssPackageImpl());

-

-		isInited = true;

-

-		// Create package meta-data objects

-		theCssPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theCssPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theCssPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(CssPackage.eNS_URI, theCssPackage);

-		return theCssPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getStylesheet()

-	{

-		return stylesheetEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getStylesheet_Charset()

-	{

-		return (EAttribute) stylesheetEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getStylesheet_Imports()

-	{

-		return (EReference) stylesheetEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getStylesheet_Contents()

-	{

-		return (EReference) stylesheetEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getContent()

-	{

-		return contentEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getImport()

-	{

-		return importEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getImport_String()

-	{

-		return (EAttribute) importEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getImport_Uri()

-	{

-		return (EReference) importEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getImport_Media()

-	{

-		return (EAttribute) importEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getMedia()

-	{

-		return mediaEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getMedia_Media()

-	{

-		return (EAttribute) mediaEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getMedia_Rules()

-	{

-		return (EReference) mediaEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getPage()

-	{

-		return pageEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getPage_Pseudo()

-	{

-		return (EReference) pageEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getPage_Declarations()

-	{

-		return (EReference) pageEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getPseudoPage()

-	{

-		return pseudoPageEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getPseudoPage_Id()

-	{

-		return (EAttribute) pseudoPageEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getRuleset()

-	{

-		return rulesetEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getRuleset_Selectors()

-	{

-		return (EReference) rulesetEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getRuleset_Properties()

-	{

-		return (EReference) rulesetEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getSelector()

-	{

-		return selectorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getCompositeSelector()

-	{

-		return compositeSelectorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getCompositeSelector_Left()

-	{

-		return (EReference) compositeSelectorEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getCompositeSelector_Combinator()

-	{

-		return (EReference) compositeSelectorEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getCompositeSelector_Right()

-	{

-		return (EReference) compositeSelectorEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getSimpleSelector()

-	{

-		return simpleSelectorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getSimpleSelector_ElementName()

-	{

-		return (EAttribute) simpleSelectorEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getSimpleSelector_Condition()

-	{

-		return (EReference) simpleSelectorEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getSelectorCondition()

-	{

-		return selectorConditionEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getCombinator()

-	{

-		return combinatorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getCombinator_Kind()

-	{

-		return (EAttribute) combinatorEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getDeclaration()

-	{

-		return declarationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getDeclaration_Property()

-	{

-		return (EAttribute) declarationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getDeclaration_Expression()

-	{

-		return (EReference) declarationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getDeclaration_Important()

-	{

-		return (EAttribute) declarationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getExpression()

-	{

-		return expressionEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getExpression_Terms()

-	{

-		return (EReference) expressionEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getExpression_Subterms()

-	{

-		return (EReference) expressionEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getSubterm()

-	{

-		return subtermEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getSubterm_Operator()

-	{

-		return (EAttribute) subtermEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getSubterm_Term()

-	{

-		return (EReference) subtermEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getTerm()

-	{

-		return termEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getFunction()

-	{

-		return functionEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFunction_Name()

-	{

-		return (EAttribute) functionEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getFunction_Args()

-	{

-		return (EReference) functionEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getName_()

-	{

-		return nameEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getName_Value()

-	{

-		return (EAttribute) nameEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getNumber()

-	{

-		return numberEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getNumber_Op()

-	{

-		return (EReference) numberEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getNumber_Value()

-	{

-		return (EAttribute) numberEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getPercentage()

-	{

-		return percentageEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getPercentage_Op()

-	{

-		return (EReference) percentageEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getPercentage_Value()

-	{

-		return (EAttribute) percentageEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getPercentage_Unit()

-	{

-		return (EAttribute) percentageEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getLength()

-	{

-		return lengthEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getLength_Op()

-	{

-		return (EReference) lengthEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getLength_Value()

-	{

-		return (EAttribute) lengthEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getLength_Unit()

-	{

-		return (EAttribute) lengthEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getEms()

-	{

-		return emsEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getEms_Op()

-	{

-		return (EReference) emsEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getEms_Value()

-	{

-		return (EAttribute) emsEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getEms_Unit()

-	{

-		return (EAttribute) emsEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getExs()

-	{

-		return exsEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getExs_Op()

-	{

-		return (EReference) exsEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getExs_Value()

-	{

-		return (EAttribute) exsEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getExs_Unit()

-	{

-		return (EAttribute) exsEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getAngle()

-	{

-		return angleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getAngle_Op()

-	{

-		return (EReference) angleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getAngle_Value()

-	{

-		return (EAttribute) angleEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getAngle_Unit()

-	{

-		return (EAttribute) angleEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getTime()

-	{

-		return timeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getTime_Op()

-	{

-		return (EReference) timeEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTime_Value()

-	{

-		return (EAttribute) timeEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTime_Unit()

-	{

-		return (EAttribute) timeEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getFrequency()

-	{

-		return frequencyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getFrequency_Op()

-	{

-		return (EReference) frequencyEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFrequency_Value()

-	{

-		return (EAttribute) frequencyEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFrequency_Unit()

-	{

-		return (EAttribute) frequencyEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getUri()

-	{

-		return uriEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getUri_Value()

-	{

-		return (EAttribute) uriEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getStringValue()

-	{

-		return stringValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getStringValue_Value()

-	{

-		return (EAttribute) stringValueEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getHexColor()

-	{

-		return hexColorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getHexColor_Value()

-	{

-		return (EAttribute) hexColorEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getClass_()

-	{

-		return classEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getClass_Class()

-	{

-		return (EAttribute) classEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getAttribute()

-	{

-		return attributeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getAttribute_Name()

-	{

-		return (EAttribute) attributeEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getAttribute_Value()

-	{

-		return (EReference) attributeEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getAttributeValue()

-	{

-		return attributeValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getAttributeValue_Operator()

-	{

-		return (EAttribute) attributeValueEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getAttributeValue_Value()

-	{

-		return (EAttribute) attributeValueEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getPseudo()

-	{

-		return pseudoEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getPseudo_Pseudo()

-	{

-		return (EAttribute) pseudoEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getPseudo_Args()

-	{

-		return (EAttribute) pseudoEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getCSSId()

-	{

-		return cssIdEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getCSSId_Value()

-	{

-		return (EAttribute) cssIdEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getUnaryOperator()

-	{

-		return unaryOperatorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getUnaryOperator_Operator()

-	{

-		return (EAttribute) unaryOperatorEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EEnum getUNARY()

-	{

-		return unaryEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EEnum getKIND()

-	{

-		return kindEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EEnum getATTRIBUTE_OP()

-	{

-		return attributE_OPEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public CssFactory getCssFactory()

-	{

-		return (CssFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createPackageContents()

-	{

-		if (isCreated) {

-			return;

-		}

-		isCreated = true;

-

-		// Create classes and their features

-		stylesheetEClass = createEClass(STYLESHEET);

-		createEAttribute(stylesheetEClass, STYLESHEET__CHARSET);

-		createEReference(stylesheetEClass, STYLESHEET__IMPORTS);

-		createEReference(stylesheetEClass, STYLESHEET__CONTENTS);

-

-		contentEClass = createEClass(CONTENT);

-

-		importEClass = createEClass(IMPORT);

-		createEAttribute(importEClass, IMPORT__STRING);

-		createEReference(importEClass, IMPORT__URI);

-		createEAttribute(importEClass, IMPORT__MEDIA);

-

-		mediaEClass = createEClass(MEDIA);

-		createEAttribute(mediaEClass, MEDIA__MEDIA);

-		createEReference(mediaEClass, MEDIA__RULES);

-

-		pageEClass = createEClass(PAGE);

-		createEReference(pageEClass, PAGE__PSEUDO);

-		createEReference(pageEClass, PAGE__DECLARATIONS);

-

-		pseudoPageEClass = createEClass(PSEUDO_PAGE);

-		createEAttribute(pseudoPageEClass, PSEUDO_PAGE__ID);

-

-		rulesetEClass = createEClass(RULESET);

-		createEReference(rulesetEClass, RULESET__SELECTORS);

-		createEReference(rulesetEClass, RULESET__PROPERTIES);

-

-		selectorEClass = createEClass(SELECTOR);

-

-		compositeSelectorEClass = createEClass(COMPOSITE_SELECTOR);

-		createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__LEFT);

-		createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__COMBINATOR);

-		createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__RIGHT);

-

-		simpleSelectorEClass = createEClass(SIMPLE_SELECTOR);

-		createEAttribute(simpleSelectorEClass, SIMPLE_SELECTOR__ELEMENT_NAME);

-		createEReference(simpleSelectorEClass, SIMPLE_SELECTOR__CONDITION);

-

-		selectorConditionEClass = createEClass(SELECTOR_CONDITION);

-

-		combinatorEClass = createEClass(COMBINATOR);

-		createEAttribute(combinatorEClass, COMBINATOR__KIND);

-

-		declarationEClass = createEClass(DECLARATION);

-		createEAttribute(declarationEClass, DECLARATION__PROPERTY);

-		createEReference(declarationEClass, DECLARATION__EXPRESSION);

-		createEAttribute(declarationEClass, DECLARATION__IMPORTANT);

-

-		expressionEClass = createEClass(EXPRESSION);

-		createEReference(expressionEClass, EXPRESSION__TERMS);

-		createEReference(expressionEClass, EXPRESSION__SUBTERMS);

-

-		subtermEClass = createEClass(SUBTERM);

-		createEAttribute(subtermEClass, SUBTERM__OPERATOR);

-		createEReference(subtermEClass, SUBTERM__TERM);

-

-		termEClass = createEClass(TERM);

-

-		functionEClass = createEClass(FUNCTION);

-		createEAttribute(functionEClass, FUNCTION__NAME);

-		createEReference(functionEClass, FUNCTION__ARGS);

-

-		nameEClass = createEClass(NAME);

-		createEAttribute(nameEClass, NAME__VALUE);

-

-		numberEClass = createEClass(NUMBER);

-		createEReference(numberEClass, NUMBER__OP);

-		createEAttribute(numberEClass, NUMBER__VALUE);

-

-		percentageEClass = createEClass(PERCENTAGE);

-		createEReference(percentageEClass, PERCENTAGE__OP);

-		createEAttribute(percentageEClass, PERCENTAGE__VALUE);

-		createEAttribute(percentageEClass, PERCENTAGE__UNIT);

-

-		lengthEClass = createEClass(LENGTH);

-		createEReference(lengthEClass, LENGTH__OP);

-		createEAttribute(lengthEClass, LENGTH__VALUE);

-		createEAttribute(lengthEClass, LENGTH__UNIT);

-

-		emsEClass = createEClass(EMS);

-		createEReference(emsEClass, EMS__OP);

-		createEAttribute(emsEClass, EMS__VALUE);

-		createEAttribute(emsEClass, EMS__UNIT);

-

-		exsEClass = createEClass(EXS);

-		createEReference(exsEClass, EXS__OP);

-		createEAttribute(exsEClass, EXS__VALUE);

-		createEAttribute(exsEClass, EXS__UNIT);

-

-		angleEClass = createEClass(ANGLE);

-		createEReference(angleEClass, ANGLE__OP);

-		createEAttribute(angleEClass, ANGLE__VALUE);

-		createEAttribute(angleEClass, ANGLE__UNIT);

-

-		timeEClass = createEClass(TIME);

-		createEReference(timeEClass, TIME__OP);

-		createEAttribute(timeEClass, TIME__VALUE);

-		createEAttribute(timeEClass, TIME__UNIT);

-

-		frequencyEClass = createEClass(FREQUENCY);

-		createEReference(frequencyEClass, FREQUENCY__OP);

-		createEAttribute(frequencyEClass, FREQUENCY__VALUE);

-		createEAttribute(frequencyEClass, FREQUENCY__UNIT);

-

-		uriEClass = createEClass(URI);

-		createEAttribute(uriEClass, URI__VALUE);

-

-		stringValueEClass = createEClass(STRING_VALUE);

-		createEAttribute(stringValueEClass, STRING_VALUE__VALUE);

-

-		hexColorEClass = createEClass(HEX_COLOR);

-		createEAttribute(hexColorEClass, HEX_COLOR__VALUE);

-

-		classEClass = createEClass(CLASS);

-		createEAttribute(classEClass, CLASS__CLASS);

-

-		attributeEClass = createEClass(ATTRIBUTE);

-		createEAttribute(attributeEClass, ATTRIBUTE__NAME);

-		createEReference(attributeEClass, ATTRIBUTE__VALUE);

-

-		attributeValueEClass = createEClass(ATTRIBUTE_VALUE);

-		createEAttribute(attributeValueEClass, ATTRIBUTE_VALUE__OPERATOR);

-		createEAttribute(attributeValueEClass, ATTRIBUTE_VALUE__VALUE);

-

-		pseudoEClass = createEClass(PSEUDO);

-		createEAttribute(pseudoEClass, PSEUDO__PSEUDO);

-		createEAttribute(pseudoEClass, PSEUDO__ARGS);

-

-		cssIdEClass = createEClass(CSS_ID);

-		createEAttribute(cssIdEClass, CSS_ID__VALUE);

-

-		unaryOperatorEClass = createEClass(UNARY_OPERATOR);

-		createEAttribute(unaryOperatorEClass, UNARY_OPERATOR__OPERATOR);

-

-		// Create enums

-		unaryEEnum = createEEnum(UNARY);

-		kindEEnum = createEEnum(KIND);

-		attributE_OPEEnum = createEEnum(ATTRIBUTE_OP);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void initializePackageContents()

-	{

-		if (isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		mediaEClass.getESuperTypes().add(this.getContent());

-		pageEClass.getESuperTypes().add(this.getContent());

-		rulesetEClass.getESuperTypes().add(this.getContent());

-		compositeSelectorEClass.getESuperTypes().add(this.getSelector());

-		simpleSelectorEClass.getESuperTypes().add(this.getSelector());

-		functionEClass.getESuperTypes().add(this.getTerm());

-		nameEClass.getESuperTypes().add(this.getTerm());

-		numberEClass.getESuperTypes().add(this.getTerm());

-		percentageEClass.getESuperTypes().add(this.getTerm());

-		lengthEClass.getESuperTypes().add(this.getTerm());

-		emsEClass.getESuperTypes().add(this.getTerm());

-		exsEClass.getESuperTypes().add(this.getTerm());

-		angleEClass.getESuperTypes().add(this.getTerm());

-		timeEClass.getESuperTypes().add(this.getTerm());

-		frequencyEClass.getESuperTypes().add(this.getTerm());

-		uriEClass.getESuperTypes().add(this.getTerm());

-		stringValueEClass.getESuperTypes().add(this.getTerm());

-		hexColorEClass.getESuperTypes().add(this.getTerm());

-		classEClass.getESuperTypes().add(this.getSelectorCondition());

-		attributeEClass.getESuperTypes().add(this.getSelectorCondition());

-		pseudoEClass.getESuperTypes().add(this.getSelectorCondition());

-		cssIdEClass.getESuperTypes().add(this.getSelectorCondition());

-

-		// Initialize classes and features; add operations and parameters

-		initEClass(stylesheetEClass, Stylesheet.class, "Stylesheet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getStylesheet_Charset(), ecorePackage.getEString(), "charset", null, 0, 1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getStylesheet_Imports(), this.getImport(), null, "imports", null, 0, -1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getStylesheet_Contents(), this.getContent(), null, "contents", null, 0, -1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(contentEClass, Content.class, "Content", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getImport_String(), ecorePackage.getEString(), "string", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getImport_Uri(), this.getUri(), null, "uri", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getImport_Media(), ecorePackage.getEString(), "media", null, 0, -1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(mediaEClass, Media.class, "Media", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getMedia_Media(), ecorePackage.getEString(), "media", null, 0, -1, Media.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getMedia_Rules(), this.getRuleset(), null, "rules", null, 0, -1, Media.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(pageEClass, Page.class, "Page", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getPage_Pseudo(), this.getPseudoPage(), null, "pseudo", null, 0, 1, Page.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getPage_Declarations(), this.getDeclaration(), null, "declarations", null, 0, -1, Page.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(pseudoPageEClass, PseudoPage.class, "PseudoPage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getPseudoPage_Id(), ecorePackage.getEString(), "id", null, 0, 1, PseudoPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(rulesetEClass, Ruleset.class, "Ruleset", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getRuleset_Selectors(), this.getSelector(), null, "selectors", null, 0, -1, Ruleset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getRuleset_Properties(), this.getDeclaration(), null, "properties", null, 0, -1, Ruleset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(selectorEClass, Selector.class, "Selector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(compositeSelectorEClass, CompositeSelector.class, "CompositeSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getCompositeSelector_Left(), this.getSimpleSelector(), null, "left", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getCompositeSelector_Combinator(), this.getCombinator(), null, "combinator", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-		initEReference(getCompositeSelector_Right(), this.getSelector(), null, "right", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(simpleSelectorEClass, SimpleSelector.class, "SimpleSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getSimpleSelector_ElementName(), ecorePackage.getEString(), "elementName", null, 0, 1, SimpleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getSimpleSelector_Condition(), this.getSelectorCondition(), null, "condition", null, 0, -1, SimpleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-

-		initEClass(selectorConditionEClass, SelectorCondition.class, "SelectorCondition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(combinatorEClass, Combinator.class, "Combinator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getCombinator_Kind(), this.getKIND(), "kind", null, 0, 1, Combinator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(declarationEClass, Declaration.class, "Declaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getDeclaration_Property(), ecorePackage.getEString(), "property", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getDeclaration_Expression(), this.getExpression(), null, "expression", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getDeclaration_Important(), ecorePackage.getEBoolean(), "important", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(expressionEClass, Expression.class, "Expression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getExpression_Terms(), this.getTerm(), null, "terms", null, 0, 1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getExpression_Subterms(), this.getSubterm(), null, "subterms", null, 0, -1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(subtermEClass, Subterm.class, "Subterm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getSubterm_Operator(), ecorePackage.getEString(), "operator", null, 0, 1, Subterm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getSubterm_Term(), this.getTerm(), null, "term", null, 0, 1, Subterm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(termEClass, Term.class, "Term", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(functionEClass, Function.class, "Function", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getFunction_Name(), ecorePackage.getEString(), "name", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getFunction_Args(), this.getExpression(), null, "args", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(nameEClass, Name.class, "Name", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getName_Value(), ecorePackage.getEString(), "value", null, 0, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(numberEClass, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, "Number", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getNumber_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-		initEAttribute(getNumber_Value(), ecorePackage.getEString(), "value", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(percentageEClass, Percentage.class, "Percentage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getPercentage_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getPercentage_Value(), ecorePackage.getEString(), "value", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getPercentage_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(lengthEClass, Length.class, "Length", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getLength_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getLength_Value(), ecorePackage.getEString(), "value", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getLength_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(emsEClass, Ems.class, "Ems", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getEms_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getEms_Value(), ecorePackage.getEString(), "value", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getEms_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(exsEClass, Exs.class, "Exs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getExs_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getExs_Value(), ecorePackage.getEString(), "value", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getExs_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(angleEClass, Angle.class, "Angle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getAngle_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getAngle_Value(), ecorePackage.getEString(), "value", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getAngle_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(timeEClass, Time.class, "Time", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getTime_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getTime_Value(), ecorePackage.getEString(), "value", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getTime_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(frequencyEClass, Frequency.class, "Frequency", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getFrequency_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getFrequency_Value(), ecorePackage.getEString(), "value", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getFrequency_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(uriEClass, Uri.class, "Uri", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getUri_Value(), ecorePackage.getEString(), "value", null, 0, 1, Uri.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(stringValueEClass, StringValue.class, "StringValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getStringValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(hexColorEClass, HexColor.class, "HexColor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getHexColor_Value(), ecorePackage.getEString(), "value", null, 0, 1, HexColor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(classEClass, org.eclipse.papyrus.infra.gmfdiag.css.Class.class, "Class", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getClass_Class(), ecorePackage.getEString(), "class", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Class.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(attributeEClass, Attribute.class, "Attribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getAttribute_Name(), ecorePackage.getEString(), "name", null, 0, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getAttribute_Value(), this.getAttributeValue(), null, "value", null, 0, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(attributeValueEClass, AttributeValue.class, "AttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getAttributeValue_Operator(), this.getATTRIBUTE_OP(), "operator", null, 0, 1, AttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getAttributeValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, AttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(pseudoEClass, Pseudo.class, "Pseudo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getPseudo_Pseudo(), ecorePackage.getEString(), "pseudo", null, 0, 1, Pseudo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getPseudo_Args(), ecorePackage.getEString(), "args", null, 0, 1, Pseudo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(cssIdEClass, CSSId.class, "CSSId", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getCSSId_Value(), ecorePackage.getEString(), "value", null, 0, 1, CSSId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(unaryOperatorEClass, UnaryOperator.class, "UnaryOperator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getUnaryOperator_Operator(), this.getUNARY(), "operator", null, 0, 1, UnaryOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		// Initialize enums and add enum literals

-		initEEnum(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.class, "UNARY");

-		addEEnumLiteral(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.NEG);

-		addEEnumLiteral(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.PLUS);

-

-		initEEnum(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.class, "KIND");

-		addEEnumLiteral(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.FIRST_CHILD);

-		addEEnumLiteral(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.SIBLING);

-

-		initEEnum(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.class, "ATTRIBUTE_OP");

-		addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.EQUALS);

-		addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.CONTAINS);

-		addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.UNEQUALS);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // CssPackageImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/DeclarationImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/DeclarationImpl.java
deleted file mode 100644
index 3afcd9545db..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/DeclarationImpl.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Declaration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.DeclarationImpl#getProperty <em>Property</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.DeclarationImpl#getExpression <em>Expression</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.DeclarationImpl#isImportant <em>Important</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class DeclarationImpl extends MinimalEObjectImpl.Container implements Declaration

-{

-	/**

-	 * The default value of the '{@link #getProperty() <em>Property</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getProperty()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String PROPERTY_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getProperty() <em>Property</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getProperty()

-	 * @generated

-	 * @ordered

-	 */

-	protected String property = PROPERTY_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getExpression()

-	 * @generated

-	 * @ordered

-	 */

-	protected Expression expression;

-

-	/**

-	 * The default value of the '{@link #isImportant() <em>Important</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isImportant()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean IMPORTANT_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isImportant() <em>Important</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isImportant()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean important = IMPORTANT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected DeclarationImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.DECLARATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getProperty()

-	{

-		return property;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setProperty(String newProperty)

-	{

-		String oldProperty = property;

-		property = newProperty;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.DECLARATION__PROPERTY, oldProperty, property));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Expression getExpression()

-	{

-		return expression;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetExpression(Expression newExpression, NotificationChain msgs)

-	{

-		Expression oldExpression = expression;

-		expression = newExpression;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.DECLARATION__EXPRESSION, oldExpression, newExpression);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setExpression(Expression newExpression)

-	{

-		if (newExpression != expression)

-		{

-			NotificationChain msgs = null;

-			if (expression != null) {

-				msgs = ((InternalEObject) expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.DECLARATION__EXPRESSION, null, msgs);

-			}

-			if (newExpression != null) {

-				msgs = ((InternalEObject) newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.DECLARATION__EXPRESSION, null, msgs);

-			}

-			msgs = basicSetExpression(newExpression, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.DECLARATION__EXPRESSION, newExpression, newExpression));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isImportant()

-	{

-		return important;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setImportant(boolean newImportant)

-	{

-		boolean oldImportant = important;

-		important = newImportant;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.DECLARATION__IMPORTANT, oldImportant, important));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.DECLARATION__EXPRESSION:

-			return basicSetExpression(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.DECLARATION__PROPERTY:

-			return getProperty();

-		case CssPackage.DECLARATION__EXPRESSION:

-			return getExpression();

-		case CssPackage.DECLARATION__IMPORTANT:

-			return isImportant();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.DECLARATION__PROPERTY:

-			setProperty((String) newValue);

-			return;

-		case CssPackage.DECLARATION__EXPRESSION:

-			setExpression((Expression) newValue);

-			return;

-		case CssPackage.DECLARATION__IMPORTANT:

-			setImportant((Boolean) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.DECLARATION__PROPERTY:

-			setProperty(PROPERTY_EDEFAULT);

-			return;

-		case CssPackage.DECLARATION__EXPRESSION:

-			setExpression((Expression) null);

-			return;

-		case CssPackage.DECLARATION__IMPORTANT:

-			setImportant(IMPORTANT_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.DECLARATION__PROPERTY:

-			return PROPERTY_EDEFAULT == null ? property != null : !PROPERTY_EDEFAULT.equals(property);

-		case CssPackage.DECLARATION__EXPRESSION:

-			return expression != null;

-		case CssPackage.DECLARATION__IMPORTANT:

-			return important != IMPORTANT_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (property: ");

-		result.append(property);

-		result.append(", important: ");

-		result.append(important);

-		result.append(')');

-		return result.toString();

-	}

-

-} // DeclarationImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/EmsImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/EmsImpl.java
deleted file mode 100644
index c27629de7a1..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/EmsImpl.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ems;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Ems</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.EmsImpl#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.EmsImpl#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.EmsImpl#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class EmsImpl extends TermImpl implements Ems

-{

-	/**

-	 * The cached value of the '{@link #getOp() <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOp()

-	 * @generated

-	 * @ordered

-	 */

-	protected UnaryOperator op;

-

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String UNIT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected String unit = UNIT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected EmsImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.EMS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UnaryOperator getOp()

-	{

-		return op;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetOp(UnaryOperator newOp, NotificationChain msgs)

-	{

-		UnaryOperator oldOp = op;

-		op = newOp;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.EMS__OP, oldOp, newOp);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setOp(UnaryOperator newOp)

-	{

-		if (newOp != op)

-		{

-			NotificationChain msgs = null;

-			if (op != null) {

-				msgs = ((InternalEObject) op).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.EMS__OP, null, msgs);

-			}

-			if (newOp != null) {

-				msgs = ((InternalEObject) newOp).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.EMS__OP, null, msgs);

-			}

-			msgs = basicSetOp(newOp, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.EMS__OP, newOp, newOp));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue)

-	{

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.EMS__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getUnit()

-	{

-		return unit;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUnit(String newUnit)

-	{

-		String oldUnit = unit;

-		unit = newUnit;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.EMS__UNIT, oldUnit, unit));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EMS__OP:

-			return basicSetOp(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EMS__OP:

-			return getOp();

-		case CssPackage.EMS__VALUE:

-			return getValue();

-		case CssPackage.EMS__UNIT:

-			return getUnit();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EMS__OP:

-			setOp((UnaryOperator) newValue);

-			return;

-		case CssPackage.EMS__VALUE:

-			setValue((String) newValue);

-			return;

-		case CssPackage.EMS__UNIT:

-			setUnit((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EMS__OP:

-			setOp((UnaryOperator) null);

-			return;

-		case CssPackage.EMS__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		case CssPackage.EMS__UNIT:

-			setUnit(UNIT_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EMS__OP:

-			return op != null;

-		case CssPackage.EMS__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		case CssPackage.EMS__UNIT:

-			return UNIT_EDEFAULT == null ? unit != null : !UNIT_EDEFAULT.equals(unit);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: ");

-		result.append(value);

-		result.append(", unit: ");

-		result.append(unit);

-		result.append(')');

-		return result.toString();

-	}

-

-} // EmsImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExpressionImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExpressionImpl.java
deleted file mode 100644
index da2f033aac1..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExpressionImpl.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

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

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

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

-import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;

-import org.eclipse.papyrus.infra.gmfdiag.css.Term;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Expression</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ExpressionImpl#getTerms <em>Terms</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ExpressionImpl#getSubterms <em>Subterms</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ExpressionImpl extends MinimalEObjectImpl.Container implements Expression

-{

-	/**

-	 * The cached value of the '{@link #getTerms() <em>Terms</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getTerms()

-	 * @generated

-	 * @ordered

-	 */

-	protected Term terms;

-

-	/**

-	 * The cached value of the '{@link #getSubterms() <em>Subterms</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSubterms()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Subterm> subterms;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExpressionImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.EXPRESSION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Term getTerms()

-	{

-		return terms;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetTerms(Term newTerms, NotificationChain msgs)

-	{

-		Term oldTerms = terms;

-		terms = newTerms;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.EXPRESSION__TERMS, oldTerms, newTerms);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setTerms(Term newTerms)

-	{

-		if (newTerms != terms)

-		{

-			NotificationChain msgs = null;

-			if (terms != null) {

-				msgs = ((InternalEObject) terms).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.EXPRESSION__TERMS, null, msgs);

-			}

-			if (newTerms != null) {

-				msgs = ((InternalEObject) newTerms).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.EXPRESSION__TERMS, null, msgs);

-			}

-			msgs = basicSetTerms(newTerms, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.EXPRESSION__TERMS, newTerms, newTerms));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<Subterm> getSubterms()

-	{

-		if (subterms == null)

-		{

-			subterms = new EObjectContainmentEList<Subterm>(Subterm.class, this, CssPackage.EXPRESSION__SUBTERMS);

-		}

-		return subterms;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EXPRESSION__TERMS:

-			return basicSetTerms(null, msgs);

-		case CssPackage.EXPRESSION__SUBTERMS:

-			return ((InternalEList<?>) getSubterms()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EXPRESSION__TERMS:

-			return getTerms();

-		case CssPackage.EXPRESSION__SUBTERMS:

-			return getSubterms();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EXPRESSION__TERMS:

-			setTerms((Term) newValue);

-			return;

-		case CssPackage.EXPRESSION__SUBTERMS:

-			getSubterms().clear();

-			getSubterms().addAll((Collection<? extends Subterm>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EXPRESSION__TERMS:

-			setTerms((Term) null);

-			return;

-		case CssPackage.EXPRESSION__SUBTERMS:

-			getSubterms().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EXPRESSION__TERMS:

-			return terms != null;

-		case CssPackage.EXPRESSION__SUBTERMS:

-			return subterms != null && !subterms.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ExpressionImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExsImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExsImpl.java
deleted file mode 100644
index 08db6c7ab72..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExsImpl.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Exs;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Exs</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ExsImpl#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ExsImpl#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ExsImpl#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ExsImpl extends TermImpl implements Exs

-{

-	/**

-	 * The cached value of the '{@link #getOp() <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOp()

-	 * @generated

-	 * @ordered

-	 */

-	protected UnaryOperator op;

-

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String UNIT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected String unit = UNIT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExsImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.EXS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UnaryOperator getOp()

-	{

-		return op;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetOp(UnaryOperator newOp, NotificationChain msgs)

-	{

-		UnaryOperator oldOp = op;

-		op = newOp;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.EXS__OP, oldOp, newOp);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setOp(UnaryOperator newOp)

-	{

-		if (newOp != op)

-		{

-			NotificationChain msgs = null;

-			if (op != null) {

-				msgs = ((InternalEObject) op).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.EXS__OP, null, msgs);

-			}

-			if (newOp != null) {

-				msgs = ((InternalEObject) newOp).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.EXS__OP, null, msgs);

-			}

-			msgs = basicSetOp(newOp, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.EXS__OP, newOp, newOp));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue)

-	{

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.EXS__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getUnit()

-	{

-		return unit;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUnit(String newUnit)

-	{

-		String oldUnit = unit;

-		unit = newUnit;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.EXS__UNIT, oldUnit, unit));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EXS__OP:

-			return basicSetOp(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EXS__OP:

-			return getOp();

-		case CssPackage.EXS__VALUE:

-			return getValue();

-		case CssPackage.EXS__UNIT:

-			return getUnit();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EXS__OP:

-			setOp((UnaryOperator) newValue);

-			return;

-		case CssPackage.EXS__VALUE:

-			setValue((String) newValue);

-			return;

-		case CssPackage.EXS__UNIT:

-			setUnit((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EXS__OP:

-			setOp((UnaryOperator) null);

-			return;

-		case CssPackage.EXS__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		case CssPackage.EXS__UNIT:

-			setUnit(UNIT_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.EXS__OP:

-			return op != null;

-		case CssPackage.EXS__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		case CssPackage.EXS__UNIT:

-			return UNIT_EDEFAULT == null ? unit != null : !UNIT_EDEFAULT.equals(unit);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: ");

-		result.append(value);

-		result.append(", unit: ");

-		result.append(unit);

-		result.append(')');

-		return result.toString();

-	}

-

-} // ExsImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FrequencyImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FrequencyImpl.java
deleted file mode 100644
index e3c085d8025..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FrequencyImpl.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Frequency;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Frequency</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.FrequencyImpl#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.FrequencyImpl#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.FrequencyImpl#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class FrequencyImpl extends TermImpl implements Frequency

-{

-	/**

-	 * The cached value of the '{@link #getOp() <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOp()

-	 * @generated

-	 * @ordered

-	 */

-	protected UnaryOperator op;

-

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String UNIT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected String unit = UNIT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FrequencyImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.FREQUENCY;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UnaryOperator getOp()

-	{

-		return op;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetOp(UnaryOperator newOp, NotificationChain msgs)

-	{

-		UnaryOperator oldOp = op;

-		op = newOp;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.FREQUENCY__OP, oldOp, newOp);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setOp(UnaryOperator newOp)

-	{

-		if (newOp != op)

-		{

-			NotificationChain msgs = null;

-			if (op != null) {

-				msgs = ((InternalEObject) op).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.FREQUENCY__OP, null, msgs);

-			}

-			if (newOp != null) {

-				msgs = ((InternalEObject) newOp).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.FREQUENCY__OP, null, msgs);

-			}

-			msgs = basicSetOp(newOp, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.FREQUENCY__OP, newOp, newOp));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue)

-	{

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.FREQUENCY__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getUnit()

-	{

-		return unit;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUnit(String newUnit)

-	{

-		String oldUnit = unit;

-		unit = newUnit;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.FREQUENCY__UNIT, oldUnit, unit));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.FREQUENCY__OP:

-			return basicSetOp(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.FREQUENCY__OP:

-			return getOp();

-		case CssPackage.FREQUENCY__VALUE:

-			return getValue();

-		case CssPackage.FREQUENCY__UNIT:

-			return getUnit();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.FREQUENCY__OP:

-			setOp((UnaryOperator) newValue);

-			return;

-		case CssPackage.FREQUENCY__VALUE:

-			setValue((String) newValue);

-			return;

-		case CssPackage.FREQUENCY__UNIT:

-			setUnit((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.FREQUENCY__OP:

-			setOp((UnaryOperator) null);

-			return;

-		case CssPackage.FREQUENCY__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		case CssPackage.FREQUENCY__UNIT:

-			setUnit(UNIT_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.FREQUENCY__OP:

-			return op != null;

-		case CssPackage.FREQUENCY__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		case CssPackage.FREQUENCY__UNIT:

-			return UNIT_EDEFAULT == null ? unit != null : !UNIT_EDEFAULT.equals(unit);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: ");

-		result.append(value);

-		result.append(", unit: ");

-		result.append(unit);

-		result.append(')');

-		return result.toString();

-	}

-

-} // FrequencyImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FunctionImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FunctionImpl.java
deleted file mode 100644
index 7e70ce9b108..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FunctionImpl.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

-import org.eclipse.papyrus.infra.gmfdiag.css.Function;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Function</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.FunctionImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.FunctionImpl#getArgs <em>Args</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class FunctionImpl extends TermImpl implements Function

-{

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getArgs() <em>Args</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getArgs()

-	 * @generated

-	 * @ordered

-	 */

-	protected Expression args;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FunctionImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.FUNCTION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName()

-	{

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName)

-	{

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.FUNCTION__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Expression getArgs()

-	{

-		return args;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetArgs(Expression newArgs, NotificationChain msgs)

-	{

-		Expression oldArgs = args;

-		args = newArgs;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.FUNCTION__ARGS, oldArgs, newArgs);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setArgs(Expression newArgs)

-	{

-		if (newArgs != args)

-		{

-			NotificationChain msgs = null;

-			if (args != null) {

-				msgs = ((InternalEObject) args).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.FUNCTION__ARGS, null, msgs);

-			}

-			if (newArgs != null) {

-				msgs = ((InternalEObject) newArgs).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.FUNCTION__ARGS, null, msgs);

-			}

-			msgs = basicSetArgs(newArgs, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.FUNCTION__ARGS, newArgs, newArgs));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.FUNCTION__ARGS:

-			return basicSetArgs(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.FUNCTION__NAME:

-			return getName();

-		case CssPackage.FUNCTION__ARGS:

-			return getArgs();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.FUNCTION__NAME:

-			setName((String) newValue);

-			return;

-		case CssPackage.FUNCTION__ARGS:

-			setArgs((Expression) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.FUNCTION__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		case CssPackage.FUNCTION__ARGS:

-			setArgs((Expression) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.FUNCTION__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		case CssPackage.FUNCTION__ARGS:

-			return args != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-

-} // FunctionImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/HexColorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/HexColorImpl.java
deleted file mode 100644
index f7687531cee..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/HexColorImpl.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.HexColor;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Hex Color</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.HexColorImpl#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class HexColorImpl extends TermImpl implements HexColor

-{

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected HexColorImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.HEX_COLOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue)

-	{

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.HEX_COLOR__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.HEX_COLOR__VALUE:

-			return getValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.HEX_COLOR__VALUE:

-			setValue((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.HEX_COLOR__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.HEX_COLOR__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: ");

-		result.append(value);

-		result.append(')');

-		return result.toString();

-	}

-

-} // HexColorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ImportImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ImportImpl.java
deleted file mode 100644
index 1b283a77709..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ImportImpl.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

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

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Import;

-import org.eclipse.papyrus.infra.gmfdiag.css.Uri;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Import</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ImportImpl#getString <em>String</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ImportImpl#getUri <em>Uri</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ImportImpl#getMedia <em>Media</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ImportImpl extends MinimalEObjectImpl.Container implements Import

-{

-	/**

-	 * The default value of the '{@link #getString() <em>String</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getString()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String STRING_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getString() <em>String</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getString()

-	 * @generated

-	 * @ordered

-	 */

-	protected String string = STRING_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getUri() <em>Uri</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUri()

-	 * @generated

-	 * @ordered

-	 */

-	protected Uri uri;

-

-	/**

-	 * The cached value of the '{@link #getMedia() <em>Media</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getMedia()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> media;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ImportImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.IMPORT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getString()

-	{

-		return string;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setString(String newString)

-	{

-		String oldString = string;

-		string = newString;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.IMPORT__STRING, oldString, string));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Uri getUri()

-	{

-		return uri;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetUri(Uri newUri, NotificationChain msgs)

-	{

-		Uri oldUri = uri;

-		uri = newUri;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.IMPORT__URI, oldUri, newUri);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUri(Uri newUri)

-	{

-		if (newUri != uri)

-		{

-			NotificationChain msgs = null;

-			if (uri != null) {

-				msgs = ((InternalEObject) uri).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.IMPORT__URI, null, msgs);

-			}

-			if (newUri != null) {

-				msgs = ((InternalEObject) newUri).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.IMPORT__URI, null, msgs);

-			}

-			msgs = basicSetUri(newUri, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.IMPORT__URI, newUri, newUri));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<String> getMedia()

-	{

-		if (media == null)

-		{

-			media = new EDataTypeEList<String>(String.class, this, CssPackage.IMPORT__MEDIA);

-		}

-		return media;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.IMPORT__URI:

-			return basicSetUri(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.IMPORT__STRING:

-			return getString();

-		case CssPackage.IMPORT__URI:

-			return getUri();

-		case CssPackage.IMPORT__MEDIA:

-			return getMedia();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.IMPORT__STRING:

-			setString((String) newValue);

-			return;

-		case CssPackage.IMPORT__URI:

-			setUri((Uri) newValue);

-			return;

-		case CssPackage.IMPORT__MEDIA:

-			getMedia().clear();

-			getMedia().addAll((Collection<? extends String>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.IMPORT__STRING:

-			setString(STRING_EDEFAULT);

-			return;

-		case CssPackage.IMPORT__URI:

-			setUri((Uri) null);

-			return;

-		case CssPackage.IMPORT__MEDIA:

-			getMedia().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.IMPORT__STRING:

-			return STRING_EDEFAULT == null ? string != null : !STRING_EDEFAULT.equals(string);

-		case CssPackage.IMPORT__URI:

-			return uri != null;

-		case CssPackage.IMPORT__MEDIA:

-			return media != null && !media.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (string: ");

-		result.append(string);

-		result.append(", media: ");

-		result.append(media);

-		result.append(')');

-		return result.toString();

-	}

-

-} // ImportImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/LengthImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/LengthImpl.java
deleted file mode 100644
index e068121b045..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/LengthImpl.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Length;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Length</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.LengthImpl#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.LengthImpl#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.LengthImpl#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class LengthImpl extends TermImpl implements Length

-{

-	/**

-	 * The cached value of the '{@link #getOp() <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOp()

-	 * @generated

-	 * @ordered

-	 */

-	protected UnaryOperator op;

-

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String UNIT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected String unit = UNIT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected LengthImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.LENGTH;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UnaryOperator getOp()

-	{

-		return op;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetOp(UnaryOperator newOp, NotificationChain msgs)

-	{

-		UnaryOperator oldOp = op;

-		op = newOp;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.LENGTH__OP, oldOp, newOp);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setOp(UnaryOperator newOp)

-	{

-		if (newOp != op)

-		{

-			NotificationChain msgs = null;

-			if (op != null) {

-				msgs = ((InternalEObject) op).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.LENGTH__OP, null, msgs);

-			}

-			if (newOp != null) {

-				msgs = ((InternalEObject) newOp).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.LENGTH__OP, null, msgs);

-			}

-			msgs = basicSetOp(newOp, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.LENGTH__OP, newOp, newOp));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue)

-	{

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.LENGTH__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getUnit()

-	{

-		return unit;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUnit(String newUnit)

-	{

-		String oldUnit = unit;

-		unit = newUnit;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.LENGTH__UNIT, oldUnit, unit));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.LENGTH__OP:

-			return basicSetOp(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.LENGTH__OP:

-			return getOp();

-		case CssPackage.LENGTH__VALUE:

-			return getValue();

-		case CssPackage.LENGTH__UNIT:

-			return getUnit();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.LENGTH__OP:

-			setOp((UnaryOperator) newValue);

-			return;

-		case CssPackage.LENGTH__VALUE:

-			setValue((String) newValue);

-			return;

-		case CssPackage.LENGTH__UNIT:

-			setUnit((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.LENGTH__OP:

-			setOp((UnaryOperator) null);

-			return;

-		case CssPackage.LENGTH__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		case CssPackage.LENGTH__UNIT:

-			setUnit(UNIT_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.LENGTH__OP:

-			return op != null;

-		case CssPackage.LENGTH__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		case CssPackage.LENGTH__UNIT:

-			return UNIT_EDEFAULT == null ? unit != null : !UNIT_EDEFAULT.equals(unit);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: ");

-		result.append(value);

-		result.append(", unit: ");

-		result.append(unit);

-		result.append(')');

-		return result.toString();

-	}

-

-} // LengthImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/MediaImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/MediaImpl.java
deleted file mode 100644
index 41e5fe04d15..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/MediaImpl.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Media;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Media</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.MediaImpl#getMedia <em>Media</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.MediaImpl#getRules <em>Rules</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class MediaImpl extends ContentImpl implements Media

-{

-	/**

-	 * The cached value of the '{@link #getMedia() <em>Media</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getMedia()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> media;

-

-	/**

-	 * The cached value of the '{@link #getRules() <em>Rules</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRules()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Ruleset> rules;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected MediaImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.MEDIA;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<String> getMedia()

-	{

-		if (media == null)

-		{

-			media = new EDataTypeEList<String>(String.class, this, CssPackage.MEDIA__MEDIA);

-		}

-		return media;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<Ruleset> getRules()

-	{

-		if (rules == null)

-		{

-			rules = new EObjectContainmentEList<Ruleset>(Ruleset.class, this, CssPackage.MEDIA__RULES);

-		}

-		return rules;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.MEDIA__RULES:

-			return ((InternalEList<?>) getRules()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.MEDIA__MEDIA:

-			return getMedia();

-		case CssPackage.MEDIA__RULES:

-			return getRules();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.MEDIA__MEDIA:

-			getMedia().clear();

-			getMedia().addAll((Collection<? extends String>) newValue);

-			return;

-		case CssPackage.MEDIA__RULES:

-			getRules().clear();

-			getRules().addAll((Collection<? extends Ruleset>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.MEDIA__MEDIA:

-			getMedia().clear();

-			return;

-		case CssPackage.MEDIA__RULES:

-			getRules().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.MEDIA__MEDIA:

-			return media != null && !media.isEmpty();

-		case CssPackage.MEDIA__RULES:

-			return rules != null && !rules.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (media: ");

-		result.append(media);

-		result.append(')');

-		return result.toString();

-	}

-

-} // MediaImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NumberImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NumberImpl.java
deleted file mode 100644
index 79f10e3cd03..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NumberImpl.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Number</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.NumberImpl#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.NumberImpl#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class NumberImpl extends TermImpl implements org.eclipse.papyrus.infra.gmfdiag.css.Number

-{

-	/**

-	 * The cached value of the '{@link #getOp() <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOp()

-	 * @generated

-	 * @ordered

-	 */

-	protected UnaryOperator op;

-

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected NumberImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.NUMBER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UnaryOperator getOp()

-	{

-		return op;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetOp(UnaryOperator newOp, NotificationChain msgs)

-	{

-		UnaryOperator oldOp = op;

-		op = newOp;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.NUMBER__OP, oldOp, newOp);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setOp(UnaryOperator newOp)

-	{

-		if (newOp != op)

-		{

-			NotificationChain msgs = null;

-			if (op != null) {

-				msgs = ((InternalEObject) op).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.NUMBER__OP, null, msgs);

-			}

-			if (newOp != null) {

-				msgs = ((InternalEObject) newOp).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.NUMBER__OP, null, msgs);

-			}

-			msgs = basicSetOp(newOp, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.NUMBER__OP, newOp, newOp));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue)

-	{

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.NUMBER__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.NUMBER__OP:

-			return basicSetOp(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.NUMBER__OP:

-			return getOp();

-		case CssPackage.NUMBER__VALUE:

-			return getValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.NUMBER__OP:

-			setOp((UnaryOperator) newValue);

-			return;

-		case CssPackage.NUMBER__VALUE:

-			setValue((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.NUMBER__OP:

-			setOp((UnaryOperator) null);

-			return;

-		case CssPackage.NUMBER__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.NUMBER__OP:

-			return op != null;

-		case CssPackage.NUMBER__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: ");

-		result.append(value);

-		result.append(')');

-		return result.toString();

-	}

-

-} // NumberImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PageImpl.java
deleted file mode 100644
index 27277dc43e6..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PageImpl.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

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

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

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css.Page;

-import org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Page</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PageImpl#getPseudo <em>Pseudo</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PageImpl#getDeclarations <em>Declarations</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class PageImpl extends ContentImpl implements Page

-{

-	/**

-	 * The cached value of the '{@link #getPseudo() <em>Pseudo</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getPseudo()

-	 * @generated

-	 * @ordered

-	 */

-	protected PseudoPage pseudo;

-

-	/**

-	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDeclarations()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Declaration> declarations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected PageImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.PAGE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public PseudoPage getPseudo()

-	{

-		return pseudo;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetPseudo(PseudoPage newPseudo, NotificationChain msgs)

-	{

-		PseudoPage oldPseudo = pseudo;

-		pseudo = newPseudo;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.PAGE__PSEUDO, oldPseudo, newPseudo);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setPseudo(PseudoPage newPseudo)

-	{

-		if (newPseudo != pseudo)

-		{

-			NotificationChain msgs = null;

-			if (pseudo != null) {

-				msgs = ((InternalEObject) pseudo).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.PAGE__PSEUDO, null, msgs);

-			}

-			if (newPseudo != null) {

-				msgs = ((InternalEObject) newPseudo).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.PAGE__PSEUDO, null, msgs);

-			}

-			msgs = basicSetPseudo(newPseudo, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.PAGE__PSEUDO, newPseudo, newPseudo));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<Declaration> getDeclarations()

-	{

-		if (declarations == null)

-		{

-			declarations = new EObjectContainmentEList<Declaration>(Declaration.class, this, CssPackage.PAGE__DECLARATIONS);

-		}

-		return declarations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PAGE__PSEUDO:

-			return basicSetPseudo(null, msgs);

-		case CssPackage.PAGE__DECLARATIONS:

-			return ((InternalEList<?>) getDeclarations()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PAGE__PSEUDO:

-			return getPseudo();

-		case CssPackage.PAGE__DECLARATIONS:

-			return getDeclarations();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PAGE__PSEUDO:

-			setPseudo((PseudoPage) newValue);

-			return;

-		case CssPackage.PAGE__DECLARATIONS:

-			getDeclarations().clear();

-			getDeclarations().addAll((Collection<? extends Declaration>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PAGE__PSEUDO:

-			setPseudo((PseudoPage) null);

-			return;

-		case CssPackage.PAGE__DECLARATIONS:

-			getDeclarations().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PAGE__PSEUDO:

-			return pseudo != null;

-		case CssPackage.PAGE__DECLARATIONS:

-			return declarations != null && !declarations.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // PageImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PercentageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PercentageImpl.java
deleted file mode 100644
index 0e5bc6ce467..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PercentageImpl.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Percentage;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Percentage</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PercentageImpl#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PercentageImpl#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PercentageImpl#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class PercentageImpl extends TermImpl implements Percentage

-{

-	/**

-	 * The cached value of the '{@link #getOp() <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOp()

-	 * @generated

-	 * @ordered

-	 */

-	protected UnaryOperator op;

-

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String UNIT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected String unit = UNIT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected PercentageImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.PERCENTAGE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UnaryOperator getOp()

-	{

-		return op;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetOp(UnaryOperator newOp, NotificationChain msgs)

-	{

-		UnaryOperator oldOp = op;

-		op = newOp;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.PERCENTAGE__OP, oldOp, newOp);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setOp(UnaryOperator newOp)

-	{

-		if (newOp != op)

-		{

-			NotificationChain msgs = null;

-			if (op != null) {

-				msgs = ((InternalEObject) op).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.PERCENTAGE__OP, null, msgs);

-			}

-			if (newOp != null) {

-				msgs = ((InternalEObject) newOp).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.PERCENTAGE__OP, null, msgs);

-			}

-			msgs = basicSetOp(newOp, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.PERCENTAGE__OP, newOp, newOp));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue)

-	{

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.PERCENTAGE__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getUnit()

-	{

-		return unit;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUnit(String newUnit)

-	{

-		String oldUnit = unit;

-		unit = newUnit;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.PERCENTAGE__UNIT, oldUnit, unit));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PERCENTAGE__OP:

-			return basicSetOp(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PERCENTAGE__OP:

-			return getOp();

-		case CssPackage.PERCENTAGE__VALUE:

-			return getValue();

-		case CssPackage.PERCENTAGE__UNIT:

-			return getUnit();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PERCENTAGE__OP:

-			setOp((UnaryOperator) newValue);

-			return;

-		case CssPackage.PERCENTAGE__VALUE:

-			setValue((String) newValue);

-			return;

-		case CssPackage.PERCENTAGE__UNIT:

-			setUnit((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PERCENTAGE__OP:

-			setOp((UnaryOperator) null);

-			return;

-		case CssPackage.PERCENTAGE__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		case CssPackage.PERCENTAGE__UNIT:

-			setUnit(UNIT_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PERCENTAGE__OP:

-			return op != null;

-		case CssPackage.PERCENTAGE__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		case CssPackage.PERCENTAGE__UNIT:

-			return UNIT_EDEFAULT == null ? unit != null : !UNIT_EDEFAULT.equals(unit);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: ");

-		result.append(value);

-		result.append(", unit: ");

-		result.append(unit);

-		result.append(')');

-		return result.toString();

-	}

-

-} // PercentageImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoImpl.java
deleted file mode 100644
index a49f231a5b7..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoImpl.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Pseudo;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Pseudo</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PseudoImpl#getPseudo <em>Pseudo</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PseudoImpl#getArgs <em>Args</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class PseudoImpl extends SelectorConditionImpl implements Pseudo

-{

-	/**

-	 * The default value of the '{@link #getPseudo() <em>Pseudo</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getPseudo()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String PSEUDO_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getPseudo() <em>Pseudo</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getPseudo()

-	 * @generated

-	 * @ordered

-	 */

-	protected String pseudo = PSEUDO_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getArgs() <em>Args</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getArgs()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ARGS_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getArgs() <em>Args</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getArgs()

-	 * @generated

-	 * @ordered

-	 */

-	protected String args = ARGS_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected PseudoImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.PSEUDO;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getPseudo()

-	{

-		return pseudo;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setPseudo(String newPseudo)

-	{

-		String oldPseudo = pseudo;

-		pseudo = newPseudo;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.PSEUDO__PSEUDO, oldPseudo, pseudo));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getArgs()

-	{

-		return args;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setArgs(String newArgs)

-	{

-		String oldArgs = args;

-		args = newArgs;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.PSEUDO__ARGS, oldArgs, args));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PSEUDO__PSEUDO:

-			return getPseudo();

-		case CssPackage.PSEUDO__ARGS:

-			return getArgs();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PSEUDO__PSEUDO:

-			setPseudo((String) newValue);

-			return;

-		case CssPackage.PSEUDO__ARGS:

-			setArgs((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PSEUDO__PSEUDO:

-			setPseudo(PSEUDO_EDEFAULT);

-			return;

-		case CssPackage.PSEUDO__ARGS:

-			setArgs(ARGS_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.PSEUDO__PSEUDO:

-			return PSEUDO_EDEFAULT == null ? pseudo != null : !PSEUDO_EDEFAULT.equals(pseudo);

-		case CssPackage.PSEUDO__ARGS:

-			return ARGS_EDEFAULT == null ? args != null : !ARGS_EDEFAULT.equals(args);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (pseudo: ");

-		result.append(pseudo);

-		result.append(", args: ");

-		result.append(args);

-		result.append(')');

-		return result.toString();

-	}

-

-} // PseudoImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/RulesetImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/RulesetImpl.java
deleted file mode 100644
index 04b0407571c..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/RulesetImpl.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

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

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

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

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css.Selector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Ruleset</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.RulesetImpl#getSelectors <em>Selectors</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.RulesetImpl#getProperties <em>Properties</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class RulesetImpl extends ContentImpl implements Ruleset

-{

-	/**

-	 * The cached value of the '{@link #getSelectors() <em>Selectors</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSelectors()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Selector> selectors;

-

-	/**

-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getProperties()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Declaration> properties;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected RulesetImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.RULESET;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<Selector> getSelectors()

-	{

-		if (selectors == null)

-		{

-			selectors = new EObjectContainmentEList<Selector>(Selector.class, this, CssPackage.RULESET__SELECTORS);

-		}

-		return selectors;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<Declaration> getProperties()

-	{

-		if (properties == null)

-		{

-			properties = new EObjectContainmentEList<Declaration>(Declaration.class, this, CssPackage.RULESET__PROPERTIES);

-		}

-		return properties;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.RULESET__SELECTORS:

-			return ((InternalEList<?>) getSelectors()).basicRemove(otherEnd, msgs);

-		case CssPackage.RULESET__PROPERTIES:

-			return ((InternalEList<?>) getProperties()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.RULESET__SELECTORS:

-			return getSelectors();

-		case CssPackage.RULESET__PROPERTIES:

-			return getProperties();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.RULESET__SELECTORS:

-			getSelectors().clear();

-			getSelectors().addAll((Collection<? extends Selector>) newValue);

-			return;

-		case CssPackage.RULESET__PROPERTIES:

-			getProperties().clear();

-			getProperties().addAll((Collection<? extends Declaration>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.RULESET__SELECTORS:

-			getSelectors().clear();

-			return;

-		case CssPackage.RULESET__PROPERTIES:

-			getProperties().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.RULESET__SELECTORS:

-			return selectors != null && !selectors.isEmpty();

-		case CssPackage.RULESET__PROPERTIES:

-			return properties != null && !properties.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // RulesetImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorConditionImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorConditionImpl.java
deleted file mode 100644
index b82b5995fbc..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorConditionImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

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

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Selector Condition</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class SelectorConditionImpl extends MinimalEObjectImpl.Container implements SelectorCondition

-{

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SelectorConditionImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.SELECTOR_CONDITION;

-	}

-

-} // SelectorConditionImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorImpl.java
deleted file mode 100644
index 55cbc9299d7..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

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

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Selector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Selector</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class SelectorImpl extends MinimalEObjectImpl.Container implements Selector

-{

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SelectorImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.SELECTOR;

-	}

-

-} // SelectorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SimpleSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SimpleSelectorImpl.java
deleted file mode 100644
index b7f22dfe68f..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SimpleSelectorImpl.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

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

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

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;

-import org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Simple Selector</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.SimpleSelectorImpl#getElementName <em>Element Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.SimpleSelectorImpl#getCondition <em>Condition</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class SimpleSelectorImpl extends SelectorImpl implements SimpleSelector

-{

-	/**

-	 * The default value of the '{@link #getElementName() <em>Element Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getElementName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ELEMENT_NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getElementName() <em>Element Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getElementName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String elementName = ELEMENT_NAME_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getCondition()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<SelectorCondition> condition;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SimpleSelectorImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.SIMPLE_SELECTOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getElementName()

-	{

-		return elementName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setElementName(String newElementName)

-	{

-		String oldElementName = elementName;

-		elementName = newElementName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.SIMPLE_SELECTOR__ELEMENT_NAME, oldElementName, elementName));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<SelectorCondition> getCondition()

-	{

-		if (condition == null)

-		{

-			condition = new EObjectContainmentEList<SelectorCondition>(SelectorCondition.class, this, CssPackage.SIMPLE_SELECTOR__CONDITION);

-		}

-		return condition;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.SIMPLE_SELECTOR__CONDITION:

-			return ((InternalEList<?>) getCondition()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.SIMPLE_SELECTOR__ELEMENT_NAME:

-			return getElementName();

-		case CssPackage.SIMPLE_SELECTOR__CONDITION:

-			return getCondition();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.SIMPLE_SELECTOR__ELEMENT_NAME:

-			setElementName((String) newValue);

-			return;

-		case CssPackage.SIMPLE_SELECTOR__CONDITION:

-			getCondition().clear();

-			getCondition().addAll((Collection<? extends SelectorCondition>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.SIMPLE_SELECTOR__ELEMENT_NAME:

-			setElementName(ELEMENT_NAME_EDEFAULT);

-			return;

-		case CssPackage.SIMPLE_SELECTOR__CONDITION:

-			getCondition().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.SIMPLE_SELECTOR__ELEMENT_NAME:

-			return ELEMENT_NAME_EDEFAULT == null ? elementName != null : !ELEMENT_NAME_EDEFAULT.equals(elementName);

-		case CssPackage.SIMPLE_SELECTOR__CONDITION:

-			return condition != null && !condition.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (elementName: ");

-		result.append(elementName);

-		result.append(')');

-		return result.toString();

-	}

-

-} // SimpleSelectorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StringValueImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StringValueImpl.java
deleted file mode 100644
index 49ef0c74de0..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StringValueImpl.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.StringValue;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>String Value</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.StringValueImpl#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class StringValueImpl extends TermImpl implements StringValue

-{

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected StringValueImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.STRING_VALUE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue)

-	{

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.STRING_VALUE__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.STRING_VALUE__VALUE:

-			return getValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.STRING_VALUE__VALUE:

-			setValue((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.STRING_VALUE__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.STRING_VALUE__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: ");

-		result.append(value);

-		result.append(')');

-		return result.toString();

-	}

-

-} // StringValueImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StylesheetImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StylesheetImpl.java
deleted file mode 100644
index 90bf961051e..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StylesheetImpl.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

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

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

-import org.eclipse.papyrus.infra.gmfdiag.css.Content;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Import;

-import org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Stylesheet</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.StylesheetImpl#getCharset <em>Charset</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.StylesheetImpl#getImports <em>Imports</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.StylesheetImpl#getContents <em>Contents</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class StylesheetImpl extends MinimalEObjectImpl.Container implements Stylesheet

-{

-	/**

-	 * The default value of the '{@link #getCharset() <em>Charset</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getCharset()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String CHARSET_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getCharset() <em>Charset</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getCharset()

-	 * @generated

-	 * @ordered

-	 */

-	protected String charset = CHARSET_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getImports() <em>Imports</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getImports()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Import> imports;

-

-	/**

-	 * The cached value of the '{@link #getContents() <em>Contents</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getContents()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Content> contents;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected StylesheetImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.STYLESHEET;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getCharset()

-	{

-		return charset;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setCharset(String newCharset)

-	{

-		String oldCharset = charset;

-		charset = newCharset;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.STYLESHEET__CHARSET, oldCharset, charset));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<Import> getImports()

-	{

-		if (imports == null)

-		{

-			imports = new EObjectContainmentEList<Import>(Import.class, this, CssPackage.STYLESHEET__IMPORTS);

-		}

-		return imports;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<Content> getContents()

-	{

-		if (contents == null)

-		{

-			contents = new EObjectContainmentEList<Content>(Content.class, this, CssPackage.STYLESHEET__CONTENTS);

-		}

-		return contents;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.STYLESHEET__IMPORTS:

-			return ((InternalEList<?>) getImports()).basicRemove(otherEnd, msgs);

-		case CssPackage.STYLESHEET__CONTENTS:

-			return ((InternalEList<?>) getContents()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.STYLESHEET__CHARSET:

-			return getCharset();

-		case CssPackage.STYLESHEET__IMPORTS:

-			return getImports();

-		case CssPackage.STYLESHEET__CONTENTS:

-			return getContents();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.STYLESHEET__CHARSET:

-			setCharset((String) newValue);

-			return;

-		case CssPackage.STYLESHEET__IMPORTS:

-			getImports().clear();

-			getImports().addAll((Collection<? extends Import>) newValue);

-			return;

-		case CssPackage.STYLESHEET__CONTENTS:

-			getContents().clear();

-			getContents().addAll((Collection<? extends Content>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.STYLESHEET__CHARSET:

-			setCharset(CHARSET_EDEFAULT);

-			return;

-		case CssPackage.STYLESHEET__IMPORTS:

-			getImports().clear();

-			return;

-		case CssPackage.STYLESHEET__CONTENTS:

-			getContents().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.STYLESHEET__CHARSET:

-			return CHARSET_EDEFAULT == null ? charset != null : !CHARSET_EDEFAULT.equals(charset);

-		case CssPackage.STYLESHEET__IMPORTS:

-			return imports != null && !imports.isEmpty();

-		case CssPackage.STYLESHEET__CONTENTS:

-			return contents != null && !contents.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (charset: ");

-		result.append(charset);

-		result.append(')');

-		return result.toString();

-	}

-

-} // StylesheetImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SubtermImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SubtermImpl.java
deleted file mode 100644
index f9b6e46d850..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SubtermImpl.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;

-import org.eclipse.papyrus.infra.gmfdiag.css.Term;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Subterm</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.SubtermImpl#getOperator <em>Operator</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.SubtermImpl#getTerm <em>Term</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class SubtermImpl extends MinimalEObjectImpl.Container implements Subterm

-{

-	/**

-	 * The default value of the '{@link #getOperator() <em>Operator</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOperator()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String OPERATOR_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOperator()

-	 * @generated

-	 * @ordered

-	 */

-	protected String operator = OPERATOR_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getTerm() <em>Term</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getTerm()

-	 * @generated

-	 * @ordered

-	 */

-	protected Term term;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SubtermImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.SUBTERM;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getOperator()

-	{

-		return operator;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setOperator(String newOperator)

-	{

-		String oldOperator = operator;

-		operator = newOperator;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.SUBTERM__OPERATOR, oldOperator, operator));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Term getTerm()

-	{

-		return term;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetTerm(Term newTerm, NotificationChain msgs)

-	{

-		Term oldTerm = term;

-		term = newTerm;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.SUBTERM__TERM, oldTerm, newTerm);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setTerm(Term newTerm)

-	{

-		if (newTerm != term)

-		{

-			NotificationChain msgs = null;

-			if (term != null) {

-				msgs = ((InternalEObject) term).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.SUBTERM__TERM, null, msgs);

-			}

-			if (newTerm != null) {

-				msgs = ((InternalEObject) newTerm).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.SUBTERM__TERM, null, msgs);

-			}

-			msgs = basicSetTerm(newTerm, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.SUBTERM__TERM, newTerm, newTerm));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.SUBTERM__TERM:

-			return basicSetTerm(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.SUBTERM__OPERATOR:

-			return getOperator();

-		case CssPackage.SUBTERM__TERM:

-			return getTerm();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.SUBTERM__OPERATOR:

-			setOperator((String) newValue);

-			return;

-		case CssPackage.SUBTERM__TERM:

-			setTerm((Term) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.SUBTERM__OPERATOR:

-			setOperator(OPERATOR_EDEFAULT);

-			return;

-		case CssPackage.SUBTERM__TERM:

-			setTerm((Term) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.SUBTERM__OPERATOR:

-			return OPERATOR_EDEFAULT == null ? operator != null : !OPERATOR_EDEFAULT.equals(operator);

-		case CssPackage.SUBTERM__TERM:

-			return term != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (operator: ");

-		result.append(operator);

-		result.append(')');

-		return result.toString();

-	}

-

-} // SubtermImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TermImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TermImpl.java
deleted file mode 100644
index 1d6ac5aa39e..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TermImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

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

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Term;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Term</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class TermImpl extends MinimalEObjectImpl.Container implements Term

-{

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TermImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.TERM;

-	}

-

-} // TermImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TimeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TimeImpl.java
deleted file mode 100644
index 4131d0fed6d..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TimeImpl.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Time;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Time</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.TimeImpl#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.TimeImpl#getValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.TimeImpl#getUnit <em>Unit</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class TimeImpl extends TermImpl implements Time

-{

-	/**

-	 * The cached value of the '{@link #getOp() <em>Op</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOp()

-	 * @generated

-	 * @ordered

-	 */

-	protected UnaryOperator op;

-

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String UNIT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getUnit() <em>Unit</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected String unit = UNIT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TimeImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.TIME;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UnaryOperator getOp()

-	{

-		return op;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetOp(UnaryOperator newOp, NotificationChain msgs)

-	{

-		UnaryOperator oldOp = op;

-		op = newOp;

-		if (eNotificationRequired())

-		{

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CssPackage.TIME__OP, oldOp, newOp);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setOp(UnaryOperator newOp)

-	{

-		if (newOp != op)

-		{

-			NotificationChain msgs = null;

-			if (op != null) {

-				msgs = ((InternalEObject) op).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CssPackage.TIME__OP, null, msgs);

-			}

-			if (newOp != null) {

-				msgs = ((InternalEObject) newOp).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CssPackage.TIME__OP, null, msgs);

-			}

-			msgs = basicSetOp(newOp, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.TIME__OP, newOp, newOp));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue()

-	{

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue)

-	{

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.TIME__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getUnit()

-	{

-		return unit;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUnit(String newUnit)

-	{

-		String oldUnit = unit;

-		unit = newUnit;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.TIME__UNIT, oldUnit, unit));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-	{

-		switch (featureID)

-		{

-		case CssPackage.TIME__OP:

-			return basicSetOp(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.TIME__OP:

-			return getOp();

-		case CssPackage.TIME__VALUE:

-			return getValue();

-		case CssPackage.TIME__UNIT:

-			return getUnit();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.TIME__OP:

-			setOp((UnaryOperator) newValue);

-			return;

-		case CssPackage.TIME__VALUE:

-			setValue((String) newValue);

-			return;

-		case CssPackage.TIME__UNIT:

-			setUnit((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.TIME__OP:

-			setOp((UnaryOperator) null);

-			return;

-		case CssPackage.TIME__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		case CssPackage.TIME__UNIT:

-			setUnit(UNIT_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.TIME__OP:

-			return op != null;

-		case CssPackage.TIME__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		case CssPackage.TIME__UNIT:

-			return UNIT_EDEFAULT == null ? unit != null : !UNIT_EDEFAULT.equals(unit);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: ");

-		result.append(value);

-		result.append(", unit: ");

-		result.append(unit);

-		result.append(')');

-		return result.toString();

-	}

-

-} // TimeImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UnaryOperatorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UnaryOperatorImpl.java
deleted file mode 100644
index 7de1a3f1008..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UnaryOperatorImpl.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

-

-import org.eclipse.emf.common.notify.Notification;

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.UNARY;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Unary Operator</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.UnaryOperatorImpl#getOperator <em>Operator</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class UnaryOperatorImpl extends MinimalEObjectImpl.Container implements UnaryOperator

-{

-	/**

-	 * The default value of the '{@link #getOperator() <em>Operator</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOperator()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final UNARY OPERATOR_EDEFAULT = UNARY.NEG;

-

-	/**

-	 * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOperator()

-	 * @generated

-	 * @ordered

-	 */

-	protected UNARY operator = OPERATOR_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected UnaryOperatorImpl()

-	{

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass()

-	{

-		return CssPackage.Literals.UNARY_OPERATOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UNARY getOperator()

-	{

-		return operator;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setOperator(UNARY newOperator)

-	{

-		UNARY oldOperator = operator;

-		operator = newOperator == null ? OPERATOR_EDEFAULT : newOperator;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.UNARY_OPERATOR__OPERATOR, oldOperator, operator));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType)

-	{

-		switch (featureID)

-		{

-		case CssPackage.UNARY_OPERATOR__OPERATOR:

-			return getOperator();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue)

-	{

-		switch (featureID)

-		{

-		case CssPackage.UNARY_OPERATOR__OPERATOR:

-			setOperator((UNARY) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.UNARY_OPERATOR__OPERATOR:

-			setOperator(OPERATOR_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID)

-	{

-		switch (featureID)

-		{

-		case CssPackage.UNARY_OPERATOR__OPERATOR:

-			return operator != OPERATOR_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString()

-	{

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (operator: ");

-		result.append(operator);

-		result.append(')');

-		return result.toString();

-	}

-

-} // UnaryOperatorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSAntlrTokenFileProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSAntlrTokenFileProvider.java
deleted file mode 100644
index 705b5723d0c..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSAntlrTokenFileProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.parser.antlr;
-
-import java.io.InputStream;
-
-import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
-
-public class CSSAntlrTokenFileProvider implements IAntlrTokenFileProvider {
-
-	@Override
-	public InputStream getAntlrTokenFile() {
-		ClassLoader classLoader = getClass().getClassLoader();
-		return classLoader.getResourceAsStream("org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.tokens");
-	}
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSParser.java
deleted file mode 100644
index 3b4654909d1..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSParser.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.parser.antlr;
-
-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
-
-import com.google.inject.Inject;
-
-public class CSSParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
-
-	@Inject
-	private CSSGrammarAccess grammarAccess;
-
-	@Override
-	protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {
-		tokenStream.setInitialHiddenTokens("RULE_ML_COMMENT");
-	}
-
-	@Override
-	protected org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal.InternalCSSParser createParser(XtextTokenStream stream) {
-		return new org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal.InternalCSSParser(stream, getGrammarAccess());
-	}
-
-	@Override
-	protected String getDefaultRuleName() {
-		return "Stylesheet";
-	}
-
-	public CSSGrammarAccess getGrammarAccess() {
-		return this.grammarAccess;
-	}
-
-	public void setGrammarAccess(CSSGrammarAccess grammarAccess) {
-		this.grammarAccess = grammarAccess;
-	}
-
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g
deleted file mode 100644
index cb56e470c58..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g
+++ /dev/null
@@ -1,2794 +0,0 @@
-/*
-* generated by Xtext
-*/
-grammar InternalCSS;
-
-options {
-	superClass=AbstractInternalAntlrParser;
-	
-}
-
-@lexer::header {
-package org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal;
-
-// Hack: Use our own Lexer superclass by means of import. 
-// Currently there is no other way to specify the superclass for the lexer.
-import org.eclipse.xtext.parser.antlr.Lexer;
-}
-
-@parser::header {
-package org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal; 
-
-import org.eclipse.xtext.*;
-import org.eclipse.xtext.parser.*;
-import org.eclipse.xtext.parser.impl.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
-import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
-
-}
-
-@parser::members {
-
- 	private CSSGrammarAccess grammarAccess;
- 	
-    public InternalCSSParser(TokenStream input, CSSGrammarAccess grammarAccess) {
-        this(input);
-        this.grammarAccess = grammarAccess;
-        registerRules(grammarAccess.getGrammar());
-    }
-    
-    @Override
-    protected String getFirstRuleName() {
-    	return "Stylesheet";	
-   	}
-   	
-   	@Override
-   	protected CSSGrammarAccess getGrammarAccess() {
-   		return grammarAccess;
-   	}
-}
-
-@rulecatch { 
-    catch (RecognitionException re) { 
-        recover(input,re); 
-        appendSkippedTokens();
-    } 
-}
-
-
-
-
-// Entry rule entryRuleStylesheet
-entryRuleStylesheet returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getStylesheetRule()); }
-	 iv_ruleStylesheet=ruleStylesheet 
-	 { $current=$iv_ruleStylesheet.current; } 
-	 EOF 
-;
-
-// Rule Stylesheet
-ruleStylesheet returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((	otherlv_0='@charset ' 
-    {
-    	newLeafNode(otherlv_0, grammarAccess.getStylesheetAccess().getCharsetKeyword_0_0());
-    }
-(
-(
-		lv_charset_1_0=RULE_STRING
-		{
-			newLeafNode(lv_charset_1_0, grammarAccess.getStylesheetAccess().getCharsetSTRINGTerminalRuleCall_0_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getStylesheetRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"charset",
-        		lv_charset_1_0, 
-        		"STRING");
-	    }
-
-)
-)	otherlv_2=';' 
-    {
-    	newLeafNode(otherlv_2, grammarAccess.getStylesheetAccess().getSemicolonKeyword_0_2());
-    }
-)?(this_WS_3=RULE_WS
-    { 
-    newLeafNode(this_WS_3, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_1_0()); 
-    }
-
-    |this_CDO_4=RULE_CDO
-    { 
-    newLeafNode(this_CDO_4, grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_1_1()); 
-    }
-
-    |this_CDC_5=RULE_CDC
-    { 
-    newLeafNode(this_CDC_5, grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_1_2()); 
-    }
-)*((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getStylesheetAccess().getImportsImportParserRuleCall_2_0_0()); 
-	    }
-		lv_imports_6_0=ruleImport		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getStylesheetRule());
-	        }
-       		add(
-       			$current, 
-       			"imports",
-        		lv_imports_6_0, 
-        		"Import");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)((this_CDO_7=RULE_CDO
-    { 
-    newLeafNode(this_CDO_7, grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_2_1_0_0()); 
-    }
-(this_WS_8=RULE_WS
-    { 
-    newLeafNode(this_WS_8, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_0_1()); 
-    }
-)*)
-    |(this_CDC_9=RULE_CDC
-    { 
-    newLeafNode(this_CDC_9, grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_2_1_1_0()); 
-    }
-(this_WS_10=RULE_WS
-    { 
-    newLeafNode(this_WS_10, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_1_1()); 
-    }
-)*))*)*((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getStylesheetAccess().getContentsContentParserRuleCall_3_0_0()); 
-	    }
-		lv_contents_11_0=ruleContent		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getStylesheetRule());
-	        }
-       		add(
-       			$current, 
-       			"contents",
-        		lv_contents_11_0, 
-        		"Content");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)((this_CDO_12=RULE_CDO
-    { 
-    newLeafNode(this_CDO_12, grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_3_1_0_0()); 
-    }
-(this_WS_13=RULE_WS
-    { 
-    newLeafNode(this_WS_13, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_0_1()); 
-    }
-)*)
-    |(this_CDC_14=RULE_CDC
-    { 
-    newLeafNode(this_CDC_14, grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_3_1_1_0()); 
-    }
-(this_WS_15=RULE_WS
-    { 
-    newLeafNode(this_WS_15, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_1_1()); 
-    }
-)*))*)*)
-;
-
-
-
-
-
-// Entry rule entryRuleContent
-entryRuleContent returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getContentRule()); }
-	 iv_ruleContent=ruleContent 
-	 { $current=$iv_ruleContent.current; } 
-	 EOF 
-;
-
-// Rule Content
-ruleContent returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(
-    { 
-        newCompositeNode(grammarAccess.getContentAccess().getRulesetParserRuleCall_0()); 
-    }
-    this_Ruleset_0=ruleRuleset
-    { 
-        $current = $this_Ruleset_0.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getContentAccess().getMediaParserRuleCall_1()); 
-    }
-    this_Media_1=ruleMedia
-    { 
-        $current = $this_Media_1.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getContentAccess().getPageParserRuleCall_2()); 
-    }
-    this_Page_2=rulePage
-    { 
-        $current = $this_Page_2.current; 
-        afterParserOrEnumRuleCall();
-    }
-)
-;
-
-
-
-
-
-// Entry rule entryRuleImport
-entryRuleImport returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getImportRule()); }
-	 iv_ruleImport=ruleImport 
-	 { $current=$iv_ruleImport.current; } 
-	 EOF 
-;
-
-// Rule Import
-ruleImport returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(	otherlv_0='@import' 
-    {
-    	newLeafNode(otherlv_0, grammarAccess.getImportAccess().getImportKeyword_0());
-    }
-(((this_WS_1=RULE_WS
-    { 
-    newLeafNode(this_WS_1, grammarAccess.getImportAccess().getWSTerminalRuleCall_1_0_0()); 
-    }
-)*(
-(
-		lv_string_2_0=RULE_STRING
-		{
-			newLeafNode(lv_string_2_0, grammarAccess.getImportAccess().getStringSTRINGTerminalRuleCall_1_0_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getImportRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"string",
-        		lv_string_2_0, 
-        		"STRING");
-	    }
-
-)
-))
-    |(this_WS_3=RULE_WS
-    { 
-    newLeafNode(this_WS_3, grammarAccess.getImportAccess().getWSTerminalRuleCall_1_1_0()); 
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getImportAccess().getUriUriParserRuleCall_1_1_1_0()); 
-	    }
-		lv_uri_4_0=ruleUri		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getImportRule());
-	        }
-       		set(
-       			$current, 
-       			"uri",
-        		lv_uri_4_0, 
-        		"Uri");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)))(this_WS_5=RULE_WS
-    { 
-    newLeafNode(this_WS_5, grammarAccess.getImportAccess().getWSTerminalRuleCall_2()); 
-    }
-)*((
-(
-		lv_media_6_0=RULE_ID
-		{
-			newLeafNode(lv_media_6_0, grammarAccess.getImportAccess().getMediaIDTerminalRuleCall_3_0_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getImportRule());
-	        }
-       		addWithLastConsumed(
-       			$current, 
-       			"media",
-        		lv_media_6_0, 
-        		"ID");
-	    }
-
-)
-)(this_WS_7=RULE_WS
-    { 
-    newLeafNode(this_WS_7, grammarAccess.getImportAccess().getWSTerminalRuleCall_3_1()); 
-    }
-)*(	otherlv_8=',' 
-    {
-    	newLeafNode(otherlv_8, grammarAccess.getImportAccess().getCommaKeyword_3_2_0());
-    }
-(this_WS_9=RULE_WS
-    { 
-    newLeafNode(this_WS_9, grammarAccess.getImportAccess().getWSTerminalRuleCall_3_2_1()); 
-    }
-)*(
-(
-		lv_media_10_0=RULE_ID
-		{
-			newLeafNode(lv_media_10_0, grammarAccess.getImportAccess().getMediaIDTerminalRuleCall_3_2_2_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getImportRule());
-	        }
-       		addWithLastConsumed(
-       			$current, 
-       			"media",
-        		lv_media_10_0, 
-        		"ID");
-	    }
-
-)
-))*)?	otherlv_11=';' 
-    {
-    	newLeafNode(otherlv_11, grammarAccess.getImportAccess().getSemicolonKeyword_4());
-    }
-(this_WS_12=RULE_WS
-    { 
-    newLeafNode(this_WS_12, grammarAccess.getImportAccess().getWSTerminalRuleCall_5()); 
-    }
-)*)
-;
-
-
-
-
-
-// Entry rule entryRuleMedia
-entryRuleMedia returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getMediaRule()); }
-	 iv_ruleMedia=ruleMedia 
-	 { $current=$iv_ruleMedia.current; } 
-	 EOF 
-;
-
-// Rule Media
-ruleMedia returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(	otherlv_0='@media' 
-    {
-    	newLeafNode(otherlv_0, grammarAccess.getMediaAccess().getMediaKeyword_0());
-    }
-this_WS_1=RULE_WS
-    { 
-    newLeafNode(this_WS_1, grammarAccess.getMediaAccess().getWSTerminalRuleCall_1()); 
-    }
-(
-(
-		lv_media_2_0=RULE_ID
-		{
-			newLeafNode(lv_media_2_0, grammarAccess.getMediaAccess().getMediaIDTerminalRuleCall_2_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getMediaRule());
-	        }
-       		addWithLastConsumed(
-       			$current, 
-       			"media",
-        		lv_media_2_0, 
-        		"ID");
-	    }
-
-)
-)(this_WS_3=RULE_WS
-    { 
-    newLeafNode(this_WS_3, grammarAccess.getMediaAccess().getWSTerminalRuleCall_3()); 
-    }
-)*(	otherlv_4=',' 
-    {
-    	newLeafNode(otherlv_4, grammarAccess.getMediaAccess().getCommaKeyword_4_0());
-    }
-(this_WS_5=RULE_WS
-    { 
-    newLeafNode(this_WS_5, grammarAccess.getMediaAccess().getWSTerminalRuleCall_4_1()); 
-    }
-)*(
-(
-		lv_media_6_0=RULE_ID
-		{
-			newLeafNode(lv_media_6_0, grammarAccess.getMediaAccess().getMediaIDTerminalRuleCall_4_2_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getMediaRule());
-	        }
-       		addWithLastConsumed(
-       			$current, 
-       			"media",
-        		lv_media_6_0, 
-        		"ID");
-	    }
-
-)
-))*	otherlv_7='{' 
-    {
-    	newLeafNode(otherlv_7, grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_5());
-    }
-(this_WS_8=RULE_WS
-    { 
-    newLeafNode(this_WS_8, grammarAccess.getMediaAccess().getWSTerminalRuleCall_6()); 
-    }
-)*(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getMediaAccess().getRulesRulesetParserRuleCall_7_0()); 
-	    }
-		lv_rules_9_0=ruleRuleset		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getMediaRule());
-	        }
-       		add(
-       			$current, 
-       			"rules",
-        		lv_rules_9_0, 
-        		"Ruleset");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)*	otherlv_10='}' 
-    {
-    	newLeafNode(otherlv_10, grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_8());
-    }
-(this_WS_11=RULE_WS
-    { 
-    newLeafNode(this_WS_11, grammarAccess.getMediaAccess().getWSTerminalRuleCall_9()); 
-    }
-)*)
-;
-
-
-
-
-
-// Entry rule entryRulePage
-entryRulePage returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getPageRule()); }
-	 iv_rulePage=rulePage 
-	 { $current=$iv_rulePage.current; } 
-	 EOF 
-;
-
-// Rule Page
-rulePage returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-    {
-        $current = forceCreateModelElement(
-            grammarAccess.getPageAccess().getPageAction_0(),
-            $current);
-    }
-)	otherlv_1='@page' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getPageAccess().getPageKeyword_1());
-    }
-(this_WS_2=RULE_WS
-    { 
-    newLeafNode(this_WS_2, grammarAccess.getPageAccess().getWSTerminalRuleCall_2()); 
-    }
-)*(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getPageAccess().getPseudoPseudoPageParserRuleCall_3_0()); 
-	    }
-		lv_pseudo_3_0=rulePseudoPage		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getPageRule());
-	        }
-       		set(
-       			$current, 
-       			"pseudo",
-        		lv_pseudo_3_0, 
-        		"PseudoPage");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?	otherlv_4='{' 
-    {
-    	newLeafNode(otherlv_4, grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_4());
-    }
-(this_WS_5=RULE_WS
-    { 
-    newLeafNode(this_WS_5, grammarAccess.getPageAccess().getWSTerminalRuleCall_5()); 
-    }
-)*(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getPageAccess().getDeclarationsDeclarationParserRuleCall_6_0()); 
-	    }
-		lv_declarations_6_0=ruleDeclaration		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getPageRule());
-	        }
-       		add(
-       			$current, 
-       			"declarations",
-        		lv_declarations_6_0, 
-        		"Declaration");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?(	otherlv_7=';' 
-    {
-    	newLeafNode(otherlv_7, grammarAccess.getPageAccess().getSemicolonKeyword_7_0());
-    }
-(this_WS_8=RULE_WS
-    { 
-    newLeafNode(this_WS_8, grammarAccess.getPageAccess().getWSTerminalRuleCall_7_1()); 
-    }
-)*(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getPageAccess().getDeclarationsDeclarationParserRuleCall_7_2_0()); 
-	    }
-		lv_declarations_9_0=ruleDeclaration		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getPageRule());
-	        }
-       		add(
-       			$current, 
-       			"declarations",
-        		lv_declarations_9_0, 
-        		"Declaration");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?)*	otherlv_10='}' 
-    {
-    	newLeafNode(otherlv_10, grammarAccess.getPageAccess().getRightCurlyBracketKeyword_8());
-    }
-(this_WS_11=RULE_WS
-    { 
-    newLeafNode(this_WS_11, grammarAccess.getPageAccess().getWSTerminalRuleCall_9()); 
-    }
-)*)
-;
-
-
-
-
-
-// Entry rule entryRulePseudoPage
-entryRulePseudoPage returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getPseudoPageRule()); }
-	 iv_rulePseudoPage=rulePseudoPage 
-	 { $current=$iv_rulePseudoPage.current; } 
-	 EOF 
-;
-
-// Rule PseudoPage
-rulePseudoPage returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(	otherlv_0=':' 
-    {
-    	newLeafNode(otherlv_0, grammarAccess.getPseudoPageAccess().getColonKeyword_0());
-    }
-(
-(
-		lv_id_1_0=RULE_ID
-		{
-			newLeafNode(lv_id_1_0, grammarAccess.getPseudoPageAccess().getIdIDTerminalRuleCall_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getPseudoPageRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"id",
-        		lv_id_1_0, 
-        		"ID");
-	    }
-
-)
-)(this_WS_2=RULE_WS
-    { 
-    newLeafNode(this_WS_2, grammarAccess.getPseudoPageAccess().getWSTerminalRuleCall_2()); 
-    }
-)*)
-;
-
-
-
-
-
-// Entry rule entryRuleRuleset
-entryRuleRuleset returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getRulesetRule()); }
-	 iv_ruleRuleset=ruleRuleset 
-	 { $current=$iv_ruleRuleset.current; } 
-	 EOF 
-;
-
-// Rule Ruleset
-ruleRuleset returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0()); 
-	    }
-		lv_selectors_0_0=ruleSelector		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getRulesetRule());
-	        }
-       		add(
-       			$current, 
-       			"selectors",
-        		lv_selectors_0_0, 
-        		"Selector");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(	otherlv_1=',' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getRulesetAccess().getCommaKeyword_1_0());
-    }
-(this_WS_2=RULE_WS
-    { 
-    newLeafNode(this_WS_2, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_1()); 
-    }
-)*(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0()); 
-	    }
-		lv_selectors_3_0=ruleSelector		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getRulesetRule());
-	        }
-       		add(
-       			$current, 
-       			"selectors",
-        		lv_selectors_3_0, 
-        		"Selector");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))*	otherlv_4='{' 
-    {
-    	newLeafNode(otherlv_4, grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_2());
-    }
-(this_WS_5=RULE_WS
-    { 
-    newLeafNode(this_WS_5, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_3()); 
-    }
-)*(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getRulesetAccess().getPropertiesDeclarationParserRuleCall_4_0()); 
-	    }
-		lv_properties_6_0=ruleDeclaration		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getRulesetRule());
-	        }
-       		add(
-       			$current, 
-       			"properties",
-        		lv_properties_6_0, 
-        		"Declaration");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?(	otherlv_7=';' 
-    {
-    	newLeafNode(otherlv_7, grammarAccess.getRulesetAccess().getSemicolonKeyword_5_0());
-    }
-(this_WS_8=RULE_WS
-    { 
-    newLeafNode(this_WS_8, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_5_1()); 
-    }
-)*(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getRulesetAccess().getPropertiesDeclarationParserRuleCall_5_2_0()); 
-	    }
-		lv_properties_9_0=ruleDeclaration		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getRulesetRule());
-	        }
-       		add(
-       			$current, 
-       			"properties",
-        		lv_properties_9_0, 
-        		"Declaration");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?)*	otherlv_10='}' 
-    {
-    	newLeafNode(otherlv_10, grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_6());
-    }
-(this_WS_11=RULE_WS
-    { 
-    newLeafNode(this_WS_11, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_7()); 
-    }
-)*)
-;
-
-
-
-
-
-// Entry rule entryRuleSelector
-entryRuleSelector returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getSelectorRule()); }
-	 iv_ruleSelector=ruleSelector 
-	 { $current=$iv_ruleSelector.current; } 
-	 EOF 
-;
-
-// Rule Selector
-ruleSelector returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-    { 
-        newCompositeNode(grammarAccess.getSelectorAccess().getSimpleSelectorParserRuleCall_0_0()); 
-    }
-    this_SimpleSelector_0=ruleSimpleSelector
-    { 
-        $current = $this_SimpleSelector_0.current; 
-        afterParserOrEnumRuleCall();
-    }
-(this_WS_1=RULE_WS
-    { 
-    newLeafNode(this_WS_1, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_0_1()); 
-    }
-)*)
-    |
-    { 
-        newCompositeNode(grammarAccess.getSelectorAccess().getCompositeSelectorParserRuleCall_1()); 
-    }
-    this_CompositeSelector_2=ruleCompositeSelector
-    { 
-        $current = $this_CompositeSelector_2.current; 
-        afterParserOrEnumRuleCall();
-    }
-)
-;
-
-
-
-
-
-// Entry rule entryRuleCompositeSelector
-entryRuleCompositeSelector returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getCompositeSelectorRule()); }
-	 iv_ruleCompositeSelector=ruleCompositeSelector 
-	 { $current=$iv_ruleCompositeSelector.current; } 
-	 EOF 
-;
-
-// Rule CompositeSelector
-ruleCompositeSelector returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getCompositeSelectorAccess().getLeftSimpleSelectorParserRuleCall_0_0()); 
-	    }
-		lv_left_0_0=ruleSimpleSelector		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getCompositeSelectorRule());
-	        }
-       		set(
-       			$current, 
-       			"left",
-        		lv_left_0_0, 
-        		"SimpleSelector");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)((this_WS_1=RULE_WS
-    { 
-    newLeafNode(this_WS_1, grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_0()); 
-    }
-)+
-    |((this_WS_2=RULE_WS
-    { 
-    newLeafNode(this_WS_2, grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_1_0()); 
-    }
-)*(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getCompositeSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0()); 
-	    }
-		lv_combinator_3_0=ruleCombinator		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getCompositeSelectorRule());
-	        }
-       		set(
-       			$current, 
-       			"combinator",
-        		lv_combinator_3_0, 
-        		"Combinator");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)))(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getCompositeSelectorAccess().getRightSelectorParserRuleCall_2_0()); 
-	    }
-		lv_right_4_0=ruleSelector		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getCompositeSelectorRule());
-	        }
-       		set(
-       			$current, 
-       			"right",
-        		lv_right_4_0, 
-        		"Selector");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleSimpleSelector
-entryRuleSimpleSelector returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getSimpleSelectorRule()); }
-	 iv_ruleSimpleSelector=ruleSimpleSelector 
-	 { $current=$iv_ruleSimpleSelector.current; } 
-	 EOF 
-;
-
-// Rule SimpleSelector
-ruleSimpleSelector returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(((
-(
-(
-		lv_elementName_0_1=RULE_ID
-		{
-			newLeafNode(lv_elementName_0_1, grammarAccess.getSimpleSelectorAccess().getElementNameIDTerminalRuleCall_0_0_0_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getSimpleSelectorRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"elementName",
-        		lv_elementName_0_1, 
-        		"ID");
-	    }
-
-    |		lv_elementName_0_2=	'*' 
-    {
-        newLeafNode(lv_elementName_0_2, grammarAccess.getSimpleSelectorAccess().getElementNameAsteriskKeyword_0_0_0_1());
-    }
- 
-	    {
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getSimpleSelectorRule());
-	        }
-       		setWithLastConsumed($current, "elementName", lv_elementName_0_2, null);
-	    }
-
-)
-
-)
-)(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getSimpleSelectorAccess().getConditionSelectorConditionParserRuleCall_0_1_0()); 
-	    }
-		lv_condition_1_0=ruleSelectorCondition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getSimpleSelectorRule());
-	        }
-       		add(
-       			$current, 
-       			"condition",
-        		lv_condition_1_0, 
-        		"SelectorCondition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)*)
-    |(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getSimpleSelectorAccess().getConditionSelectorConditionParserRuleCall_1_0()); 
-	    }
-		lv_condition_2_0=ruleSelectorCondition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getSimpleSelectorRule());
-	        }
-       		add(
-       			$current, 
-       			"condition",
-        		lv_condition_2_0, 
-        		"SelectorCondition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)+)
-;
-
-
-
-
-
-// Entry rule entryRuleSelectorCondition
-entryRuleSelectorCondition returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getSelectorConditionRule()); }
-	 iv_ruleSelectorCondition=ruleSelectorCondition 
-	 { $current=$iv_ruleSelectorCondition.current; } 
-	 EOF 
-;
-
-// Rule SelectorCondition
-ruleSelectorCondition returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(
-    { 
-        newCompositeNode(grammarAccess.getSelectorConditionAccess().getCSSIdParserRuleCall_0()); 
-    }
-    this_CSSId_0=ruleCSSId
-    { 
-        $current = $this_CSSId_0.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getSelectorConditionAccess().getClassParserRuleCall_1()); 
-    }
-    this_Class_1=ruleClass
-    { 
-        $current = $this_Class_1.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getSelectorConditionAccess().getAttributeParserRuleCall_2()); 
-    }
-    this_Attribute_2=ruleAttribute
-    { 
-        $current = $this_Attribute_2.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getSelectorConditionAccess().getPseudoParserRuleCall_3()); 
-    }
-    this_Pseudo_3=rulePseudo
-    { 
-        $current = $this_Pseudo_3.current; 
-        afterParserOrEnumRuleCall();
-    }
-)
-;
-
-
-
-
-
-// Entry rule entryRuleCombinator
-entryRuleCombinator returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getCombinatorRule()); }
-	 iv_ruleCombinator=ruleCombinator 
-	 { $current=$iv_ruleCombinator.current; } 
-	 EOF 
-;
-
-// Rule Combinator
-ruleCombinator returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getCombinatorAccess().getKindKINDEnumRuleCall_0_0()); 
-	    }
-		lv_kind_0_0=ruleKIND		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getCombinatorRule());
-	        }
-       		set(
-       			$current, 
-       			"kind",
-        		lv_kind_0_0, 
-        		"KIND");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(this_WS_1=RULE_WS
-    { 
-    newLeafNode(this_WS_1, grammarAccess.getCombinatorAccess().getWSTerminalRuleCall_1()); 
-    }
-)*)
-;
-
-
-
-
-
-// Entry rule entryRuleDeclaration
-entryRuleDeclaration returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getDeclarationRule()); }
-	 iv_ruleDeclaration=ruleDeclaration 
-	 { $current=$iv_ruleDeclaration.current; } 
-	 EOF 
-;
-
-// Rule Declaration
-ruleDeclaration returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		lv_property_0_0=RULE_ID
-		{
-			newLeafNode(lv_property_0_0, grammarAccess.getDeclarationAccess().getPropertyIDTerminalRuleCall_0_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getDeclarationRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"property",
-        		lv_property_0_0, 
-        		"ID");
-	    }
-
-)
-)(this_WS_1=RULE_WS
-    { 
-    newLeafNode(this_WS_1, grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_1()); 
-    }
-)*	otherlv_2=':' 
-    {
-    	newLeafNode(otherlv_2, grammarAccess.getDeclarationAccess().getColonKeyword_2());
-    }
-(this_WS_3=RULE_WS
-    { 
-    newLeafNode(this_WS_3, grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_3()); 
-    }
-)*(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getDeclarationAccess().getExpressionExpressionParserRuleCall_4_0()); 
-	    }
-		lv_expression_4_0=ruleExpression		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getDeclarationRule());
-	        }
-       		set(
-       			$current, 
-       			"expression",
-        		lv_expression_4_0, 
-        		"Expression");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)((
-(
-		lv_important_5_0=RULE_T_IMPORTANT
-		{
-			newLeafNode(lv_important_5_0, grammarAccess.getDeclarationAccess().getImportantT_IMPORTANTTerminalRuleCall_5_0_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getDeclarationRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"important",
-        		true, 
-        		"T_IMPORTANT");
-	    }
-
-)
-)(this_WS_6=RULE_WS
-    { 
-    newLeafNode(this_WS_6, grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_5_1()); 
-    }
-)*)?)
-;
-
-
-
-
-
-// Entry rule entryRuleExpression
-entryRuleExpression returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getExpressionRule()); }
-	 iv_ruleExpression=ruleExpression 
-	 { $current=$iv_ruleExpression.current; } 
-	 EOF 
-;
-
-// Rule Expression
-ruleExpression returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getExpressionAccess().getTermsTermParserRuleCall_0_0()); 
-	    }
-		lv_terms_0_0=ruleTerm		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getExpressionRule());
-	        }
-       		set(
-       			$current, 
-       			"terms",
-        		lv_terms_0_0, 
-        		"Term");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getExpressionAccess().getSubtermsSubtermParserRuleCall_1_0()); 
-	    }
-		lv_subterms_1_0=ruleSubterm		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getExpressionRule());
-	        }
-       		add(
-       			$current, 
-       			"subterms",
-        		lv_subterms_1_0, 
-        		"Subterm");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)*)
-;
-
-
-
-
-
-// Entry rule entryRuleSubterm
-entryRuleSubterm returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getSubtermRule()); }
-	 iv_ruleSubterm=ruleSubterm 
-	 { $current=$iv_ruleSubterm.current; } 
-	 EOF 
-;
-
-// Rule Subterm
-ruleSubterm returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getSubtermAccess().getOperatorOperatorParserRuleCall_0_0()); 
-	    }
-		lv_operator_0_0=ruleOperator		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getSubtermRule());
-	        }
-       		set(
-       			$current, 
-       			"operator",
-        		lv_operator_0_0, 
-        		"Operator");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getSubtermAccess().getTermTermParserRuleCall_1_0()); 
-	    }
-		lv_term_1_0=ruleTerm		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getSubtermRule());
-	        }
-       		set(
-       			$current, 
-       			"term",
-        		lv_term_1_0, 
-        		"Term");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleTerm
-entryRuleTerm returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getTermRule()); }
-	 iv_ruleTerm=ruleTerm 
-	 { $current=$iv_ruleTerm.current; } 
-	 EOF 
-;
-
-// Rule Term
-ruleTerm returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-    { 
-        newCompositeNode(grammarAccess.getTermAccess().getNumberParserRuleCall_0_0()); 
-    }
-    this_Number_0=ruleNumber
-    { 
-        $current = $this_Number_0.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getTermAccess().getPercentageParserRuleCall_0_1()); 
-    }
-    this_Percentage_1=rulePercentage
-    { 
-        $current = $this_Percentage_1.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getTermAccess().getLengthParserRuleCall_0_2()); 
-    }
-    this_Length_2=ruleLength
-    { 
-        $current = $this_Length_2.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getTermAccess().getEmsParserRuleCall_0_3()); 
-    }
-    this_Ems_3=ruleEms
-    { 
-        $current = $this_Ems_3.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getTermAccess().getExsParserRuleCall_0_4()); 
-    }
-    this_Exs_4=ruleExs
-    { 
-        $current = $this_Exs_4.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getTermAccess().getAngleParserRuleCall_0_5()); 
-    }
-    this_Angle_5=ruleAngle
-    { 
-        $current = $this_Angle_5.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getTermAccess().getTimeParserRuleCall_0_6()); 
-    }
-    this_Time_6=ruleTime
-    { 
-        $current = $this_Time_6.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getTermAccess().getFrequencyParserRuleCall_0_7()); 
-    }
-    this_Frequency_7=ruleFrequency
-    { 
-        $current = $this_Frequency_7.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getTermAccess().getNameParserRuleCall_0_8()); 
-    }
-    this_Name_8=ruleName
-    { 
-        $current = $this_Name_8.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getTermAccess().getStringValueParserRuleCall_0_9()); 
-    }
-    this_StringValue_9=ruleStringValue
-    { 
-        $current = $this_StringValue_9.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getTermAccess().getUriParserRuleCall_0_10()); 
-    }
-    this_Uri_10=ruleUri
-    { 
-        $current = $this_Uri_10.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getTermAccess().getHexColorParserRuleCall_0_11()); 
-    }
-    this_HexColor_11=ruleHexColor
-    { 
-        $current = $this_HexColor_11.current; 
-        afterParserOrEnumRuleCall();
-    }
-
-    |
-    { 
-        newCompositeNode(grammarAccess.getTermAccess().getFunctionParserRuleCall_0_12()); 
-    }
-    this_Function_12=ruleFunction
-    { 
-        $current = $this_Function_12.current; 
-        afterParserOrEnumRuleCall();
-    }
-)(this_WS_13=RULE_WS
-    { 
-    newLeafNode(this_WS_13, grammarAccess.getTermAccess().getWSTerminalRuleCall_1()); 
-    }
-)*)
-;
-
-
-
-
-
-// Entry rule entryRuleFunction
-entryRuleFunction returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getFunctionRule()); }
-	 iv_ruleFunction=ruleFunction 
-	 { $current=$iv_ruleFunction.current; } 
-	 EOF 
-;
-
-// Rule Function
-ruleFunction returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		lv_name_0_0=RULE_ID
-		{
-			newLeafNode(lv_name_0_0, grammarAccess.getFunctionAccess().getNameIDTerminalRuleCall_0_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getFunctionRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"name",
-        		lv_name_0_0, 
-        		"ID");
-	    }
-
-)
-)	otherlv_1='(' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getFunctionAccess().getLeftParenthesisKeyword_1());
-    }
-(this_WS_2=RULE_WS
-    { 
-    newLeafNode(this_WS_2, grammarAccess.getFunctionAccess().getWSTerminalRuleCall_2()); 
-    }
-)*(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getFunctionAccess().getArgsExpressionParserRuleCall_3_0()); 
-	    }
-		lv_args_3_0=ruleExpression		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getFunctionRule());
-	        }
-       		set(
-       			$current, 
-       			"args",
-        		lv_args_3_0, 
-        		"Expression");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_4=')' 
-    {
-    	newLeafNode(otherlv_4, grammarAccess.getFunctionAccess().getRightParenthesisKeyword_4());
-    }
-)
-;
-
-
-
-
-
-// Entry rule entryRuleName
-entryRuleName returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getNameRule()); }
-	 iv_ruleName=ruleName 
-	 { $current=$iv_ruleName.current; } 
-	 EOF 
-;
-
-// Rule Name
-ruleName returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(
-(
-		lv_value_0_0=RULE_ID
-		{
-			newLeafNode(lv_value_0_0, grammarAccess.getNameAccess().getValueIDTerminalRuleCall_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getNameRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_0_0, 
-        		"ID");
-	    }
-
-)
-)
-;
-
-
-
-
-
-// Entry rule entryRuleNumber
-entryRuleNumber returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getNumberRule()); }
-	 iv_ruleNumber=ruleNumber 
-	 { $current=$iv_ruleNumber.current; } 
-	 EOF 
-;
-
-// Rule Number
-ruleNumber returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getNumberAccess().getOpUnaryOperatorParserRuleCall_0_0()); 
-	    }
-		lv_op_0_0=ruleUnaryOperator		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getNumberRule());
-	        }
-       		set(
-       			$current, 
-       			"op",
-        		lv_op_0_0, 
-        		"UnaryOperator");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?(
-(
-		lv_value_1_0=RULE_T_NUM
-		{
-			newLeafNode(lv_value_1_0, grammarAccess.getNumberAccess().getValueT_NUMTerminalRuleCall_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getNumberRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_1_0, 
-        		"T_NUM");
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRulePercentage
-entryRulePercentage returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getPercentageRule()); }
-	 iv_rulePercentage=rulePercentage 
-	 { $current=$iv_rulePercentage.current; } 
-	 EOF 
-;
-
-// Rule Percentage
-rulePercentage returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getPercentageAccess().getOpUnaryOperatorParserRuleCall_0_0()); 
-	    }
-		lv_op_0_0=ruleUnaryOperator		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getPercentageRule());
-	        }
-       		set(
-       			$current, 
-       			"op",
-        		lv_op_0_0, 
-        		"UnaryOperator");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?(
-(
-		lv_value_1_0=RULE_T_NUM
-		{
-			newLeafNode(lv_value_1_0, grammarAccess.getPercentageAccess().getValueT_NUMTerminalRuleCall_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getPercentageRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_1_0, 
-        		"T_NUM");
-	    }
-
-)
-)(
-(
-		lv_unit_2_0=RULE_PC_UNIT
-		{
-			newLeafNode(lv_unit_2_0, grammarAccess.getPercentageAccess().getUnitPC_UNITTerminalRuleCall_2_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getPercentageRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"unit",
-        		lv_unit_2_0, 
-        		"PC_UNIT");
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleLength
-entryRuleLength returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getLengthRule()); }
-	 iv_ruleLength=ruleLength 
-	 { $current=$iv_ruleLength.current; } 
-	 EOF 
-;
-
-// Rule Length
-ruleLength returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getLengthAccess().getOpUnaryOperatorParserRuleCall_0_0()); 
-	    }
-		lv_op_0_0=ruleUnaryOperator		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getLengthRule());
-	        }
-       		set(
-       			$current, 
-       			"op",
-        		lv_op_0_0, 
-        		"UnaryOperator");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?(
-(
-		lv_value_1_0=RULE_T_NUM
-		{
-			newLeafNode(lv_value_1_0, grammarAccess.getLengthAccess().getValueT_NUMTerminalRuleCall_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getLengthRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_1_0, 
-        		"T_NUM");
-	    }
-
-)
-)(
-(
-		lv_unit_2_0=RULE_LEN_UNIT
-		{
-			newLeafNode(lv_unit_2_0, grammarAccess.getLengthAccess().getUnitLEN_UNITTerminalRuleCall_2_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getLengthRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"unit",
-        		lv_unit_2_0, 
-        		"LEN_UNIT");
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleEms
-entryRuleEms returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getEmsRule()); }
-	 iv_ruleEms=ruleEms 
-	 { $current=$iv_ruleEms.current; } 
-	 EOF 
-;
-
-// Rule Ems
-ruleEms returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getEmsAccess().getOpUnaryOperatorParserRuleCall_0_0()); 
-	    }
-		lv_op_0_0=ruleUnaryOperator		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getEmsRule());
-	        }
-       		set(
-       			$current, 
-       			"op",
-        		lv_op_0_0, 
-        		"UnaryOperator");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?(
-(
-		lv_value_1_0=RULE_T_NUM
-		{
-			newLeafNode(lv_value_1_0, grammarAccess.getEmsAccess().getValueT_NUMTerminalRuleCall_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getEmsRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_1_0, 
-        		"T_NUM");
-	    }
-
-)
-)(
-(
-		lv_unit_2_0=RULE_EM_UNIT
-		{
-			newLeafNode(lv_unit_2_0, grammarAccess.getEmsAccess().getUnitEM_UNITTerminalRuleCall_2_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getEmsRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"unit",
-        		lv_unit_2_0, 
-        		"EM_UNIT");
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleExs
-entryRuleExs returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getExsRule()); }
-	 iv_ruleExs=ruleExs 
-	 { $current=$iv_ruleExs.current; } 
-	 EOF 
-;
-
-// Rule Exs
-ruleExs returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getExsAccess().getOpUnaryOperatorParserRuleCall_0_0()); 
-	    }
-		lv_op_0_0=ruleUnaryOperator		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getExsRule());
-	        }
-       		set(
-       			$current, 
-       			"op",
-        		lv_op_0_0, 
-        		"UnaryOperator");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?(
-(
-		lv_value_1_0=RULE_T_NUM
-		{
-			newLeafNode(lv_value_1_0, grammarAccess.getExsAccess().getValueT_NUMTerminalRuleCall_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getExsRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_1_0, 
-        		"T_NUM");
-	    }
-
-)
-)(
-(
-		lv_unit_2_0=RULE_EX_UNIT
-		{
-			newLeafNode(lv_unit_2_0, grammarAccess.getExsAccess().getUnitEX_UNITTerminalRuleCall_2_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getExsRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"unit",
-        		lv_unit_2_0, 
-        		"EX_UNIT");
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleAngle
-entryRuleAngle returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getAngleRule()); }
-	 iv_ruleAngle=ruleAngle 
-	 { $current=$iv_ruleAngle.current; } 
-	 EOF 
-;
-
-// Rule Angle
-ruleAngle returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getAngleAccess().getOpUnaryOperatorParserRuleCall_0_0()); 
-	    }
-		lv_op_0_0=ruleUnaryOperator		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getAngleRule());
-	        }
-       		set(
-       			$current, 
-       			"op",
-        		lv_op_0_0, 
-        		"UnaryOperator");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?(
-(
-		lv_value_1_0=RULE_T_NUM
-		{
-			newLeafNode(lv_value_1_0, grammarAccess.getAngleAccess().getValueT_NUMTerminalRuleCall_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getAngleRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_1_0, 
-        		"T_NUM");
-	    }
-
-)
-)(
-(
-		lv_unit_2_0=RULE_ANGLE_UNIT
-		{
-			newLeafNode(lv_unit_2_0, grammarAccess.getAngleAccess().getUnitANGLE_UNITTerminalRuleCall_2_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getAngleRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"unit",
-        		lv_unit_2_0, 
-        		"ANGLE_UNIT");
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleTime
-entryRuleTime returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getTimeRule()); }
-	 iv_ruleTime=ruleTime 
-	 { $current=$iv_ruleTime.current; } 
-	 EOF 
-;
-
-// Rule Time
-ruleTime returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getTimeAccess().getOpUnaryOperatorParserRuleCall_0_0()); 
-	    }
-		lv_op_0_0=ruleUnaryOperator		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getTimeRule());
-	        }
-       		set(
-       			$current, 
-       			"op",
-        		lv_op_0_0, 
-        		"UnaryOperator");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?(
-(
-		lv_value_1_0=RULE_T_NUM
-		{
-			newLeafNode(lv_value_1_0, grammarAccess.getTimeAccess().getValueT_NUMTerminalRuleCall_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getTimeRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_1_0, 
-        		"T_NUM");
-	    }
-
-)
-)(
-(
-		lv_unit_2_0=RULE_TIME_UNIT
-		{
-			newLeafNode(lv_unit_2_0, grammarAccess.getTimeAccess().getUnitTIME_UNITTerminalRuleCall_2_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getTimeRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"unit",
-        		lv_unit_2_0, 
-        		"TIME_UNIT");
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleFrequency
-entryRuleFrequency returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getFrequencyRule()); }
-	 iv_ruleFrequency=ruleFrequency 
-	 { $current=$iv_ruleFrequency.current; } 
-	 EOF 
-;
-
-// Rule Frequency
-ruleFrequency returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getFrequencyAccess().getOpUnaryOperatorParserRuleCall_0_0()); 
-	    }
-		lv_op_0_0=ruleUnaryOperator		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getFrequencyRule());
-	        }
-       		set(
-       			$current, 
-       			"op",
-        		lv_op_0_0, 
-        		"UnaryOperator");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?(
-(
-		lv_value_1_0=RULE_T_NUM
-		{
-			newLeafNode(lv_value_1_0, grammarAccess.getFrequencyAccess().getValueT_NUMTerminalRuleCall_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getFrequencyRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_1_0, 
-        		"T_NUM");
-	    }
-
-)
-)(
-(
-		lv_unit_2_0=RULE_FREQ_UNIT
-		{
-			newLeafNode(lv_unit_2_0, grammarAccess.getFrequencyAccess().getUnitFREQ_UNITTerminalRuleCall_2_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getFrequencyRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"unit",
-        		lv_unit_2_0, 
-        		"FREQ_UNIT");
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleUri
-entryRuleUri returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getUriRule()); }
-	 iv_ruleUri=ruleUri 
-	 { $current=$iv_ruleUri.current; } 
-	 EOF 
-;
-
-// Rule Uri
-ruleUri returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(	otherlv_0='url(' 
-    {
-    	newLeafNode(otherlv_0, grammarAccess.getUriAccess().getUrlKeyword_0());
-    }
-(this_WS_1=RULE_WS
-    { 
-    newLeafNode(this_WS_1, grammarAccess.getUriAccess().getWSTerminalRuleCall_1()); 
-    }
-)?(
-(
-		lv_value_2_0=RULE_STRING
-		{
-			newLeafNode(lv_value_2_0, grammarAccess.getUriAccess().getValueSTRINGTerminalRuleCall_2_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getUriRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_2_0, 
-        		"STRING");
-	    }
-
-)
-)(this_WS_3=RULE_WS
-    { 
-    newLeafNode(this_WS_3, grammarAccess.getUriAccess().getWSTerminalRuleCall_3()); 
-    }
-)?	otherlv_4=')' 
-    {
-    	newLeafNode(otherlv_4, grammarAccess.getUriAccess().getRightParenthesisKeyword_4());
-    }
-)
-;
-
-
-
-
-
-// Entry rule entryRuleStringValue
-entryRuleStringValue returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getStringValueRule()); }
-	 iv_ruleStringValue=ruleStringValue 
-	 { $current=$iv_ruleStringValue.current; } 
-	 EOF 
-;
-
-// Rule StringValue
-ruleStringValue returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(
-(
-		lv_value_0_0=RULE_STRING
-		{
-			newLeafNode(lv_value_0_0, grammarAccess.getStringValueAccess().getValueSTRINGTerminalRuleCall_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getStringValueRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_0_0, 
-        		"STRING");
-	    }
-
-)
-)
-;
-
-
-
-
-
-// Entry rule entryRuleHexColor
-entryRuleHexColor returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getHexColorRule()); }
-	 iv_ruleHexColor=ruleHexColor 
-	 { $current=$iv_ruleHexColor.current; } 
-	 EOF 
-;
-
-// Rule HexColor
-ruleHexColor returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(
-(
-		lv_value_0_0=RULE_HASH
-		{
-			newLeafNode(lv_value_0_0, grammarAccess.getHexColorAccess().getValueHASHTerminalRuleCall_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getHexColorRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_0_0, 
-        		"HASH");
-	    }
-
-)
-)
-;
-
-
-
-
-
-// Entry rule entryRuleOperator
-entryRuleOperator returns [String current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getOperatorRule()); } 
-	 iv_ruleOperator=ruleOperator 
-	 { $current=$iv_ruleOperator.current.getText(); }  
-	 EOF 
-;
-
-// Rule Operator
-ruleOperator returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-	kw='/' 
-    {
-        $current.merge(kw);
-        newLeafNode(kw, grammarAccess.getOperatorAccess().getSolidusKeyword_0_0()); 
-    }
-(    this_WS_1=RULE_WS    {
-		$current.merge(this_WS_1);
-    }
-
-    { 
-    newLeafNode(this_WS_1, grammarAccess.getOperatorAccess().getWSTerminalRuleCall_0_1()); 
-    }
-)*)
-    |(
-	kw=',' 
-    {
-        $current.merge(kw);
-        newLeafNode(kw, grammarAccess.getOperatorAccess().getCommaKeyword_1_0()); 
-    }
-(    this_WS_3=RULE_WS    {
-		$current.merge(this_WS_3);
-    }
-
-    { 
-    newLeafNode(this_WS_3, grammarAccess.getOperatorAccess().getWSTerminalRuleCall_1_1()); 
-    }
-)*))
-    ;
-
-
-
-
-
-// Entry rule entryRuleClass
-entryRuleClass returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getClassRule()); }
-	 iv_ruleClass=ruleClass 
-	 { $current=$iv_ruleClass.current; } 
-	 EOF 
-;
-
-// Rule Class
-ruleClass returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(
-(
-		lv_class_0_0=RULE_T_CLASS
-		{
-			newLeafNode(lv_class_0_0, grammarAccess.getClassAccess().getClassT_CLASSTerminalRuleCall_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getClassRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"class",
-        		lv_class_0_0, 
-        		"T_CLASS");
-	    }
-
-)
-)
-;
-
-
-
-
-
-// Entry rule entryRuleAttribute
-entryRuleAttribute returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getAttributeRule()); }
-	 iv_ruleAttribute=ruleAttribute 
-	 { $current=$iv_ruleAttribute.current; } 
-	 EOF 
-;
-
-// Rule Attribute
-ruleAttribute returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(	otherlv_0='[' 
-    {
-    	newLeafNode(otherlv_0, grammarAccess.getAttributeAccess().getLeftSquareBracketKeyword_0());
-    }
-(this_WS_1=RULE_WS
-    { 
-    newLeafNode(this_WS_1, grammarAccess.getAttributeAccess().getWSTerminalRuleCall_1()); 
-    }
-)*(
-(
-		lv_name_2_0=RULE_ID
-		{
-			newLeafNode(lv_name_2_0, grammarAccess.getAttributeAccess().getNameIDTerminalRuleCall_2_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getAttributeRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"name",
-        		lv_name_2_0, 
-        		"ID");
-	    }
-
-)
-)(this_WS_3=RULE_WS
-    { 
-    newLeafNode(this_WS_3, grammarAccess.getAttributeAccess().getWSTerminalRuleCall_3()); 
-    }
-)*(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getAttributeAccess().getValueAttributeValueParserRuleCall_4_0()); 
-	    }
-		lv_value_4_0=ruleAttributeValue		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getAttributeRule());
-	        }
-       		set(
-       			$current, 
-       			"value",
-        		lv_value_4_0, 
-        		"AttributeValue");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)?	otherlv_5=']' 
-    {
-    	newLeafNode(otherlv_5, grammarAccess.getAttributeAccess().getRightSquareBracketKeyword_5());
-    }
-)
-;
-
-
-
-
-
-// Entry rule entryRuleAttributeValue
-entryRuleAttributeValue returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getAttributeValueRule()); }
-	 iv_ruleAttributeValue=ruleAttributeValue 
-	 { $current=$iv_ruleAttributeValue.current; } 
-	 EOF 
-;
-
-// Rule AttributeValue
-ruleAttributeValue returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getAttributeValueAccess().getOperatorATTRIBUTE_OPEnumRuleCall_0_0()); 
-	    }
-		lv_operator_0_0=ruleATTRIBUTE_OP		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getAttributeValueRule());
-	        }
-       		set(
-       			$current, 
-       			"operator",
-        		lv_operator_0_0, 
-        		"ATTRIBUTE_OP");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(this_WS_1=RULE_WS
-    { 
-    newLeafNode(this_WS_1, grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_1()); 
-    }
-)*(
-(
-(
-		lv_value_2_1=RULE_ID
-		{
-			newLeafNode(lv_value_2_1, grammarAccess.getAttributeValueAccess().getValueIDTerminalRuleCall_2_0_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getAttributeValueRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_2_1, 
-        		"ID");
-	    }
-
-    |		lv_value_2_2=RULE_STRING
-		{
-			newLeafNode(lv_value_2_2, grammarAccess.getAttributeValueAccess().getValueSTRINGTerminalRuleCall_2_0_1()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getAttributeValueRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_2_2, 
-        		"STRING");
-	    }
-
-)
-
-)
-)(this_WS_3=RULE_WS
-    { 
-    newLeafNode(this_WS_3, grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_3()); 
-    }
-)*)
-;
-
-
-
-
-
-// Entry rule entryRulePseudo
-entryRulePseudo returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getPseudoRule()); }
-	 iv_rulePseudo=rulePseudo 
-	 { $current=$iv_rulePseudo.current; } 
-	 EOF 
-;
-
-// Rule Pseudo
-rulePseudo returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(	otherlv_0=':' 
-    {
-    	newLeafNode(otherlv_0, grammarAccess.getPseudoAccess().getColonKeyword_0());
-    }
-((
-(
-		lv_pseudo_1_0=RULE_ID
-		{
-			newLeafNode(lv_pseudo_1_0, grammarAccess.getPseudoAccess().getPseudoIDTerminalRuleCall_1_0_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getPseudoRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"pseudo",
-        		lv_pseudo_1_0, 
-        		"ID");
-	    }
-
-)
-)
-    |((
-(
-		lv_pseudo_2_0=RULE_ID
-		{
-			newLeafNode(lv_pseudo_2_0, grammarAccess.getPseudoAccess().getPseudoIDTerminalRuleCall_1_1_0_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getPseudoRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"pseudo",
-        		lv_pseudo_2_0, 
-        		"ID");
-	    }
-
-)
-)	otherlv_3='(' 
-    {
-    	newLeafNode(otherlv_3, grammarAccess.getPseudoAccess().getLeftParenthesisKeyword_1_1_1());
-    }
-(this_WS_4=RULE_WS
-    { 
-    newLeafNode(this_WS_4, grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_2()); 
-    }
-)*((
-(
-		lv_args_5_0=RULE_ID
-		{
-			newLeafNode(lv_args_5_0, grammarAccess.getPseudoAccess().getArgsIDTerminalRuleCall_1_1_3_0_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getPseudoRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"args",
-        		lv_args_5_0, 
-        		"ID");
-	    }
-
-)
-)(this_WS_6=RULE_WS
-    { 
-    newLeafNode(this_WS_6, grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_3_1()); 
-    }
-)*)?	otherlv_7=')' 
-    {
-    	newLeafNode(otherlv_7, grammarAccess.getPseudoAccess().getRightParenthesisKeyword_1_1_4());
-    }
-)))
-;
-
-
-
-
-
-// Entry rule entryRuleCSSId
-entryRuleCSSId returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getCSSIdRule()); }
-	 iv_ruleCSSId=ruleCSSId 
-	 { $current=$iv_ruleCSSId.current; } 
-	 EOF 
-;
-
-// Rule CSSId
-ruleCSSId returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(
-(
-		lv_value_0_0=RULE_HASH
-		{
-			newLeafNode(lv_value_0_0, grammarAccess.getCSSIdAccess().getValueHASHTerminalRuleCall_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getCSSIdRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"value",
-        		lv_value_0_0, 
-        		"HASH");
-	    }
-
-)
-)
-;
-
-
-
-
-
-// Entry rule entryRuleUnaryOperator
-entryRuleUnaryOperator returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getUnaryOperatorRule()); }
-	 iv_ruleUnaryOperator=ruleUnaryOperator 
-	 { $current=$iv_ruleUnaryOperator.current; } 
-	 EOF 
-;
-
-// Rule UnaryOperator
-ruleUnaryOperator returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getUnaryOperatorAccess().getOperatorUNARYEnumRuleCall_0()); 
-	    }
-		lv_operator_0_0=ruleUNARY		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getUnaryOperatorRule());
-	        }
-       		set(
-       			$current, 
-       			"operator",
-        		lv_operator_0_0, 
-        		"UNARY");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)
-;
-
-
-
-
-
-// Rule UNARY
-ruleUNARY returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='-' 
-	{
-        $current = grammarAccess.getUNARYAccess().getNEGEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getUNARYAccess().getNEGEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='+' 
-	{
-        $current = grammarAccess.getUNARYAccess().getPLUSEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getUNARYAccess().getPLUSEnumLiteralDeclaration_1()); 
-    }
-));
-
-
-
-// Rule KIND
-ruleKIND returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='>' 
-	{
-        $current = grammarAccess.getKINDAccess().getFIRST_CHILDEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getKINDAccess().getFIRST_CHILDEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='+' 
-	{
-        $current = grammarAccess.getKINDAccess().getSIBLINGEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getKINDAccess().getSIBLINGEnumLiteralDeclaration_1()); 
-    }
-));
-
-
-
-// Rule ATTRIBUTE_OP
-ruleATTRIBUTE_OP returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='=' 
-	{
-        $current = grammarAccess.getATTRIBUTE_OPAccess().getEQUALSEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getATTRIBUTE_OPAccess().getEQUALSEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='~=' 
-	{
-        $current = grammarAccess.getATTRIBUTE_OPAccess().getCONTAINSEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getATTRIBUTE_OPAccess().getCONTAINSEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='!=' 
-	{
-        $current = grammarAccess.getATTRIBUTE_OPAccess().getUNEQUALSEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getATTRIBUTE_OPAccess().getUNEQUALSEnumLiteralDeclaration_2()); 
-    }
-));
-
-
-
-RULE_HASH : '#' ('A'..'Z'|'a'..'z'|'0'..'9')+;
-
-RULE_T_CLASS : '.' RULE_ID;
-
-RULE_T_IMPORTANT : '!important';
-
-RULE_PC_UNIT : '%';
-
-RULE_LEN_UNIT : ('px'|'cm'|'mm'|'in'|'pt'|'pc');
-
-RULE_EM_UNIT : 'em';
-
-RULE_EX_UNIT : 'ex';
-
-RULE_ANGLE_UNIT : ('deg'|'rad'|'grad');
-
-RULE_TIME_UNIT : ('s'|'ms');
-
-RULE_FREQ_UNIT : ('hz'|'mhz');
-
-RULE_T_NUM : (('0'..'9')+|('0'..'9')* '.' ('0'..'9')+);
-
-RULE_ID : '-'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'-')*;
-
-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
-
-RULE_CDO : '<!--';
-
-RULE_CDC : '-->';
-
-RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-
-RULE_WS : (' '|'\t'|'\r'|'\n')+;
-
-RULE_ANY_OTHER : .;
-
-
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.tokens b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.tokens
deleted file mode 100644
index 4bede915ae2..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.tokens
+++ /dev/null
@@ -1,62 +0,0 @@
-RULE_ID=8

-T__29=29

-T__28=28

-T__27=27

-T__26=26

-T__25=25

-T__24=24

-T__23=23

-RULE_PC_UNIT=11

-T__22=22

-RULE_ANY_OTHER=21

-RULE_T_CLASS=19

-RULE_CDC=7

-T__42=42

-RULE_CDO=6

-T__43=43

-T__40=40

-T__41=41

-RULE_FREQ_UNIT=17

-RULE_T_IMPORTANT=9

-RULE_HASH=18

-RULE_ML_COMMENT=20

-T__30=30

-RULE_TIME_UNIT=16

-T__31=31

-RULE_LEN_UNIT=12

-T__32=32

-RULE_STRING=4

-T__33=33

-T__34=34

-T__35=35

-T__36=36

-T__37=37

-T__38=38

-T__39=39

-RULE_T_NUM=10

-RULE_ANGLE_UNIT=15

-RULE_EX_UNIT=14

-RULE_WS=5

-RULE_EM_UNIT=13

-'}'=28

-'/'=35

-'url('=34

-'>'=40

-'{'=27

-'~='=42

-'@charset '=22

-'@media'=26

-';'=23

-'!='=43

-'@import'=24

-'='=41

-':'=30

-'('=32

-'-'=38

-'['=36

-'*'=31

-'+'=39

-','=25

-')'=33

-']'=37

-'@page'=29

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSLexer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSLexer.java
deleted file mode 100644
index 656b8d86377..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSLexer.java
+++ /dev/null
@@ -1,2292 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal;

-

-// Hack: Use our own Lexer superclass by means of import.

-// Currently there is no other way to specify the superclass for the lexer.

-import org.antlr.runtime.BaseRecognizer;

-import org.antlr.runtime.CharStream;

-import org.antlr.runtime.DFA;

-import org.antlr.runtime.EarlyExitException;

-import org.antlr.runtime.IntStream;

-import org.antlr.runtime.MismatchedSetException;

-import org.antlr.runtime.NoViableAltException;

-import org.antlr.runtime.RecognitionException;

-import org.antlr.runtime.RecognizerSharedState;

-import org.eclipse.xtext.parser.antlr.Lexer;

-

-@SuppressWarnings("all")

-public class InternalCSSLexer extends Lexer {

-	public static final int RULE_ID = 8;

-	public static final int T__29 = 29;

-	public static final int T__28 = 28;

-	public static final int T__27 = 27;

-	public static final int T__26 = 26;

-	public static final int T__25 = 25;

-	public static final int T__24 = 24;

-	public static final int RULE_PC_UNIT = 11;

-	public static final int T__23 = 23;

-	public static final int T__22 = 22;

-	public static final int RULE_ANY_OTHER = 21;

-	public static final int RULE_T_CLASS = 19;

-	public static final int EOF = -1;

-	public static final int RULE_CDC = 7;

-	public static final int RULE_CDO = 6;

-	public static final int T__42 = 42;

-	public static final int T__43 = 43;

-	public static final int T__40 = 40;

-	public static final int T__41 = 41;

-	public static final int RULE_FREQ_UNIT = 17;

-	public static final int RULE_T_IMPORTANT = 9;

-	public static final int RULE_HASH = 18;

-	public static final int RULE_ML_COMMENT = 20;

-	public static final int T__30 = 30;

-	public static final int RULE_TIME_UNIT = 16;

-	public static final int T__31 = 31;

-	public static final int RULE_LEN_UNIT = 12;

-	public static final int T__32 = 32;

-	public static final int RULE_STRING = 4;

-	public static final int T__33 = 33;

-	public static final int T__34 = 34;

-	public static final int T__35 = 35;

-	public static final int T__36 = 36;

-	public static final int T__37 = 37;

-	public static final int T__38 = 38;

-	public static final int T__39 = 39;

-	public static final int RULE_T_NUM = 10;

-	public static final int RULE_ANGLE_UNIT = 15;

-	public static final int RULE_EX_UNIT = 14;

-	public static final int RULE_WS = 5;

-	public static final int RULE_EM_UNIT = 13;

-

-	// delegates

-	// delegators

-

-	public InternalCSSLexer() {

-		;

-	}

-

-	public InternalCSSLexer(CharStream input) {

-		this(input, new RecognizerSharedState());

-	}

-

-	public InternalCSSLexer(CharStream input, RecognizerSharedState state) {

-		super(input, state);

-

-	}

-

-	@Override

-	public String getGrammarFileName() {

-		return "../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g";

-	}

-

-	// $ANTLR start "T__22"

-	public final void mT__22() throws RecognitionException {

-		try {

-			int _type = T__22;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:11:7: ( '@charset ' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:11:9: '@charset '

-			{

-				match("@charset ");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__22"

-

-	// $ANTLR start "T__23"

-	public final void mT__23() throws RecognitionException {

-		try {

-			int _type = T__23;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:12:7: ( ';' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:12:9: ';'

-			{

-				match(';');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__23"

-

-	// $ANTLR start "T__24"

-	public final void mT__24() throws RecognitionException {

-		try {

-			int _type = T__24;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:13:7: ( '@import' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:13:9: '@import'

-			{

-				match("@import");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__24"

-

-	// $ANTLR start "T__25"

-	public final void mT__25() throws RecognitionException {

-		try {

-			int _type = T__25;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:14:7: ( ',' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:14:9: ','

-			{

-				match(',');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__25"

-

-	// $ANTLR start "T__26"

-	public final void mT__26() throws RecognitionException {

-		try {

-			int _type = T__26;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:15:7: ( '@media' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:15:9: '@media'

-			{

-				match("@media");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__26"

-

-	// $ANTLR start "T__27"

-	public final void mT__27() throws RecognitionException {

-		try {

-			int _type = T__27;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:16:7: ( '{' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:16:9: '{'

-			{

-				match('{');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__27"

-

-	// $ANTLR start "T__28"

-	public final void mT__28() throws RecognitionException {

-		try {

-			int _type = T__28;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:17:7: ( '}' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:17:9: '}'

-			{

-				match('}');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__28"

-

-	// $ANTLR start "T__29"

-	public final void mT__29() throws RecognitionException {

-		try {

-			int _type = T__29;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:18:7: ( '@page' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:18:9: '@page'

-			{

-				match("@page");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__29"

-

-	// $ANTLR start "T__30"

-	public final void mT__30() throws RecognitionException {

-		try {

-			int _type = T__30;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:19:7: ( ':' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:19:9: ':'

-			{

-				match(':');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__30"

-

-	// $ANTLR start "T__31"

-	public final void mT__31() throws RecognitionException {

-		try {

-			int _type = T__31;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:20:7: ( '*' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:20:9: '*'

-			{

-				match('*');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__31"

-

-	// $ANTLR start "T__32"

-	public final void mT__32() throws RecognitionException {

-		try {

-			int _type = T__32;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:21:7: ( '(' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:21:9: '('

-			{

-				match('(');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__32"

-

-	// $ANTLR start "T__33"

-	public final void mT__33() throws RecognitionException {

-		try {

-			int _type = T__33;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:22:7: ( ')' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:22:9: ')'

-			{

-				match(')');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__33"

-

-	// $ANTLR start "T__34"

-	public final void mT__34() throws RecognitionException {

-		try {

-			int _type = T__34;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:23:7: ( 'url(' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:23:9: 'url('

-			{

-				match("url(");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__34"

-

-	// $ANTLR start "T__35"

-	public final void mT__35() throws RecognitionException {

-		try {

-			int _type = T__35;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:24:7: ( '/' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:24:9: '/'

-			{

-				match('/');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__35"

-

-	// $ANTLR start "T__36"

-	public final void mT__36() throws RecognitionException {

-		try {

-			int _type = T__36;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:25:7: ( '[' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:25:9: '['

-			{

-				match('[');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__36"

-

-	// $ANTLR start "T__37"

-	public final void mT__37() throws RecognitionException {

-		try {

-			int _type = T__37;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:26:7: ( ']' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:26:9: ']'

-			{

-				match(']');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__37"

-

-	// $ANTLR start "T__38"

-	public final void mT__38() throws RecognitionException {

-		try {

-			int _type = T__38;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:27:7: ( '-' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:27:9: '-'

-			{

-				match('-');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__38"

-

-	// $ANTLR start "T__39"

-	public final void mT__39() throws RecognitionException {

-		try {

-			int _type = T__39;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:28:7: ( '+' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:28:9: '+'

-			{

-				match('+');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__39"

-

-	// $ANTLR start "T__40"

-	public final void mT__40() throws RecognitionException {

-		try {

-			int _type = T__40;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:29:7: ( '>' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:29:9: '>'

-			{

-				match('>');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__40"

-

-	// $ANTLR start "T__41"

-	public final void mT__41() throws RecognitionException {

-		try {

-			int _type = T__41;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:30:7: ( '=' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:30:9: '='

-			{

-				match('=');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__41"

-

-	// $ANTLR start "T__42"

-	public final void mT__42() throws RecognitionException {

-		try {

-			int _type = T__42;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:31:7: ( '~=' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:31:9: '~='

-			{

-				match("~=");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__42"

-

-	// $ANTLR start "T__43"

-	public final void mT__43() throws RecognitionException {

-		try {

-			int _type = T__43;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:32:7: ( '!=' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:32:9: '!='

-			{

-				match("!=");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "T__43"

-

-	// $ANTLR start "RULE_HASH"

-	public final void mRULE_HASH() throws RecognitionException {

-		try {

-			int _type = RULE_HASH;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2758:11: ( '#' ( 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' )+ )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2758:13: '#' ( 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' )+

-			{

-				match('#');

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2758:17: ( 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' )+

-				int cnt1 = 0;

-				loop1: do {

-					int alt1 = 2;

-					int LA1_0 = input.LA(1);

-

-					if (((LA1_0 >= '0' && LA1_0 <= '9') || (LA1_0 >= 'A' && LA1_0 <= 'Z') || (LA1_0 >= 'a' && LA1_0 <= 'z'))) {

-						alt1 = 1;

-					}

-

-

-					switch (alt1) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:

-					{

-						if ((input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'Z') || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {

-							input.consume();

-

-						}

-						else {

-							MismatchedSetException mse = new MismatchedSetException(null, input);

-							recover(mse);

-							throw mse;

-						}

-

-

-					}

-						break;

-

-					default:

-						if (cnt1 >= 1) {

-							break loop1;

-						}

-						EarlyExitException eee =

-								new EarlyExitException(1, input);

-						throw eee;

-					}

-					cnt1++;

-				} while (true);

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_HASH"

-

-	// $ANTLR start "RULE_T_CLASS"

-	public final void mRULE_T_CLASS() throws RecognitionException {

-		try {

-			int _type = RULE_T_CLASS;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2760:14: ( '.' RULE_ID )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2760:16: '.' RULE_ID

-			{

-				match('.');

-				mRULE_ID();

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_T_CLASS"

-

-	// $ANTLR start "RULE_T_IMPORTANT"

-	public final void mRULE_T_IMPORTANT() throws RecognitionException {

-		try {

-			int _type = RULE_T_IMPORTANT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2762:18: ( '!important' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2762:20: '!important'

-			{

-				match("!important");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_T_IMPORTANT"

-

-	// $ANTLR start "RULE_PC_UNIT"

-	public final void mRULE_PC_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_PC_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2764:14: ( '%' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2764:16: '%'

-			{

-				match('%');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_PC_UNIT"

-

-	// $ANTLR start "RULE_LEN_UNIT"

-	public final void mRULE_LEN_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_LEN_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2766:15: ( ( 'px' | 'cm' | 'mm' | 'in' | 'pt' | 'pc' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2766:17: ( 'px' | 'cm' | 'mm' | 'in' | 'pt' | 'pc' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2766:17: ( 'px' | 'cm' | 'mm' | 'in' | 'pt' | 'pc' )

-				int alt2 = 6;

-				switch (input.LA(1)) {

-				case 'p': {

-					switch (input.LA(2)) {

-					case 'x': {

-						alt2 = 1;

-					}

-						break;

-					case 't': {

-						alt2 = 5;

-					}

-						break;

-					case 'c': {

-						alt2 = 6;

-					}

-						break;

-					default:

-						NoViableAltException nvae =

-								new NoViableAltException("", 2, 1, input);

-

-						throw nvae;

-					}

-

-				}

-					break;

-				case 'c': {

-					alt2 = 2;

-				}

-					break;

-				case 'm': {

-					alt2 = 3;

-				}

-					break;

-				case 'i': {

-					alt2 = 4;

-				}

-					break;

-				default:

-					NoViableAltException nvae =

-							new NoViableAltException("", 2, 0, input);

-

-					throw nvae;

-				}

-

-				switch (alt2) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2766:18: 'px'

-				{

-					match("px");

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2766:23: 'cm'

-				{

-					match("cm");

-

-

-				}

-					break;

-				case 3:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2766:28: 'mm'

-				{

-					match("mm");

-

-

-				}

-					break;

-				case 4:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2766:33: 'in'

-				{

-					match("in");

-

-

-				}

-					break;

-				case 5:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2766:38: 'pt'

-				{

-					match("pt");

-

-

-				}

-					break;

-				case 6:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2766:43: 'pc'

-				{

-					match("pc");

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_LEN_UNIT"

-

-	// $ANTLR start "RULE_EM_UNIT"

-	public final void mRULE_EM_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_EM_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2768:14: ( 'em' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2768:16: 'em'

-			{

-				match("em");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_EM_UNIT"

-

-	// $ANTLR start "RULE_EX_UNIT"

-	public final void mRULE_EX_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_EX_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2770:14: ( 'ex' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2770:16: 'ex'

-			{

-				match("ex");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_EX_UNIT"

-

-	// $ANTLR start "RULE_ANGLE_UNIT"

-	public final void mRULE_ANGLE_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_ANGLE_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2772:17: ( ( 'deg' | 'rad' | 'grad' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2772:19: ( 'deg' | 'rad' | 'grad' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2772:19: ( 'deg' | 'rad' | 'grad' )

-				int alt3 = 3;

-				switch (input.LA(1)) {

-				case 'd': {

-					alt3 = 1;

-				}

-					break;

-				case 'r': {

-					alt3 = 2;

-				}

-					break;

-				case 'g': {

-					alt3 = 3;

-				}

-					break;

-				default:

-					NoViableAltException nvae =

-							new NoViableAltException("", 3, 0, input);

-

-					throw nvae;

-				}

-

-				switch (alt3) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2772:20: 'deg'

-				{

-					match("deg");

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2772:26: 'rad'

-				{

-					match("rad");

-

-

-				}

-					break;

-				case 3:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2772:32: 'grad'

-				{

-					match("grad");

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_ANGLE_UNIT"

-

-	// $ANTLR start "RULE_TIME_UNIT"

-	public final void mRULE_TIME_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_TIME_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2774:16: ( ( 's' | 'ms' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2774:18: ( 's' | 'ms' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2774:18: ( 's' | 'ms' )

-				int alt4 = 2;

-				int LA4_0 = input.LA(1);

-

-				if ((LA4_0 == 's')) {

-					alt4 = 1;

-				}

-				else if ((LA4_0 == 'm')) {

-					alt4 = 2;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 4, 0, input);

-

-					throw nvae;

-				}

-				switch (alt4) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2774:19: 's'

-				{

-					match('s');

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2774:23: 'ms'

-				{

-					match("ms");

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_TIME_UNIT"

-

-	// $ANTLR start "RULE_FREQ_UNIT"

-	public final void mRULE_FREQ_UNIT() throws RecognitionException {

-		try {

-			int _type = RULE_FREQ_UNIT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2776:16: ( ( 'hz' | 'mhz' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2776:18: ( 'hz' | 'mhz' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2776:18: ( 'hz' | 'mhz' )

-				int alt5 = 2;

-				int LA5_0 = input.LA(1);

-

-				if ((LA5_0 == 'h')) {

-					alt5 = 1;

-				}

-				else if ((LA5_0 == 'm')) {

-					alt5 = 2;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 5, 0, input);

-

-					throw nvae;

-				}

-				switch (alt5) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2776:19: 'hz'

-				{

-					match("hz");

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2776:24: 'mhz'

-				{

-					match("mhz");

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_FREQ_UNIT"

-

-	// $ANTLR start "RULE_T_NUM"

-	public final void mRULE_T_NUM() throws RecognitionException {

-		try {

-			int _type = RULE_T_NUM;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2778:12: ( ( ( '0' .. '9' )+ | ( '0' .. '9' )* '.' ( '0' .. '9' )+ ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2778:14: ( ( '0' .. '9' )+ | ( '0' .. '9' )* '.' ( '0' .. '9' )+ )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2778:14: ( ( '0' .. '9' )+ | ( '0' .. '9' )* '.' ( '0' .. '9' )+ )

-				int alt9 = 2;

-				alt9 = dfa9.predict(input);

-				switch (alt9) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2778:15: ( '0' .. '9' )+

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2778:15: ( '0' .. '9' )+

-					int cnt6 = 0;

-					loop6: do {

-						int alt6 = 2;

-						int LA6_0 = input.LA(1);

-

-						if (((LA6_0 >= '0' && LA6_0 <= '9'))) {

-							alt6 = 1;

-						}

-

-

-						switch (alt6) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2778:16: '0' .. '9'

-						{

-							matchRange('0', '9');

-

-						}

-							break;

-

-						default:

-							if (cnt6 >= 1) {

-								break loop6;

-							}

-							EarlyExitException eee =

-									new EarlyExitException(6, input);

-							throw eee;

-						}

-						cnt6++;

-					} while (true);

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2778:27: ( '0' .. '9' )* '.' ( '0' .. '9' )+

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2778:27: ( '0' .. '9' )*

-					loop7: do {

-						int alt7 = 2;

-						int LA7_0 = input.LA(1);

-

-						if (((LA7_0 >= '0' && LA7_0 <= '9'))) {

-							alt7 = 1;

-						}

-

-

-						switch (alt7) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2778:28: '0' .. '9'

-						{

-							matchRange('0', '9');

-

-						}

-							break;

-

-						default:

-							break loop7;

-						}

-					} while (true);

-

-					match('.');

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2778:43: ( '0' .. '9' )+

-					int cnt8 = 0;

-					loop8: do {

-						int alt8 = 2;

-						int LA8_0 = input.LA(1);

-

-						if (((LA8_0 >= '0' && LA8_0 <= '9'))) {

-							alt8 = 1;

-						}

-

-

-						switch (alt8) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2778:44: '0' .. '9'

-						{

-							matchRange('0', '9');

-

-						}

-							break;

-

-						default:

-							if (cnt8 >= 1) {

-								break loop8;

-							}

-							EarlyExitException eee =

-									new EarlyExitException(8, input);

-							throw eee;

-						}

-						cnt8++;

-					} while (true);

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_T_NUM"

-

-	// $ANTLR start "RULE_ID"

-	public final void mRULE_ID() throws RecognitionException {

-		try {

-			int _type = RULE_ID;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:9: ( ( '-' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )* )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:11: ( '-' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )*

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:11: ( '-' )?

-				int alt10 = 2;

-				int LA10_0 = input.LA(1);

-

-				if ((LA10_0 == '-')) {

-					alt10 = 1;

-				}

-				switch (alt10) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:11: '-'

-				{

-					match('-');

-

-				}

-					break;

-

-				}

-

-				if ((input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {

-					input.consume();

-

-				}

-				else {

-					MismatchedSetException mse = new MismatchedSetException(null, input);

-					recover(mse);

-					throw mse;

-				}

-

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )*

-				loop11: do {

-					int alt11 = 2;

-					int LA11_0 = input.LA(1);

-

-					if ((LA11_0 == '-' || (LA11_0 >= '0' && LA11_0 <= '9') || (LA11_0 >= 'A' && LA11_0 <= 'Z') || LA11_0 == '_' || (LA11_0 >= 'a' && LA11_0 <= 'z'))) {

-						alt11 = 1;

-					}

-

-

-					switch (alt11) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:

-					{

-						if (input.LA(1) == '-' || (input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z')) {

-							input.consume();

-

-						}

-						else {

-							MismatchedSetException mse = new MismatchedSetException(null, input);

-							recover(mse);

-							throw mse;

-						}

-

-

-					}

-						break;

-

-					default:

-						break loop11;

-					}

-				} while (true);

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_ID"

-

-	// $ANTLR start "RULE_STRING"

-	public final void mRULE_STRING() throws RecognitionException {

-		try {

-			int _type = RULE_STRING;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*

-			// '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'

-			// | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*

-				// '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

-				int alt14 = 2;

-				int LA14_0 = input.LA(1);

-

-				if ((LA14_0 == '\"')) {

-					alt14 = 1;

-				}

-				else if ((LA14_0 == '\'')) {

-					alt14 = 2;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 14, 0, input);

-

-					throw nvae;

-				}

-				switch (alt14) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*

-				// '\"'

-				{

-					match('\"');

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*

-					loop12: do {

-						int alt12 = 3;

-						int LA12_0 = input.LA(1);

-

-						if ((LA12_0 == '\\')) {

-							alt12 = 1;

-						}

-						else if (((LA12_0 >= '\u0000' && LA12_0 <= '!') || (LA12_0 >= '#' && LA12_0 <= '[') || (LA12_0 >= ']' && LA12_0 <= '\uFFFF'))) {

-							alt12 = 2;

-						}

-

-

-						switch (alt12) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )

-						{

-							match('\\');

-							if (input.LA(1) == '\"' || input.LA(1) == '\'' || input.LA(1) == '\\' || input.LA(1) == 'b' || input.LA(1) == 'f' || input.LA(1) == 'n' || input.LA(1) == 'r' || (input.LA(1) >= 't' && input.LA(1) <= 'u')) {

-								input.consume();

-

-							}

-							else {

-								MismatchedSetException mse = new MismatchedSetException(null, input);

-								recover(mse);

-								throw mse;

-							}

-

-

-						}

-							break;

-						case 2:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:66: ~ ( ( '\\\\' | '\"' ) )

-						{

-							if ((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) {

-								input.consume();

-

-							}

-							else {

-								MismatchedSetException mse = new MismatchedSetException(null, input);

-								recover(mse);

-								throw mse;

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop12;

-						}

-					} while (true);

-

-					match('\"');

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*

-				// '\\''

-				{

-					match('\'');

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*

-					loop13: do {

-						int alt13 = 3;

-						int LA13_0 = input.LA(1);

-

-						if ((LA13_0 == '\\')) {

-							alt13 = 1;

-						}

-						else if (((LA13_0 >= '\u0000' && LA13_0 <= '&') || (LA13_0 >= '(' && LA13_0 <= '[') || (LA13_0 >= ']' && LA13_0 <= '\uFFFF'))) {

-							alt13 = 2;

-						}

-

-

-						switch (alt13) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )

-						{

-							match('\\');

-							if (input.LA(1) == '\"' || input.LA(1) == '\'' || input.LA(1) == '\\' || input.LA(1) == 'b' || input.LA(1) == 'f' || input.LA(1) == 'n' || input.LA(1) == 'r' || (input.LA(1) >= 't' && input.LA(1) <= 'u')) {

-								input.consume();

-

-							}

-							else {

-								MismatchedSetException mse = new MismatchedSetException(null, input);

-								recover(mse);

-								throw mse;

-							}

-

-

-						}

-							break;

-						case 2:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:137: ~ ( ( '\\\\' | '\\'' ) )

-						{

-							if ((input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) {

-								input.consume();

-

-							}

-							else {

-								MismatchedSetException mse = new MismatchedSetException(null, input);

-								recover(mse);

-								throw mse;

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop13;

-						}

-					} while (true);

-

-					match('\'');

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_STRING"

-

-	// $ANTLR start "RULE_CDO"

-	public final void mRULE_CDO() throws RecognitionException {

-		try {

-			int _type = RULE_CDO;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2784:10: ( '<!--' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2784:12: '<!--'

-			{

-				match("<!--");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_CDO"

-

-	// $ANTLR start "RULE_CDC"

-	public final void mRULE_CDC() throws RecognitionException {

-		try {

-			int _type = RULE_CDC;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2786:10: ( '-->' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2786:12: '-->'

-			{

-				match("-->");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_CDC"

-

-	// $ANTLR start "RULE_ML_COMMENT"

-	public final void mRULE_ML_COMMENT() throws RecognitionException {

-		try {

-			int _type = RULE_ML_COMMENT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2788:17: ( '/*' ( options {greedy=false; } : . )* '*/' )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2788:19: '/*' ( options {greedy=false; } : . )* '*/'

-			{

-				match("/*");

-

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2788:24: ( options {greedy=false; } : . )*

-				loop15: do {

-					int alt15 = 2;

-					int LA15_0 = input.LA(1);

-

-					if ((LA15_0 == '*')) {

-						int LA15_1 = input.LA(2);

-

-						if ((LA15_1 == '/')) {

-							alt15 = 2;

-						}

-						else if (((LA15_1 >= '\u0000' && LA15_1 <= '.') || (LA15_1 >= '0' && LA15_1 <= '\uFFFF'))) {

-							alt15 = 1;

-						}

-

-

-					}

-					else if (((LA15_0 >= '\u0000' && LA15_0 <= ')') || (LA15_0 >= '+' && LA15_0 <= '\uFFFF'))) {

-						alt15 = 1;

-					}

-

-

-					switch (alt15) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2788:52: .

-					{

-						matchAny();

-

-					}

-						break;

-

-					default:

-						break loop15;

-					}

-				} while (true);

-

-				match("*/");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_ML_COMMENT"

-

-	// $ANTLR start "RULE_WS"

-	public final void mRULE_WS() throws RecognitionException {

-		try {

-			int _type = RULE_WS;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2790:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2790:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2790:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

-				int cnt16 = 0;

-				loop16: do {

-					int alt16 = 2;

-					int LA16_0 = input.LA(1);

-

-					if (((LA16_0 >= '\t' && LA16_0 <= '\n') || LA16_0 == '\r' || LA16_0 == ' ')) {

-						alt16 = 1;

-					}

-

-

-					switch (alt16) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:

-					{

-						if ((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') {

-							input.consume();

-

-						}

-						else {

-							MismatchedSetException mse = new MismatchedSetException(null, input);

-							recover(mse);

-							throw mse;

-						}

-

-

-					}

-						break;

-

-					default:

-						if (cnt16 >= 1) {

-							break loop16;

-						}

-						EarlyExitException eee =

-								new EarlyExitException(16, input);

-						throw eee;

-					}

-					cnt16++;

-				} while (true);

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_WS"

-

-	// $ANTLR start "RULE_ANY_OTHER"

-	public final void mRULE_ANY_OTHER() throws RecognitionException {

-		try {

-			int _type = RULE_ANY_OTHER;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2792:16: ( . )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2792:18: .

-			{

-				matchAny();

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-

-	// $ANTLR end "RULE_ANY_OTHER"

-

-	@Override

-	public void mTokens() throws RecognitionException {

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:8: ( T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36

-		// | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_HASH | RULE_T_CLASS | RULE_T_IMPORTANT | RULE_PC_UNIT | RULE_LEN_UNIT | RULE_EM_UNIT | RULE_EX_UNIT | RULE_ANGLE_UNIT | RULE_TIME_UNIT | RULE_FREQ_UNIT | RULE_T_NUM | RULE_ID |

-		// RULE_STRING | RULE_CDO | RULE_CDC | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER )

-		int alt17 = 40;

-		alt17 = dfa17.predict(input);

-		switch (alt17) {

-		case 1:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:10: T__22

-		{

-			mT__22();

-

-		}

-			break;

-		case 2:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:16: T__23

-		{

-			mT__23();

-

-		}

-			break;

-		case 3:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:22: T__24

-		{

-			mT__24();

-

-		}

-			break;

-		case 4:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:28: T__25

-		{

-			mT__25();

-

-		}

-			break;

-		case 5:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:34: T__26

-		{

-			mT__26();

-

-		}

-			break;

-		case 6:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:40: T__27

-		{

-			mT__27();

-

-		}

-			break;

-		case 7:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:46: T__28

-		{

-			mT__28();

-

-		}

-			break;

-		case 8:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:52: T__29

-		{

-			mT__29();

-

-		}

-			break;

-		case 9:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:58: T__30

-		{

-			mT__30();

-

-		}

-			break;

-		case 10:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:64: T__31

-		{

-			mT__31();

-

-		}

-			break;

-		case 11:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:70: T__32

-		{

-			mT__32();

-

-		}

-			break;

-		case 12:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:76: T__33

-		{

-			mT__33();

-

-		}

-			break;

-		case 13:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:82: T__34

-		{

-			mT__34();

-

-		}

-			break;

-		case 14:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:88: T__35

-		{

-			mT__35();

-

-		}

-			break;

-		case 15:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:94: T__36

-		{

-			mT__36();

-

-		}

-			break;

-		case 16:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:100: T__37

-		{

-			mT__37();

-

-		}

-			break;

-		case 17:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:106: T__38

-		{

-			mT__38();

-

-		}

-			break;

-		case 18:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:112: T__39

-		{

-			mT__39();

-

-		}

-			break;

-		case 19:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:118: T__40

-		{

-			mT__40();

-

-		}

-			break;

-		case 20:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:124: T__41

-		{

-			mT__41();

-

-		}

-			break;

-		case 21:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:130: T__42

-		{

-			mT__42();

-

-		}

-			break;

-		case 22:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:136: T__43

-		{

-			mT__43();

-

-		}

-			break;

-		case 23:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:142: RULE_HASH

-		{

-			mRULE_HASH();

-

-		}

-			break;

-		case 24:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:152: RULE_T_CLASS

-		{

-			mRULE_T_CLASS();

-

-		}

-			break;

-		case 25:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:165: RULE_T_IMPORTANT

-		{

-			mRULE_T_IMPORTANT();

-

-		}

-			break;

-		case 26:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:182: RULE_PC_UNIT

-		{

-			mRULE_PC_UNIT();

-

-		}

-			break;

-		case 27:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:195: RULE_LEN_UNIT

-		{

-			mRULE_LEN_UNIT();

-

-		}

-			break;

-		case 28:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:209: RULE_EM_UNIT

-		{

-			mRULE_EM_UNIT();

-

-		}

-			break;

-		case 29:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:222: RULE_EX_UNIT

-		{

-			mRULE_EX_UNIT();

-

-		}

-			break;

-		case 30:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:235: RULE_ANGLE_UNIT

-		{

-			mRULE_ANGLE_UNIT();

-

-		}

-			break;

-		case 31:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:251: RULE_TIME_UNIT

-		{

-			mRULE_TIME_UNIT();

-

-		}

-			break;

-		case 32:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:266: RULE_FREQ_UNIT

-		{

-			mRULE_FREQ_UNIT();

-

-		}

-			break;

-		case 33:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:281: RULE_T_NUM

-		{

-			mRULE_T_NUM();

-

-		}

-			break;

-		case 34:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:292: RULE_ID

-		{

-			mRULE_ID();

-

-		}

-			break;

-		case 35:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:300: RULE_STRING

-		{

-			mRULE_STRING();

-

-		}

-			break;

-		case 36:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:312: RULE_CDO

-		{

-			mRULE_CDO();

-

-		}

-			break;

-		case 37:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:321: RULE_CDC

-		{

-			mRULE_CDC();

-

-		}

-			break;

-		case 38:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:330: RULE_ML_COMMENT

-		{

-			mRULE_ML_COMMENT();

-

-		}

-			break;

-		case 39:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:346: RULE_WS

-		{

-			mRULE_WS();

-

-		}

-			break;

-		case 40:

-		// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:354: RULE_ANY_OTHER

-		{

-			mRULE_ANY_OTHER();

-

-		}

-			break;

-

-		}

-

-	}

-

-

-	protected DFA9 dfa9 = new DFA9(this);

-	protected DFA17 dfa17 = new DFA17(this);

-	static final String DFA9_eotS =

-			"\1\uffff\1\3\2\uffff";

-	static final String DFA9_eofS =

-			"\4\uffff";

-	static final String DFA9_minS =

-			"\2\56\2\uffff";

-	static final String DFA9_maxS =

-			"\2\71\2\uffff";

-	static final String DFA9_acceptS =

-			"\2\uffff\1\2\1\1";

-	static final String DFA9_specialS =

-			"\4\uffff}>";

-	static final String[] DFA9_transitionS = {

-			"\1\2\1\uffff\12\1",

-			"\1\2\1\uffff\12\1",

-			"",

-			""

-	};

-

-	static final short[] DFA9_eot = DFA.unpackEncodedString(DFA9_eotS);

-	static final short[] DFA9_eof = DFA.unpackEncodedString(DFA9_eofS);

-	static final char[] DFA9_min = DFA.unpackEncodedStringToUnsignedChars(DFA9_minS);

-	static final char[] DFA9_max = DFA.unpackEncodedStringToUnsignedChars(DFA9_maxS);

-	static final short[] DFA9_accept = DFA.unpackEncodedString(DFA9_acceptS);

-	static final short[] DFA9_special = DFA.unpackEncodedString(DFA9_specialS);

-	static final short[][] DFA9_transition;

-

-	static {

-		int numStates = DFA9_transitionS.length;

-		DFA9_transition = new short[numStates][];

-		for (int i = 0; i < numStates; i++) {

-			DFA9_transition[i] = DFA.unpackEncodedString(DFA9_transitionS[i]);

-		}

-	}

-

-	class DFA9 extends DFA {

-

-		public DFA9(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 9;

-			this.eot = DFA9_eot;

-			this.eof = DFA9_eof;

-			this.min = DFA9_min;

-			this.max = DFA9_max;

-			this.accept = DFA9_accept;

-			this.special = DFA9_special;

-			this.transition = DFA9_transition;

-		}

-

-		@Override

-		public String getDescription() {

-			return "2778:14: ( ( '0' .. '9' )+ | ( '0' .. '9' )* '.' ( '0' .. '9' )+ )";

-		}

-	}

-

-	static final String DFA17_eotS =

-			"\1\uffff\1\47\10\uffff\1\65\1\67\2\uffff\1\73\3\uffff\4\47\1\uffff" +

-					"\10\65\1\123\1\65\2\uffff\3\47\16\uffff\1\65\21\uffff\5\131\1\123" +

-					"\1\65\1\131\1\133\1\134\3\65\1\uffff\1\140\3\uffff\1\65\1\uffff" +

-					"\1\140\2\uffff\2\142\1\65\3\uffff\1\142";

-	static final String DFA17_eofS =

-			"\144\uffff";

-	static final String DFA17_minS =

-			"\1\0\1\143\10\uffff\1\162\1\52\2\uffff\1\55\3\uffff\2\75\1\60\1" +

-					"\55\1\uffff\1\143\1\155\1\150\1\156\1\155\1\145\1\141\1\162\1\55" +

-					"\1\172\2\uffff\2\0\1\41\16\uffff\1\154\21\uffff\6\55\1\172\3\55" +

-					"\1\147\1\144\1\141\1\uffff\1\55\3\uffff\1\50\1\uffff\1\55\2\uffff" +

-					"\2\55\1\144\3\uffff\1\55";

-	static final String DFA17_maxS =

-			"\1\uffff\1\160\10\uffff\1\162\1\52\2\uffff\1\172\3\uffff\1\75\1" +

-					"\151\2\172\1\uffff\1\170\1\155\1\163\1\156\1\170\1\145\1\141\1\162" +

-					"\2\172\2\uffff\2\uffff\1\41\16\uffff\1\154\21\uffff\12\172\1\147" +

-					"\1\144\1\141\1\uffff\1\172\3\uffff\1\50\1\uffff\1\172\2\uffff\2" +

-					"\172\1\144\3\uffff\1\172";

-	static final String DFA17_acceptS =

-			"\2\uffff\1\2\1\4\1\6\1\7\1\11\1\12\1\13\1\14\2\uffff\1\17\1\20" +

-					"\1\uffff\1\22\1\23\1\24\4\uffff\1\32\12\uffff\1\41\1\42\3\uffff" +

-					"\1\47\1\50\1\1\1\3\1\5\1\10\1\2\1\4\1\6\1\7\1\11\1\12\1\13\1\14" +

-					"\1\uffff\1\42\1\46\1\16\1\17\1\20\1\45\1\21\1\22\1\23\1\24\1\25" +

-					"\1\26\1\31\1\27\1\41\1\30\1\32\15\uffff\1\37\1\uffff\1\43\1\44\1" +

-					"\47\1\uffff\1\33\1\uffff\1\34\1\35\3\uffff\1\40\1\15\1\36\1\uffff";

-	static final String DFA17_specialS =

-			"\1\1\42\uffff\1\2\1\0\77\uffff}>";

-	static final String[] DFA17_transitionS = {

-			"\11\47\2\46\2\47\1\46\22\47\1\46\1\23\1\43\1\24\1\47\1\26\1" +

-					"\47\1\44\1\10\1\11\1\7\1\17\1\3\1\16\1\25\1\13\12\41\1\6\1\2" +

-					"\1\45\1\21\1\20\1\47\1\1\32\42\1\14\1\47\1\15\1\47\1\42\1\47" +

-					"\2\42\1\30\1\34\1\33\1\42\1\36\1\40\1\32\3\42\1\31\2\42\1\27" +

-					"\1\42\1\35\1\37\1\42\1\12\5\42\1\4\1\47\1\5\1\22\uff81\47",

-			"\1\50\5\uffff\1\51\3\uffff\1\52\2\uffff\1\53",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\1\64",

-			"\1\66",

-			"",

-			"",

-			"\1\72\23\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

-			"",

-			"",

-			"",

-			"\1\77",

-			"\1\100\53\uffff\1\101",

-			"\12\102\7\uffff\32\102\6\uffff\32\102",

-			"\1\104\2\uffff\12\103\7\uffff\32\104\4\uffff\1\104\1\uffff" +

-					"\32\104",

-			"",

-			"\1\110\20\uffff\1\107\3\uffff\1\106",

-			"\1\111",

-			"\1\114\4\uffff\1\112\5\uffff\1\113",

-			"\1\115",

-			"\1\116\12\uffff\1\117",

-			"\1\120",

-			"\1\121",

-			"\1\122",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"\1\124",

-			"",

-			"",

-			"\0\125",

-			"\0\125",

-			"\1\126",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\1\130",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"\1\132",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"\1\135",

-			"\1\136",

-			"\1\137",

-			"",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"",

-			"",

-			"",

-			"\1\141",

-			"",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"",

-			"",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65",

-			"\1\143",

-			"",

-			"",

-			"",

-			"\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32" +

-					"\65"

-	};

-

-	static final short[] DFA17_eot = DFA.unpackEncodedString(DFA17_eotS);

-	static final short[] DFA17_eof = DFA.unpackEncodedString(DFA17_eofS);

-	static final char[] DFA17_min = DFA.unpackEncodedStringToUnsignedChars(DFA17_minS);

-	static final char[] DFA17_max = DFA.unpackEncodedStringToUnsignedChars(DFA17_maxS);

-	static final short[] DFA17_accept = DFA.unpackEncodedString(DFA17_acceptS);

-	static final short[] DFA17_special = DFA.unpackEncodedString(DFA17_specialS);

-	static final short[][] DFA17_transition;

-

-	static {

-		int numStates = DFA17_transitionS.length;

-		DFA17_transition = new short[numStates][];

-		for (int i = 0; i < numStates; i++) {

-			DFA17_transition[i] = DFA.unpackEncodedString(DFA17_transitionS[i]);

-		}

-	}

-

-	class DFA17 extends DFA {

-

-		public DFA17(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 17;

-			this.eot = DFA17_eot;

-			this.eof = DFA17_eof;

-			this.min = DFA17_min;

-			this.max = DFA17_max;

-			this.accept = DFA17_accept;

-			this.special = DFA17_special;

-			this.transition = DFA17_transition;

-		}

-

-		@Override

-		public String getDescription() {

-			return "1:1: Tokens : ( T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_HASH | RULE_T_CLASS | RULE_T_IMPORTANT | RULE_PC_UNIT | RULE_LEN_UNIT | RULE_EM_UNIT | RULE_EX_UNIT | RULE_ANGLE_UNIT | RULE_TIME_UNIT | RULE_FREQ_UNIT | RULE_T_NUM | RULE_ID | RULE_STRING | RULE_CDO | RULE_CDC | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER );";

-		}

-

-		@Override

-		public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {

-			IntStream input = _input;

-			int _s = s;

-			switch (s) {

-			case 0:

-				int LA17_36 = input.LA(1);

-

-				s = -1;

-				if (((LA17_36 >= '\u0000' && LA17_36 <= '\uFFFF'))) {

-					s = 85;

-				} else {

-					s = 39;

-				}

-

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 1:

-				int LA17_0 = input.LA(1);

-

-				s = -1;

-				if ((LA17_0 == '@')) {

-					s = 1;

-				}

-

-				else if ((LA17_0 == ';')) {

-					s = 2;

-				}

-

-				else if ((LA17_0 == ',')) {

-					s = 3;

-				}

-

-				else if ((LA17_0 == '{')) {

-					s = 4;

-				}

-

-				else if ((LA17_0 == '}')) {

-					s = 5;

-				}

-

-				else if ((LA17_0 == ':')) {

-					s = 6;

-				}

-

-				else if ((LA17_0 == '*')) {

-					s = 7;

-				}

-

-				else if ((LA17_0 == '(')) {

-					s = 8;

-				}

-

-				else if ((LA17_0 == ')')) {

-					s = 9;

-				}

-

-				else if ((LA17_0 == 'u')) {

-					s = 10;

-				}

-

-				else if ((LA17_0 == '/')) {

-					s = 11;

-				}

-

-				else if ((LA17_0 == '[')) {

-					s = 12;

-				}

-

-				else if ((LA17_0 == ']')) {

-					s = 13;

-				}

-

-				else if ((LA17_0 == '-')) {

-					s = 14;

-				}

-

-				else if ((LA17_0 == '+')) {

-					s = 15;

-				}

-

-				else if ((LA17_0 == '>')) {

-					s = 16;

-				}

-

-				else if ((LA17_0 == '=')) {

-					s = 17;

-				}

-

-				else if ((LA17_0 == '~')) {

-					s = 18;

-				}

-

-				else if ((LA17_0 == '!')) {

-					s = 19;

-				}

-

-				else if ((LA17_0 == '#')) {

-					s = 20;

-				}

-

-				else if ((LA17_0 == '.')) {

-					s = 21;

-				}

-

-				else if ((LA17_0 == '%')) {

-					s = 22;

-				}

-

-				else if ((LA17_0 == 'p')) {

-					s = 23;

-				}

-

-				else if ((LA17_0 == 'c')) {

-					s = 24;

-				}

-

-				else if ((LA17_0 == 'm')) {

-					s = 25;

-				}

-

-				else if ((LA17_0 == 'i')) {

-					s = 26;

-				}

-

-				else if ((LA17_0 == 'e')) {

-					s = 27;

-				}

-

-				else if ((LA17_0 == 'd')) {

-					s = 28;

-				}

-

-				else if ((LA17_0 == 'r')) {

-					s = 29;

-				}

-

-				else if ((LA17_0 == 'g')) {

-					s = 30;

-				}

-

-				else if ((LA17_0 == 's')) {

-					s = 31;

-				}

-

-				else if ((LA17_0 == 'h')) {

-					s = 32;

-				}

-

-				else if (((LA17_0 >= '0' && LA17_0 <= '9'))) {

-					s = 33;

-				}

-

-				else if (((LA17_0 >= 'A' && LA17_0 <= 'Z') || LA17_0 == '_' || (LA17_0 >= 'a' && LA17_0 <= 'b') || LA17_0 == 'f' || (LA17_0 >= 'j' && LA17_0 <= 'l') || (LA17_0 >= 'n' && LA17_0 <= 'o') || LA17_0 == 'q' || LA17_0 == 't' || (LA17_0 >= 'v' && LA17_0 <= 'z'))) {

-					s = 34;

-				}

-

-				else if ((LA17_0 == '\"')) {

-					s = 35;

-				}

-

-				else if ((LA17_0 == '\'')) {

-					s = 36;

-				}

-

-				else if ((LA17_0 == '<')) {

-					s = 37;

-				}

-

-				else if (((LA17_0 >= '\t' && LA17_0 <= '\n') || LA17_0 == '\r' || LA17_0 == ' ')) {

-					s = 38;

-				}

-

-				else if (((LA17_0 >= '\u0000' && LA17_0 <= '\b') || (LA17_0 >= '\u000B' && LA17_0 <= '\f') || (LA17_0 >= '\u000E' && LA17_0 <= '\u001F') || LA17_0 == '$' || LA17_0 == '&' || LA17_0 == '?' || LA17_0 == '\\' || LA17_0 == '^' || LA17_0 == '`'

-						|| LA17_0 == '|' || (LA17_0 >= '\u007F' && LA17_0 <= '\uFFFF'))) {

-					s = 39;

-				}

-

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 2:

-				int LA17_35 = input.LA(1);

-

-				s = -1;

-				if (((LA17_35 >= '\u0000' && LA17_35 <= '\uFFFF'))) {

-					s = 85;

-				} else {

-					s = 39;

-				}

-

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			}

-			NoViableAltException nvae =

-					new NoViableAltException(getDescription(), 17, _s, input);

-			error(nvae);

-			throw nvae;

-		}

-	}

-

-

-}
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSParser.java
deleted file mode 100644
index 832690bc123..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSParser.java
+++ /dev/null
@@ -1,8415 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal;

-

-import org.antlr.runtime.BaseRecognizer;

-import org.antlr.runtime.BitSet;

-import org.antlr.runtime.DFA;

-import org.antlr.runtime.EarlyExitException;

-import org.antlr.runtime.NoViableAltException;

-import org.antlr.runtime.RecognitionException;

-import org.antlr.runtime.RecognizerSharedState;

-import org.antlr.runtime.Token;

-import org.antlr.runtime.TokenStream;

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

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

-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;

-import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;

-import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;

-

-@SuppressWarnings("all")

-public class InternalCSSParser extends AbstractInternalAntlrParser {

-	public static final String[] tokenNames = new String[] {

-			"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_WS", "RULE_CDO", "RULE_CDC", "RULE_ID", "RULE_T_IMPORTANT", "RULE_T_NUM", "RULE_PC_UNIT", "RULE_LEN_UNIT", "RULE_EM_UNIT", "RULE_EX_UNIT", "RULE_ANGLE_UNIT", "RULE_TIME_UNIT",

-			"RULE_FREQ_UNIT", "RULE_HASH", "RULE_T_CLASS", "RULE_ML_COMMENT", "RULE_ANY_OTHER", "'@charset '", "';'", "'@import'", "','", "'@media'", "'{'", "'}'", "'@page'", "':'", "'*'", "'('", "')'", "'url('", "'/'", "'['", "']'", "'-'", "'+'", "'>'",

-			"'='", "'~='", "'!='"

-	};

-	public static final int RULE_ID = 8;

-	public static final int T__29 = 29;

-	public static final int T__28 = 28;

-	public static final int T__27 = 27;

-	public static final int T__26 = 26;

-	public static final int T__25 = 25;

-	public static final int T__24 = 24;

-	public static final int T__23 = 23;

-	public static final int RULE_PC_UNIT = 11;

-	public static final int T__22 = 22;

-	public static final int RULE_ANY_OTHER = 21;

-	public static final int RULE_T_CLASS = 19;

-	public static final int EOF = -1;

-	public static final int RULE_CDC = 7;

-	public static final int T__42 = 42;

-	public static final int RULE_CDO = 6;

-	public static final int T__43 = 43;

-	public static final int T__40 = 40;

-	public static final int T__41 = 41;

-	public static final int RULE_FREQ_UNIT = 17;

-	public static final int RULE_T_IMPORTANT = 9;

-	public static final int RULE_HASH = 18;

-	public static final int RULE_ML_COMMENT = 20;

-	public static final int T__30 = 30;

-	public static final int RULE_TIME_UNIT = 16;

-	public static final int T__31 = 31;

-	public static final int RULE_LEN_UNIT = 12;

-	public static final int T__32 = 32;

-	public static final int RULE_STRING = 4;

-	public static final int T__33 = 33;

-	public static final int T__34 = 34;

-	public static final int T__35 = 35;

-	public static final int T__36 = 36;

-	public static final int T__37 = 37;

-	public static final int T__38 = 38;

-	public static final int T__39 = 39;

-	public static final int RULE_T_NUM = 10;

-	public static final int RULE_ANGLE_UNIT = 15;

-	public static final int RULE_EX_UNIT = 14;

-	public static final int RULE_WS = 5;

-	public static final int RULE_EM_UNIT = 13;

-

-	// delegates

-	// delegators

-

-

-	public InternalCSSParser(TokenStream input) {

-		this(input, new RecognizerSharedState());

-	}

-

-	public InternalCSSParser(TokenStream input, RecognizerSharedState state) {

-		super(input, state);

-

-	}

-

-

-	@Override

-	public String[] getTokenNames() {

-		return InternalCSSParser.tokenNames;

-	}

-

-	@Override

-	public String getGrammarFileName() {

-		return "../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g";

-	}

-

-

-

-	private CSSGrammarAccess grammarAccess;

-

-	public InternalCSSParser(TokenStream input, CSSGrammarAccess grammarAccess) {

-		this(input);

-		this.grammarAccess = grammarAccess;

-		registerRules(grammarAccess.getGrammar());

-	}

-

-	@Override

-	protected String getFirstRuleName() {

-		return "Stylesheet";

-	}

-

-	@Override

-	protected CSSGrammarAccess getGrammarAccess() {

-		return grammarAccess;

-	}

-

-

-

-	// $ANTLR start "entryRuleStylesheet"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:68:1: entryRuleStylesheet returns [EObject current=null] : iv_ruleStylesheet= ruleStylesheet EOF ;

-	public final EObject entryRuleStylesheet() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleStylesheet = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:69:2: (iv_ruleStylesheet= ruleStylesheet EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:70:2: iv_ruleStylesheet= ruleStylesheet EOF

-			{

-				newCompositeNode(grammarAccess.getStylesheetRule());

-				pushFollow(FOLLOW_ruleStylesheet_in_entryRuleStylesheet75);

-				iv_ruleStylesheet = ruleStylesheet();

-

-				state._fsp--;

-

-				current = iv_ruleStylesheet;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleStylesheet85);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleStylesheet"

-

-

-	// $ANTLR start "ruleStylesheet"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:77:1: ruleStylesheet returns [EObject current=null] : ( (otherlv_0= '@charset ' ( (lv_charset_1_0= RULE_STRING ) ) otherlv_2=

-	// ';' )? (this_WS_3= RULE_WS | this_CDO_4= RULE_CDO | this_CDC_5= RULE_CDC )* ( ( (lv_imports_6_0= ruleImport ) ) ( (this_CDO_7= RULE_CDO (this_WS_8= RULE_WS )* ) | (this_CDC_9= RULE_CDC (this_WS_10= RULE_WS )* ) )* )* ( ( (lv_contents_11_0= ruleContent )

-	// ) ( (this_CDO_12= RULE_CDO (this_WS_13= RULE_WS )* ) | (this_CDC_14= RULE_CDC (this_WS_15= RULE_WS )* ) )* )* ) ;

-	public final EObject ruleStylesheet() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_0 = null;

-		Token lv_charset_1_0 = null;

-		Token otherlv_2 = null;

-		Token this_WS_3 = null;

-		Token this_CDO_4 = null;

-		Token this_CDC_5 = null;

-		Token this_CDO_7 = null;

-		Token this_WS_8 = null;

-		Token this_CDC_9 = null;

-		Token this_WS_10 = null;

-		Token this_CDO_12 = null;

-		Token this_WS_13 = null;

-		Token this_CDC_14 = null;

-		Token this_WS_15 = null;

-		EObject lv_imports_6_0 = null;

-

-		EObject lv_contents_11_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:80:28: ( ( (otherlv_0= '@charset ' ( (lv_charset_1_0= RULE_STRING ) ) otherlv_2= ';' )? (this_WS_3= RULE_WS |

-			// this_CDO_4= RULE_CDO | this_CDC_5= RULE_CDC )* ( ( (lv_imports_6_0= ruleImport ) ) ( (this_CDO_7= RULE_CDO (this_WS_8= RULE_WS )* ) | (this_CDC_9= RULE_CDC (this_WS_10= RULE_WS )* ) )* )* ( ( (lv_contents_11_0= ruleContent ) ) ( (this_CDO_12=

-			// RULE_CDO (this_WS_13= RULE_WS )* ) | (this_CDC_14= RULE_CDC (this_WS_15= RULE_WS )* ) )* )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:81:1: ( (otherlv_0= '@charset ' ( (lv_charset_1_0= RULE_STRING ) ) otherlv_2= ';' )? (this_WS_3= RULE_WS | this_CDO_4=

-			// RULE_CDO | this_CDC_5= RULE_CDC )* ( ( (lv_imports_6_0= ruleImport ) ) ( (this_CDO_7= RULE_CDO (this_WS_8= RULE_WS )* ) | (this_CDC_9= RULE_CDC (this_WS_10= RULE_WS )* ) )* )* ( ( (lv_contents_11_0= ruleContent ) ) ( (this_CDO_12= RULE_CDO

-			// (this_WS_13= RULE_WS )* ) | (this_CDC_14= RULE_CDC (this_WS_15= RULE_WS )* ) )* )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:81:1: ( (otherlv_0= '@charset ' ( (lv_charset_1_0= RULE_STRING ) ) otherlv_2= ';' )? (this_WS_3= RULE_WS |

-				// this_CDO_4= RULE_CDO | this_CDC_5= RULE_CDC )* ( ( (lv_imports_6_0= ruleImport ) ) ( (this_CDO_7= RULE_CDO (this_WS_8= RULE_WS )* ) | (this_CDC_9= RULE_CDC (this_WS_10= RULE_WS )* ) )* )* ( ( (lv_contents_11_0= ruleContent ) ) (

-				// (this_CDO_12= RULE_CDO (this_WS_13= RULE_WS )* ) | (this_CDC_14= RULE_CDC (this_WS_15= RULE_WS )* ) )* )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:81:2: (otherlv_0= '@charset ' ( (lv_charset_1_0= RULE_STRING ) ) otherlv_2= ';' )? (this_WS_3= RULE_WS | this_CDO_4=

-				// RULE_CDO | this_CDC_5= RULE_CDC )* ( ( (lv_imports_6_0= ruleImport ) ) ( (this_CDO_7= RULE_CDO (this_WS_8= RULE_WS )* ) | (this_CDC_9= RULE_CDC (this_WS_10= RULE_WS )* ) )* )* ( ( (lv_contents_11_0= ruleContent ) ) ( (this_CDO_12= RULE_CDO

-				// (this_WS_13= RULE_WS )* ) | (this_CDC_14= RULE_CDC (this_WS_15= RULE_WS )* ) )* )*

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:81:2: (otherlv_0= '@charset ' ( (lv_charset_1_0= RULE_STRING ) ) otherlv_2= ';' )?

-					int alt1 = 2;

-					int LA1_0 = input.LA(1);

-

-					if ((LA1_0 == 22)) {

-						alt1 = 1;

-					}

-					switch (alt1) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:81:4: otherlv_0= '@charset ' ( (lv_charset_1_0= RULE_STRING ) ) otherlv_2= ';'

-					{

-						otherlv_0 = (Token) match(input, 22, FOLLOW_22_in_ruleStylesheet123);

-

-						newLeafNode(otherlv_0, grammarAccess.getStylesheetAccess().getCharsetKeyword_0_0());

-

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:85:1: ( (lv_charset_1_0= RULE_STRING ) )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:86:1: (lv_charset_1_0= RULE_STRING )

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:86:1: (lv_charset_1_0= RULE_STRING )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:87:3: lv_charset_1_0= RULE_STRING

-							{

-								lv_charset_1_0 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleStylesheet140);

-

-								newLeafNode(lv_charset_1_0, grammarAccess.getStylesheetAccess().getCharsetSTRINGTerminalRuleCall_0_1_0());

-

-

-								if (current == null) {

-									current = createModelElement(grammarAccess.getStylesheetRule());

-								}

-								setWithLastConsumed(

-										current,

-										"charset",

-										lv_charset_1_0,

-										"STRING");

-

-

-							}

-

-

-						}

-

-						otherlv_2 = (Token) match(input, 23, FOLLOW_23_in_ruleStylesheet157);

-

-						newLeafNode(otherlv_2, grammarAccess.getStylesheetAccess().getSemicolonKeyword_0_2());

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:107:3: (this_WS_3= RULE_WS | this_CDO_4= RULE_CDO | this_CDC_5= RULE_CDC )*

-					loop2: do {

-						int alt2 = 4;

-						switch (input.LA(1)) {

-						case RULE_WS: {

-							alt2 = 1;

-						}

-							break;

-						case RULE_CDO: {

-							alt2 = 2;

-						}

-							break;

-						case RULE_CDC: {

-							alt2 = 3;

-						}

-							break;

-

-						}

-

-						switch (alt2) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:107:4: this_WS_3= RULE_WS

-						{

-							this_WS_3 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleStylesheet171);

-

-							newLeafNode(this_WS_3, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_1_0());

-

-

-						}

-							break;

-						case 2:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:112:6: this_CDO_4= RULE_CDO

-						{

-							this_CDO_4 = (Token) match(input, RULE_CDO, FOLLOW_RULE_CDO_in_ruleStylesheet187);

-

-							newLeafNode(this_CDO_4, grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_1_1());

-

-

-						}

-							break;

-						case 3:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:117:6: this_CDC_5= RULE_CDC

-						{

-							this_CDC_5 = (Token) match(input, RULE_CDC, FOLLOW_RULE_CDC_in_ruleStylesheet203);

-

-							newLeafNode(this_CDC_5, grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_1_2());

-

-

-						}

-							break;

-

-						default:

-							break loop2;

-						}

-					} while (true);

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:121:3: ( ( (lv_imports_6_0= ruleImport ) ) ( (this_CDO_7= RULE_CDO (this_WS_8= RULE_WS )* ) | (this_CDC_9=

-					// RULE_CDC (this_WS_10= RULE_WS )* ) )* )*

-					loop6: do {

-						int alt6 = 2;

-						int LA6_0 = input.LA(1);

-

-						if ((LA6_0 == 24)) {

-							alt6 = 1;

-						}

-

-

-						switch (alt6) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:121:4: ( (lv_imports_6_0= ruleImport ) ) ( (this_CDO_7= RULE_CDO (this_WS_8= RULE_WS )* ) | (this_CDC_9=

-						// RULE_CDC (this_WS_10= RULE_WS )* ) )*

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:121:4: ( (lv_imports_6_0= ruleImport ) )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:122:1: (lv_imports_6_0= ruleImport )

-							{

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:122:1: (lv_imports_6_0= ruleImport )

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:123:3: lv_imports_6_0= ruleImport

-								{

-

-									newCompositeNode(grammarAccess.getStylesheetAccess().getImportsImportParserRuleCall_2_0_0());

-

-									pushFollow(FOLLOW_ruleImport_in_ruleStylesheet226);

-									lv_imports_6_0 = ruleImport();

-

-									state._fsp--;

-

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getStylesheetRule());

-									}

-									add(

-											current,

-											"imports",

-											lv_imports_6_0,

-											"Import");

-									afterParserOrEnumRuleCall();

-

-

-								}

-

-

-							}

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:139:2: ( (this_CDO_7= RULE_CDO (this_WS_8= RULE_WS )* ) | (this_CDC_9= RULE_CDC (this_WS_10= RULE_WS )*

-							// ) )*

-							loop5: do {

-								int alt5 = 3;

-								int LA5_0 = input.LA(1);

-

-								if ((LA5_0 == RULE_CDO)) {

-									alt5 = 1;

-								}

-								else if ((LA5_0 == RULE_CDC)) {

-									alt5 = 2;

-								}

-

-

-								switch (alt5) {

-								case 1:

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:139:3: (this_CDO_7= RULE_CDO (this_WS_8= RULE_WS )* )

-								{

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:139:3: (this_CDO_7= RULE_CDO (this_WS_8= RULE_WS )* )

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:139:4: this_CDO_7= RULE_CDO (this_WS_8= RULE_WS )*

-									{

-										this_CDO_7 = (Token) match(input, RULE_CDO, FOLLOW_RULE_CDO_in_ruleStylesheet239);

-

-										newLeafNode(this_CDO_7, grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_2_1_0_0());

-

-										// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:143:1: (this_WS_8= RULE_WS )*

-										loop3: do {

-											int alt3 = 2;

-											int LA3_0 = input.LA(1);

-

-											if ((LA3_0 == RULE_WS)) {

-												alt3 = 1;

-											}

-

-

-											switch (alt3) {

-											case 1:

-											// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:143:2: this_WS_8= RULE_WS

-											{

-												this_WS_8 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleStylesheet250);

-

-												newLeafNode(this_WS_8, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_0_1());

-

-

-											}

-												break;

-

-											default:

-												break loop3;

-											}

-										} while (true);

-

-

-									}

-

-

-								}

-									break;

-								case 2:

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:148:6: (this_CDC_9= RULE_CDC (this_WS_10= RULE_WS )* )

-								{

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:148:6: (this_CDC_9= RULE_CDC (this_WS_10= RULE_WS )* )

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:148:7: this_CDC_9= RULE_CDC (this_WS_10= RULE_WS )*

-									{

-										this_CDC_9 = (Token) match(input, RULE_CDC, FOLLOW_RULE_CDC_in_ruleStylesheet270);

-

-										newLeafNode(this_CDC_9, grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_2_1_1_0());

-

-										// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:152:1: (this_WS_10= RULE_WS )*

-										loop4: do {

-											int alt4 = 2;

-											int LA4_0 = input.LA(1);

-

-											if ((LA4_0 == RULE_WS)) {

-												alt4 = 1;

-											}

-

-

-											switch (alt4) {

-											case 1:

-											// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:152:2: this_WS_10= RULE_WS

-											{

-												this_WS_10 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleStylesheet281);

-

-												newLeafNode(this_WS_10, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_1_1());

-

-

-											}

-												break;

-

-											default:

-												break loop4;

-											}

-										} while (true);

-

-

-									}

-

-

-								}

-									break;

-

-								default:

-									break loop5;

-								}

-							} while (true);

-

-

-						}

-							break;

-

-						default:

-							break loop6;

-						}

-					} while (true);

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:156:8: ( ( (lv_contents_11_0= ruleContent ) ) ( (this_CDO_12= RULE_CDO (this_WS_13= RULE_WS )* ) | (this_CDC_14=

-					// RULE_CDC (this_WS_15= RULE_WS )* ) )* )*

-					loop10: do {

-						int alt10 = 2;

-						int LA10_0 = input.LA(1);

-

-						if ((LA10_0 == RULE_ID || (LA10_0 >= RULE_HASH && LA10_0 <= RULE_T_CLASS) || LA10_0 == 26 || (LA10_0 >= 29 && LA10_0 <= 31) || LA10_0 == 36)) {

-							alt10 = 1;

-						}

-

-

-						switch (alt10) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:156:9: ( (lv_contents_11_0= ruleContent ) ) ( (this_CDO_12= RULE_CDO (this_WS_13= RULE_WS )* ) |

-						// (this_CDC_14= RULE_CDC (this_WS_15= RULE_WS )* ) )*

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:156:9: ( (lv_contents_11_0= ruleContent ) )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:157:1: (lv_contents_11_0= ruleContent )

-							{

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:157:1: (lv_contents_11_0= ruleContent )

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:158:3: lv_contents_11_0= ruleContent

-								{

-

-									newCompositeNode(grammarAccess.getStylesheetAccess().getContentsContentParserRuleCall_3_0_0());

-

-									pushFollow(FOLLOW_ruleContent_in_ruleStylesheet309);

-									lv_contents_11_0 = ruleContent();

-

-									state._fsp--;

-

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getStylesheetRule());

-									}

-									add(

-											current,

-											"contents",

-											lv_contents_11_0,

-											"Content");

-									afterParserOrEnumRuleCall();

-

-

-								}

-

-

-							}

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:174:2: ( (this_CDO_12= RULE_CDO (this_WS_13= RULE_WS )* ) | (this_CDC_14= RULE_CDC (this_WS_15= RULE_WS

-							// )* ) )*

-							loop9: do {

-								int alt9 = 3;

-								int LA9_0 = input.LA(1);

-

-								if ((LA9_0 == RULE_CDO)) {

-									alt9 = 1;

-								}

-								else if ((LA9_0 == RULE_CDC)) {

-									alt9 = 2;

-								}

-

-

-								switch (alt9) {

-								case 1:

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:174:3: (this_CDO_12= RULE_CDO (this_WS_13= RULE_WS )* )

-								{

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:174:3: (this_CDO_12= RULE_CDO (this_WS_13= RULE_WS )* )

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:174:4: this_CDO_12= RULE_CDO (this_WS_13= RULE_WS )*

-									{

-										this_CDO_12 = (Token) match(input, RULE_CDO, FOLLOW_RULE_CDO_in_ruleStylesheet322);

-

-										newLeafNode(this_CDO_12, grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_3_1_0_0());

-

-										// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:178:1: (this_WS_13= RULE_WS )*

-										loop7: do {

-											int alt7 = 2;

-											int LA7_0 = input.LA(1);

-

-											if ((LA7_0 == RULE_WS)) {

-												alt7 = 1;

-											}

-

-

-											switch (alt7) {

-											case 1:

-											// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:178:2: this_WS_13= RULE_WS

-											{

-												this_WS_13 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleStylesheet333);

-

-												newLeafNode(this_WS_13, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_0_1());

-

-

-											}

-												break;

-

-											default:

-												break loop7;

-											}

-										} while (true);

-

-

-									}

-

-

-								}

-									break;

-								case 2:

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:183:6: (this_CDC_14= RULE_CDC (this_WS_15= RULE_WS )* )

-								{

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:183:6: (this_CDC_14= RULE_CDC (this_WS_15= RULE_WS )* )

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:183:7: this_CDC_14= RULE_CDC (this_WS_15= RULE_WS )*

-									{

-										this_CDC_14 = (Token) match(input, RULE_CDC, FOLLOW_RULE_CDC_in_ruleStylesheet353);

-

-										newLeafNode(this_CDC_14, grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_3_1_1_0());

-

-										// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:187:1: (this_WS_15= RULE_WS )*

-										loop8: do {

-											int alt8 = 2;

-											int LA8_0 = input.LA(1);

-

-											if ((LA8_0 == RULE_WS)) {

-												alt8 = 1;

-											}

-

-

-											switch (alt8) {

-											case 1:

-											// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:187:2: this_WS_15= RULE_WS

-											{

-												this_WS_15 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleStylesheet364);

-

-												newLeafNode(this_WS_15, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_1_1());

-

-

-											}

-												break;

-

-											default:

-												break loop8;

-											}

-										} while (true);

-

-

-									}

-

-

-								}

-									break;

-

-								default:

-									break loop9;

-								}

-							} while (true);

-

-

-						}

-							break;

-

-						default:

-							break loop10;

-						}

-					} while (true);

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleStylesheet"

-

-

-	// $ANTLR start "entryRuleContent"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:199:1: entryRuleContent returns [EObject current=null] : iv_ruleContent= ruleContent EOF ;

-	public final EObject entryRuleContent() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleContent = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:200:2: (iv_ruleContent= ruleContent EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:201:2: iv_ruleContent= ruleContent EOF

-			{

-				newCompositeNode(grammarAccess.getContentRule());

-				pushFollow(FOLLOW_ruleContent_in_entryRuleContent406);

-				iv_ruleContent = ruleContent();

-

-				state._fsp--;

-

-				current = iv_ruleContent;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleContent416);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleContent"

-

-

-	// $ANTLR start "ruleContent"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:208:1: ruleContent returns [EObject current=null] : (this_Ruleset_0= ruleRuleset | this_Media_1= ruleMedia | this_Page_2=

-	// rulePage ) ;

-	public final EObject ruleContent() throws RecognitionException {

-		EObject current = null;

-

-		EObject this_Ruleset_0 = null;

-

-		EObject this_Media_1 = null;

-

-		EObject this_Page_2 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:211:28: ( (this_Ruleset_0= ruleRuleset | this_Media_1= ruleMedia | this_Page_2= rulePage ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:212:1: (this_Ruleset_0= ruleRuleset | this_Media_1= ruleMedia | this_Page_2= rulePage )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:212:1: (this_Ruleset_0= ruleRuleset | this_Media_1= ruleMedia | this_Page_2= rulePage )

-				int alt11 = 3;

-				switch (input.LA(1)) {

-				case RULE_ID:

-				case RULE_HASH:

-				case RULE_T_CLASS:

-				case 30:

-				case 31:

-				case 36: {

-					alt11 = 1;

-				}

-					break;

-				case 26: {

-					alt11 = 2;

-				}

-					break;

-				case 29: {

-					alt11 = 3;

-				}

-					break;

-				default:

-					NoViableAltException nvae =

-							new NoViableAltException("", 11, 0, input);

-

-					throw nvae;

-				}

-

-				switch (alt11) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:213:5: this_Ruleset_0= ruleRuleset

-				{

-

-					newCompositeNode(grammarAccess.getContentAccess().getRulesetParserRuleCall_0());

-

-					pushFollow(FOLLOW_ruleRuleset_in_ruleContent463);

-					this_Ruleset_0 = ruleRuleset();

-

-					state._fsp--;

-

-

-					current = this_Ruleset_0;

-					afterParserOrEnumRuleCall();

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:223:5: this_Media_1= ruleMedia

-				{

-

-					newCompositeNode(grammarAccess.getContentAccess().getMediaParserRuleCall_1());

-

-					pushFollow(FOLLOW_ruleMedia_in_ruleContent490);

-					this_Media_1 = ruleMedia();

-

-					state._fsp--;

-

-

-					current = this_Media_1;

-					afterParserOrEnumRuleCall();

-

-

-				}

-					break;

-				case 3:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:233:5: this_Page_2= rulePage

-				{

-

-					newCompositeNode(grammarAccess.getContentAccess().getPageParserRuleCall_2());

-

-					pushFollow(FOLLOW_rulePage_in_ruleContent517);

-					this_Page_2 = rulePage();

-

-					state._fsp--;

-

-

-					current = this_Page_2;

-					afterParserOrEnumRuleCall();

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleContent"

-

-

-	// $ANTLR start "entryRuleImport"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:249:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;

-	public final EObject entryRuleImport() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleImport = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:250:2: (iv_ruleImport= ruleImport EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:251:2: iv_ruleImport= ruleImport EOF

-			{

-				newCompositeNode(grammarAccess.getImportRule());

-				pushFollow(FOLLOW_ruleImport_in_entryRuleImport552);

-				iv_ruleImport = ruleImport();

-

-				state._fsp--;

-

-				current = iv_ruleImport;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleImport562);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleImport"

-

-

-	// $ANTLR start "ruleImport"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:258:1: ruleImport returns [EObject current=null] : (otherlv_0= '@import' ( ( (this_WS_1= RULE_WS )* ( (lv_string_2_0=

-	// RULE_STRING ) ) ) | (this_WS_3= RULE_WS ( (lv_uri_4_0= ruleUri ) ) ) ) (this_WS_5= RULE_WS )* ( ( (lv_media_6_0= RULE_ID ) ) (this_WS_7= RULE_WS )* (otherlv_8= ',' (this_WS_9= RULE_WS )* ( (lv_media_10_0= RULE_ID ) ) )* )? otherlv_11= ';' (this_WS_12=

-	// RULE_WS )* ) ;

-	public final EObject ruleImport() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_0 = null;

-		Token this_WS_1 = null;

-		Token lv_string_2_0 = null;

-		Token this_WS_3 = null;

-		Token this_WS_5 = null;

-		Token lv_media_6_0 = null;

-		Token this_WS_7 = null;

-		Token otherlv_8 = null;

-		Token this_WS_9 = null;

-		Token lv_media_10_0 = null;

-		Token otherlv_11 = null;

-		Token this_WS_12 = null;

-		EObject lv_uri_4_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:261:28: ( (otherlv_0= '@import' ( ( (this_WS_1= RULE_WS )* ( (lv_string_2_0= RULE_STRING ) ) ) | (this_WS_3= RULE_WS (

-			// (lv_uri_4_0= ruleUri ) ) ) ) (this_WS_5= RULE_WS )* ( ( (lv_media_6_0= RULE_ID ) ) (this_WS_7= RULE_WS )* (otherlv_8= ',' (this_WS_9= RULE_WS )* ( (lv_media_10_0= RULE_ID ) ) )* )? otherlv_11= ';' (this_WS_12= RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:262:1: (otherlv_0= '@import' ( ( (this_WS_1= RULE_WS )* ( (lv_string_2_0= RULE_STRING ) ) ) | (this_WS_3= RULE_WS (

-			// (lv_uri_4_0= ruleUri ) ) ) ) (this_WS_5= RULE_WS )* ( ( (lv_media_6_0= RULE_ID ) ) (this_WS_7= RULE_WS )* (otherlv_8= ',' (this_WS_9= RULE_WS )* ( (lv_media_10_0= RULE_ID ) ) )* )? otherlv_11= ';' (this_WS_12= RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:262:1: (otherlv_0= '@import' ( ( (this_WS_1= RULE_WS )* ( (lv_string_2_0= RULE_STRING ) ) ) | (this_WS_3= RULE_WS (

-				// (lv_uri_4_0= ruleUri ) ) ) ) (this_WS_5= RULE_WS )* ( ( (lv_media_6_0= RULE_ID ) ) (this_WS_7= RULE_WS )* (otherlv_8= ',' (this_WS_9= RULE_WS )* ( (lv_media_10_0= RULE_ID ) ) )* )? otherlv_11= ';' (this_WS_12= RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:262:3: otherlv_0= '@import' ( ( (this_WS_1= RULE_WS )* ( (lv_string_2_0= RULE_STRING ) ) ) | (this_WS_3= RULE_WS (

-				// (lv_uri_4_0= ruleUri ) ) ) ) (this_WS_5= RULE_WS )* ( ( (lv_media_6_0= RULE_ID ) ) (this_WS_7= RULE_WS )* (otherlv_8= ',' (this_WS_9= RULE_WS )* ( (lv_media_10_0= RULE_ID ) ) )* )? otherlv_11= ';' (this_WS_12= RULE_WS )*

-				{

-					otherlv_0 = (Token) match(input, 24, FOLLOW_24_in_ruleImport599);

-

-					newLeafNode(otherlv_0, grammarAccess.getImportAccess().getImportKeyword_0());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:266:1: ( ( (this_WS_1= RULE_WS )* ( (lv_string_2_0= RULE_STRING ) ) ) | (this_WS_3= RULE_WS ( (lv_uri_4_0=

-					// ruleUri ) ) ) )

-					int alt13 = 2;

-					int LA13_0 = input.LA(1);

-

-					if ((LA13_0 == RULE_WS)) {

-						int LA13_1 = input.LA(2);

-

-						if ((LA13_1 == 34)) {

-							alt13 = 2;

-						}

-						else if (((LA13_1 >= RULE_STRING && LA13_1 <= RULE_WS))) {

-							alt13 = 1;

-						}

-						else {

-							NoViableAltException nvae =

-									new NoViableAltException("", 13, 1, input);

-

-							throw nvae;

-						}

-					}

-					else if ((LA13_0 == RULE_STRING)) {

-						alt13 = 1;

-					}

-					else {

-						NoViableAltException nvae =

-								new NoViableAltException("", 13, 0, input);

-

-						throw nvae;

-					}

-					switch (alt13) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:266:2: ( (this_WS_1= RULE_WS )* ( (lv_string_2_0= RULE_STRING ) ) )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:266:2: ( (this_WS_1= RULE_WS )* ( (lv_string_2_0= RULE_STRING ) ) )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:266:3: (this_WS_1= RULE_WS )* ( (lv_string_2_0= RULE_STRING ) )

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:266:3: (this_WS_1= RULE_WS )*

-							loop12: do {

-								int alt12 = 2;

-								int LA12_0 = input.LA(1);

-

-								if ((LA12_0 == RULE_WS)) {

-									alt12 = 1;

-								}

-

-

-								switch (alt12) {

-								case 1:

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:266:4: this_WS_1= RULE_WS

-								{

-									this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleImport613);

-

-									newLeafNode(this_WS_1, grammarAccess.getImportAccess().getWSTerminalRuleCall_1_0_0());

-

-

-								}

-									break;

-

-								default:

-									break loop12;

-								}

-							} while (true);

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:270:3: ( (lv_string_2_0= RULE_STRING ) )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:271:1: (lv_string_2_0= RULE_STRING )

-							{

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:271:1: (lv_string_2_0= RULE_STRING )

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:272:3: lv_string_2_0= RULE_STRING

-								{

-									lv_string_2_0 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleImport631);

-

-									newLeafNode(lv_string_2_0, grammarAccess.getImportAccess().getStringSTRINGTerminalRuleCall_1_0_1_0());

-

-

-									if (current == null) {

-										current = createModelElement(grammarAccess.getImportRule());

-									}

-									setWithLastConsumed(

-											current,

-											"string",

-											lv_string_2_0,

-											"STRING");

-

-

-								}

-

-

-							}

-

-

-						}

-

-

-					}

-						break;

-					case 2:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:289:6: (this_WS_3= RULE_WS ( (lv_uri_4_0= ruleUri ) ) )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:289:6: (this_WS_3= RULE_WS ( (lv_uri_4_0= ruleUri ) ) )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:289:7: this_WS_3= RULE_WS ( (lv_uri_4_0= ruleUri ) )

-						{

-							this_WS_3 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleImport655);

-

-							newLeafNode(this_WS_3, grammarAccess.getImportAccess().getWSTerminalRuleCall_1_1_0());

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:293:1: ( (lv_uri_4_0= ruleUri ) )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:294:1: (lv_uri_4_0= ruleUri )

-							{

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:294:1: (lv_uri_4_0= ruleUri )

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:295:3: lv_uri_4_0= ruleUri

-								{

-

-									newCompositeNode(grammarAccess.getImportAccess().getUriUriParserRuleCall_1_1_1_0());

-

-									pushFollow(FOLLOW_ruleUri_in_ruleImport675);

-									lv_uri_4_0 = ruleUri();

-

-									state._fsp--;

-

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getImportRule());

-									}

-									set(

-											current,

-											"uri",

-											lv_uri_4_0,

-											"Uri");

-									afterParserOrEnumRuleCall();

-

-

-								}

-

-

-							}

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:311:4: (this_WS_5= RULE_WS )*

-					loop14: do {

-						int alt14 = 2;

-						int LA14_0 = input.LA(1);

-

-						if ((LA14_0 == RULE_WS)) {

-							alt14 = 1;

-						}

-

-

-						switch (alt14) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:311:5: this_WS_5= RULE_WS

-						{

-							this_WS_5 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleImport689);

-

-							newLeafNode(this_WS_5, grammarAccess.getImportAccess().getWSTerminalRuleCall_2());

-

-

-						}

-							break;

-

-						default:

-							break loop14;

-						}

-					} while (true);

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:315:3: ( ( (lv_media_6_0= RULE_ID ) ) (this_WS_7= RULE_WS )* (otherlv_8= ',' (this_WS_9= RULE_WS )* (

-					// (lv_media_10_0= RULE_ID ) ) )* )?

-					int alt18 = 2;

-					int LA18_0 = input.LA(1);

-

-					if ((LA18_0 == RULE_ID)) {

-						alt18 = 1;

-					}

-					switch (alt18) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:315:4: ( (lv_media_6_0= RULE_ID ) ) (this_WS_7= RULE_WS )* (otherlv_8= ',' (this_WS_9= RULE_WS )* (

-					// (lv_media_10_0= RULE_ID ) ) )*

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:315:4: ( (lv_media_6_0= RULE_ID ) )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:316:1: (lv_media_6_0= RULE_ID )

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:316:1: (lv_media_6_0= RULE_ID )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:317:3: lv_media_6_0= RULE_ID

-							{

-								lv_media_6_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleImport708);

-

-								newLeafNode(lv_media_6_0, grammarAccess.getImportAccess().getMediaIDTerminalRuleCall_3_0_0());

-

-

-								if (current == null) {

-									current = createModelElement(grammarAccess.getImportRule());

-								}

-								addWithLastConsumed(

-										current,

-										"media",

-										lv_media_6_0,

-										"ID");

-

-

-							}

-

-

-						}

-

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:333:2: (this_WS_7= RULE_WS )*

-						loop15: do {

-							int alt15 = 2;

-							int LA15_0 = input.LA(1);

-

-							if ((LA15_0 == RULE_WS)) {

-								alt15 = 1;

-							}

-

-

-							switch (alt15) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:333:3: this_WS_7= RULE_WS

-							{

-								this_WS_7 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleImport725);

-

-								newLeafNode(this_WS_7, grammarAccess.getImportAccess().getWSTerminalRuleCall_3_1());

-

-

-							}

-								break;

-

-							default:

-								break loop15;

-							}

-						} while (true);

-

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:337:3: (otherlv_8= ',' (this_WS_9= RULE_WS )* ( (lv_media_10_0= RULE_ID ) ) )*

-						loop17: do {

-							int alt17 = 2;

-							int LA17_0 = input.LA(1);

-

-							if ((LA17_0 == 25)) {

-								alt17 = 1;

-							}

-

-

-							switch (alt17) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:337:5: otherlv_8= ',' (this_WS_9= RULE_WS )* ( (lv_media_10_0= RULE_ID ) )

-							{

-								otherlv_8 = (Token) match(input, 25, FOLLOW_25_in_ruleImport739);

-

-								newLeafNode(otherlv_8, grammarAccess.getImportAccess().getCommaKeyword_3_2_0());

-

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:341:1: (this_WS_9= RULE_WS )*

-								loop16: do {

-									int alt16 = 2;

-									int LA16_0 = input.LA(1);

-

-									if ((LA16_0 == RULE_WS)) {

-										alt16 = 1;

-									}

-

-

-									switch (alt16) {

-									case 1:

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:341:2: this_WS_9= RULE_WS

-									{

-										this_WS_9 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleImport751);

-

-										newLeafNode(this_WS_9, grammarAccess.getImportAccess().getWSTerminalRuleCall_3_2_1());

-

-

-									}

-										break;

-

-									default:

-										break loop16;

-									}

-								} while (true);

-

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:345:3: ( (lv_media_10_0= RULE_ID ) )

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:346:1: (lv_media_10_0= RULE_ID )

-								{

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:346:1: (lv_media_10_0= RULE_ID )

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:347:3: lv_media_10_0= RULE_ID

-									{

-										lv_media_10_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleImport769);

-

-										newLeafNode(lv_media_10_0, grammarAccess.getImportAccess().getMediaIDTerminalRuleCall_3_2_2_0());

-

-

-										if (current == null) {

-											current = createModelElement(grammarAccess.getImportRule());

-										}

-										addWithLastConsumed(

-												current,

-												"media",

-												lv_media_10_0,

-												"ID");

-

-

-									}

-

-

-								}

-

-

-							}

-								break;

-

-							default:

-								break loop17;

-							}

-						} while (true);

-

-

-					}

-						break;

-

-					}

-

-					otherlv_11 = (Token) match(input, 23, FOLLOW_23_in_ruleImport790);

-

-					newLeafNode(otherlv_11, grammarAccess.getImportAccess().getSemicolonKeyword_4());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:367:1: (this_WS_12= RULE_WS )*

-					loop19: do {

-						int alt19 = 2;

-						int LA19_0 = input.LA(1);

-

-						if ((LA19_0 == RULE_WS)) {

-							alt19 = 1;

-						}

-

-

-						switch (alt19) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:367:2: this_WS_12= RULE_WS

-						{

-							this_WS_12 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleImport802);

-

-							newLeafNode(this_WS_12, grammarAccess.getImportAccess().getWSTerminalRuleCall_5());

-

-

-						}

-							break;

-

-						default:

-							break loop19;

-						}

-					} while (true);

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleImport"

-

-

-	// $ANTLR start "entryRuleMedia"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:379:1: entryRuleMedia returns [EObject current=null] : iv_ruleMedia= ruleMedia EOF ;

-	public final EObject entryRuleMedia() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleMedia = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:380:2: (iv_ruleMedia= ruleMedia EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:381:2: iv_ruleMedia= ruleMedia EOF

-			{

-				newCompositeNode(grammarAccess.getMediaRule());

-				pushFollow(FOLLOW_ruleMedia_in_entryRuleMedia839);

-				iv_ruleMedia = ruleMedia();

-

-				state._fsp--;

-

-				current = iv_ruleMedia;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleMedia849);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleMedia"

-

-

-	// $ANTLR start "ruleMedia"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:388:1: ruleMedia returns [EObject current=null] : (otherlv_0= '@media' this_WS_1= RULE_WS ( (lv_media_2_0= RULE_ID ) )

-	// (this_WS_3= RULE_WS )* (otherlv_4= ',' (this_WS_5= RULE_WS )* ( (lv_media_6_0= RULE_ID ) ) )* otherlv_7= '{' (this_WS_8= RULE_WS )* ( (lv_rules_9_0= ruleRuleset ) )* otherlv_10= '}' (this_WS_11= RULE_WS )* ) ;

-	public final EObject ruleMedia() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_0 = null;

-		Token this_WS_1 = null;

-		Token lv_media_2_0 = null;

-		Token this_WS_3 = null;

-		Token otherlv_4 = null;

-		Token this_WS_5 = null;

-		Token lv_media_6_0 = null;

-		Token otherlv_7 = null;

-		Token this_WS_8 = null;

-		Token otherlv_10 = null;

-		Token this_WS_11 = null;

-		EObject lv_rules_9_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:391:28: ( (otherlv_0= '@media' this_WS_1= RULE_WS ( (lv_media_2_0= RULE_ID ) ) (this_WS_3= RULE_WS )* (otherlv_4= ','

-			// (this_WS_5= RULE_WS )* ( (lv_media_6_0= RULE_ID ) ) )* otherlv_7= '{' (this_WS_8= RULE_WS )* ( (lv_rules_9_0= ruleRuleset ) )* otherlv_10= '}' (this_WS_11= RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:392:1: (otherlv_0= '@media' this_WS_1= RULE_WS ( (lv_media_2_0= RULE_ID ) ) (this_WS_3= RULE_WS )* (otherlv_4= ','

-			// (this_WS_5= RULE_WS )* ( (lv_media_6_0= RULE_ID ) ) )* otherlv_7= '{' (this_WS_8= RULE_WS )* ( (lv_rules_9_0= ruleRuleset ) )* otherlv_10= '}' (this_WS_11= RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:392:1: (otherlv_0= '@media' this_WS_1= RULE_WS ( (lv_media_2_0= RULE_ID ) ) (this_WS_3= RULE_WS )* (otherlv_4= ','

-				// (this_WS_5= RULE_WS )* ( (lv_media_6_0= RULE_ID ) ) )* otherlv_7= '{' (this_WS_8= RULE_WS )* ( (lv_rules_9_0= ruleRuleset ) )* otherlv_10= '}' (this_WS_11= RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:392:3: otherlv_0= '@media' this_WS_1= RULE_WS ( (lv_media_2_0= RULE_ID ) ) (this_WS_3= RULE_WS )* (otherlv_4= ','

-				// (this_WS_5= RULE_WS )* ( (lv_media_6_0= RULE_ID ) ) )* otherlv_7= '{' (this_WS_8= RULE_WS )* ( (lv_rules_9_0= ruleRuleset ) )* otherlv_10= '}' (this_WS_11= RULE_WS )*

-				{

-					otherlv_0 = (Token) match(input, 26, FOLLOW_26_in_ruleMedia886);

-

-					newLeafNode(otherlv_0, grammarAccess.getMediaAccess().getMediaKeyword_0());

-

-					this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleMedia897);

-

-					newLeafNode(this_WS_1, grammarAccess.getMediaAccess().getWSTerminalRuleCall_1());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:400:1: ( (lv_media_2_0= RULE_ID ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:401:1: (lv_media_2_0= RULE_ID )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:401:1: (lv_media_2_0= RULE_ID )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:402:3: lv_media_2_0= RULE_ID

-						{

-							lv_media_2_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleMedia913);

-

-							newLeafNode(lv_media_2_0, grammarAccess.getMediaAccess().getMediaIDTerminalRuleCall_2_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getMediaRule());

-							}

-							addWithLastConsumed(

-									current,

-									"media",

-									lv_media_2_0,

-									"ID");

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:418:2: (this_WS_3= RULE_WS )*

-					loop20: do {

-						int alt20 = 2;

-						int LA20_0 = input.LA(1);

-

-						if ((LA20_0 == RULE_WS)) {

-							alt20 = 1;

-						}

-

-

-						switch (alt20) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:418:3: this_WS_3= RULE_WS

-						{

-							this_WS_3 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleMedia930);

-

-							newLeafNode(this_WS_3, grammarAccess.getMediaAccess().getWSTerminalRuleCall_3());

-

-

-						}

-							break;

-

-						default:

-							break loop20;

-						}

-					} while (true);

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:422:3: (otherlv_4= ',' (this_WS_5= RULE_WS )* ( (lv_media_6_0= RULE_ID ) ) )*

-					loop22: do {

-						int alt22 = 2;

-						int LA22_0 = input.LA(1);

-

-						if ((LA22_0 == 25)) {

-							alt22 = 1;

-						}

-

-

-						switch (alt22) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:422:5: otherlv_4= ',' (this_WS_5= RULE_WS )* ( (lv_media_6_0= RULE_ID ) )

-						{

-							otherlv_4 = (Token) match(input, 25, FOLLOW_25_in_ruleMedia944);

-

-							newLeafNode(otherlv_4, grammarAccess.getMediaAccess().getCommaKeyword_4_0());

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:426:1: (this_WS_5= RULE_WS )*

-							loop21: do {

-								int alt21 = 2;

-								int LA21_0 = input.LA(1);

-

-								if ((LA21_0 == RULE_WS)) {

-									alt21 = 1;

-								}

-

-

-								switch (alt21) {

-								case 1:

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:426:2: this_WS_5= RULE_WS

-								{

-									this_WS_5 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleMedia956);

-

-									newLeafNode(this_WS_5, grammarAccess.getMediaAccess().getWSTerminalRuleCall_4_1());

-

-

-								}

-									break;

-

-								default:

-									break loop21;

-								}

-							} while (true);

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:430:3: ( (lv_media_6_0= RULE_ID ) )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:431:1: (lv_media_6_0= RULE_ID )

-							{

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:431:1: (lv_media_6_0= RULE_ID )

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:432:3: lv_media_6_0= RULE_ID

-								{

-									lv_media_6_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleMedia974);

-

-									newLeafNode(lv_media_6_0, grammarAccess.getMediaAccess().getMediaIDTerminalRuleCall_4_2_0());

-

-

-									if (current == null) {

-										current = createModelElement(grammarAccess.getMediaRule());

-									}

-									addWithLastConsumed(

-											current,

-											"media",

-											lv_media_6_0,

-											"ID");

-

-

-								}

-

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop22;

-						}

-					} while (true);

-

-					otherlv_7 = (Token) match(input, 27, FOLLOW_27_in_ruleMedia993);

-

-					newLeafNode(otherlv_7, grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_5());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:452:1: (this_WS_8= RULE_WS )*

-					loop23: do {

-						int alt23 = 2;

-						int LA23_0 = input.LA(1);

-

-						if ((LA23_0 == RULE_WS)) {

-							alt23 = 1;

-						}

-

-

-						switch (alt23) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:452:2: this_WS_8= RULE_WS

-						{

-							this_WS_8 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleMedia1005);

-

-							newLeafNode(this_WS_8, grammarAccess.getMediaAccess().getWSTerminalRuleCall_6());

-

-

-						}

-							break;

-

-						default:

-							break loop23;

-						}

-					} while (true);

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:456:3: ( (lv_rules_9_0= ruleRuleset ) )*

-					loop24: do {

-						int alt24 = 2;

-						int LA24_0 = input.LA(1);

-

-						if ((LA24_0 == RULE_ID || (LA24_0 >= RULE_HASH && LA24_0 <= RULE_T_CLASS) || (LA24_0 >= 30 && LA24_0 <= 31) || LA24_0 == 36)) {

-							alt24 = 1;

-						}

-

-

-						switch (alt24) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:457:1: (lv_rules_9_0= ruleRuleset )

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:457:1: (lv_rules_9_0= ruleRuleset )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:458:3: lv_rules_9_0= ruleRuleset

-							{

-

-								newCompositeNode(grammarAccess.getMediaAccess().getRulesRulesetParserRuleCall_7_0());

-

-								pushFollow(FOLLOW_ruleRuleset_in_ruleMedia1027);

-								lv_rules_9_0 = ruleRuleset();

-

-								state._fsp--;

-

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getMediaRule());

-								}

-								add(

-										current,

-										"rules",

-										lv_rules_9_0,

-										"Ruleset");

-								afterParserOrEnumRuleCall();

-

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop24;

-						}

-					} while (true);

-

-					otherlv_10 = (Token) match(input, 28, FOLLOW_28_in_ruleMedia1040);

-

-					newLeafNode(otherlv_10, grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_8());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:478:1: (this_WS_11= RULE_WS )*

-					loop25: do {

-						int alt25 = 2;

-						int LA25_0 = input.LA(1);

-

-						if ((LA25_0 == RULE_WS)) {

-							alt25 = 1;

-						}

-

-

-						switch (alt25) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:478:2: this_WS_11= RULE_WS

-						{

-							this_WS_11 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleMedia1052);

-

-							newLeafNode(this_WS_11, grammarAccess.getMediaAccess().getWSTerminalRuleCall_9());

-

-

-						}

-							break;

-

-						default:

-							break loop25;

-						}

-					} while (true);

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleMedia"

-

-

-	// $ANTLR start "entryRulePage"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:490:1: entryRulePage returns [EObject current=null] : iv_rulePage= rulePage EOF ;

-	public final EObject entryRulePage() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulePage = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:491:2: (iv_rulePage= rulePage EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:492:2: iv_rulePage= rulePage EOF

-			{

-				newCompositeNode(grammarAccess.getPageRule());

-				pushFollow(FOLLOW_rulePage_in_entryRulePage1089);

-				iv_rulePage = rulePage();

-

-				state._fsp--;

-

-				current = iv_rulePage;

-				match(input, EOF, FOLLOW_EOF_in_entryRulePage1099);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRulePage"

-

-

-	// $ANTLR start "rulePage"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:499:1: rulePage returns [EObject current=null] : ( () otherlv_1= '@page' (this_WS_2= RULE_WS )* ( (lv_pseudo_3_0= rulePseudoPage

-	// ) )? otherlv_4= '{' (this_WS_5= RULE_WS )* ( (lv_declarations_6_0= ruleDeclaration ) )? (otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_declarations_9_0= ruleDeclaration ) )? )* otherlv_10= '}' (this_WS_11= RULE_WS )* ) ;

-	public final EObject rulePage() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_1 = null;

-		Token this_WS_2 = null;

-		Token otherlv_4 = null;

-		Token this_WS_5 = null;

-		Token otherlv_7 = null;

-		Token this_WS_8 = null;

-		Token otherlv_10 = null;

-		Token this_WS_11 = null;

-		EObject lv_pseudo_3_0 = null;

-

-		EObject lv_declarations_6_0 = null;

-

-		EObject lv_declarations_9_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:502:28: ( ( () otherlv_1= '@page' (this_WS_2= RULE_WS )* ( (lv_pseudo_3_0= rulePseudoPage ) )? otherlv_4= '{'

-			// (this_WS_5= RULE_WS )* ( (lv_declarations_6_0= ruleDeclaration ) )? (otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_declarations_9_0= ruleDeclaration ) )? )* otherlv_10= '}' (this_WS_11= RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:503:1: ( () otherlv_1= '@page' (this_WS_2= RULE_WS )* ( (lv_pseudo_3_0= rulePseudoPage ) )? otherlv_4= '{' (this_WS_5=

-			// RULE_WS )* ( (lv_declarations_6_0= ruleDeclaration ) )? (otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_declarations_9_0= ruleDeclaration ) )? )* otherlv_10= '}' (this_WS_11= RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:503:1: ( () otherlv_1= '@page' (this_WS_2= RULE_WS )* ( (lv_pseudo_3_0= rulePseudoPage ) )? otherlv_4= '{'

-				// (this_WS_5= RULE_WS )* ( (lv_declarations_6_0= ruleDeclaration ) )? (otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_declarations_9_0= ruleDeclaration ) )? )* otherlv_10= '}' (this_WS_11= RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:503:2: () otherlv_1= '@page' (this_WS_2= RULE_WS )* ( (lv_pseudo_3_0= rulePseudoPage ) )? otherlv_4= '{' (this_WS_5=

-				// RULE_WS )* ( (lv_declarations_6_0= ruleDeclaration ) )? (otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_declarations_9_0= ruleDeclaration ) )? )* otherlv_10= '}' (this_WS_11= RULE_WS )*

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:503:2: ()

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:504:5:

-					{

-

-						current = forceCreateModelElement(

-								grammarAccess.getPageAccess().getPageAction_0(),

-								current);

-

-

-					}

-

-					otherlv_1 = (Token) match(input, 29, FOLLOW_29_in_rulePage1145);

-

-					newLeafNode(otherlv_1, grammarAccess.getPageAccess().getPageKeyword_1());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:513:1: (this_WS_2= RULE_WS )*

-					loop26: do {

-						int alt26 = 2;

-						int LA26_0 = input.LA(1);

-

-						if ((LA26_0 == RULE_WS)) {

-							alt26 = 1;

-						}

-

-

-						switch (alt26) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:513:2: this_WS_2= RULE_WS

-						{

-							this_WS_2 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_rulePage1157);

-

-							newLeafNode(this_WS_2, grammarAccess.getPageAccess().getWSTerminalRuleCall_2());

-

-

-						}

-							break;

-

-						default:

-							break loop26;

-						}

-					} while (true);

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:517:3: ( (lv_pseudo_3_0= rulePseudoPage ) )?

-					int alt27 = 2;

-					int LA27_0 = input.LA(1);

-

-					if ((LA27_0 == 30)) {

-						alt27 = 1;

-					}

-					switch (alt27) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:518:1: (lv_pseudo_3_0= rulePseudoPage )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:518:1: (lv_pseudo_3_0= rulePseudoPage )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:519:3: lv_pseudo_3_0= rulePseudoPage

-						{

-

-							newCompositeNode(grammarAccess.getPageAccess().getPseudoPseudoPageParserRuleCall_3_0());

-

-							pushFollow(FOLLOW_rulePseudoPage_in_rulePage1179);

-							lv_pseudo_3_0 = rulePseudoPage();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getPageRule());

-							}

-							set(

-									current,

-									"pseudo",

-									lv_pseudo_3_0,

-									"PseudoPage");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					otherlv_4 = (Token) match(input, 27, FOLLOW_27_in_rulePage1192);

-

-					newLeafNode(otherlv_4, grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_4());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:539:1: (this_WS_5= RULE_WS )*

-					loop28: do {

-						int alt28 = 2;

-						int LA28_0 = input.LA(1);

-

-						if ((LA28_0 == RULE_WS)) {

-							alt28 = 1;

-						}

-

-

-						switch (alt28) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:539:2: this_WS_5= RULE_WS

-						{

-							this_WS_5 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_rulePage1204);

-

-							newLeafNode(this_WS_5, grammarAccess.getPageAccess().getWSTerminalRuleCall_5());

-

-

-						}

-							break;

-

-						default:

-							break loop28;

-						}

-					} while (true);

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:543:3: ( (lv_declarations_6_0= ruleDeclaration ) )?

-					int alt29 = 2;

-					int LA29_0 = input.LA(1);

-

-					if ((LA29_0 == RULE_ID)) {

-						alt29 = 1;

-					}

-					switch (alt29) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:544:1: (lv_declarations_6_0= ruleDeclaration )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:544:1: (lv_declarations_6_0= ruleDeclaration )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:545:3: lv_declarations_6_0= ruleDeclaration

-						{

-

-							newCompositeNode(grammarAccess.getPageAccess().getDeclarationsDeclarationParserRuleCall_6_0());

-

-							pushFollow(FOLLOW_ruleDeclaration_in_rulePage1226);

-							lv_declarations_6_0 = ruleDeclaration();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getPageRule());

-							}

-							add(

-									current,

-									"declarations",

-									lv_declarations_6_0,

-									"Declaration");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:561:3: (otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_declarations_9_0= ruleDeclaration ) )? )*

-					loop32: do {

-						int alt32 = 2;

-						int LA32_0 = input.LA(1);

-

-						if ((LA32_0 == 23)) {

-							alt32 = 1;

-						}

-

-

-						switch (alt32) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:561:5: otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_declarations_9_0= ruleDeclaration ) )?

-						{

-							otherlv_7 = (Token) match(input, 23, FOLLOW_23_in_rulePage1240);

-

-							newLeafNode(otherlv_7, grammarAccess.getPageAccess().getSemicolonKeyword_7_0());

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:565:1: (this_WS_8= RULE_WS )*

-							loop30: do {

-								int alt30 = 2;

-								int LA30_0 = input.LA(1);

-

-								if ((LA30_0 == RULE_WS)) {

-									alt30 = 1;

-								}

-

-

-								switch (alt30) {

-								case 1:

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:565:2: this_WS_8= RULE_WS

-								{

-									this_WS_8 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_rulePage1252);

-

-									newLeafNode(this_WS_8, grammarAccess.getPageAccess().getWSTerminalRuleCall_7_1());

-

-

-								}

-									break;

-

-								default:

-									break loop30;

-								}

-							} while (true);

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:569:3: ( (lv_declarations_9_0= ruleDeclaration ) )?

-							int alt31 = 2;

-							int LA31_0 = input.LA(1);

-

-							if ((LA31_0 == RULE_ID)) {

-								alt31 = 1;

-							}

-							switch (alt31) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:570:1: (lv_declarations_9_0= ruleDeclaration )

-							{

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:570:1: (lv_declarations_9_0= ruleDeclaration )

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:571:3: lv_declarations_9_0= ruleDeclaration

-								{

-

-									newCompositeNode(grammarAccess.getPageAccess().getDeclarationsDeclarationParserRuleCall_7_2_0());

-

-									pushFollow(FOLLOW_ruleDeclaration_in_rulePage1274);

-									lv_declarations_9_0 = ruleDeclaration();

-

-									state._fsp--;

-

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getPageRule());

-									}

-									add(

-											current,

-											"declarations",

-											lv_declarations_9_0,

-											"Declaration");

-									afterParserOrEnumRuleCall();

-

-

-								}

-

-

-							}

-								break;

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop32;

-						}

-					} while (true);

-

-					otherlv_10 = (Token) match(input, 28, FOLLOW_28_in_rulePage1289);

-

-					newLeafNode(otherlv_10, grammarAccess.getPageAccess().getRightCurlyBracketKeyword_8());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:591:1: (this_WS_11= RULE_WS )*

-					loop33: do {

-						int alt33 = 2;

-						int LA33_0 = input.LA(1);

-

-						if ((LA33_0 == RULE_WS)) {

-							alt33 = 1;

-						}

-

-

-						switch (alt33) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:591:2: this_WS_11= RULE_WS

-						{

-							this_WS_11 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_rulePage1301);

-

-							newLeafNode(this_WS_11, grammarAccess.getPageAccess().getWSTerminalRuleCall_9());

-

-

-						}

-							break;

-

-						default:

-							break loop33;

-						}

-					} while (true);

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "rulePage"

-

-

-	// $ANTLR start "entryRulePseudoPage"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:603:1: entryRulePseudoPage returns [EObject current=null] : iv_rulePseudoPage= rulePseudoPage EOF ;

-	public final EObject entryRulePseudoPage() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulePseudoPage = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:604:2: (iv_rulePseudoPage= rulePseudoPage EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:605:2: iv_rulePseudoPage= rulePseudoPage EOF

-			{

-				newCompositeNode(grammarAccess.getPseudoPageRule());

-				pushFollow(FOLLOW_rulePseudoPage_in_entryRulePseudoPage1338);

-				iv_rulePseudoPage = rulePseudoPage();

-

-				state._fsp--;

-

-				current = iv_rulePseudoPage;

-				match(input, EOF, FOLLOW_EOF_in_entryRulePseudoPage1348);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRulePseudoPage"

-

-

-	// $ANTLR start "rulePseudoPage"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:612:1: rulePseudoPage returns [EObject current=null] : (otherlv_0= ':' ( (lv_id_1_0= RULE_ID ) ) (this_WS_2= RULE_WS )* ) ;

-	public final EObject rulePseudoPage() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_0 = null;

-		Token lv_id_1_0 = null;

-		Token this_WS_2 = null;

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:615:28: ( (otherlv_0= ':' ( (lv_id_1_0= RULE_ID ) ) (this_WS_2= RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:616:1: (otherlv_0= ':' ( (lv_id_1_0= RULE_ID ) ) (this_WS_2= RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:616:1: (otherlv_0= ':' ( (lv_id_1_0= RULE_ID ) ) (this_WS_2= RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:616:3: otherlv_0= ':' ( (lv_id_1_0= RULE_ID ) ) (this_WS_2= RULE_WS )*

-				{

-					otherlv_0 = (Token) match(input, 30, FOLLOW_30_in_rulePseudoPage1385);

-

-					newLeafNode(otherlv_0, grammarAccess.getPseudoPageAccess().getColonKeyword_0());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:620:1: ( (lv_id_1_0= RULE_ID ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:621:1: (lv_id_1_0= RULE_ID )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:621:1: (lv_id_1_0= RULE_ID )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:622:3: lv_id_1_0= RULE_ID

-						{

-							lv_id_1_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_rulePseudoPage1402);

-

-							newLeafNode(lv_id_1_0, grammarAccess.getPseudoPageAccess().getIdIDTerminalRuleCall_1_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getPseudoPageRule());

-							}

-							setWithLastConsumed(

-									current,

-									"id",

-									lv_id_1_0,

-									"ID");

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:638:2: (this_WS_2= RULE_WS )*

-					loop34: do {

-						int alt34 = 2;

-						int LA34_0 = input.LA(1);

-

-						if ((LA34_0 == RULE_WS)) {

-							alt34 = 1;

-						}

-

-

-						switch (alt34) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:638:3: this_WS_2= RULE_WS

-						{

-							this_WS_2 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_rulePseudoPage1419);

-

-							newLeafNode(this_WS_2, grammarAccess.getPseudoPageAccess().getWSTerminalRuleCall_2());

-

-

-						}

-							break;

-

-						default:

-							break loop34;

-						}

-					} while (true);

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "rulePseudoPage"

-

-

-	// $ANTLR start "entryRuleRuleset"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:650:1: entryRuleRuleset returns [EObject current=null] : iv_ruleRuleset= ruleRuleset EOF ;

-	public final EObject entryRuleRuleset() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleRuleset = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:651:2: (iv_ruleRuleset= ruleRuleset EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:652:2: iv_ruleRuleset= ruleRuleset EOF

-			{

-				newCompositeNode(grammarAccess.getRulesetRule());

-				pushFollow(FOLLOW_ruleRuleset_in_entryRuleRuleset1456);

-				iv_ruleRuleset = ruleRuleset();

-

-				state._fsp--;

-

-				current = iv_ruleRuleset;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleRuleset1466);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleRuleset"

-

-

-	// $ANTLR start "ruleRuleset"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:659:1: ruleRuleset returns [EObject current=null] : ( ( (lv_selectors_0_0= ruleSelector ) ) (otherlv_1= ',' (this_WS_2= RULE_WS

-	// )* ( (lv_selectors_3_0= ruleSelector ) ) )* otherlv_4= '{' (this_WS_5= RULE_WS )* ( (lv_properties_6_0= ruleDeclaration ) )? (otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_properties_9_0= ruleDeclaration ) )? )* otherlv_10= '}' (this_WS_11= RULE_WS )* ) ;

-	public final EObject ruleRuleset() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_1 = null;

-		Token this_WS_2 = null;

-		Token otherlv_4 = null;

-		Token this_WS_5 = null;

-		Token otherlv_7 = null;

-		Token this_WS_8 = null;

-		Token otherlv_10 = null;

-		Token this_WS_11 = null;

-		EObject lv_selectors_0_0 = null;

-

-		EObject lv_selectors_3_0 = null;

-

-		EObject lv_properties_6_0 = null;

-

-		EObject lv_properties_9_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:662:28: ( ( ( (lv_selectors_0_0= ruleSelector ) ) (otherlv_1= ',' (this_WS_2= RULE_WS )* ( (lv_selectors_3_0=

-			// ruleSelector ) ) )* otherlv_4= '{' (this_WS_5= RULE_WS )* ( (lv_properties_6_0= ruleDeclaration ) )? (otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_properties_9_0= ruleDeclaration ) )? )* otherlv_10= '}' (this_WS_11= RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:663:1: ( ( (lv_selectors_0_0= ruleSelector ) ) (otherlv_1= ',' (this_WS_2= RULE_WS )* ( (lv_selectors_3_0= ruleSelector

-			// ) ) )* otherlv_4= '{' (this_WS_5= RULE_WS )* ( (lv_properties_6_0= ruleDeclaration ) )? (otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_properties_9_0= ruleDeclaration ) )? )* otherlv_10= '}' (this_WS_11= RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:663:1: ( ( (lv_selectors_0_0= ruleSelector ) ) (otherlv_1= ',' (this_WS_2= RULE_WS )* ( (lv_selectors_3_0=

-				// ruleSelector ) ) )* otherlv_4= '{' (this_WS_5= RULE_WS )* ( (lv_properties_6_0= ruleDeclaration ) )? (otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_properties_9_0= ruleDeclaration ) )? )* otherlv_10= '}' (this_WS_11= RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:663:2: ( (lv_selectors_0_0= ruleSelector ) ) (otherlv_1= ',' (this_WS_2= RULE_WS )* ( (lv_selectors_3_0=

-				// ruleSelector ) ) )* otherlv_4= '{' (this_WS_5= RULE_WS )* ( (lv_properties_6_0= ruleDeclaration ) )? (otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_properties_9_0= ruleDeclaration ) )? )* otherlv_10= '}' (this_WS_11= RULE_WS )*

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:663:2: ( (lv_selectors_0_0= ruleSelector ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:664:1: (lv_selectors_0_0= ruleSelector )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:664:1: (lv_selectors_0_0= ruleSelector )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:665:3: lv_selectors_0_0= ruleSelector

-						{

-

-							newCompositeNode(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleSelector_in_ruleRuleset1512);

-							lv_selectors_0_0 = ruleSelector();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getRulesetRule());

-							}

-							add(

-									current,

-									"selectors",

-									lv_selectors_0_0,

-									"Selector");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:681:2: (otherlv_1= ',' (this_WS_2= RULE_WS )* ( (lv_selectors_3_0= ruleSelector ) ) )*

-					loop36: do {

-						int alt36 = 2;

-						int LA36_0 = input.LA(1);

-

-						if ((LA36_0 == 25)) {

-							alt36 = 1;

-						}

-

-

-						switch (alt36) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:681:4: otherlv_1= ',' (this_WS_2= RULE_WS )* ( (lv_selectors_3_0= ruleSelector ) )

-						{

-							otherlv_1 = (Token) match(input, 25, FOLLOW_25_in_ruleRuleset1525);

-

-							newLeafNode(otherlv_1, grammarAccess.getRulesetAccess().getCommaKeyword_1_0());

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:685:1: (this_WS_2= RULE_WS )*

-							loop35: do {

-								int alt35 = 2;

-								int LA35_0 = input.LA(1);

-

-								if ((LA35_0 == RULE_WS)) {

-									alt35 = 1;

-								}

-

-

-								switch (alt35) {

-								case 1:

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:685:2: this_WS_2= RULE_WS

-								{

-									this_WS_2 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleRuleset1537);

-

-									newLeafNode(this_WS_2, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_1());

-

-

-								}

-									break;

-

-								default:

-									break loop35;

-								}

-							} while (true);

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:689:3: ( (lv_selectors_3_0= ruleSelector ) )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:690:1: (lv_selectors_3_0= ruleSelector )

-							{

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:690:1: (lv_selectors_3_0= ruleSelector )

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:691:3: lv_selectors_3_0= ruleSelector

-								{

-

-									newCompositeNode(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0());

-

-									pushFollow(FOLLOW_ruleSelector_in_ruleRuleset1559);

-									lv_selectors_3_0 = ruleSelector();

-

-									state._fsp--;

-

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getRulesetRule());

-									}

-									add(

-											current,

-											"selectors",

-											lv_selectors_3_0,

-											"Selector");

-									afterParserOrEnumRuleCall();

-

-

-								}

-

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop36;

-						}

-					} while (true);

-

-					otherlv_4 = (Token) match(input, 27, FOLLOW_27_in_ruleRuleset1573);

-

-					newLeafNode(otherlv_4, grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_2());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:711:1: (this_WS_5= RULE_WS )*

-					loop37: do {

-						int alt37 = 2;

-						int LA37_0 = input.LA(1);

-

-						if ((LA37_0 == RULE_WS)) {

-							alt37 = 1;

-						}

-

-

-						switch (alt37) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:711:2: this_WS_5= RULE_WS

-						{

-							this_WS_5 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleRuleset1585);

-

-							newLeafNode(this_WS_5, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_3());

-

-

-						}

-							break;

-

-						default:

-							break loop37;

-						}

-					} while (true);

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:715:3: ( (lv_properties_6_0= ruleDeclaration ) )?

-					int alt38 = 2;

-					int LA38_0 = input.LA(1);

-

-					if ((LA38_0 == RULE_ID)) {

-						alt38 = 1;

-					}

-					switch (alt38) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:716:1: (lv_properties_6_0= ruleDeclaration )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:716:1: (lv_properties_6_0= ruleDeclaration )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:717:3: lv_properties_6_0= ruleDeclaration

-						{

-

-							newCompositeNode(grammarAccess.getRulesetAccess().getPropertiesDeclarationParserRuleCall_4_0());

-

-							pushFollow(FOLLOW_ruleDeclaration_in_ruleRuleset1607);

-							lv_properties_6_0 = ruleDeclaration();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getRulesetRule());

-							}

-							add(

-									current,

-									"properties",

-									lv_properties_6_0,

-									"Declaration");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:733:3: (otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_properties_9_0= ruleDeclaration ) )? )*

-					loop41: do {

-						int alt41 = 2;

-						int LA41_0 = input.LA(1);

-

-						if ((LA41_0 == 23)) {

-							alt41 = 1;

-						}

-

-

-						switch (alt41) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:733:5: otherlv_7= ';' (this_WS_8= RULE_WS )* ( (lv_properties_9_0= ruleDeclaration ) )?

-						{

-							otherlv_7 = (Token) match(input, 23, FOLLOW_23_in_ruleRuleset1621);

-

-							newLeafNode(otherlv_7, grammarAccess.getRulesetAccess().getSemicolonKeyword_5_0());

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:737:1: (this_WS_8= RULE_WS )*

-							loop39: do {

-								int alt39 = 2;

-								int LA39_0 = input.LA(1);

-

-								if ((LA39_0 == RULE_WS)) {

-									alt39 = 1;

-								}

-

-

-								switch (alt39) {

-								case 1:

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:737:2: this_WS_8= RULE_WS

-								{

-									this_WS_8 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleRuleset1633);

-

-									newLeafNode(this_WS_8, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_5_1());

-

-

-								}

-									break;

-

-								default:

-									break loop39;

-								}

-							} while (true);

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:741:3: ( (lv_properties_9_0= ruleDeclaration ) )?

-							int alt40 = 2;

-							int LA40_0 = input.LA(1);

-

-							if ((LA40_0 == RULE_ID)) {

-								alt40 = 1;

-							}

-							switch (alt40) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:742:1: (lv_properties_9_0= ruleDeclaration )

-							{

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:742:1: (lv_properties_9_0= ruleDeclaration )

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:743:3: lv_properties_9_0= ruleDeclaration

-								{

-

-									newCompositeNode(grammarAccess.getRulesetAccess().getPropertiesDeclarationParserRuleCall_5_2_0());

-

-									pushFollow(FOLLOW_ruleDeclaration_in_ruleRuleset1655);

-									lv_properties_9_0 = ruleDeclaration();

-

-									state._fsp--;

-

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getRulesetRule());

-									}

-									add(

-											current,

-											"properties",

-											lv_properties_9_0,

-											"Declaration");

-									afterParserOrEnumRuleCall();

-

-

-								}

-

-

-							}

-								break;

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop41;

-						}

-					} while (true);

-

-					otherlv_10 = (Token) match(input, 28, FOLLOW_28_in_ruleRuleset1670);

-

-					newLeafNode(otherlv_10, grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_6());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:763:1: (this_WS_11= RULE_WS )*

-					loop42: do {

-						int alt42 = 2;

-						int LA42_0 = input.LA(1);

-

-						if ((LA42_0 == RULE_WS)) {

-							alt42 = 1;

-						}

-

-

-						switch (alt42) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:763:2: this_WS_11= RULE_WS

-						{

-							this_WS_11 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleRuleset1682);

-

-							newLeafNode(this_WS_11, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_7());

-

-

-						}

-							break;

-

-						default:

-							break loop42;

-						}

-					} while (true);

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleRuleset"

-

-

-	// $ANTLR start "entryRuleSelector"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:775:1: entryRuleSelector returns [EObject current=null] : iv_ruleSelector= ruleSelector EOF ;

-	public final EObject entryRuleSelector() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleSelector = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:776:2: (iv_ruleSelector= ruleSelector EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:777:2: iv_ruleSelector= ruleSelector EOF

-			{

-				newCompositeNode(grammarAccess.getSelectorRule());

-				pushFollow(FOLLOW_ruleSelector_in_entryRuleSelector1719);

-				iv_ruleSelector = ruleSelector();

-

-				state._fsp--;

-

-				current = iv_ruleSelector;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleSelector1729);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleSelector"

-

-

-	// $ANTLR start "ruleSelector"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:784:1: ruleSelector returns [EObject current=null] : ( (this_SimpleSelector_0= ruleSimpleSelector (this_WS_1= RULE_WS )* ) |

-	// this_CompositeSelector_2= ruleCompositeSelector ) ;

-	public final EObject ruleSelector() throws RecognitionException {

-		EObject current = null;

-

-		Token this_WS_1 = null;

-		EObject this_SimpleSelector_0 = null;

-

-		EObject this_CompositeSelector_2 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:787:28: ( ( (this_SimpleSelector_0= ruleSimpleSelector (this_WS_1= RULE_WS )* ) | this_CompositeSelector_2=

-			// ruleCompositeSelector ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:788:1: ( (this_SimpleSelector_0= ruleSimpleSelector (this_WS_1= RULE_WS )* ) | this_CompositeSelector_2=

-			// ruleCompositeSelector )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:788:1: ( (this_SimpleSelector_0= ruleSimpleSelector (this_WS_1= RULE_WS )* ) | this_CompositeSelector_2=

-				// ruleCompositeSelector )

-				int alt44 = 2;

-				alt44 = dfa44.predict(input);

-				switch (alt44) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:788:2: (this_SimpleSelector_0= ruleSimpleSelector (this_WS_1= RULE_WS )* )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:788:2: (this_SimpleSelector_0= ruleSimpleSelector (this_WS_1= RULE_WS )* )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:789:5: this_SimpleSelector_0= ruleSimpleSelector (this_WS_1= RULE_WS )*

-					{

-

-						newCompositeNode(grammarAccess.getSelectorAccess().getSimpleSelectorParserRuleCall_0_0());

-

-						pushFollow(FOLLOW_ruleSimpleSelector_in_ruleSelector1777);

-						this_SimpleSelector_0 = ruleSimpleSelector();

-

-						state._fsp--;

-

-

-						current = this_SimpleSelector_0;

-						afterParserOrEnumRuleCall();

-

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:797:1: (this_WS_1= RULE_WS )*

-						loop43: do {

-							int alt43 = 2;

-							int LA43_0 = input.LA(1);

-

-							if ((LA43_0 == RULE_WS)) {

-								alt43 = 1;

-							}

-

-

-							switch (alt43) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:797:2: this_WS_1= RULE_WS

-							{

-								this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleSelector1788);

-

-								newLeafNode(this_WS_1, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_0_1());

-

-

-							}

-								break;

-

-							default:

-								break loop43;

-							}

-						} while (true);

-

-

-					}

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:803:5: this_CompositeSelector_2= ruleCompositeSelector

-				{

-

-					newCompositeNode(grammarAccess.getSelectorAccess().getCompositeSelectorParserRuleCall_1());

-

-					pushFollow(FOLLOW_ruleCompositeSelector_in_ruleSelector1818);

-					this_CompositeSelector_2 = ruleCompositeSelector();

-

-					state._fsp--;

-

-

-					current = this_CompositeSelector_2;

-					afterParserOrEnumRuleCall();

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleSelector"

-

-

-	// $ANTLR start "entryRuleCompositeSelector"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:819:1: entryRuleCompositeSelector returns [EObject current=null] : iv_ruleCompositeSelector= ruleCompositeSelector EOF ;

-	public final EObject entryRuleCompositeSelector() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleCompositeSelector = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:820:2: (iv_ruleCompositeSelector= ruleCompositeSelector EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:821:2: iv_ruleCompositeSelector= ruleCompositeSelector EOF

-			{

-				newCompositeNode(grammarAccess.getCompositeSelectorRule());

-				pushFollow(FOLLOW_ruleCompositeSelector_in_entryRuleCompositeSelector1853);

-				iv_ruleCompositeSelector = ruleCompositeSelector();

-

-				state._fsp--;

-

-				current = iv_ruleCompositeSelector;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleCompositeSelector1863);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleCompositeSelector"

-

-

-	// $ANTLR start "ruleCompositeSelector"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:828:1: ruleCompositeSelector returns [EObject current=null] : ( ( (lv_left_0_0= ruleSimpleSelector ) ) ( (this_WS_1= RULE_WS )+

-	// | ( (this_WS_2= RULE_WS )* ( (lv_combinator_3_0= ruleCombinator ) ) ) ) ( (lv_right_4_0= ruleSelector ) ) ) ;

-	public final EObject ruleCompositeSelector() throws RecognitionException {

-		EObject current = null;

-

-		Token this_WS_1 = null;

-		Token this_WS_2 = null;

-		EObject lv_left_0_0 = null;

-

-		EObject lv_combinator_3_0 = null;

-

-		EObject lv_right_4_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:831:28: ( ( ( (lv_left_0_0= ruleSimpleSelector ) ) ( (this_WS_1= RULE_WS )+ | ( (this_WS_2= RULE_WS )* (

-			// (lv_combinator_3_0= ruleCombinator ) ) ) ) ( (lv_right_4_0= ruleSelector ) ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:832:1: ( ( (lv_left_0_0= ruleSimpleSelector ) ) ( (this_WS_1= RULE_WS )+ | ( (this_WS_2= RULE_WS )* (

-			// (lv_combinator_3_0= ruleCombinator ) ) ) ) ( (lv_right_4_0= ruleSelector ) ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:832:1: ( ( (lv_left_0_0= ruleSimpleSelector ) ) ( (this_WS_1= RULE_WS )+ | ( (this_WS_2= RULE_WS )* (

-				// (lv_combinator_3_0= ruleCombinator ) ) ) ) ( (lv_right_4_0= ruleSelector ) ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:832:2: ( (lv_left_0_0= ruleSimpleSelector ) ) ( (this_WS_1= RULE_WS )+ | ( (this_WS_2= RULE_WS )* (

-				// (lv_combinator_3_0= ruleCombinator ) ) ) ) ( (lv_right_4_0= ruleSelector ) )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:832:2: ( (lv_left_0_0= ruleSimpleSelector ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:833:1: (lv_left_0_0= ruleSimpleSelector )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:833:1: (lv_left_0_0= ruleSimpleSelector )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:834:3: lv_left_0_0= ruleSimpleSelector

-						{

-

-							newCompositeNode(grammarAccess.getCompositeSelectorAccess().getLeftSimpleSelectorParserRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleSimpleSelector_in_ruleCompositeSelector1909);

-							lv_left_0_0 = ruleSimpleSelector();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getCompositeSelectorRule());

-							}

-							set(

-									current,

-									"left",

-									lv_left_0_0,

-									"SimpleSelector");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:850:2: ( (this_WS_1= RULE_WS )+ | ( (this_WS_2= RULE_WS )* ( (lv_combinator_3_0= ruleCombinator ) ) ) )

-					int alt47 = 2;

-					alt47 = dfa47.predict(input);

-					switch (alt47) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:850:3: (this_WS_1= RULE_WS )+

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:850:3: (this_WS_1= RULE_WS )+

-						int cnt45 = 0;

-						loop45: do {

-							int alt45 = 2;

-							int LA45_0 = input.LA(1);

-

-							if ((LA45_0 == RULE_WS)) {

-								alt45 = 1;

-							}

-

-

-							switch (alt45) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:850:4: this_WS_1= RULE_WS

-							{

-								this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleCompositeSelector1922);

-

-								newLeafNode(this_WS_1, grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_0());

-

-

-							}

-								break;

-

-							default:

-								if (cnt45 >= 1) {

-									break loop45;

-								}

-								EarlyExitException eee =

-										new EarlyExitException(45, input);

-								throw eee;

-							}

-							cnt45++;

-						} while (true);

-

-

-					}

-						break;

-					case 2:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:855:6: ( (this_WS_2= RULE_WS )* ( (lv_combinator_3_0= ruleCombinator ) ) )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:855:6: ( (this_WS_2= RULE_WS )* ( (lv_combinator_3_0= ruleCombinator ) ) )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:855:7: (this_WS_2= RULE_WS )* ( (lv_combinator_3_0= ruleCombinator ) )

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:855:7: (this_WS_2= RULE_WS )*

-							loop46: do {

-								int alt46 = 2;

-								int LA46_0 = input.LA(1);

-

-								if ((LA46_0 == RULE_WS)) {

-									alt46 = 1;

-								}

-

-

-								switch (alt46) {

-								case 1:

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:855:8: this_WS_2= RULE_WS

-								{

-									this_WS_2 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleCompositeSelector1942);

-

-									newLeafNode(this_WS_2, grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_1_0());

-

-

-								}

-									break;

-

-								default:

-									break loop46;

-								}

-							} while (true);

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:859:3: ( (lv_combinator_3_0= ruleCombinator ) )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:860:1: (lv_combinator_3_0= ruleCombinator )

-							{

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:860:1: (lv_combinator_3_0= ruleCombinator )

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:861:3: lv_combinator_3_0= ruleCombinator

-								{

-

-									newCompositeNode(grammarAccess.getCompositeSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0());

-

-									pushFollow(FOLLOW_ruleCombinator_in_ruleCompositeSelector1964);

-									lv_combinator_3_0 = ruleCombinator();

-

-									state._fsp--;

-

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getCompositeSelectorRule());

-									}

-									set(

-											current,

-											"combinator",

-											lv_combinator_3_0,

-											"Combinator");

-									afterParserOrEnumRuleCall();

-

-

-								}

-

-

-							}

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:877:4: ( (lv_right_4_0= ruleSelector ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:878:1: (lv_right_4_0= ruleSelector )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:878:1: (lv_right_4_0= ruleSelector )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:879:3: lv_right_4_0= ruleSelector

-						{

-

-							newCompositeNode(grammarAccess.getCompositeSelectorAccess().getRightSelectorParserRuleCall_2_0());

-

-							pushFollow(FOLLOW_ruleSelector_in_ruleCompositeSelector1987);

-							lv_right_4_0 = ruleSelector();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getCompositeSelectorRule());

-							}

-							set(

-									current,

-									"right",

-									lv_right_4_0,

-									"Selector");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleCompositeSelector"

-

-

-	// $ANTLR start "entryRuleSimpleSelector"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:903:1: entryRuleSimpleSelector returns [EObject current=null] : iv_ruleSimpleSelector= ruleSimpleSelector EOF ;

-	public final EObject entryRuleSimpleSelector() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleSimpleSelector = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:904:2: (iv_ruleSimpleSelector= ruleSimpleSelector EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:905:2: iv_ruleSimpleSelector= ruleSimpleSelector EOF

-			{

-				newCompositeNode(grammarAccess.getSimpleSelectorRule());

-				pushFollow(FOLLOW_ruleSimpleSelector_in_entryRuleSimpleSelector2023);

-				iv_ruleSimpleSelector = ruleSimpleSelector();

-

-				state._fsp--;

-

-				current = iv_ruleSimpleSelector;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleSimpleSelector2033);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleSimpleSelector"

-

-

-	// $ANTLR start "ruleSimpleSelector"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:912:1: ruleSimpleSelector returns [EObject current=null] : ( ( ( ( (lv_elementName_0_1= RULE_ID | lv_elementName_0_2= '*' ) ) )

-	// ( (lv_condition_1_0= ruleSelectorCondition ) )* ) | ( (lv_condition_2_0= ruleSelectorCondition ) )+ ) ;

-	public final EObject ruleSimpleSelector() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_elementName_0_1 = null;

-		Token lv_elementName_0_2 = null;

-		EObject lv_condition_1_0 = null;

-

-		EObject lv_condition_2_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:915:28: ( ( ( ( ( (lv_elementName_0_1= RULE_ID | lv_elementName_0_2= '*' ) ) ) ( (lv_condition_1_0=

-			// ruleSelectorCondition ) )* ) | ( (lv_condition_2_0= ruleSelectorCondition ) )+ ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:916:1: ( ( ( ( (lv_elementName_0_1= RULE_ID | lv_elementName_0_2= '*' ) ) ) ( (lv_condition_1_0= ruleSelectorCondition )

-			// )* ) | ( (lv_condition_2_0= ruleSelectorCondition ) )+ )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:916:1: ( ( ( ( (lv_elementName_0_1= RULE_ID | lv_elementName_0_2= '*' ) ) ) ( (lv_condition_1_0=

-				// ruleSelectorCondition ) )* ) | ( (lv_condition_2_0= ruleSelectorCondition ) )+ )

-				int alt51 = 2;

-				int LA51_0 = input.LA(1);

-

-				if ((LA51_0 == RULE_ID || LA51_0 == 31)) {

-					alt51 = 1;

-				}

-				else if (((LA51_0 >= RULE_HASH && LA51_0 <= RULE_T_CLASS) || LA51_0 == 30 || LA51_0 == 36)) {

-					alt51 = 2;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 51, 0, input);

-

-					throw nvae;

-				}

-				switch (alt51) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:916:2: ( ( ( (lv_elementName_0_1= RULE_ID | lv_elementName_0_2= '*' ) ) ) ( (lv_condition_1_0= ruleSelectorCondition

-				// ) )* )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:916:2: ( ( ( (lv_elementName_0_1= RULE_ID | lv_elementName_0_2= '*' ) ) ) ( (lv_condition_1_0=

-					// ruleSelectorCondition ) )* )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:916:3: ( ( (lv_elementName_0_1= RULE_ID | lv_elementName_0_2= '*' ) ) ) ( (lv_condition_1_0=

-					// ruleSelectorCondition ) )*

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:916:3: ( ( (lv_elementName_0_1= RULE_ID | lv_elementName_0_2= '*' ) ) )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:917:1: ( (lv_elementName_0_1= RULE_ID | lv_elementName_0_2= '*' ) )

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:917:1: ( (lv_elementName_0_1= RULE_ID | lv_elementName_0_2= '*' ) )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:918:1: (lv_elementName_0_1= RULE_ID | lv_elementName_0_2= '*' )

-							{

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:918:1: (lv_elementName_0_1= RULE_ID | lv_elementName_0_2= '*' )

-								int alt48 = 2;

-								int LA48_0 = input.LA(1);

-

-								if ((LA48_0 == RULE_ID)) {

-									alt48 = 1;

-								}

-								else if ((LA48_0 == 31)) {

-									alt48 = 2;

-								}

-								else {

-									NoViableAltException nvae =

-											new NoViableAltException("", 48, 0, input);

-

-									throw nvae;

-								}

-								switch (alt48) {

-								case 1:

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:919:3: lv_elementName_0_1= RULE_ID

-								{

-									lv_elementName_0_1 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleSimpleSelector2078);

-

-									newLeafNode(lv_elementName_0_1, grammarAccess.getSimpleSelectorAccess().getElementNameIDTerminalRuleCall_0_0_0_0());

-

-

-									if (current == null) {

-										current = createModelElement(grammarAccess.getSimpleSelectorRule());

-									}

-									setWithLastConsumed(

-											current,

-											"elementName",

-											lv_elementName_0_1,

-											"ID");

-

-

-								}

-									break;

-								case 2:

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:934:8: lv_elementName_0_2= '*'

-								{

-									lv_elementName_0_2 = (Token) match(input, 31, FOLLOW_31_in_ruleSimpleSelector2099);

-

-									newLeafNode(lv_elementName_0_2, grammarAccess.getSimpleSelectorAccess().getElementNameAsteriskKeyword_0_0_0_1());

-

-

-									if (current == null) {

-										current = createModelElement(grammarAccess.getSimpleSelectorRule());

-									}

-									setWithLastConsumed(current, "elementName", lv_elementName_0_2, null);

-

-

-								}

-									break;

-

-								}

-

-

-							}

-

-

-						}

-

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:949:2: ( (lv_condition_1_0= ruleSelectorCondition ) )*

-						loop49: do {

-							int alt49 = 2;

-							int LA49_0 = input.LA(1);

-

-							if (((LA49_0 >= RULE_HASH && LA49_0 <= RULE_T_CLASS) || LA49_0 == 30 || LA49_0 == 36)) {

-								alt49 = 1;

-							}

-

-

-							switch (alt49) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:950:1: (lv_condition_1_0= ruleSelectorCondition )

-							{

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:950:1: (lv_condition_1_0= ruleSelectorCondition )

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:951:3: lv_condition_1_0= ruleSelectorCondition

-								{

-

-									newCompositeNode(grammarAccess.getSimpleSelectorAccess().getConditionSelectorConditionParserRuleCall_0_1_0());

-

-									pushFollow(FOLLOW_ruleSelectorCondition_in_ruleSimpleSelector2136);

-									lv_condition_1_0 = ruleSelectorCondition();

-

-									state._fsp--;

-

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getSimpleSelectorRule());

-									}

-									add(

-											current,

-											"condition",

-											lv_condition_1_0,

-											"SelectorCondition");

-									afterParserOrEnumRuleCall();

-

-

-								}

-

-

-							}

-								break;

-

-							default:

-								break loop49;

-							}

-						} while (true);

-

-

-					}

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:968:6: ( (lv_condition_2_0= ruleSelectorCondition ) )+

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:968:6: ( (lv_condition_2_0= ruleSelectorCondition ) )+

-					int cnt50 = 0;

-					loop50: do {

-						int alt50 = 2;

-						int LA50_0 = input.LA(1);

-

-						if (((LA50_0 >= RULE_HASH && LA50_0 <= RULE_T_CLASS) || LA50_0 == 30 || LA50_0 == 36)) {

-							alt50 = 1;

-						}

-

-

-						switch (alt50) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:969:1: (lv_condition_2_0= ruleSelectorCondition )

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:969:1: (lv_condition_2_0= ruleSelectorCondition )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:970:3: lv_condition_2_0= ruleSelectorCondition

-							{

-

-								newCompositeNode(grammarAccess.getSimpleSelectorAccess().getConditionSelectorConditionParserRuleCall_1_0());

-

-								pushFollow(FOLLOW_ruleSelectorCondition_in_ruleSimpleSelector2165);

-								lv_condition_2_0 = ruleSelectorCondition();

-

-								state._fsp--;

-

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getSimpleSelectorRule());

-								}

-								add(

-										current,

-										"condition",

-										lv_condition_2_0,

-										"SelectorCondition");

-								afterParserOrEnumRuleCall();

-

-

-							}

-

-

-						}

-							break;

-

-						default:

-							if (cnt50 >= 1) {

-								break loop50;

-							}

-							EarlyExitException eee =

-									new EarlyExitException(50, input);

-							throw eee;

-						}

-						cnt50++;

-					} while (true);

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleSimpleSelector"

-

-

-	// $ANTLR start "entryRuleSelectorCondition"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:994:1: entryRuleSelectorCondition returns [EObject current=null] : iv_ruleSelectorCondition= ruleSelectorCondition EOF ;

-	public final EObject entryRuleSelectorCondition() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleSelectorCondition = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:995:2: (iv_ruleSelectorCondition= ruleSelectorCondition EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:996:2: iv_ruleSelectorCondition= ruleSelectorCondition EOF

-			{

-				newCompositeNode(grammarAccess.getSelectorConditionRule());

-				pushFollow(FOLLOW_ruleSelectorCondition_in_entryRuleSelectorCondition2202);

-				iv_ruleSelectorCondition = ruleSelectorCondition();

-

-				state._fsp--;

-

-				current = iv_ruleSelectorCondition;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleSelectorCondition2212);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleSelectorCondition"

-

-

-	// $ANTLR start "ruleSelectorCondition"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1003:1: ruleSelectorCondition returns [EObject current=null] : (this_CSSId_0= ruleCSSId | this_Class_1= ruleClass |

-	// this_Attribute_2= ruleAttribute | this_Pseudo_3= rulePseudo ) ;

-	public final EObject ruleSelectorCondition() throws RecognitionException {

-		EObject current = null;

-

-		EObject this_CSSId_0 = null;

-

-		EObject this_Class_1 = null;

-

-		EObject this_Attribute_2 = null;

-

-		EObject this_Pseudo_3 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1006:28: ( (this_CSSId_0= ruleCSSId | this_Class_1= ruleClass | this_Attribute_2= ruleAttribute | this_Pseudo_3=

-			// rulePseudo ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1007:1: (this_CSSId_0= ruleCSSId | this_Class_1= ruleClass | this_Attribute_2= ruleAttribute | this_Pseudo_3= rulePseudo

-			// )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1007:1: (this_CSSId_0= ruleCSSId | this_Class_1= ruleClass | this_Attribute_2= ruleAttribute | this_Pseudo_3=

-				// rulePseudo )

-				int alt52 = 4;

-				switch (input.LA(1)) {

-				case RULE_HASH: {

-					alt52 = 1;

-				}

-					break;

-				case RULE_T_CLASS: {

-					alt52 = 2;

-				}

-					break;

-				case 36: {

-					alt52 = 3;

-				}

-					break;

-				case 30: {

-					alt52 = 4;

-				}

-					break;

-				default:

-					NoViableAltException nvae =

-							new NoViableAltException("", 52, 0, input);

-

-					throw nvae;

-				}

-

-				switch (alt52) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1008:5: this_CSSId_0= ruleCSSId

-				{

-

-					newCompositeNode(grammarAccess.getSelectorConditionAccess().getCSSIdParserRuleCall_0());

-

-					pushFollow(FOLLOW_ruleCSSId_in_ruleSelectorCondition2259);

-					this_CSSId_0 = ruleCSSId();

-

-					state._fsp--;

-

-

-					current = this_CSSId_0;

-					afterParserOrEnumRuleCall();

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1018:5: this_Class_1= ruleClass

-				{

-

-					newCompositeNode(grammarAccess.getSelectorConditionAccess().getClassParserRuleCall_1());

-

-					pushFollow(FOLLOW_ruleClass_in_ruleSelectorCondition2286);

-					this_Class_1 = ruleClass();

-

-					state._fsp--;

-

-

-					current = this_Class_1;

-					afterParserOrEnumRuleCall();

-

-

-				}

-					break;

-				case 3:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1028:5: this_Attribute_2= ruleAttribute

-				{

-

-					newCompositeNode(grammarAccess.getSelectorConditionAccess().getAttributeParserRuleCall_2());

-

-					pushFollow(FOLLOW_ruleAttribute_in_ruleSelectorCondition2313);

-					this_Attribute_2 = ruleAttribute();

-

-					state._fsp--;

-

-

-					current = this_Attribute_2;

-					afterParserOrEnumRuleCall();

-

-

-				}

-					break;

-				case 4:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1038:5: this_Pseudo_3= rulePseudo

-				{

-

-					newCompositeNode(grammarAccess.getSelectorConditionAccess().getPseudoParserRuleCall_3());

-

-					pushFollow(FOLLOW_rulePseudo_in_ruleSelectorCondition2340);

-					this_Pseudo_3 = rulePseudo();

-

-					state._fsp--;

-

-

-					current = this_Pseudo_3;

-					afterParserOrEnumRuleCall();

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleSelectorCondition"

-

-

-	// $ANTLR start "entryRuleCombinator"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1054:1: entryRuleCombinator returns [EObject current=null] : iv_ruleCombinator= ruleCombinator EOF ;

-	public final EObject entryRuleCombinator() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleCombinator = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1055:2: (iv_ruleCombinator= ruleCombinator EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1056:2: iv_ruleCombinator= ruleCombinator EOF

-			{

-				newCompositeNode(grammarAccess.getCombinatorRule());

-				pushFollow(FOLLOW_ruleCombinator_in_entryRuleCombinator2375);

-				iv_ruleCombinator = ruleCombinator();

-

-				state._fsp--;

-

-				current = iv_ruleCombinator;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleCombinator2385);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleCombinator"

-

-

-	// $ANTLR start "ruleCombinator"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1063:1: ruleCombinator returns [EObject current=null] : ( ( (lv_kind_0_0= ruleKIND ) ) (this_WS_1= RULE_WS )* ) ;

-	public final EObject ruleCombinator() throws RecognitionException {

-		EObject current = null;

-

-		Token this_WS_1 = null;

-		Enumerator lv_kind_0_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1066:28: ( ( ( (lv_kind_0_0= ruleKIND ) ) (this_WS_1= RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1067:1: ( ( (lv_kind_0_0= ruleKIND ) ) (this_WS_1= RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1067:1: ( ( (lv_kind_0_0= ruleKIND ) ) (this_WS_1= RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1067:2: ( (lv_kind_0_0= ruleKIND ) ) (this_WS_1= RULE_WS )*

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1067:2: ( (lv_kind_0_0= ruleKIND ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1068:1: (lv_kind_0_0= ruleKIND )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1068:1: (lv_kind_0_0= ruleKIND )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1069:3: lv_kind_0_0= ruleKIND

-						{

-

-							newCompositeNode(grammarAccess.getCombinatorAccess().getKindKINDEnumRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleKIND_in_ruleCombinator2431);

-							lv_kind_0_0 = ruleKIND();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getCombinatorRule());

-							}

-							set(

-									current,

-									"kind",

-									lv_kind_0_0,

-									"KIND");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1085:2: (this_WS_1= RULE_WS )*

-					loop53: do {

-						int alt53 = 2;

-						int LA53_0 = input.LA(1);

-

-						if ((LA53_0 == RULE_WS)) {

-							alt53 = 1;

-						}

-

-

-						switch (alt53) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1085:3: this_WS_1= RULE_WS

-						{

-							this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleCombinator2443);

-

-							newLeafNode(this_WS_1, grammarAccess.getCombinatorAccess().getWSTerminalRuleCall_1());

-

-

-						}

-							break;

-

-						default:

-							break loop53;

-						}

-					} while (true);

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleCombinator"

-

-

-	// $ANTLR start "entryRuleDeclaration"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1097:1: entryRuleDeclaration returns [EObject current=null] : iv_ruleDeclaration= ruleDeclaration EOF ;

-	public final EObject entryRuleDeclaration() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleDeclaration = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1098:2: (iv_ruleDeclaration= ruleDeclaration EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1099:2: iv_ruleDeclaration= ruleDeclaration EOF

-			{

-				newCompositeNode(grammarAccess.getDeclarationRule());

-				pushFollow(FOLLOW_ruleDeclaration_in_entryRuleDeclaration2480);

-				iv_ruleDeclaration = ruleDeclaration();

-

-				state._fsp--;

-

-				current = iv_ruleDeclaration;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleDeclaration2490);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleDeclaration"

-

-

-	// $ANTLR start "ruleDeclaration"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1106:1: ruleDeclaration returns [EObject current=null] : ( ( (lv_property_0_0= RULE_ID ) ) (this_WS_1= RULE_WS )* otherlv_2= ':'

-	// (this_WS_3= RULE_WS )* ( (lv_expression_4_0= ruleExpression ) ) ( ( (lv_important_5_0= RULE_T_IMPORTANT ) ) (this_WS_6= RULE_WS )* )? ) ;

-	public final EObject ruleDeclaration() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_property_0_0 = null;

-		Token this_WS_1 = null;

-		Token otherlv_2 = null;

-		Token this_WS_3 = null;

-		Token lv_important_5_0 = null;

-		Token this_WS_6 = null;

-		EObject lv_expression_4_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1109:28: ( ( ( (lv_property_0_0= RULE_ID ) ) (this_WS_1= RULE_WS )* otherlv_2= ':' (this_WS_3= RULE_WS )* (

-			// (lv_expression_4_0= ruleExpression ) ) ( ( (lv_important_5_0= RULE_T_IMPORTANT ) ) (this_WS_6= RULE_WS )* )? ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1110:1: ( ( (lv_property_0_0= RULE_ID ) ) (this_WS_1= RULE_WS )* otherlv_2= ':' (this_WS_3= RULE_WS )* (

-			// (lv_expression_4_0= ruleExpression ) ) ( ( (lv_important_5_0= RULE_T_IMPORTANT ) ) (this_WS_6= RULE_WS )* )? )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1110:1: ( ( (lv_property_0_0= RULE_ID ) ) (this_WS_1= RULE_WS )* otherlv_2= ':' (this_WS_3= RULE_WS )* (

-				// (lv_expression_4_0= ruleExpression ) ) ( ( (lv_important_5_0= RULE_T_IMPORTANT ) ) (this_WS_6= RULE_WS )* )? )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1110:2: ( (lv_property_0_0= RULE_ID ) ) (this_WS_1= RULE_WS )* otherlv_2= ':' (this_WS_3= RULE_WS )* (

-				// (lv_expression_4_0= ruleExpression ) ) ( ( (lv_important_5_0= RULE_T_IMPORTANT ) ) (this_WS_6= RULE_WS )* )?

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1110:2: ( (lv_property_0_0= RULE_ID ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1111:1: (lv_property_0_0= RULE_ID )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1111:1: (lv_property_0_0= RULE_ID )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1112:3: lv_property_0_0= RULE_ID

-						{

-							lv_property_0_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleDeclaration2532);

-

-							newLeafNode(lv_property_0_0, grammarAccess.getDeclarationAccess().getPropertyIDTerminalRuleCall_0_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getDeclarationRule());

-							}

-							setWithLastConsumed(

-									current,

-									"property",

-									lv_property_0_0,

-									"ID");

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1128:2: (this_WS_1= RULE_WS )*

-					loop54: do {

-						int alt54 = 2;

-						int LA54_0 = input.LA(1);

-

-						if ((LA54_0 == RULE_WS)) {

-							alt54 = 1;

-						}

-

-

-						switch (alt54) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1128:3: this_WS_1= RULE_WS

-						{

-							this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleDeclaration2549);

-

-							newLeafNode(this_WS_1, grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_1());

-

-

-						}

-							break;

-

-						default:

-							break loop54;

-						}

-					} while (true);

-

-					otherlv_2 = (Token) match(input, 30, FOLLOW_30_in_ruleDeclaration2562);

-

-					newLeafNode(otherlv_2, grammarAccess.getDeclarationAccess().getColonKeyword_2());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1136:1: (this_WS_3= RULE_WS )*

-					loop55: do {

-						int alt55 = 2;

-						int LA55_0 = input.LA(1);

-

-						if ((LA55_0 == RULE_WS)) {

-							alt55 = 1;

-						}

-

-

-						switch (alt55) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1136:2: this_WS_3= RULE_WS

-						{

-							this_WS_3 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleDeclaration2574);

-

-							newLeafNode(this_WS_3, grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_3());

-

-

-						}

-							break;

-

-						default:

-							break loop55;

-						}

-					} while (true);

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1140:3: ( (lv_expression_4_0= ruleExpression ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1141:1: (lv_expression_4_0= ruleExpression )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1141:1: (lv_expression_4_0= ruleExpression )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1142:3: lv_expression_4_0= ruleExpression

-						{

-

-							newCompositeNode(grammarAccess.getDeclarationAccess().getExpressionExpressionParserRuleCall_4_0());

-

-							pushFollow(FOLLOW_ruleExpression_in_ruleDeclaration2596);

-							lv_expression_4_0 = ruleExpression();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getDeclarationRule());

-							}

-							set(

-									current,

-									"expression",

-									lv_expression_4_0,

-									"Expression");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1158:2: ( ( (lv_important_5_0= RULE_T_IMPORTANT ) ) (this_WS_6= RULE_WS )* )?

-					int alt57 = 2;

-					int LA57_0 = input.LA(1);

-

-					if ((LA57_0 == RULE_T_IMPORTANT)) {

-						alt57 = 1;

-					}

-					switch (alt57) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1158:3: ( (lv_important_5_0= RULE_T_IMPORTANT ) ) (this_WS_6= RULE_WS )*

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1158:3: ( (lv_important_5_0= RULE_T_IMPORTANT ) )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1159:1: (lv_important_5_0= RULE_T_IMPORTANT )

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1159:1: (lv_important_5_0= RULE_T_IMPORTANT )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1160:3: lv_important_5_0= RULE_T_IMPORTANT

-							{

-								lv_important_5_0 = (Token) match(input, RULE_T_IMPORTANT, FOLLOW_RULE_T_IMPORTANT_in_ruleDeclaration2614);

-

-								newLeafNode(lv_important_5_0, grammarAccess.getDeclarationAccess().getImportantT_IMPORTANTTerminalRuleCall_5_0_0());

-

-

-								if (current == null) {

-									current = createModelElement(grammarAccess.getDeclarationRule());

-								}

-								setWithLastConsumed(

-										current,

-										"important",

-										true,

-										"T_IMPORTANT");

-

-

-							}

-

-

-						}

-

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1176:2: (this_WS_6= RULE_WS )*

-						loop56: do {

-							int alt56 = 2;

-							int LA56_0 = input.LA(1);

-

-							if ((LA56_0 == RULE_WS)) {

-								alt56 = 1;

-							}

-

-

-							switch (alt56) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1176:3: this_WS_6= RULE_WS

-							{

-								this_WS_6 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleDeclaration2631);

-

-								newLeafNode(this_WS_6, grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_5_1());

-

-

-							}

-								break;

-

-							default:

-								break loop56;

-							}

-						} while (true);

-

-

-					}

-						break;

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleDeclaration"

-

-

-	// $ANTLR start "entryRuleExpression"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1188:1: entryRuleExpression returns [EObject current=null] : iv_ruleExpression= ruleExpression EOF ;

-	public final EObject entryRuleExpression() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleExpression = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1189:2: (iv_ruleExpression= ruleExpression EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1190:2: iv_ruleExpression= ruleExpression EOF

-			{

-				newCompositeNode(grammarAccess.getExpressionRule());

-				pushFollow(FOLLOW_ruleExpression_in_entryRuleExpression2670);

-				iv_ruleExpression = ruleExpression();

-

-				state._fsp--;

-

-				current = iv_ruleExpression;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleExpression2680);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleExpression"

-

-

-	// $ANTLR start "ruleExpression"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1197:1: ruleExpression returns [EObject current=null] : ( ( (lv_terms_0_0= ruleTerm ) ) ( (lv_subterms_1_0= ruleSubterm ) )* ) ;

-	public final EObject ruleExpression() throws RecognitionException {

-		EObject current = null;

-

-		EObject lv_terms_0_0 = null;

-

-		EObject lv_subterms_1_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1200:28: ( ( ( (lv_terms_0_0= ruleTerm ) ) ( (lv_subterms_1_0= ruleSubterm ) )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1201:1: ( ( (lv_terms_0_0= ruleTerm ) ) ( (lv_subterms_1_0= ruleSubterm ) )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1201:1: ( ( (lv_terms_0_0= ruleTerm ) ) ( (lv_subterms_1_0= ruleSubterm ) )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1201:2: ( (lv_terms_0_0= ruleTerm ) ) ( (lv_subterms_1_0= ruleSubterm ) )*

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1201:2: ( (lv_terms_0_0= ruleTerm ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1202:1: (lv_terms_0_0= ruleTerm )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1202:1: (lv_terms_0_0= ruleTerm )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1203:3: lv_terms_0_0= ruleTerm

-						{

-

-							newCompositeNode(grammarAccess.getExpressionAccess().getTermsTermParserRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleTerm_in_ruleExpression2726);

-							lv_terms_0_0 = ruleTerm();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getExpressionRule());

-							}

-							set(

-									current,

-									"terms",

-									lv_terms_0_0,

-									"Term");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1219:2: ( (lv_subterms_1_0= ruleSubterm ) )*

-					loop58: do {

-						int alt58 = 2;

-						int LA58_0 = input.LA(1);

-

-						if ((LA58_0 == RULE_STRING || LA58_0 == RULE_ID || LA58_0 == RULE_T_NUM || LA58_0 == RULE_HASH || LA58_0 == 25 || (LA58_0 >= 34 && LA58_0 <= 35) || (LA58_0 >= 38 && LA58_0 <= 39))) {

-							alt58 = 1;

-						}

-

-

-						switch (alt58) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1220:1: (lv_subterms_1_0= ruleSubterm )

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1220:1: (lv_subterms_1_0= ruleSubterm )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1221:3: lv_subterms_1_0= ruleSubterm

-							{

-

-								newCompositeNode(grammarAccess.getExpressionAccess().getSubtermsSubtermParserRuleCall_1_0());

-

-								pushFollow(FOLLOW_ruleSubterm_in_ruleExpression2747);

-								lv_subterms_1_0 = ruleSubterm();

-

-								state._fsp--;

-

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getExpressionRule());

-								}

-								add(

-										current,

-										"subterms",

-										lv_subterms_1_0,

-										"Subterm");

-								afterParserOrEnumRuleCall();

-

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop58;

-						}

-					} while (true);

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleExpression"

-

-

-	// $ANTLR start "entryRuleSubterm"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1245:1: entryRuleSubterm returns [EObject current=null] : iv_ruleSubterm= ruleSubterm EOF ;

-	public final EObject entryRuleSubterm() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleSubterm = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1246:2: (iv_ruleSubterm= ruleSubterm EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1247:2: iv_ruleSubterm= ruleSubterm EOF

-			{

-				newCompositeNode(grammarAccess.getSubtermRule());

-				pushFollow(FOLLOW_ruleSubterm_in_entryRuleSubterm2784);

-				iv_ruleSubterm = ruleSubterm();

-

-				state._fsp--;

-

-				current = iv_ruleSubterm;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleSubterm2794);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleSubterm"

-

-

-	// $ANTLR start "ruleSubterm"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1254:1: ruleSubterm returns [EObject current=null] : ( ( (lv_operator_0_0= ruleOperator ) )? ( (lv_term_1_0= ruleTerm ) ) ) ;

-	public final EObject ruleSubterm() throws RecognitionException {

-		EObject current = null;

-

-		AntlrDatatypeRuleToken lv_operator_0_0 = null;

-

-		EObject lv_term_1_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1257:28: ( ( ( (lv_operator_0_0= ruleOperator ) )? ( (lv_term_1_0= ruleTerm ) ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1258:1: ( ( (lv_operator_0_0= ruleOperator ) )? ( (lv_term_1_0= ruleTerm ) ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1258:1: ( ( (lv_operator_0_0= ruleOperator ) )? ( (lv_term_1_0= ruleTerm ) ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1258:2: ( (lv_operator_0_0= ruleOperator ) )? ( (lv_term_1_0= ruleTerm ) )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1258:2: ( (lv_operator_0_0= ruleOperator ) )?

-					int alt59 = 2;

-					int LA59_0 = input.LA(1);

-

-					if ((LA59_0 == 25 || LA59_0 == 35)) {

-						alt59 = 1;

-					}

-					switch (alt59) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1259:1: (lv_operator_0_0= ruleOperator )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1259:1: (lv_operator_0_0= ruleOperator )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1260:3: lv_operator_0_0= ruleOperator

-						{

-

-							newCompositeNode(grammarAccess.getSubtermAccess().getOperatorOperatorParserRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleOperator_in_ruleSubterm2840);

-							lv_operator_0_0 = ruleOperator();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getSubtermRule());

-							}

-							set(

-									current,

-									"operator",

-									lv_operator_0_0,

-									"Operator");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1276:3: ( (lv_term_1_0= ruleTerm ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1277:1: (lv_term_1_0= ruleTerm )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1277:1: (lv_term_1_0= ruleTerm )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1278:3: lv_term_1_0= ruleTerm

-						{

-

-							newCompositeNode(grammarAccess.getSubtermAccess().getTermTermParserRuleCall_1_0());

-

-							pushFollow(FOLLOW_ruleTerm_in_ruleSubterm2862);

-							lv_term_1_0 = ruleTerm();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getSubtermRule());

-							}

-							set(

-									current,

-									"term",

-									lv_term_1_0,

-									"Term");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleSubterm"

-

-

-	// $ANTLR start "entryRuleTerm"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1302:1: entryRuleTerm returns [EObject current=null] : iv_ruleTerm= ruleTerm EOF ;

-	public final EObject entryRuleTerm() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleTerm = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1303:2: (iv_ruleTerm= ruleTerm EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1304:2: iv_ruleTerm= ruleTerm EOF

-			{

-				newCompositeNode(grammarAccess.getTermRule());

-				pushFollow(FOLLOW_ruleTerm_in_entryRuleTerm2898);

-				iv_ruleTerm = ruleTerm();

-

-				state._fsp--;

-

-				current = iv_ruleTerm;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleTerm2908);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleTerm"

-

-

-	// $ANTLR start "ruleTerm"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1311:1: ruleTerm returns [EObject current=null] : ( (this_Number_0= ruleNumber | this_Percentage_1= rulePercentage |

-	// this_Length_2= ruleLength | this_Ems_3= ruleEms | this_Exs_4= ruleExs | this_Angle_5= ruleAngle | this_Time_6= ruleTime | this_Frequency_7= ruleFrequency | this_Name_8= ruleName | this_StringValue_9= ruleStringValue | this_Uri_10= ruleUri |

-	// this_HexColor_11= ruleHexColor | this_Function_12= ruleFunction ) (this_WS_13= RULE_WS )* ) ;

-	public final EObject ruleTerm() throws RecognitionException {

-		EObject current = null;

-

-		Token this_WS_13 = null;

-		EObject this_Number_0 = null;

-

-		EObject this_Percentage_1 = null;

-

-		EObject this_Length_2 = null;

-

-		EObject this_Ems_3 = null;

-

-		EObject this_Exs_4 = null;

-

-		EObject this_Angle_5 = null;

-

-		EObject this_Time_6 = null;

-

-		EObject this_Frequency_7 = null;

-

-		EObject this_Name_8 = null;

-

-		EObject this_StringValue_9 = null;

-

-		EObject this_Uri_10 = null;

-

-		EObject this_HexColor_11 = null;

-

-		EObject this_Function_12 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1314:28: ( ( (this_Number_0= ruleNumber | this_Percentage_1= rulePercentage | this_Length_2= ruleLength | this_Ems_3=

-			// ruleEms | this_Exs_4= ruleExs | this_Angle_5= ruleAngle | this_Time_6= ruleTime | this_Frequency_7= ruleFrequency | this_Name_8= ruleName | this_StringValue_9= ruleStringValue | this_Uri_10= ruleUri | this_HexColor_11= ruleHexColor |

-			// this_Function_12= ruleFunction ) (this_WS_13= RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1315:1: ( (this_Number_0= ruleNumber | this_Percentage_1= rulePercentage | this_Length_2= ruleLength | this_Ems_3=

-			// ruleEms | this_Exs_4= ruleExs | this_Angle_5= ruleAngle | this_Time_6= ruleTime | this_Frequency_7= ruleFrequency | this_Name_8= ruleName | this_StringValue_9= ruleStringValue | this_Uri_10= ruleUri | this_HexColor_11= ruleHexColor |

-			// this_Function_12= ruleFunction ) (this_WS_13= RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1315:1: ( (this_Number_0= ruleNumber | this_Percentage_1= rulePercentage | this_Length_2= ruleLength | this_Ems_3=

-				// ruleEms | this_Exs_4= ruleExs | this_Angle_5= ruleAngle | this_Time_6= ruleTime | this_Frequency_7= ruleFrequency | this_Name_8= ruleName | this_StringValue_9= ruleStringValue | this_Uri_10= ruleUri | this_HexColor_11= ruleHexColor |

-				// this_Function_12= ruleFunction ) (this_WS_13= RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1315:2: (this_Number_0= ruleNumber | this_Percentage_1= rulePercentage | this_Length_2= ruleLength | this_Ems_3=

-				// ruleEms | this_Exs_4= ruleExs | this_Angle_5= ruleAngle | this_Time_6= ruleTime | this_Frequency_7= ruleFrequency | this_Name_8= ruleName | this_StringValue_9= ruleStringValue | this_Uri_10= ruleUri | this_HexColor_11= ruleHexColor |

-				// this_Function_12= ruleFunction ) (this_WS_13= RULE_WS )*

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1315:2: (this_Number_0= ruleNumber | this_Percentage_1= rulePercentage | this_Length_2= ruleLength | this_Ems_3=

-					// ruleEms | this_Exs_4= ruleExs | this_Angle_5= ruleAngle | this_Time_6= ruleTime | this_Frequency_7= ruleFrequency | this_Name_8= ruleName | this_StringValue_9= ruleStringValue | this_Uri_10= ruleUri | this_HexColor_11= ruleHexColor |

-					// this_Function_12= ruleFunction )

-					int alt60 = 13;

-					alt60 = dfa60.predict(input);

-					switch (alt60) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1316:5: this_Number_0= ruleNumber

-					{

-

-						newCompositeNode(grammarAccess.getTermAccess().getNumberParserRuleCall_0_0());

-

-						pushFollow(FOLLOW_ruleNumber_in_ruleTerm2956);

-						this_Number_0 = ruleNumber();

-

-						state._fsp--;

-

-

-						current = this_Number_0;

-						afterParserOrEnumRuleCall();

-

-

-					}

-						break;

-					case 2:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1326:5: this_Percentage_1= rulePercentage

-					{

-

-						newCompositeNode(grammarAccess.getTermAccess().getPercentageParserRuleCall_0_1());

-

-						pushFollow(FOLLOW_rulePercentage_in_ruleTerm2983);

-						this_Percentage_1 = rulePercentage();

-

-						state._fsp--;

-

-

-						current = this_Percentage_1;

-						afterParserOrEnumRuleCall();

-

-

-					}

-						break;

-					case 3:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1336:5: this_Length_2= ruleLength

-					{

-

-						newCompositeNode(grammarAccess.getTermAccess().getLengthParserRuleCall_0_2());

-

-						pushFollow(FOLLOW_ruleLength_in_ruleTerm3010);

-						this_Length_2 = ruleLength();

-

-						state._fsp--;

-

-

-						current = this_Length_2;

-						afterParserOrEnumRuleCall();

-

-

-					}

-						break;

-					case 4:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1346:5: this_Ems_3= ruleEms

-					{

-

-						newCompositeNode(grammarAccess.getTermAccess().getEmsParserRuleCall_0_3());

-

-						pushFollow(FOLLOW_ruleEms_in_ruleTerm3037);

-						this_Ems_3 = ruleEms();

-

-						state._fsp--;

-

-

-						current = this_Ems_3;

-						afterParserOrEnumRuleCall();

-

-

-					}

-						break;

-					case 5:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1356:5: this_Exs_4= ruleExs

-					{

-

-						newCompositeNode(grammarAccess.getTermAccess().getExsParserRuleCall_0_4());

-

-						pushFollow(FOLLOW_ruleExs_in_ruleTerm3064);

-						this_Exs_4 = ruleExs();

-

-						state._fsp--;

-

-

-						current = this_Exs_4;

-						afterParserOrEnumRuleCall();

-

-

-					}

-						break;

-					case 6:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1366:5: this_Angle_5= ruleAngle

-					{

-

-						newCompositeNode(grammarAccess.getTermAccess().getAngleParserRuleCall_0_5());

-

-						pushFollow(FOLLOW_ruleAngle_in_ruleTerm3091);

-						this_Angle_5 = ruleAngle();

-

-						state._fsp--;

-

-

-						current = this_Angle_5;

-						afterParserOrEnumRuleCall();

-

-

-					}

-						break;

-					case 7:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1376:5: this_Time_6= ruleTime

-					{

-

-						newCompositeNode(grammarAccess.getTermAccess().getTimeParserRuleCall_0_6());

-

-						pushFollow(FOLLOW_ruleTime_in_ruleTerm3118);

-						this_Time_6 = ruleTime();

-

-						state._fsp--;

-

-

-						current = this_Time_6;

-						afterParserOrEnumRuleCall();

-

-

-					}

-						break;

-					case 8:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1386:5: this_Frequency_7= ruleFrequency

-					{

-

-						newCompositeNode(grammarAccess.getTermAccess().getFrequencyParserRuleCall_0_7());

-

-						pushFollow(FOLLOW_ruleFrequency_in_ruleTerm3145);

-						this_Frequency_7 = ruleFrequency();

-

-						state._fsp--;

-

-

-						current = this_Frequency_7;

-						afterParserOrEnumRuleCall();

-

-

-					}

-						break;

-					case 9:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1396:5: this_Name_8= ruleName

-					{

-

-						newCompositeNode(grammarAccess.getTermAccess().getNameParserRuleCall_0_8());

-

-						pushFollow(FOLLOW_ruleName_in_ruleTerm3172);

-						this_Name_8 = ruleName();

-

-						state._fsp--;

-

-

-						current = this_Name_8;

-						afterParserOrEnumRuleCall();

-

-

-					}

-						break;

-					case 10:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1406:5: this_StringValue_9= ruleStringValue

-					{

-

-						newCompositeNode(grammarAccess.getTermAccess().getStringValueParserRuleCall_0_9());

-

-						pushFollow(FOLLOW_ruleStringValue_in_ruleTerm3199);

-						this_StringValue_9 = ruleStringValue();

-

-						state._fsp--;

-

-

-						current = this_StringValue_9;

-						afterParserOrEnumRuleCall();

-

-

-					}

-						break;

-					case 11:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1416:5: this_Uri_10= ruleUri

-					{

-

-						newCompositeNode(grammarAccess.getTermAccess().getUriParserRuleCall_0_10());

-

-						pushFollow(FOLLOW_ruleUri_in_ruleTerm3226);

-						this_Uri_10 = ruleUri();

-

-						state._fsp--;

-

-

-						current = this_Uri_10;

-						afterParserOrEnumRuleCall();

-

-

-					}

-						break;

-					case 12:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1426:5: this_HexColor_11= ruleHexColor

-					{

-

-						newCompositeNode(grammarAccess.getTermAccess().getHexColorParserRuleCall_0_11());

-

-						pushFollow(FOLLOW_ruleHexColor_in_ruleTerm3253);

-						this_HexColor_11 = ruleHexColor();

-

-						state._fsp--;

-

-

-						current = this_HexColor_11;

-						afterParserOrEnumRuleCall();

-

-

-					}

-						break;

-					case 13:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1436:5: this_Function_12= ruleFunction

-					{

-

-						newCompositeNode(grammarAccess.getTermAccess().getFunctionParserRuleCall_0_12());

-

-						pushFollow(FOLLOW_ruleFunction_in_ruleTerm3280);

-						this_Function_12 = ruleFunction();

-

-						state._fsp--;

-

-

-						current = this_Function_12;

-						afterParserOrEnumRuleCall();

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1444:2: (this_WS_13= RULE_WS )*

-					loop61: do {

-						int alt61 = 2;

-						int LA61_0 = input.LA(1);

-

-						if ((LA61_0 == RULE_WS)) {

-							alt61 = 1;

-						}

-

-

-						switch (alt61) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1444:3: this_WS_13= RULE_WS

-						{

-							this_WS_13 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleTerm3292);

-

-							newLeafNode(this_WS_13, grammarAccess.getTermAccess().getWSTerminalRuleCall_1());

-

-

-						}

-							break;

-

-						default:

-							break loop61;

-						}

-					} while (true);

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleTerm"

-

-

-	// $ANTLR start "entryRuleFunction"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1456:1: entryRuleFunction returns [EObject current=null] : iv_ruleFunction= ruleFunction EOF ;

-	public final EObject entryRuleFunction() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleFunction = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1457:2: (iv_ruleFunction= ruleFunction EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1458:2: iv_ruleFunction= ruleFunction EOF

-			{

-				newCompositeNode(grammarAccess.getFunctionRule());

-				pushFollow(FOLLOW_ruleFunction_in_entryRuleFunction3329);

-				iv_ruleFunction = ruleFunction();

-

-				state._fsp--;

-

-				current = iv_ruleFunction;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleFunction3339);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleFunction"

-

-

-	// $ANTLR start "ruleFunction"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1465:1: ruleFunction returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '(' (this_WS_2= RULE_WS )* (

-	// (lv_args_3_0= ruleExpression ) ) otherlv_4= ')' ) ;

-	public final EObject ruleFunction() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_name_0_0 = null;

-		Token otherlv_1 = null;

-		Token this_WS_2 = null;

-		Token otherlv_4 = null;

-		EObject lv_args_3_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1468:28: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '(' (this_WS_2= RULE_WS )* ( (lv_args_3_0= ruleExpression ) )

-			// otherlv_4= ')' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1469:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '(' (this_WS_2= RULE_WS )* ( (lv_args_3_0= ruleExpression ) )

-			// otherlv_4= ')' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1469:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '(' (this_WS_2= RULE_WS )* ( (lv_args_3_0= ruleExpression ) )

-				// otherlv_4= ')' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1469:2: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '(' (this_WS_2= RULE_WS )* ( (lv_args_3_0= ruleExpression ) )

-				// otherlv_4= ')'

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1469:2: ( (lv_name_0_0= RULE_ID ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1470:1: (lv_name_0_0= RULE_ID )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1470:1: (lv_name_0_0= RULE_ID )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1471:3: lv_name_0_0= RULE_ID

-						{

-							lv_name_0_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleFunction3381);

-

-							newLeafNode(lv_name_0_0, grammarAccess.getFunctionAccess().getNameIDTerminalRuleCall_0_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getFunctionRule());

-							}

-							setWithLastConsumed(

-									current,

-									"name",

-									lv_name_0_0,

-									"ID");

-

-

-						}

-

-

-					}

-

-					otherlv_1 = (Token) match(input, 32, FOLLOW_32_in_ruleFunction3398);

-

-					newLeafNode(otherlv_1, grammarAccess.getFunctionAccess().getLeftParenthesisKeyword_1());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1491:1: (this_WS_2= RULE_WS )*

-					loop62: do {

-						int alt62 = 2;

-						int LA62_0 = input.LA(1);

-

-						if ((LA62_0 == RULE_WS)) {

-							alt62 = 1;

-						}

-

-

-						switch (alt62) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1491:2: this_WS_2= RULE_WS

-						{

-							this_WS_2 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleFunction3410);

-

-							newLeafNode(this_WS_2, grammarAccess.getFunctionAccess().getWSTerminalRuleCall_2());

-

-

-						}

-							break;

-

-						default:

-							break loop62;

-						}

-					} while (true);

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1495:3: ( (lv_args_3_0= ruleExpression ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1496:1: (lv_args_3_0= ruleExpression )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1496:1: (lv_args_3_0= ruleExpression )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1497:3: lv_args_3_0= ruleExpression

-						{

-

-							newCompositeNode(grammarAccess.getFunctionAccess().getArgsExpressionParserRuleCall_3_0());

-

-							pushFollow(FOLLOW_ruleExpression_in_ruleFunction3432);

-							lv_args_3_0 = ruleExpression();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getFunctionRule());

-							}

-							set(

-									current,

-									"args",

-									lv_args_3_0,

-									"Expression");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-

-					otherlv_4 = (Token) match(input, 33, FOLLOW_33_in_ruleFunction3444);

-

-					newLeafNode(otherlv_4, grammarAccess.getFunctionAccess().getRightParenthesisKeyword_4());

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleFunction"

-

-

-	// $ANTLR start "entryRuleName"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1525:1: entryRuleName returns [EObject current=null] : iv_ruleName= ruleName EOF ;

-	public final EObject entryRuleName() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleName = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1526:2: (iv_ruleName= ruleName EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1527:2: iv_ruleName= ruleName EOF

-			{

-				newCompositeNode(grammarAccess.getNameRule());

-				pushFollow(FOLLOW_ruleName_in_entryRuleName3480);

-				iv_ruleName = ruleName();

-

-				state._fsp--;

-

-				current = iv_ruleName;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleName3490);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleName"

-

-

-	// $ANTLR start "ruleName"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1534:1: ruleName returns [EObject current=null] : ( (lv_value_0_0= RULE_ID ) ) ;

-	public final EObject ruleName() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_value_0_0 = null;

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1537:28: ( ( (lv_value_0_0= RULE_ID ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1538:1: ( (lv_value_0_0= RULE_ID ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1538:1: ( (lv_value_0_0= RULE_ID ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1539:1: (lv_value_0_0= RULE_ID )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1539:1: (lv_value_0_0= RULE_ID )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1540:3: lv_value_0_0= RULE_ID

-					{

-						lv_value_0_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleName3531);

-

-						newLeafNode(lv_value_0_0, grammarAccess.getNameAccess().getValueIDTerminalRuleCall_0());

-

-

-						if (current == null) {

-							current = createModelElement(grammarAccess.getNameRule());

-						}

-						setWithLastConsumed(

-								current,

-								"value",

-								lv_value_0_0,

-								"ID");

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleName"

-

-

-	// $ANTLR start "entryRuleNumber"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1564:1: entryRuleNumber returns [EObject current=null] : iv_ruleNumber= ruleNumber EOF ;

-	public final EObject entryRuleNumber() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleNumber = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1565:2: (iv_ruleNumber= ruleNumber EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1566:2: iv_ruleNumber= ruleNumber EOF

-			{

-				newCompositeNode(grammarAccess.getNumberRule());

-				pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber3571);

-				iv_ruleNumber = ruleNumber();

-

-				state._fsp--;

-

-				current = iv_ruleNumber;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleNumber3581);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleNumber"

-

-

-	// $ANTLR start "ruleNumber"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1573:1: ruleNumber returns [EObject current=null] : ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ) ;

-	public final EObject ruleNumber() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_value_1_0 = null;

-		EObject lv_op_0_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1576:28: ( ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1577:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1577:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1577:2: ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1577:2: ( (lv_op_0_0= ruleUnaryOperator ) )?

-					int alt63 = 2;

-					int LA63_0 = input.LA(1);

-

-					if (((LA63_0 >= 38 && LA63_0 <= 39))) {

-						alt63 = 1;

-					}

-					switch (alt63) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1578:1: (lv_op_0_0= ruleUnaryOperator )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1578:1: (lv_op_0_0= ruleUnaryOperator )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1579:3: lv_op_0_0= ruleUnaryOperator

-						{

-

-							newCompositeNode(grammarAccess.getNumberAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleUnaryOperator_in_ruleNumber3627);

-							lv_op_0_0 = ruleUnaryOperator();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getNumberRule());

-							}

-							set(

-									current,

-									"op",

-									lv_op_0_0,

-									"UnaryOperator");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1595:3: ( (lv_value_1_0= RULE_T_NUM ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1596:1: (lv_value_1_0= RULE_T_NUM )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1596:1: (lv_value_1_0= RULE_T_NUM )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1597:3: lv_value_1_0= RULE_T_NUM

-						{

-							lv_value_1_0 = (Token) match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_ruleNumber3645);

-

-							newLeafNode(lv_value_1_0, grammarAccess.getNumberAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getNumberRule());

-							}

-							setWithLastConsumed(

-									current,

-									"value",

-									lv_value_1_0,

-									"T_NUM");

-

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleNumber"

-

-

-	// $ANTLR start "entryRulePercentage"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1621:1: entryRulePercentage returns [EObject current=null] : iv_rulePercentage= rulePercentage EOF ;

-	public final EObject entryRulePercentage() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulePercentage = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1622:2: (iv_rulePercentage= rulePercentage EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1623:2: iv_rulePercentage= rulePercentage EOF

-			{

-				newCompositeNode(grammarAccess.getPercentageRule());

-				pushFollow(FOLLOW_rulePercentage_in_entryRulePercentage3686);

-				iv_rulePercentage = rulePercentage();

-

-				state._fsp--;

-

-				current = iv_rulePercentage;

-				match(input, EOF, FOLLOW_EOF_in_entryRulePercentage3696);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRulePercentage"

-

-

-	// $ANTLR start "rulePercentage"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1630:1: rulePercentage returns [EObject current=null] : ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) (

-	// (lv_unit_2_0= RULE_PC_UNIT ) ) ) ;

-	public final EObject rulePercentage() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_value_1_0 = null;

-		Token lv_unit_2_0 = null;

-		EObject lv_op_0_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1633:28: ( ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_PC_UNIT ) ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1634:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_PC_UNIT ) ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1634:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_PC_UNIT ) ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1634:2: ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_PC_UNIT ) )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1634:2: ( (lv_op_0_0= ruleUnaryOperator ) )?

-					int alt64 = 2;

-					int LA64_0 = input.LA(1);

-

-					if (((LA64_0 >= 38 && LA64_0 <= 39))) {

-						alt64 = 1;

-					}

-					switch (alt64) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1635:1: (lv_op_0_0= ruleUnaryOperator )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1635:1: (lv_op_0_0= ruleUnaryOperator )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1636:3: lv_op_0_0= ruleUnaryOperator

-						{

-

-							newCompositeNode(grammarAccess.getPercentageAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleUnaryOperator_in_rulePercentage3742);

-							lv_op_0_0 = ruleUnaryOperator();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getPercentageRule());

-							}

-							set(

-									current,

-									"op",

-									lv_op_0_0,

-									"UnaryOperator");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1652:3: ( (lv_value_1_0= RULE_T_NUM ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1653:1: (lv_value_1_0= RULE_T_NUM )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1653:1: (lv_value_1_0= RULE_T_NUM )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1654:3: lv_value_1_0= RULE_T_NUM

-						{

-							lv_value_1_0 = (Token) match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_rulePercentage3760);

-

-							newLeafNode(lv_value_1_0, grammarAccess.getPercentageAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getPercentageRule());

-							}

-							setWithLastConsumed(

-									current,

-									"value",

-									lv_value_1_0,

-									"T_NUM");

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1670:2: ( (lv_unit_2_0= RULE_PC_UNIT ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1671:1: (lv_unit_2_0= RULE_PC_UNIT )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1671:1: (lv_unit_2_0= RULE_PC_UNIT )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1672:3: lv_unit_2_0= RULE_PC_UNIT

-						{

-							lv_unit_2_0 = (Token) match(input, RULE_PC_UNIT, FOLLOW_RULE_PC_UNIT_in_rulePercentage3782);

-

-							newLeafNode(lv_unit_2_0, grammarAccess.getPercentageAccess().getUnitPC_UNITTerminalRuleCall_2_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getPercentageRule());

-							}

-							setWithLastConsumed(

-									current,

-									"unit",

-									lv_unit_2_0,

-									"PC_UNIT");

-

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "rulePercentage"

-

-

-	// $ANTLR start "entryRuleLength"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1696:1: entryRuleLength returns [EObject current=null] : iv_ruleLength= ruleLength EOF ;

-	public final EObject entryRuleLength() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleLength = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1697:2: (iv_ruleLength= ruleLength EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1698:2: iv_ruleLength= ruleLength EOF

-			{

-				newCompositeNode(grammarAccess.getLengthRule());

-				pushFollow(FOLLOW_ruleLength_in_entryRuleLength3823);

-				iv_ruleLength = ruleLength();

-

-				state._fsp--;

-

-				current = iv_ruleLength;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleLength3833);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleLength"

-

-

-	// $ANTLR start "ruleLength"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1705:1: ruleLength returns [EObject current=null] : ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) (

-	// (lv_unit_2_0= RULE_LEN_UNIT ) ) ) ;

-	public final EObject ruleLength() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_value_1_0 = null;

-		Token lv_unit_2_0 = null;

-		EObject lv_op_0_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1708:28: ( ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_LEN_UNIT ) ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1709:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_LEN_UNIT ) ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1709:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_LEN_UNIT ) ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1709:2: ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_LEN_UNIT ) )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1709:2: ( (lv_op_0_0= ruleUnaryOperator ) )?

-					int alt65 = 2;

-					int LA65_0 = input.LA(1);

-

-					if (((LA65_0 >= 38 && LA65_0 <= 39))) {

-						alt65 = 1;

-					}

-					switch (alt65) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1710:1: (lv_op_0_0= ruleUnaryOperator )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1710:1: (lv_op_0_0= ruleUnaryOperator )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1711:3: lv_op_0_0= ruleUnaryOperator

-						{

-

-							newCompositeNode(grammarAccess.getLengthAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleUnaryOperator_in_ruleLength3879);

-							lv_op_0_0 = ruleUnaryOperator();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getLengthRule());

-							}

-							set(

-									current,

-									"op",

-									lv_op_0_0,

-									"UnaryOperator");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1727:3: ( (lv_value_1_0= RULE_T_NUM ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1728:1: (lv_value_1_0= RULE_T_NUM )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1728:1: (lv_value_1_0= RULE_T_NUM )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1729:3: lv_value_1_0= RULE_T_NUM

-						{

-							lv_value_1_0 = (Token) match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_ruleLength3897);

-

-							newLeafNode(lv_value_1_0, grammarAccess.getLengthAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getLengthRule());

-							}

-							setWithLastConsumed(

-									current,

-									"value",

-									lv_value_1_0,

-									"T_NUM");

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1745:2: ( (lv_unit_2_0= RULE_LEN_UNIT ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1746:1: (lv_unit_2_0= RULE_LEN_UNIT )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1746:1: (lv_unit_2_0= RULE_LEN_UNIT )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1747:3: lv_unit_2_0= RULE_LEN_UNIT

-						{

-							lv_unit_2_0 = (Token) match(input, RULE_LEN_UNIT, FOLLOW_RULE_LEN_UNIT_in_ruleLength3919);

-

-							newLeafNode(lv_unit_2_0, grammarAccess.getLengthAccess().getUnitLEN_UNITTerminalRuleCall_2_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getLengthRule());

-							}

-							setWithLastConsumed(

-									current,

-									"unit",

-									lv_unit_2_0,

-									"LEN_UNIT");

-

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleLength"

-

-

-	// $ANTLR start "entryRuleEms"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1771:1: entryRuleEms returns [EObject current=null] : iv_ruleEms= ruleEms EOF ;

-	public final EObject entryRuleEms() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleEms = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1772:2: (iv_ruleEms= ruleEms EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1773:2: iv_ruleEms= ruleEms EOF

-			{

-				newCompositeNode(grammarAccess.getEmsRule());

-				pushFollow(FOLLOW_ruleEms_in_entryRuleEms3960);

-				iv_ruleEms = ruleEms();

-

-				state._fsp--;

-

-				current = iv_ruleEms;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleEms3970);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleEms"

-

-

-	// $ANTLR start "ruleEms"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1780:1: ruleEms returns [EObject current=null] : ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) (

-	// (lv_unit_2_0= RULE_EM_UNIT ) ) ) ;

-	public final EObject ruleEms() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_value_1_0 = null;

-		Token lv_unit_2_0 = null;

-		EObject lv_op_0_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1783:28: ( ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_EM_UNIT ) ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1784:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_EM_UNIT ) ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1784:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_EM_UNIT ) ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1784:2: ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_EM_UNIT ) )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1784:2: ( (lv_op_0_0= ruleUnaryOperator ) )?

-					int alt66 = 2;

-					int LA66_0 = input.LA(1);

-

-					if (((LA66_0 >= 38 && LA66_0 <= 39))) {

-						alt66 = 1;

-					}

-					switch (alt66) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1785:1: (lv_op_0_0= ruleUnaryOperator )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1785:1: (lv_op_0_0= ruleUnaryOperator )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1786:3: lv_op_0_0= ruleUnaryOperator

-						{

-

-							newCompositeNode(grammarAccess.getEmsAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleUnaryOperator_in_ruleEms4016);

-							lv_op_0_0 = ruleUnaryOperator();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getEmsRule());

-							}

-							set(

-									current,

-									"op",

-									lv_op_0_0,

-									"UnaryOperator");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1802:3: ( (lv_value_1_0= RULE_T_NUM ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1803:1: (lv_value_1_0= RULE_T_NUM )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1803:1: (lv_value_1_0= RULE_T_NUM )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1804:3: lv_value_1_0= RULE_T_NUM

-						{

-							lv_value_1_0 = (Token) match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_ruleEms4034);

-

-							newLeafNode(lv_value_1_0, grammarAccess.getEmsAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getEmsRule());

-							}

-							setWithLastConsumed(

-									current,

-									"value",

-									lv_value_1_0,

-									"T_NUM");

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1820:2: ( (lv_unit_2_0= RULE_EM_UNIT ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1821:1: (lv_unit_2_0= RULE_EM_UNIT )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1821:1: (lv_unit_2_0= RULE_EM_UNIT )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1822:3: lv_unit_2_0= RULE_EM_UNIT

-						{

-							lv_unit_2_0 = (Token) match(input, RULE_EM_UNIT, FOLLOW_RULE_EM_UNIT_in_ruleEms4056);

-

-							newLeafNode(lv_unit_2_0, grammarAccess.getEmsAccess().getUnitEM_UNITTerminalRuleCall_2_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getEmsRule());

-							}

-							setWithLastConsumed(

-									current,

-									"unit",

-									lv_unit_2_0,

-									"EM_UNIT");

-

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleEms"

-

-

-	// $ANTLR start "entryRuleExs"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1846:1: entryRuleExs returns [EObject current=null] : iv_ruleExs= ruleExs EOF ;

-	public final EObject entryRuleExs() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleExs = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1847:2: (iv_ruleExs= ruleExs EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1848:2: iv_ruleExs= ruleExs EOF

-			{

-				newCompositeNode(grammarAccess.getExsRule());

-				pushFollow(FOLLOW_ruleExs_in_entryRuleExs4097);

-				iv_ruleExs = ruleExs();

-

-				state._fsp--;

-

-				current = iv_ruleExs;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleExs4107);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleExs"

-

-

-	// $ANTLR start "ruleExs"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1855:1: ruleExs returns [EObject current=null] : ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) (

-	// (lv_unit_2_0= RULE_EX_UNIT ) ) ) ;

-	public final EObject ruleExs() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_value_1_0 = null;

-		Token lv_unit_2_0 = null;

-		EObject lv_op_0_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1858:28: ( ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_EX_UNIT ) ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1859:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_EX_UNIT ) ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1859:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_EX_UNIT ) ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1859:2: ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_EX_UNIT ) )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1859:2: ( (lv_op_0_0= ruleUnaryOperator ) )?

-					int alt67 = 2;

-					int LA67_0 = input.LA(1);

-

-					if (((LA67_0 >= 38 && LA67_0 <= 39))) {

-						alt67 = 1;

-					}

-					switch (alt67) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1860:1: (lv_op_0_0= ruleUnaryOperator )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1860:1: (lv_op_0_0= ruleUnaryOperator )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1861:3: lv_op_0_0= ruleUnaryOperator

-						{

-

-							newCompositeNode(grammarAccess.getExsAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleUnaryOperator_in_ruleExs4153);

-							lv_op_0_0 = ruleUnaryOperator();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getExsRule());

-							}

-							set(

-									current,

-									"op",

-									lv_op_0_0,

-									"UnaryOperator");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1877:3: ( (lv_value_1_0= RULE_T_NUM ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1878:1: (lv_value_1_0= RULE_T_NUM )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1878:1: (lv_value_1_0= RULE_T_NUM )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1879:3: lv_value_1_0= RULE_T_NUM

-						{

-							lv_value_1_0 = (Token) match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_ruleExs4171);

-

-							newLeafNode(lv_value_1_0, grammarAccess.getExsAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getExsRule());

-							}

-							setWithLastConsumed(

-									current,

-									"value",

-									lv_value_1_0,

-									"T_NUM");

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1895:2: ( (lv_unit_2_0= RULE_EX_UNIT ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1896:1: (lv_unit_2_0= RULE_EX_UNIT )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1896:1: (lv_unit_2_0= RULE_EX_UNIT )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1897:3: lv_unit_2_0= RULE_EX_UNIT

-						{

-							lv_unit_2_0 = (Token) match(input, RULE_EX_UNIT, FOLLOW_RULE_EX_UNIT_in_ruleExs4193);

-

-							newLeafNode(lv_unit_2_0, grammarAccess.getExsAccess().getUnitEX_UNITTerminalRuleCall_2_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getExsRule());

-							}

-							setWithLastConsumed(

-									current,

-									"unit",

-									lv_unit_2_0,

-									"EX_UNIT");

-

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleExs"

-

-

-	// $ANTLR start "entryRuleAngle"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1921:1: entryRuleAngle returns [EObject current=null] : iv_ruleAngle= ruleAngle EOF ;

-	public final EObject entryRuleAngle() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleAngle = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1922:2: (iv_ruleAngle= ruleAngle EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1923:2: iv_ruleAngle= ruleAngle EOF

-			{

-				newCompositeNode(grammarAccess.getAngleRule());

-				pushFollow(FOLLOW_ruleAngle_in_entryRuleAngle4234);

-				iv_ruleAngle = ruleAngle();

-

-				state._fsp--;

-

-				current = iv_ruleAngle;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleAngle4244);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleAngle"

-

-

-	// $ANTLR start "ruleAngle"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1930:1: ruleAngle returns [EObject current=null] : ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) (

-	// (lv_unit_2_0= RULE_ANGLE_UNIT ) ) ) ;

-	public final EObject ruleAngle() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_value_1_0 = null;

-		Token lv_unit_2_0 = null;

-		EObject lv_op_0_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1933:28: ( ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_ANGLE_UNIT ) ) )

-			// )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1934:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_ANGLE_UNIT ) ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1934:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_ANGLE_UNIT ) ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1934:2: ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_ANGLE_UNIT ) )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1934:2: ( (lv_op_0_0= ruleUnaryOperator ) )?

-					int alt68 = 2;

-					int LA68_0 = input.LA(1);

-

-					if (((LA68_0 >= 38 && LA68_0 <= 39))) {

-						alt68 = 1;

-					}

-					switch (alt68) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1935:1: (lv_op_0_0= ruleUnaryOperator )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1935:1: (lv_op_0_0= ruleUnaryOperator )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1936:3: lv_op_0_0= ruleUnaryOperator

-						{

-

-							newCompositeNode(grammarAccess.getAngleAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleUnaryOperator_in_ruleAngle4290);

-							lv_op_0_0 = ruleUnaryOperator();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getAngleRule());

-							}

-							set(

-									current,

-									"op",

-									lv_op_0_0,

-									"UnaryOperator");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1952:3: ( (lv_value_1_0= RULE_T_NUM ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1953:1: (lv_value_1_0= RULE_T_NUM )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1953:1: (lv_value_1_0= RULE_T_NUM )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1954:3: lv_value_1_0= RULE_T_NUM

-						{

-							lv_value_1_0 = (Token) match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_ruleAngle4308);

-

-							newLeafNode(lv_value_1_0, grammarAccess.getAngleAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getAngleRule());

-							}

-							setWithLastConsumed(

-									current,

-									"value",

-									lv_value_1_0,

-									"T_NUM");

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1970:2: ( (lv_unit_2_0= RULE_ANGLE_UNIT ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1971:1: (lv_unit_2_0= RULE_ANGLE_UNIT )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1971:1: (lv_unit_2_0= RULE_ANGLE_UNIT )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1972:3: lv_unit_2_0= RULE_ANGLE_UNIT

-						{

-							lv_unit_2_0 = (Token) match(input, RULE_ANGLE_UNIT, FOLLOW_RULE_ANGLE_UNIT_in_ruleAngle4330);

-

-							newLeafNode(lv_unit_2_0, grammarAccess.getAngleAccess().getUnitANGLE_UNITTerminalRuleCall_2_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getAngleRule());

-							}

-							setWithLastConsumed(

-									current,

-									"unit",

-									lv_unit_2_0,

-									"ANGLE_UNIT");

-

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleAngle"

-

-

-	// $ANTLR start "entryRuleTime"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1996:1: entryRuleTime returns [EObject current=null] : iv_ruleTime= ruleTime EOF ;

-	public final EObject entryRuleTime() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleTime = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1997:2: (iv_ruleTime= ruleTime EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1998:2: iv_ruleTime= ruleTime EOF

-			{

-				newCompositeNode(grammarAccess.getTimeRule());

-				pushFollow(FOLLOW_ruleTime_in_entryRuleTime4371);

-				iv_ruleTime = ruleTime();

-

-				state._fsp--;

-

-				current = iv_ruleTime;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleTime4381);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleTime"

-

-

-	// $ANTLR start "ruleTime"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2005:1: ruleTime returns [EObject current=null] : ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) (

-	// (lv_unit_2_0= RULE_TIME_UNIT ) ) ) ;

-	public final EObject ruleTime() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_value_1_0 = null;

-		Token lv_unit_2_0 = null;

-		EObject lv_op_0_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2008:28: ( ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_TIME_UNIT ) ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2009:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_TIME_UNIT ) ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2009:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_TIME_UNIT ) ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2009:2: ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_TIME_UNIT ) )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2009:2: ( (lv_op_0_0= ruleUnaryOperator ) )?

-					int alt69 = 2;

-					int LA69_0 = input.LA(1);

-

-					if (((LA69_0 >= 38 && LA69_0 <= 39))) {

-						alt69 = 1;

-					}

-					switch (alt69) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2010:1: (lv_op_0_0= ruleUnaryOperator )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2010:1: (lv_op_0_0= ruleUnaryOperator )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2011:3: lv_op_0_0= ruleUnaryOperator

-						{

-

-							newCompositeNode(grammarAccess.getTimeAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleUnaryOperator_in_ruleTime4427);

-							lv_op_0_0 = ruleUnaryOperator();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getTimeRule());

-							}

-							set(

-									current,

-									"op",

-									lv_op_0_0,

-									"UnaryOperator");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2027:3: ( (lv_value_1_0= RULE_T_NUM ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2028:1: (lv_value_1_0= RULE_T_NUM )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2028:1: (lv_value_1_0= RULE_T_NUM )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2029:3: lv_value_1_0= RULE_T_NUM

-						{

-							lv_value_1_0 = (Token) match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_ruleTime4445);

-

-							newLeafNode(lv_value_1_0, grammarAccess.getTimeAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getTimeRule());

-							}

-							setWithLastConsumed(

-									current,

-									"value",

-									lv_value_1_0,

-									"T_NUM");

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2045:2: ( (lv_unit_2_0= RULE_TIME_UNIT ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2046:1: (lv_unit_2_0= RULE_TIME_UNIT )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2046:1: (lv_unit_2_0= RULE_TIME_UNIT )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2047:3: lv_unit_2_0= RULE_TIME_UNIT

-						{

-							lv_unit_2_0 = (Token) match(input, RULE_TIME_UNIT, FOLLOW_RULE_TIME_UNIT_in_ruleTime4467);

-

-							newLeafNode(lv_unit_2_0, grammarAccess.getTimeAccess().getUnitTIME_UNITTerminalRuleCall_2_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getTimeRule());

-							}

-							setWithLastConsumed(

-									current,

-									"unit",

-									lv_unit_2_0,

-									"TIME_UNIT");

-

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleTime"

-

-

-	// $ANTLR start "entryRuleFrequency"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2071:1: entryRuleFrequency returns [EObject current=null] : iv_ruleFrequency= ruleFrequency EOF ;

-	public final EObject entryRuleFrequency() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleFrequency = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2072:2: (iv_ruleFrequency= ruleFrequency EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2073:2: iv_ruleFrequency= ruleFrequency EOF

-			{

-				newCompositeNode(grammarAccess.getFrequencyRule());

-				pushFollow(FOLLOW_ruleFrequency_in_entryRuleFrequency4508);

-				iv_ruleFrequency = ruleFrequency();

-

-				state._fsp--;

-

-				current = iv_ruleFrequency;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleFrequency4518);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleFrequency"

-

-

-	// $ANTLR start "ruleFrequency"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2080:1: ruleFrequency returns [EObject current=null] : ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) (

-	// (lv_unit_2_0= RULE_FREQ_UNIT ) ) ) ;

-	public final EObject ruleFrequency() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_value_1_0 = null;

-		Token lv_unit_2_0 = null;

-		EObject lv_op_0_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2083:28: ( ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_FREQ_UNIT ) ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2084:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_FREQ_UNIT ) ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2084:1: ( ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_FREQ_UNIT ) ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2084:2: ( (lv_op_0_0= ruleUnaryOperator ) )? ( (lv_value_1_0= RULE_T_NUM ) ) ( (lv_unit_2_0= RULE_FREQ_UNIT ) )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2084:2: ( (lv_op_0_0= ruleUnaryOperator ) )?

-					int alt70 = 2;

-					int LA70_0 = input.LA(1);

-

-					if (((LA70_0 >= 38 && LA70_0 <= 39))) {

-						alt70 = 1;

-					}

-					switch (alt70) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2085:1: (lv_op_0_0= ruleUnaryOperator )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2085:1: (lv_op_0_0= ruleUnaryOperator )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2086:3: lv_op_0_0= ruleUnaryOperator

-						{

-

-							newCompositeNode(grammarAccess.getFrequencyAccess().getOpUnaryOperatorParserRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleUnaryOperator_in_ruleFrequency4564);

-							lv_op_0_0 = ruleUnaryOperator();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getFrequencyRule());

-							}

-							set(

-									current,

-									"op",

-									lv_op_0_0,

-									"UnaryOperator");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2102:3: ( (lv_value_1_0= RULE_T_NUM ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2103:1: (lv_value_1_0= RULE_T_NUM )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2103:1: (lv_value_1_0= RULE_T_NUM )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2104:3: lv_value_1_0= RULE_T_NUM

-						{

-							lv_value_1_0 = (Token) match(input, RULE_T_NUM, FOLLOW_RULE_T_NUM_in_ruleFrequency4582);

-

-							newLeafNode(lv_value_1_0, grammarAccess.getFrequencyAccess().getValueT_NUMTerminalRuleCall_1_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getFrequencyRule());

-							}

-							setWithLastConsumed(

-									current,

-									"value",

-									lv_value_1_0,

-									"T_NUM");

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2120:2: ( (lv_unit_2_0= RULE_FREQ_UNIT ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2121:1: (lv_unit_2_0= RULE_FREQ_UNIT )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2121:1: (lv_unit_2_0= RULE_FREQ_UNIT )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2122:3: lv_unit_2_0= RULE_FREQ_UNIT

-						{

-							lv_unit_2_0 = (Token) match(input, RULE_FREQ_UNIT, FOLLOW_RULE_FREQ_UNIT_in_ruleFrequency4604);

-

-							newLeafNode(lv_unit_2_0, grammarAccess.getFrequencyAccess().getUnitFREQ_UNITTerminalRuleCall_2_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getFrequencyRule());

-							}

-							setWithLastConsumed(

-									current,

-									"unit",

-									lv_unit_2_0,

-									"FREQ_UNIT");

-

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleFrequency"

-

-

-	// $ANTLR start "entryRuleUri"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2146:1: entryRuleUri returns [EObject current=null] : iv_ruleUri= ruleUri EOF ;

-	public final EObject entryRuleUri() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleUri = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2147:2: (iv_ruleUri= ruleUri EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2148:2: iv_ruleUri= ruleUri EOF

-			{

-				newCompositeNode(grammarAccess.getUriRule());

-				pushFollow(FOLLOW_ruleUri_in_entryRuleUri4645);

-				iv_ruleUri = ruleUri();

-

-				state._fsp--;

-

-				current = iv_ruleUri;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleUri4655);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleUri"

-

-

-	// $ANTLR start "ruleUri"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2155:1: ruleUri returns [EObject current=null] : (otherlv_0= 'url(' (this_WS_1= RULE_WS )? ( (lv_value_2_0= RULE_STRING ) )

-	// (this_WS_3= RULE_WS )? otherlv_4= ')' ) ;

-	public final EObject ruleUri() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_0 = null;

-		Token this_WS_1 = null;

-		Token lv_value_2_0 = null;

-		Token this_WS_3 = null;

-		Token otherlv_4 = null;

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2158:28: ( (otherlv_0= 'url(' (this_WS_1= RULE_WS )? ( (lv_value_2_0= RULE_STRING ) ) (this_WS_3= RULE_WS )? otherlv_4=

-			// ')' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2159:1: (otherlv_0= 'url(' (this_WS_1= RULE_WS )? ( (lv_value_2_0= RULE_STRING ) ) (this_WS_3= RULE_WS )? otherlv_4= ')'

-			// )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2159:1: (otherlv_0= 'url(' (this_WS_1= RULE_WS )? ( (lv_value_2_0= RULE_STRING ) ) (this_WS_3= RULE_WS )? otherlv_4=

-				// ')' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2159:3: otherlv_0= 'url(' (this_WS_1= RULE_WS )? ( (lv_value_2_0= RULE_STRING ) ) (this_WS_3= RULE_WS )? otherlv_4=

-				// ')'

-				{

-					otherlv_0 = (Token) match(input, 34, FOLLOW_34_in_ruleUri4692);

-

-					newLeafNode(otherlv_0, grammarAccess.getUriAccess().getUrlKeyword_0());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2163:1: (this_WS_1= RULE_WS )?

-					int alt71 = 2;

-					int LA71_0 = input.LA(1);

-

-					if ((LA71_0 == RULE_WS)) {

-						alt71 = 1;

-					}

-					switch (alt71) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2163:2: this_WS_1= RULE_WS

-					{

-						this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleUri4704);

-

-						newLeafNode(this_WS_1, grammarAccess.getUriAccess().getWSTerminalRuleCall_1());

-

-

-					}

-						break;

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2167:3: ( (lv_value_2_0= RULE_STRING ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2168:1: (lv_value_2_0= RULE_STRING )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2168:1: (lv_value_2_0= RULE_STRING )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2169:3: lv_value_2_0= RULE_STRING

-						{

-							lv_value_2_0 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleUri4722);

-

-							newLeafNode(lv_value_2_0, grammarAccess.getUriAccess().getValueSTRINGTerminalRuleCall_2_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getUriRule());

-							}

-							setWithLastConsumed(

-									current,

-									"value",

-									lv_value_2_0,

-									"STRING");

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2185:2: (this_WS_3= RULE_WS )?

-					int alt72 = 2;

-					int LA72_0 = input.LA(1);

-

-					if ((LA72_0 == RULE_WS)) {

-						alt72 = 1;

-					}

-					switch (alt72) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2185:3: this_WS_3= RULE_WS

-					{

-						this_WS_3 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleUri4739);

-

-						newLeafNode(this_WS_3, grammarAccess.getUriAccess().getWSTerminalRuleCall_3());

-

-

-					}

-						break;

-

-					}

-

-					otherlv_4 = (Token) match(input, 33, FOLLOW_33_in_ruleUri4752);

-

-					newLeafNode(otherlv_4, grammarAccess.getUriAccess().getRightParenthesisKeyword_4());

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleUri"

-

-

-	// $ANTLR start "entryRuleStringValue"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2201:1: entryRuleStringValue returns [EObject current=null] : iv_ruleStringValue= ruleStringValue EOF ;

-	public final EObject entryRuleStringValue() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleStringValue = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2202:2: (iv_ruleStringValue= ruleStringValue EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2203:2: iv_ruleStringValue= ruleStringValue EOF

-			{

-				newCompositeNode(grammarAccess.getStringValueRule());

-				pushFollow(FOLLOW_ruleStringValue_in_entryRuleStringValue4788);

-				iv_ruleStringValue = ruleStringValue();

-

-				state._fsp--;

-

-				current = iv_ruleStringValue;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleStringValue4798);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleStringValue"

-

-

-	// $ANTLR start "ruleStringValue"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2210:1: ruleStringValue returns [EObject current=null] : ( (lv_value_0_0= RULE_STRING ) ) ;

-	public final EObject ruleStringValue() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_value_0_0 = null;

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2213:28: ( ( (lv_value_0_0= RULE_STRING ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2214:1: ( (lv_value_0_0= RULE_STRING ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2214:1: ( (lv_value_0_0= RULE_STRING ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2215:1: (lv_value_0_0= RULE_STRING )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2215:1: (lv_value_0_0= RULE_STRING )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2216:3: lv_value_0_0= RULE_STRING

-					{

-						lv_value_0_0 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleStringValue4839);

-

-						newLeafNode(lv_value_0_0, grammarAccess.getStringValueAccess().getValueSTRINGTerminalRuleCall_0());

-

-

-						if (current == null) {

-							current = createModelElement(grammarAccess.getStringValueRule());

-						}

-						setWithLastConsumed(

-								current,

-								"value",

-								lv_value_0_0,

-								"STRING");

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleStringValue"

-

-

-	// $ANTLR start "entryRuleHexColor"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2240:1: entryRuleHexColor returns [EObject current=null] : iv_ruleHexColor= ruleHexColor EOF ;

-	public final EObject entryRuleHexColor() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleHexColor = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2241:2: (iv_ruleHexColor= ruleHexColor EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2242:2: iv_ruleHexColor= ruleHexColor EOF

-			{

-				newCompositeNode(grammarAccess.getHexColorRule());

-				pushFollow(FOLLOW_ruleHexColor_in_entryRuleHexColor4879);

-				iv_ruleHexColor = ruleHexColor();

-

-				state._fsp--;

-

-				current = iv_ruleHexColor;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleHexColor4889);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleHexColor"

-

-

-	// $ANTLR start "ruleHexColor"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2249:1: ruleHexColor returns [EObject current=null] : ( (lv_value_0_0= RULE_HASH ) ) ;

-	public final EObject ruleHexColor() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_value_0_0 = null;

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2252:28: ( ( (lv_value_0_0= RULE_HASH ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2253:1: ( (lv_value_0_0= RULE_HASH ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2253:1: ( (lv_value_0_0= RULE_HASH ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2254:1: (lv_value_0_0= RULE_HASH )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2254:1: (lv_value_0_0= RULE_HASH )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2255:3: lv_value_0_0= RULE_HASH

-					{

-						lv_value_0_0 = (Token) match(input, RULE_HASH, FOLLOW_RULE_HASH_in_ruleHexColor4930);

-

-						newLeafNode(lv_value_0_0, grammarAccess.getHexColorAccess().getValueHASHTerminalRuleCall_0());

-

-

-						if (current == null) {

-							current = createModelElement(grammarAccess.getHexColorRule());

-						}

-						setWithLastConsumed(

-								current,

-								"value",

-								lv_value_0_0,

-								"HASH");

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleHexColor"

-

-

-	// $ANTLR start "entryRuleOperator"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2279:1: entryRuleOperator returns [String current=null] : iv_ruleOperator= ruleOperator EOF ;

-	public final String entryRuleOperator() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_ruleOperator = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2280:2: (iv_ruleOperator= ruleOperator EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2281:2: iv_ruleOperator= ruleOperator EOF

-			{

-				newCompositeNode(grammarAccess.getOperatorRule());

-				pushFollow(FOLLOW_ruleOperator_in_entryRuleOperator4971);

-				iv_ruleOperator = ruleOperator();

-

-				state._fsp--;

-

-				current = iv_ruleOperator.getText();

-				match(input, EOF, FOLLOW_EOF_in_entryRuleOperator4982);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleOperator"

-

-

-	// $ANTLR start "ruleOperator"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2288:1: ruleOperator returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '/' (this_WS_1= RULE_WS )* )

-	// | (kw= ',' (this_WS_3= RULE_WS )* ) ) ;

-	public final AntlrDatatypeRuleToken ruleOperator() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		Token kw = null;

-		Token this_WS_1 = null;

-		Token this_WS_3 = null;

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2291:28: ( ( (kw= '/' (this_WS_1= RULE_WS )* ) | (kw= ',' (this_WS_3= RULE_WS )* ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2292:1: ( (kw= '/' (this_WS_1= RULE_WS )* ) | (kw= ',' (this_WS_3= RULE_WS )* ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2292:1: ( (kw= '/' (this_WS_1= RULE_WS )* ) | (kw= ',' (this_WS_3= RULE_WS )* ) )

-				int alt75 = 2;

-				int LA75_0 = input.LA(1);

-

-				if ((LA75_0 == 35)) {

-					alt75 = 1;

-				}

-				else if ((LA75_0 == 25)) {

-					alt75 = 2;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 75, 0, input);

-

-					throw nvae;

-				}

-				switch (alt75) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2292:2: (kw= '/' (this_WS_1= RULE_WS )* )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2292:2: (kw= '/' (this_WS_1= RULE_WS )* )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2293:2: kw= '/' (this_WS_1= RULE_WS )*

-					{

-						kw = (Token) match(input, 35, FOLLOW_35_in_ruleOperator5021);

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getOperatorAccess().getSolidusKeyword_0_0());

-

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2298:1: (this_WS_1= RULE_WS )*

-						loop73: do {

-							int alt73 = 2;

-							int LA73_0 = input.LA(1);

-

-							if ((LA73_0 == RULE_WS)) {

-								alt73 = 1;

-							}

-

-

-							switch (alt73) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2298:6: this_WS_1= RULE_WS

-							{

-								this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleOperator5037);

-

-								current.merge(this_WS_1);

-

-

-								newLeafNode(this_WS_1, grammarAccess.getOperatorAccess().getWSTerminalRuleCall_0_1());

-

-

-							}

-								break;

-

-							default:

-								break loop73;

-							}

-						} while (true);

-

-

-					}

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2306:6: (kw= ',' (this_WS_3= RULE_WS )* )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2306:6: (kw= ',' (this_WS_3= RULE_WS )* )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2307:2: kw= ',' (this_WS_3= RULE_WS )*

-					{

-						kw = (Token) match(input, 25, FOLLOW_25_in_ruleOperator5065);

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getOperatorAccess().getCommaKeyword_1_0());

-

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2312:1: (this_WS_3= RULE_WS )*

-						loop74: do {

-							int alt74 = 2;

-							int LA74_0 = input.LA(1);

-

-							if ((LA74_0 == RULE_WS)) {

-								alt74 = 1;

-							}

-

-

-							switch (alt74) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2312:6: this_WS_3= RULE_WS

-							{

-								this_WS_3 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleOperator5081);

-

-								current.merge(this_WS_3);

-

-

-								newLeafNode(this_WS_3, grammarAccess.getOperatorAccess().getWSTerminalRuleCall_1_1());

-

-

-							}

-								break;

-

-							default:

-								break loop74;

-							}

-						} while (true);

-

-

-					}

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleOperator"

-

-

-	// $ANTLR start "entryRuleClass"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2327:1: entryRuleClass returns [EObject current=null] : iv_ruleClass= ruleClass EOF ;

-	public final EObject entryRuleClass() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleClass = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2328:2: (iv_ruleClass= ruleClass EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2329:2: iv_ruleClass= ruleClass EOF

-			{

-				newCompositeNode(grammarAccess.getClassRule());

-				pushFollow(FOLLOW_ruleClass_in_entryRuleClass5129);

-				iv_ruleClass = ruleClass();

-

-				state._fsp--;

-

-				current = iv_ruleClass;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleClass5139);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleClass"

-

-

-	// $ANTLR start "ruleClass"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2336:1: ruleClass returns [EObject current=null] : ( (lv_class_0_0= RULE_T_CLASS ) ) ;

-	public final EObject ruleClass() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_class_0_0 = null;

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2339:28: ( ( (lv_class_0_0= RULE_T_CLASS ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2340:1: ( (lv_class_0_0= RULE_T_CLASS ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2340:1: ( (lv_class_0_0= RULE_T_CLASS ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2341:1: (lv_class_0_0= RULE_T_CLASS )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2341:1: (lv_class_0_0= RULE_T_CLASS )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2342:3: lv_class_0_0= RULE_T_CLASS

-					{

-						lv_class_0_0 = (Token) match(input, RULE_T_CLASS, FOLLOW_RULE_T_CLASS_in_ruleClass5180);

-

-						newLeafNode(lv_class_0_0, grammarAccess.getClassAccess().getClassT_CLASSTerminalRuleCall_0());

-

-

-						if (current == null) {

-							current = createModelElement(grammarAccess.getClassRule());

-						}

-						setWithLastConsumed(

-								current,

-								"class",

-								lv_class_0_0,

-								"T_CLASS");

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleClass"

-

-

-	// $ANTLR start "entryRuleAttribute"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2366:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ;

-	public final EObject entryRuleAttribute() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleAttribute = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2367:2: (iv_ruleAttribute= ruleAttribute EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2368:2: iv_ruleAttribute= ruleAttribute EOF

-			{

-				newCompositeNode(grammarAccess.getAttributeRule());

-				pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute5220);

-				iv_ruleAttribute = ruleAttribute();

-

-				state._fsp--;

-

-				current = iv_ruleAttribute;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleAttribute5230);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleAttribute"

-

-

-	// $ANTLR start "ruleAttribute"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2375:1: ruleAttribute returns [EObject current=null] : (otherlv_0= '[' (this_WS_1= RULE_WS )* ( (lv_name_2_0= RULE_ID ) )

-	// (this_WS_3= RULE_WS )* ( (lv_value_4_0= ruleAttributeValue ) )? otherlv_5= ']' ) ;

-	public final EObject ruleAttribute() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_0 = null;

-		Token this_WS_1 = null;

-		Token lv_name_2_0 = null;

-		Token this_WS_3 = null;

-		Token otherlv_5 = null;

-		EObject lv_value_4_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2378:28: ( (otherlv_0= '[' (this_WS_1= RULE_WS )* ( (lv_name_2_0= RULE_ID ) ) (this_WS_3= RULE_WS )* ( (lv_value_4_0=

-			// ruleAttributeValue ) )? otherlv_5= ']' ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2379:1: (otherlv_0= '[' (this_WS_1= RULE_WS )* ( (lv_name_2_0= RULE_ID ) ) (this_WS_3= RULE_WS )* ( (lv_value_4_0=

-			// ruleAttributeValue ) )? otherlv_5= ']' )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2379:1: (otherlv_0= '[' (this_WS_1= RULE_WS )* ( (lv_name_2_0= RULE_ID ) ) (this_WS_3= RULE_WS )* ( (lv_value_4_0=

-				// ruleAttributeValue ) )? otherlv_5= ']' )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2379:3: otherlv_0= '[' (this_WS_1= RULE_WS )* ( (lv_name_2_0= RULE_ID ) ) (this_WS_3= RULE_WS )* ( (lv_value_4_0=

-				// ruleAttributeValue ) )? otherlv_5= ']'

-				{

-					otherlv_0 = (Token) match(input, 36, FOLLOW_36_in_ruleAttribute5267);

-

-					newLeafNode(otherlv_0, grammarAccess.getAttributeAccess().getLeftSquareBracketKeyword_0());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2383:1: (this_WS_1= RULE_WS )*

-					loop76: do {

-						int alt76 = 2;

-						int LA76_0 = input.LA(1);

-

-						if ((LA76_0 == RULE_WS)) {

-							alt76 = 1;

-						}

-

-

-						switch (alt76) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2383:2: this_WS_1= RULE_WS

-						{

-							this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleAttribute5279);

-

-							newLeafNode(this_WS_1, grammarAccess.getAttributeAccess().getWSTerminalRuleCall_1());

-

-

-						}

-							break;

-

-						default:

-							break loop76;

-						}

-					} while (true);

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2387:3: ( (lv_name_2_0= RULE_ID ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2388:1: (lv_name_2_0= RULE_ID )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2388:1: (lv_name_2_0= RULE_ID )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2389:3: lv_name_2_0= RULE_ID

-						{

-							lv_name_2_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleAttribute5297);

-

-							newLeafNode(lv_name_2_0, grammarAccess.getAttributeAccess().getNameIDTerminalRuleCall_2_0());

-

-

-							if (current == null) {

-								current = createModelElement(grammarAccess.getAttributeRule());

-							}

-							setWithLastConsumed(

-									current,

-									"name",

-									lv_name_2_0,

-									"ID");

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2405:2: (this_WS_3= RULE_WS )*

-					loop77: do {

-						int alt77 = 2;

-						int LA77_0 = input.LA(1);

-

-						if ((LA77_0 == RULE_WS)) {

-							alt77 = 1;

-						}

-

-

-						switch (alt77) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2405:3: this_WS_3= RULE_WS

-						{

-							this_WS_3 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleAttribute5314);

-

-							newLeafNode(this_WS_3, grammarAccess.getAttributeAccess().getWSTerminalRuleCall_3());

-

-

-						}

-							break;

-

-						default:

-							break loop77;

-						}

-					} while (true);

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2409:3: ( (lv_value_4_0= ruleAttributeValue ) )?

-					int alt78 = 2;

-					int LA78_0 = input.LA(1);

-

-					if (((LA78_0 >= 41 && LA78_0 <= 43))) {

-						alt78 = 1;

-					}

-					switch (alt78) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2410:1: (lv_value_4_0= ruleAttributeValue )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2410:1: (lv_value_4_0= ruleAttributeValue )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2411:3: lv_value_4_0= ruleAttributeValue

-						{

-

-							newCompositeNode(grammarAccess.getAttributeAccess().getValueAttributeValueParserRuleCall_4_0());

-

-							pushFollow(FOLLOW_ruleAttributeValue_in_ruleAttribute5336);

-							lv_value_4_0 = ruleAttributeValue();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getAttributeRule());

-							}

-							set(

-									current,

-									"value",

-									lv_value_4_0,

-									"AttributeValue");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					otherlv_5 = (Token) match(input, 37, FOLLOW_37_in_ruleAttribute5349);

-

-					newLeafNode(otherlv_5, grammarAccess.getAttributeAccess().getRightSquareBracketKeyword_5());

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleAttribute"

-

-

-	// $ANTLR start "entryRuleAttributeValue"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2439:1: entryRuleAttributeValue returns [EObject current=null] : iv_ruleAttributeValue= ruleAttributeValue EOF ;

-	public final EObject entryRuleAttributeValue() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleAttributeValue = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2440:2: (iv_ruleAttributeValue= ruleAttributeValue EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2441:2: iv_ruleAttributeValue= ruleAttributeValue EOF

-			{

-				newCompositeNode(grammarAccess.getAttributeValueRule());

-				pushFollow(FOLLOW_ruleAttributeValue_in_entryRuleAttributeValue5385);

-				iv_ruleAttributeValue = ruleAttributeValue();

-

-				state._fsp--;

-

-				current = iv_ruleAttributeValue;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleAttributeValue5395);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleAttributeValue"

-

-

-	// $ANTLR start "ruleAttributeValue"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2448:1: ruleAttributeValue returns [EObject current=null] : ( ( (lv_operator_0_0= ruleATTRIBUTE_OP ) ) (this_WS_1= RULE_WS )* (

-	// ( (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING ) ) ) (this_WS_3= RULE_WS )* ) ;

-	public final EObject ruleAttributeValue() throws RecognitionException {

-		EObject current = null;

-

-		Token this_WS_1 = null;

-		Token lv_value_2_1 = null;

-		Token lv_value_2_2 = null;

-		Token this_WS_3 = null;

-		Enumerator lv_operator_0_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2451:28: ( ( ( (lv_operator_0_0= ruleATTRIBUTE_OP ) ) (this_WS_1= RULE_WS )* ( ( (lv_value_2_1= RULE_ID | lv_value_2_2=

-			// RULE_STRING ) ) ) (this_WS_3= RULE_WS )* ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2452:1: ( ( (lv_operator_0_0= ruleATTRIBUTE_OP ) ) (this_WS_1= RULE_WS )* ( ( (lv_value_2_1= RULE_ID | lv_value_2_2=

-			// RULE_STRING ) ) ) (this_WS_3= RULE_WS )* )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2452:1: ( ( (lv_operator_0_0= ruleATTRIBUTE_OP ) ) (this_WS_1= RULE_WS )* ( ( (lv_value_2_1= RULE_ID | lv_value_2_2=

-				// RULE_STRING ) ) ) (this_WS_3= RULE_WS )* )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2452:2: ( (lv_operator_0_0= ruleATTRIBUTE_OP ) ) (this_WS_1= RULE_WS )* ( ( (lv_value_2_1= RULE_ID | lv_value_2_2=

-				// RULE_STRING ) ) ) (this_WS_3= RULE_WS )*

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2452:2: ( (lv_operator_0_0= ruleATTRIBUTE_OP ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2453:1: (lv_operator_0_0= ruleATTRIBUTE_OP )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2453:1: (lv_operator_0_0= ruleATTRIBUTE_OP )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2454:3: lv_operator_0_0= ruleATTRIBUTE_OP

-						{

-

-							newCompositeNode(grammarAccess.getAttributeValueAccess().getOperatorATTRIBUTE_OPEnumRuleCall_0_0());

-

-							pushFollow(FOLLOW_ruleATTRIBUTE_OP_in_ruleAttributeValue5441);

-							lv_operator_0_0 = ruleATTRIBUTE_OP();

-

-							state._fsp--;

-

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getAttributeValueRule());

-							}

-							set(

-									current,

-									"operator",

-									lv_operator_0_0,

-									"ATTRIBUTE_OP");

-							afterParserOrEnumRuleCall();

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2470:2: (this_WS_1= RULE_WS )*

-					loop79: do {

-						int alt79 = 2;

-						int LA79_0 = input.LA(1);

-

-						if ((LA79_0 == RULE_WS)) {

-							alt79 = 1;

-						}

-

-

-						switch (alt79) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2470:3: this_WS_1= RULE_WS

-						{

-							this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleAttributeValue5453);

-

-							newLeafNode(this_WS_1, grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_1());

-

-

-						}

-							break;

-

-						default:

-							break loop79;

-						}

-					} while (true);

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2474:3: ( ( (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING ) ) )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2475:1: ( (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING ) )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2475:1: ( (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING ) )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2476:1: (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING )

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2476:1: (lv_value_2_1= RULE_ID | lv_value_2_2= RULE_STRING )

-							int alt80 = 2;

-							int LA80_0 = input.LA(1);

-

-							if ((LA80_0 == RULE_ID)) {

-								alt80 = 1;

-							}

-							else if ((LA80_0 == RULE_STRING)) {

-								alt80 = 2;

-							}

-							else {

-								NoViableAltException nvae =

-										new NoViableAltException("", 80, 0, input);

-

-								throw nvae;

-							}

-							switch (alt80) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2477:3: lv_value_2_1= RULE_ID

-							{

-								lv_value_2_1 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_ruleAttributeValue5473);

-

-								newLeafNode(lv_value_2_1, grammarAccess.getAttributeValueAccess().getValueIDTerminalRuleCall_2_0_0());

-

-

-								if (current == null) {

-									current = createModelElement(grammarAccess.getAttributeValueRule());

-								}

-								setWithLastConsumed(

-										current,

-										"value",

-										lv_value_2_1,

-										"ID");

-

-

-							}

-								break;

-							case 2:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2492:8: lv_value_2_2= RULE_STRING

-							{

-								lv_value_2_2 = (Token) match(input, RULE_STRING, FOLLOW_RULE_STRING_in_ruleAttributeValue5493);

-

-								newLeafNode(lv_value_2_2, grammarAccess.getAttributeValueAccess().getValueSTRINGTerminalRuleCall_2_0_1());

-

-

-								if (current == null) {

-									current = createModelElement(grammarAccess.getAttributeValueRule());

-								}

-								setWithLastConsumed(

-										current,

-										"value",

-										lv_value_2_2,

-										"STRING");

-

-

-							}

-								break;

-

-							}

-

-

-						}

-

-

-					}

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2510:2: (this_WS_3= RULE_WS )*

-					loop81: do {

-						int alt81 = 2;

-						int LA81_0 = input.LA(1);

-

-						if ((LA81_0 == RULE_WS)) {

-							alt81 = 1;

-						}

-

-

-						switch (alt81) {

-						case 1:

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2510:3: this_WS_3= RULE_WS

-						{

-							this_WS_3 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleAttributeValue5513);

-

-							newLeafNode(this_WS_3, grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_3());

-

-

-						}

-							break;

-

-						default:

-							break loop81;

-						}

-					} while (true);

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleAttributeValue"

-

-

-	// $ANTLR start "entryRulePseudo"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2522:1: entryRulePseudo returns [EObject current=null] : iv_rulePseudo= rulePseudo EOF ;

-	public final EObject entryRulePseudo() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulePseudo = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2523:2: (iv_rulePseudo= rulePseudo EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2524:2: iv_rulePseudo= rulePseudo EOF

-			{

-				newCompositeNode(grammarAccess.getPseudoRule());

-				pushFollow(FOLLOW_rulePseudo_in_entryRulePseudo5550);

-				iv_rulePseudo = rulePseudo();

-

-				state._fsp--;

-

-				current = iv_rulePseudo;

-				match(input, EOF, FOLLOW_EOF_in_entryRulePseudo5560);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRulePseudo"

-

-

-	// $ANTLR start "rulePseudo"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2531:1: rulePseudo returns [EObject current=null] : (otherlv_0= ':' ( ( (lv_pseudo_1_0= RULE_ID ) ) | ( ( (lv_pseudo_2_0=

-	// RULE_ID ) ) otherlv_3= '(' (this_WS_4= RULE_WS )* ( ( (lv_args_5_0= RULE_ID ) ) (this_WS_6= RULE_WS )* )? otherlv_7= ')' ) ) ) ;

-	public final EObject rulePseudo() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_0 = null;

-		Token lv_pseudo_1_0 = null;

-		Token lv_pseudo_2_0 = null;

-		Token otherlv_3 = null;

-		Token this_WS_4 = null;

-		Token lv_args_5_0 = null;

-		Token this_WS_6 = null;

-		Token otherlv_7 = null;

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2534:28: ( (otherlv_0= ':' ( ( (lv_pseudo_1_0= RULE_ID ) ) | ( ( (lv_pseudo_2_0= RULE_ID ) ) otherlv_3= '(' (this_WS_4=

-			// RULE_WS )* ( ( (lv_args_5_0= RULE_ID ) ) (this_WS_6= RULE_WS )* )? otherlv_7= ')' ) ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2535:1: (otherlv_0= ':' ( ( (lv_pseudo_1_0= RULE_ID ) ) | ( ( (lv_pseudo_2_0= RULE_ID ) ) otherlv_3= '(' (this_WS_4=

-			// RULE_WS )* ( ( (lv_args_5_0= RULE_ID ) ) (this_WS_6= RULE_WS )* )? otherlv_7= ')' ) ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2535:1: (otherlv_0= ':' ( ( (lv_pseudo_1_0= RULE_ID ) ) | ( ( (lv_pseudo_2_0= RULE_ID ) ) otherlv_3= '(' (this_WS_4=

-				// RULE_WS )* ( ( (lv_args_5_0= RULE_ID ) ) (this_WS_6= RULE_WS )* )? otherlv_7= ')' ) ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2535:3: otherlv_0= ':' ( ( (lv_pseudo_1_0= RULE_ID ) ) | ( ( (lv_pseudo_2_0= RULE_ID ) ) otherlv_3= '(' (this_WS_4=

-				// RULE_WS )* ( ( (lv_args_5_0= RULE_ID ) ) (this_WS_6= RULE_WS )* )? otherlv_7= ')' ) )

-				{

-					otherlv_0 = (Token) match(input, 30, FOLLOW_30_in_rulePseudo5597);

-

-					newLeafNode(otherlv_0, grammarAccess.getPseudoAccess().getColonKeyword_0());

-

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2539:1: ( ( (lv_pseudo_1_0= RULE_ID ) ) | ( ( (lv_pseudo_2_0= RULE_ID ) ) otherlv_3= '(' (this_WS_4= RULE_WS )*

-					// ( ( (lv_args_5_0= RULE_ID ) ) (this_WS_6= RULE_WS )* )? otherlv_7= ')' ) )

-					int alt85 = 2;

-					int LA85_0 = input.LA(1);

-

-					if ((LA85_0 == RULE_ID)) {

-						int LA85_1 = input.LA(2);

-

-						if ((LA85_1 == 32)) {

-							alt85 = 2;

-						}

-						else if ((LA85_1 == EOF || LA85_1 == RULE_WS || (LA85_1 >= RULE_HASH && LA85_1 <= RULE_T_CLASS) || LA85_1 == 25 || LA85_1 == 27 || LA85_1 == 30 || LA85_1 == 36 || (LA85_1 >= 39 && LA85_1 <= 40))) {

-							alt85 = 1;

-						}

-						else {

-							NoViableAltException nvae =

-									new NoViableAltException("", 85, 1, input);

-

-							throw nvae;

-						}

-					}

-					else {

-						NoViableAltException nvae =

-								new NoViableAltException("", 85, 0, input);

-

-						throw nvae;

-					}

-					switch (alt85) {

-					case 1:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2539:2: ( (lv_pseudo_1_0= RULE_ID ) )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2539:2: ( (lv_pseudo_1_0= RULE_ID ) )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2540:1: (lv_pseudo_1_0= RULE_ID )

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2540:1: (lv_pseudo_1_0= RULE_ID )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2541:3: lv_pseudo_1_0= RULE_ID

-							{

-								lv_pseudo_1_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_rulePseudo5615);

-

-								newLeafNode(lv_pseudo_1_0, grammarAccess.getPseudoAccess().getPseudoIDTerminalRuleCall_1_0_0());

-

-

-								if (current == null) {

-									current = createModelElement(grammarAccess.getPseudoRule());

-								}

-								setWithLastConsumed(

-										current,

-										"pseudo",

-										lv_pseudo_1_0,

-										"ID");

-

-

-							}

-

-

-						}

-

-

-					}

-						break;

-					case 2:

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2558:6: ( ( (lv_pseudo_2_0= RULE_ID ) ) otherlv_3= '(' (this_WS_4= RULE_WS )* ( ( (lv_args_5_0= RULE_ID ) )

-					// (this_WS_6= RULE_WS )* )? otherlv_7= ')' )

-					{

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2558:6: ( ( (lv_pseudo_2_0= RULE_ID ) ) otherlv_3= '(' (this_WS_4= RULE_WS )* ( ( (lv_args_5_0= RULE_ID ) )

-						// (this_WS_6= RULE_WS )* )? otherlv_7= ')' )

-						// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2558:7: ( (lv_pseudo_2_0= RULE_ID ) ) otherlv_3= '(' (this_WS_4= RULE_WS )* ( ( (lv_args_5_0= RULE_ID ) )

-						// (this_WS_6= RULE_WS )* )? otherlv_7= ')'

-						{

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2558:7: ( (lv_pseudo_2_0= RULE_ID ) )

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2559:1: (lv_pseudo_2_0= RULE_ID )

-							{

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2559:1: (lv_pseudo_2_0= RULE_ID )

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2560:3: lv_pseudo_2_0= RULE_ID

-								{

-									lv_pseudo_2_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_rulePseudo5644);

-

-									newLeafNode(lv_pseudo_2_0, grammarAccess.getPseudoAccess().getPseudoIDTerminalRuleCall_1_1_0_0());

-

-

-									if (current == null) {

-										current = createModelElement(grammarAccess.getPseudoRule());

-									}

-									setWithLastConsumed(

-											current,

-											"pseudo",

-											lv_pseudo_2_0,

-											"ID");

-

-

-								}

-

-

-							}

-

-							otherlv_3 = (Token) match(input, 32, FOLLOW_32_in_rulePseudo5661);

-

-							newLeafNode(otherlv_3, grammarAccess.getPseudoAccess().getLeftParenthesisKeyword_1_1_1());

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2580:1: (this_WS_4= RULE_WS )*

-							loop82: do {

-								int alt82 = 2;

-								int LA82_0 = input.LA(1);

-

-								if ((LA82_0 == RULE_WS)) {

-									alt82 = 1;

-								}

-

-

-								switch (alt82) {

-								case 1:

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2580:2: this_WS_4= RULE_WS

-								{

-									this_WS_4 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_rulePseudo5673);

-

-									newLeafNode(this_WS_4, grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_2());

-

-

-								}

-									break;

-

-								default:

-									break loop82;

-								}

-							} while (true);

-

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2584:3: ( ( (lv_args_5_0= RULE_ID ) ) (this_WS_6= RULE_WS )* )?

-							int alt84 = 2;

-							int LA84_0 = input.LA(1);

-

-							if ((LA84_0 == RULE_ID)) {

-								alt84 = 1;

-							}

-							switch (alt84) {

-							case 1:

-							// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2584:4: ( (lv_args_5_0= RULE_ID ) ) (this_WS_6= RULE_WS )*

-							{

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2584:4: ( (lv_args_5_0= RULE_ID ) )

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2585:1: (lv_args_5_0= RULE_ID )

-								{

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2585:1: (lv_args_5_0= RULE_ID )

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2586:3: lv_args_5_0= RULE_ID

-									{

-										lv_args_5_0 = (Token) match(input, RULE_ID, FOLLOW_RULE_ID_in_rulePseudo5692);

-

-										newLeafNode(lv_args_5_0, grammarAccess.getPseudoAccess().getArgsIDTerminalRuleCall_1_1_3_0_0());

-

-

-										if (current == null) {

-											current = createModelElement(grammarAccess.getPseudoRule());

-										}

-										setWithLastConsumed(

-												current,

-												"args",

-												lv_args_5_0,

-												"ID");

-

-

-									}

-

-

-								}

-

-								// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2602:2: (this_WS_6= RULE_WS )*

-								loop83: do {

-									int alt83 = 2;

-									int LA83_0 = input.LA(1);

-

-									if ((LA83_0 == RULE_WS)) {

-										alt83 = 1;

-									}

-

-

-									switch (alt83) {

-									case 1:

-									// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2602:3: this_WS_6= RULE_WS

-									{

-										this_WS_6 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_rulePseudo5709);

-

-										newLeafNode(this_WS_6, grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_3_1());

-

-

-									}

-										break;

-

-									default:

-										break loop83;

-									}

-								} while (true);

-

-

-							}

-								break;

-

-							}

-

-							otherlv_7 = (Token) match(input, 33, FOLLOW_33_in_rulePseudo5724);

-

-							newLeafNode(otherlv_7, grammarAccess.getPseudoAccess().getRightParenthesisKeyword_1_1_4());

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "rulePseudo"

-

-

-	// $ANTLR start "entryRuleCSSId"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2618:1: entryRuleCSSId returns [EObject current=null] : iv_ruleCSSId= ruleCSSId EOF ;

-	public final EObject entryRuleCSSId() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleCSSId = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2619:2: (iv_ruleCSSId= ruleCSSId EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2620:2: iv_ruleCSSId= ruleCSSId EOF

-			{

-				newCompositeNode(grammarAccess.getCSSIdRule());

-				pushFollow(FOLLOW_ruleCSSId_in_entryRuleCSSId5762);

-				iv_ruleCSSId = ruleCSSId();

-

-				state._fsp--;

-

-				current = iv_ruleCSSId;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleCSSId5772);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleCSSId"

-

-

-	// $ANTLR start "ruleCSSId"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2627:1: ruleCSSId returns [EObject current=null] : ( (lv_value_0_0= RULE_HASH ) ) ;

-	public final EObject ruleCSSId() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_value_0_0 = null;

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2630:28: ( ( (lv_value_0_0= RULE_HASH ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2631:1: ( (lv_value_0_0= RULE_HASH ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2631:1: ( (lv_value_0_0= RULE_HASH ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2632:1: (lv_value_0_0= RULE_HASH )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2632:1: (lv_value_0_0= RULE_HASH )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2633:3: lv_value_0_0= RULE_HASH

-					{

-						lv_value_0_0 = (Token) match(input, RULE_HASH, FOLLOW_RULE_HASH_in_ruleCSSId5813);

-

-						newLeafNode(lv_value_0_0, grammarAccess.getCSSIdAccess().getValueHASHTerminalRuleCall_0());

-

-

-						if (current == null) {

-							current = createModelElement(grammarAccess.getCSSIdRule());

-						}

-						setWithLastConsumed(

-								current,

-								"value",

-								lv_value_0_0,

-								"HASH");

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleCSSId"

-

-

-	// $ANTLR start "entryRuleUnaryOperator"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2657:1: entryRuleUnaryOperator returns [EObject current=null] : iv_ruleUnaryOperator= ruleUnaryOperator EOF ;

-	public final EObject entryRuleUnaryOperator() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleUnaryOperator = null;

-

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2658:2: (iv_ruleUnaryOperator= ruleUnaryOperator EOF )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2659:2: iv_ruleUnaryOperator= ruleUnaryOperator EOF

-			{

-				newCompositeNode(grammarAccess.getUnaryOperatorRule());

-				pushFollow(FOLLOW_ruleUnaryOperator_in_entryRuleUnaryOperator5853);

-				iv_ruleUnaryOperator = ruleUnaryOperator();

-

-				state._fsp--;

-

-				current = iv_ruleUnaryOperator;

-				match(input, EOF, FOLLOW_EOF_in_entryRuleUnaryOperator5863);

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "entryRuleUnaryOperator"

-

-

-	// $ANTLR start "ruleUnaryOperator"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2666:1: ruleUnaryOperator returns [EObject current=null] : ( (lv_operator_0_0= ruleUNARY ) ) ;

-	public final EObject ruleUnaryOperator() throws RecognitionException {

-		EObject current = null;

-

-		Enumerator lv_operator_0_0 = null;

-

-

-		enterRule();

-

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2669:28: ( ( (lv_operator_0_0= ruleUNARY ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2670:1: ( (lv_operator_0_0= ruleUNARY ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2670:1: ( (lv_operator_0_0= ruleUNARY ) )

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2671:1: (lv_operator_0_0= ruleUNARY )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2671:1: (lv_operator_0_0= ruleUNARY )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2672:3: lv_operator_0_0= ruleUNARY

-					{

-

-						newCompositeNode(grammarAccess.getUnaryOperatorAccess().getOperatorUNARYEnumRuleCall_0());

-

-						pushFollow(FOLLOW_ruleUNARY_in_ruleUnaryOperator5908);

-						lv_operator_0_0 = ruleUNARY();

-

-						state._fsp--;

-

-

-						if (current == null) {

-							current = createModelElementForParent(grammarAccess.getUnaryOperatorRule());

-						}

-						set(

-								current,

-								"operator",

-								lv_operator_0_0,

-								"UNARY");

-						afterParserOrEnumRuleCall();

-

-

-					}

-

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleUnaryOperator"

-

-

-	// $ANTLR start "ruleUNARY"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2696:1: ruleUNARY returns [Enumerator current=null] : ( (enumLiteral_0= '-' ) | (enumLiteral_1= '+' ) ) ;

-	public final Enumerator ruleUNARY() throws RecognitionException {

-		Enumerator current = null;

-

-		Token enumLiteral_0 = null;

-		Token enumLiteral_1 = null;

-

-		enterRule();

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2698:28: ( ( (enumLiteral_0= '-' ) | (enumLiteral_1= '+' ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2699:1: ( (enumLiteral_0= '-' ) | (enumLiteral_1= '+' ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2699:1: ( (enumLiteral_0= '-' ) | (enumLiteral_1= '+' ) )

-				int alt86 = 2;

-				int LA86_0 = input.LA(1);

-

-				if ((LA86_0 == 38)) {

-					alt86 = 1;

-				}

-				else if ((LA86_0 == 39)) {

-					alt86 = 2;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 86, 0, input);

-

-					throw nvae;

-				}

-				switch (alt86) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2699:2: (enumLiteral_0= '-' )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2699:2: (enumLiteral_0= '-' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2699:4: enumLiteral_0= '-'

-					{

-						enumLiteral_0 = (Token) match(input, 38, FOLLOW_38_in_ruleUNARY5957);

-

-						current = grammarAccess.getUNARYAccess().getNEGEnumLiteralDeclaration_0().getEnumLiteral().getInstance();

-						newLeafNode(enumLiteral_0, grammarAccess.getUNARYAccess().getNEGEnumLiteralDeclaration_0());

-

-

-					}

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2705:6: (enumLiteral_1= '+' )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2705:6: (enumLiteral_1= '+' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2705:8: enumLiteral_1= '+'

-					{

-						enumLiteral_1 = (Token) match(input, 39, FOLLOW_39_in_ruleUNARY5974);

-

-						current = grammarAccess.getUNARYAccess().getPLUSEnumLiteralDeclaration_1().getEnumLiteral().getInstance();

-						newLeafNode(enumLiteral_1, grammarAccess.getUNARYAccess().getPLUSEnumLiteralDeclaration_1());

-

-

-					}

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleUNARY"

-

-

-	// $ANTLR start "ruleKIND"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2715:1: ruleKIND returns [Enumerator current=null] : ( (enumLiteral_0= '>' ) | (enumLiteral_1= '+' ) ) ;

-	public final Enumerator ruleKIND() throws RecognitionException {

-		Enumerator current = null;

-

-		Token enumLiteral_0 = null;

-		Token enumLiteral_1 = null;

-

-		enterRule();

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2717:28: ( ( (enumLiteral_0= '>' ) | (enumLiteral_1= '+' ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2718:1: ( (enumLiteral_0= '>' ) | (enumLiteral_1= '+' ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2718:1: ( (enumLiteral_0= '>' ) | (enumLiteral_1= '+' ) )

-				int alt87 = 2;

-				int LA87_0 = input.LA(1);

-

-				if ((LA87_0 == 40)) {

-					alt87 = 1;

-				}

-				else if ((LA87_0 == 39)) {

-					alt87 = 2;

-				}

-				else {

-					NoViableAltException nvae =

-							new NoViableAltException("", 87, 0, input);

-

-					throw nvae;

-				}

-				switch (alt87) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2718:2: (enumLiteral_0= '>' )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2718:2: (enumLiteral_0= '>' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2718:4: enumLiteral_0= '>'

-					{

-						enumLiteral_0 = (Token) match(input, 40, FOLLOW_40_in_ruleKIND6019);

-

-						current = grammarAccess.getKINDAccess().getFIRST_CHILDEnumLiteralDeclaration_0().getEnumLiteral().getInstance();

-						newLeafNode(enumLiteral_0, grammarAccess.getKINDAccess().getFIRST_CHILDEnumLiteralDeclaration_0());

-

-

-					}

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2724:6: (enumLiteral_1= '+' )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2724:6: (enumLiteral_1= '+' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2724:8: enumLiteral_1= '+'

-					{

-						enumLiteral_1 = (Token) match(input, 39, FOLLOW_39_in_ruleKIND6036);

-

-						current = grammarAccess.getKINDAccess().getSIBLINGEnumLiteralDeclaration_1().getEnumLiteral().getInstance();

-						newLeafNode(enumLiteral_1, grammarAccess.getKINDAccess().getSIBLINGEnumLiteralDeclaration_1());

-

-

-					}

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleKIND"

-

-

-	// $ANTLR start "ruleATTRIBUTE_OP"

-	// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2734:1: ruleATTRIBUTE_OP returns [Enumerator current=null] : ( (enumLiteral_0= '=' ) | (enumLiteral_1= '~=' ) | (enumLiteral_2=

-	// '!=' ) ) ;

-	public final Enumerator ruleATTRIBUTE_OP() throws RecognitionException {

-		Enumerator current = null;

-

-		Token enumLiteral_0 = null;

-		Token enumLiteral_1 = null;

-		Token enumLiteral_2 = null;

-

-		enterRule();

-		try {

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2736:28: ( ( (enumLiteral_0= '=' ) | (enumLiteral_1= '~=' ) | (enumLiteral_2= '!=' ) ) )

-			// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2737:1: ( (enumLiteral_0= '=' ) | (enumLiteral_1= '~=' ) | (enumLiteral_2= '!=' ) )

-			{

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2737:1: ( (enumLiteral_0= '=' ) | (enumLiteral_1= '~=' ) | (enumLiteral_2= '!=' ) )

-				int alt88 = 3;

-				switch (input.LA(1)) {

-				case 41: {

-					alt88 = 1;

-				}

-					break;

-				case 42: {

-					alt88 = 2;

-				}

-					break;

-				case 43: {

-					alt88 = 3;

-				}

-					break;

-				default:

-					NoViableAltException nvae =

-							new NoViableAltException("", 88, 0, input);

-

-					throw nvae;

-				}

-

-				switch (alt88) {

-				case 1:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2737:2: (enumLiteral_0= '=' )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2737:2: (enumLiteral_0= '=' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2737:4: enumLiteral_0= '='

-					{

-						enumLiteral_0 = (Token) match(input, 41, FOLLOW_41_in_ruleATTRIBUTE_OP6081);

-

-						current = grammarAccess.getATTRIBUTE_OPAccess().getEQUALSEnumLiteralDeclaration_0().getEnumLiteral().getInstance();

-						newLeafNode(enumLiteral_0, grammarAccess.getATTRIBUTE_OPAccess().getEQUALSEnumLiteralDeclaration_0());

-

-

-					}

-

-

-				}

-					break;

-				case 2:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2743:6: (enumLiteral_1= '~=' )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2743:6: (enumLiteral_1= '~=' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2743:8: enumLiteral_1= '~='

-					{

-						enumLiteral_1 = (Token) match(input, 42, FOLLOW_42_in_ruleATTRIBUTE_OP6098);

-

-						current = grammarAccess.getATTRIBUTE_OPAccess().getCONTAINSEnumLiteralDeclaration_1().getEnumLiteral().getInstance();

-						newLeafNode(enumLiteral_1, grammarAccess.getATTRIBUTE_OPAccess().getCONTAINSEnumLiteralDeclaration_1());

-

-

-					}

-

-

-				}

-					break;

-				case 3:

-				// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2749:6: (enumLiteral_2= '!=' )

-				{

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2749:6: (enumLiteral_2= '!=' )

-					// ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2749:8: enumLiteral_2= '!='

-					{

-						enumLiteral_2 = (Token) match(input, 43, FOLLOW_43_in_ruleATTRIBUTE_OP6115);

-

-						current = grammarAccess.getATTRIBUTE_OPAccess().getUNEQUALSEnumLiteralDeclaration_2().getEnumLiteral().getInstance();

-						newLeafNode(enumLiteral_2, grammarAccess.getATTRIBUTE_OPAccess().getUNEQUALSEnumLiteralDeclaration_2());

-

-

-					}

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			leaveRule();

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-

-	// $ANTLR end "ruleATTRIBUTE_OP"

-

-	// Delegated rules

-

-

-	protected DFA44 dfa44 = new DFA44(this);

-	protected DFA47 dfa47 = new DFA47(this);

-	protected DFA60 dfa60 = new DFA60(this);

-	static final String DFA44_eotS =

-			"\60\uffff";

-	static final String DFA44_eofS =

-			"\1\uffff\4\15\2\uffff\2\15\2\uffff\1\15\4\uffff\1\15\2\uffff\1" +

-					"\15\4\uffff\1\15\5\uffff\1\15\6\uffff\1\15\5\uffff\1\15\4\uffff";

-	static final String DFA44_minS =

-			"\1\10\5\5\1\10\3\5\1\10\1\5\2\uffff\7\5\3\4\3\5\3\4\2\5\1\4\5\5" +

-					"\1\4\11\5";

-	static final String DFA44_maxS =

-			"\1\44\4\50\2\10\2\50\2\10\1\50\2\uffff\1\10\1\53\1\50\1\10\1\53" +

-					"\1\50\1\53\3\10\1\50\1\41\1\53\3\10\1\50\1\41\1\10\2\45\2\41\1\50" +

-					"\1\10\2\45\2\41\1\50\1\45\1\41\1\45\1\41";

-	static final String DFA44_acceptS =

-			"\14\uffff\1\2\1\1\42\uffff";

-	static final String DFA44_specialS =

-			"\60\uffff}>";

-	static final String[] DFA44_transitionS = {

-			"\1\1\11\uffff\1\3\1\4\12\uffff\1\6\1\2\4\uffff\1\5",

-			"\1\13\14\uffff\1\7\1\10\5\uffff\1\15\1\uffff\1\15\2\uffff" +

-					"\1\12\5\uffff\1\11\2\uffff\2\14",

-			"\1\13\14\uffff\1\7\1\10\5\uffff\1\15\1\uffff\1\15\2\uffff" +

-					"\1\12\5\uffff\1\11\2\uffff\2\14",

-			"\1\13\14\uffff\1\3\1\4\5\uffff\1\15\1\uffff\1\15\2\uffff\1" +

-					"\6\5\uffff\1\5\2\uffff\2\14",

-			"\1\13\14\uffff\1\3\1\4\5\uffff\1\15\1\uffff\1\15\2\uffff\1" +

-					"\6\5\uffff\1\5\2\uffff\2\14",

-			"\1\16\2\uffff\1\17",

-			"\1\20",

-			"\1\13\14\uffff\1\7\1\10\5\uffff\1\15\1\uffff\1\15\2\uffff" +

-					"\1\12\5\uffff\1\11\2\uffff\2\14",

-			"\1\13\14\uffff\1\7\1\10\5\uffff\1\15\1\uffff\1\15\2\uffff" +

-					"\1\12\5\uffff\1\11\2\uffff\2\14",

-			"\1\21\2\uffff\1\22",

-			"\1\23",

-			"\1\13\2\uffff\1\14\11\uffff\2\14\5\uffff\1\15\1\uffff\1\15" +

-					"\2\uffff\2\14\4\uffff\1\14\2\uffff\2\14",

-			"",

-			"",

-			"\1\16\2\uffff\1\17",

-			"\1\24\37\uffff\1\30\3\uffff\1\25\1\26\1\27",

-			"\1\13\14\uffff\1\3\1\4\5\uffff\1\15\1\uffff\1\15\2\uffff\1" +

-					"\6\1\uffff\1\31\3\uffff\1\5\2\uffff\2\14",

-			"\1\21\2\uffff\1\22",

-			"\1\32\37\uffff\1\36\3\uffff\1\33\1\34\1\35",

-			"\1\13\14\uffff\1\7\1\10\5\uffff\1\15\1\uffff\1\15\2\uffff" +

-					"\1\12\1\uffff\1\37\3\uffff\1\11\2\uffff\2\14",

-			"\1\24\37\uffff\1\30\3\uffff\1\25\1\26\1\27",

-			"\1\42\1\40\2\uffff\1\41",

-			"\1\42\1\40\2\uffff\1\41",

-			"\1\42\1\40\2\uffff\1\41",

-			"\1\13\14\uffff\1\3\1\4\5\uffff\1\15\1\uffff\1\15\2\uffff\1" +

-					"\6\5\uffff\1\5\2\uffff\2\14",

-			"\1\43\2\uffff\1\44\30\uffff\1\45",

-			"\1\32\37\uffff\1\36\3\uffff\1\33\1\34\1\35",

-			"\1\50\1\46\2\uffff\1\47",

-			"\1\50\1\46\2\uffff\1\47",

-			"\1\50\1\46\2\uffff\1\47",

-			"\1\13\14\uffff\1\7\1\10\5\uffff\1\15\1\uffff\1\15\2\uffff" +

-					"\1\12\5\uffff\1\11\2\uffff\2\14",

-			"\1\51\2\uffff\1\52\30\uffff\1\53",

-			"\1\42\1\40\2\uffff\1\41",

-			"\1\54\37\uffff\1\30",

-			"\1\54\37\uffff\1\30",

-			"\1\43\2\uffff\1\44\30\uffff\1\45",

-			"\1\55\33\uffff\1\45",

-			"\1\13\14\uffff\1\3\1\4\5\uffff\1\15\1\uffff\1\15\2\uffff\1" +

-					"\6\5\uffff\1\5\2\uffff\2\14",

-			"\1\50\1\46\2\uffff\1\47",

-			"\1\56\37\uffff\1\36",

-			"\1\56\37\uffff\1\36",

-			"\1\51\2\uffff\1\52\30\uffff\1\53",

-			"\1\57\33\uffff\1\53",

-			"\1\13\14\uffff\1\7\1\10\5\uffff\1\15\1\uffff\1\15\2\uffff" +

-					"\1\12\5\uffff\1\11\2\uffff\2\14",

-			"\1\54\37\uffff\1\30",

-			"\1\55\33\uffff\1\45",

-			"\1\56\37\uffff\1\36",

-			"\1\57\33\uffff\1\53"

-	};

-

-	static final short[] DFA44_eot = DFA.unpackEncodedString(DFA44_eotS);

-	static final short[] DFA44_eof = DFA.unpackEncodedString(DFA44_eofS);

-	static final char[] DFA44_min = DFA.unpackEncodedStringToUnsignedChars(DFA44_minS);

-	static final char[] DFA44_max = DFA.unpackEncodedStringToUnsignedChars(DFA44_maxS);

-	static final short[] DFA44_accept = DFA.unpackEncodedString(DFA44_acceptS);

-	static final short[] DFA44_special = DFA.unpackEncodedString(DFA44_specialS);

-	static final short[][] DFA44_transition;

-

-	static {

-		int numStates = DFA44_transitionS.length;

-		DFA44_transition = new short[numStates][];

-		for (int i = 0; i < numStates; i++) {

-			DFA44_transition[i] = DFA.unpackEncodedString(DFA44_transitionS[i]);

-		}

-	}

-

-	class DFA44 extends DFA {

-

-		public DFA44(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 44;

-			this.eot = DFA44_eot;

-			this.eof = DFA44_eof;

-			this.min = DFA44_min;

-			this.max = DFA44_max;

-			this.accept = DFA44_accept;

-			this.special = DFA44_special;

-			this.transition = DFA44_transition;

-		}

-

-		@Override

-		public String getDescription() {

-			return "788:1: ( (this_SimpleSelector_0= ruleSimpleSelector (this_WS_1= RULE_WS )* ) | this_CompositeSelector_2= ruleCompositeSelector )";

-		}

-	}

-

-	static final String DFA47_eotS =

-			"\4\uffff";

-	static final String DFA47_eofS =

-			"\4\uffff";

-	static final String DFA47_minS =

-			"\2\5\2\uffff";

-	static final String DFA47_maxS =

-			"\2\50\2\uffff";

-	static final String DFA47_acceptS =

-			"\2\uffff\1\2\1\1";

-	static final String DFA47_specialS =

-			"\4\uffff}>";

-	static final String[] DFA47_transitionS = {

-			"\1\1\41\uffff\2\2",

-			"\1\1\2\uffff\1\3\11\uffff\2\3\12\uffff\2\3\4\uffff\1\3\2\uffff" +

-					"\2\2",

-			"",

-			""

-	};

-

-	static final short[] DFA47_eot = DFA.unpackEncodedString(DFA47_eotS);

-	static final short[] DFA47_eof = DFA.unpackEncodedString(DFA47_eofS);

-	static final char[] DFA47_min = DFA.unpackEncodedStringToUnsignedChars(DFA47_minS);

-	static final char[] DFA47_max = DFA.unpackEncodedStringToUnsignedChars(DFA47_maxS);

-	static final short[] DFA47_accept = DFA.unpackEncodedString(DFA47_acceptS);

-	static final short[] DFA47_special = DFA.unpackEncodedString(DFA47_specialS);

-	static final short[][] DFA47_transition;

-

-	static {

-		int numStates = DFA47_transitionS.length;

-		DFA47_transition = new short[numStates][];

-		for (int i = 0; i < numStates; i++) {

-			DFA47_transition[i] = DFA.unpackEncodedString(DFA47_transitionS[i]);

-		}

-	}

-

-	class DFA47 extends DFA {

-

-		public DFA47(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 47;

-			this.eot = DFA47_eot;

-			this.eof = DFA47_eof;

-			this.min = DFA47_min;

-			this.max = DFA47_max;

-			this.accept = DFA47_accept;

-			this.special = DFA47_special;

-			this.transition = DFA47_transition;

-		}

-

-		@Override

-		public String getDescription() {

-			return "850:2: ( (this_WS_1= RULE_WS )+ | ( (this_WS_2= RULE_WS )* ( (lv_combinator_3_0= ruleCombinator ) ) ) )";

-		}

-	}

-

-	static final String DFA60_eotS =

-			"\22\uffff";

-	static final String DFA60_eofS =

-			"\3\uffff\1\17\1\21\15\uffff";

-	static final String DFA60_minS =

-			"\1\4\2\12\2\4\15\uffff";

-	static final String DFA60_maxS =

-			"\1\47\2\12\2\47\15\uffff";

-	static final String DFA60_acceptS =

-			"\5\uffff\1\12\1\13\1\14\1\4\1\2\1\10\1\6\1\7\1\5\1\3\1\1\1\15\1" +

-					"\11";

-	static final String DFA60_specialS =

-			"\22\uffff}>";

-	static final String[] DFA60_transitionS = {

-			"\1\5\3\uffff\1\4\1\uffff\1\3\7\uffff\1\7\17\uffff\1\6\3\uffff" +

-					"\1\1\1\2",

-			"\1\3",

-			"\1\3",

-			"\2\17\2\uffff\3\17\1\11\1\16\1\10\1\15\1\13\1\14\1\12\1\17" +

-					"\4\uffff\1\17\1\uffff\1\17\2\uffff\1\17\4\uffff\3\17\2\uffff" +

-					"\2\17",

-			"\2\21\2\uffff\3\21\7\uffff\1\21\4\uffff\1\21\1\uffff\1\21" +

-					"\2\uffff\1\21\3\uffff\1\20\3\21\2\uffff\2\21",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			""

-	};

-

-	static final short[] DFA60_eot = DFA.unpackEncodedString(DFA60_eotS);

-	static final short[] DFA60_eof = DFA.unpackEncodedString(DFA60_eofS);

-	static final char[] DFA60_min = DFA.unpackEncodedStringToUnsignedChars(DFA60_minS);

-	static final char[] DFA60_max = DFA.unpackEncodedStringToUnsignedChars(DFA60_maxS);

-	static final short[] DFA60_accept = DFA.unpackEncodedString(DFA60_acceptS);

-	static final short[] DFA60_special = DFA.unpackEncodedString(DFA60_specialS);

-	static final short[][] DFA60_transition;

-

-	static {

-		int numStates = DFA60_transitionS.length;

-		DFA60_transition = new short[numStates][];

-		for (int i = 0; i < numStates; i++) {

-			DFA60_transition[i] = DFA.unpackEncodedString(DFA60_transitionS[i]);

-		}

-	}

-

-	class DFA60 extends DFA {

-

-		public DFA60(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 60;

-			this.eot = DFA60_eot;

-			this.eof = DFA60_eof;

-			this.min = DFA60_min;

-			this.max = DFA60_max;

-			this.accept = DFA60_accept;

-			this.special = DFA60_special;

-			this.transition = DFA60_transition;

-		}

-

-		@Override

-		public String getDescription() {

-			return "1315:2: (this_Number_0= ruleNumber | this_Percentage_1= rulePercentage | this_Length_2= ruleLength | this_Ems_3= ruleEms | this_Exs_4= ruleExs | this_Angle_5= ruleAngle | this_Time_6= ruleTime | this_Frequency_7= ruleFrequency | this_Name_8= ruleName | this_StringValue_9= ruleStringValue | this_Uri_10= ruleUri | this_HexColor_11= ruleHexColor | this_Function_12= ruleFunction )";

-		}

-	}

-

-

-	public static final BitSet FOLLOW_ruleStylesheet_in_entryRuleStylesheet75 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleStylesheet85 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_22_in_ruleStylesheet123 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_RULE_STRING_in_ruleStylesheet140 = new BitSet(new long[] { 0x0000000000800000L });

-	public static final BitSet FOLLOW_23_in_ruleStylesheet157 = new BitSet(new long[] { 0x00000010E50C01E2L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleStylesheet171 = new BitSet(new long[] { 0x00000010E50C01E2L });

-	public static final BitSet FOLLOW_RULE_CDO_in_ruleStylesheet187 = new BitSet(new long[] { 0x00000010E50C01E2L });

-	public static final BitSet FOLLOW_RULE_CDC_in_ruleStylesheet203 = new BitSet(new long[] { 0x00000010E50C01E2L });

-	public static final BitSet FOLLOW_ruleImport_in_ruleStylesheet226 = new BitSet(new long[] { 0x00000010E50C01C2L });

-	public static final BitSet FOLLOW_RULE_CDO_in_ruleStylesheet239 = new BitSet(new long[] { 0x00000010E50C01E2L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleStylesheet250 = new BitSet(new long[] { 0x00000010E50C01E2L });

-	public static final BitSet FOLLOW_RULE_CDC_in_ruleStylesheet270 = new BitSet(new long[] { 0x00000010E50C01E2L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleStylesheet281 = new BitSet(new long[] { 0x00000010E50C01E2L });

-	public static final BitSet FOLLOW_ruleContent_in_ruleStylesheet309 = new BitSet(new long[] { 0x00000010E40C01C2L });

-	public static final BitSet FOLLOW_RULE_CDO_in_ruleStylesheet322 = new BitSet(new long[] { 0x00000010E40C01E2L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleStylesheet333 = new BitSet(new long[] { 0x00000010E40C01E2L });

-	public static final BitSet FOLLOW_RULE_CDC_in_ruleStylesheet353 = new BitSet(new long[] { 0x00000010E40C01E2L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleStylesheet364 = new BitSet(new long[] { 0x00000010E40C01E2L });

-	public static final BitSet FOLLOW_ruleContent_in_entryRuleContent406 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleContent416 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleRuleset_in_ruleContent463 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleMedia_in_ruleContent490 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rulePage_in_ruleContent517 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleImport_in_entryRuleImport552 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleImport562 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_24_in_ruleImport599 = new BitSet(new long[] { 0x0000000000000030L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleImport613 = new BitSet(new long[] { 0x0000000000000030L });

-	public static final BitSet FOLLOW_RULE_STRING_in_ruleImport631 = new BitSet(new long[] { 0x0000000000800120L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleImport655 = new BitSet(new long[] { 0x0000000400000000L });

-	public static final BitSet FOLLOW_ruleUri_in_ruleImport675 = new BitSet(new long[] { 0x0000000000800120L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleImport689 = new BitSet(new long[] { 0x0000000000800120L });

-	public static final BitSet FOLLOW_RULE_ID_in_ruleImport708 = new BitSet(new long[] { 0x0000000002800020L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleImport725 = new BitSet(new long[] { 0x0000000002800020L });

-	public static final BitSet FOLLOW_25_in_ruleImport739 = new BitSet(new long[] { 0x0000000000000120L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleImport751 = new BitSet(new long[] { 0x0000000000000120L });

-	public static final BitSet FOLLOW_RULE_ID_in_ruleImport769 = new BitSet(new long[] { 0x0000000002800000L });

-	public static final BitSet FOLLOW_23_in_ruleImport790 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleImport802 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleMedia_in_entryRuleMedia839 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleMedia849 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_26_in_ruleMedia886 = new BitSet(new long[] { 0x0000000000000020L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleMedia897 = new BitSet(new long[] { 0x0000000000000100L });

-	public static final BitSet FOLLOW_RULE_ID_in_ruleMedia913 = new BitSet(new long[] { 0x000000000A000020L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleMedia930 = new BitSet(new long[] { 0x000000000A000020L });

-	public static final BitSet FOLLOW_25_in_ruleMedia944 = new BitSet(new long[] { 0x0000000000000120L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleMedia956 = new BitSet(new long[] { 0x0000000000000120L });

-	public static final BitSet FOLLOW_RULE_ID_in_ruleMedia974 = new BitSet(new long[] { 0x000000000A000000L });

-	public static final BitSet FOLLOW_27_in_ruleMedia993 = new BitSet(new long[] { 0x00000010D00C0120L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleMedia1005 = new BitSet(new long[] { 0x00000010D00C0120L });

-	public static final BitSet FOLLOW_ruleRuleset_in_ruleMedia1027 = new BitSet(new long[] { 0x00000010D00C0100L });

-	public static final BitSet FOLLOW_28_in_ruleMedia1040 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleMedia1052 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_rulePage_in_entryRulePage1089 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRulePage1099 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_29_in_rulePage1145 = new BitSet(new long[] { 0x0000000048000020L });

-	public static final BitSet FOLLOW_RULE_WS_in_rulePage1157 = new BitSet(new long[] { 0x0000000048000020L });

-	public static final BitSet FOLLOW_rulePseudoPage_in_rulePage1179 = new BitSet(new long[] { 0x0000000008000000L });

-	public static final BitSet FOLLOW_27_in_rulePage1192 = new BitSet(new long[] { 0x0000000010800120L });

-	public static final BitSet FOLLOW_RULE_WS_in_rulePage1204 = new BitSet(new long[] { 0x0000000010800120L });

-	public static final BitSet FOLLOW_ruleDeclaration_in_rulePage1226 = new BitSet(new long[] { 0x0000000010800000L });

-	public static final BitSet FOLLOW_23_in_rulePage1240 = new BitSet(new long[] { 0x0000000010800120L });

-	public static final BitSet FOLLOW_RULE_WS_in_rulePage1252 = new BitSet(new long[] { 0x0000000010800120L });

-	public static final BitSet FOLLOW_ruleDeclaration_in_rulePage1274 = new BitSet(new long[] { 0x0000000010800000L });

-	public static final BitSet FOLLOW_28_in_rulePage1289 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_RULE_WS_in_rulePage1301 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_rulePseudoPage_in_entryRulePseudoPage1338 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRulePseudoPage1348 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_30_in_rulePseudoPage1385 = new BitSet(new long[] { 0x0000000000000100L });

-	public static final BitSet FOLLOW_RULE_ID_in_rulePseudoPage1402 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_RULE_WS_in_rulePseudoPage1419 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleRuleset_in_entryRuleRuleset1456 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleRuleset1466 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSelector_in_ruleRuleset1512 = new BitSet(new long[] { 0x000000000A000000L });

-	public static final BitSet FOLLOW_25_in_ruleRuleset1525 = new BitSet(new long[] { 0x00000010C00C0120L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleRuleset1537 = new BitSet(new long[] { 0x00000010C00C0120L });

-	public static final BitSet FOLLOW_ruleSelector_in_ruleRuleset1559 = new BitSet(new long[] { 0x000000000A000000L });

-	public static final BitSet FOLLOW_27_in_ruleRuleset1573 = new BitSet(new long[] { 0x0000000010800120L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleRuleset1585 = new BitSet(new long[] { 0x0000000010800120L });

-	public static final BitSet FOLLOW_ruleDeclaration_in_ruleRuleset1607 = new BitSet(new long[] { 0x0000000010800000L });

-	public static final BitSet FOLLOW_23_in_ruleRuleset1621 = new BitSet(new long[] { 0x0000000010800120L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleRuleset1633 = new BitSet(new long[] { 0x0000000010800120L });

-	public static final BitSet FOLLOW_ruleDeclaration_in_ruleRuleset1655 = new BitSet(new long[] { 0x0000000010800000L });

-	public static final BitSet FOLLOW_28_in_ruleRuleset1670 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleRuleset1682 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleSelector_in_entryRuleSelector1719 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleSelector1729 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSimpleSelector_in_ruleSelector1777 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleSelector1788 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleCompositeSelector_in_ruleSelector1818 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleCompositeSelector_in_entryRuleCompositeSelector1853 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleCompositeSelector1863 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSimpleSelector_in_ruleCompositeSelector1909 = new BitSet(new long[] { 0x0000018000000020L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleCompositeSelector1922 = new BitSet(new long[] { 0x00000010C00C0120L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleCompositeSelector1942 = new BitSet(new long[] { 0x0000018000000020L });

-	public static final BitSet FOLLOW_ruleCombinator_in_ruleCompositeSelector1964 = new BitSet(new long[] { 0x00000010C00C0100L });

-	public static final BitSet FOLLOW_ruleSelector_in_ruleCompositeSelector1987 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleSimpleSelector_in_entryRuleSimpleSelector2023 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleSimpleSelector2033 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_ruleSimpleSelector2078 = new BitSet(new long[] { 0x00000010C00C0102L });

-	public static final BitSet FOLLOW_31_in_ruleSimpleSelector2099 = new BitSet(new long[] { 0x00000010C00C0102L });

-	public static final BitSet FOLLOW_ruleSelectorCondition_in_ruleSimpleSelector2136 = new BitSet(new long[] { 0x00000010C00C0102L });

-	public static final BitSet FOLLOW_ruleSelectorCondition_in_ruleSimpleSelector2165 = new BitSet(new long[] { 0x00000010C00C0102L });

-	public static final BitSet FOLLOW_ruleSelectorCondition_in_entryRuleSelectorCondition2202 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleSelectorCondition2212 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleCSSId_in_ruleSelectorCondition2259 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleClass_in_ruleSelectorCondition2286 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleAttribute_in_ruleSelectorCondition2313 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rulePseudo_in_ruleSelectorCondition2340 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleCombinator_in_entryRuleCombinator2375 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleCombinator2385 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleKIND_in_ruleCombinator2431 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleCombinator2443 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleDeclaration_in_entryRuleDeclaration2480 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleDeclaration2490 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_ruleDeclaration2532 = new BitSet(new long[] { 0x0000000040000020L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleDeclaration2549 = new BitSet(new long[] { 0x0000000040000020L });

-	public static final BitSet FOLLOW_30_in_ruleDeclaration2562 = new BitSet(new long[] { 0x000000C400040530L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleDeclaration2574 = new BitSet(new long[] { 0x000000C400040530L });

-	public static final BitSet FOLLOW_ruleExpression_in_ruleDeclaration2596 = new BitSet(new long[] { 0x0000000000000202L });

-	public static final BitSet FOLLOW_RULE_T_IMPORTANT_in_ruleDeclaration2614 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleDeclaration2631 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleExpression_in_entryRuleExpression2670 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleExpression2680 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleTerm_in_ruleExpression2726 = new BitSet(new long[] { 0x000000CC02040532L });

-	public static final BitSet FOLLOW_ruleSubterm_in_ruleExpression2747 = new BitSet(new long[] { 0x000000CC02040532L });

-	public static final BitSet FOLLOW_ruleSubterm_in_entryRuleSubterm2784 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleSubterm2794 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleOperator_in_ruleSubterm2840 = new BitSet(new long[] { 0x000000C400040530L });

-	public static final BitSet FOLLOW_ruleTerm_in_ruleSubterm2862 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleTerm_in_entryRuleTerm2898 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleTerm2908 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleNumber_in_ruleTerm2956 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_rulePercentage_in_ruleTerm2983 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleLength_in_ruleTerm3010 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleEms_in_ruleTerm3037 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleExs_in_ruleTerm3064 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleAngle_in_ruleTerm3091 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleTime_in_ruleTerm3118 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleFrequency_in_ruleTerm3145 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleName_in_ruleTerm3172 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleStringValue_in_ruleTerm3199 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleUri_in_ruleTerm3226 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleHexColor_in_ruleTerm3253 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleFunction_in_ruleTerm3280 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleTerm3292 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleFunction_in_entryRuleFunction3329 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleFunction3339 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_ruleFunction3381 = new BitSet(new long[] { 0x0000000100000000L });

-	public static final BitSet FOLLOW_32_in_ruleFunction3398 = new BitSet(new long[] { 0x000000C400040530L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleFunction3410 = new BitSet(new long[] { 0x000000C400040530L });

-	public static final BitSet FOLLOW_ruleExpression_in_ruleFunction3432 = new BitSet(new long[] { 0x0000000200000000L });

-	public static final BitSet FOLLOW_33_in_ruleFunction3444 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleName_in_entryRuleName3480 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleName3490 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_ruleName3531 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleNumber_in_entryRuleNumber3571 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleNumber3581 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_ruleNumber3627 = new BitSet(new long[] { 0x0000000000000400L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_ruleNumber3645 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_rulePercentage_in_entryRulePercentage3686 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRulePercentage3696 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_rulePercentage3742 = new BitSet(new long[] { 0x0000000000000400L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_rulePercentage3760 = new BitSet(new long[] { 0x0000000000000800L });

-	public static final BitSet FOLLOW_RULE_PC_UNIT_in_rulePercentage3782 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleLength_in_entryRuleLength3823 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleLength3833 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_ruleLength3879 = new BitSet(new long[] { 0x0000000000000400L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_ruleLength3897 = new BitSet(new long[] { 0x0000000000001000L });

-	public static final BitSet FOLLOW_RULE_LEN_UNIT_in_ruleLength3919 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleEms_in_entryRuleEms3960 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleEms3970 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_ruleEms4016 = new BitSet(new long[] { 0x0000000000000400L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_ruleEms4034 = new BitSet(new long[] { 0x0000000000002000L });

-	public static final BitSet FOLLOW_RULE_EM_UNIT_in_ruleEms4056 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleExs_in_entryRuleExs4097 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleExs4107 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_ruleExs4153 = new BitSet(new long[] { 0x0000000000000400L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_ruleExs4171 = new BitSet(new long[] { 0x0000000000004000L });

-	public static final BitSet FOLLOW_RULE_EX_UNIT_in_ruleExs4193 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleAngle_in_entryRuleAngle4234 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleAngle4244 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_ruleAngle4290 = new BitSet(new long[] { 0x0000000000000400L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_ruleAngle4308 = new BitSet(new long[] { 0x0000000000008000L });

-	public static final BitSet FOLLOW_RULE_ANGLE_UNIT_in_ruleAngle4330 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleTime_in_entryRuleTime4371 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleTime4381 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_ruleTime4427 = new BitSet(new long[] { 0x0000000000000400L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_ruleTime4445 = new BitSet(new long[] { 0x0000000000010000L });

-	public static final BitSet FOLLOW_RULE_TIME_UNIT_in_ruleTime4467 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleFrequency_in_entryRuleFrequency4508 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleFrequency4518 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_ruleFrequency4564 = new BitSet(new long[] { 0x0000000000000400L });

-	public static final BitSet FOLLOW_RULE_T_NUM_in_ruleFrequency4582 = new BitSet(new long[] { 0x0000000000020000L });

-	public static final BitSet FOLLOW_RULE_FREQ_UNIT_in_ruleFrequency4604 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUri_in_entryRuleUri4645 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleUri4655 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_34_in_ruleUri4692 = new BitSet(new long[] { 0x0000000000000030L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleUri4704 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_RULE_STRING_in_ruleUri4722 = new BitSet(new long[] { 0x0000000200000020L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleUri4739 = new BitSet(new long[] { 0x0000000200000000L });

-	public static final BitSet FOLLOW_33_in_ruleUri4752 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleStringValue_in_entryRuleStringValue4788 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleStringValue4798 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_STRING_in_ruleStringValue4839 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleHexColor_in_entryRuleHexColor4879 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleHexColor4889 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_HASH_in_ruleHexColor4930 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleOperator_in_entryRuleOperator4971 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleOperator4982 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_35_in_ruleOperator5021 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleOperator5037 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_25_in_ruleOperator5065 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleOperator5081 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_ruleClass_in_entryRuleClass5129 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleClass5139 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_T_CLASS_in_ruleClass5180 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute5220 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleAttribute5230 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_36_in_ruleAttribute5267 = new BitSet(new long[] { 0x0000000000000120L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleAttribute5279 = new BitSet(new long[] { 0x0000000000000120L });

-	public static final BitSet FOLLOW_RULE_ID_in_ruleAttribute5297 = new BitSet(new long[] { 0x00000E2000000020L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleAttribute5314 = new BitSet(new long[] { 0x00000E2000000020L });

-	public static final BitSet FOLLOW_ruleAttributeValue_in_ruleAttribute5336 = new BitSet(new long[] { 0x0000002000000000L });

-	public static final BitSet FOLLOW_37_in_ruleAttribute5349 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleAttributeValue_in_entryRuleAttributeValue5385 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleAttributeValue5395 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleATTRIBUTE_OP_in_ruleAttributeValue5441 = new BitSet(new long[] { 0x0000000000000130L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleAttributeValue5453 = new BitSet(new long[] { 0x0000000000000130L });

-	public static final BitSet FOLLOW_RULE_ID_in_ruleAttributeValue5473 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_RULE_STRING_in_ruleAttributeValue5493 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_RULE_WS_in_ruleAttributeValue5513 = new BitSet(new long[] { 0x0000000000000022L });

-	public static final BitSet FOLLOW_rulePseudo_in_entryRulePseudo5550 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRulePseudo5560 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_30_in_rulePseudo5597 = new BitSet(new long[] { 0x0000000000000100L });

-	public static final BitSet FOLLOW_RULE_ID_in_rulePseudo5615 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_ID_in_rulePseudo5644 = new BitSet(new long[] { 0x0000000100000000L });

-	public static final BitSet FOLLOW_32_in_rulePseudo5661 = new BitSet(new long[] { 0x0000000200000120L });

-	public static final BitSet FOLLOW_RULE_WS_in_rulePseudo5673 = new BitSet(new long[] { 0x0000000200000120L });

-	public static final BitSet FOLLOW_RULE_ID_in_rulePseudo5692 = new BitSet(new long[] { 0x0000000200000020L });

-	public static final BitSet FOLLOW_RULE_WS_in_rulePseudo5709 = new BitSet(new long[] { 0x0000000200000020L });

-	public static final BitSet FOLLOW_33_in_rulePseudo5724 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleCSSId_in_entryRuleCSSId5762 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleCSSId5772 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_RULE_HASH_in_ruleCSSId5813 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUnaryOperator_in_entryRuleUnaryOperator5853 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_EOF_in_entryRuleUnaryOperator5863 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_ruleUNARY_in_ruleUnaryOperator5908 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_38_in_ruleUNARY5957 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_39_in_ruleUNARY5974 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_40_in_ruleKIND6019 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_39_in_ruleKIND6036 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_41_in_ruleATTRIBUTE_OP6081 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_42_in_ruleATTRIBUTE_OP6098 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_43_in_ruleATTRIBUTE_OP6115 = new BitSet(new long[] { 0x0000000000000002L });

-

-}
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSemanticSequencer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSemanticSequencer.java
deleted file mode 100644
index cfe4d2019f3..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSemanticSequencer.java
+++ /dev/null
@@ -1,670 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.serializer;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.gmfdiag.css.Angle;
-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;
-import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSId;
-import org.eclipse.papyrus.infra.gmfdiag.css.Combinator;
-import org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector;
-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;
-import org.eclipse.papyrus.infra.gmfdiag.css.Ems;
-import org.eclipse.papyrus.infra.gmfdiag.css.Expression;
-import org.eclipse.papyrus.infra.gmfdiag.css.Exs;
-import org.eclipse.papyrus.infra.gmfdiag.css.Frequency;
-import org.eclipse.papyrus.infra.gmfdiag.css.Function;
-import org.eclipse.papyrus.infra.gmfdiag.css.HexColor;
-import org.eclipse.papyrus.infra.gmfdiag.css.Import;
-import org.eclipse.papyrus.infra.gmfdiag.css.Length;
-import org.eclipse.papyrus.infra.gmfdiag.css.Media;
-import org.eclipse.papyrus.infra.gmfdiag.css.Name;
-import org.eclipse.papyrus.infra.gmfdiag.css.Page;
-import org.eclipse.papyrus.infra.gmfdiag.css.Percentage;
-import org.eclipse.papyrus.infra.gmfdiag.css.Pseudo;
-import org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage;
-import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;
-import org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector;
-import org.eclipse.papyrus.infra.gmfdiag.css.StringValue;
-import org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet;
-import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;
-import org.eclipse.papyrus.infra.gmfdiag.css.Time;
-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;
-import org.eclipse.papyrus.infra.gmfdiag.css.Uri;
-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
-import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
-import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
-
-import com.google.inject.Inject;
-
-@SuppressWarnings("all")
-public class CSSSemanticSequencer extends AbstractDelegatingSemanticSequencer {
-
-	@Inject
-	private CSSGrammarAccess grammarAccess;
-
-	@Override
-	public void createSequence(EObject context, EObject semanticObject) {
-		if (semanticObject.eClass().getEPackage() == CssPackage.eINSTANCE) {
-			switch (semanticObject.eClass().getClassifierID()) {
-			case CssPackage.ANGLE:
-				if (context == grammarAccess.getAngleRule() ||
-						context == grammarAccess.getTermRule()) {
-					sequence_Angle(context, (Angle) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.ATTRIBUTE:
-				if (context == grammarAccess.getAttributeRule() ||
-						context == grammarAccess.getSelectorConditionRule()) {
-					sequence_Attribute(context, (Attribute) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.ATTRIBUTE_VALUE:
-				if (context == grammarAccess.getAttributeValueRule()) {
-					sequence_AttributeValue(context, (AttributeValue) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.CSS_ID:
-				if (context == grammarAccess.getCSSIdRule() ||
-						context == grammarAccess.getSelectorConditionRule()) {
-					sequence_CSSId(context, (CSSId) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.CLASS:
-				if (context == grammarAccess.getClassRule() ||
-						context == grammarAccess.getSelectorConditionRule()) {
-					sequence_Class(context, (org.eclipse.papyrus.infra.gmfdiag.css.Class) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.COMBINATOR:
-				if (context == grammarAccess.getCombinatorRule()) {
-					sequence_Combinator(context, (Combinator) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.COMPOSITE_SELECTOR:
-				if (context == grammarAccess.getCompositeSelectorRule() ||
-						context == grammarAccess.getSelectorRule()) {
-					sequence_CompositeSelector(context, (CompositeSelector) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.DECLARATION:
-				if (context == grammarAccess.getDeclarationRule()) {
-					sequence_Declaration(context, (Declaration) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.EMS:
-				if (context == grammarAccess.getEmsRule() ||
-						context == grammarAccess.getTermRule()) {
-					sequence_Ems(context, (Ems) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.EXPRESSION:
-				if (context == grammarAccess.getExpressionRule()) {
-					sequence_Expression(context, (Expression) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.EXS:
-				if (context == grammarAccess.getExsRule() ||
-						context == grammarAccess.getTermRule()) {
-					sequence_Exs(context, (Exs) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.FREQUENCY:
-				if (context == grammarAccess.getFrequencyRule() ||
-						context == grammarAccess.getTermRule()) {
-					sequence_Frequency(context, (Frequency) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.FUNCTION:
-				if (context == grammarAccess.getFunctionRule() ||
-						context == grammarAccess.getTermRule()) {
-					sequence_Function(context, (Function) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.HEX_COLOR:
-				if (context == grammarAccess.getHexColorRule() ||
-						context == grammarAccess.getTermRule()) {
-					sequence_HexColor(context, (HexColor) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.IMPORT:
-				if (context == grammarAccess.getImportRule()) {
-					sequence_Import(context, (Import) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.LENGTH:
-				if (context == grammarAccess.getLengthRule() ||
-						context == grammarAccess.getTermRule()) {
-					sequence_Length(context, (Length) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.MEDIA:
-				if (context == grammarAccess.getContentRule() ||
-						context == grammarAccess.getMediaRule()) {
-					sequence_Media(context, (Media) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.NAME:
-				if (context == grammarAccess.getNameRule() ||
-						context == grammarAccess.getTermRule()) {
-					sequence_Name(context, (Name) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.NUMBER:
-				if (context == grammarAccess.getNumberRule() ||
-						context == grammarAccess.getTermRule()) {
-					sequence_Number(context, (org.eclipse.papyrus.infra.gmfdiag.css.Number) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.PAGE:
-				if (context == grammarAccess.getContentRule() ||
-						context == grammarAccess.getPageRule()) {
-					sequence_Page(context, (Page) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.PERCENTAGE:
-				if (context == grammarAccess.getPercentageRule() ||
-						context == grammarAccess.getTermRule()) {
-					sequence_Percentage(context, (Percentage) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.PSEUDO:
-				if (context == grammarAccess.getPseudoRule() ||
-						context == grammarAccess.getSelectorConditionRule()) {
-					sequence_Pseudo(context, (Pseudo) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.PSEUDO_PAGE:
-				if (context == grammarAccess.getPseudoPageRule()) {
-					sequence_PseudoPage(context, (PseudoPage) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.RULESET:
-				if (context == grammarAccess.getContentRule() ||
-						context == grammarAccess.getRulesetRule()) {
-					sequence_Ruleset(context, (Ruleset) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.SIMPLE_SELECTOR:
-				if (context == grammarAccess.getSelectorRule() ||
-						context == grammarAccess.getSimpleSelectorRule()) {
-					sequence_SimpleSelector(context, (SimpleSelector) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.STRING_VALUE:
-				if (context == grammarAccess.getStringValueRule() ||
-						context == grammarAccess.getTermRule()) {
-					sequence_StringValue(context, (StringValue) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.STYLESHEET:
-				if (context == grammarAccess.getStylesheetRule()) {
-					sequence_Stylesheet(context, (Stylesheet) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.SUBTERM:
-				if (context == grammarAccess.getSubtermRule()) {
-					sequence_Subterm(context, (Subterm) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.TIME:
-				if (context == grammarAccess.getTermRule() ||
-						context == grammarAccess.getTimeRule()) {
-					sequence_Time(context, (Time) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.UNARY_OPERATOR:
-				if (context == grammarAccess.getUnaryOperatorRule()) {
-					sequence_UnaryOperator(context, (UnaryOperator) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			case CssPackage.URI:
-				if (context == grammarAccess.getTermRule() ||
-						context == grammarAccess.getUriRule()) {
-					sequence_Uri(context, (Uri) semanticObject);
-					return;
-				} else {
-					break;
-				}
-			}
-		}
-		if (errorAcceptor != null) {
-			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
-		}
-	}
-
-	/**
-	 * Constraint:
-	 * (op=UnaryOperator? value=T_NUM unit=ANGLE_UNIT)
-	 */
-	protected void sequence_Angle(EObject context, Angle semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (operator=ATTRIBUTE_OP (value=ID | value=STRING))
-	 */
-	protected void sequence_AttributeValue(EObject context, AttributeValue semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (name=ID value=AttributeValue?)
-	 */
-	protected void sequence_Attribute(EObject context, Attribute semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * value=HASH
-	 */
-	protected void sequence_CSSId(EObject context, CSSId semanticObject) {
-		if (errorAcceptor != null) {
-			if (transientValues.isValueTransient(semanticObject, CssPackage.Literals.CSS_ID__VALUE) == ValueTransient.YES) {
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CssPackage.Literals.CSS_ID__VALUE));
-			}
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getCSSIdAccess().getValueHASHTerminalRuleCall_0(), semanticObject.getValue());
-		feeder.finish();
-	}
-
-
-	/**
-	 * Constraint:
-	 * class=T_CLASS
-	 */
-	protected void sequence_Class(EObject context, org.eclipse.papyrus.infra.gmfdiag.css.Class semanticObject) {
-		if (errorAcceptor != null) {
-			if (transientValues.isValueTransient(semanticObject, CssPackage.Literals.CLASS__CLASS) == ValueTransient.YES) {
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CssPackage.Literals.CLASS__CLASS));
-			}
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getClassAccess().getClassT_CLASSTerminalRuleCall_0(), semanticObject.getClass_());
-		feeder.finish();
-	}
-
-
-	/**
-	 * Constraint:
-	 * kind=KIND
-	 */
-	protected void sequence_Combinator(EObject context, Combinator semanticObject) {
-		if (errorAcceptor != null) {
-			if (transientValues.isValueTransient(semanticObject, CssPackage.Literals.COMBINATOR__KIND) == ValueTransient.YES) {
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CssPackage.Literals.COMBINATOR__KIND));
-			}
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getCombinatorAccess().getKindKINDEnumRuleCall_0_0(), semanticObject.getKind());
-		feeder.finish();
-	}
-
-
-	/**
-	 * Constraint:
-	 * (left=SimpleSelector combinator=Combinator? right=Selector)
-	 */
-	protected void sequence_CompositeSelector(EObject context, CompositeSelector semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (property=ID expression=Expression important?=T_IMPORTANT?)
-	 */
-	protected void sequence_Declaration(EObject context, Declaration semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (op=UnaryOperator? value=T_NUM unit=EM_UNIT)
-	 */
-	protected void sequence_Ems(EObject context, Ems semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (terms=Term subterms+=Subterm*)
-	 */
-	protected void sequence_Expression(EObject context, Expression semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (op=UnaryOperator? value=T_NUM unit=EX_UNIT)
-	 */
-	protected void sequence_Exs(EObject context, Exs semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (op=UnaryOperator? value=T_NUM unit=FREQ_UNIT)
-	 */
-	protected void sequence_Frequency(EObject context, Frequency semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (name=ID args=Expression)
-	 */
-	protected void sequence_Function(EObject context, Function semanticObject) {
-		if (errorAcceptor != null) {
-			if (transientValues.isValueTransient(semanticObject, CssPackage.Literals.FUNCTION__NAME) == ValueTransient.YES) {
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CssPackage.Literals.FUNCTION__NAME));
-			}
-			if (transientValues.isValueTransient(semanticObject, CssPackage.Literals.FUNCTION__ARGS) == ValueTransient.YES) {
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CssPackage.Literals.FUNCTION__ARGS));
-			}
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getFunctionAccess().getNameIDTerminalRuleCall_0_0(), semanticObject.getName());
-		feeder.accept(grammarAccess.getFunctionAccess().getArgsExpressionParserRuleCall_3_0(), semanticObject.getArgs());
-		feeder.finish();
-	}
-
-
-	/**
-	 * Constraint:
-	 * value=HASH
-	 */
-	protected void sequence_HexColor(EObject context, HexColor semanticObject) {
-		if (errorAcceptor != null) {
-			if (transientValues.isValueTransient(semanticObject, CssPackage.Literals.HEX_COLOR__VALUE) == ValueTransient.YES) {
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CssPackage.Literals.HEX_COLOR__VALUE));
-			}
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getHexColorAccess().getValueHASHTerminalRuleCall_0(), semanticObject.getValue());
-		feeder.finish();
-	}
-
-
-	/**
-	 * Constraint:
-	 * ((string=STRING | uri=Uri) (media+=ID media+=ID*)?)
-	 */
-	protected void sequence_Import(EObject context, Import semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (op=UnaryOperator? value=T_NUM unit=LEN_UNIT)
-	 */
-	protected void sequence_Length(EObject context, Length semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (media+=ID media+=ID* rules+=Ruleset*)
-	 */
-	protected void sequence_Media(EObject context, Media semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * value=ID
-	 */
-	protected void sequence_Name(EObject context, Name semanticObject) {
-		if (errorAcceptor != null) {
-			if (transientValues.isValueTransient(semanticObject, CssPackage.Literals.NAME__VALUE) == ValueTransient.YES) {
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CssPackage.Literals.NAME__VALUE));
-			}
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getNameAccess().getValueIDTerminalRuleCall_0(), semanticObject.getValue());
-		feeder.finish();
-	}
-
-
-	/**
-	 * Constraint:
-	 * (op=UnaryOperator? value=T_NUM)
-	 */
-	protected void sequence_Number(EObject context, org.eclipse.papyrus.infra.gmfdiag.css.Number semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (pseudo=PseudoPage? declarations+=Declaration? declarations+=Declaration*)
-	 */
-	protected void sequence_Page(EObject context, Page semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (op=UnaryOperator? value=T_NUM unit=PC_UNIT)
-	 */
-	protected void sequence_Percentage(EObject context, Percentage semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * id=ID
-	 */
-	protected void sequence_PseudoPage(EObject context, PseudoPage semanticObject) {
-		if (errorAcceptor != null) {
-			if (transientValues.isValueTransient(semanticObject, CssPackage.Literals.PSEUDO_PAGE__ID) == ValueTransient.YES) {
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CssPackage.Literals.PSEUDO_PAGE__ID));
-			}
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getPseudoPageAccess().getIdIDTerminalRuleCall_1_0(), semanticObject.getId());
-		feeder.finish();
-	}
-
-
-	/**
-	 * Constraint:
-	 * (pseudo=ID | (pseudo=ID args=ID?))
-	 */
-	protected void sequence_Pseudo(EObject context, Pseudo semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (selectors+=Selector selectors+=Selector* properties+=Declaration? properties+=Declaration*)
-	 */
-	protected void sequence_Ruleset(EObject context, Ruleset semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (((elementName=ID | elementName='*') condition+=SelectorCondition*) | condition+=SelectorCondition+)
-	 */
-	protected void sequence_SimpleSelector(EObject context, SimpleSelector semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * value=STRING
-	 */
-	protected void sequence_StringValue(EObject context, StringValue semanticObject) {
-		if (errorAcceptor != null) {
-			if (transientValues.isValueTransient(semanticObject, CssPackage.Literals.STRING_VALUE__VALUE) == ValueTransient.YES) {
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CssPackage.Literals.STRING_VALUE__VALUE));
-			}
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getStringValueAccess().getValueSTRINGTerminalRuleCall_0(), semanticObject.getValue());
-		feeder.finish();
-	}
-
-
-	/**
-	 * Constraint:
-	 * (charset=STRING? imports+=Import* contents+=Content*)
-	 */
-	protected void sequence_Stylesheet(EObject context, Stylesheet semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (operator=Operator? term=Term)
-	 */
-	protected void sequence_Subterm(EObject context, Subterm semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * (op=UnaryOperator? value=T_NUM unit=TIME_UNIT)
-	 */
-	protected void sequence_Time(EObject context, Time semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-
-
-	/**
-	 * Constraint:
-	 * operator=UNARY
-	 */
-	protected void sequence_UnaryOperator(EObject context, UnaryOperator semanticObject) {
-		if (errorAcceptor != null) {
-			if (transientValues.isValueTransient(semanticObject, CssPackage.Literals.UNARY_OPERATOR__OPERATOR) == ValueTransient.YES) {
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CssPackage.Literals.UNARY_OPERATOR__OPERATOR));
-			}
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getUnaryOperatorAccess().getOperatorUNARYEnumRuleCall_0(), semanticObject.getOperator());
-		feeder.finish();
-	}
-
-
-	/**
-	 * Constraint:
-	 * value=STRING
-	 */
-	protected void sequence_Uri(EObject context, Uri semanticObject) {
-		if (errorAcceptor != null) {
-			if (transientValues.isValueTransient(semanticObject, CssPackage.Literals.URI__VALUE) == ValueTransient.YES) {
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CssPackage.Literals.URI__VALUE));
-			}
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getUriAccess().getValueSTRINGTerminalRuleCall_2_0(), semanticObject.getValue());
-		feeder.finish();
-	}
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSyntacticSequencer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSyntacticSequencer.java
deleted file mode 100644
index e785b1990af..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSyntacticSequencer.java
+++ /dev/null
@@ -1,615 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.serializer;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
-import org.eclipse.xtext.IGrammarAccess;
-import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.nodemodel.INode;
-import org.eclipse.xtext.serializer.analysis.GrammarAlias.AbstractElementAlias;
-import org.eclipse.xtext.serializer.analysis.GrammarAlias.AlternativeAlias;
-import org.eclipse.xtext.serializer.analysis.GrammarAlias.GroupAlias;
-import org.eclipse.xtext.serializer.analysis.GrammarAlias.TokenAlias;
-import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynNavigable;
-import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition;
-import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;
-
-import com.google.inject.Inject;
-
-@SuppressWarnings("all")
-public class CSSSyntacticSequencer extends AbstractSyntacticSequencer {
-
-	protected CSSGrammarAccess grammarAccess;
-	protected AbstractElementAlias match_AttributeValue_WSTerminalRuleCall_1_a;
-	protected AbstractElementAlias match_AttributeValue_WSTerminalRuleCall_3_a;
-	protected AbstractElementAlias match_Attribute_WSTerminalRuleCall_1_a;
-	protected AbstractElementAlias match_Attribute_WSTerminalRuleCall_3_a;
-	protected AbstractElementAlias match_Combinator_WSTerminalRuleCall_1_a;
-	protected AbstractElementAlias match_CompositeSelector_WSTerminalRuleCall_1_0_p;
-	protected AbstractElementAlias match_CompositeSelector_WSTerminalRuleCall_1_1_0_a;
-	protected AbstractElementAlias match_Declaration_WSTerminalRuleCall_1_a;
-	protected AbstractElementAlias match_Declaration_WSTerminalRuleCall_3_a;
-	protected AbstractElementAlias match_Declaration_WSTerminalRuleCall_5_1_a;
-	protected AbstractElementAlias match_Function_WSTerminalRuleCall_2_a;
-	protected AbstractElementAlias match_Import_WSTerminalRuleCall_1_0_0_a;
-	protected AbstractElementAlias match_Import_WSTerminalRuleCall_2_a;
-	protected AbstractElementAlias match_Import_WSTerminalRuleCall_3_1_a;
-	protected AbstractElementAlias match_Import_WSTerminalRuleCall_3_2_1_a;
-	protected AbstractElementAlias match_Import_WSTerminalRuleCall_5_a;
-	protected AbstractElementAlias match_Media_WSTerminalRuleCall_3_a;
-	protected AbstractElementAlias match_Media_WSTerminalRuleCall_4_1_a;
-	protected AbstractElementAlias match_Media_WSTerminalRuleCall_6_a;
-	protected AbstractElementAlias match_Media_WSTerminalRuleCall_9_a;
-	protected AbstractElementAlias match_Page_WSTerminalRuleCall_2_a;
-	protected AbstractElementAlias match_Page_WSTerminalRuleCall_5_a;
-	protected AbstractElementAlias match_Page_WSTerminalRuleCall_9_a;
-	protected AbstractElementAlias match_Page___SemicolonKeyword_7_0_WSTerminalRuleCall_7_1_a__a;
-	protected AbstractElementAlias match_Page___SemicolonKeyword_7_0_WSTerminalRuleCall_7_1_a__p;
-	protected AbstractElementAlias match_PseudoPage_WSTerminalRuleCall_2_a;
-	protected AbstractElementAlias match_Pseudo_WSTerminalRuleCall_1_1_2_a;
-	protected AbstractElementAlias match_Pseudo_WSTerminalRuleCall_1_1_3_1_a;
-	protected AbstractElementAlias match_Ruleset_WSTerminalRuleCall_1_1_a;
-	protected AbstractElementAlias match_Ruleset_WSTerminalRuleCall_3_a;
-	protected AbstractElementAlias match_Ruleset_WSTerminalRuleCall_7_a;
-	protected AbstractElementAlias match_Ruleset___SemicolonKeyword_5_0_WSTerminalRuleCall_5_1_a__a;
-	protected AbstractElementAlias match_Ruleset___SemicolonKeyword_5_0_WSTerminalRuleCall_5_1_a__p;
-	protected AbstractElementAlias match_Selector_WSTerminalRuleCall_0_1_a;
-	protected AbstractElementAlias match_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__a;
-	protected AbstractElementAlias match_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__p;
-	protected AbstractElementAlias match_Stylesheet_____CDCTerminalRuleCall_2_1_1_0_WSTerminalRuleCall_2_1_1_1_a___or___CDOTerminalRuleCall_2_1_0_0_WSTerminalRuleCall_2_1_0_1_a____a;
-	protected AbstractElementAlias match_Stylesheet_____CDCTerminalRuleCall_3_1_1_0_WSTerminalRuleCall_3_1_1_1_a___or___CDOTerminalRuleCall_3_1_0_0_WSTerminalRuleCall_3_1_0_1_a____a;
-	protected AbstractElementAlias match_Term_WSTerminalRuleCall_1_a;
-	protected AbstractElementAlias match_Uri_WSTerminalRuleCall_1_q;
-	protected AbstractElementAlias match_Uri_WSTerminalRuleCall_3_q;
-
-	@Inject
-	protected void init(IGrammarAccess access) {
-		grammarAccess = (CSSGrammarAccess) access;
-		match_AttributeValue_WSTerminalRuleCall_1_a = new TokenAlias(true, true, grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_1());
-		match_AttributeValue_WSTerminalRuleCall_3_a = new TokenAlias(true, true, grammarAccess.getAttributeValueAccess().getWSTerminalRuleCall_3());
-		match_Attribute_WSTerminalRuleCall_1_a = new TokenAlias(true, true, grammarAccess.getAttributeAccess().getWSTerminalRuleCall_1());
-		match_Attribute_WSTerminalRuleCall_3_a = new TokenAlias(true, true, grammarAccess.getAttributeAccess().getWSTerminalRuleCall_3());
-		match_Combinator_WSTerminalRuleCall_1_a = new TokenAlias(true, true, grammarAccess.getCombinatorAccess().getWSTerminalRuleCall_1());
-		match_CompositeSelector_WSTerminalRuleCall_1_0_p = new TokenAlias(true, false, grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_0());
-		match_CompositeSelector_WSTerminalRuleCall_1_1_0_a = new TokenAlias(true, true, grammarAccess.getCompositeSelectorAccess().getWSTerminalRuleCall_1_1_0());
-		match_Declaration_WSTerminalRuleCall_1_a = new TokenAlias(true, true, grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_1());
-		match_Declaration_WSTerminalRuleCall_3_a = new TokenAlias(true, true, grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_3());
-		match_Declaration_WSTerminalRuleCall_5_1_a = new TokenAlias(true, true, grammarAccess.getDeclarationAccess().getWSTerminalRuleCall_5_1());
-		match_Function_WSTerminalRuleCall_2_a = new TokenAlias(true, true, grammarAccess.getFunctionAccess().getWSTerminalRuleCall_2());
-		match_Import_WSTerminalRuleCall_1_0_0_a = new TokenAlias(true, true, grammarAccess.getImportAccess().getWSTerminalRuleCall_1_0_0());
-		match_Import_WSTerminalRuleCall_2_a = new TokenAlias(true, true, grammarAccess.getImportAccess().getWSTerminalRuleCall_2());
-		match_Import_WSTerminalRuleCall_3_1_a = new TokenAlias(true, true, grammarAccess.getImportAccess().getWSTerminalRuleCall_3_1());
-		match_Import_WSTerminalRuleCall_3_2_1_a = new TokenAlias(true, true, grammarAccess.getImportAccess().getWSTerminalRuleCall_3_2_1());
-		match_Import_WSTerminalRuleCall_5_a = new TokenAlias(true, true, grammarAccess.getImportAccess().getWSTerminalRuleCall_5());
-		match_Media_WSTerminalRuleCall_3_a = new TokenAlias(true, true, grammarAccess.getMediaAccess().getWSTerminalRuleCall_3());
-		match_Media_WSTerminalRuleCall_4_1_a = new TokenAlias(true, true, grammarAccess.getMediaAccess().getWSTerminalRuleCall_4_1());
-		match_Media_WSTerminalRuleCall_6_a = new TokenAlias(true, true, grammarAccess.getMediaAccess().getWSTerminalRuleCall_6());
-		match_Media_WSTerminalRuleCall_9_a = new TokenAlias(true, true, grammarAccess.getMediaAccess().getWSTerminalRuleCall_9());
-		match_Page_WSTerminalRuleCall_2_a = new TokenAlias(true, true, grammarAccess.getPageAccess().getWSTerminalRuleCall_2());
-		match_Page_WSTerminalRuleCall_5_a = new TokenAlias(true, true, grammarAccess.getPageAccess().getWSTerminalRuleCall_5());
-		match_Page_WSTerminalRuleCall_9_a = new TokenAlias(true, true, grammarAccess.getPageAccess().getWSTerminalRuleCall_9());
-		match_Page___SemicolonKeyword_7_0_WSTerminalRuleCall_7_1_a__a = new GroupAlias(true, true, new TokenAlias(false, false, grammarAccess.getPageAccess().getSemicolonKeyword_7_0()), new TokenAlias(true, true, grammarAccess.getPageAccess()
-				.getWSTerminalRuleCall_7_1()));
-		match_Page___SemicolonKeyword_7_0_WSTerminalRuleCall_7_1_a__p = new GroupAlias(true, false, new TokenAlias(false, false, grammarAccess.getPageAccess().getSemicolonKeyword_7_0()), new TokenAlias(true, true, grammarAccess.getPageAccess()
-				.getWSTerminalRuleCall_7_1()));
-		match_PseudoPage_WSTerminalRuleCall_2_a = new TokenAlias(true, true, grammarAccess.getPseudoPageAccess().getWSTerminalRuleCall_2());
-		match_Pseudo_WSTerminalRuleCall_1_1_2_a = new TokenAlias(true, true, grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_2());
-		match_Pseudo_WSTerminalRuleCall_1_1_3_1_a = new TokenAlias(true, true, grammarAccess.getPseudoAccess().getWSTerminalRuleCall_1_1_3_1());
-		match_Ruleset_WSTerminalRuleCall_1_1_a = new TokenAlias(true, true, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_1());
-		match_Ruleset_WSTerminalRuleCall_3_a = new TokenAlias(true, true, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_3());
-		match_Ruleset_WSTerminalRuleCall_7_a = new TokenAlias(true, true, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_7());
-		match_Ruleset___SemicolonKeyword_5_0_WSTerminalRuleCall_5_1_a__a = new GroupAlias(true, true, new TokenAlias(false, false, grammarAccess.getRulesetAccess().getSemicolonKeyword_5_0()), new TokenAlias(true, true, grammarAccess.getRulesetAccess()
-				.getWSTerminalRuleCall_5_1()));
-		match_Ruleset___SemicolonKeyword_5_0_WSTerminalRuleCall_5_1_a__p = new GroupAlias(true, false, new TokenAlias(false, false, grammarAccess.getRulesetAccess().getSemicolonKeyword_5_0()), new TokenAlias(true, true, grammarAccess.getRulesetAccess()
-				.getWSTerminalRuleCall_5_1()));
-		match_Selector_WSTerminalRuleCall_0_1_a = new TokenAlias(true, true, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_0_1());
-		match_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__a = new AlternativeAlias(true, true, new TokenAlias(false, false, grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_1_2()), new TokenAlias(false,
-				false, grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_1_1()), new TokenAlias(false, false, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_1_0()));
-		match_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__p = new AlternativeAlias(true, false, new TokenAlias(false, false, grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_1_2()), new TokenAlias(
-				false, false, grammarAccess.getStylesheetAccess().getCDOTerminalRuleCall_1_1()), new TokenAlias(false, false, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_1_0()));
-		match_Stylesheet_____CDCTerminalRuleCall_2_1_1_0_WSTerminalRuleCall_2_1_1_1_a___or___CDOTerminalRuleCall_2_1_0_0_WSTerminalRuleCall_2_1_0_1_a____a = new AlternativeAlias(true, true, new GroupAlias(false, false, new TokenAlias(false, false,
-				grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_2_1_1_0()), new TokenAlias(true, true, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_1_1())), new GroupAlias(false, false, new TokenAlias(false, false, grammarAccess
-				.getStylesheetAccess().getCDOTerminalRuleCall_2_1_0_0()), new TokenAlias(true, true, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_2_1_0_1())));
-		match_Stylesheet_____CDCTerminalRuleCall_3_1_1_0_WSTerminalRuleCall_3_1_1_1_a___or___CDOTerminalRuleCall_3_1_0_0_WSTerminalRuleCall_3_1_0_1_a____a = new AlternativeAlias(true, true, new GroupAlias(false, false, new TokenAlias(false, false,
-				grammarAccess.getStylesheetAccess().getCDCTerminalRuleCall_3_1_1_0()), new TokenAlias(true, true, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_1_1())), new GroupAlias(false, false, new TokenAlias(false, false, grammarAccess
-				.getStylesheetAccess().getCDOTerminalRuleCall_3_1_0_0()), new TokenAlias(true, true, grammarAccess.getStylesheetAccess().getWSTerminalRuleCall_3_1_0_1())));
-		match_Term_WSTerminalRuleCall_1_a = new TokenAlias(true, true, grammarAccess.getTermAccess().getWSTerminalRuleCall_1());
-		match_Uri_WSTerminalRuleCall_1_q = new TokenAlias(false, true, grammarAccess.getUriAccess().getWSTerminalRuleCall_1());
-		match_Uri_WSTerminalRuleCall_3_q = new TokenAlias(false, true, grammarAccess.getUriAccess().getWSTerminalRuleCall_3());
-	}
-
-	@Override
-	protected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {
-		if (ruleCall.getRule() == grammarAccess.getCDCRule()) {
-			return getCDCToken(semanticObject, ruleCall, node);
-		} else if (ruleCall.getRule() == grammarAccess.getCDORule()) {
-			return getCDOToken(semanticObject, ruleCall, node);
-		} else if (ruleCall.getRule() == grammarAccess.getT_IMPORTANTRule()) {
-			return getT_IMPORTANTToken(semanticObject, ruleCall, node);
-		} else if (ruleCall.getRule() == grammarAccess.getWSRule()) {
-			return getWSToken(semanticObject, ruleCall, node);
-		}
-		return "";
-	}
-
-	/**
-	 * terminal CDC:
-	 * '-->';
-	 */
-	protected String getCDCToken(EObject semanticObject, RuleCall ruleCall, INode node) {
-		if (node != null) {
-			return getTokenText(node);
-		}
-		return "-->";
-	}
-
-	/**
-	 * terminal CDO:
-	 * '<!--';
-	 */
-	protected String getCDOToken(EObject semanticObject, RuleCall ruleCall, INode node) {
-		if (node != null) {
-			return getTokenText(node);
-		}
-		return "<!--";
-	}
-
-	/**
-	 * terminal T_IMPORTANT:
-	 * '!important';
-	 */
-	protected String getT_IMPORTANTToken(EObject semanticObject, RuleCall ruleCall, INode node) {
-		if (node != null) {
-			return getTokenText(node);
-		}
-		return "!important";
-	}
-
-	/**
-	 * terminal WS:
-	 * (' ' | '\t' | '\r' | '\n')+;
-	 */
-	protected String getWSToken(EObject semanticObject, RuleCall ruleCall, INode node) {
-		if (node != null) {
-			return getTokenText(node);
-		}
-		return " ";
-	}
-
-	@Override
-	protected void emitUnassignedTokens(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {
-		if (transition.getAmbiguousSyntaxes().isEmpty()) {
-			return;
-		}
-		List<INode> transitionNodes = collectNodes(fromNode, toNode);
-		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
-			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			if (match_AttributeValue_WSTerminalRuleCall_1_a.equals(syntax)) {
-				emit_AttributeValue_WSTerminalRuleCall_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_AttributeValue_WSTerminalRuleCall_3_a.equals(syntax)) {
-				emit_AttributeValue_WSTerminalRuleCall_3_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Attribute_WSTerminalRuleCall_1_a.equals(syntax)) {
-				emit_Attribute_WSTerminalRuleCall_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Attribute_WSTerminalRuleCall_3_a.equals(syntax)) {
-				emit_Attribute_WSTerminalRuleCall_3_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Combinator_WSTerminalRuleCall_1_a.equals(syntax)) {
-				emit_Combinator_WSTerminalRuleCall_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_CompositeSelector_WSTerminalRuleCall_1_0_p.equals(syntax)) {
-				emit_CompositeSelector_WSTerminalRuleCall_1_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_CompositeSelector_WSTerminalRuleCall_1_1_0_a.equals(syntax)) {
-				emit_CompositeSelector_WSTerminalRuleCall_1_1_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Declaration_WSTerminalRuleCall_1_a.equals(syntax)) {
-				emit_Declaration_WSTerminalRuleCall_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Declaration_WSTerminalRuleCall_3_a.equals(syntax)) {
-				emit_Declaration_WSTerminalRuleCall_3_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Declaration_WSTerminalRuleCall_5_1_a.equals(syntax)) {
-				emit_Declaration_WSTerminalRuleCall_5_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Function_WSTerminalRuleCall_2_a.equals(syntax)) {
-				emit_Function_WSTerminalRuleCall_2_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Import_WSTerminalRuleCall_1_0_0_a.equals(syntax)) {
-				emit_Import_WSTerminalRuleCall_1_0_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Import_WSTerminalRuleCall_2_a.equals(syntax)) {
-				emit_Import_WSTerminalRuleCall_2_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Import_WSTerminalRuleCall_3_1_a.equals(syntax)) {
-				emit_Import_WSTerminalRuleCall_3_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Import_WSTerminalRuleCall_3_2_1_a.equals(syntax)) {
-				emit_Import_WSTerminalRuleCall_3_2_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Import_WSTerminalRuleCall_5_a.equals(syntax)) {
-				emit_Import_WSTerminalRuleCall_5_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Media_WSTerminalRuleCall_3_a.equals(syntax)) {
-				emit_Media_WSTerminalRuleCall_3_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Media_WSTerminalRuleCall_4_1_a.equals(syntax)) {
-				emit_Media_WSTerminalRuleCall_4_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Media_WSTerminalRuleCall_6_a.equals(syntax)) {
-				emit_Media_WSTerminalRuleCall_6_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Media_WSTerminalRuleCall_9_a.equals(syntax)) {
-				emit_Media_WSTerminalRuleCall_9_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Page_WSTerminalRuleCall_2_a.equals(syntax)) {
-				emit_Page_WSTerminalRuleCall_2_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Page_WSTerminalRuleCall_5_a.equals(syntax)) {
-				emit_Page_WSTerminalRuleCall_5_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Page_WSTerminalRuleCall_9_a.equals(syntax)) {
-				emit_Page_WSTerminalRuleCall_9_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Page___SemicolonKeyword_7_0_WSTerminalRuleCall_7_1_a__a.equals(syntax)) {
-				emit_Page___SemicolonKeyword_7_0_WSTerminalRuleCall_7_1_a__a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Page___SemicolonKeyword_7_0_WSTerminalRuleCall_7_1_a__p.equals(syntax)) {
-				emit_Page___SemicolonKeyword_7_0_WSTerminalRuleCall_7_1_a__p(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_PseudoPage_WSTerminalRuleCall_2_a.equals(syntax)) {
-				emit_PseudoPage_WSTerminalRuleCall_2_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Pseudo_WSTerminalRuleCall_1_1_2_a.equals(syntax)) {
-				emit_Pseudo_WSTerminalRuleCall_1_1_2_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Pseudo_WSTerminalRuleCall_1_1_3_1_a.equals(syntax)) {
-				emit_Pseudo_WSTerminalRuleCall_1_1_3_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Ruleset_WSTerminalRuleCall_1_1_a.equals(syntax)) {
-				emit_Ruleset_WSTerminalRuleCall_1_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Ruleset_WSTerminalRuleCall_3_a.equals(syntax)) {
-				emit_Ruleset_WSTerminalRuleCall_3_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Ruleset_WSTerminalRuleCall_7_a.equals(syntax)) {
-				emit_Ruleset_WSTerminalRuleCall_7_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Ruleset___SemicolonKeyword_5_0_WSTerminalRuleCall_5_1_a__a.equals(syntax)) {
-				emit_Ruleset___SemicolonKeyword_5_0_WSTerminalRuleCall_5_1_a__a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Ruleset___SemicolonKeyword_5_0_WSTerminalRuleCall_5_1_a__p.equals(syntax)) {
-				emit_Ruleset___SemicolonKeyword_5_0_WSTerminalRuleCall_5_1_a__p(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Selector_WSTerminalRuleCall_0_1_a.equals(syntax)) {
-				emit_Selector_WSTerminalRuleCall_0_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__a.equals(syntax)) {
-				emit_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__p.equals(syntax)) {
-				emit_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__p(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Stylesheet_____CDCTerminalRuleCall_2_1_1_0_WSTerminalRuleCall_2_1_1_1_a___or___CDOTerminalRuleCall_2_1_0_0_WSTerminalRuleCall_2_1_0_1_a____a.equals(syntax)) {
-				emit_Stylesheet_____CDCTerminalRuleCall_2_1_1_0_WSTerminalRuleCall_2_1_1_1_a___or___CDOTerminalRuleCall_2_1_0_0_WSTerminalRuleCall_2_1_0_1_a____a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Stylesheet_____CDCTerminalRuleCall_3_1_1_0_WSTerminalRuleCall_3_1_1_1_a___or___CDOTerminalRuleCall_3_1_0_0_WSTerminalRuleCall_3_1_0_1_a____a.equals(syntax)) {
-				emit_Stylesheet_____CDCTerminalRuleCall_3_1_1_0_WSTerminalRuleCall_3_1_1_1_a___or___CDOTerminalRuleCall_3_1_0_0_WSTerminalRuleCall_3_1_0_1_a____a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Term_WSTerminalRuleCall_1_a.equals(syntax)) {
-				emit_Term_WSTerminalRuleCall_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Uri_WSTerminalRuleCall_1_q.equals(syntax)) {
-				emit_Uri_WSTerminalRuleCall_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else if (match_Uri_WSTerminalRuleCall_3_q.equals(syntax)) {
-				emit_Uri_WSTerminalRuleCall_3_q(semanticObject, getLastNavigableState(), syntaxNodes);
-			} else {
-				acceptNodes(getLastNavigableState(), syntaxNodes);
-			}
-		}
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_AttributeValue_WSTerminalRuleCall_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_AttributeValue_WSTerminalRuleCall_3_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Attribute_WSTerminalRuleCall_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Attribute_WSTerminalRuleCall_3_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Combinator_WSTerminalRuleCall_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS+
-	 */
-	protected void emit_CompositeSelector_WSTerminalRuleCall_1_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_CompositeSelector_WSTerminalRuleCall_1_1_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Declaration_WSTerminalRuleCall_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Declaration_WSTerminalRuleCall_3_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Declaration_WSTerminalRuleCall_5_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Function_WSTerminalRuleCall_2_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Import_WSTerminalRuleCall_1_0_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Import_WSTerminalRuleCall_2_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Import_WSTerminalRuleCall_3_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Import_WSTerminalRuleCall_3_2_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Import_WSTerminalRuleCall_5_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Media_WSTerminalRuleCall_3_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Media_WSTerminalRuleCall_4_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Media_WSTerminalRuleCall_6_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Media_WSTerminalRuleCall_9_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Page_WSTerminalRuleCall_2_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Page_WSTerminalRuleCall_5_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Page_WSTerminalRuleCall_9_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * (';' WS*)*
-	 */
-	protected void emit_Page___SemicolonKeyword_7_0_WSTerminalRuleCall_7_1_a__a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * (';' WS*)+
-	 */
-	protected void emit_Page___SemicolonKeyword_7_0_WSTerminalRuleCall_7_1_a__p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_PseudoPage_WSTerminalRuleCall_2_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Pseudo_WSTerminalRuleCall_1_1_2_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Pseudo_WSTerminalRuleCall_1_1_3_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Ruleset_WSTerminalRuleCall_1_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Ruleset_WSTerminalRuleCall_3_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Ruleset_WSTerminalRuleCall_7_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * (';' WS*)*
-	 */
-	protected void emit_Ruleset___SemicolonKeyword_5_0_WSTerminalRuleCall_5_1_a__a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * (';' WS*)+
-	 */
-	protected void emit_Ruleset___SemicolonKeyword_5_0_WSTerminalRuleCall_5_1_a__p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Selector_WSTerminalRuleCall_0_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * (CDC | CDO | WS)*
-	 */
-	protected void emit_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * (CDC | CDO | WS)+
-	 */
-	protected void emit_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * ((CDO WS*) | (CDC WS*))*
-	 */
-	protected void emit_Stylesheet_____CDCTerminalRuleCall_2_1_1_0_WSTerminalRuleCall_2_1_1_1_a___or___CDOTerminalRuleCall_2_1_0_0_WSTerminalRuleCall_2_1_0_1_a____a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * ((CDC WS*) | (CDO WS*))*
-	 */
-	protected void emit_Stylesheet_____CDCTerminalRuleCall_3_1_1_0_WSTerminalRuleCall_3_1_1_1_a___or___CDOTerminalRuleCall_3_1_0_0_WSTerminalRuleCall_3_1_0_1_a____a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS*
-	 */
-	protected void emit_Term_WSTerminalRuleCall_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS?
-	 */
-	protected void emit_Uri_WSTerminalRuleCall_1_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-	/**
-	 * Syntax:
-	 * WS?
-	 */
-	protected void emit_Uri_WSTerminalRuleCall_3_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
-		acceptNodes(transition, nodes);
-	}
-
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/services/CSSGrammarAccess.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/services/CSSGrammarAccess.java
deleted file mode 100644
index bb42dac4dbd..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/services/CSSGrammarAccess.java
+++ /dev/null
@@ -1,3185 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.services;
-
-import java.util.List;
-
-import org.eclipse.xtext.Action;
-import org.eclipse.xtext.Alternatives;
-import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.EnumLiteralDeclaration;
-import org.eclipse.xtext.EnumRule;
-import org.eclipse.xtext.Grammar;
-import org.eclipse.xtext.GrammarUtil;
-import org.eclipse.xtext.Group;
-import org.eclipse.xtext.Keyword;
-import org.eclipse.xtext.ParserRule;
-import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.TerminalRule;
-import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder;
-import org.eclipse.xtext.service.GrammarProvider;
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-
-@Singleton
-public class CSSGrammarAccess extends AbstractGrammarElementFinder {
-
-
-	public class StylesheetElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Stylesheet");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Group cGroup_0 = (Group) cGroup.eContents().get(0);
-		private final Keyword cCharsetKeyword_0_0 = (Keyword) cGroup_0.eContents().get(0);
-		private final Assignment cCharsetAssignment_0_1 = (Assignment) cGroup_0.eContents().get(1);
-		private final RuleCall cCharsetSTRINGTerminalRuleCall_0_1_0 = (RuleCall) cCharsetAssignment_0_1.eContents().get(0);
-		private final Keyword cSemicolonKeyword_0_2 = (Keyword) cGroup_0.eContents().get(2);
-		private final Alternatives cAlternatives_1 = (Alternatives) cGroup.eContents().get(1);
-		private final RuleCall cWSTerminalRuleCall_1_0 = (RuleCall) cAlternatives_1.eContents().get(0);
-		private final RuleCall cCDOTerminalRuleCall_1_1 = (RuleCall) cAlternatives_1.eContents().get(1);
-		private final RuleCall cCDCTerminalRuleCall_1_2 = (RuleCall) cAlternatives_1.eContents().get(2);
-		private final Group cGroup_2 = (Group) cGroup.eContents().get(2);
-		private final Assignment cImportsAssignment_2_0 = (Assignment) cGroup_2.eContents().get(0);
-		private final RuleCall cImportsImportParserRuleCall_2_0_0 = (RuleCall) cImportsAssignment_2_0.eContents().get(0);
-		private final Alternatives cAlternatives_2_1 = (Alternatives) cGroup_2.eContents().get(1);
-		private final Group cGroup_2_1_0 = (Group) cAlternatives_2_1.eContents().get(0);
-		private final RuleCall cCDOTerminalRuleCall_2_1_0_0 = (RuleCall) cGroup_2_1_0.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_2_1_0_1 = (RuleCall) cGroup_2_1_0.eContents().get(1);
-		private final Group cGroup_2_1_1 = (Group) cAlternatives_2_1.eContents().get(1);
-		private final RuleCall cCDCTerminalRuleCall_2_1_1_0 = (RuleCall) cGroup_2_1_1.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_2_1_1_1 = (RuleCall) cGroup_2_1_1.eContents().get(1);
-		private final Group cGroup_3 = (Group) cGroup.eContents().get(3);
-		private final Assignment cContentsAssignment_3_0 = (Assignment) cGroup_3.eContents().get(0);
-		private final RuleCall cContentsContentParserRuleCall_3_0_0 = (RuleCall) cContentsAssignment_3_0.eContents().get(0);
-		private final Alternatives cAlternatives_3_1 = (Alternatives) cGroup_3.eContents().get(1);
-		private final Group cGroup_3_1_0 = (Group) cAlternatives_3_1.eContents().get(0);
-		private final RuleCall cCDOTerminalRuleCall_3_1_0_0 = (RuleCall) cGroup_3_1_0.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_3_1_0_1 = (RuleCall) cGroup_3_1_0.eContents().get(1);
-		private final Group cGroup_3_1_1 = (Group) cAlternatives_3_1.eContents().get(1);
-		private final RuleCall cCDCTerminalRuleCall_3_1_1_0 = (RuleCall) cGroup_3_1_1.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_3_1_1_1 = (RuleCall) cGroup_3_1_1.eContents().get(1);
-
-		// //Do not create a Stylesheet for WS* (This seems to cause a serialization problem when editing an EMF Model from an Empty file)
-		//
-		//
-		// //Do not ignore WS as @charset must be followed by exactly one Space.
-		// Stylesheet:
-		//
-		// ("@charset " charset=STRING ";")? (WS | CDO | CDC)* (imports+=Import (CDO WS* | CDC WS*)*)* (contents+=Content (CDO
-		//
-		// WS* | CDC WS*)*)*;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// ("@charset " charset=STRING ";")? (WS | CDO | CDC)* (imports+=Import (CDO WS* | CDC WS*)*)* (contents+=Content (CDO WS*
-		//
-		// | CDC WS*)*)*
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// ("@charset " charset=STRING ";")?
-		public Group getGroup_0() {
-			return cGroup_0;
-		}
-
-		// "@charset "
-		public Keyword getCharsetKeyword_0_0() {
-			return cCharsetKeyword_0_0;
-		}
-
-		// charset=STRING
-		public Assignment getCharsetAssignment_0_1() {
-			return cCharsetAssignment_0_1;
-		}
-
-		// STRING
-		public RuleCall getCharsetSTRINGTerminalRuleCall_0_1_0() {
-			return cCharsetSTRINGTerminalRuleCall_0_1_0;
-		}
-
-		// ";"
-		public Keyword getSemicolonKeyword_0_2() {
-			return cSemicolonKeyword_0_2;
-		}
-
-		// (WS | CDO | CDC)*
-		public Alternatives getAlternatives_1() {
-			return cAlternatives_1;
-		}
-
-		// WS
-		public RuleCall getWSTerminalRuleCall_1_0() {
-			return cWSTerminalRuleCall_1_0;
-		}
-
-		// CDO
-		public RuleCall getCDOTerminalRuleCall_1_1() {
-			return cCDOTerminalRuleCall_1_1;
-		}
-
-		// CDC
-		public RuleCall getCDCTerminalRuleCall_1_2() {
-			return cCDCTerminalRuleCall_1_2;
-		}
-
-		// (imports+=Import (CDO WS* | CDC WS*)*)*
-		public Group getGroup_2() {
-			return cGroup_2;
-		}
-
-		// imports+=Import
-		public Assignment getImportsAssignment_2_0() {
-			return cImportsAssignment_2_0;
-		}
-
-		// Import
-		public RuleCall getImportsImportParserRuleCall_2_0_0() {
-			return cImportsImportParserRuleCall_2_0_0;
-		}
-
-		// (CDO WS* | CDC WS*)*
-		public Alternatives getAlternatives_2_1() {
-			return cAlternatives_2_1;
-		}
-
-		// CDO WS*
-		public Group getGroup_2_1_0() {
-			return cGroup_2_1_0;
-		}
-
-		// CDO
-		public RuleCall getCDOTerminalRuleCall_2_1_0_0() {
-			return cCDOTerminalRuleCall_2_1_0_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_2_1_0_1() {
-			return cWSTerminalRuleCall_2_1_0_1;
-		}
-
-		// CDC WS*
-		public Group getGroup_2_1_1() {
-			return cGroup_2_1_1;
-		}
-
-		// CDC
-		public RuleCall getCDCTerminalRuleCall_2_1_1_0() {
-			return cCDCTerminalRuleCall_2_1_1_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_2_1_1_1() {
-			return cWSTerminalRuleCall_2_1_1_1;
-		}
-
-		// (contents+=Content (CDO WS* | CDC WS*)*)*
-		public Group getGroup_3() {
-			return cGroup_3;
-		}
-
-		// contents+=Content
-		public Assignment getContentsAssignment_3_0() {
-			return cContentsAssignment_3_0;
-		}
-
-		// Content
-		public RuleCall getContentsContentParserRuleCall_3_0_0() {
-			return cContentsContentParserRuleCall_3_0_0;
-		}
-
-		// (CDO WS* | CDC WS*)*
-		public Alternatives getAlternatives_3_1() {
-			return cAlternatives_3_1;
-		}
-
-		// CDO WS*
-		public Group getGroup_3_1_0() {
-			return cGroup_3_1_0;
-		}
-
-		// CDO
-		public RuleCall getCDOTerminalRuleCall_3_1_0_0() {
-			return cCDOTerminalRuleCall_3_1_0_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_3_1_0_1() {
-			return cWSTerminalRuleCall_3_1_0_1;
-		}
-
-		// CDC WS*
-		public Group getGroup_3_1_1() {
-			return cGroup_3_1_1;
-		}
-
-		// CDC
-		public RuleCall getCDCTerminalRuleCall_3_1_1_0() {
-			return cCDCTerminalRuleCall_3_1_1_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_3_1_1_1() {
-			return cWSTerminalRuleCall_3_1_1_1;
-		}
-	}
-
-	public class ContentElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Content");
-		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);
-		private final RuleCall cRulesetParserRuleCall_0 = (RuleCall) cAlternatives.eContents().get(0);
-		private final RuleCall cMediaParserRuleCall_1 = (RuleCall) cAlternatives.eContents().get(1);
-		private final RuleCall cPageParserRuleCall_2 = (RuleCall) cAlternatives.eContents().get(2);
-
-		// Content:
-		//
-		// Ruleset | Media | Page;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// Ruleset | Media | Page
-		public Alternatives getAlternatives() {
-			return cAlternatives;
-		}
-
-		// Ruleset
-		public RuleCall getRulesetParserRuleCall_0() {
-			return cRulesetParserRuleCall_0;
-		}
-
-		// Media
-		public RuleCall getMediaParserRuleCall_1() {
-			return cMediaParserRuleCall_1;
-		}
-
-		// Page
-		public RuleCall getPageParserRuleCall_2() {
-			return cPageParserRuleCall_2;
-		}
-	}
-
-	public class ImportElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Import");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Keyword cImportKeyword_0 = (Keyword) cGroup.eContents().get(0);
-		private final Alternatives cAlternatives_1 = (Alternatives) cGroup.eContents().get(1);
-		private final Group cGroup_1_0 = (Group) cAlternatives_1.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_1_0_0 = (RuleCall) cGroup_1_0.eContents().get(0);
-		private final Assignment cStringAssignment_1_0_1 = (Assignment) cGroup_1_0.eContents().get(1);
-		private final RuleCall cStringSTRINGTerminalRuleCall_1_0_1_0 = (RuleCall) cStringAssignment_1_0_1.eContents().get(0);
-		private final Group cGroup_1_1 = (Group) cAlternatives_1.eContents().get(1);
-		private final RuleCall cWSTerminalRuleCall_1_1_0 = (RuleCall) cGroup_1_1.eContents().get(0);
-		private final Assignment cUriAssignment_1_1_1 = (Assignment) cGroup_1_1.eContents().get(1);
-		private final RuleCall cUriUriParserRuleCall_1_1_1_0 = (RuleCall) cUriAssignment_1_1_1.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_2 = (RuleCall) cGroup.eContents().get(2);
-		private final Group cGroup_3 = (Group) cGroup.eContents().get(3);
-		private final Assignment cMediaAssignment_3_0 = (Assignment) cGroup_3.eContents().get(0);
-		private final RuleCall cMediaIDTerminalRuleCall_3_0_0 = (RuleCall) cMediaAssignment_3_0.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_3_1 = (RuleCall) cGroup_3.eContents().get(1);
-		private final Group cGroup_3_2 = (Group) cGroup_3.eContents().get(2);
-		private final Keyword cCommaKeyword_3_2_0 = (Keyword) cGroup_3_2.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_3_2_1 = (RuleCall) cGroup_3_2.eContents().get(1);
-		private final Assignment cMediaAssignment_3_2_2 = (Assignment) cGroup_3_2.eContents().get(2);
-		private final RuleCall cMediaIDTerminalRuleCall_3_2_2_0 = (RuleCall) cMediaAssignment_3_2_2.eContents().get(0);
-		private final Keyword cSemicolonKeyword_4 = (Keyword) cGroup.eContents().get(4);
-		private final RuleCall cWSTerminalRuleCall_5 = (RuleCall) cGroup.eContents().get(5);
-
-		// Import:
-		//
-		// "@import" (WS* string=STRING | WS uri=Uri) WS* (media+=ID WS* ("," WS* media+=ID)*)? ";" WS*;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// "@import" (WS* string=STRING | WS uri=Uri) WS* (media+=ID WS* ("," WS* media+=ID)*)? ";" WS*
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// "@import"
-		public Keyword getImportKeyword_0() {
-			return cImportKeyword_0;
-		}
-
-		// WS* string=STRING | WS uri=Uri
-		public Alternatives getAlternatives_1() {
-			return cAlternatives_1;
-		}
-
-		// WS* string=STRING
-		public Group getGroup_1_0() {
-			return cGroup_1_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_1_0_0() {
-			return cWSTerminalRuleCall_1_0_0;
-		}
-
-		// string=STRING
-		public Assignment getStringAssignment_1_0_1() {
-			return cStringAssignment_1_0_1;
-		}
-
-		// STRING
-		public RuleCall getStringSTRINGTerminalRuleCall_1_0_1_0() {
-			return cStringSTRINGTerminalRuleCall_1_0_1_0;
-		}
-
-		// WS uri=Uri
-		public Group getGroup_1_1() {
-			return cGroup_1_1;
-		}
-
-		// WS
-		public RuleCall getWSTerminalRuleCall_1_1_0() {
-			return cWSTerminalRuleCall_1_1_0;
-		}
-
-		// uri=Uri
-		public Assignment getUriAssignment_1_1_1() {
-			return cUriAssignment_1_1_1;
-		}
-
-		// Uri
-		public RuleCall getUriUriParserRuleCall_1_1_1_0() {
-			return cUriUriParserRuleCall_1_1_1_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_2() {
-			return cWSTerminalRuleCall_2;
-		}
-
-		// (media+=ID WS* ("," WS* media+=ID)*)?
-		public Group getGroup_3() {
-			return cGroup_3;
-		}
-
-		// media+=ID
-		public Assignment getMediaAssignment_3_0() {
-			return cMediaAssignment_3_0;
-		}
-
-		// ID
-		public RuleCall getMediaIDTerminalRuleCall_3_0_0() {
-			return cMediaIDTerminalRuleCall_3_0_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_3_1() {
-			return cWSTerminalRuleCall_3_1;
-		}
-
-		// ("," WS* media+=ID)*
-		public Group getGroup_3_2() {
-			return cGroup_3_2;
-		}
-
-		// ","
-		public Keyword getCommaKeyword_3_2_0() {
-			return cCommaKeyword_3_2_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_3_2_1() {
-			return cWSTerminalRuleCall_3_2_1;
-		}
-
-		// media+=ID
-		public Assignment getMediaAssignment_3_2_2() {
-			return cMediaAssignment_3_2_2;
-		}
-
-		// ID
-		public RuleCall getMediaIDTerminalRuleCall_3_2_2_0() {
-			return cMediaIDTerminalRuleCall_3_2_2_0;
-		}
-
-		// ";"
-		public Keyword getSemicolonKeyword_4() {
-			return cSemicolonKeyword_4;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_5() {
-			return cWSTerminalRuleCall_5;
-		}
-	}
-
-	public class MediaElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Media");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Keyword cMediaKeyword_0 = (Keyword) cGroup.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_1 = (RuleCall) cGroup.eContents().get(1);
-		private final Assignment cMediaAssignment_2 = (Assignment) cGroup.eContents().get(2);
-		private final RuleCall cMediaIDTerminalRuleCall_2_0 = (RuleCall) cMediaAssignment_2.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_3 = (RuleCall) cGroup.eContents().get(3);
-		private final Group cGroup_4 = (Group) cGroup.eContents().get(4);
-		private final Keyword cCommaKeyword_4_0 = (Keyword) cGroup_4.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_4_1 = (RuleCall) cGroup_4.eContents().get(1);
-		private final Assignment cMediaAssignment_4_2 = (Assignment) cGroup_4.eContents().get(2);
-		private final RuleCall cMediaIDTerminalRuleCall_4_2_0 = (RuleCall) cMediaAssignment_4_2.eContents().get(0);
-		private final Keyword cLeftCurlyBracketKeyword_5 = (Keyword) cGroup.eContents().get(5);
-		private final RuleCall cWSTerminalRuleCall_6 = (RuleCall) cGroup.eContents().get(6);
-		private final Assignment cRulesAssignment_7 = (Assignment) cGroup.eContents().get(7);
-		private final RuleCall cRulesRulesetParserRuleCall_7_0 = (RuleCall) cRulesAssignment_7.eContents().get(0);
-		private final Keyword cRightCurlyBracketKeyword_8 = (Keyword) cGroup.eContents().get(8);
-		private final RuleCall cWSTerminalRuleCall_9 = (RuleCall) cGroup.eContents().get(9);
-
-		// Media:
-		//
-		// "@media" WS media+=ID WS* ("," WS* media+=ID)* "{" WS* rules+=Ruleset* "}" WS*;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// "@media" WS media+=ID WS* ("," WS* media+=ID)* "{" WS* rules+=Ruleset* "}" WS*
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// "@media"
-		public Keyword getMediaKeyword_0() {
-			return cMediaKeyword_0;
-		}
-
-		// WS
-		public RuleCall getWSTerminalRuleCall_1() {
-			return cWSTerminalRuleCall_1;
-		}
-
-		// media+=ID
-		public Assignment getMediaAssignment_2() {
-			return cMediaAssignment_2;
-		}
-
-		// ID
-		public RuleCall getMediaIDTerminalRuleCall_2_0() {
-			return cMediaIDTerminalRuleCall_2_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_3() {
-			return cWSTerminalRuleCall_3;
-		}
-
-		// ("," WS* media+=ID)*
-		public Group getGroup_4() {
-			return cGroup_4;
-		}
-
-		// ","
-		public Keyword getCommaKeyword_4_0() {
-			return cCommaKeyword_4_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_4_1() {
-			return cWSTerminalRuleCall_4_1;
-		}
-
-		// media+=ID
-		public Assignment getMediaAssignment_4_2() {
-			return cMediaAssignment_4_2;
-		}
-
-		// ID
-		public RuleCall getMediaIDTerminalRuleCall_4_2_0() {
-			return cMediaIDTerminalRuleCall_4_2_0;
-		}
-
-		// "{"
-		public Keyword getLeftCurlyBracketKeyword_5() {
-			return cLeftCurlyBracketKeyword_5;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_6() {
-			return cWSTerminalRuleCall_6;
-		}
-
-		// rules+=Ruleset*
-		public Assignment getRulesAssignment_7() {
-			return cRulesAssignment_7;
-		}
-
-		// Ruleset
-		public RuleCall getRulesRulesetParserRuleCall_7_0() {
-			return cRulesRulesetParserRuleCall_7_0;
-		}
-
-		// "}"
-		public Keyword getRightCurlyBracketKeyword_8() {
-			return cRightCurlyBracketKeyword_8;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_9() {
-			return cWSTerminalRuleCall_9;
-		}
-	}
-
-	public class PageElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Page");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Action cPageAction_0 = (Action) cGroup.eContents().get(0);
-		private final Keyword cPageKeyword_1 = (Keyword) cGroup.eContents().get(1);
-		private final RuleCall cWSTerminalRuleCall_2 = (RuleCall) cGroup.eContents().get(2);
-		private final Assignment cPseudoAssignment_3 = (Assignment) cGroup.eContents().get(3);
-		private final RuleCall cPseudoPseudoPageParserRuleCall_3_0 = (RuleCall) cPseudoAssignment_3.eContents().get(0);
-		private final Keyword cLeftCurlyBracketKeyword_4 = (Keyword) cGroup.eContents().get(4);
-		private final RuleCall cWSTerminalRuleCall_5 = (RuleCall) cGroup.eContents().get(5);
-		private final Assignment cDeclarationsAssignment_6 = (Assignment) cGroup.eContents().get(6);
-		private final RuleCall cDeclarationsDeclarationParserRuleCall_6_0 = (RuleCall) cDeclarationsAssignment_6.eContents().get(0);
-		private final Group cGroup_7 = (Group) cGroup.eContents().get(7);
-		private final Keyword cSemicolonKeyword_7_0 = (Keyword) cGroup_7.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_7_1 = (RuleCall) cGroup_7.eContents().get(1);
-		private final Assignment cDeclarationsAssignment_7_2 = (Assignment) cGroup_7.eContents().get(2);
-		private final RuleCall cDeclarationsDeclarationParserRuleCall_7_2_0 = (RuleCall) cDeclarationsAssignment_7_2.eContents().get(0);
-		private final Keyword cRightCurlyBracketKeyword_8 = (Keyword) cGroup.eContents().get(8);
-		private final RuleCall cWSTerminalRuleCall_9 = (RuleCall) cGroup.eContents().get(9);
-
-		// Page:
-		//
-		// {Page} "@page" WS* pseudo=PseudoPage? "{" WS* declarations+=Declaration? (";" WS* declarations+=Declaration?)* "}"
-		//
-		// WS*;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// {Page} "@page" WS* pseudo=PseudoPage? "{" WS* declarations+=Declaration? (";" WS* declarations+=Declaration?)* "}" WS*
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// {Page}
-		public Action getPageAction_0() {
-			return cPageAction_0;
-		}
-
-		// "@page"
-		public Keyword getPageKeyword_1() {
-			return cPageKeyword_1;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_2() {
-			return cWSTerminalRuleCall_2;
-		}
-
-		// pseudo=PseudoPage?
-		public Assignment getPseudoAssignment_3() {
-			return cPseudoAssignment_3;
-		}
-
-		// PseudoPage
-		public RuleCall getPseudoPseudoPageParserRuleCall_3_0() {
-			return cPseudoPseudoPageParserRuleCall_3_0;
-		}
-
-		// "{"
-		public Keyword getLeftCurlyBracketKeyword_4() {
-			return cLeftCurlyBracketKeyword_4;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_5() {
-			return cWSTerminalRuleCall_5;
-		}
-
-		// declarations+=Declaration?
-		public Assignment getDeclarationsAssignment_6() {
-			return cDeclarationsAssignment_6;
-		}
-
-		// Declaration
-		public RuleCall getDeclarationsDeclarationParserRuleCall_6_0() {
-			return cDeclarationsDeclarationParserRuleCall_6_0;
-		}
-
-		// (";" WS* declarations+=Declaration?)*
-		public Group getGroup_7() {
-			return cGroup_7;
-		}
-
-		// ";"
-		public Keyword getSemicolonKeyword_7_0() {
-			return cSemicolonKeyword_7_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_7_1() {
-			return cWSTerminalRuleCall_7_1;
-		}
-
-		// declarations+=Declaration?
-		public Assignment getDeclarationsAssignment_7_2() {
-			return cDeclarationsAssignment_7_2;
-		}
-
-		// Declaration
-		public RuleCall getDeclarationsDeclarationParserRuleCall_7_2_0() {
-			return cDeclarationsDeclarationParserRuleCall_7_2_0;
-		}
-
-		// "}"
-		public Keyword getRightCurlyBracketKeyword_8() {
-			return cRightCurlyBracketKeyword_8;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_9() {
-			return cWSTerminalRuleCall_9;
-		}
-	}
-
-	public class PseudoPageElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PseudoPage");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Keyword cColonKeyword_0 = (Keyword) cGroup.eContents().get(0);
-		private final Assignment cIdAssignment_1 = (Assignment) cGroup.eContents().get(1);
-		private final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall) cIdAssignment_1.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_2 = (RuleCall) cGroup.eContents().get(2);
-
-		// PseudoPage:
-		//
-		// ":" id=ID WS*;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// ":" id=ID WS*
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// ":"
-		public Keyword getColonKeyword_0() {
-			return cColonKeyword_0;
-		}
-
-		// id=ID
-		public Assignment getIdAssignment_1() {
-			return cIdAssignment_1;
-		}
-
-		// ID
-		public RuleCall getIdIDTerminalRuleCall_1_0() {
-			return cIdIDTerminalRuleCall_1_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_2() {
-			return cWSTerminalRuleCall_2;
-		}
-	}
-
-	public class RulesetElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Ruleset");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cSelectorsAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cSelectorsSelectorParserRuleCall_0_0 = (RuleCall) cSelectorsAssignment_0.eContents().get(0);
-		private final Group cGroup_1 = (Group) cGroup.eContents().get(1);
-		private final Keyword cCommaKeyword_1_0 = (Keyword) cGroup_1.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_1_1 = (RuleCall) cGroup_1.eContents().get(1);
-		private final Assignment cSelectorsAssignment_1_2 = (Assignment) cGroup_1.eContents().get(2);
-		private final RuleCall cSelectorsSelectorParserRuleCall_1_2_0 = (RuleCall) cSelectorsAssignment_1_2.eContents().get(0);
-		private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword) cGroup.eContents().get(2);
-		private final RuleCall cWSTerminalRuleCall_3 = (RuleCall) cGroup.eContents().get(3);
-		private final Assignment cPropertiesAssignment_4 = (Assignment) cGroup.eContents().get(4);
-		private final RuleCall cPropertiesDeclarationParserRuleCall_4_0 = (RuleCall) cPropertiesAssignment_4.eContents().get(0);
-		private final Group cGroup_5 = (Group) cGroup.eContents().get(5);
-		private final Keyword cSemicolonKeyword_5_0 = (Keyword) cGroup_5.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_5_1 = (RuleCall) cGroup_5.eContents().get(1);
-		private final Assignment cPropertiesAssignment_5_2 = (Assignment) cGroup_5.eContents().get(2);
-		private final RuleCall cPropertiesDeclarationParserRuleCall_5_2_0 = (RuleCall) cPropertiesAssignment_5_2.eContents().get(0);
-		private final Keyword cRightCurlyBracketKeyword_6 = (Keyword) cGroup.eContents().get(6);
-		private final RuleCall cWSTerminalRuleCall_7 = (RuleCall) cGroup.eContents().get(7);
-
-		// Ruleset:
-		//
-		// selectors+=Selector ("," WS* selectors+=Selector)* "{" WS* properties+=Declaration? (";" WS*
-		//
-		// properties+=Declaration?)* "}" WS*;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// selectors+=Selector ("," WS* selectors+=Selector)* "{" WS* properties+=Declaration? (";" WS* properties+=Declaration?)*
-		//
-		// "}" WS*
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// selectors+=Selector
-		public Assignment getSelectorsAssignment_0() {
-			return cSelectorsAssignment_0;
-		}
-
-		// Selector
-		public RuleCall getSelectorsSelectorParserRuleCall_0_0() {
-			return cSelectorsSelectorParserRuleCall_0_0;
-		}
-
-		// ("," WS* selectors+=Selector)*
-		public Group getGroup_1() {
-			return cGroup_1;
-		}
-
-		// ","
-		public Keyword getCommaKeyword_1_0() {
-			return cCommaKeyword_1_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_1_1() {
-			return cWSTerminalRuleCall_1_1;
-		}
-
-		// selectors+=Selector
-		public Assignment getSelectorsAssignment_1_2() {
-			return cSelectorsAssignment_1_2;
-		}
-
-		// Selector
-		public RuleCall getSelectorsSelectorParserRuleCall_1_2_0() {
-			return cSelectorsSelectorParserRuleCall_1_2_0;
-		}
-
-		// "{"
-		public Keyword getLeftCurlyBracketKeyword_2() {
-			return cLeftCurlyBracketKeyword_2;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_3() {
-			return cWSTerminalRuleCall_3;
-		}
-
-		// properties+=Declaration?
-		public Assignment getPropertiesAssignment_4() {
-			return cPropertiesAssignment_4;
-		}
-
-		// Declaration
-		public RuleCall getPropertiesDeclarationParserRuleCall_4_0() {
-			return cPropertiesDeclarationParserRuleCall_4_0;
-		}
-
-		// (";" WS* properties+=Declaration?)*
-		public Group getGroup_5() {
-			return cGroup_5;
-		}
-
-		// ";"
-		public Keyword getSemicolonKeyword_5_0() {
-			return cSemicolonKeyword_5_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_5_1() {
-			return cWSTerminalRuleCall_5_1;
-		}
-
-		// properties+=Declaration?
-		public Assignment getPropertiesAssignment_5_2() {
-			return cPropertiesAssignment_5_2;
-		}
-
-		// Declaration
-		public RuleCall getPropertiesDeclarationParserRuleCall_5_2_0() {
-			return cPropertiesDeclarationParserRuleCall_5_2_0;
-		}
-
-		// "}"
-		public Keyword getRightCurlyBracketKeyword_6() {
-			return cRightCurlyBracketKeyword_6;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_7() {
-			return cWSTerminalRuleCall_7;
-		}
-	}
-
-	public class SelectorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Selector");
-		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);
-		private final Group cGroup_0 = (Group) cAlternatives.eContents().get(0);
-		private final RuleCall cSimpleSelectorParserRuleCall_0_0 = (RuleCall) cGroup_0.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_0_1 = (RuleCall) cGroup_0.eContents().get(1);
-		private final RuleCall cCompositeSelectorParserRuleCall_1 = (RuleCall) cAlternatives.eContents().get(1);
-
-		// Selector:
-		//
-		// SimpleSelector WS* | CompositeSelector;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// SimpleSelector WS* | CompositeSelector
-		public Alternatives getAlternatives() {
-			return cAlternatives;
-		}
-
-		// SimpleSelector WS*
-		public Group getGroup_0() {
-			return cGroup_0;
-		}
-
-		// SimpleSelector
-		public RuleCall getSimpleSelectorParserRuleCall_0_0() {
-			return cSimpleSelectorParserRuleCall_0_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_0_1() {
-			return cWSTerminalRuleCall_0_1;
-		}
-
-		// CompositeSelector
-		public RuleCall getCompositeSelectorParserRuleCall_1() {
-			return cCompositeSelectorParserRuleCall_1;
-		}
-	}
-
-	public class CompositeSelectorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "CompositeSelector");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cLeftAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cLeftSimpleSelectorParserRuleCall_0_0 = (RuleCall) cLeftAssignment_0.eContents().get(0);
-		private final Alternatives cAlternatives_1 = (Alternatives) cGroup.eContents().get(1);
-		private final RuleCall cWSTerminalRuleCall_1_0 = (RuleCall) cAlternatives_1.eContents().get(0);
-		private final Group cGroup_1_1 = (Group) cAlternatives_1.eContents().get(1);
-		private final RuleCall cWSTerminalRuleCall_1_1_0 = (RuleCall) cGroup_1_1.eContents().get(0);
-		private final Assignment cCombinatorAssignment_1_1_1 = (Assignment) cGroup_1_1.eContents().get(1);
-		private final RuleCall cCombinatorCombinatorParserRuleCall_1_1_1_0 = (RuleCall) cCombinatorAssignment_1_1_1.eContents().get(0);
-		private final Assignment cRightAssignment_2 = (Assignment) cGroup.eContents().get(2);
-		private final RuleCall cRightSelectorParserRuleCall_2_0 = (RuleCall) cRightAssignment_2.eContents().get(0);
-
-		// //left=SimpleSelector (combinator=Combinator right=Selector | WS+ (combinator=Combinator? right=Selector)?)?;
-		//
-		//
-		// CompositeSelector:
-		//
-		// left=SimpleSelector (WS+ | WS* combinator=Combinator) right=Selector;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// left=SimpleSelector (WS+ | WS* combinator=Combinator) right=Selector
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// left=SimpleSelector
-		public Assignment getLeftAssignment_0() {
-			return cLeftAssignment_0;
-		}
-
-		// SimpleSelector
-		public RuleCall getLeftSimpleSelectorParserRuleCall_0_0() {
-			return cLeftSimpleSelectorParserRuleCall_0_0;
-		}
-
-		// WS+ | WS* combinator=Combinator
-		public Alternatives getAlternatives_1() {
-			return cAlternatives_1;
-		}
-
-		// WS+
-		public RuleCall getWSTerminalRuleCall_1_0() {
-			return cWSTerminalRuleCall_1_0;
-		}
-
-		// WS* combinator=Combinator
-		public Group getGroup_1_1() {
-			return cGroup_1_1;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_1_1_0() {
-			return cWSTerminalRuleCall_1_1_0;
-		}
-
-		// combinator=Combinator
-		public Assignment getCombinatorAssignment_1_1_1() {
-			return cCombinatorAssignment_1_1_1;
-		}
-
-		// Combinator
-		public RuleCall getCombinatorCombinatorParserRuleCall_1_1_1_0() {
-			return cCombinatorCombinatorParserRuleCall_1_1_1_0;
-		}
-
-		// right=Selector
-		public Assignment getRightAssignment_2() {
-			return cRightAssignment_2;
-		}
-
-		// Selector
-		public RuleCall getRightSelectorParserRuleCall_2_0() {
-			return cRightSelectorParserRuleCall_2_0;
-		}
-	}
-
-	public class SimpleSelectorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SimpleSelector");
-		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);
-		private final Group cGroup_0 = (Group) cAlternatives.eContents().get(0);
-		private final Assignment cElementNameAssignment_0_0 = (Assignment) cGroup_0.eContents().get(0);
-		private final Alternatives cElementNameAlternatives_0_0_0 = (Alternatives) cElementNameAssignment_0_0.eContents().get(0);
-		private final RuleCall cElementNameIDTerminalRuleCall_0_0_0_0 = (RuleCall) cElementNameAlternatives_0_0_0.eContents().get(0);
-		private final Keyword cElementNameAsteriskKeyword_0_0_0_1 = (Keyword) cElementNameAlternatives_0_0_0.eContents().get(1);
-		private final Assignment cConditionAssignment_0_1 = (Assignment) cGroup_0.eContents().get(1);
-		private final RuleCall cConditionSelectorConditionParserRuleCall_0_1_0 = (RuleCall) cConditionAssignment_0_1.eContents().get(0);
-		private final Assignment cConditionAssignment_1 = (Assignment) cAlternatives.eContents().get(1);
-		private final RuleCall cConditionSelectorConditionParserRuleCall_1_0 = (RuleCall) cConditionAssignment_1.eContents().get(0);
-
-		// SimpleSelector:
-		//
-		// elementName=(ID | "*") condition+=SelectorCondition* | condition+=SelectorCondition+;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// elementName=(ID | "*") condition+=SelectorCondition* | condition+=SelectorCondition+
-		public Alternatives getAlternatives() {
-			return cAlternatives;
-		}
-
-		// elementName=(ID | "*") condition+=SelectorCondition*
-		public Group getGroup_0() {
-			return cGroup_0;
-		}
-
-		// elementName=(ID | "*")
-		public Assignment getElementNameAssignment_0_0() {
-			return cElementNameAssignment_0_0;
-		}
-
-		// ID | "*"
-		public Alternatives getElementNameAlternatives_0_0_0() {
-			return cElementNameAlternatives_0_0_0;
-		}
-
-		// ID
-		public RuleCall getElementNameIDTerminalRuleCall_0_0_0_0() {
-			return cElementNameIDTerminalRuleCall_0_0_0_0;
-		}
-
-		// "*"
-		public Keyword getElementNameAsteriskKeyword_0_0_0_1() {
-			return cElementNameAsteriskKeyword_0_0_0_1;
-		}
-
-		// condition+=SelectorCondition*
-		public Assignment getConditionAssignment_0_1() {
-			return cConditionAssignment_0_1;
-		}
-
-		// SelectorCondition
-		public RuleCall getConditionSelectorConditionParserRuleCall_0_1_0() {
-			return cConditionSelectorConditionParserRuleCall_0_1_0;
-		}
-
-		// condition+=SelectorCondition+
-		public Assignment getConditionAssignment_1() {
-			return cConditionAssignment_1;
-		}
-
-		// SelectorCondition
-		public RuleCall getConditionSelectorConditionParserRuleCall_1_0() {
-			return cConditionSelectorConditionParserRuleCall_1_0;
-		}
-	}
-
-	public class SelectorConditionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SelectorCondition");
-		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);
-		private final RuleCall cCSSIdParserRuleCall_0 = (RuleCall) cAlternatives.eContents().get(0);
-		private final RuleCall cClassParserRuleCall_1 = (RuleCall) cAlternatives.eContents().get(1);
-		private final RuleCall cAttributeParserRuleCall_2 = (RuleCall) cAlternatives.eContents().get(2);
-		private final RuleCall cPseudoParserRuleCall_3 = (RuleCall) cAlternatives.eContents().get(3);
-
-		// SelectorCondition:
-		//
-		// CSSId | Class | Attribute | Pseudo;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// CSSId | Class | Attribute | Pseudo
-		public Alternatives getAlternatives() {
-			return cAlternatives;
-		}
-
-		// CSSId
-		public RuleCall getCSSIdParserRuleCall_0() {
-			return cCSSIdParserRuleCall_0;
-		}
-
-		// Class
-		public RuleCall getClassParserRuleCall_1() {
-			return cClassParserRuleCall_1;
-		}
-
-		// Attribute
-		public RuleCall getAttributeParserRuleCall_2() {
-			return cAttributeParserRuleCall_2;
-		}
-
-		// Pseudo
-		public RuleCall getPseudoParserRuleCall_3() {
-			return cPseudoParserRuleCall_3;
-		}
-	}
-
-	public class CombinatorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Combinator");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cKindAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cKindKINDEnumRuleCall_0_0 = (RuleCall) cKindAssignment_0.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_1 = (RuleCall) cGroup.eContents().get(1);
-
-		// Combinator:
-		//
-		// kind=KIND WS*;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// kind=KIND WS*
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// kind=KIND
-		public Assignment getKindAssignment_0() {
-			return cKindAssignment_0;
-		}
-
-		// KIND
-		public RuleCall getKindKINDEnumRuleCall_0_0() {
-			return cKindKINDEnumRuleCall_0_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_1() {
-			return cWSTerminalRuleCall_1;
-		}
-	}
-
-	public class DeclarationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Declaration");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cPropertyAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cPropertyIDTerminalRuleCall_0_0 = (RuleCall) cPropertyAssignment_0.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_1 = (RuleCall) cGroup.eContents().get(1);
-		private final Keyword cColonKeyword_2 = (Keyword) cGroup.eContents().get(2);
-		private final RuleCall cWSTerminalRuleCall_3 = (RuleCall) cGroup.eContents().get(3);
-		private final Assignment cExpressionAssignment_4 = (Assignment) cGroup.eContents().get(4);
-		private final RuleCall cExpressionExpressionParserRuleCall_4_0 = (RuleCall) cExpressionAssignment_4.eContents().get(0);
-		private final Group cGroup_5 = (Group) cGroup.eContents().get(5);
-		private final Assignment cImportantAssignment_5_0 = (Assignment) cGroup_5.eContents().get(0);
-		private final RuleCall cImportantT_IMPORTANTTerminalRuleCall_5_0_0 = (RuleCall) cImportantAssignment_5_0.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_5_1 = (RuleCall) cGroup_5.eContents().get(1);
-
-		// Declaration:
-		//
-		// property=ID WS* ":" WS* expression=Expression (important?=T_IMPORTANT WS*)?;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// property=ID WS* ":" WS* expression=Expression (important?=T_IMPORTANT WS*)?
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// property=ID
-		public Assignment getPropertyAssignment_0() {
-			return cPropertyAssignment_0;
-		}
-
-		// ID
-		public RuleCall getPropertyIDTerminalRuleCall_0_0() {
-			return cPropertyIDTerminalRuleCall_0_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_1() {
-			return cWSTerminalRuleCall_1;
-		}
-
-		// ":"
-		public Keyword getColonKeyword_2() {
-			return cColonKeyword_2;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_3() {
-			return cWSTerminalRuleCall_3;
-		}
-
-		// expression=Expression
-		public Assignment getExpressionAssignment_4() {
-			return cExpressionAssignment_4;
-		}
-
-		// Expression
-		public RuleCall getExpressionExpressionParserRuleCall_4_0() {
-			return cExpressionExpressionParserRuleCall_4_0;
-		}
-
-		// (important?=T_IMPORTANT WS*)?
-		public Group getGroup_5() {
-			return cGroup_5;
-		}
-
-		// important?=T_IMPORTANT
-		public Assignment getImportantAssignment_5_0() {
-			return cImportantAssignment_5_0;
-		}
-
-		// T_IMPORTANT
-		public RuleCall getImportantT_IMPORTANTTerminalRuleCall_5_0_0() {
-			return cImportantT_IMPORTANTTerminalRuleCall_5_0_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_5_1() {
-			return cWSTerminalRuleCall_5_1;
-		}
-	}
-
-	public class ExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Expression");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cTermsAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cTermsTermParserRuleCall_0_0 = (RuleCall) cTermsAssignment_0.eContents().get(0);
-		private final Assignment cSubtermsAssignment_1 = (Assignment) cGroup.eContents().get(1);
-		private final RuleCall cSubtermsSubtermParserRuleCall_1_0 = (RuleCall) cSubtermsAssignment_1.eContents().get(0);
-
-		// Expression:
-		//
-		// terms=Term subterms+=Subterm*;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// terms=Term subterms+=Subterm*
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// terms=Term
-		public Assignment getTermsAssignment_0() {
-			return cTermsAssignment_0;
-		}
-
-		// Term
-		public RuleCall getTermsTermParserRuleCall_0_0() {
-			return cTermsTermParserRuleCall_0_0;
-		}
-
-		// subterms+=Subterm*
-		public Assignment getSubtermsAssignment_1() {
-			return cSubtermsAssignment_1;
-		}
-
-		// Subterm
-		public RuleCall getSubtermsSubtermParserRuleCall_1_0() {
-			return cSubtermsSubtermParserRuleCall_1_0;
-		}
-	}
-
-	public class SubtermElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Subterm");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cOperatorAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cOperatorOperatorParserRuleCall_0_0 = (RuleCall) cOperatorAssignment_0.eContents().get(0);
-		private final Assignment cTermAssignment_1 = (Assignment) cGroup.eContents().get(1);
-		private final RuleCall cTermTermParserRuleCall_1_0 = (RuleCall) cTermAssignment_1.eContents().get(0);
-
-		// Subterm:
-		//
-		// operator=Operator? term=Term;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// operator=Operator? term=Term
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// operator=Operator?
-		public Assignment getOperatorAssignment_0() {
-			return cOperatorAssignment_0;
-		}
-
-		// Operator
-		public RuleCall getOperatorOperatorParserRuleCall_0_0() {
-			return cOperatorOperatorParserRuleCall_0_0;
-		}
-
-		// term=Term
-		public Assignment getTermAssignment_1() {
-			return cTermAssignment_1;
-		}
-
-		// Term
-		public RuleCall getTermTermParserRuleCall_1_0() {
-			return cTermTermParserRuleCall_1_0;
-		}
-	}
-
-	public class TermElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Term");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Alternatives cAlternatives_0 = (Alternatives) cGroup.eContents().get(0);
-		private final RuleCall cNumberParserRuleCall_0_0 = (RuleCall) cAlternatives_0.eContents().get(0);
-		private final RuleCall cPercentageParserRuleCall_0_1 = (RuleCall) cAlternatives_0.eContents().get(1);
-		private final RuleCall cLengthParserRuleCall_0_2 = (RuleCall) cAlternatives_0.eContents().get(2);
-		private final RuleCall cEmsParserRuleCall_0_3 = (RuleCall) cAlternatives_0.eContents().get(3);
-		private final RuleCall cExsParserRuleCall_0_4 = (RuleCall) cAlternatives_0.eContents().get(4);
-		private final RuleCall cAngleParserRuleCall_0_5 = (RuleCall) cAlternatives_0.eContents().get(5);
-		private final RuleCall cTimeParserRuleCall_0_6 = (RuleCall) cAlternatives_0.eContents().get(6);
-		private final RuleCall cFrequencyParserRuleCall_0_7 = (RuleCall) cAlternatives_0.eContents().get(7);
-		private final RuleCall cNameParserRuleCall_0_8 = (RuleCall) cAlternatives_0.eContents().get(8);
-		private final RuleCall cStringValueParserRuleCall_0_9 = (RuleCall) cAlternatives_0.eContents().get(9);
-		private final RuleCall cUriParserRuleCall_0_10 = (RuleCall) cAlternatives_0.eContents().get(10);
-		private final RuleCall cHexColorParserRuleCall_0_11 = (RuleCall) cAlternatives_0.eContents().get(11);
-		private final RuleCall cFunctionParserRuleCall_0_12 = (RuleCall) cAlternatives_0.eContents().get(12);
-		private final RuleCall cWSTerminalRuleCall_1 = (RuleCall) cGroup.eContents().get(1);
-
-		// Term:
-		//
-		// (Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor |
-		//
-		// Function) WS*;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// (Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor | Function)
-		//
-		// WS*
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor | Function
-		public Alternatives getAlternatives_0() {
-			return cAlternatives_0;
-		}
-
-		// Number
-		public RuleCall getNumberParserRuleCall_0_0() {
-			return cNumberParserRuleCall_0_0;
-		}
-
-		// Percentage
-		public RuleCall getPercentageParserRuleCall_0_1() {
-			return cPercentageParserRuleCall_0_1;
-		}
-
-		// Length
-		public RuleCall getLengthParserRuleCall_0_2() {
-			return cLengthParserRuleCall_0_2;
-		}
-
-		// Ems
-		public RuleCall getEmsParserRuleCall_0_3() {
-			return cEmsParserRuleCall_0_3;
-		}
-
-		// Exs
-		public RuleCall getExsParserRuleCall_0_4() {
-			return cExsParserRuleCall_0_4;
-		}
-
-		// Angle
-		public RuleCall getAngleParserRuleCall_0_5() {
-			return cAngleParserRuleCall_0_5;
-		}
-
-		// Time
-		public RuleCall getTimeParserRuleCall_0_6() {
-			return cTimeParserRuleCall_0_6;
-		}
-
-		// Frequency
-		public RuleCall getFrequencyParserRuleCall_0_7() {
-			return cFrequencyParserRuleCall_0_7;
-		}
-
-		// Name
-		public RuleCall getNameParserRuleCall_0_8() {
-			return cNameParserRuleCall_0_8;
-		}
-
-		// StringValue
-		public RuleCall getStringValueParserRuleCall_0_9() {
-			return cStringValueParserRuleCall_0_9;
-		}
-
-		// Uri
-		public RuleCall getUriParserRuleCall_0_10() {
-			return cUriParserRuleCall_0_10;
-		}
-
-		// HexColor
-		public RuleCall getHexColorParserRuleCall_0_11() {
-			return cHexColorParserRuleCall_0_11;
-		}
-
-		// Function
-		public RuleCall getFunctionParserRuleCall_0_12() {
-			return cFunctionParserRuleCall_0_12;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_1() {
-			return cWSTerminalRuleCall_1;
-		}
-	}
-
-	public class FunctionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Function");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cNameAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cNameIDTerminalRuleCall_0_0 = (RuleCall) cNameAssignment_0.eContents().get(0);
-		private final Keyword cLeftParenthesisKeyword_1 = (Keyword) cGroup.eContents().get(1);
-		private final RuleCall cWSTerminalRuleCall_2 = (RuleCall) cGroup.eContents().get(2);
-		private final Assignment cArgsAssignment_3 = (Assignment) cGroup.eContents().get(3);
-		private final RuleCall cArgsExpressionParserRuleCall_3_0 = (RuleCall) cArgsAssignment_3.eContents().get(0);
-		private final Keyword cRightParenthesisKeyword_4 = (Keyword) cGroup.eContents().get(4);
-
-		// Function:
-		//
-		// name=ID "(" WS* args=Expression ")";
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// name=ID "(" WS* args=Expression ")"
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// name=ID
-		public Assignment getNameAssignment_0() {
-			return cNameAssignment_0;
-		}
-
-		// ID
-		public RuleCall getNameIDTerminalRuleCall_0_0() {
-			return cNameIDTerminalRuleCall_0_0;
-		}
-
-		// "("
-		public Keyword getLeftParenthesisKeyword_1() {
-			return cLeftParenthesisKeyword_1;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_2() {
-			return cWSTerminalRuleCall_2;
-		}
-
-		// args=Expression
-		public Assignment getArgsAssignment_3() {
-			return cArgsAssignment_3;
-		}
-
-		// Expression
-		public RuleCall getArgsExpressionParserRuleCall_3_0() {
-			return cArgsExpressionParserRuleCall_3_0;
-		}
-
-		// ")"
-		public Keyword getRightParenthesisKeyword_4() {
-			return cRightParenthesisKeyword_4;
-		}
-	}
-
-	public class NameElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Name");
-		private final Assignment cValueAssignment = (Assignment) rule.eContents().get(1);
-		private final RuleCall cValueIDTerminalRuleCall_0 = (RuleCall) cValueAssignment.eContents().get(0);
-
-		// Name:
-		//
-		// value=ID;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// value=ID
-		public Assignment getValueAssignment() {
-			return cValueAssignment;
-		}
-
-		// ID
-		public RuleCall getValueIDTerminalRuleCall_0() {
-			return cValueIDTerminalRuleCall_0;
-		}
-	}
-
-	public class NumberElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Number");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cOpAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cOpUnaryOperatorParserRuleCall_0_0 = (RuleCall) cOpAssignment_0.eContents().get(0);
-		private final Assignment cValueAssignment_1 = (Assignment) cGroup.eContents().get(1);
-		private final RuleCall cValueT_NUMTerminalRuleCall_1_0 = (RuleCall) cValueAssignment_1.eContents().get(0);
-
-		// //Terms
-		// Number:
-		//
-		// op=UnaryOperator? value=T_NUM;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// op=UnaryOperator? value=T_NUM
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// op=UnaryOperator?
-		public Assignment getOpAssignment_0() {
-			return cOpAssignment_0;
-		}
-
-		// UnaryOperator
-		public RuleCall getOpUnaryOperatorParserRuleCall_0_0() {
-			return cOpUnaryOperatorParserRuleCall_0_0;
-		}
-
-		// value=T_NUM
-		public Assignment getValueAssignment_1() {
-			return cValueAssignment_1;
-		}
-
-		// T_NUM
-		public RuleCall getValueT_NUMTerminalRuleCall_1_0() {
-			return cValueT_NUMTerminalRuleCall_1_0;
-		}
-	}
-
-	public class PercentageElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Percentage");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cOpAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cOpUnaryOperatorParserRuleCall_0_0 = (RuleCall) cOpAssignment_0.eContents().get(0);
-		private final Assignment cValueAssignment_1 = (Assignment) cGroup.eContents().get(1);
-		private final RuleCall cValueT_NUMTerminalRuleCall_1_0 = (RuleCall) cValueAssignment_1.eContents().get(0);
-		private final Assignment cUnitAssignment_2 = (Assignment) cGroup.eContents().get(2);
-		private final RuleCall cUnitPC_UNITTerminalRuleCall_2_0 = (RuleCall) cUnitAssignment_2.eContents().get(0);
-
-		// Percentage:
-		//
-		// op=UnaryOperator? value=T_NUM unit=PC_UNIT;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// op=UnaryOperator? value=T_NUM unit=PC_UNIT
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// op=UnaryOperator?
-		public Assignment getOpAssignment_0() {
-			return cOpAssignment_0;
-		}
-
-		// UnaryOperator
-		public RuleCall getOpUnaryOperatorParserRuleCall_0_0() {
-			return cOpUnaryOperatorParserRuleCall_0_0;
-		}
-
-		// value=T_NUM
-		public Assignment getValueAssignment_1() {
-			return cValueAssignment_1;
-		}
-
-		// T_NUM
-		public RuleCall getValueT_NUMTerminalRuleCall_1_0() {
-			return cValueT_NUMTerminalRuleCall_1_0;
-		}
-
-		// unit=PC_UNIT
-		public Assignment getUnitAssignment_2() {
-			return cUnitAssignment_2;
-		}
-
-		// PC_UNIT
-		public RuleCall getUnitPC_UNITTerminalRuleCall_2_0() {
-			return cUnitPC_UNITTerminalRuleCall_2_0;
-		}
-	}
-
-	public class LengthElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Length");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cOpAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cOpUnaryOperatorParserRuleCall_0_0 = (RuleCall) cOpAssignment_0.eContents().get(0);
-		private final Assignment cValueAssignment_1 = (Assignment) cGroup.eContents().get(1);
-		private final RuleCall cValueT_NUMTerminalRuleCall_1_0 = (RuleCall) cValueAssignment_1.eContents().get(0);
-		private final Assignment cUnitAssignment_2 = (Assignment) cGroup.eContents().get(2);
-		private final RuleCall cUnitLEN_UNITTerminalRuleCall_2_0 = (RuleCall) cUnitAssignment_2.eContents().get(0);
-
-		// Length:
-		//
-		// op=UnaryOperator? value=T_NUM unit=LEN_UNIT;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// op=UnaryOperator? value=T_NUM unit=LEN_UNIT
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// op=UnaryOperator?
-		public Assignment getOpAssignment_0() {
-			return cOpAssignment_0;
-		}
-
-		// UnaryOperator
-		public RuleCall getOpUnaryOperatorParserRuleCall_0_0() {
-			return cOpUnaryOperatorParserRuleCall_0_0;
-		}
-
-		// value=T_NUM
-		public Assignment getValueAssignment_1() {
-			return cValueAssignment_1;
-		}
-
-		// T_NUM
-		public RuleCall getValueT_NUMTerminalRuleCall_1_0() {
-			return cValueT_NUMTerminalRuleCall_1_0;
-		}
-
-		// unit=LEN_UNIT
-		public Assignment getUnitAssignment_2() {
-			return cUnitAssignment_2;
-		}
-
-		// LEN_UNIT
-		public RuleCall getUnitLEN_UNITTerminalRuleCall_2_0() {
-			return cUnitLEN_UNITTerminalRuleCall_2_0;
-		}
-	}
-
-	public class EmsElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Ems");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cOpAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cOpUnaryOperatorParserRuleCall_0_0 = (RuleCall) cOpAssignment_0.eContents().get(0);
-		private final Assignment cValueAssignment_1 = (Assignment) cGroup.eContents().get(1);
-		private final RuleCall cValueT_NUMTerminalRuleCall_1_0 = (RuleCall) cValueAssignment_1.eContents().get(0);
-		private final Assignment cUnitAssignment_2 = (Assignment) cGroup.eContents().get(2);
-		private final RuleCall cUnitEM_UNITTerminalRuleCall_2_0 = (RuleCall) cUnitAssignment_2.eContents().get(0);
-
-		// Ems:
-		//
-		// op=UnaryOperator? value=T_NUM unit=EM_UNIT;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// op=UnaryOperator? value=T_NUM unit=EM_UNIT
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// op=UnaryOperator?
-		public Assignment getOpAssignment_0() {
-			return cOpAssignment_0;
-		}
-
-		// UnaryOperator
-		public RuleCall getOpUnaryOperatorParserRuleCall_0_0() {
-			return cOpUnaryOperatorParserRuleCall_0_0;
-		}
-
-		// value=T_NUM
-		public Assignment getValueAssignment_1() {
-			return cValueAssignment_1;
-		}
-
-		// T_NUM
-		public RuleCall getValueT_NUMTerminalRuleCall_1_0() {
-			return cValueT_NUMTerminalRuleCall_1_0;
-		}
-
-		// unit=EM_UNIT
-		public Assignment getUnitAssignment_2() {
-			return cUnitAssignment_2;
-		}
-
-		// EM_UNIT
-		public RuleCall getUnitEM_UNITTerminalRuleCall_2_0() {
-			return cUnitEM_UNITTerminalRuleCall_2_0;
-		}
-	}
-
-	public class ExsElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Exs");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cOpAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cOpUnaryOperatorParserRuleCall_0_0 = (RuleCall) cOpAssignment_0.eContents().get(0);
-		private final Assignment cValueAssignment_1 = (Assignment) cGroup.eContents().get(1);
-		private final RuleCall cValueT_NUMTerminalRuleCall_1_0 = (RuleCall) cValueAssignment_1.eContents().get(0);
-		private final Assignment cUnitAssignment_2 = (Assignment) cGroup.eContents().get(2);
-		private final RuleCall cUnitEX_UNITTerminalRuleCall_2_0 = (RuleCall) cUnitAssignment_2.eContents().get(0);
-
-		// Exs:
-		//
-		// op=UnaryOperator? value=T_NUM unit=EX_UNIT;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// op=UnaryOperator? value=T_NUM unit=EX_UNIT
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// op=UnaryOperator?
-		public Assignment getOpAssignment_0() {
-			return cOpAssignment_0;
-		}
-
-		// UnaryOperator
-		public RuleCall getOpUnaryOperatorParserRuleCall_0_0() {
-			return cOpUnaryOperatorParserRuleCall_0_0;
-		}
-
-		// value=T_NUM
-		public Assignment getValueAssignment_1() {
-			return cValueAssignment_1;
-		}
-
-		// T_NUM
-		public RuleCall getValueT_NUMTerminalRuleCall_1_0() {
-			return cValueT_NUMTerminalRuleCall_1_0;
-		}
-
-		// unit=EX_UNIT
-		public Assignment getUnitAssignment_2() {
-			return cUnitAssignment_2;
-		}
-
-		// EX_UNIT
-		public RuleCall getUnitEX_UNITTerminalRuleCall_2_0() {
-			return cUnitEX_UNITTerminalRuleCall_2_0;
-		}
-	}
-
-	public class AngleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Angle");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cOpAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cOpUnaryOperatorParserRuleCall_0_0 = (RuleCall) cOpAssignment_0.eContents().get(0);
-		private final Assignment cValueAssignment_1 = (Assignment) cGroup.eContents().get(1);
-		private final RuleCall cValueT_NUMTerminalRuleCall_1_0 = (RuleCall) cValueAssignment_1.eContents().get(0);
-		private final Assignment cUnitAssignment_2 = (Assignment) cGroup.eContents().get(2);
-		private final RuleCall cUnitANGLE_UNITTerminalRuleCall_2_0 = (RuleCall) cUnitAssignment_2.eContents().get(0);
-
-		// Angle:
-		//
-		// op=UnaryOperator? value=T_NUM unit=ANGLE_UNIT;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// op=UnaryOperator? value=T_NUM unit=ANGLE_UNIT
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// op=UnaryOperator?
-		public Assignment getOpAssignment_0() {
-			return cOpAssignment_0;
-		}
-
-		// UnaryOperator
-		public RuleCall getOpUnaryOperatorParserRuleCall_0_0() {
-			return cOpUnaryOperatorParserRuleCall_0_0;
-		}
-
-		// value=T_NUM
-		public Assignment getValueAssignment_1() {
-			return cValueAssignment_1;
-		}
-
-		// T_NUM
-		public RuleCall getValueT_NUMTerminalRuleCall_1_0() {
-			return cValueT_NUMTerminalRuleCall_1_0;
-		}
-
-		// unit=ANGLE_UNIT
-		public Assignment getUnitAssignment_2() {
-			return cUnitAssignment_2;
-		}
-
-		// ANGLE_UNIT
-		public RuleCall getUnitANGLE_UNITTerminalRuleCall_2_0() {
-			return cUnitANGLE_UNITTerminalRuleCall_2_0;
-		}
-	}
-
-	public class TimeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Time");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cOpAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cOpUnaryOperatorParserRuleCall_0_0 = (RuleCall) cOpAssignment_0.eContents().get(0);
-		private final Assignment cValueAssignment_1 = (Assignment) cGroup.eContents().get(1);
-		private final RuleCall cValueT_NUMTerminalRuleCall_1_0 = (RuleCall) cValueAssignment_1.eContents().get(0);
-		private final Assignment cUnitAssignment_2 = (Assignment) cGroup.eContents().get(2);
-		private final RuleCall cUnitTIME_UNITTerminalRuleCall_2_0 = (RuleCall) cUnitAssignment_2.eContents().get(0);
-
-		// Time:
-		//
-		// op=UnaryOperator? value=T_NUM unit=TIME_UNIT;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// op=UnaryOperator? value=T_NUM unit=TIME_UNIT
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// op=UnaryOperator?
-		public Assignment getOpAssignment_0() {
-			return cOpAssignment_0;
-		}
-
-		// UnaryOperator
-		public RuleCall getOpUnaryOperatorParserRuleCall_0_0() {
-			return cOpUnaryOperatorParserRuleCall_0_0;
-		}
-
-		// value=T_NUM
-		public Assignment getValueAssignment_1() {
-			return cValueAssignment_1;
-		}
-
-		// T_NUM
-		public RuleCall getValueT_NUMTerminalRuleCall_1_0() {
-			return cValueT_NUMTerminalRuleCall_1_0;
-		}
-
-		// unit=TIME_UNIT
-		public Assignment getUnitAssignment_2() {
-			return cUnitAssignment_2;
-		}
-
-		// TIME_UNIT
-		public RuleCall getUnitTIME_UNITTerminalRuleCall_2_0() {
-			return cUnitTIME_UNITTerminalRuleCall_2_0;
-		}
-	}
-
-	public class FrequencyElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Frequency");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cOpAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cOpUnaryOperatorParserRuleCall_0_0 = (RuleCall) cOpAssignment_0.eContents().get(0);
-		private final Assignment cValueAssignment_1 = (Assignment) cGroup.eContents().get(1);
-		private final RuleCall cValueT_NUMTerminalRuleCall_1_0 = (RuleCall) cValueAssignment_1.eContents().get(0);
-		private final Assignment cUnitAssignment_2 = (Assignment) cGroup.eContents().get(2);
-		private final RuleCall cUnitFREQ_UNITTerminalRuleCall_2_0 = (RuleCall) cUnitAssignment_2.eContents().get(0);
-
-		// Frequency:
-		//
-		// op=UnaryOperator? value=T_NUM unit=FREQ_UNIT;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// op=UnaryOperator? value=T_NUM unit=FREQ_UNIT
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// op=UnaryOperator?
-		public Assignment getOpAssignment_0() {
-			return cOpAssignment_0;
-		}
-
-		// UnaryOperator
-		public RuleCall getOpUnaryOperatorParserRuleCall_0_0() {
-			return cOpUnaryOperatorParserRuleCall_0_0;
-		}
-
-		// value=T_NUM
-		public Assignment getValueAssignment_1() {
-			return cValueAssignment_1;
-		}
-
-		// T_NUM
-		public RuleCall getValueT_NUMTerminalRuleCall_1_0() {
-			return cValueT_NUMTerminalRuleCall_1_0;
-		}
-
-		// unit=FREQ_UNIT
-		public Assignment getUnitAssignment_2() {
-			return cUnitAssignment_2;
-		}
-
-		// FREQ_UNIT
-		public RuleCall getUnitFREQ_UNITTerminalRuleCall_2_0() {
-			return cUnitFREQ_UNITTerminalRuleCall_2_0;
-		}
-	}
-
-	public class UriElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Uri");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Keyword cUrlKeyword_0 = (Keyword) cGroup.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_1 = (RuleCall) cGroup.eContents().get(1);
-		private final Assignment cValueAssignment_2 = (Assignment) cGroup.eContents().get(2);
-		private final RuleCall cValueSTRINGTerminalRuleCall_2_0 = (RuleCall) cValueAssignment_2.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_3 = (RuleCall) cGroup.eContents().get(3);
-		private final Keyword cRightParenthesisKeyword_4 = (Keyword) cGroup.eContents().get(4);
-
-		// / * | 'url(' WS? url=URL WS? ')' * / //TODO
-		// Uri:
-		//
-		// "url(" WS? value=STRING WS? ")";
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// "url(" WS? value=STRING WS? ")"
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// "url("
-		public Keyword getUrlKeyword_0() {
-			return cUrlKeyword_0;
-		}
-
-		// WS?
-		public RuleCall getWSTerminalRuleCall_1() {
-			return cWSTerminalRuleCall_1;
-		}
-
-		// value=STRING
-		public Assignment getValueAssignment_2() {
-			return cValueAssignment_2;
-		}
-
-		// STRING
-		public RuleCall getValueSTRINGTerminalRuleCall_2_0() {
-			return cValueSTRINGTerminalRuleCall_2_0;
-		}
-
-		// WS?
-		public RuleCall getWSTerminalRuleCall_3() {
-			return cWSTerminalRuleCall_3;
-		}
-
-		// ")"
-		public Keyword getRightParenthesisKeyword_4() {
-			return cRightParenthesisKeyword_4;
-		}
-	}
-
-	public class StringValueElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StringValue");
-		private final Assignment cValueAssignment = (Assignment) rule.eContents().get(1);
-		private final RuleCall cValueSTRINGTerminalRuleCall_0 = (RuleCall) cValueAssignment.eContents().get(0);
-
-		// StringValue:
-		//
-		// value=STRING;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// value=STRING
-		public Assignment getValueAssignment() {
-			return cValueAssignment;
-		}
-
-		// STRING
-		public RuleCall getValueSTRINGTerminalRuleCall_0() {
-			return cValueSTRINGTerminalRuleCall_0;
-		}
-	}
-
-	public class HexColorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "HexColor");
-		private final Assignment cValueAssignment = (Assignment) rule.eContents().get(1);
-		private final RuleCall cValueHASHTerminalRuleCall_0 = (RuleCall) cValueAssignment.eContents().get(0);
-
-		// //terminal URL:
-		// // (('!' | '#' | '$' | '%' | '&' | '*' | '-' | '~') / * | NON_ASCII | ESCAPE * /)*;
-		//
-		//
-		// //terminal NON_ASCII:
-		// // (\0240..\0377) //Chars 160 to 255
-		// //;
-		// //terminal UNICODE:
-		//
-		//
-		// // '\\' HEXA (HEXA (HEXA (HEXA (HEXA (HEXA)?)?)?)?)? ('\r\n' | ' ' | '\t' | '\r' | '\n')?;
-		// //
-		// //terminal ESCAPE:
-		//
-		//
-		// // UNICODE | ('\\' !('\r' | '\n' | '0'..'9' | 'a'..'f' | 'A'..'F'));
-		// HexColor:
-		//
-		// value=HASH;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// value=HASH
-		public Assignment getValueAssignment() {
-			return cValueAssignment;
-		}
-
-		// HASH
-		public RuleCall getValueHASHTerminalRuleCall_0() {
-			return cValueHASHTerminalRuleCall_0;
-		}
-	}
-
-	public class OperatorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Operator");
-		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);
-		private final Group cGroup_0 = (Group) cAlternatives.eContents().get(0);
-		private final Keyword cSolidusKeyword_0_0 = (Keyword) cGroup_0.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_0_1 = (RuleCall) cGroup_0.eContents().get(1);
-		private final Group cGroup_1 = (Group) cAlternatives.eContents().get(1);
-		private final Keyword cCommaKeyword_1_0 = (Keyword) cGroup_1.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_1_1 = (RuleCall) cGroup_1.eContents().get(1);
-
-		// Operator:
-		//
-		// "/" WS* | "," WS*;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// "/" WS* | "," WS*
-		public Alternatives getAlternatives() {
-			return cAlternatives;
-		}
-
-		// "/" WS*
-		public Group getGroup_0() {
-			return cGroup_0;
-		}
-
-		// "/"
-		public Keyword getSolidusKeyword_0_0() {
-			return cSolidusKeyword_0_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_0_1() {
-			return cWSTerminalRuleCall_0_1;
-		}
-
-		// "," WS*
-		public Group getGroup_1() {
-			return cGroup_1;
-		}
-
-		// ","
-		public Keyword getCommaKeyword_1_0() {
-			return cCommaKeyword_1_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_1_1() {
-			return cWSTerminalRuleCall_1_1;
-		}
-	}
-
-	public class ClassElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Class");
-		private final Assignment cClassAssignment = (Assignment) rule.eContents().get(1);
-		private final RuleCall cClassT_CLASSTerminalRuleCall_0 = (RuleCall) cClassAssignment.eContents().get(0);
-
-		// Class:
-		//
-		// class=T_CLASS;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// class=T_CLASS
-		public Assignment getClassAssignment() {
-			return cClassAssignment;
-		}
-
-		// T_CLASS
-		public RuleCall getClassT_CLASSTerminalRuleCall_0() {
-			return cClassT_CLASSTerminalRuleCall_0;
-		}
-	}
-
-	public class AttributeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Attribute");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Keyword cLeftSquareBracketKeyword_0 = (Keyword) cGroup.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_1 = (RuleCall) cGroup.eContents().get(1);
-		private final Assignment cNameAssignment_2 = (Assignment) cGroup.eContents().get(2);
-		private final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall) cNameAssignment_2.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_3 = (RuleCall) cGroup.eContents().get(3);
-		private final Assignment cValueAssignment_4 = (Assignment) cGroup.eContents().get(4);
-		private final RuleCall cValueAttributeValueParserRuleCall_4_0 = (RuleCall) cValueAssignment_4.eContents().get(0);
-		private final Keyword cRightSquareBracketKeyword_5 = (Keyword) cGroup.eContents().get(5);
-
-		// Attribute:
-		//
-		// "[" WS* name=ID WS* value=AttributeValue? "]";
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// "[" WS* name=ID WS* value=AttributeValue? "]"
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// "["
-		public Keyword getLeftSquareBracketKeyword_0() {
-			return cLeftSquareBracketKeyword_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_1() {
-			return cWSTerminalRuleCall_1;
-		}
-
-		// name=ID
-		public Assignment getNameAssignment_2() {
-			return cNameAssignment_2;
-		}
-
-		// ID
-		public RuleCall getNameIDTerminalRuleCall_2_0() {
-			return cNameIDTerminalRuleCall_2_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_3() {
-			return cWSTerminalRuleCall_3;
-		}
-
-		// value=AttributeValue?
-		public Assignment getValueAssignment_4() {
-			return cValueAssignment_4;
-		}
-
-		// AttributeValue
-		public RuleCall getValueAttributeValueParserRuleCall_4_0() {
-			return cValueAttributeValueParserRuleCall_4_0;
-		}
-
-		// "]"
-		public Keyword getRightSquareBracketKeyword_5() {
-			return cRightSquareBracketKeyword_5;
-		}
-	}
-
-	public class AttributeValueElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AttributeValue");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Assignment cOperatorAssignment_0 = (Assignment) cGroup.eContents().get(0);
-		private final RuleCall cOperatorATTRIBUTE_OPEnumRuleCall_0_0 = (RuleCall) cOperatorAssignment_0.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_1 = (RuleCall) cGroup.eContents().get(1);
-		private final Assignment cValueAssignment_2 = (Assignment) cGroup.eContents().get(2);
-		private final Alternatives cValueAlternatives_2_0 = (Alternatives) cValueAssignment_2.eContents().get(0);
-		private final RuleCall cValueIDTerminalRuleCall_2_0_0 = (RuleCall) cValueAlternatives_2_0.eContents().get(0);
-		private final RuleCall cValueSTRINGTerminalRuleCall_2_0_1 = (RuleCall) cValueAlternatives_2_0.eContents().get(1);
-		private final RuleCall cWSTerminalRuleCall_3 = (RuleCall) cGroup.eContents().get(3);
-
-		// AttributeValue:
-		//
-		// operator=ATTRIBUTE_OP WS* value=(ID | STRING) WS*;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// operator=ATTRIBUTE_OP WS* value=(ID | STRING) WS*
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// operator=ATTRIBUTE_OP
-		public Assignment getOperatorAssignment_0() {
-			return cOperatorAssignment_0;
-		}
-
-		// ATTRIBUTE_OP
-		public RuleCall getOperatorATTRIBUTE_OPEnumRuleCall_0_0() {
-			return cOperatorATTRIBUTE_OPEnumRuleCall_0_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_1() {
-			return cWSTerminalRuleCall_1;
-		}
-
-		// value=(ID | STRING)
-		public Assignment getValueAssignment_2() {
-			return cValueAssignment_2;
-		}
-
-		// ID | STRING
-		public Alternatives getValueAlternatives_2_0() {
-			return cValueAlternatives_2_0;
-		}
-
-		// ID
-		public RuleCall getValueIDTerminalRuleCall_2_0_0() {
-			return cValueIDTerminalRuleCall_2_0_0;
-		}
-
-		// STRING
-		public RuleCall getValueSTRINGTerminalRuleCall_2_0_1() {
-			return cValueSTRINGTerminalRuleCall_2_0_1;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_3() {
-			return cWSTerminalRuleCall_3;
-		}
-	}
-
-	public class PseudoElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Pseudo");
-		private final Group cGroup = (Group) rule.eContents().get(1);
-		private final Keyword cColonKeyword_0 = (Keyword) cGroup.eContents().get(0);
-		private final Alternatives cAlternatives_1 = (Alternatives) cGroup.eContents().get(1);
-		private final Assignment cPseudoAssignment_1_0 = (Assignment) cAlternatives_1.eContents().get(0);
-		private final RuleCall cPseudoIDTerminalRuleCall_1_0_0 = (RuleCall) cPseudoAssignment_1_0.eContents().get(0);
-		private final Group cGroup_1_1 = (Group) cAlternatives_1.eContents().get(1);
-		private final Assignment cPseudoAssignment_1_1_0 = (Assignment) cGroup_1_1.eContents().get(0);
-		private final RuleCall cPseudoIDTerminalRuleCall_1_1_0_0 = (RuleCall) cPseudoAssignment_1_1_0.eContents().get(0);
-		private final Keyword cLeftParenthesisKeyword_1_1_1 = (Keyword) cGroup_1_1.eContents().get(1);
-		private final RuleCall cWSTerminalRuleCall_1_1_2 = (RuleCall) cGroup_1_1.eContents().get(2);
-		private final Group cGroup_1_1_3 = (Group) cGroup_1_1.eContents().get(3);
-		private final Assignment cArgsAssignment_1_1_3_0 = (Assignment) cGroup_1_1_3.eContents().get(0);
-		private final RuleCall cArgsIDTerminalRuleCall_1_1_3_0_0 = (RuleCall) cArgsAssignment_1_1_3_0.eContents().get(0);
-		private final RuleCall cWSTerminalRuleCall_1_1_3_1 = (RuleCall) cGroup_1_1_3.eContents().get(1);
-		private final Keyword cRightParenthesisKeyword_1_1_4 = (Keyword) cGroup_1_1.eContents().get(4);
-
-		// Pseudo:
-		//
-		// ":" (pseudo=ID | pseudo=ID "(" WS* (args=ID WS*)? ")");
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// ":" (pseudo=ID | pseudo=ID "(" WS* (args=ID WS*)? ")")
-		public Group getGroup() {
-			return cGroup;
-		}
-
-		// ":"
-		public Keyword getColonKeyword_0() {
-			return cColonKeyword_0;
-		}
-
-		// pseudo=ID | pseudo=ID "(" WS* (args=ID WS*)? ")"
-		public Alternatives getAlternatives_1() {
-			return cAlternatives_1;
-		}
-
-		// pseudo=ID
-		public Assignment getPseudoAssignment_1_0() {
-			return cPseudoAssignment_1_0;
-		}
-
-		// ID
-		public RuleCall getPseudoIDTerminalRuleCall_1_0_0() {
-			return cPseudoIDTerminalRuleCall_1_0_0;
-		}
-
-		// pseudo=ID "(" WS* (args=ID WS*)? ")"
-		public Group getGroup_1_1() {
-			return cGroup_1_1;
-		}
-
-		// pseudo=ID
-		public Assignment getPseudoAssignment_1_1_0() {
-			return cPseudoAssignment_1_1_0;
-		}
-
-		// ID
-		public RuleCall getPseudoIDTerminalRuleCall_1_1_0_0() {
-			return cPseudoIDTerminalRuleCall_1_1_0_0;
-		}
-
-		// "("
-		public Keyword getLeftParenthesisKeyword_1_1_1() {
-			return cLeftParenthesisKeyword_1_1_1;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_1_1_2() {
-			return cWSTerminalRuleCall_1_1_2;
-		}
-
-		// (args=ID WS*)?
-		public Group getGroup_1_1_3() {
-			return cGroup_1_1_3;
-		}
-
-		// args=ID
-		public Assignment getArgsAssignment_1_1_3_0() {
-			return cArgsAssignment_1_1_3_0;
-		}
-
-		// ID
-		public RuleCall getArgsIDTerminalRuleCall_1_1_3_0_0() {
-			return cArgsIDTerminalRuleCall_1_1_3_0_0;
-		}
-
-		// WS*
-		public RuleCall getWSTerminalRuleCall_1_1_3_1() {
-			return cWSTerminalRuleCall_1_1_3_1;
-		}
-
-		// ")"
-		public Keyword getRightParenthesisKeyword_1_1_4() {
-			return cRightParenthesisKeyword_1_1_4;
-		}
-	}
-
-	public class CSSIdElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "CSSId");
-		private final Assignment cValueAssignment = (Assignment) rule.eContents().get(1);
-		private final RuleCall cValueHASHTerminalRuleCall_0 = (RuleCall) cValueAssignment.eContents().get(0);
-
-		// CSSId:
-		//
-		// value=HASH;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// value=HASH
-		public Assignment getValueAssignment() {
-			return cValueAssignment;
-		}
-
-		// HASH
-		public RuleCall getValueHASHTerminalRuleCall_0() {
-			return cValueHASHTerminalRuleCall_0;
-		}
-	}
-
-	public class UnaryOperatorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UnaryOperator");
-		private final Assignment cOperatorAssignment = (Assignment) rule.eContents().get(1);
-		private final RuleCall cOperatorUNARYEnumRuleCall_0 = (RuleCall) cOperatorAssignment.eContents().get(0);
-
-		// UnaryOperator:
-		//
-		// operator=UNARY;
-		@Override
-		public ParserRule getRule() {
-			return rule;
-		}
-
-		// operator=UNARY
-		public Assignment getOperatorAssignment() {
-			return cOperatorAssignment;
-		}
-
-		// UNARY
-		public RuleCall getOperatorUNARYEnumRuleCall_0() {
-			return cOperatorUNARYEnumRuleCall_0;
-		}
-	}
-
-
-	public class UNARYElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "UNARY");
-		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);
-		private final EnumLiteralDeclaration cNEGEnumLiteralDeclaration_0 = (EnumLiteralDeclaration) cAlternatives.eContents().get(0);
-		private final Keyword cNEGHyphenMinusKeyword_0_0 = (Keyword) cNEGEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cPLUSEnumLiteralDeclaration_1 = (EnumLiteralDeclaration) cAlternatives.eContents().get(1);
-		private final Keyword cPLUSPlusSignKeyword_1_0 = (Keyword) cPLUSEnumLiteralDeclaration_1.eContents().get(0);
-
-		// enum UNARY:
-		//
-		// NEG="-" | PLUS="+";
-		@Override
-		public EnumRule getRule() {
-			return rule;
-		}
-
-		// NEG="-" | PLUS="+"
-		public Alternatives getAlternatives() {
-			return cAlternatives;
-		}
-
-		// NEG="-"
-		public EnumLiteralDeclaration getNEGEnumLiteralDeclaration_0() {
-			return cNEGEnumLiteralDeclaration_0;
-		}
-
-		// "-"
-		public Keyword getNEGHyphenMinusKeyword_0_0() {
-			return cNEGHyphenMinusKeyword_0_0;
-		}
-
-		// PLUS="+"
-		public EnumLiteralDeclaration getPLUSEnumLiteralDeclaration_1() {
-			return cPLUSEnumLiteralDeclaration_1;
-		}
-
-		// "+"
-		public Keyword getPLUSPlusSignKeyword_1_0() {
-			return cPLUSPlusSignKeyword_1_0;
-		}
-	}
-
-	public class KINDElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "KIND");
-		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);
-		private final EnumLiteralDeclaration cFIRST_CHILDEnumLiteralDeclaration_0 = (EnumLiteralDeclaration) cAlternatives.eContents().get(0);
-		private final Keyword cFIRST_CHILDGreaterThanSignKeyword_0_0 = (Keyword) cFIRST_CHILDEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cSIBLINGEnumLiteralDeclaration_1 = (EnumLiteralDeclaration) cAlternatives.eContents().get(1);
-		private final Keyword cSIBLINGPlusSignKeyword_1_0 = (Keyword) cSIBLINGEnumLiteralDeclaration_1.eContents().get(0);
-
-		// enum KIND:
-		//
-		// FIRST_CHILD=">" | SIBLING="+";
-		@Override
-		public EnumRule getRule() {
-			return rule;
-		}
-
-		// FIRST_CHILD=">" | SIBLING="+"
-		public Alternatives getAlternatives() {
-			return cAlternatives;
-		}
-
-		// FIRST_CHILD=">"
-		public EnumLiteralDeclaration getFIRST_CHILDEnumLiteralDeclaration_0() {
-			return cFIRST_CHILDEnumLiteralDeclaration_0;
-		}
-
-		// ">"
-		public Keyword getFIRST_CHILDGreaterThanSignKeyword_0_0() {
-			return cFIRST_CHILDGreaterThanSignKeyword_0_0;
-		}
-
-		// SIBLING="+"
-		public EnumLiteralDeclaration getSIBLINGEnumLiteralDeclaration_1() {
-			return cSIBLINGEnumLiteralDeclaration_1;
-		}
-
-		// "+"
-		public Keyword getSIBLINGPlusSignKeyword_1_0() {
-			return cSIBLINGPlusSignKeyword_1_0;
-		}
-	}
-
-	public class ATTRIBUTE_OPElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "ATTRIBUTE_OP");
-		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);
-		private final EnumLiteralDeclaration cEQUALSEnumLiteralDeclaration_0 = (EnumLiteralDeclaration) cAlternatives.eContents().get(0);
-		private final Keyword cEQUALSEqualsSignKeyword_0_0 = (Keyword) cEQUALSEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cCONTAINSEnumLiteralDeclaration_1 = (EnumLiteralDeclaration) cAlternatives.eContents().get(1);
-		private final Keyword cCONTAINSTildeEqualsSignKeyword_1_0 = (Keyword) cCONTAINSEnumLiteralDeclaration_1.eContents().get(0);
-		private final EnumLiteralDeclaration cUNEQUALSEnumLiteralDeclaration_2 = (EnumLiteralDeclaration) cAlternatives.eContents().get(2);
-		private final Keyword cUNEQUALSExclamationMarkEqualsSignKeyword_2_0 = (Keyword) cUNEQUALSEnumLiteralDeclaration_2.eContents().get(0);
-
-		// enum ATTRIBUTE_OP:
-		//
-		// EQUALS="=" | CONTAINS="~=" | UNEQUALS="!=";
-		@Override
-		public EnumRule getRule() {
-			return rule;
-		}
-
-		// EQUALS="=" | CONTAINS="~=" | UNEQUALS="!="
-		public Alternatives getAlternatives() {
-			return cAlternatives;
-		}
-
-		// EQUALS="="
-		public EnumLiteralDeclaration getEQUALSEnumLiteralDeclaration_0() {
-			return cEQUALSEnumLiteralDeclaration_0;
-		}
-
-		// "="
-		public Keyword getEQUALSEqualsSignKeyword_0_0() {
-			return cEQUALSEqualsSignKeyword_0_0;
-		}
-
-		// CONTAINS="~="
-		public EnumLiteralDeclaration getCONTAINSEnumLiteralDeclaration_1() {
-			return cCONTAINSEnumLiteralDeclaration_1;
-		}
-
-		// "~="
-		public Keyword getCONTAINSTildeEqualsSignKeyword_1_0() {
-			return cCONTAINSTildeEqualsSignKeyword_1_0;
-		}
-
-		// UNEQUALS="!="
-		public EnumLiteralDeclaration getUNEQUALSEnumLiteralDeclaration_2() {
-			return cUNEQUALSEnumLiteralDeclaration_2;
-		}
-
-		// "!="
-		public Keyword getUNEQUALSExclamationMarkEqualsSignKeyword_2_0() {
-			return cUNEQUALSExclamationMarkEqualsSignKeyword_2_0;
-		}
-	}
-
-	private StylesheetElements pStylesheet;
-	private ContentElements pContent;
-	private ImportElements pImport;
-	private MediaElements pMedia;
-	private PageElements pPage;
-	private PseudoPageElements pPseudoPage;
-	private RulesetElements pRuleset;
-	private SelectorElements pSelector;
-	private CompositeSelectorElements pCompositeSelector;
-	private SimpleSelectorElements pSimpleSelector;
-	private SelectorConditionElements pSelectorCondition;
-	private CombinatorElements pCombinator;
-	private DeclarationElements pDeclaration;
-	private ExpressionElements pExpression;
-	private SubtermElements pSubterm;
-	private TermElements pTerm;
-	private FunctionElements pFunction;
-	private NameElements pName;
-	private NumberElements pNumber;
-	private PercentageElements pPercentage;
-	private LengthElements pLength;
-	private EmsElements pEms;
-	private ExsElements pExs;
-	private AngleElements pAngle;
-	private TimeElements pTime;
-	private FrequencyElements pFrequency;
-	private UriElements pUri;
-	private StringValueElements pStringValue;
-	private HexColorElements pHexColor;
-	private OperatorElements pOperator;
-	private ClassElements pClass;
-	private AttributeElements pAttribute;
-	private AttributeValueElements pAttributeValue;
-	private PseudoElements pPseudo;
-	private CSSIdElements pCSSId;
-	private UnaryOperatorElements pUnaryOperator;
-	private UNARYElements unknownRuleUNARY;
-	private KINDElements unknownRuleKIND;
-	private ATTRIBUTE_OPElements unknownRuleATTRIBUTE_OP;
-	private TerminalRule tHASH;
-	private TerminalRule tT_CLASS;
-	private TerminalRule tT_IMPORTANT;
-	private TerminalRule tPC_UNIT;
-	private TerminalRule tLEN_UNIT;
-	private TerminalRule tEM_UNIT;
-	private TerminalRule tEX_UNIT;
-	private TerminalRule tANGLE_UNIT;
-	private TerminalRule tTIME_UNIT;
-	private TerminalRule tFREQ_UNIT;
-	private TerminalRule tT_NUM;
-	private TerminalRule tID;
-	private TerminalRule tSTRING;
-	private TerminalRule tCDO;
-	private TerminalRule tCDC;
-	private TerminalRule tML_COMMENT;
-	private TerminalRule tWS;
-	private TerminalRule tANY_OTHER;
-
-	private final Grammar grammar;
-
-	@Inject
-	public CSSGrammarAccess(GrammarProvider grammarProvider) {
-		this.grammar = internalFindGrammar(grammarProvider);
-	}
-
-	protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
-		Grammar grammar = grammarProvider.getGrammar(this);
-		while (grammar != null) {
-			if ("org.eclipse.papyrus.infra.gmfdiag.CSS".equals(grammar.getName())) {
-				return grammar;
-			}
-			List<Grammar> grammars = grammar.getUsedGrammars();
-			if (!grammars.isEmpty()) {
-				grammar = grammars.iterator().next();
-			} else {
-				return null;
-			}
-		}
-		return grammar;
-	}
-
-
-	@Override
-	public Grammar getGrammar() {
-		return grammar;
-	}
-
-
-
-	// //Do not create a Stylesheet for WS* (This seems to cause a serialization problem when editing an EMF Model from an Empty file)
-	//
-	//
-	// //Do not ignore WS as @charset must be followed by exactly one Space.
-	// Stylesheet:
-	//
-	// ("@charset " charset=STRING ";")? (WS | CDO | CDC)* (imports+=Import (CDO WS* | CDC WS*)*)* (contents+=Content (CDO
-	//
-	// WS* | CDC WS*)*)*;
-	public StylesheetElements getStylesheetAccess() {
-		return (pStylesheet != null) ? pStylesheet : (pStylesheet = new StylesheetElements());
-	}
-
-	public ParserRule getStylesheetRule() {
-		return getStylesheetAccess().getRule();
-	}
-
-	// Content:
-	//
-	// Ruleset | Media | Page;
-	public ContentElements getContentAccess() {
-		return (pContent != null) ? pContent : (pContent = new ContentElements());
-	}
-
-	public ParserRule getContentRule() {
-		return getContentAccess().getRule();
-	}
-
-	// Import:
-	//
-	// "@import" (WS* string=STRING | WS uri=Uri) WS* (media+=ID WS* ("," WS* media+=ID)*)? ";" WS*;
-	public ImportElements getImportAccess() {
-		return (pImport != null) ? pImport : (pImport = new ImportElements());
-	}
-
-	public ParserRule getImportRule() {
-		return getImportAccess().getRule();
-	}
-
-	// Media:
-	//
-	// "@media" WS media+=ID WS* ("," WS* media+=ID)* "{" WS* rules+=Ruleset* "}" WS*;
-	public MediaElements getMediaAccess() {
-		return (pMedia != null) ? pMedia : (pMedia = new MediaElements());
-	}
-
-	public ParserRule getMediaRule() {
-		return getMediaAccess().getRule();
-	}
-
-	// Page:
-	//
-	// {Page} "@page" WS* pseudo=PseudoPage? "{" WS* declarations+=Declaration? (";" WS* declarations+=Declaration?)* "}"
-	//
-	// WS*;
-	public PageElements getPageAccess() {
-		return (pPage != null) ? pPage : (pPage = new PageElements());
-	}
-
-	public ParserRule getPageRule() {
-		return getPageAccess().getRule();
-	}
-
-	// PseudoPage:
-	//
-	// ":" id=ID WS*;
-	public PseudoPageElements getPseudoPageAccess() {
-		return (pPseudoPage != null) ? pPseudoPage : (pPseudoPage = new PseudoPageElements());
-	}
-
-	public ParserRule getPseudoPageRule() {
-		return getPseudoPageAccess().getRule();
-	}
-
-	// Ruleset:
-	//
-	// selectors+=Selector ("," WS* selectors+=Selector)* "{" WS* properties+=Declaration? (";" WS*
-	//
-	// properties+=Declaration?)* "}" WS*;
-	public RulesetElements getRulesetAccess() {
-		return (pRuleset != null) ? pRuleset : (pRuleset = new RulesetElements());
-	}
-
-	public ParserRule getRulesetRule() {
-		return getRulesetAccess().getRule();
-	}
-
-	// Selector:
-	//
-	// SimpleSelector WS* | CompositeSelector;
-	public SelectorElements getSelectorAccess() {
-		return (pSelector != null) ? pSelector : (pSelector = new SelectorElements());
-	}
-
-	public ParserRule getSelectorRule() {
-		return getSelectorAccess().getRule();
-	}
-
-	// //left=SimpleSelector (combinator=Combinator right=Selector | WS+ (combinator=Combinator? right=Selector)?)?;
-	//
-	//
-	// CompositeSelector:
-	//
-	// left=SimpleSelector (WS+ | WS* combinator=Combinator) right=Selector;
-	public CompositeSelectorElements getCompositeSelectorAccess() {
-		return (pCompositeSelector != null) ? pCompositeSelector : (pCompositeSelector = new CompositeSelectorElements());
-	}
-
-	public ParserRule getCompositeSelectorRule() {
-		return getCompositeSelectorAccess().getRule();
-	}
-
-	// SimpleSelector:
-	//
-	// elementName=(ID | "*") condition+=SelectorCondition* | condition+=SelectorCondition+;
-	public SimpleSelectorElements getSimpleSelectorAccess() {
-		return (pSimpleSelector != null) ? pSimpleSelector : (pSimpleSelector = new SimpleSelectorElements());
-	}
-
-	public ParserRule getSimpleSelectorRule() {
-		return getSimpleSelectorAccess().getRule();
-	}
-
-	// SelectorCondition:
-	//
-	// CSSId | Class | Attribute | Pseudo;
-	public SelectorConditionElements getSelectorConditionAccess() {
-		return (pSelectorCondition != null) ? pSelectorCondition : (pSelectorCondition = new SelectorConditionElements());
-	}
-
-	public ParserRule getSelectorConditionRule() {
-		return getSelectorConditionAccess().getRule();
-	}
-
-	// Combinator:
-	//
-	// kind=KIND WS*;
-	public CombinatorElements getCombinatorAccess() {
-		return (pCombinator != null) ? pCombinator : (pCombinator = new CombinatorElements());
-	}
-
-	public ParserRule getCombinatorRule() {
-		return getCombinatorAccess().getRule();
-	}
-
-	// Declaration:
-	//
-	// property=ID WS* ":" WS* expression=Expression (important?=T_IMPORTANT WS*)?;
-	public DeclarationElements getDeclarationAccess() {
-		return (pDeclaration != null) ? pDeclaration : (pDeclaration = new DeclarationElements());
-	}
-
-	public ParserRule getDeclarationRule() {
-		return getDeclarationAccess().getRule();
-	}
-
-	// Expression:
-	//
-	// terms=Term subterms+=Subterm*;
-	public ExpressionElements getExpressionAccess() {
-		return (pExpression != null) ? pExpression : (pExpression = new ExpressionElements());
-	}
-
-	public ParserRule getExpressionRule() {
-		return getExpressionAccess().getRule();
-	}
-
-	// Subterm:
-	//
-	// operator=Operator? term=Term;
-	public SubtermElements getSubtermAccess() {
-		return (pSubterm != null) ? pSubterm : (pSubterm = new SubtermElements());
-	}
-
-	public ParserRule getSubtermRule() {
-		return getSubtermAccess().getRule();
-	}
-
-	// Term:
-	//
-	// (Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor |
-	//
-	// Function) WS*;
-	public TermElements getTermAccess() {
-		return (pTerm != null) ? pTerm : (pTerm = new TermElements());
-	}
-
-	public ParserRule getTermRule() {
-		return getTermAccess().getRule();
-	}
-
-	// Function:
-	//
-	// name=ID "(" WS* args=Expression ")";
-	public FunctionElements getFunctionAccess() {
-		return (pFunction != null) ? pFunction : (pFunction = new FunctionElements());
-	}
-
-	public ParserRule getFunctionRule() {
-		return getFunctionAccess().getRule();
-	}
-
-	// Name:
-	//
-	// value=ID;
-	public NameElements getNameAccess() {
-		return (pName != null) ? pName : (pName = new NameElements());
-	}
-
-	public ParserRule getNameRule() {
-		return getNameAccess().getRule();
-	}
-
-	// //Terms
-	// Number:
-	//
-	// op=UnaryOperator? value=T_NUM;
-	public NumberElements getNumberAccess() {
-		return (pNumber != null) ? pNumber : (pNumber = new NumberElements());
-	}
-
-	public ParserRule getNumberRule() {
-		return getNumberAccess().getRule();
-	}
-
-	// Percentage:
-	//
-	// op=UnaryOperator? value=T_NUM unit=PC_UNIT;
-	public PercentageElements getPercentageAccess() {
-		return (pPercentage != null) ? pPercentage : (pPercentage = new PercentageElements());
-	}
-
-	public ParserRule getPercentageRule() {
-		return getPercentageAccess().getRule();
-	}
-
-	// Length:
-	//
-	// op=UnaryOperator? value=T_NUM unit=LEN_UNIT;
-	public LengthElements getLengthAccess() {
-		return (pLength != null) ? pLength : (pLength = new LengthElements());
-	}
-
-	public ParserRule getLengthRule() {
-		return getLengthAccess().getRule();
-	}
-
-	// Ems:
-	//
-	// op=UnaryOperator? value=T_NUM unit=EM_UNIT;
-	public EmsElements getEmsAccess() {
-		return (pEms != null) ? pEms : (pEms = new EmsElements());
-	}
-
-	public ParserRule getEmsRule() {
-		return getEmsAccess().getRule();
-	}
-
-	// Exs:
-	//
-	// op=UnaryOperator? value=T_NUM unit=EX_UNIT;
-	public ExsElements getExsAccess() {
-		return (pExs != null) ? pExs : (pExs = new ExsElements());
-	}
-
-	public ParserRule getExsRule() {
-		return getExsAccess().getRule();
-	}
-
-	// Angle:
-	//
-	// op=UnaryOperator? value=T_NUM unit=ANGLE_UNIT;
-	public AngleElements getAngleAccess() {
-		return (pAngle != null) ? pAngle : (pAngle = new AngleElements());
-	}
-
-	public ParserRule getAngleRule() {
-		return getAngleAccess().getRule();
-	}
-
-	// Time:
-	//
-	// op=UnaryOperator? value=T_NUM unit=TIME_UNIT;
-	public TimeElements getTimeAccess() {
-		return (pTime != null) ? pTime : (pTime = new TimeElements());
-	}
-
-	public ParserRule getTimeRule() {
-		return getTimeAccess().getRule();
-	}
-
-	// Frequency:
-	//
-	// op=UnaryOperator? value=T_NUM unit=FREQ_UNIT;
-	public FrequencyElements getFrequencyAccess() {
-		return (pFrequency != null) ? pFrequency : (pFrequency = new FrequencyElements());
-	}
-
-	public ParserRule getFrequencyRule() {
-		return getFrequencyAccess().getRule();
-	}
-
-	// / * | 'url(' WS? url=URL WS? ')' * / //TODO
-	// Uri:
-	//
-	// "url(" WS? value=STRING WS? ")";
-	public UriElements getUriAccess() {
-		return (pUri != null) ? pUri : (pUri = new UriElements());
-	}
-
-	public ParserRule getUriRule() {
-		return getUriAccess().getRule();
-	}
-
-	// StringValue:
-	//
-	// value=STRING;
-	public StringValueElements getStringValueAccess() {
-		return (pStringValue != null) ? pStringValue : (pStringValue = new StringValueElements());
-	}
-
-	public ParserRule getStringValueRule() {
-		return getStringValueAccess().getRule();
-	}
-
-	// //terminal URL:
-	// // (('!' | '#' | '$' | '%' | '&' | '*' | '-' | '~') / * | NON_ASCII | ESCAPE * /)*;
-	//
-	//
-	// //terminal NON_ASCII:
-	// // (\0240..\0377) //Chars 160 to 255
-	// //;
-	// //terminal UNICODE:
-	//
-	//
-	// // '\\' HEXA (HEXA (HEXA (HEXA (HEXA (HEXA)?)?)?)?)? ('\r\n' | ' ' | '\t' | '\r' | '\n')?;
-	// //
-	// //terminal ESCAPE:
-	//
-	//
-	// // UNICODE | ('\\' !('\r' | '\n' | '0'..'9' | 'a'..'f' | 'A'..'F'));
-	// HexColor:
-	//
-	// value=HASH;
-	public HexColorElements getHexColorAccess() {
-		return (pHexColor != null) ? pHexColor : (pHexColor = new HexColorElements());
-	}
-
-	public ParserRule getHexColorRule() {
-		return getHexColorAccess().getRule();
-	}
-
-	// Operator:
-	//
-	// "/" WS* | "," WS*;
-	public OperatorElements getOperatorAccess() {
-		return (pOperator != null) ? pOperator : (pOperator = new OperatorElements());
-	}
-
-	public ParserRule getOperatorRule() {
-		return getOperatorAccess().getRule();
-	}
-
-	// Class:
-	//
-	// class=T_CLASS;
-	public ClassElements getClassAccess() {
-		return (pClass != null) ? pClass : (pClass = new ClassElements());
-	}
-
-	public ParserRule getClassRule() {
-		return getClassAccess().getRule();
-	}
-
-	// Attribute:
-	//
-	// "[" WS* name=ID WS* value=AttributeValue? "]";
-	public AttributeElements getAttributeAccess() {
-		return (pAttribute != null) ? pAttribute : (pAttribute = new AttributeElements());
-	}
-
-	public ParserRule getAttributeRule() {
-		return getAttributeAccess().getRule();
-	}
-
-	// AttributeValue:
-	//
-	// operator=ATTRIBUTE_OP WS* value=(ID | STRING) WS*;
-	public AttributeValueElements getAttributeValueAccess() {
-		return (pAttributeValue != null) ? pAttributeValue : (pAttributeValue = new AttributeValueElements());
-	}
-
-	public ParserRule getAttributeValueRule() {
-		return getAttributeValueAccess().getRule();
-	}
-
-	// Pseudo:
-	//
-	// ":" (pseudo=ID | pseudo=ID "(" WS* (args=ID WS*)? ")");
-	public PseudoElements getPseudoAccess() {
-		return (pPseudo != null) ? pPseudo : (pPseudo = new PseudoElements());
-	}
-
-	public ParserRule getPseudoRule() {
-		return getPseudoAccess().getRule();
-	}
-
-	// CSSId:
-	//
-	// value=HASH;
-	public CSSIdElements getCSSIdAccess() {
-		return (pCSSId != null) ? pCSSId : (pCSSId = new CSSIdElements());
-	}
-
-	public ParserRule getCSSIdRule() {
-		return getCSSIdAccess().getRule();
-	}
-
-	// UnaryOperator:
-	//
-	// operator=UNARY;
-	public UnaryOperatorElements getUnaryOperatorAccess() {
-		return (pUnaryOperator != null) ? pUnaryOperator : (pUnaryOperator = new UnaryOperatorElements());
-	}
-
-	public ParserRule getUnaryOperatorRule() {
-		return getUnaryOperatorAccess().getRule();
-	}
-
-	// enum UNARY:
-	//
-	// NEG="-" | PLUS="+";
-	public UNARYElements getUNARYAccess() {
-		return (unknownRuleUNARY != null) ? unknownRuleUNARY : (unknownRuleUNARY = new UNARYElements());
-	}
-
-	public EnumRule getUNARYRule() {
-		return getUNARYAccess().getRule();
-	}
-
-	// enum KIND:
-	//
-	// FIRST_CHILD=">" | SIBLING="+";
-	public KINDElements getKINDAccess() {
-		return (unknownRuleKIND != null) ? unknownRuleKIND : (unknownRuleKIND = new KINDElements());
-	}
-
-	public EnumRule getKINDRule() {
-		return getKINDAccess().getRule();
-	}
-
-	// enum ATTRIBUTE_OP:
-	//
-	// EQUALS="=" | CONTAINS="~=" | UNEQUALS="!=";
-	public ATTRIBUTE_OPElements getATTRIBUTE_OPAccess() {
-		return (unknownRuleATTRIBUTE_OP != null) ? unknownRuleATTRIBUTE_OP : (unknownRuleATTRIBUTE_OP = new ATTRIBUTE_OPElements());
-	}
-
-	public EnumRule getATTRIBUTE_OPRule() {
-		return getATTRIBUTE_OPAccess().getRule();
-	}
-
-	// terminal HASH:
-	//
-	// "#" ("A".."Z" | "a".."z" | "0".."9")+;
-	public TerminalRule getHASHRule() {
-		return (tHASH != null) ? tHASH : (tHASH = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "HASH"));
-	}
-
-	// terminal T_CLASS:
-	//
-	// "." ID;
-	public TerminalRule getT_CLASSRule() {
-		return (tT_CLASS != null) ? tT_CLASS : (tT_CLASS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "T_CLASS"));
-	}
-
-	// //This is not the exact CSS Grammar
-	// terminal T_IMPORTANT:
-	//
-	// "!important";
-	public TerminalRule getT_IMPORTANTRule() {
-		return (tT_IMPORTANT != null) ? tT_IMPORTANT : (tT_IMPORTANT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "T_IMPORTANT"));
-	}
-
-	// terminal PC_UNIT:
-	//
-	// "%";
-	public TerminalRule getPC_UNITRule() {
-		return (tPC_UNIT != null) ? tPC_UNIT : (tPC_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "PC_UNIT"));
-	}
-
-	// terminal LEN_UNIT:
-	//
-	// "px" | "cm" | "mm" | "in" | "pt" | "pc";
-	public TerminalRule getLEN_UNITRule() {
-		return (tLEN_UNIT != null) ? tLEN_UNIT : (tLEN_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "LEN_UNIT"));
-	}
-
-	// terminal EM_UNIT:
-	//
-	// "em";
-	public TerminalRule getEM_UNITRule() {
-		return (tEM_UNIT != null) ? tEM_UNIT : (tEM_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "EM_UNIT"));
-	}
-
-	// terminal EX_UNIT:
-	//
-	// "ex";
-	public TerminalRule getEX_UNITRule() {
-		return (tEX_UNIT != null) ? tEX_UNIT : (tEX_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "EX_UNIT"));
-	}
-
-	// terminal ANGLE_UNIT:
-	//
-	// "deg" | "rad" | "grad";
-	public TerminalRule getANGLE_UNITRule() {
-		return (tANGLE_UNIT != null) ? tANGLE_UNIT : (tANGLE_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ANGLE_UNIT"));
-	}
-
-	// terminal TIME_UNIT:
-	//
-	// "s" | "ms";
-	public TerminalRule getTIME_UNITRule() {
-		return (tTIME_UNIT != null) ? tTIME_UNIT : (tTIME_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "TIME_UNIT"));
-	}
-
-	// terminal FREQ_UNIT:
-	//
-	// "hz" | "mhz";
-	public TerminalRule getFREQ_UNITRule() {
-		return (tFREQ_UNIT != null) ? tFREQ_UNIT : (tFREQ_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "FREQ_UNIT"));
-	}
-
-	// terminal T_NUM:
-	//
-	// "0".."9"+ | "0".."9"* "." "0".."9"+;
-	public TerminalRule getT_NUMRule() {
-		return (tT_NUM != null) ? tT_NUM : (tT_NUM = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "T_NUM"));
-	}
-
-	// terminal ID:
-	//
-	// "-"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9" | "-")*;
-	public TerminalRule getIDRule() {
-		return (tID != null) ? tID : (tID = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ID"));
-	}
-
-	// terminal STRING:
-	//
-	// "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
-	//
-	// "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
-	public TerminalRule getSTRINGRule() {
-		return (tSTRING != null) ? tSTRING : (tSTRING = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "STRING"));
-	}
-
-	// terminal CDO:
-	//
-	// "<!--";
-	public TerminalRule getCDORule() {
-		return (tCDO != null) ? tCDO : (tCDO = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "CDO"));
-	}
-
-	// terminal CDC:
-	//
-	// "-->";
-	public TerminalRule getCDCRule() {
-		return (tCDC != null) ? tCDC : (tCDC = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "CDC"));
-	}
-
-	// //Doesn't exactly match CSS Comments... * / can be protected by \ : \* / doesn't close the comment in XText, while it does in CSS
-	//
-	//
-	// terminal ML_COMMENT:
-	//
-	// "/ *"->"* /";
-	public TerminalRule getML_COMMENTRule() {
-		return (tML_COMMENT != null) ? tML_COMMENT : (tML_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ML_COMMENT"));
-	}
-
-	// terminal WS:
-	//
-	// (" " | "\t" | "\r" | "\n")+;
-	public TerminalRule getWSRule() {
-		return (tWS != null) ? tWS : (tWS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "WS"));
-	}
-
-	// terminal ANY_OTHER:
-	//
-	// .;
-	public TerminalRule getANY_OTHERRule() {
-		return (tANY_OTHER != null) ? tANY_OTHER : (tANY_OTHER = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ANY_OTHER"));
-	}
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/validation/AbstractCSSJavaValidator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/validation/AbstractCSSJavaValidator.java
deleted file mode 100644
index c9cfa89dd59..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/validation/AbstractCSSJavaValidator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.validation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EPackage;
-
-public class AbstractCSSJavaValidator extends org.eclipse.xtext.validation.AbstractDeclarativeValidator {
-
-	@Override
-	protected List<EPackage> getEPackages() {
-		List<EPackage> result = new ArrayList<EPackage>();
-		result.add(org.eclipse.papyrus.infra.gmfdiag.css.CssPackage.eINSTANCE);
-		return result;
-	}
-
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSS.xtext b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSS.xtext
deleted file mode 100644
index 005d09ed8c0..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSS.xtext
+++ /dev/null
@@ -1,208 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-/**
- * CSS 2.1 Grammar
- */
-grammar org.eclipse.papyrus.infra.gmfdiag.CSS hidden(ML_COMMENT)
-//with org.eclipse.xtext.common.Terminals
-import "http://www.eclipse.org/emf/2002/Ecore" as ecore
-generate css "http://www.eclipse.org/papyrus/infra/gmfdiag/CSS"
-
-//Do not create a Stylesheet for WS* (This seems to cause a serialization problem when editing an EMF Model from an Empty file)
-//Do not ignore WS as @charset must be followed by exactly one Space.
-Stylesheet:
-	('@charset ' charset=STRING ';')?
-	(WS | CDO | CDC)* (imports+=Import (CDO WS* | CDC WS*)*)*
-	(contents+=Content (CDO WS* | CDC WS*)*)*;
-
-Content:
-	Ruleset | Media | Page;
-
-Import:
-	'@import' (WS* string=STRING | WS uri=Uri) WS* (media+=ID WS* (',' WS* media+=ID)*)? ';' WS*;
-
-Media:
-	'@media' WS media+=ID WS* (',' WS* media+=ID)* '{' WS* (rules+=Ruleset)* '}' WS*;
-
-Page:
-	{Page}
-	'@page' WS* pseudo=PseudoPage? '{' WS* declarations+=Declaration? (';' WS* declarations+=Declaration?)* '}' WS*;
-
-PseudoPage:
-	':' id=ID WS*;
-
-Ruleset:
-	selectors+=Selector (',' WS* selectors+=Selector)* '{' WS* properties+=Declaration? (';' WS*
-	properties+=Declaration?)* '}' WS*;
-
-Selector:
-	(SimpleSelector WS* | CompositeSelector);
-
-	//left=SimpleSelector (combinator=Combinator right=Selector | WS+ (combinator=Combinator? right=Selector)?)?;
-CompositeSelector:
-	left=SimpleSelector (WS+ | WS* combinator=Combinator) right=Selector;
-
-SimpleSelector:
-	(elementName=(ID | '*') condition+=(SelectorCondition)*) | (condition+=(SelectorCondition)+);
-
-SelectorCondition:
-	CSSId | Class | Attribute | Pseudo;
-
-Combinator:
-	kind=KIND WS*;
-
-Declaration:
-	property=ID WS* ':' WS* expression=Expression (important?=T_IMPORTANT WS*)?;
-
-Expression:
-	terms=Term (subterms+=Subterm)*;
-
-Subterm:
-	operator=Operator? term=Term;
-
-Term:
-	(Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor | Function)
-	WS*;
-
-Function:
-	name=ID '(' WS* args=Expression ')';
-
-Name:
-	value=ID;
-
-	//Terms  
-Number:
-	op=UnaryOperator? value=T_NUM;
-
-Percentage:
-	op=UnaryOperator? value=T_NUM unit=PC_UNIT;
-
-Length:
-	op=UnaryOperator? value=T_NUM unit=LEN_UNIT;
-
-Ems:
-	op=UnaryOperator? value=T_NUM unit=EM_UNIT;
-
-Exs:
-	op=UnaryOperator? value=T_NUM unit=EX_UNIT;
-
-Angle:
-	op=UnaryOperator? value=T_NUM unit=ANGLE_UNIT;
-
-Time:
-	op=UnaryOperator? value=T_NUM unit=TIME_UNIT;
-
-Frequency:
-	op=UnaryOperator? value=T_NUM unit=FREQ_UNIT;
-
-Uri:
-	'url(' WS? value=STRING WS? ')' /* | 'url(' WS? url=URL WS? ')' */; //TODO
-StringValue:
-	value=STRING;
-
-	//terminal URL:
-//	(('!' | '#' | '$' | '%' | '&' | '*' | '-' | '~') /* | NON_ASCII  |  ESCAPE */)*;
-
-//terminal NON_ASCII:
-//	(\0240..\0377) //Chars 160 to 255
-//;
-//terminal UNICODE:
-//	'\\' HEXA (HEXA (HEXA (HEXA (HEXA (HEXA)?)?)?)?)? ('\r\n' | ' ' | '\t' | '\r' | '\n')?;
-//
-//terminal ESCAPE:
-//	UNICODE | ('\\' !('\r' | '\n' | '0'..'9' | 'a'..'f' | 'A'..'F'));
-HexColor:
-	value=HASH;
-
-Operator:
-	'/' WS* | ',' WS*;
-
-Class:
-	class=T_CLASS;
-
-Attribute:
-	'[' WS* name=ID WS* value=AttributeValue? ']';
-
-AttributeValue:
-	operator=ATTRIBUTE_OP WS* value=(ID | STRING) WS*;
-
-Pseudo:
-	':' (pseudo=ID | (pseudo=ID '(' WS* (args=ID WS*)? ')'));
-
-CSSId:
-	value=HASH;
-
-UnaryOperator:
-	operator=UNARY;
-
-enum UNARY:
-	NEG='-' | PLUS='+';
-
-enum KIND:
-	FIRST_CHILD='>' | SIBLING='+';
-
-enum ATTRIBUTE_OP:
-	EQUALS='=' | CONTAINS='~=' | UNEQUALS='!=';
-
-terminal HASH:
-	'#' ('A'..'Z' | 'a'..'z' | '0'..'9')+;
-
-terminal T_CLASS:
-	'.' ID;
-
-terminal T_IMPORTANT:
-	'!important'; //This is not the exact CSS Grammar
-terminal PC_UNIT:
-	'%';
-
-terminal LEN_UNIT:
-	'px' | 'cm' | 'mm' | 'in' | 'pt' | 'pc';
-
-terminal EM_UNIT:
-	'em';
-
-terminal EX_UNIT:
-	'ex';
-
-terminal ANGLE_UNIT:
-	'deg' | 'rad' | 'grad';
-
-terminal TIME_UNIT:
-	's' | 'ms';
-
-terminal FREQ_UNIT:
-	'hz' | 'mhz';
-
-terminal T_NUM:
-	('0'..'9')+ | ('0'..'9')* "." ('0'..'9')+;
-
-terminal ID:
-	'-'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9' | '-')*;
-
-terminal STRING:
-	'"' ('\\' ('b' | 't' | 'n' | 'f' | 'r' | 'u' | '"' | "'" | '\\') | !('\\' | '"'))* '"' |
-	"'" ('\\' ('b' | 't' | 'n' | 'f' | 'r' | 'u' | '"' | "'" | '\\') | !('\\' | "'"))* "'";
-
-terminal CDO:
-	'<!--';
-
-terminal CDC:
-	'-->';
-
-terminal ML_COMMENT:
-	'/*'->'*/'; //Doesn't exactly match CSS Comments... */ can be protected by \ : \*/ doesn't close the comment in XText, while it does in CSS 
-terminal WS:
-	(' ' | '\t' | '\r' | '\n')+;
-
-terminal ANY_OTHER:
-	.;
-
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSSRuntimeModule.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSSRuntimeModule.java
deleted file mode 100644
index 54d7b442532..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSSRuntimeModule.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.papyrus.infra.gmfdiag;
-
-import org.eclipse.papyrus.infra.gmfdiag.converter.CSSTerminalConverter;
-import org.eclipse.xtext.conversion.IValueConverterService;
-
-/**
- * Use this class to register components to be used at runtime / without the Equinox extension registry.
- */
-public class CSSRuntimeModule extends org.eclipse.papyrus.infra.gmfdiag.AbstractCSSRuntimeModule {
-
-	@Override
-	public Class<? extends IValueConverterService> bindIValueConverterService() {
-		return CSSTerminalConverter.class;
-	}
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/GenerateCSS.mwe2 b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/GenerateCSS.mwe2
deleted file mode 100644
index 4060f4a2ca2..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/GenerateCSS.mwe2
+++ /dev/null
@@ -1,138 +0,0 @@
-module org.eclipse.papyrus.infra.gmfdiag.GenerateCSS
-
-import org.eclipse.emf.mwe.utils.*
-import org.eclipse.xtext.generator.*
-import org.eclipse.xtext.ui.generator.*
-
-var grammarURI = "classpath:/org/eclipse/papyrus/infra/gmfdiag/CSS.xtext"
-var file.extensions = "css"
-var projectName = "org.eclipse.papyrus.infra.gmfdiag.css.xtext"
-var runtimeProject = "../${projectName}"
-
-Workflow {
-    bean = StandaloneSetup {
-        scanClassPath = true
-        platformUri = "${runtimeProject}/.."
-        // The following two lines can be removed, if Xbase is not used.
-        registerGeneratedEPackage = "org.eclipse.xtext.xbase.XbasePackage"
-        registerGenModelFile = "platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel"
-    }
-
-    component = DirectoryCleaner {
-        directory = "${runtimeProject}/src-gen"
-    }
-
-    component = DirectoryCleaner {
-        directory = "${runtimeProject}.ui/src-gen"
-    }
-
-    component = Generator {
-        pathRtProject = runtimeProject
-        pathUiProject = "${runtimeProject}.ui"
-        pathTestProject = "${runtimeProject}.tests"
-        projectNameRt = projectName
-        projectNameUi = "${projectName}.ui"
-        language = {
-            uri = grammarURI
-            fileExtensions = file.extensions
-
-            // Java API to access grammar elements (required by several other fragments)
-            fragment = grammarAccess.GrammarAccessFragment {}
-
-            // generates Java API for the generated EPackages
-            fragment = ecore.EcoreGeneratorFragment {
-            // referencedGenModels = "
-            //  platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel,
-            //  platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel
-            // "
-            }
-
-            // Serializer 2.0
-            fragment = serializer.SerializerFragment {
-            	generateStub = false
-            }
-            
-            // the serialization component (1.0)
-            // fragment = parseTreeConstructor.ParseTreeConstructorFragment {}
-
-            // a custom ResourceFactory for use with EMF
-            fragment = resourceFactory.ResourceFactoryFragment {
-                fileExtensions = file.extensions
-            }
-
-            // The antlr parser generator fragment.
-            fragment = parser.antlr.XtextAntlrGeneratorFragment {
-            //  options = {
-            //      backtrack = true
-            //  }
-            }
-
-            // java-based API for validation
-            fragment = validation.JavaValidatorFragment {
-            //    composedCheck = "org.eclipse.xtext.validation.ImportUriValidator"
-            //    composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
-            }
-
-            // scoping and exporting API
-            // fragment = scoping.ImportURIScopingFragment {}
-            // fragment = exporting.SimpleNamesFragment {}
-
-            // scoping and exporting API
-            fragment = scoping.ImportNamespacesScopingFragment {}
-            fragment = exporting.QualifiedNamesFragment {}
-            fragment = builder.BuilderIntegrationFragment {}
-
-            // generator API
-            fragment = generator.GeneratorFragment {
-                generateMwe = false
-                generateJavaMain = false
-            }
-
-            // formatter API
-            fragment = formatting.FormatterFragment {}
-
-            // labeling API
-            fragment = labeling.LabelProviderFragment {}
-
-            // outline API
-            fragment = outline.OutlineTreeProviderFragment {}
-            fragment = outline.QuickOutlineFragment {}
-
-            // quickfix API
-            fragment = quickfix.QuickfixProviderFragment {}
-
-            // content assist API
-            fragment = contentAssist.JavaBasedContentAssistFragment {}
-
-            // generates a more lightweight Antlr parser and lexer tailored for content assist
-            fragment = parser.antlr.XtextAntlrUiGeneratorFragment {}
-
-            // generates junit test support classes into Generator#pathTestProject
-            fragment = junit.Junit4Fragment {}
-
-            // project wizard (optional)
-            // fragment = projectWizard.SimpleProjectWizardFragment {
-            //      generatorProjectName = "${projectName}"
-            //      modelFileExtension = file.extensions
-            // }
-
-            // rename refactoring
-            fragment = refactoring.RefactorElementNameFragment {}
-
-            // provides the necessary bindings for java types integration
-            fragment = types.TypesGeneratorFragment {}
-
-            // generates the required bindings only if the grammar inherits from Xbase
-            fragment = xbase.XbaseGeneratorFragment {}
-
-            // provides a preference page for template proposals
-            fragment = templates.CodetemplatesGeneratorFragment {}
-
-            // provides a compare view
-            fragment = compare.CompareFragment {
-                 fileExtensions = file.extensions
-            }
-
-        }
-    }
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/converter/CSSTerminalConverter.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/converter/CSSTerminalConverter.java
deleted file mode 100644
index be726bb03cd..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/converter/CSSTerminalConverter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.papyrus.infra.gmfdiag.converter;

-

-import org.eclipse.xtext.common.services.DefaultTerminalConverters;

-import org.eclipse.xtext.conversion.IValueConverter;

-import org.eclipse.xtext.conversion.ValueConverter;

-import org.eclipse.xtext.conversion.ValueConverterException;

-import org.eclipse.xtext.conversion.impl.AbstractNullSafeConverter;

-import org.eclipse.xtext.nodemodel.INode;

-

-

-public class CSSTerminalConverter extends DefaultTerminalConverters {

-

-	@ValueConverter(rule = "HASH")

-	public IValueConverter<String> HASH() {

-		return new AbstractNullSafeConverter<String>() {

-

-			@Override

-			protected String internalToString(String value) {

-				return '#' + value;

-			}

-

-			@Override

-			protected String internalToValue(String string, INode node) throws ValueConverterException {

-				return string.substring(1);

-			}

-

-		};

-	}

-

-	@ValueConverter(rule = "T_CLASS")

-	public IValueConverter<String> T_CLASS() {

-		return new AbstractNullSafeConverter<String>() {

-

-			@Override

-			protected String internalToString(String value) {

-				return '.' + value;

-			}

-

-			@Override

-			protected String internalToValue(String string, INode node) throws ValueConverterException {

-				return string.substring(1);

-			}

-

-		};

-	}

-

-	@Override

-	@ValueConverter(rule = "ID")

-	public IValueConverter<String> ID() {

-		return new AbstractNullSafeConverter<String>() {

-

-			@Override

-			protected String internalToString(String value) {

-				return value;

-			}

-

-			@Override

-			protected String internalToValue(String string, INode node) throws ValueConverterException {

-				return string;

-			}

-

-		};

-	}

-}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/formatting/CSSFormatter.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/formatting/CSSFormatter.java
deleted file mode 100644
index e6bc62976c8..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/formatting/CSSFormatter.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.formatting;
-
-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
-import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter;
-import org.eclipse.xtext.formatting.impl.FormattingConfig;
-
-/**
- * This class contains custom formatting description.
- *
- * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#formatting
- * on how and when to use it
- *
- * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example
- */
-public class CSSFormatter extends AbstractDeclarativeFormatter {
-
-
-	@Override
-	protected void configureFormatting(FormattingConfig c) {
-		// It's usually a good idea to activate the following three statements.
-		// They will add and preserve newlines around comments
-		// c.setLinewrap(0, 1, 2).before(getGrammarAccess().getSL_COMMENTRule());
-		// c.setLinewrap(0, 1, 2).before(getGrammarAccess().getML_COMMENTRule());
-		// c.setLinewrap(0, 1, 1).after(getGrammarAccess().getML_COMMENTRule());
-
-		// Semantic formatting (Prevent XText from adding invalid spaces)
-
-		// c.setWhitespaceRule(getGrammarAccess().getWSRule());
-		// c.setNoSpace().around(getGrammarAccess().getWSRule());
-		c.setNoSpace().around(getGrammarAccess().getANY_OTHERRule());
-
-		// Preserve the charset spaces
-		c.setNoSpace().after(getGrammarAccess().getStylesheetAccess().getCharsetKeyword_0_0());
-		c.setNoSpace().before(getGrammarAccess().getStylesheetAccess().getSemicolonKeyword_0_2());
-
-		// No spaces before units
-		c.setNoSpace().before(getGrammarAccess().getEM_UNITRule());
-		c.setNoSpace().before(getGrammarAccess().getFREQ_UNITRule());
-		c.setNoSpace().before(getGrammarAccess().getTIME_UNITRule());
-		c.setNoSpace().before(getGrammarAccess().getEX_UNITRule());
-		c.setNoSpace().before(getGrammarAccess().getPC_UNITRule());
-		c.setNoSpace().before(getGrammarAccess().getANGLE_UNITRule());
-		c.setNoSpace().before(getGrammarAccess().getLEN_UNITRule());
-
-		// No spaces between unary operator and number
-		c.setNoSpace().after(getGrammarAccess().getUnaryOperatorRule());
-		c.setNoSpace().before(getGrammarAccess().getNumberRule());
-
-		// No spaces before simpleSelector condition
-		c.setNoSpace().before(getGrammarAccess().getSelectorConditionRule());
-		c.setNoSpace().around(getGrammarAccess().getPseudoAccess().getColonKeyword_0());
-		c.setNoSpace().after(getGrammarAccess().getPseudoAccess().getPseudoAssignment_1_1_0());
-
-		// Pretty printing
-
-		// c.setWrappedLineIndentation(4);
-
-		// Charset
-		c.setLinewrap(2).after(getGrammarAccess().getStylesheetAccess().getSemicolonKeyword_0_2());
-
-
-		// Declarations
-		c.setNoSpace().after(getGrammarAccess().getDeclarationRule());
-		c.setNoSpace().before(getGrammarAccess().getDeclarationAccess().getColonKeyword_2());
-		c.setSpace(" ").after(getGrammarAccess().getDeclarationAccess().getColonKeyword_2());
-		// c.setNoSpace().around(getGrammarAccess().getTermRule());
-		c.setNoLinewrap().before(getGrammarAccess().getRulesetAccess().getSemicolonKeyword_5_0());
-		c.setNoSpace().before(getGrammarAccess().getRulesetAccess().getSemicolonKeyword_5_0());
-
-		c.setIndentationIncrement().after(getGrammarAccess().getRulesetAccess().getLeftCurlyBracketKeyword_2());
-		c.setLinewrap().after(getGrammarAccess().getRulesetAccess().getLeftCurlyBracketKeyword_2());
-
-
-		// Attribute
-		c.setNoSpace().after(getGrammarAccess().getAttributeAccess().getLeftSquareBracketKeyword_0());
-		c.setNoSpace().before(getGrammarAccess().getAttributeAccess().getRightSquareBracketKeyword_5());
-		c.setNoSpace().around(getGrammarAccess().getAttributeValueAccess().getOperatorAssignment_0());
-
-		// Ruleset
-		c.setIndentationDecrement().before(getGrammarAccess().getRulesetAccess().getRightCurlyBracketKeyword_6());
-		c.setLinewrap().before(getGrammarAccess().getRulesetAccess().getRightCurlyBracketKeyword_6());
-		// c.setLinewrap(2).after(getGrammarAccess().getContentRule());
-		c.setLinewrap(2).after(getGrammarAccess().getRulesetAccess().getRightCurlyBracketKeyword_6());
-
-		c.setLinewrap().after(getGrammarAccess().getRulesetAccess().getSemicolonKeyword_5_0());
-	}
-
-	@Override
-	public CSSGrammarAccess getGrammarAccess() {
-		return (CSSGrammarAccess) super.getGrammarAccess();
-	}
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/generator/CSSGenerator.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/generator/CSSGenerator.xtend
deleted file mode 100644
index 2c6d3225ca7..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/generator/CSSGenerator.xtend
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.papyrus.infra.gmfdiag.generator
-
-import org.eclipse.emf.ecore.resource.Resource
-import org.eclipse.xtext.generator.IGenerator
-import org.eclipse.xtext.generator.IFileSystemAccess
-
-class CSSGenerator implements IGenerator {
-	
-	override void doGenerate(Resource resource, IFileSystemAccess fsa) {
-		//TODO implement me
-	}
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/scoping/CSSScopeProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/scoping/CSSScopeProvider.java
deleted file mode 100644
index 0434fc9806c..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/scoping/CSSScopeProvider.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.papyrus.infra.gmfdiag.scoping;
-
-import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
-
-/**
- * This class contains custom scoping description.
- *
- * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#scoping
- * on how and when to use it
- *
- */
-public class CSSScopeProvider extends AbstractDeclarativeScopeProvider {
-
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/validation/CSSJavaValidator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/validation/CSSJavaValidator.java
deleted file mode 100644
index 7baf546c762..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/validation/CSSJavaValidator.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.validation;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;
-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.Expression;
-import org.eclipse.papyrus.infra.gmfdiag.css.Function;
-import org.eclipse.papyrus.infra.gmfdiag.css.HexColor;
-import org.eclipse.papyrus.infra.gmfdiag.css.Number;
-import org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector;
-import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;
-import org.eclipse.papyrus.infra.gmfdiag.css.Term;
-import org.eclipse.papyrus.infra.gmfdiag.css.UNARY;
-import org.eclipse.xtext.validation.Check;
-
-
-public class CSSJavaValidator extends AbstractCSSJavaValidator {
-
-	public static final String INVALID_HEX_COLOR = "InvalidHexColor";
-
-	public static final String EMPTY_ELEMENT_NAME = "EmptyElementName";
-
-	// ////////////////////////
-	// EMF + XText //
-	// ////////////////////////
-	@Check
-	public void checkHexColor(HexColor color) {
-		if (!color.getValue().matches("[0-9A-Fa-f]{6}")) {
-			error("Invalid color. The color must be a 6-digit Hexadecimal number", CssPackage.Literals.HEX_COLOR__VALUE);
-		}
-	}
-
-	@Check
-	public void checkRGBColor(Function function) {
-		if ("rgb".equals(function.getName().toLowerCase())) {
-			if (function.getArgs().getSubterms().size() != 2) { // 3 Args: 1 Term + 2 Subterms
-				warning("Invalid color. The RGB color must have exactly 3 arguments", CssPackage.Literals.FUNCTION__ARGS);
-			}
-
-
-		}
-	}
-
-	@Check
-	public void checkRGBTerm(Term term) {
-		Expression owningExpression = findExpression(term);
-		if (owningExpression == null) {
-			return;
-		}
-
-		if (owningExpression.eContainer() instanceof Function) {
-			if ("rgb".equals(((Function) owningExpression.eContainer()).getName().toLowerCase())) {
-				if (!(term instanceof Number)) {
-					warning("The RGB color arguments must be integers. Actual type: " + term.eClass().getName(), term.eClass().getEStructuralFeature("value"));
-				} else {
-					Number number = (Number) term;
-
-					boolean validValue = true;
-					try {
-						int absoluteValue = Integer.parseInt(number.getValue());
-						validValue = (number.getOp() == null || number.getOp().getOperator() == UNARY.PLUS) && absoluteValue <= 255;
-					} catch (NumberFormatException ex) {
-						validValue = false;
-					}
-
-					if (!validValue) {
-						warning("The RGB color arguments must be integers between 0 and 255", term.eClass().getEStructuralFeature("value"));
-					}
-				}
-			}
-		}
-	}
-
-	protected Expression findExpression(EObject term) {
-		if (term.eContainer() instanceof Expression) {
-			return (Expression) term.eContainer();
-		}
-
-		if (term.eContainer() instanceof Subterm) {
-			return findExpression(term.eContainer());
-		}
-
-		return null;
-	}
-
-	// ////////////////////////
-	// EMF Only //
-	// ////////////////////////
-	@Check
-	public void checkElementName(SimpleSelector selector) {
-		if ("".equals(selector.getElementName())) {
-			error("The selector's name should either be null or non-empty", CssPackage.Literals.SIMPLE_SELECTOR__ELEMENT_NAME);
-		}
-	}
-
-	@Check
-	public void checkSimpleSelector(SimpleSelector selector) {
-		if (!selector.eIsSet(CssPackage.Literals.SIMPLE_SELECTOR__ELEMENT_NAME)) {
-			if (selector.getCondition().isEmpty()) {
-				error("The SimpleSelector should have either a non-empty name or at least one condition", CssPackage.Literals.SIMPLE_SELECTOR__ELEMENT_NAME);
-			}
-		}
-	}
-
-	@Check
-	public void checkAttribute(Attribute attribute) {
-		if ("".equals(attribute.getName())) {
-			error("The attribute's name should not be empty", CssPackage.Literals.ATTRIBUTE__NAME);
-		}
-	}
-
-}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSInjectorProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSInjectorProvider.java
new file mode 100644
index 00000000000..9e63dc3eedc
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSInjectorProvider.java
@@ -0,0 +1,48 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3;

+

+import org.eclipse.xtext.junit4.GlobalRegistries;

+import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;

+import org.eclipse.xtext.junit4.IInjectorProvider;

+import org.eclipse.xtext.junit4.IRegistryConfigurator;

+

+import com.google.inject.Injector;

+

+public class CSSInjectorProvider implements IInjectorProvider, IRegistryConfigurator {

+	

+    protected GlobalStateMemento stateBeforeInjectorCreation;

+	protected GlobalStateMemento stateAfterInjectorCreation;

+	protected Injector injector;

+

+	static {

+		GlobalRegistries.initializeDefaults();

+	}

+

+	@Override

+	public Injector getInjector()

+	{

+		if (injector == null) {

+			stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();

+			this.injector = internalCreateInjector();

+			stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();

+		}

+		return injector;

+	}

+	

+	protected Injector internalCreateInjector() {

+	    return new CSSStandaloneSetup().createInjectorAndDoEMFRegistration();

+	}

+

+	@Override

+	public void restoreRegistry() {

+		stateBeforeInjectorCreation.restoreGlobalState();

+	}

+

+	@Override

+	public void setupRegistry() {

+		getInjector();

+		stateAfterInjectorCreation.restoreGlobalState();

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSUiInjectorProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSUiInjectorProvider.java
new file mode 100644
index 00000000000..6ecd68de5c8
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSUiInjectorProvider.java
@@ -0,0 +1,17 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3;

+

+import org.eclipse.xtext.junit4.IInjectorProvider;

+

+import com.google.inject.Injector;

+

+public class CSSUiInjectorProvider implements IInjectorProvider {

+	

+	@Override

+	public Injector getInjector() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal.CSSActivator.getInstance().getInjector("org.eclipse.papyrus.infra.gmfdiag.css3.CSS");

+	}

+	

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/.classpath b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.classpath
index 9389ddb61c1..d1b97f72bd5 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/.classpath
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="xtend-gen"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/.project b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.project
index e91cc95a91f..8acb9f2acd3 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/.project
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.project
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.gmfdiag.css.xtext</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.core.resources.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..99f26c0203a
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..d54abf01b36
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: CSS3 Xtext Editor (UI)

+Bundle-Vendor: Eclipse Modeling Project

+Bundle-Version: 1.1.0.qualifier

+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui; singleton:=true

+Bundle-ActivationPolicy: lazy

+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.1.0";visibility:=reexport,

+ org.eclipse.xtext.ui,

+ org.eclipse.ui.editors;bundle-version="3.5.0",

+ org.eclipse.ui.ide;bundle-version="3.5.0",

+ org.eclipse.xtext.ui.shared,

+ org.eclipse.ui,

+ org.eclipse.xtext.builder,

+ org.eclipse.xtext.xbase.lib,

+ org.eclipse.xtext.common.types.ui,

+ org.eclipse.xtext.ui.codetemplates.ui,

+ org.eclipse.compare

+Import-Package: org.apache.log4j

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3.ui.quickfix,

+ org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist,

+ org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal,

+ org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr

+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal.CSSActivator

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/about.html b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/about.html
index 209103075a7..209103075a7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/about.html
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/about.html
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/build.properties b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/build.properties
index 2ff830d312e..2ff830d312e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/build.properties
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/build.properties
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/icons/sourceEditor.gif b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/icons/sourceEditor.gif
index 75ebdb85865..75ebdb85865 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/icons/sourceEditor.gif
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/icons/sourceEditor.gif
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/plugin.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/plugin.xml
new file mode 100644
index 00000000000..d7716fb075a
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/plugin.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.0"?>

+

+<plugin>

+

+    <extension

+            point="org.eclipse.ui.editors">

+        <editor

+              class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"

+              contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"

+              default="true"

+              extensions="css"

+              icon="icons/sourceEditor.gif"

+              id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

+              name="Papyrus CSS Editor">

+        </editor>

+    </extension>

+    <extension

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

+        <handler

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"

+            commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">

+            <activeWhen>

+                <reference

+                    definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

+                </reference>

+            </activeWhen>

+        </handler>

+        <handler

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"

+            commandId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.validate">

+         <activeWhen>

+            <reference

+                    definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

+            </reference>

+         </activeWhen>

+      	</handler>

+      	<!-- copy qualified name -->

+        <handler

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"

+            commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">

+            <activeWhen>

+				<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />

+            </activeWhen>

+        </handler>

+        <handler

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"

+            commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">

+            <activeWhen>

+            	<and>

+            		<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.XtextEditor.opened" />

+	                <iterate>

+						<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />

+					</iterate>

+				</and>

+            </activeWhen>

+        </handler>

+    </extension>

+    <extension point="org.eclipse.core.expressions.definitions">

+        <definition id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

+            <and>

+                <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>

+                <with variable="activeEditor">

+                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 

+                        value="org.eclipse.papyrus.infra.gmfdiag.css3.CSS" 

+                        forcePluginActivation="true"/>

+                </with>        

+            </and>

+        </definition>

+        <definition id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.XtextEditor.opened">

+            <and>

+                <reference definitionId="isXtextEditorActive"/>

+                <with variable="activeEditor">

+                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 

+                        value="org.eclipse.papyrus.infra.gmfdiag.css3.CSS" 

+                        forcePluginActivation="true"/>

+                </with>        

+            </and>

+        </definition>

+    </extension>

+    <extension

+            point="org.eclipse.ui.preferencePages">

+        <page

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

+            name="CSS">

+            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

+        </page>

+        <page

+            category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.coloring"

+            name="Syntax Coloring">

+            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

+        </page>

+        <page

+            category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.templates"

+            name="Templates">

+            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

+        </page>

+    </extension>

+    <extension

+            point="org.eclipse.ui.propertyPages">

+        <page

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

+            name="CSS">

+            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

+            <enabledWhen>

+	            <adapt type="org.eclipse.core.resources.IProject"/>

+			</enabledWhen>

+	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>

+        </page>

+    </extension>

+    <extension

+        point="org.eclipse.ui.keywords">

+        <keyword

+            id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"

+            label="CSS"/>

+    </extension>

+    <extension

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

+      <command

+            description="Trigger expensive validation"

+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.validate"

+            name="Validate">

+      </command>

+      <!-- copy qualified name -->

+      <command

+            id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"

+            categoryId="org.eclipse.ui.category.edit"

+            description="Copy the qualified name for the selected element"

+            name="Copy Qualified Name">

+      </command>

+      <command

+            id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"

+            categoryId="org.eclipse.ui.category.edit"

+            description="Copy the qualified name for the selected element"

+            name="Copy Qualified Name">

+      </command>

+    </extension>

+    <extension point="org.eclipse.ui.menus">

+        <menuContribution

+            locationURI="popup:#TextEditorContext?after=group.edit">

+             <command

+                 commandId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.validate"

+                 style="push"

+                 tooltip="Trigger expensive validation">

+            <visibleWhen checkEnabled="false">

+                <reference

+                    definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

+                </reference>

+            </visibleWhen>

+         </command>  

+         </menuContribution>

+         <!-- copy qualified name -->

+         <menuContribution locationURI="popup:#TextEditorContext?after=copy">

+         	<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" 

+         		style="push" tooltip="Copy Qualified Name">

+            	<visibleWhen checkEnabled="false">

+                	<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />

+            	</visibleWhen>

+         	</command>  

+         </menuContribution>

+         <menuContribution locationURI="menu:edit?after=copy">

+         	<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"

+            	style="push" tooltip="Copy Qualified Name">

+            	<visibleWhen checkEnabled="false">

+                	<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />

+            	</visibleWhen>

+         	</command>  

+         </menuContribution>

+         <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">

+			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName" 

+				style="push" tooltip="Copy Qualified Name">

+         		<visibleWhen checkEnabled="false">

+	            	<and>

+	            		<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.XtextEditor.opened" />

+						<iterate>

+							<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />

+						</iterate>

+					</and>

+				</visibleWhen>

+			</command>

+         </menuContribution>

+    </extension>

+    <extension point="org.eclipse.ui.menus">

+		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">

+			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">

+				<visibleWhen checkEnabled="false">

+                	<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

+                	</reference>

+            	</visibleWhen>

+			</command>

+		</menuContribution>

+	</extension>

+	<extension point="org.eclipse.ui.handlers">

+	    <handler

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"

+            commandId="org.eclipse.xtext.ui.editor.FindReferences">

+            <activeWhen>

+                <reference

+                    definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

+                </reference>

+            </activeWhen>

+        </handler>

+    </extension>   

+

+<!-- adding resource factories -->

+

+	<extension

+		point="org.eclipse.emf.ecore.extension_parser">

+		<parser

+			class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"

+			type="css">

+		</parser>

+	</extension>

+	<extension point="org.eclipse.xtext.extension_resourceServiceProvider">

+        <resourceServiceProvider

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"

+            uriExtension="css">

+        </resourceServiceProvider>

+    </extension>

+

+

+	<!-- marker definitions for org.eclipse.papyrus.infra.gmfdiag.css3.CSS -->

+	<extension

+	        id="css.check.fast"

+	        name="CSS Problem"

+	        point="org.eclipse.core.resources.markers">

+	    <super type="org.eclipse.xtext.ui.check.fast"/>

+	    <persistent value="true"/>

+	</extension>

+	<extension

+	        id="css.check.normal"

+	        name="CSS Problem"

+	        point="org.eclipse.core.resources.markers">

+	    <super type="org.eclipse.xtext.ui.check.normal"/>

+	    <persistent value="true"/>

+	</extension>

+	<extension

+	        id="css.check.expensive"

+	        name="CSS Problem"

+	        point="org.eclipse.core.resources.markers">

+	    <super type="org.eclipse.xtext.ui.check.expensive"/>

+	    <persistent value="true"/>

+	</extension>

+

+   <extension

+         point="org.eclipse.xtext.builder.participant">

+      <participant

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"

+            fileExtensions="css"

+            >

+      </participant>

+   </extension>

+   <extension

+            point="org.eclipse.ui.preferencePages">

+        <page

+            category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.compiler.preferencePage"

+            name="Compiler">

+            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

+        </page>

+    </extension>

+    <extension

+            point="org.eclipse.ui.propertyPages">

+        <page

+            category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"

+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.compiler.propertyPage"

+            name="Compiler">

+            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

+            <enabledWhen>

+	            <adapt type="org.eclipse.core.resources.IProject"/>

+			</enabledWhen>

+	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>

+        </page>

+    </extension>

+    <extension point="org.eclipse.ui.menus">

+		<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">

+			<command

+				commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"

+				id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.OpenGeneratedCode"

+				style="push">

+					<visibleWhen checkEnabled="false">

+						<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />

+					</visibleWhen>

+			</command>

+		</menuContribution>

+	</extension>

+	<extension point="org.eclipse.ui.handlers">

+		<handler

+			class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"

+			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">

+				<activeWhen>

+					<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />

+				</activeWhen>

+		</handler>

+	</extension>

+

+	<!-- Quick Outline -->

+	<extension

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

+		<handler 

+			class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"

+			commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">

+			<activeWhen>

+				<reference

+					definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

+				</reference>

+			</activeWhen>

+		</handler>

+	</extension>

+	<extension

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

+		<command

+			description="Open the quick outline."

+			id="org.eclipse.xtext.ui.editor.outline.QuickOutline"

+			name="Quick Outline">

+		</command>

+	</extension>

+	<extension point="org.eclipse.ui.menus">

+		<menuContribution

+			locationURI="popup:#TextEditorContext?after=group.open">

+			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"

+				style="push"

+				tooltip="Open Quick Outline">

+				<visibleWhen checkEnabled="false">

+					<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened"/>

+				</visibleWhen>

+			</command>

+		</menuContribution>

+	</extension>

+    <!-- quickfix marker resolution generator for org.eclipse.papyrus.infra.gmfdiag.css3.CSS -->

+    <extension

+            point="org.eclipse.ui.ide.markerResolution">

+        <markerResolutionGenerator

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"

+            markerType="org.eclipse.papyrus.infra.gmfdiag.css3.ui.css.check.fast">

+            <attribute

+                name="FIXABLE_KEY"

+                value="true">

+            </attribute>

+        </markerResolutionGenerator>

+        <markerResolutionGenerator

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"

+            markerType="org.eclipse.papyrus.infra.gmfdiag.css3.ui.css.check.normal">

+            <attribute

+                name="FIXABLE_KEY"

+                value="true">

+            </attribute>

+        </markerResolutionGenerator>

+        <markerResolutionGenerator

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"

+            markerType="org.eclipse.papyrus.infra.gmfdiag.css3.ui.css.check.expensive">

+            <attribute

+                name="FIXABLE_KEY"

+                value="true">

+            </attribute>

+        </markerResolutionGenerator>

+    </extension>

+   	<!-- Rename Refactoring -->

+	<extension point="org.eclipse.ui.handlers">

+		<handler 

+			class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"

+			commandId="org.eclipse.xtext.ui.refactoring.RenameElement">

+			<activeWhen>

+				<reference

+					definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

+				</reference>

+			</activeWhen>

+		</handler>

+	</extension>

+    <extension point="org.eclipse.ui.menus">

+         <menuContribution

+            locationURI="popup:#TextEditorContext?after=group.edit">

+         <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"

+               style="push">

+            <visibleWhen checkEnabled="false">

+               <reference

+                     definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

+               </reference>

+            </visibleWhen>

+         </command>

+      </menuContribution>

+   </extension>

+   <extension point="org.eclipse.ui.preferencePages">

+	    <page

+	        category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

+	        class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"

+	        id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.refactoring"

+	        name="Refactoring">

+	        <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

+	    </page>

+	</extension>

+

+  <extension point="org.eclipse.compare.contentViewers">

+    <viewer id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.compare.contentViewers"

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"

+            extensions="css">

+    </viewer>

+  </extension>

+  <extension point="org.eclipse.compare.contentMergeViewers">

+    <viewer id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.compare.contentMergeViewers"

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"

+            extensions="css" label="CSS Compare">

+     </viewer>

+  </extension>

+  <extension point="org.eclipse.ui.editors.documentProviders">

+    <provider id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.editors.documentProviders"

+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"

+            extensions="css">

+    </provider>

+  </extension>

+  <extension point="org.eclipse.team.core.fileTypes">

+    <fileTypes

+            extension="css"

+            type="text">

+    </fileTypes>

+  </extension>

+

+</plugin>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/pom.xml
new file mode 100644
index 00000000000..1ca4947fc3c
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../../../../../releng/top-pom-main.xml</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui</artifactId>
+	<groupId>org.eclipse.papyrus</groupId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<fileset>
+						<directory>xtend-gen</directory>
+						<includes>
+							<include>**/*</include>
+						</includes>
+						<excludes>
+							<exclude>.gitignore</exclude>
+						</excludes>
+					</fileset>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<outputDirectory>xtend-gen</outputDirectory>
+					<testOutputDirectory>${project.build.directory}/xtend-gen/test</testOutputDirectory>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/AbstractCSSUiModule.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/AbstractCSSUiModule.java
index e24405a68e2..f40c93c9793 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/AbstractCSSUiModule.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/AbstractCSSUiModule.java
@@ -1,258 +1,199 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.xtext.ui.DefaultUiModule;
-
-/**
- * Manual modifications go to {org.eclipse.papyrus.infra.gmfdiag.ui.CSSUiModule}
- */
-@SuppressWarnings("all")
-public abstract class AbstractCSSUiModule extends DefaultUiModule {
-
-	public AbstractCSSUiModule(AbstractUIPlugin plugin) {
-		super(plugin);
-	}
-
-
-	// contributed by org.eclipse.xtext.ui.generator.ImplicitUiFragment
-	public com.google.inject.Provider<org.eclipse.xtext.resource.containers.IAllContainersState> provideIAllContainersState() {
-		return org.eclipse.xtext.ui.shared.Access.getJavaProjectsState();
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {
-		return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public void configureHighlightingLexer(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal.InternalCSSLexer.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public void configureHighlightingTokenDefProvider(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
-		return org.eclipse.xtext.ui.refactoring.impl.DefaultDependentElementsCalculator.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE))
-				.to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.IXtextEditorCallback> bindIXtextEditorCallback() {
-		return org.eclipse.xtext.builder.nature.NatureAddingEditorCallback.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.PERSISTED_DESCRIPTIONS))
-				.to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource> bindDocumentBasedDirtyResource() {
-		return org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
-	public Class<? extends org.eclipse.xtext.builder.IXtextBuilderParticipant> bindIXtextBuilderParticipant() {
-		return org.eclipse.xtext.builder.BuilderParticipant.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
-	public org.eclipse.core.resources.IWorkspaceRoot bindIWorkspaceRootToInstance() {
-		return org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot();
-	}
-
-	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
-	public void configureBuilderPreferenceStoreInitializer(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer.class).annotatedWith(com.google.inject.name.Names.named("builderPreferenceInitializer"))
-				.to(org.eclipse.xtext.builder.preferences.BuilderPreferenceAccess.Initializer.class);
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment
-	@Override
-	public Class<? extends org.eclipse.jface.viewers.ILabelProvider> bindILabelProvider() {
-		return org.eclipse.papyrus.infra.gmfdiag.ui.labeling.CSSLabelProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment
-	@Override
-	public void configureResourceUIServiceLabelProvider(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.jface.viewers.ILabelProvider.class).annotatedWith(org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider.class).to(org.eclipse.papyrus.infra.gmfdiag.ui.labeling.CSSDescriptionLabelProvider.class);
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider> bindIOutlineTreeProvider() {
-		return org.eclipse.papyrus.infra.gmfdiag.ui.outline.CSSOutlineTreeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {
-		return org.eclipse.papyrus.infra.gmfdiag.ui.outline.CSSOutlineTreeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment
-	@Override
-	public Class<? extends org.eclipse.xtext.ui.editor.quickfix.IssueResolutionProvider> bindIssueResolutionProvider() {
-		return org.eclipse.papyrus.infra.gmfdiag.ui.quickfix.CSSQuickfixProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.contentAssist.JavaBasedContentAssistFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {
-		return org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.CSSProposalProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext.Factory> bindContentAssistContext$Factory() {
-		return org.eclipse.xtext.ui.editor.contentassist.antlr.ParserBasedContentAssistContextFactory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.antlr.IContentAssistParser> bindIContentAssistParser() {
-		return org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.CSSParser.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
-	public void configureContentAssistLexerProvider(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal.InternalCSSLexer.class).toProvider(
-				org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal.InternalCSSLexer.class));
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
-	public void configureContentAssistLexer(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.CONTENT_ASSIST))
-				.to(org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.internal.InternalCSSLexer.class);
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.IRenameStrategy> bindIRenameStrategy() {
-		return org.eclipse.xtext.ui.refactoring.impl.DefaultRenameStrategy.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.IReferenceUpdater> bindIReferenceUpdater() {
-		return org.eclipse.xtext.ui.refactoring.impl.DefaultReferenceUpdater.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
-	public void configureIPreferenceStoreInitializer(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer.class).annotatedWith(com.google.inject.name.Names.named("RefactoringPreferences")).to(org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferences.Initializer.class);
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.IRenameRefactoringProvider> bindIRenameRefactoringProvider() {
-		return org.eclipse.xtext.ui.refactoring.impl.DefaultRenameRefactoringProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.ui.IRenameSupport.Factory> bindIRenameSupport$Factory() {
-		return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameSupport.Factory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public java.lang.ClassLoader bindClassLoaderToInstance() {
-		return getClass().getClassLoader();
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
-		return org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderFactory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtBasedSimpleTypeScopeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.ui.ITypesProposalProvider> bindITypesProposalProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtTypesProposalProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.jdt.IJavaProjectProvider> bindIJavaProjectProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.XtextResourceSetBasedProjectProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkHelper> bindIHyperlinkHelper() {
-		return org.eclipse.xtext.common.types.xtext.ui.TypeAwareHyperlinkHelper.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {
-		return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider.ReferenceProposalCreator> bindAbstractJavaBasedContentProposalProvider$ReferenceProposalCreator() {
-		return org.eclipse.xtext.common.types.xtext.ui.TypeAwareReferenceProposalCreator.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.IValidationJobScheduler> bindIValidationJobScheduler() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtValidationJobScheduler.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.impl.RefactoringResourceSetProvider> bindRefactoringResourceSetProvider() {
-		return org.eclipse.xtext.common.types.ui.refactoring.JvmRefactoringResourceSetProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation> bindIJavaSearchParticipation() {
-		return org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation.Yes.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
-	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
-		return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
-	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistry> provideLanguageRegistry() {
-		return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getLanguageRegistry();
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
-	@org.eclipse.xtext.service.SingletonBinding(eager = true)
-	public Class<? extends org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistrar> bindLanguageRegistrar() {
-		return org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistrar.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage> bindXtextTemplatePreferencePage() {
-		return org.eclipse.xtext.ui.codetemplates.ui.preferences.AdvancedTemplatesPreferencePage.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.codetemplates.ui.partialEditing.IPartialContentAssistParser> bindIPartialContentAssistParser() {
-		return org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr.PartialCSSContentAssistParser.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.compare.CompareFragment
-	public Class<? extends org.eclipse.compare.IViewerCreator> bindIViewerCreator() {
-		return org.eclipse.xtext.ui.compare.DefaultViewerCreator.class;
-	}
-
-
-}
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui;

+

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

+

+/**

+ * Manual modifications go to {org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSUiModule}

+ */

+@SuppressWarnings("all")

+public abstract class AbstractCSSUiModule extends org.eclipse.xtext.common.types.ui.DefaultCommonTypesUiModule {

+

+	public AbstractCSSUiModule(AbstractUIPlugin plugin) {

+		super(plugin);

+	}

+

+

+	// contributed by org.eclipse.xtext.ui.generator.ImplicitUiFragment

+	public com.google.inject.Provider<org.eclipse.xtext.resource.containers.IAllContainersState> provideIAllContainersState() {

+		return org.eclipse.xtext.ui.shared.Access.getJavaProjectsState();

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

+	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {

+		return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

+	public void configureHighlightingLexer(com.google.inject.Binder binder) {

+		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer.class);

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

+	public void configureHighlightingTokenDefProvider(com.google.inject.Binder binder) {

+		binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);

+	}

+

+	// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment

+	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {

+		return org.eclipse.xtext.ui.refactoring.impl.DefaultDependentElementsCalculator.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

+	public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) {

+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE))

+				.to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class);

+	}

+

+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

+	public Class<? extends org.eclipse.xtext.ui.editor.IXtextEditorCallback> bindIXtextEditorCallback() {

+		return org.eclipse.xtext.builder.nature.NatureAddingEditorCallback.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

+	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {

+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS))

+				.to(org.eclipse.xtext.builder.builderState.IBuilderState.class);

+	}

+

+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

+	public Class<? extends org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource> bindDocumentBasedDirtyResource() {

+		return org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment

+	public Class<? extends org.eclipse.xtext.builder.IXtextBuilderParticipant> bindIXtextBuilderParticipant() {

+		return org.eclipse.xtext.builder.BuilderParticipant.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment

+	public org.eclipse.core.resources.IWorkspaceRoot bindIWorkspaceRootToInstance() {

+		return org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot();

+	}

+

+	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment

+	public void configureBuilderPreferenceStoreInitializer(com.google.inject.Binder binder) {

+		binder.bind(org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer.class).annotatedWith(com.google.inject.name.Names.named("builderPreferenceInitializer"))

+				.to(org.eclipse.xtext.builder.preferences.BuilderPreferenceAccess.Initializer.class);

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment

+	@Override

+	public Class<? extends org.eclipse.jface.viewers.ILabelProvider> bindILabelProvider() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.labeling.CSSLabelProvider.class;

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment

+	@Override

+	public void configureResourceUIServiceLabelProvider(com.google.inject.Binder binder) {

+		binder.bind(org.eclipse.jface.viewers.ILabelProvider.class).annotatedWith(org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider.class).to(org.eclipse.papyrus.infra.gmfdiag.css3.ui.labeling.CSSDescriptionLabelProvider.class);

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment

+	public Class<? extends org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider> bindIOutlineTreeProvider() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.outline.CSSOutlineTreeProvider.class;

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment

+	public Class<? extends org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.outline.CSSOutlineTreeProvider.class;

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment

+	@Override

+	public Class<? extends org.eclipse.xtext.ui.editor.quickfix.IssueResolutionProvider> bindIssueResolutionProvider() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.quickfix.CSSQuickfixProvider.class;

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.contentAssist.ContentAssistFragment

+	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.CSSProposalProvider.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment

+	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext.Factory> bindContentAssistContext$Factory() {

+		return org.eclipse.xtext.ui.editor.contentassist.antlr.ParserBasedContentAssistContextFactory.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment

+	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.antlr.IContentAssistParser> bindIContentAssistParser() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.CSSParser.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment

+	public void configureContentAssistLexerProvider(com.google.inject.Binder binder) {

+		binder.bind(org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSLexer.class).toProvider(

+				org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSLexer.class));

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment

+	public void configureContentAssistLexer(com.google.inject.Binder binder) {

+		binder.bind(org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.CONTENT_ASSIST))

+				.to(org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSLexer.class);

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment

+	public Class<? extends org.eclipse.xtext.ui.refactoring.IRenameStrategy> bindIRenameStrategy() {

+		return org.eclipse.xtext.ui.refactoring.impl.DefaultRenameStrategy.class;

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment

+	public Class<? extends org.eclipse.xtext.ui.refactoring.IReferenceUpdater> bindIReferenceUpdater() {

+		return org.eclipse.xtext.ui.refactoring.impl.DefaultReferenceUpdater.class;

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment

+	public void configureIPreferenceStoreInitializer(com.google.inject.Binder binder) {

+		binder.bind(org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer.class).annotatedWith(com.google.inject.name.Names.named("RefactoringPreferences")).to(org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferences.Initializer.class);

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment

+	public Class<? extends org.eclipse.xtext.ui.refactoring.IRenameRefactoringProvider> bindIRenameRefactoringProvider() {

+		return org.eclipse.xtext.ui.refactoring.impl.DefaultRenameRefactoringProvider.class;

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment

+	public Class<? extends org.eclipse.xtext.ui.refactoring.ui.IRenameSupport.Factory> bindIRenameSupport$Factory() {

+		return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameSupport.Factory.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment

+	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {

+		return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment

+	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {

+		return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment

+	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistry> provideLanguageRegistry() {

+		return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getLanguageRegistry();

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment

+	@org.eclipse.xtext.service.SingletonBinding(eager = true)

+	public Class<? extends org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistrar> bindLanguageRegistrar() {

+		return org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistrar.class;

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment

+	public Class<? extends org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage> bindXtextTemplatePreferencePage() {

+		return org.eclipse.xtext.ui.codetemplates.ui.preferences.AdvancedTemplatesPreferencePage.class;

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment

+	public Class<? extends org.eclipse.xtext.ui.codetemplates.ui.partialEditing.IPartialContentAssistParser> bindIPartialContentAssistParser() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.PartialCSSContentAssistParser.class;

+	}

+

+	// contributed by org.eclipse.xtext.ui.generator.compare.CompareFragment

+	public Class<? extends org.eclipse.compare.IViewerCreator> bindIViewerCreator() {

+		return org.eclipse.xtext.ui.compare.DefaultViewerCreator.class;

+	}

+

+

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/CSSExecutableExtensionFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/CSSExecutableExtensionFactory.java
new file mode 100644
index 00000000000..af3403a0116
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/CSSExecutableExtensionFactory.java
@@ -0,0 +1,29 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui;

+

+import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;

+import org.osgi.framework.Bundle;

+

+import com.google.inject.Injector;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal.CSSActivator;

+

+/**

+ * This class was generated. Customizations should only happen in a newly

+ * introduced subclass.

+ */

+public class CSSExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {

+

+	@Override

+	protected Bundle getBundle() {

+		return CSSActivator.getInstance().getBundle();

+	}

+

+	@Override

+	protected Injector getInjector() {

+		return CSSActivator.getInstance().getInjector(CSSActivator.ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS3_CSS);

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/AbstractCSSProposalProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/AbstractCSSProposalProvider.java
index 98138e4068a..3281aa68cf3 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/AbstractCSSProposalProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/AbstractCSSProposalProvider.java
@@ -1,514 +1,505 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.ui.contentassist;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.Alternatives;
-import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
-import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
-
-/**
- * Represents a generated, default implementation of interface {@link IProposalProvider}.
- * Methods are dynamically dispatched on the first parameter, i.e., you can override them
- * with a more concrete subtype.
- */
-@SuppressWarnings("all")
-public class AbstractCSSProposalProvider extends org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider {
-
-	public void completeStylesheet_Charset(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeStylesheet_Imports(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeStylesheet_Contents(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeImport_String(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeImport_Uri(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeImport_Media(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeMedia_Media(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeMedia_Rules(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completePage_Pseudo(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completePage_Declarations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completePseudoPage_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeRuleset_Selectors(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeRuleset_Properties(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeCompositeSelector_Left(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeCompositeSelector_Combinator(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeCompositeSelector_Right(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeSimpleSelector_ElementName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) ((Alternatives) assignment.getTerminal()).getElements().get(0)), context, acceptor);
-		// subclasses may override
-	}
-
-	public void completeSimpleSelector_Condition(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeCombinator_Kind(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeDeclaration_Property(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeDeclaration_Expression(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeDeclaration_Important(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeExpression_Terms(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeExpression_Subterms(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeSubterm_Operator(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeSubterm_Term(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeFunction_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeFunction_Args(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeName_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeNumber_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeNumber_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completePercentage_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completePercentage_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completePercentage_Unit(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeLength_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeLength_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeLength_Unit(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeEms_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeEms_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeEms_Unit(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeExs_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeExs_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeExs_Unit(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeAngle_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeAngle_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeAngle_Unit(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeTime_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeTime_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeTime_Unit(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeFrequency_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeFrequency_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeFrequency_Unit(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeUri_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeStringValue_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeHexColor_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeClass_Class(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeAttribute_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeAttribute_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeAttributeValue_Operator(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeAttributeValue_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) ((Alternatives) assignment.getTerminal()).getElements().get(0)), context, acceptor);
-		completeRuleCall(((RuleCall) ((Alternatives) assignment.getTerminal()).getElements().get(1)), context, acceptor);
-	}
-
-	public void completePseudo_Pseudo(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completePseudo_Args(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeCSSId_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void completeUnaryOperator_Operator(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);
-	}
-
-	public void complete_Stylesheet(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Content(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Import(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Media(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Page(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_PseudoPage(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Ruleset(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Selector(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_CompositeSelector(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_SimpleSelector(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_SelectorCondition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Combinator(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Declaration(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Expression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Subterm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Term(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Function(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Name(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Number(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Percentage(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Length(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Ems(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Exs(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Angle(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Time(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Frequency(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Uri(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_StringValue(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_HexColor(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Operator(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Class(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Attribute(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_AttributeValue(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_Pseudo(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_CSSId(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_UnaryOperator(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_UNARY(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_KIND(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_ATTRIBUTE_OP(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_HASH(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_T_CLASS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_T_IMPORTANT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_PC_UNIT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_LEN_UNIT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_EM_UNIT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_EX_UNIT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_ANGLE_UNIT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_TIME_UNIT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_FREQ_UNIT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_T_NUM(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_ID(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_STRING(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_CDO(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_CDC(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_ML_COMMENT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_WS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-
-	public void complete_ANY_OTHER(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-}
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist;

+

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

+import org.eclipse.xtext.*;

+import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;

+import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;

+

+/**

+ * Represents a generated, default implementation of superclass {@link org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider}.

+ * Methods are dynamically dispatched on the first parameter, i.e., you can override them

+ * with a more concrete subtype.

+ */

+@SuppressWarnings("all")

+public class AbstractCSSProposalProvider extends org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider {

+

+	public void completeStylesheet_Charset(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeStylesheet_Imports(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeStylesheet_Ruleset(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeStylesheet_Media(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeStylesheet_Page(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeStylesheet_Font_face(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeStylesheet_Keyframes(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeCharset_Charset(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeImportExpression_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeImportExpression_MediaList(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completePage_PseudoPage(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completePage_Declarations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeMedia_Medialist(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeMedia_Rulesets(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeFont_face_Declarations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeKeyframes_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeKeyframes_Keyframeselectors(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeKeyframe_selector_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeKeyframe_selector_Percentage(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeKeyframe_selector_Declarations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeRuleset_Selectors(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeRuleset_Declarations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeSelector_Simpleselectors(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeSelector_Combinator(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeSelector_Selector(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeSimpleSelectorForNegation_Element(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeSimpleSelectorForNegation_Universal(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeSimpleSelectorForNegation_SubSelectors(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeSimple_selector_Element(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeSimple_selector_Universal(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeSimple_selector_SubSelectors(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeAttributeSelector_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeAttributeSelector_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+		// subclasses may override

+		// subclasses may override

+		// subclasses may override

+		completeRuleCall(((RuleCall) ((Alternatives) assignment.getTerminal()).getElements().get(4)), context, acceptor);

+		completeRuleCall(((RuleCall) ((Alternatives) assignment.getTerminal()).getElements().get(5)), context, acceptor);

+	}

+

+	public void completeAttributeSelector_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) ((Alternatives) assignment.getTerminal()).getElements().get(0)), context, acceptor);

+		completeRuleCall(((RuleCall) ((Alternatives) assignment.getTerminal()).getElements().get(1)), context, acceptor);

+	}

+

+	public void completeClassSelector_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeElementSelector_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeUniversalSelector_Namespace(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeIdSelector_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeCss_declaration_Property(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeCss_declaration_ValueTokens(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeCss_declaration_Important(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeCss_property_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completePseudoClassName_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completePseudoClassFunction_Not(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completePseudoClassFunction_ParamSelector(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completePseudoClassFunction_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completePseudoClassFunction_Params(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeSymbolTok_Symbol(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) ((Alternatives) assignment.getTerminal()).getElements().get(0)), context, acceptor);

+		completeRuleCall(((RuleCall) ((Alternatives) assignment.getTerminal()).getElements().get(1)), context, acceptor);

+	}

+

+	public void completeStringTok_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeNumberTok_Val(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeUrlTok_Url(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeColorTok_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeIdentifierOrFuncTok_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeIdentifierOrFuncTok_Params(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void completeURLType_Url(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		completeRuleCall(((RuleCall) assignment.getTerminal()), context, acceptor);

+	}

+

+	public void complete_stylesheet(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_charset(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_importExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_page(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_pseudo_page(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_media(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_media_list(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_medium(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_font_face(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_keyframes(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_keyframe_selector(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_ruleset(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_selector(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_SimpleSelectorForNegation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_SubSelectorForNegation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_simple_selector(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_SubSelector(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_AttributeSelector(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_ClassSelector(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_ElementSelector(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_UniversalSelector(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_IdSelector(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_css_namespace_prefix(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_css_declaration(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_css_property(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_ValidPropertyIdent(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_PseudoClassOrFunc(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_PseudoClass(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_PseudoClassName(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_PseudoClassFunction(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_NotFunctionCall(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_combinator(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_operator(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_unary_operator(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_SymbolTok(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_WSTok(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_StringTok(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_NumberTok(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_UrlTok(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_ColorTok(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_IdentifierOrFuncTok(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_CssTok(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_URLType(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_ValidURLSymbol(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_KeywordHack(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_ValidURL(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_IMPORTANT_SYM(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_Identifier(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_Num(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_Hex(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_ONE_INT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_ONE_HEX_LETTER(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_ONE_NON_HEX_LETTER(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_UNDERSCORE(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_DASH(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_PLUS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_HASHMARK(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_COMMA(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_PERCENT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_ML_COMMENT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_WS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_CSSSTRING(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_INCLUDES(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_DASHMATCH(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+

+	public void complete_COLON(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+		// subclasses may override

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/CSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/CSSParser.java
new file mode 100644
index 00000000000..b745a1a5395
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/CSSParser.java
@@ -0,0 +1,230 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr;

+

+import java.util.Collection;

+import java.util.Map;

+import java.util.HashMap;

+

+import org.antlr.runtime.RecognitionException;

+import org.eclipse.xtext.AbstractElement;

+import org.eclipse.xtext.ui.editor.contentassist.antlr.AbstractContentAssistParser;

+import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;

+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;

+

+import com.google.inject.Inject;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;

+

+public class CSSParser extends AbstractContentAssistParser {

+

+	@Inject

+	private CSSGrammarAccess grammarAccess;

+

+	private Map<AbstractElement, String> nameMappings;

+

+	@Override

+	protected org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSParser createParser() {

+		org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSParser result = new org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSParser(null);

+		result.setGrammarAccess(grammarAccess);

+		return result;

+	}

+

+	@Override

+	protected String getRuleName(AbstractElement element) {

+		if (nameMappings == null) {

+			nameMappings = new HashMap<AbstractElement, String>() {

+				private static final long serialVersionUID = 1L;

+				{

+					put(grammarAccess.getStylesheetAccess().getAlternatives_2(), "rule__Stylesheet__Alternatives_2");

+					put(grammarAccess.getCharsetAccess().getAlternatives_0(), "rule__Charset__Alternatives_0");

+					put(grammarAccess.getImportExpressionAccess().getAlternatives_0(), "rule__ImportExpression__Alternatives_0");

+					put(grammarAccess.getImportExpressionAccess().getAlternatives_1(), "rule__ImportExpression__Alternatives_1");

+					put(grammarAccess.getPageAccess().getAlternatives_1(), "rule__Page__Alternatives_1");

+					put(grammarAccess.getMediaAccess().getAlternatives_0(), "rule__Media__Alternatives_0");

+					put(grammarAccess.getFont_faceAccess().getAlternatives_1(), "rule__Font_face__Alternatives_1");

+					put(grammarAccess.getKeyframesAccess().getAlternatives_1(), "rule__Keyframes__Alternatives_1");

+					put(grammarAccess.getKeyframe_selectorAccess().getAlternatives_0(), "rule__Keyframe_selector__Alternatives_0");

+					put(grammarAccess.getSelectorAccess().getAlternatives_1(), "rule__Selector__Alternatives_1");

+					put(grammarAccess.getSimpleSelectorForNegationAccess().getAlternatives(), "rule__SimpleSelectorForNegation__Alternatives");

+					put(grammarAccess.getSimpleSelectorForNegationAccess().getAlternatives_0_0(), "rule__SimpleSelectorForNegation__Alternatives_0_0");

+					put(grammarAccess.getSubSelectorForNegationAccess().getAlternatives(), "rule__SubSelectorForNegation__Alternatives");

+					put(grammarAccess.getSimple_selectorAccess().getAlternatives(), "rule__Simple_selector__Alternatives");

+					put(grammarAccess.getSimple_selectorAccess().getAlternatives_0_0(), "rule__Simple_selector__Alternatives_0_0");

+					put(grammarAccess.getSubSelectorAccess().getAlternatives(), "rule__SubSelector__Alternatives");

+					put(grammarAccess.getAttributeSelectorAccess().getOpAlternatives_3_0_0(), "rule__AttributeSelector__OpAlternatives_3_0_0");

+					put(grammarAccess.getAttributeSelectorAccess().getValueAlternatives_3_1_0(), "rule__AttributeSelector__ValueAlternatives_3_1_0");

+					put(grammarAccess.getCss_namespace_prefixAccess().getAlternatives_0(), "rule__Css_namespace_prefix__Alternatives_0");

+					put(grammarAccess.getPseudoClassOrFuncAccess().getAlternatives(), "rule__PseudoClassOrFunc__Alternatives");

+					put(grammarAccess.getPseudoClassFunctionAccess().getAlternatives(), "rule__PseudoClassFunction__Alternatives");

+					put(grammarAccess.getCombinatorAccess().getAlternatives(), "rule__Combinator__Alternatives");

+					put(grammarAccess.getOperatorAccess().getAlternatives(), "rule__Operator__Alternatives");

+					put(grammarAccess.getUnary_operatorAccess().getAlternatives(), "rule__Unary_operator__Alternatives");

+					put(grammarAccess.getSymbolTokAccess().getSymbolAlternatives_1_0(), "rule__SymbolTok__SymbolAlternatives_1_0");

+					put(grammarAccess.getCssTokAccess().getAlternatives(), "rule__CssTok__Alternatives");

+					put(grammarAccess.getValidURLSymbolAccess().getAlternatives(), "rule__ValidURLSymbol__Alternatives");

+					put(grammarAccess.getKeywordHackAccess().getAlternatives(), "rule__KeywordHack__Alternatives");

+					put(grammarAccess.getValidURLAccess().getAlternatives(), "rule__ValidURL__Alternatives");

+					put(grammarAccess.getValidURLAccess().getAlternatives_1(), "rule__ValidURL__Alternatives_1");

+					put(grammarAccess.getValidURLAccess().getAlternatives_1_10_1(), "rule__ValidURL__Alternatives_1_10_1");

+					put(grammarAccess.getValidURLAccess().getAlternatives_1_10_2(), "rule__ValidURL__Alternatives_1_10_2");

+					put(grammarAccess.getIdentifierAccess().getAlternatives_1(), "rule__Identifier__Alternatives_1");

+					put(grammarAccess.getIdentifierAccess().getAlternatives_2_0(), "rule__Identifier__Alternatives_2_0");

+					put(grammarAccess.getNumAccess().getAlternatives_0(), "rule__Num__Alternatives_0");

+					put(grammarAccess.getNumAccess().getAlternatives_1(), "rule__Num__Alternatives_1");

+					put(grammarAccess.getHexAccess().getAlternatives_1_0(), "rule__Hex__Alternatives_1_0");

+					put(grammarAccess.getStylesheetAccess().getGroup(), "rule__Stylesheet__Group__0");

+					put(grammarAccess.getCharsetAccess().getGroup(), "rule__Charset__Group__0");

+					put(grammarAccess.getImportExpressionAccess().getGroup(), "rule__ImportExpression__Group__0");

+					put(grammarAccess.getImportExpressionAccess().getGroup_1_1(), "rule__ImportExpression__Group_1_1__0");

+					put(grammarAccess.getPageAccess().getGroup(), "rule__Page__Group__0");

+					put(grammarAccess.getPageAccess().getGroup_5(), "rule__Page__Group_5__0");

+					put(grammarAccess.getPseudo_pageAccess().getGroup(), "rule__Pseudo_page__Group__0");

+					put(grammarAccess.getMediaAccess().getGroup(), "rule__Media__Group__0");

+					put(grammarAccess.getMedia_listAccess().getGroup(), "rule__Media_list__Group__0");

+					put(grammarAccess.getMedia_listAccess().getGroup_1(), "rule__Media_list__Group_1__0");

+					put(grammarAccess.getFont_faceAccess().getGroup(), "rule__Font_face__Group__0");

+					put(grammarAccess.getFont_faceAccess().getGroup_4(), "rule__Font_face__Group_4__0");

+					put(grammarAccess.getKeyframesAccess().getGroup(), "rule__Keyframes__Group__0");

+					put(grammarAccess.getKeyframesAccess().getGroup_5(), "rule__Keyframes__Group_5__0");

+					put(grammarAccess.getKeyframe_selectorAccess().getGroup(), "rule__Keyframe_selector__Group__0");

+					put(grammarAccess.getKeyframe_selectorAccess().getGroup_0_1(), "rule__Keyframe_selector__Group_0_1__0");

+					put(grammarAccess.getKeyframe_selectorAccess().getGroup_3(), "rule__Keyframe_selector__Group_3__0");

+					put(grammarAccess.getRulesetAccess().getGroup(), "rule__Ruleset__Group__0");

+					put(grammarAccess.getRulesetAccess().getGroup_1(), "rule__Ruleset__Group_1__0");

+					put(grammarAccess.getRulesetAccess().getGroup_4(), "rule__Ruleset__Group_4__0");

+					put(grammarAccess.getRulesetAccess().getGroup_4_1(), "rule__Ruleset__Group_4_1__0");

+					put(grammarAccess.getSelectorAccess().getGroup(), "rule__Selector__Group__0");

+					put(grammarAccess.getSelectorAccess().getGroup_1_0(), "rule__Selector__Group_1_0__0");

+					put(grammarAccess.getSelectorAccess().getGroup_1_1(), "rule__Selector__Group_1_1__0");

+					put(grammarAccess.getSelectorAccess().getGroup_1_1_1(), "rule__Selector__Group_1_1_1__0");

+					put(grammarAccess.getSimpleSelectorForNegationAccess().getGroup_0(), "rule__SimpleSelectorForNegation__Group_0__0");

+					put(grammarAccess.getSimple_selectorAccess().getGroup_0(), "rule__Simple_selector__Group_0__0");

+					put(grammarAccess.getAttributeSelectorAccess().getGroup(), "rule__AttributeSelector__Group__0");

+					put(grammarAccess.getAttributeSelectorAccess().getGroup_3(), "rule__AttributeSelector__Group_3__0");

+					put(grammarAccess.getClassSelectorAccess().getGroup(), "rule__ClassSelector__Group__0");

+					put(grammarAccess.getElementSelectorAccess().getGroup(), "rule__ElementSelector__Group__0");

+					put(grammarAccess.getUniversalSelectorAccess().getGroup(), "rule__UniversalSelector__Group__0");

+					put(grammarAccess.getIdSelectorAccess().getGroup(), "rule__IdSelector__Group__0");

+					put(grammarAccess.getCss_namespace_prefixAccess().getGroup(), "rule__Css_namespace_prefix__Group__0");

+					put(grammarAccess.getCss_declarationAccess().getGroup(), "rule__Css_declaration__Group__0");

+					put(grammarAccess.getCss_propertyAccess().getGroup(), "rule__Css_property__Group__0");

+					put(grammarAccess.getPseudoClassAccess().getGroup(), "rule__PseudoClass__Group__0");

+					put(grammarAccess.getPseudoClassFunctionAccess().getGroup_0(), "rule__PseudoClassFunction__Group_0__0");

+					put(grammarAccess.getPseudoClassFunctionAccess().getGroup_1(), "rule__PseudoClassFunction__Group_1__0");

+					put(grammarAccess.getNotFunctionCallAccess().getGroup(), "rule__NotFunctionCall__Group__0");

+					put(grammarAccess.getSymbolTokAccess().getGroup(), "rule__SymbolTok__Group__0");

+					put(grammarAccess.getWSTokAccess().getGroup(), "rule__WSTok__Group__0");

+					put(grammarAccess.getStringTokAccess().getGroup(), "rule__StringTok__Group__0");

+					put(grammarAccess.getNumberTokAccess().getGroup(), "rule__NumberTok__Group__0");

+					put(grammarAccess.getUrlTokAccess().getGroup(), "rule__UrlTok__Group__0");

+					put(grammarAccess.getColorTokAccess().getGroup(), "rule__ColorTok__Group__0");

+					put(grammarAccess.getIdentifierOrFuncTokAccess().getGroup(), "rule__IdentifierOrFuncTok__Group__0");

+					put(grammarAccess.getIdentifierOrFuncTokAccess().getGroup_2(), "rule__IdentifierOrFuncTok__Group_2__0");

+					put(grammarAccess.getURLTypeAccess().getGroup(), "rule__URLType__Group__0");

+					put(grammarAccess.getValidURLSymbolAccess().getGroup_18(), "rule__ValidURLSymbol__Group_18__0");

+					put(grammarAccess.getValidURLAccess().getGroup_1_10(), "rule__ValidURL__Group_1_10__0");

+					put(grammarAccess.getIdentifierAccess().getGroup(), "rule__Identifier__Group__0");

+					put(grammarAccess.getIdentifierAccess().getGroup_2(), "rule__Identifier__Group_2__0");

+					put(grammarAccess.getNumAccess().getGroup(), "rule__Num__Group__0");

+					put(grammarAccess.getNumAccess().getGroup_1_0(), "rule__Num__Group_1_0__0");

+					put(grammarAccess.getNumAccess().getGroup_1_1(), "rule__Num__Group_1_1__0");

+					put(grammarAccess.getNumAccess().getGroup_1_1_1(), "rule__Num__Group_1_1_1__0");

+					put(grammarAccess.getHexAccess().getGroup(), "rule__Hex__Group__0");

+					put(grammarAccess.getHexAccess().getGroup_1(), "rule__Hex__Group_1__0");

+					put(grammarAccess.getStylesheetAccess().getCharsetAssignment_0(), "rule__Stylesheet__CharsetAssignment_0");

+					put(grammarAccess.getStylesheetAccess().getImportsAssignment_1(), "rule__Stylesheet__ImportsAssignment_1");

+					put(grammarAccess.getStylesheetAccess().getRulesetAssignment_2_0(), "rule__Stylesheet__RulesetAssignment_2_0");

+					put(grammarAccess.getStylesheetAccess().getMediaAssignment_2_1(), "rule__Stylesheet__MediaAssignment_2_1");

+					put(grammarAccess.getStylesheetAccess().getPageAssignment_2_2(), "rule__Stylesheet__PageAssignment_2_2");

+					put(grammarAccess.getStylesheetAccess().getFont_faceAssignment_2_3(), "rule__Stylesheet__Font_faceAssignment_2_3");

+					put(grammarAccess.getStylesheetAccess().getKeyframesAssignment_2_4(), "rule__Stylesheet__KeyframesAssignment_2_4");

+					put(grammarAccess.getCharsetAccess().getCharsetAssignment_1(), "rule__Charset__CharsetAssignment_1");

+					put(grammarAccess.getImportExpressionAccess().getValueAssignment_1_0(), "rule__ImportExpression__ValueAssignment_1_0");

+					put(grammarAccess.getImportExpressionAccess().getMediaListAssignment_1_1_1(), "rule__ImportExpression__MediaListAssignment_1_1_1");

+					put(grammarAccess.getPageAccess().getPseudoPageAssignment_2(), "rule__Page__PseudoPageAssignment_2");

+					put(grammarAccess.getPageAccess().getDeclarationsAssignment_4(), "rule__Page__DeclarationsAssignment_4");

+					put(grammarAccess.getPageAccess().getDeclarationsAssignment_5_1(), "rule__Page__DeclarationsAssignment_5_1");

+					put(grammarAccess.getMediaAccess().getMedialistAssignment_1(), "rule__Media__MedialistAssignment_1");

+					put(grammarAccess.getMediaAccess().getRulesetsAssignment_3(), "rule__Media__RulesetsAssignment_3");

+					put(grammarAccess.getFont_faceAccess().getDeclarationsAssignment_3(), "rule__Font_face__DeclarationsAssignment_3");

+					put(grammarAccess.getFont_faceAccess().getDeclarationsAssignment_4_1(), "rule__Font_face__DeclarationsAssignment_4_1");

+					put(grammarAccess.getKeyframesAccess().getNameAssignment_2(), "rule__Keyframes__NameAssignment_2");

+					put(grammarAccess.getKeyframesAccess().getKeyframeselectorsAssignment_4(), "rule__Keyframes__KeyframeselectorsAssignment_4");

+					put(grammarAccess.getKeyframesAccess().getKeyframeselectorsAssignment_5_1(), "rule__Keyframes__KeyframeselectorsAssignment_5_1");

+					put(grammarAccess.getKeyframe_selectorAccess().getTypeAssignment_0_0(), "rule__Keyframe_selector__TypeAssignment_0_0");

+					put(grammarAccess.getKeyframe_selectorAccess().getPercentageAssignment_0_1_0(), "rule__Keyframe_selector__PercentageAssignment_0_1_0");

+					put(grammarAccess.getKeyframe_selectorAccess().getDeclarationsAssignment_2(), "rule__Keyframe_selector__DeclarationsAssignment_2");

+					put(grammarAccess.getKeyframe_selectorAccess().getDeclarationsAssignment_3_1(), "rule__Keyframe_selector__DeclarationsAssignment_3_1");

+					put(grammarAccess.getRulesetAccess().getSelectorsAssignment_0(), "rule__Ruleset__SelectorsAssignment_0");

+					put(grammarAccess.getRulesetAccess().getSelectorsAssignment_1_2(), "rule__Ruleset__SelectorsAssignment_1_2");

+					put(grammarAccess.getRulesetAccess().getDeclarationsAssignment_4_0(), "rule__Ruleset__DeclarationsAssignment_4_0");

+					put(grammarAccess.getRulesetAccess().getDeclarationsAssignment_4_1_1(), "rule__Ruleset__DeclarationsAssignment_4_1_1");

+					put(grammarAccess.getSelectorAccess().getSimpleselectorsAssignment_0(), "rule__Selector__SimpleselectorsAssignment_0");

+					put(grammarAccess.getSelectorAccess().getCombinatorAssignment_1_0_0(), "rule__Selector__CombinatorAssignment_1_0_0");

+					put(grammarAccess.getSelectorAccess().getSelectorAssignment_1_0_2(), "rule__Selector__SelectorAssignment_1_0_2");

+					put(grammarAccess.getSelectorAccess().getCombinatorAssignment_1_1_1_0(), "rule__Selector__CombinatorAssignment_1_1_1_0");

+					put(grammarAccess.getSelectorAccess().getSelectorAssignment_1_1_2(), "rule__Selector__SelectorAssignment_1_1_2");

+					put(grammarAccess.getSimpleSelectorForNegationAccess().getElementAssignment_0_0_0(), "rule__SimpleSelectorForNegation__ElementAssignment_0_0_0");

+					put(grammarAccess.getSimpleSelectorForNegationAccess().getUniversalAssignment_0_0_1(), "rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1");

+					put(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_0_1(), "rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1");

+					put(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_1(), "rule__SimpleSelectorForNegation__SubSelectorsAssignment_1");

+					put(grammarAccess.getSimple_selectorAccess().getElementAssignment_0_0_0(), "rule__Simple_selector__ElementAssignment_0_0_0");

+					put(grammarAccess.getSimple_selectorAccess().getUniversalAssignment_0_0_1(), "rule__Simple_selector__UniversalAssignment_0_0_1");

+					put(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_0_1(), "rule__Simple_selector__SubSelectorsAssignment_0_1");

+					put(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_1(), "rule__Simple_selector__SubSelectorsAssignment_1");

+					put(grammarAccess.getAttributeSelectorAccess().getNameAssignment_2(), "rule__AttributeSelector__NameAssignment_2");

+					put(grammarAccess.getAttributeSelectorAccess().getOpAssignment_3_0(), "rule__AttributeSelector__OpAssignment_3_0");

+					put(grammarAccess.getAttributeSelectorAccess().getValueAssignment_3_1(), "rule__AttributeSelector__ValueAssignment_3_1");

+					put(grammarAccess.getClassSelectorAccess().getNameAssignment_2(), "rule__ClassSelector__NameAssignment_2");

+					put(grammarAccess.getElementSelectorAccess().getNameAssignment_1(), "rule__ElementSelector__NameAssignment_1");

+					put(grammarAccess.getUniversalSelectorAccess().getNamespaceAssignment_1(), "rule__UniversalSelector__NamespaceAssignment_1");

+					put(grammarAccess.getIdSelectorAccess().getNameAssignment_2(), "rule__IdSelector__NameAssignment_2");

+					put(grammarAccess.getCss_declarationAccess().getPropertyAssignment_1(), "rule__Css_declaration__PropertyAssignment_1");

+					put(grammarAccess.getCss_declarationAccess().getValueTokensAssignment_4(), "rule__Css_declaration__ValueTokensAssignment_4");

+					put(grammarAccess.getCss_declarationAccess().getImportantAssignment_5(), "rule__Css_declaration__ImportantAssignment_5");

+					put(grammarAccess.getCss_propertyAccess().getNameAssignment_1(), "rule__Css_property__NameAssignment_1");

+					put(grammarAccess.getPseudoClassNameAccess().getNameAssignment(), "rule__PseudoClassName__NameAssignment");

+					put(grammarAccess.getPseudoClassFunctionAccess().getNotAssignment_0_0(), "rule__PseudoClassFunction__NotAssignment_0_0");

+					put(grammarAccess.getPseudoClassFunctionAccess().getParamSelectorAssignment_0_1(), "rule__PseudoClassFunction__ParamSelectorAssignment_0_1");

+					put(grammarAccess.getPseudoClassFunctionAccess().getNameAssignment_1_1(), "rule__PseudoClassFunction__NameAssignment_1_1");

+					put(grammarAccess.getPseudoClassFunctionAccess().getParamsAssignment_1_3(), "rule__PseudoClassFunction__ParamsAssignment_1_3");

+					put(grammarAccess.getSymbolTokAccess().getSymbolAssignment_1(), "rule__SymbolTok__SymbolAssignment_1");

+					put(grammarAccess.getStringTokAccess().getValueAssignment_1(), "rule__StringTok__ValueAssignment_1");

+					put(grammarAccess.getNumberTokAccess().getValAssignment_1(), "rule__NumberTok__ValAssignment_1");

+					put(grammarAccess.getUrlTokAccess().getUrlAssignment_1(), "rule__UrlTok__UrlAssignment_1");

+					put(grammarAccess.getColorTokAccess().getValueAssignment_1(), "rule__ColorTok__ValueAssignment_1");

+					put(grammarAccess.getIdentifierOrFuncTokAccess().getNameAssignment_1(), "rule__IdentifierOrFuncTok__NameAssignment_1");

+					put(grammarAccess.getIdentifierOrFuncTokAccess().getParamsAssignment_2_2(), "rule__IdentifierOrFuncTok__ParamsAssignment_2_2");

+					put(grammarAccess.getURLTypeAccess().getUrlAssignment_1(), "rule__URLType__UrlAssignment_1");

+				}

+			};

+		}

+		return nameMappings.get(element);

+	}

+

+	@Override

+	protected Collection<FollowElement> getFollowElements(AbstractInternalContentAssistParser parser) {

+		try {

+			org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSParser typedParser = (org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSParser) parser;

+			typedParser.entryRulestylesheet();

+			return typedParser.getFollowElements();

+		} catch (RecognitionException ex) {

+			throw new RuntimeException(ex);

+		}

+	}

+

+	@Override

+	protected String[] getInitialHiddenTokens() {

+		return new String[] { "RULE_WS", "RULE_ML_COMMENT" };

+	}

+

+	public CSSGrammarAccess getGrammarAccess() {

+		return this.grammarAccess;

+	}

+

+	public void setGrammarAccess(CSSGrammarAccess grammarAccess) {

+		this.grammarAccess = grammarAccess;

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/PartialCSSContentAssistParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/PartialCSSContentAssistParser.java
index 383ca04b5b0..9272bed0303 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/contentassist/antlr/PartialCSSContentAssistParser.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/PartialCSSContentAssistParser.java
@@ -1,47 +1,39 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.ui.contentassist.antlr;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.xtext.AbstractRule;
-import org.eclipse.xtext.ui.codetemplates.ui.partialEditing.IPartialContentAssistParser;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
-import org.eclipse.xtext.util.PolymorphicDispatcher;
-
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
- */
-public class PartialCSSContentAssistParser extends CSSParser implements IPartialContentAssistParser {
-
-	private AbstractRule rule;
-
-	@Override
-	public void initializeFor(AbstractRule rule) {
-		this.rule = rule;
-	}
-
-	@Override
-	protected Collection<FollowElement> getFollowElements(AbstractInternalContentAssistParser parser) {
-		if (rule == null || rule.eIsProxy()) {
-			return Collections.emptyList();
-		}
-		String methodName = "entryRule" + rule.getName();
-		PolymorphicDispatcher<Collection<FollowElement>> dispatcher =
-				new PolymorphicDispatcher<Collection<FollowElement>>(methodName, 0, 0, Collections.singletonList(parser));
-		dispatcher.invoke();
-		return parser.getFollowElements();
-	}
-
-}
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr;

+

+import java.util.Collection;

+import java.util.Collections;

+

+import org.eclipse.xtext.AbstractRule;

+import org.eclipse.xtext.ui.codetemplates.ui.partialEditing.IPartialContentAssistParser;

+import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;

+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;

+import org.eclipse.xtext.util.PolymorphicDispatcher;

+

+/*

+ * Template CodetemplatesGeneratorFragment.xpt

+ */

+public class PartialCSSContentAssistParser extends CSSParser implements IPartialContentAssistParser {

+

+	private AbstractRule rule;

+

+	@Override

+	public void initializeFor(AbstractRule rule) {

+		this.rule = rule;

+	}

+

+	@Override

+	protected Collection<FollowElement> getFollowElements(AbstractInternalContentAssistParser parser) {

+		if (rule == null || rule.eIsProxy()) {

+			return Collections.emptyList();

+		}

+		String methodName = "entryRule" + rule.getName();

+		PolymorphicDispatcher<Collection<FollowElement>> dispatcher =

+				new PolymorphicDispatcher<Collection<FollowElement>>(methodName, 0, 0, Collections.singletonList(parser));

+		dispatcher.invoke();

+		return parser.getFollowElements();

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g
new file mode 100644
index 00000000000..cefb26f2b0f
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g
@@ -0,0 +1,8974 @@
+/*

+ * generated by Xtext

+ */

+grammar InternalCSS;

+

+options {

+	superClass=AbstractInternalContentAssistParser;

+	backtrack=true;

+	

+}

+

+@lexer::header {

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal;

+

+// Hack: Use our own Lexer superclass by means of import. 

+// Currently there is no other way to specify the superclass for the lexer.

+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;

+}

+

+@parser::header {

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal; 

+

+import java.io.InputStream;

+import org.eclipse.xtext.*;

+import org.eclipse.xtext.parser.*;

+import org.eclipse.xtext.parser.impl.*;

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

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

+import org.eclipse.xtext.parser.antlr.XtextTokenStream;

+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;

+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;

+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.DFA;

+import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;

+

+}

+

+@parser::members {

+ 

+ 	private CSSGrammarAccess grammarAccess;

+ 	

+    public void setGrammarAccess(CSSGrammarAccess grammarAccess) {

+    	this.grammarAccess = grammarAccess;

+    }

+    

+    @Override

+    protected Grammar getGrammar() {

+    	return grammarAccess.getGrammar();

+    }

+    

+    @Override

+    protected String getValueForTokenName(String tokenName) {

+    	return tokenName;

+    }

+

+}

+

+

+

+

+// Entry rule entryRulestylesheet

+entryRulestylesheet 

+:

+{ before(grammarAccess.getStylesheetRule()); }

+	 rulestylesheet

+{ after(grammarAccess.getStylesheetRule()); } 

+	 EOF 

+;

+

+// Rule stylesheet

+rulestylesheet

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getStylesheetAccess().getGroup()); }

+(rule__Stylesheet__Group__0)

+{ after(grammarAccess.getStylesheetAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulecharset

+entryRulecharset 

+:

+{ before(grammarAccess.getCharsetRule()); }

+	 rulecharset

+{ after(grammarAccess.getCharsetRule()); } 

+	 EOF 

+;

+

+// Rule charset

+rulecharset

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getCharsetAccess().getGroup()); }

+(rule__Charset__Group__0)

+{ after(grammarAccess.getCharsetAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleimportExpression

+entryRuleimportExpression 

+:

+{ before(grammarAccess.getImportExpressionRule()); }

+	 ruleimportExpression

+{ after(grammarAccess.getImportExpressionRule()); } 

+	 EOF 

+;

+

+// Rule importExpression

+ruleimportExpression

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getImportExpressionAccess().getGroup()); }

+(rule__ImportExpression__Group__0)

+{ after(grammarAccess.getImportExpressionAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulepage

+entryRulepage 

+:

+{ before(grammarAccess.getPageRule()); }

+	 rulepage

+{ after(grammarAccess.getPageRule()); } 

+	 EOF 

+;

+

+// Rule page

+rulepage

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getPageAccess().getGroup()); }

+(rule__Page__Group__0)

+{ after(grammarAccess.getPageAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulepseudo_page

+entryRulepseudo_page 

+:

+{ before(grammarAccess.getPseudo_pageRule()); }

+	 rulepseudo_page

+{ after(grammarAccess.getPseudo_pageRule()); } 

+	 EOF 

+;

+

+// Rule pseudo_page

+rulepseudo_page

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getPseudo_pageAccess().getGroup()); }

+(rule__Pseudo_page__Group__0)

+{ after(grammarAccess.getPseudo_pageAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulemedia

+entryRulemedia 

+:

+{ before(grammarAccess.getMediaRule()); }

+	 rulemedia

+{ after(grammarAccess.getMediaRule()); } 

+	 EOF 

+;

+

+// Rule media

+rulemedia

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getMediaAccess().getGroup()); }

+(rule__Media__Group__0)

+{ after(grammarAccess.getMediaAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulemedia_list

+entryRulemedia_list 

+:

+{ before(grammarAccess.getMedia_listRule()); }

+	 rulemedia_list

+{ after(grammarAccess.getMedia_listRule()); } 

+	 EOF 

+;

+

+// Rule media_list

+rulemedia_list

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getMedia_listAccess().getGroup()); }

+(rule__Media_list__Group__0)

+{ after(grammarAccess.getMedia_listAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulemedium

+entryRulemedium 

+:

+{ before(grammarAccess.getMediumRule()); }

+	 rulemedium

+{ after(grammarAccess.getMediumRule()); } 

+	 EOF 

+;

+

+// Rule medium

+rulemedium

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getMediumAccess().getIdentifierParserRuleCall()); }

+	ruleIdentifier

+{ after(grammarAccess.getMediumAccess().getIdentifierParserRuleCall()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulefont_face

+entryRulefont_face 

+:

+{ before(grammarAccess.getFont_faceRule()); }

+	 rulefont_face

+{ after(grammarAccess.getFont_faceRule()); } 

+	 EOF 

+;

+

+// Rule font_face

+rulefont_face

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getFont_faceAccess().getGroup()); }

+(rule__Font_face__Group__0)

+{ after(grammarAccess.getFont_faceAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulekeyframes

+entryRulekeyframes 

+:

+{ before(grammarAccess.getKeyframesRule()); }

+	 rulekeyframes

+{ after(grammarAccess.getKeyframesRule()); } 

+	 EOF 

+;

+

+// Rule keyframes

+rulekeyframes

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getKeyframesAccess().getGroup()); }

+(rule__Keyframes__Group__0)

+{ after(grammarAccess.getKeyframesAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulekeyframe_selector

+entryRulekeyframe_selector 

+:

+{ before(grammarAccess.getKeyframe_selectorRule()); }

+	 rulekeyframe_selector

+{ after(grammarAccess.getKeyframe_selectorRule()); } 

+	 EOF 

+;

+

+// Rule keyframe_selector

+rulekeyframe_selector

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getGroup()); }

+(rule__Keyframe_selector__Group__0)

+{ after(grammarAccess.getKeyframe_selectorAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleruleset

+entryRuleruleset 

+:

+{ before(grammarAccess.getRulesetRule()); }

+	 ruleruleset

+{ after(grammarAccess.getRulesetRule()); } 

+	 EOF 

+;

+

+// Rule ruleset

+ruleruleset

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getRulesetAccess().getGroup()); }

+(rule__Ruleset__Group__0)

+{ after(grammarAccess.getRulesetAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleselector

+entryRuleselector 

+@init {

+	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+}

+:

+{ before(grammarAccess.getSelectorRule()); }

+	 ruleselector

+{ after(grammarAccess.getSelectorRule()); } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule selector

+ruleselector

+    @init {

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getSelectorAccess().getGroup()); }

+(rule__Selector__Group__0)

+{ after(grammarAccess.getSelectorAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+	myHiddenTokenState.restore();

+}

+

+

+

+// Entry rule entryRuleSimpleSelectorForNegation

+entryRuleSimpleSelectorForNegation 

+:

+{ before(grammarAccess.getSimpleSelectorForNegationRule()); }

+	 ruleSimpleSelectorForNegation

+{ after(grammarAccess.getSimpleSelectorForNegationRule()); } 

+	 EOF 

+;

+

+// Rule SimpleSelectorForNegation

+ruleSimpleSelectorForNegation

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getSimpleSelectorForNegationAccess().getAlternatives()); }

+(rule__SimpleSelectorForNegation__Alternatives)

+{ after(grammarAccess.getSimpleSelectorForNegationAccess().getAlternatives()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleSubSelectorForNegation

+entryRuleSubSelectorForNegation 

+:

+{ before(grammarAccess.getSubSelectorForNegationRule()); }

+	 ruleSubSelectorForNegation

+{ after(grammarAccess.getSubSelectorForNegationRule()); } 

+	 EOF 

+;

+

+// Rule SubSelectorForNegation

+ruleSubSelectorForNegation

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getSubSelectorForNegationAccess().getAlternatives()); }

+(rule__SubSelectorForNegation__Alternatives)

+{ after(grammarAccess.getSubSelectorForNegationAccess().getAlternatives()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulesimple_selector

+entryRulesimple_selector 

+@init {

+	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+}

+:

+{ before(grammarAccess.getSimple_selectorRule()); }

+	 rulesimple_selector

+{ after(grammarAccess.getSimple_selectorRule()); } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule simple_selector

+rulesimple_selector

+    @init {

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getSimple_selectorAccess().getAlternatives()); }

+(rule__Simple_selector__Alternatives)

+{ after(grammarAccess.getSimple_selectorAccess().getAlternatives()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+	myHiddenTokenState.restore();

+}

+

+

+

+// Entry rule entryRuleSubSelector

+entryRuleSubSelector 

+:

+{ before(grammarAccess.getSubSelectorRule()); }

+	 ruleSubSelector

+{ after(grammarAccess.getSubSelectorRule()); } 

+	 EOF 

+;

+

+// Rule SubSelector

+ruleSubSelector

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getSubSelectorAccess().getAlternatives()); }

+(rule__SubSelector__Alternatives)

+{ after(grammarAccess.getSubSelectorAccess().getAlternatives()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleAttributeSelector

+entryRuleAttributeSelector 

+:

+{ before(grammarAccess.getAttributeSelectorRule()); }

+	 ruleAttributeSelector

+{ after(grammarAccess.getAttributeSelectorRule()); } 

+	 EOF 

+;

+

+// Rule AttributeSelector

+ruleAttributeSelector

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getAttributeSelectorAccess().getGroup()); }

+(rule__AttributeSelector__Group__0)

+{ after(grammarAccess.getAttributeSelectorAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleClassSelector

+entryRuleClassSelector 

+:

+{ before(grammarAccess.getClassSelectorRule()); }

+	 ruleClassSelector

+{ after(grammarAccess.getClassSelectorRule()); } 

+	 EOF 

+;

+

+// Rule ClassSelector

+ruleClassSelector

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getClassSelectorAccess().getGroup()); }

+(rule__ClassSelector__Group__0)

+{ after(grammarAccess.getClassSelectorAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleElementSelector

+entryRuleElementSelector 

+:

+{ before(grammarAccess.getElementSelectorRule()); }

+	 ruleElementSelector

+{ after(grammarAccess.getElementSelectorRule()); } 

+	 EOF 

+;

+

+// Rule ElementSelector

+ruleElementSelector

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getElementSelectorAccess().getGroup()); }

+(rule__ElementSelector__Group__0)

+{ after(grammarAccess.getElementSelectorAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleUniversalSelector

+entryRuleUniversalSelector 

+:

+{ before(grammarAccess.getUniversalSelectorRule()); }

+	 ruleUniversalSelector

+{ after(grammarAccess.getUniversalSelectorRule()); } 

+	 EOF 

+;

+

+// Rule UniversalSelector

+ruleUniversalSelector

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getUniversalSelectorAccess().getGroup()); }

+(rule__UniversalSelector__Group__0)

+{ after(grammarAccess.getUniversalSelectorAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleIdSelector

+entryRuleIdSelector 

+:

+{ before(grammarAccess.getIdSelectorRule()); }

+	 ruleIdSelector

+{ after(grammarAccess.getIdSelectorRule()); } 

+	 EOF 

+;

+

+// Rule IdSelector

+ruleIdSelector

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getIdSelectorAccess().getGroup()); }

+(rule__IdSelector__Group__0)

+{ after(grammarAccess.getIdSelectorAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulecss_namespace_prefix

+entryRulecss_namespace_prefix 

+:

+{ before(grammarAccess.getCss_namespace_prefixRule()); }

+	 rulecss_namespace_prefix

+{ after(grammarAccess.getCss_namespace_prefixRule()); } 

+	 EOF 

+;

+

+// Rule css_namespace_prefix

+rulecss_namespace_prefix

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getCss_namespace_prefixAccess().getGroup()); }

+(rule__Css_namespace_prefix__Group__0)

+{ after(grammarAccess.getCss_namespace_prefixAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulecss_declaration

+entryRulecss_declaration 

+@init {

+	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+}

+:

+{ before(grammarAccess.getCss_declarationRule()); }

+	 rulecss_declaration

+{ after(grammarAccess.getCss_declarationRule()); } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule css_declaration

+rulecss_declaration

+    @init {

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getCss_declarationAccess().getGroup()); }

+(rule__Css_declaration__Group__0)

+{ after(grammarAccess.getCss_declarationAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+	myHiddenTokenState.restore();

+}

+

+

+

+// Entry rule entryRulecss_property

+entryRulecss_property 

+:

+{ before(grammarAccess.getCss_propertyRule()); }

+	 rulecss_property

+{ after(grammarAccess.getCss_propertyRule()); } 

+	 EOF 

+;

+

+// Rule css_property

+rulecss_property

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getCss_propertyAccess().getGroup()); }

+(rule__Css_property__Group__0)

+{ after(grammarAccess.getCss_propertyAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleValidPropertyIdent

+entryRuleValidPropertyIdent 

+:

+{ before(grammarAccess.getValidPropertyIdentRule()); }

+	 ruleValidPropertyIdent

+{ after(grammarAccess.getValidPropertyIdentRule()); } 

+	 EOF 

+;

+

+// Rule ValidPropertyIdent

+ruleValidPropertyIdent

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getValidPropertyIdentAccess().getIdentifierParserRuleCall()); }

+	ruleIdentifier

+{ after(grammarAccess.getValidPropertyIdentAccess().getIdentifierParserRuleCall()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulePseudoClassOrFunc

+entryRulePseudoClassOrFunc 

+:

+{ before(grammarAccess.getPseudoClassOrFuncRule()); }

+	 rulePseudoClassOrFunc

+{ after(grammarAccess.getPseudoClassOrFuncRule()); } 

+	 EOF 

+;

+

+// Rule PseudoClassOrFunc

+rulePseudoClassOrFunc

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getPseudoClassOrFuncAccess().getAlternatives()); }

+(rule__PseudoClassOrFunc__Alternatives)

+{ after(grammarAccess.getPseudoClassOrFuncAccess().getAlternatives()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulePseudoClass

+entryRulePseudoClass 

+:

+{ before(grammarAccess.getPseudoClassRule()); }

+	 rulePseudoClass

+{ after(grammarAccess.getPseudoClassRule()); } 

+	 EOF 

+;

+

+// Rule PseudoClass

+rulePseudoClass

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getPseudoClassAccess().getGroup()); }

+(rule__PseudoClass__Group__0)

+{ after(grammarAccess.getPseudoClassAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulePseudoClassName

+entryRulePseudoClassName 

+:

+{ before(grammarAccess.getPseudoClassNameRule()); }

+	 rulePseudoClassName

+{ after(grammarAccess.getPseudoClassNameRule()); } 

+	 EOF 

+;

+

+// Rule PseudoClassName

+rulePseudoClassName

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getPseudoClassNameAccess().getNameAssignment()); }

+(rule__PseudoClassName__NameAssignment)

+{ after(grammarAccess.getPseudoClassNameAccess().getNameAssignment()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRulePseudoClassFunction

+entryRulePseudoClassFunction 

+:

+{ before(grammarAccess.getPseudoClassFunctionRule()); }

+	 rulePseudoClassFunction

+{ after(grammarAccess.getPseudoClassFunctionRule()); } 

+	 EOF 

+;

+

+// Rule PseudoClassFunction

+rulePseudoClassFunction

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getAlternatives()); }

+(rule__PseudoClassFunction__Alternatives)

+{ after(grammarAccess.getPseudoClassFunctionAccess().getAlternatives()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleNotFunctionCall

+entryRuleNotFunctionCall 

+@init {

+	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+}

+:

+{ before(grammarAccess.getNotFunctionCallRule()); }

+	 ruleNotFunctionCall

+{ after(grammarAccess.getNotFunctionCallRule()); } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule NotFunctionCall

+ruleNotFunctionCall

+    @init {

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getNotFunctionCallAccess().getGroup()); }

+(rule__NotFunctionCall__Group__0)

+{ after(grammarAccess.getNotFunctionCallAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+	myHiddenTokenState.restore();

+}

+

+

+

+// Entry rule entryRulecombinator

+entryRulecombinator 

+:

+{ before(grammarAccess.getCombinatorRule()); }

+	 rulecombinator

+{ after(grammarAccess.getCombinatorRule()); } 

+	 EOF 

+;

+

+// Rule combinator

+rulecombinator

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getCombinatorAccess().getAlternatives()); }

+(rule__Combinator__Alternatives)

+{ after(grammarAccess.getCombinatorAccess().getAlternatives()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+// Entry rule entryRuleSymbolTok

+entryRuleSymbolTok 

+:

+{ before(grammarAccess.getSymbolTokRule()); }

+	 ruleSymbolTok

+{ after(grammarAccess.getSymbolTokRule()); } 

+	 EOF 

+;

+

+// Rule SymbolTok

+ruleSymbolTok

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getSymbolTokAccess().getGroup()); }

+(rule__SymbolTok__Group__0)

+{ after(grammarAccess.getSymbolTokAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleWSTok

+entryRuleWSTok 

+:

+{ before(grammarAccess.getWSTokRule()); }

+	 ruleWSTok

+{ after(grammarAccess.getWSTokRule()); } 

+	 EOF 

+;

+

+// Rule WSTok

+ruleWSTok

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getWSTokAccess().getGroup()); }

+(rule__WSTok__Group__0)

+{ after(grammarAccess.getWSTokAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleStringTok

+entryRuleStringTok 

+:

+{ before(grammarAccess.getStringTokRule()); }

+	 ruleStringTok

+{ after(grammarAccess.getStringTokRule()); } 

+	 EOF 

+;

+

+// Rule StringTok

+ruleStringTok

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getStringTokAccess().getGroup()); }

+(rule__StringTok__Group__0)

+{ after(grammarAccess.getStringTokAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleNumberTok

+entryRuleNumberTok 

+@init {

+	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+}

+:

+{ before(grammarAccess.getNumberTokRule()); }

+	 ruleNumberTok

+{ after(grammarAccess.getNumberTokRule()); } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule NumberTok

+ruleNumberTok

+    @init {

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getNumberTokAccess().getGroup()); }

+(rule__NumberTok__Group__0)

+{ after(grammarAccess.getNumberTokAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+	myHiddenTokenState.restore();

+}

+

+

+

+// Entry rule entryRuleUrlTok

+entryRuleUrlTok 

+:

+{ before(grammarAccess.getUrlTokRule()); }

+	 ruleUrlTok

+{ after(grammarAccess.getUrlTokRule()); } 

+	 EOF 

+;

+

+// Rule UrlTok

+ruleUrlTok

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getUrlTokAccess().getGroup()); }

+(rule__UrlTok__Group__0)

+{ after(grammarAccess.getUrlTokAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleColorTok

+entryRuleColorTok 

+@init {

+	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+}

+:

+{ before(grammarAccess.getColorTokRule()); }

+	 ruleColorTok

+{ after(grammarAccess.getColorTokRule()); } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule ColorTok

+ruleColorTok

+    @init {

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getColorTokAccess().getGroup()); }

+(rule__ColorTok__Group__0)

+{ after(grammarAccess.getColorTokAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+	myHiddenTokenState.restore();

+}

+

+

+

+// Entry rule entryRuleIdentifierOrFuncTok

+entryRuleIdentifierOrFuncTok 

+@init {

+	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+}

+:

+{ before(grammarAccess.getIdentifierOrFuncTokRule()); }

+	 ruleIdentifierOrFuncTok

+{ after(grammarAccess.getIdentifierOrFuncTokRule()); } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule IdentifierOrFuncTok

+ruleIdentifierOrFuncTok

+    @init {

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getIdentifierOrFuncTokAccess().getGroup()); }

+(rule__IdentifierOrFuncTok__Group__0)

+{ after(grammarAccess.getIdentifierOrFuncTokAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+	myHiddenTokenState.restore();

+}

+

+

+

+// Entry rule entryRuleCssTok

+entryRuleCssTok 

+@init {

+	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+}

+:

+{ before(grammarAccess.getCssTokRule()); }

+	 ruleCssTok

+{ after(grammarAccess.getCssTokRule()); } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule CssTok

+ruleCssTok

+    @init {

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getCssTokAccess().getAlternatives()); }

+(rule__CssTok__Alternatives)

+{ after(grammarAccess.getCssTokAccess().getAlternatives()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+	myHiddenTokenState.restore();

+}

+

+

+

+// Entry rule entryRuleURLType

+entryRuleURLType 

+@init {

+	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+}

+:

+{ before(grammarAccess.getURLTypeRule()); }

+	 ruleURLType

+{ after(grammarAccess.getURLTypeRule()); } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule URLType

+ruleURLType

+    @init {

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getURLTypeAccess().getGroup()); }

+(rule__URLType__Group__0)

+{ after(grammarAccess.getURLTypeAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+	myHiddenTokenState.restore();

+}

+

+

+

+// Entry rule entryRuleValidURLSymbol

+entryRuleValidURLSymbol 

+:

+{ before(grammarAccess.getValidURLSymbolRule()); }

+	 ruleValidURLSymbol

+{ after(grammarAccess.getValidURLSymbolRule()); } 

+	 EOF 

+;

+

+// Rule ValidURLSymbol

+ruleValidURLSymbol

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getValidURLSymbolAccess().getAlternatives()); }

+(rule__ValidURLSymbol__Alternatives)

+{ after(grammarAccess.getValidURLSymbolAccess().getAlternatives()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleKeywordHack

+entryRuleKeywordHack 

+:

+{ before(grammarAccess.getKeywordHackRule()); }

+	 ruleKeywordHack

+{ after(grammarAccess.getKeywordHackRule()); } 

+	 EOF 

+;

+

+// Rule KeywordHack

+ruleKeywordHack

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getKeywordHackAccess().getAlternatives()); }

+(rule__KeywordHack__Alternatives)

+{ after(grammarAccess.getKeywordHackAccess().getAlternatives()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+// Entry rule entryRuleValidURL

+entryRuleValidURL 

+@init {

+	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+}

+:

+{ before(grammarAccess.getValidURLRule()); }

+	 ruleValidURL

+{ after(grammarAccess.getValidURLRule()); } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule ValidURL

+ruleValidURL

+    @init {

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getValidURLAccess().getAlternatives()); }

+(rule__ValidURL__Alternatives)

+{ after(grammarAccess.getValidURLAccess().getAlternatives()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+	myHiddenTokenState.restore();

+}

+

+

+

+// Entry rule entryRuleIdentifier

+entryRuleIdentifier 

+@init {

+	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+}

+:

+{ before(grammarAccess.getIdentifierRule()); }

+	 ruleIdentifier

+{ after(grammarAccess.getIdentifierRule()); } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule Identifier

+ruleIdentifier

+    @init {

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getIdentifierAccess().getGroup()); }

+(rule__Identifier__Group__0)

+{ after(grammarAccess.getIdentifierAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+	myHiddenTokenState.restore();

+}

+

+

+

+// Entry rule entryRuleNum

+entryRuleNum 

+@init {

+	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+}

+:

+{ before(grammarAccess.getNumRule()); }

+	 ruleNum

+{ after(grammarAccess.getNumRule()); } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule Num

+ruleNum

+    @init {

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getNumAccess().getGroup()); }

+(rule__Num__Group__0)

+{ after(grammarAccess.getNumAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+	myHiddenTokenState.restore();

+}

+

+

+

+// Entry rule entryRuleHex

+entryRuleHex 

+:

+{ before(grammarAccess.getHexRule()); }

+	 ruleHex

+{ after(grammarAccess.getHexRule()); } 

+	 EOF 

+;

+

+// Rule Hex

+ruleHex

+    @init {

+		int stackSize = keepStackSize();

+    }

+	:

+(

+{ before(grammarAccess.getHexAccess().getGroup()); }

+(rule__Hex__Group__0)

+{ after(grammarAccess.getHexAccess().getGroup()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+rule__Stylesheet__Alternatives_2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStylesheetAccess().getRulesetAssignment_2_0()); }

+(rule__Stylesheet__RulesetAssignment_2_0)

+{ after(grammarAccess.getStylesheetAccess().getRulesetAssignment_2_0()); }

+)

+

+    |(

+{ before(grammarAccess.getStylesheetAccess().getMediaAssignment_2_1()); }

+(rule__Stylesheet__MediaAssignment_2_1)

+{ after(grammarAccess.getStylesheetAccess().getMediaAssignment_2_1()); }

+)

+

+    |(

+{ before(grammarAccess.getStylesheetAccess().getPageAssignment_2_2()); }

+(rule__Stylesheet__PageAssignment_2_2)

+{ after(grammarAccess.getStylesheetAccess().getPageAssignment_2_2()); }

+)

+

+    |(

+{ before(grammarAccess.getStylesheetAccess().getFont_faceAssignment_2_3()); }

+(rule__Stylesheet__Font_faceAssignment_2_3)

+{ after(grammarAccess.getStylesheetAccess().getFont_faceAssignment_2_3()); }

+)

+

+    |(

+{ before(grammarAccess.getStylesheetAccess().getKeyframesAssignment_2_4()); }

+(rule__Stylesheet__KeyframesAssignment_2_4)

+{ after(grammarAccess.getStylesheetAccess().getKeyframesAssignment_2_4()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Charset__Alternatives_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCharsetAccess().getCharsetKeyword_0_0()); }

+

+	'@charset' 

+

+{ after(grammarAccess.getCharsetAccess().getCharsetKeyword_0_0()); }

+)

+

+    |(

+{ before(grammarAccess.getCharsetAccess().getCHARSETKeyword_0_1()); }

+

+	'@CHARSET' 

+

+{ after(grammarAccess.getCharsetAccess().getCHARSETKeyword_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ImportExpression__Alternatives_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getImportExpressionAccess().getImportKeyword_0_0()); }

+

+	'@import' 

+

+{ after(grammarAccess.getImportExpressionAccess().getImportKeyword_0_0()); }

+)

+

+    |(

+{ before(grammarAccess.getImportExpressionAccess().getIMPORTKeyword_0_1()); }

+

+	'@IMPORT' 

+

+{ after(grammarAccess.getImportExpressionAccess().getIMPORTKeyword_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ImportExpression__Alternatives_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getImportExpressionAccess().getValueAssignment_1_0()); }

+(rule__ImportExpression__ValueAssignment_1_0)

+{ after(grammarAccess.getImportExpressionAccess().getValueAssignment_1_0()); }

+)

+

+    |(

+{ before(grammarAccess.getImportExpressionAccess().getGroup_1_1()); }

+(rule__ImportExpression__Group_1_1__0)

+{ after(grammarAccess.getImportExpressionAccess().getGroup_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Page__Alternatives_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPageAccess().getPageKeyword_1_0()); }

+

+	'@page' 

+

+{ after(grammarAccess.getPageAccess().getPageKeyword_1_0()); }

+)

+

+    |(

+{ before(grammarAccess.getPageAccess().getPAGEKeyword_1_1()); }

+

+	'@PAGE' 

+

+{ after(grammarAccess.getPageAccess().getPAGEKeyword_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Media__Alternatives_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getMediaAccess().getMediaKeyword_0_0()); }

+

+	'@media' 

+

+{ after(grammarAccess.getMediaAccess().getMediaKeyword_0_0()); }

+)

+

+    |(

+{ before(grammarAccess.getMediaAccess().getMEDIAKeyword_0_1()); }

+

+	'@MEDIA' 

+

+{ after(grammarAccess.getMediaAccess().getMEDIAKeyword_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Font_face__Alternatives_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getFont_faceAccess().getFontFaceKeyword_1_0()); }

+

+	'@font-face' 

+

+{ after(grammarAccess.getFont_faceAccess().getFontFaceKeyword_1_0()); }

+)

+

+    |(

+{ before(grammarAccess.getFont_faceAccess().getFONTFACEKeyword_1_1()); }

+

+	'@FONT-FACE' 

+

+{ after(grammarAccess.getFont_faceAccess().getFONTFACEKeyword_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframes__Alternatives_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframesAccess().getKeyframesKeyword_1_0()); }

+

+	'@keyframes' 

+

+{ after(grammarAccess.getKeyframesAccess().getKeyframesKeyword_1_0()); }

+)

+

+    |(

+{ before(grammarAccess.getKeyframesAccess().getKEYFRAMESKeyword_1_1()); }

+

+	'@KEYFRAMES' 

+

+{ after(grammarAccess.getKeyframesAccess().getKEYFRAMESKeyword_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__Alternatives_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getTypeAssignment_0_0()); }

+(rule__Keyframe_selector__TypeAssignment_0_0)

+{ after(grammarAccess.getKeyframe_selectorAccess().getTypeAssignment_0_0()); }

+)

+

+    |(

+{ before(grammarAccess.getKeyframe_selectorAccess().getGroup_0_1()); }

+(rule__Keyframe_selector__Group_0_1__0)

+{ after(grammarAccess.getKeyframe_selectorAccess().getGroup_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__Alternatives_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getGroup_1_0()); }

+(rule__Selector__Group_1_0__0)

+{ after(grammarAccess.getSelectorAccess().getGroup_1_0()); }

+)

+

+    |(

+{ before(grammarAccess.getSelectorAccess().getGroup_1_1()); }

+(rule__Selector__Group_1_1__0)

+{ after(grammarAccess.getSelectorAccess().getGroup_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__SimpleSelectorForNegation__Alternatives

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimpleSelectorForNegationAccess().getGroup_0()); }

+(rule__SimpleSelectorForNegation__Group_0__0)

+{ after(grammarAccess.getSimpleSelectorForNegationAccess().getGroup_0()); }

+)

+

+    |(

+(

+{ before(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_1()); }

+(rule__SimpleSelectorForNegation__SubSelectorsAssignment_1)

+{ after(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_1()); }

+)

+(

+{ before(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_1()); }

+(rule__SimpleSelectorForNegation__SubSelectorsAssignment_1)*

+{ after(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_1()); }

+)

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__SimpleSelectorForNegation__Alternatives_0_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimpleSelectorForNegationAccess().getElementAssignment_0_0_0()); }

+(rule__SimpleSelectorForNegation__ElementAssignment_0_0_0)

+{ after(grammarAccess.getSimpleSelectorForNegationAccess().getElementAssignment_0_0_0()); }

+)

+

+    |(

+{ before(grammarAccess.getSimpleSelectorForNegationAccess().getUniversalAssignment_0_0_1()); }

+(rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1)

+{ after(grammarAccess.getSimpleSelectorForNegationAccess().getUniversalAssignment_0_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__SubSelectorForNegation__Alternatives

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSubSelectorForNegationAccess().getIdSelectorParserRuleCall_0()); }

+	ruleIdSelector

+{ after(grammarAccess.getSubSelectorForNegationAccess().getIdSelectorParserRuleCall_0()); }

+)

+

+    |(

+{ before(grammarAccess.getSubSelectorForNegationAccess().getClassSelectorParserRuleCall_1()); }

+	ruleClassSelector

+{ after(grammarAccess.getSubSelectorForNegationAccess().getClassSelectorParserRuleCall_1()); }

+)

+

+    |(

+{ before(grammarAccess.getSubSelectorForNegationAccess().getAttributeSelectorParserRuleCall_2()); }

+	ruleAttributeSelector

+{ after(grammarAccess.getSubSelectorForNegationAccess().getAttributeSelectorParserRuleCall_2()); }

+)

+

+    |(

+{ before(grammarAccess.getSubSelectorForNegationAccess().getPseudoClassParserRuleCall_3()); }

+	rulePseudoClass

+{ after(grammarAccess.getSubSelectorForNegationAccess().getPseudoClassParserRuleCall_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Simple_selector__Alternatives

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimple_selectorAccess().getGroup_0()); }

+(rule__Simple_selector__Group_0__0)

+{ after(grammarAccess.getSimple_selectorAccess().getGroup_0()); }

+)

+

+    |(

+(

+{ before(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_1()); }

+(rule__Simple_selector__SubSelectorsAssignment_1)

+{ after(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_1()); }

+)

+(

+{ before(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_1()); }

+(rule__Simple_selector__SubSelectorsAssignment_1)*

+{ after(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_1()); }

+)

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Simple_selector__Alternatives_0_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimple_selectorAccess().getElementAssignment_0_0_0()); }

+(rule__Simple_selector__ElementAssignment_0_0_0)

+{ after(grammarAccess.getSimple_selectorAccess().getElementAssignment_0_0_0()); }

+)

+

+    |(

+{ before(grammarAccess.getSimple_selectorAccess().getUniversalAssignment_0_0_1()); }

+(rule__Simple_selector__UniversalAssignment_0_0_1)

+{ after(grammarAccess.getSimple_selectorAccess().getUniversalAssignment_0_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__SubSelector__Alternatives

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSubSelectorAccess().getIdSelectorParserRuleCall_0()); }

+	ruleIdSelector

+{ after(grammarAccess.getSubSelectorAccess().getIdSelectorParserRuleCall_0()); }

+)

+

+    |(

+{ before(grammarAccess.getSubSelectorAccess().getClassSelectorParserRuleCall_1()); }

+	ruleClassSelector

+{ after(grammarAccess.getSubSelectorAccess().getClassSelectorParserRuleCall_1()); }

+)

+

+    |(

+{ before(grammarAccess.getSubSelectorAccess().getAttributeSelectorParserRuleCall_2()); }

+	ruleAttributeSelector

+{ after(grammarAccess.getSubSelectorAccess().getAttributeSelectorParserRuleCall_2()); }

+)

+

+    |(

+{ before(grammarAccess.getSubSelectorAccess().getPseudoClassOrFuncParserRuleCall_3()); }

+	rulePseudoClassOrFunc

+{ after(grammarAccess.getSubSelectorAccess().getPseudoClassOrFuncParserRuleCall_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__AttributeSelector__OpAlternatives_3_0_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getAttributeSelectorAccess().getOpCircumflexAccentEqualsSignKeyword_3_0_0_0()); }

+

+	'^=' 

+

+{ after(grammarAccess.getAttributeSelectorAccess().getOpCircumflexAccentEqualsSignKeyword_3_0_0_0()); }

+)

+

+    |(

+{ before(grammarAccess.getAttributeSelectorAccess().getOpDollarSignEqualsSignKeyword_3_0_0_1()); }

+

+	'$=' 

+

+{ after(grammarAccess.getAttributeSelectorAccess().getOpDollarSignEqualsSignKeyword_3_0_0_1()); }

+)

+

+    |(

+{ before(grammarAccess.getAttributeSelectorAccess().getOpAsteriskEqualsSignKeyword_3_0_0_2()); }

+

+	'*=' 

+

+{ after(grammarAccess.getAttributeSelectorAccess().getOpAsteriskEqualsSignKeyword_3_0_0_2()); }

+)

+

+    |(

+{ before(grammarAccess.getAttributeSelectorAccess().getOpEqualsSignKeyword_3_0_0_3()); }

+

+	'=' 

+

+{ after(grammarAccess.getAttributeSelectorAccess().getOpEqualsSignKeyword_3_0_0_3()); }

+)

+

+    |(

+{ before(grammarAccess.getAttributeSelectorAccess().getOpINCLUDESTerminalRuleCall_3_0_0_4()); }

+	RULE_INCLUDES

+{ after(grammarAccess.getAttributeSelectorAccess().getOpINCLUDESTerminalRuleCall_3_0_0_4()); }

+)

+

+    |(

+{ before(grammarAccess.getAttributeSelectorAccess().getOpDASHMATCHTerminalRuleCall_3_0_0_5()); }

+	RULE_DASHMATCH

+{ after(grammarAccess.getAttributeSelectorAccess().getOpDASHMATCHTerminalRuleCall_3_0_0_5()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__AttributeSelector__ValueAlternatives_3_1_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getAttributeSelectorAccess().getValueIdentifierParserRuleCall_3_1_0_0()); }

+	ruleIdentifier

+{ after(grammarAccess.getAttributeSelectorAccess().getValueIdentifierParserRuleCall_3_1_0_0()); }

+)

+

+    |(

+{ before(grammarAccess.getAttributeSelectorAccess().getValueCSSSTRINGTerminalRuleCall_3_1_0_1()); }

+	RULE_CSSSTRING

+{ after(grammarAccess.getAttributeSelectorAccess().getValueCSSSTRINGTerminalRuleCall_3_1_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_namespace_prefix__Alternatives_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_namespace_prefixAccess().getIdentifierParserRuleCall_0_0()); }

+	ruleIdentifier

+{ after(grammarAccess.getCss_namespace_prefixAccess().getIdentifierParserRuleCall_0_0()); }

+)

+

+    |(

+{ before(grammarAccess.getCss_namespace_prefixAccess().getAsteriskKeyword_0_1()); }

+

+	'*' 

+

+{ after(grammarAccess.getCss_namespace_prefixAccess().getAsteriskKeyword_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassOrFunc__Alternatives

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassParserRuleCall_0()); }

+	rulePseudoClass

+{ after(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassParserRuleCall_0()); }

+)

+

+    |(

+{ before(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassFunctionParserRuleCall_1()); }

+	rulePseudoClassFunction

+{ after(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassFunctionParserRuleCall_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassFunction__Alternatives

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getGroup_0()); }

+(rule__PseudoClassFunction__Group_0__0)

+{ after(grammarAccess.getPseudoClassFunctionAccess().getGroup_0()); }

+)

+

+    |(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getGroup_1()); }

+(rule__PseudoClassFunction__Group_1__0)

+{ after(grammarAccess.getPseudoClassFunctionAccess().getGroup_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Combinator__Alternatives

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCombinatorAccess().getPLUSTerminalRuleCall_0()); }

+	RULE_PLUS

+{ after(grammarAccess.getCombinatorAccess().getPLUSTerminalRuleCall_0()); }

+)

+

+    |(

+{ before(grammarAccess.getCombinatorAccess().getGreaterThanSignKeyword_1()); }

+

+	'>' 

+

+{ after(grammarAccess.getCombinatorAccess().getGreaterThanSignKeyword_1()); }

+)

+

+    |(

+{ before(grammarAccess.getCombinatorAccess().getTildeKeyword_2()); }

+

+	'~' 

+

+{ after(grammarAccess.getCombinatorAccess().getTildeKeyword_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+rule__SymbolTok__SymbolAlternatives_1_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSymbolTokAccess().getSymbolCOMMATerminalRuleCall_1_0_0()); }

+	RULE_COMMA

+{ after(grammarAccess.getSymbolTokAccess().getSymbolCOMMATerminalRuleCall_1_0_0()); }

+)

+

+    |(

+{ before(grammarAccess.getSymbolTokAccess().getSymbolPERCENTTerminalRuleCall_1_0_1()); }

+	RULE_PERCENT

+{ after(grammarAccess.getSymbolTokAccess().getSymbolPERCENTTerminalRuleCall_1_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__CssTok__Alternatives

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCssTokAccess().getIdentifierOrFuncTokParserRuleCall_0()); }

+	ruleIdentifierOrFuncTok

+{ after(grammarAccess.getCssTokAccess().getIdentifierOrFuncTokParserRuleCall_0()); }

+)

+

+    |(

+{ before(grammarAccess.getCssTokAccess().getSymbolTokParserRuleCall_1()); }

+	ruleSymbolTok

+{ after(grammarAccess.getCssTokAccess().getSymbolTokParserRuleCall_1()); }

+)

+

+    |(

+{ before(grammarAccess.getCssTokAccess().getWSTokParserRuleCall_2()); }

+	ruleWSTok

+{ after(grammarAccess.getCssTokAccess().getWSTokParserRuleCall_2()); }

+)

+

+    |(

+{ before(grammarAccess.getCssTokAccess().getStringTokParserRuleCall_3()); }

+	ruleStringTok

+{ after(grammarAccess.getCssTokAccess().getStringTokParserRuleCall_3()); }

+)

+

+    |(

+{ before(grammarAccess.getCssTokAccess().getNumberTokParserRuleCall_4()); }

+	ruleNumberTok

+{ after(grammarAccess.getCssTokAccess().getNumberTokParserRuleCall_4()); }

+)

+

+    |(

+{ before(grammarAccess.getCssTokAccess().getUrlTokParserRuleCall_5()); }

+	ruleUrlTok

+{ after(grammarAccess.getCssTokAccess().getUrlTokParserRuleCall_5()); }

+)

+

+    |(

+{ before(grammarAccess.getCssTokAccess().getColorTokParserRuleCall_6()); }

+	ruleColorTok

+{ after(grammarAccess.getCssTokAccess().getColorTokParserRuleCall_6()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ValidURLSymbol__Alternatives

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getValidURLSymbolAccess().getDASHTerminalRuleCall_0()); }

+	RULE_DASH

+{ after(grammarAccess.getValidURLSymbolAccess().getDASHTerminalRuleCall_0()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getFullStopKeyword_1()); }

+

+	'.' 

+

+{ after(grammarAccess.getValidURLSymbolAccess().getFullStopKeyword_1()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getUNDERSCORETerminalRuleCall_2()); }

+	RULE_UNDERSCORE

+{ after(grammarAccess.getValidURLSymbolAccess().getUNDERSCORETerminalRuleCall_2()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getTildeKeyword_3()); }

+

+	'~' 

+

+{ after(grammarAccess.getValidURLSymbolAccess().getTildeKeyword_3()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getCOLONTerminalRuleCall_4()); }

+	RULE_COLON

+{ after(grammarAccess.getValidURLSymbolAccess().getCOLONTerminalRuleCall_4()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getSolidusKeyword_5()); }

+

+	'/' 

+

+{ after(grammarAccess.getValidURLSymbolAccess().getSolidusKeyword_5()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getQuestionMarkKeyword_6()); }

+

+	'?' 

+

+{ after(grammarAccess.getValidURLSymbolAccess().getQuestionMarkKeyword_6()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getHASHMARKTerminalRuleCall_7()); }

+	RULE_HASHMARK

+{ after(grammarAccess.getValidURLSymbolAccess().getHASHMARKTerminalRuleCall_7()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getLeftSquareBracketKeyword_8()); }

+

+	'[' 

+

+{ after(grammarAccess.getValidURLSymbolAccess().getLeftSquareBracketKeyword_8()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getRightSquareBracketKeyword_9()); }

+

+	']' 

+

+{ after(grammarAccess.getValidURLSymbolAccess().getRightSquareBracketKeyword_9()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getCommercialAtKeyword_10()); }

+

+	'@' 

+

+{ after(grammarAccess.getValidURLSymbolAccess().getCommercialAtKeyword_10()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getExclamationMarkKeyword_11()); }

+

+	'!' 

+

+{ after(grammarAccess.getValidURLSymbolAccess().getExclamationMarkKeyword_11()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getDollarSignKeyword_12()); }

+

+	'$' 

+

+{ after(grammarAccess.getValidURLSymbolAccess().getDollarSignKeyword_12()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getAmpersandKeyword_13()); }

+

+	'&' 

+

+{ after(grammarAccess.getValidURLSymbolAccess().getAmpersandKeyword_13()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getAsteriskKeyword_14()); }

+

+	'*' 

+

+{ after(grammarAccess.getValidURLSymbolAccess().getAsteriskKeyword_14()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getPLUSTerminalRuleCall_15()); }

+	RULE_PLUS

+{ after(grammarAccess.getValidURLSymbolAccess().getPLUSTerminalRuleCall_15()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getCOMMATerminalRuleCall_16()); }

+	RULE_COMMA

+{ after(grammarAccess.getValidURLSymbolAccess().getCOMMATerminalRuleCall_16()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getSemicolonKeyword_17()); }

+

+	';' 

+

+{ after(grammarAccess.getValidURLSymbolAccess().getSemicolonKeyword_17()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLSymbolAccess().getGroup_18()); }

+(rule__ValidURLSymbol__Group_18__0)

+{ after(grammarAccess.getValidURLSymbolAccess().getGroup_18()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__KeywordHack__Alternatives

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeywordHackAccess().getNotKeyword_0()); }

+

+	'not' 

+

+{ after(grammarAccess.getKeywordHackAccess().getNotKeyword_0()); }

+)

+

+    |(

+{ before(grammarAccess.getKeywordHackAccess().getNoKeyword_1()); }

+

+	'no' 

+

+{ after(grammarAccess.getKeywordHackAccess().getNoKeyword_1()); }

+)

+

+    |(

+{ before(grammarAccess.getKeywordHackAccess().getUrlKeyword_2()); }

+

+	'url' 

+

+{ after(grammarAccess.getKeywordHackAccess().getUrlKeyword_2()); }

+)

+

+    |(

+{ before(grammarAccess.getKeywordHackAccess().getUrKeyword_3()); }

+

+	'ur' 

+

+{ after(grammarAccess.getKeywordHackAccess().getUrKeyword_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ValidURL__Alternatives

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getValidURLAccess().getCSSSTRINGTerminalRuleCall_0()); }

+	RULE_CSSSTRING

+{ after(grammarAccess.getValidURLAccess().getCSSSTRINGTerminalRuleCall_0()); }

+)

+

+    |(

+(

+{ before(grammarAccess.getValidURLAccess().getAlternatives_1()); }

+(rule__ValidURL__Alternatives_1)

+{ after(grammarAccess.getValidURLAccess().getAlternatives_1()); }

+)

+(

+{ before(grammarAccess.getValidURLAccess().getAlternatives_1()); }

+(rule__ValidURL__Alternatives_1)*

+{ after(grammarAccess.getValidURLAccess().getAlternatives_1()); }

+)

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ValidURL__Alternatives_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getValidURLAccess().getValidURLSymbolParserRuleCall_1_0()); }

+	ruleValidURLSymbol

+{ after(grammarAccess.getValidURLAccess().getValidURLSymbolParserRuleCall_1_0()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLAccess().getKeywordHackParserRuleCall_1_1()); }

+	ruleKeywordHack

+{ after(grammarAccess.getValidURLAccess().getKeywordHackParserRuleCall_1_1()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_2()); }

+	RULE_ONE_HEX_LETTER

+{ after(grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_2()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_3()); }

+	RULE_ONE_NON_HEX_LETTER

+{ after(grammarAccess.getValidURLAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_3()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_4()); }

+	RULE_ONE_INT

+{ after(grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_4()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLAccess().getReverseSolidusSpaceKeyword_1_5()); }

+

+	'\\ ' 

+

+{ after(grammarAccess.getValidURLAccess().getReverseSolidusSpaceKeyword_1_5()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLAccess().getReverseSolidusLeftParenthesisKeyword_1_6()); }

+

+	'\\(' 

+

+{ after(grammarAccess.getValidURLAccess().getReverseSolidusLeftParenthesisKeyword_1_6()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLAccess().getReverseSolidusRightParenthesisKeyword_1_7()); }

+

+	'\\)' 

+

+{ after(grammarAccess.getValidURLAccess().getReverseSolidusRightParenthesisKeyword_1_7()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLAccess().getReverseSolidusApostropheKeyword_1_8()); }

+

+	'\\\'' 

+

+{ after(grammarAccess.getValidURLAccess().getReverseSolidusApostropheKeyword_1_8()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLAccess().getReverseSolidusQuotationMarkKeyword_1_9()); }

+

+	'\\"' 

+

+{ after(grammarAccess.getValidURLAccess().getReverseSolidusQuotationMarkKeyword_1_9()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLAccess().getGroup_1_10()); }

+(rule__ValidURL__Group_1_10__0)

+{ after(grammarAccess.getValidURLAccess().getGroup_1_10()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ValidURL__Alternatives_1_10_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_1_0()); }

+	RULE_ONE_INT

+{ after(grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_1_0()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_1_1()); }

+	RULE_ONE_HEX_LETTER

+{ after(grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ValidURL__Alternatives_1_10_2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_2_0()); }

+	RULE_ONE_INT

+{ after(grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_2_0()); }

+)

+

+    |(

+{ before(grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_2_1()); }

+	RULE_ONE_HEX_LETTER

+{ after(grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_2_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Identifier__Alternatives_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_1_0()); }

+	RULE_UNDERSCORE

+{ after(grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_1_0()); }

+)

+

+    |(

+{ before(grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_1_1()); }

+	RULE_ONE_HEX_LETTER

+{ after(grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_1_1()); }

+)

+

+    |(

+{ before(grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_2()); }

+	RULE_ONE_NON_HEX_LETTER

+{ after(grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_2()); }

+)

+

+    |(

+{ before(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_1_3()); }

+	ruleKeywordHack

+{ after(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_1_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Identifier__Alternatives_2_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_2_0_0()); }

+	RULE_UNDERSCORE

+{ after(grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_2_0_0()); }

+)

+

+    |(

+{ before(grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_2_0_1()); }

+	RULE_DASH

+{ after(grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_2_0_1()); }

+)

+

+    |(

+{ before(grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_2_0_2()); }

+	RULE_ONE_HEX_LETTER

+{ after(grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_2_0_2()); }

+)

+

+    |(

+{ before(grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_2_0_3()); }

+	RULE_ONE_NON_HEX_LETTER

+{ after(grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_2_0_3()); }

+)

+

+    |(

+{ before(grammarAccess.getIdentifierAccess().getONE_INTTerminalRuleCall_2_0_4()); }

+	RULE_ONE_INT

+{ after(grammarAccess.getIdentifierAccess().getONE_INTTerminalRuleCall_2_0_4()); }

+)

+

+    |(

+{ before(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_2_0_5()); }

+	ruleKeywordHack

+{ after(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_2_0_5()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Num__Alternatives_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getNumAccess().getPLUSTerminalRuleCall_0_0()); }

+	RULE_PLUS

+{ after(grammarAccess.getNumAccess().getPLUSTerminalRuleCall_0_0()); }

+)

+

+    |(

+{ before(grammarAccess.getNumAccess().getDASHTerminalRuleCall_0_1()); }

+	RULE_DASH

+{ after(grammarAccess.getNumAccess().getDASHTerminalRuleCall_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Num__Alternatives_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getNumAccess().getGroup_1_0()); }

+(rule__Num__Group_1_0__0)

+{ after(grammarAccess.getNumAccess().getGroup_1_0()); }

+)

+

+    |(

+{ before(grammarAccess.getNumAccess().getGroup_1_1()); }

+(rule__Num__Group_1_1__0)

+{ after(grammarAccess.getNumAccess().getGroup_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Hex__Alternatives_1_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getHexAccess().getONE_INTTerminalRuleCall_1_0_0()); }

+	RULE_ONE_INT

+{ after(grammarAccess.getHexAccess().getONE_INTTerminalRuleCall_1_0_0()); }

+)

+

+    |(

+{ before(grammarAccess.getHexAccess().getONE_HEX_LETTERTerminalRuleCall_1_0_1()); }

+	RULE_ONE_HEX_LETTER

+{ after(grammarAccess.getHexAccess().getONE_HEX_LETTERTerminalRuleCall_1_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+rule__Stylesheet__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Stylesheet__Group__0__Impl

+	rule__Stylesheet__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Stylesheet__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStylesheetAccess().getCharsetAssignment_0()); }

+(rule__Stylesheet__CharsetAssignment_0)?

+{ after(grammarAccess.getStylesheetAccess().getCharsetAssignment_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Stylesheet__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Stylesheet__Group__1__Impl

+	rule__Stylesheet__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Stylesheet__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStylesheetAccess().getImportsAssignment_1()); }

+(rule__Stylesheet__ImportsAssignment_1)*

+{ after(grammarAccess.getStylesheetAccess().getImportsAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Stylesheet__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Stylesheet__Group__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Stylesheet__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStylesheetAccess().getAlternatives_2()); }

+(rule__Stylesheet__Alternatives_2)*

+{ after(grammarAccess.getStylesheetAccess().getAlternatives_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__Charset__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Charset__Group__0__Impl

+	rule__Charset__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Charset__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCharsetAccess().getAlternatives_0()); }

+(rule__Charset__Alternatives_0)

+{ after(grammarAccess.getCharsetAccess().getAlternatives_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Charset__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Charset__Group__1__Impl

+	rule__Charset__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Charset__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCharsetAccess().getCharsetAssignment_1()); }

+(rule__Charset__CharsetAssignment_1)

+{ after(grammarAccess.getCharsetAccess().getCharsetAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Charset__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Charset__Group__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Charset__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCharsetAccess().getSemicolonKeyword_2()); }

+

+	';' 

+

+{ after(grammarAccess.getCharsetAccess().getSemicolonKeyword_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__ImportExpression__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ImportExpression__Group__0__Impl

+	rule__ImportExpression__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ImportExpression__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getImportExpressionAccess().getAlternatives_0()); }

+(rule__ImportExpression__Alternatives_0)

+{ after(grammarAccess.getImportExpressionAccess().getAlternatives_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__ImportExpression__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ImportExpression__Group__1__Impl

+	rule__ImportExpression__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ImportExpression__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getImportExpressionAccess().getAlternatives_1()); }

+(rule__ImportExpression__Alternatives_1)

+{ after(grammarAccess.getImportExpressionAccess().getAlternatives_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__ImportExpression__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ImportExpression__Group__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ImportExpression__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getImportExpressionAccess().getSemicolonKeyword_2()); }

+

+	';' 

+

+{ after(grammarAccess.getImportExpressionAccess().getSemicolonKeyword_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__ImportExpression__Group_1_1__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ImportExpression__Group_1_1__0__Impl

+	rule__ImportExpression__Group_1_1__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ImportExpression__Group_1_1__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getImportExpressionAccess().getURLTypeParserRuleCall_1_1_0()); }

+	ruleURLType

+{ after(grammarAccess.getImportExpressionAccess().getURLTypeParserRuleCall_1_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__ImportExpression__Group_1_1__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ImportExpression__Group_1_1__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ImportExpression__Group_1_1__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getImportExpressionAccess().getMediaListAssignment_1_1_1()); }

+(rule__ImportExpression__MediaListAssignment_1_1_1)?

+{ after(grammarAccess.getImportExpressionAccess().getMediaListAssignment_1_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Page__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Page__Group__0__Impl

+	rule__Page__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Page__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPageAccess().getPageAction_0()); }

+(

+

+)

+{ after(grammarAccess.getPageAccess().getPageAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Page__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Page__Group__1__Impl

+	rule__Page__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Page__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPageAccess().getAlternatives_1()); }

+(rule__Page__Alternatives_1)

+{ after(grammarAccess.getPageAccess().getAlternatives_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Page__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Page__Group__2__Impl

+	rule__Page__Group__3

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Page__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPageAccess().getPseudoPageAssignment_2()); }

+(rule__Page__PseudoPageAssignment_2)?

+{ after(grammarAccess.getPageAccess().getPseudoPageAssignment_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Page__Group__3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Page__Group__3__Impl

+	rule__Page__Group__4

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Page__Group__3__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_3()); }

+

+	'{' 

+

+{ after(grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Page__Group__4

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Page__Group__4__Impl

+	rule__Page__Group__5

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Page__Group__4__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPageAccess().getDeclarationsAssignment_4()); }

+(rule__Page__DeclarationsAssignment_4)?

+{ after(grammarAccess.getPageAccess().getDeclarationsAssignment_4()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Page__Group__5

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Page__Group__5__Impl

+	rule__Page__Group__6

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Page__Group__5__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPageAccess().getGroup_5()); }

+(rule__Page__Group_5__0)*

+{ after(grammarAccess.getPageAccess().getGroup_5()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Page__Group__6

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Page__Group__6__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Page__Group__6__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPageAccess().getRightCurlyBracketKeyword_6()); }

+

+	'}' 

+

+{ after(grammarAccess.getPageAccess().getRightCurlyBracketKeyword_6()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+rule__Page__Group_5__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Page__Group_5__0__Impl

+	rule__Page__Group_5__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Page__Group_5__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPageAccess().getSemicolonKeyword_5_0()); }

+

+	';' 

+

+{ after(grammarAccess.getPageAccess().getSemicolonKeyword_5_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Page__Group_5__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Page__Group_5__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Page__Group_5__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPageAccess().getDeclarationsAssignment_5_1()); }

+(rule__Page__DeclarationsAssignment_5_1)?

+{ after(grammarAccess.getPageAccess().getDeclarationsAssignment_5_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Pseudo_page__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Pseudo_page__Group__0__Impl

+	rule__Pseudo_page__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Pseudo_page__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudo_pageAccess().getCOLONTerminalRuleCall_0()); }

+	RULE_COLON

+{ after(grammarAccess.getPseudo_pageAccess().getCOLONTerminalRuleCall_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Pseudo_page__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Pseudo_page__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Pseudo_page__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudo_pageAccess().getIdentifierParserRuleCall_1()); }

+	ruleIdentifier

+{ after(grammarAccess.getPseudo_pageAccess().getIdentifierParserRuleCall_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Media__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Media__Group__0__Impl

+	rule__Media__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Media__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getMediaAccess().getAlternatives_0()); }

+(rule__Media__Alternatives_0)

+{ after(grammarAccess.getMediaAccess().getAlternatives_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Media__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Media__Group__1__Impl

+	rule__Media__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Media__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getMediaAccess().getMedialistAssignment_1()); }

+(rule__Media__MedialistAssignment_1)

+{ after(grammarAccess.getMediaAccess().getMedialistAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Media__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Media__Group__2__Impl

+	rule__Media__Group__3

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Media__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_2()); }

+

+	'{' 

+

+{ after(grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Media__Group__3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Media__Group__3__Impl

+	rule__Media__Group__4

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Media__Group__3__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getMediaAccess().getRulesetsAssignment_3()); }

+(rule__Media__RulesetsAssignment_3)*

+{ after(grammarAccess.getMediaAccess().getRulesetsAssignment_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Media__Group__4

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Media__Group__4__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Media__Group__4__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_4()); }

+

+	'}' 

+

+{ after(grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_4()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+

+

+

+

+rule__Media_list__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Media_list__Group__0__Impl

+	rule__Media_list__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Media_list__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_0()); }

+	rulemedium

+{ after(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Media_list__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Media_list__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Media_list__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getMedia_listAccess().getGroup_1()); }

+(rule__Media_list__Group_1__0)*

+{ after(grammarAccess.getMedia_listAccess().getGroup_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Media_list__Group_1__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Media_list__Group_1__0__Impl

+	rule__Media_list__Group_1__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Media_list__Group_1__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getMedia_listAccess().getCOMMATerminalRuleCall_1_0()); }

+	RULE_COMMA

+{ after(grammarAccess.getMedia_listAccess().getCOMMATerminalRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Media_list__Group_1__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Media_list__Group_1__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Media_list__Group_1__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_1_1()); }

+	rulemedium

+{ after(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Font_face__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Font_face__Group__0__Impl

+	rule__Font_face__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Font_face__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getFont_faceAccess().getFont_faceAction_0()); }

+(

+

+)

+{ after(grammarAccess.getFont_faceAccess().getFont_faceAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Font_face__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Font_face__Group__1__Impl

+	rule__Font_face__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Font_face__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getFont_faceAccess().getAlternatives_1()); }

+(rule__Font_face__Alternatives_1)

+{ after(grammarAccess.getFont_faceAccess().getAlternatives_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Font_face__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Font_face__Group__2__Impl

+	rule__Font_face__Group__3

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Font_face__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getFont_faceAccess().getLeftCurlyBracketKeyword_2()); }

+

+	'{' 

+

+{ after(grammarAccess.getFont_faceAccess().getLeftCurlyBracketKeyword_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Font_face__Group__3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Font_face__Group__3__Impl

+	rule__Font_face__Group__4

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Font_face__Group__3__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getFont_faceAccess().getDeclarationsAssignment_3()); }

+(rule__Font_face__DeclarationsAssignment_3)?

+{ after(grammarAccess.getFont_faceAccess().getDeclarationsAssignment_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Font_face__Group__4

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Font_face__Group__4__Impl

+	rule__Font_face__Group__5

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Font_face__Group__4__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getFont_faceAccess().getGroup_4()); }

+(rule__Font_face__Group_4__0)*

+{ after(grammarAccess.getFont_faceAccess().getGroup_4()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Font_face__Group__5

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Font_face__Group__5__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Font_face__Group__5__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getFont_faceAccess().getRightCurlyBracketKeyword_5()); }

+

+	'}' 

+

+{ after(grammarAccess.getFont_faceAccess().getRightCurlyBracketKeyword_5()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+rule__Font_face__Group_4__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Font_face__Group_4__0__Impl

+	rule__Font_face__Group_4__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Font_face__Group_4__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0()); }

+

+	';' 

+

+{ after(grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Font_face__Group_4__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Font_face__Group_4__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Font_face__Group_4__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getFont_faceAccess().getDeclarationsAssignment_4_1()); }

+(rule__Font_face__DeclarationsAssignment_4_1)?

+{ after(grammarAccess.getFont_faceAccess().getDeclarationsAssignment_4_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Keyframes__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframes__Group__0__Impl

+	rule__Keyframes__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframes__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframesAccess().getFont_faceAction_0()); }

+(

+

+)

+{ after(grammarAccess.getKeyframesAccess().getFont_faceAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Keyframes__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframes__Group__1__Impl

+	rule__Keyframes__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframes__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframesAccess().getAlternatives_1()); }

+(rule__Keyframes__Alternatives_1)

+{ after(grammarAccess.getKeyframesAccess().getAlternatives_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Keyframes__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframes__Group__2__Impl

+	rule__Keyframes__Group__3

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframes__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframesAccess().getNameAssignment_2()); }

+(rule__Keyframes__NameAssignment_2)

+{ after(grammarAccess.getKeyframesAccess().getNameAssignment_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Keyframes__Group__3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframes__Group__3__Impl

+	rule__Keyframes__Group__4

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframes__Group__3__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframesAccess().getLeftCurlyBracketKeyword_3()); }

+

+	'{' 

+

+{ after(grammarAccess.getKeyframesAccess().getLeftCurlyBracketKeyword_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Keyframes__Group__4

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframes__Group__4__Impl

+	rule__Keyframes__Group__5

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframes__Group__4__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframesAccess().getKeyframeselectorsAssignment_4()); }

+(rule__Keyframes__KeyframeselectorsAssignment_4)?

+{ after(grammarAccess.getKeyframesAccess().getKeyframeselectorsAssignment_4()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Keyframes__Group__5

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframes__Group__5__Impl

+	rule__Keyframes__Group__6

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframes__Group__5__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframesAccess().getGroup_5()); }

+(rule__Keyframes__Group_5__0)*

+{ after(grammarAccess.getKeyframesAccess().getGroup_5()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Keyframes__Group__6

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframes__Group__6__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframes__Group__6__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframesAccess().getRightCurlyBracketKeyword_6()); }

+

+	'}' 

+

+{ after(grammarAccess.getKeyframesAccess().getRightCurlyBracketKeyword_6()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+rule__Keyframes__Group_5__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframes__Group_5__0__Impl

+	rule__Keyframes__Group_5__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframes__Group_5__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0()); }

+

+	';' 

+

+{ after(grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Keyframes__Group_5__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframes__Group_5__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframes__Group_5__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframesAccess().getKeyframeselectorsAssignment_5_1()); }

+(rule__Keyframes__KeyframeselectorsAssignment_5_1)?

+{ after(grammarAccess.getKeyframesAccess().getKeyframeselectorsAssignment_5_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Keyframe_selector__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframe_selector__Group__0__Impl

+	rule__Keyframe_selector__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getAlternatives_0()); }

+(rule__Keyframe_selector__Alternatives_0)

+{ after(grammarAccess.getKeyframe_selectorAccess().getAlternatives_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Keyframe_selector__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframe_selector__Group__1__Impl

+	rule__Keyframe_selector__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getLeftCurlyBracketKeyword_1()); }

+

+	'{' 

+

+{ after(grammarAccess.getKeyframe_selectorAccess().getLeftCurlyBracketKeyword_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Keyframe_selector__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframe_selector__Group__2__Impl

+	rule__Keyframe_selector__Group__3

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getDeclarationsAssignment_2()); }

+(rule__Keyframe_selector__DeclarationsAssignment_2)?

+{ after(grammarAccess.getKeyframe_selectorAccess().getDeclarationsAssignment_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Keyframe_selector__Group__3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframe_selector__Group__3__Impl

+	rule__Keyframe_selector__Group__4

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__Group__3__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getGroup_3()); }

+(rule__Keyframe_selector__Group_3__0)*

+{ after(grammarAccess.getKeyframe_selectorAccess().getGroup_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Keyframe_selector__Group__4

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframe_selector__Group__4__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__Group__4__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getRightCurlyBracketKeyword_4()); }

+

+	'}' 

+

+{ after(grammarAccess.getKeyframe_selectorAccess().getRightCurlyBracketKeyword_4()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+

+

+

+

+rule__Keyframe_selector__Group_0_1__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframe_selector__Group_0_1__0__Impl

+	rule__Keyframe_selector__Group_0_1__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__Group_0_1__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getPercentageAssignment_0_1_0()); }

+(rule__Keyframe_selector__PercentageAssignment_0_1_0)

+{ after(grammarAccess.getKeyframe_selectorAccess().getPercentageAssignment_0_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Keyframe_selector__Group_0_1__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframe_selector__Group_0_1__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__Group_0_1__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getPERCENTTerminalRuleCall_0_1_1()); }

+	RULE_PERCENT

+{ after(grammarAccess.getKeyframe_selectorAccess().getPERCENTTerminalRuleCall_0_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Keyframe_selector__Group_3__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframe_selector__Group_3__0__Impl

+	rule__Keyframe_selector__Group_3__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__Group_3__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0()); }

+

+	';' 

+

+{ after(grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Keyframe_selector__Group_3__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Keyframe_selector__Group_3__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__Group_3__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getDeclarationsAssignment_3_1()); }

+(rule__Keyframe_selector__DeclarationsAssignment_3_1)?

+{ after(grammarAccess.getKeyframe_selectorAccess().getDeclarationsAssignment_3_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Ruleset__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group__0__Impl

+	rule__Ruleset__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getSelectorsAssignment_0()); }

+(rule__Ruleset__SelectorsAssignment_0)

+{ after(grammarAccess.getRulesetAccess().getSelectorsAssignment_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Ruleset__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group__1__Impl

+	rule__Ruleset__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getGroup_1()); }

+(rule__Ruleset__Group_1__0)*

+{ after(grammarAccess.getRulesetAccess().getGroup_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Ruleset__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group__2__Impl

+	rule__Ruleset__Group__3

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_2()); }

+(	RULE_WS)*

+{ after(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Ruleset__Group__3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group__3__Impl

+	rule__Ruleset__Group__4

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group__3__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_3()); }

+

+	'{' 

+

+{ after(grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Ruleset__Group__4

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group__4__Impl

+	rule__Ruleset__Group__5

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group__4__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getGroup_4()); }

+(rule__Ruleset__Group_4__0)?

+{ after(grammarAccess.getRulesetAccess().getGroup_4()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Ruleset__Group__5

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group__5__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group__5__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_5()); }

+

+	'}' 

+

+{ after(grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_5()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+rule__Ruleset__Group_1__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group_1__0__Impl

+	rule__Ruleset__Group_1__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group_1__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_0()); }

+(	RULE_WS)*

+{ after(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Ruleset__Group_1__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group_1__1__Impl

+	rule__Ruleset__Group_1__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group_1__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getCOMMATerminalRuleCall_1_1()); }

+	RULE_COMMA

+{ after(grammarAccess.getRulesetAccess().getCOMMATerminalRuleCall_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Ruleset__Group_1__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group_1__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group_1__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getSelectorsAssignment_1_2()); }

+(rule__Ruleset__SelectorsAssignment_1_2)

+{ after(grammarAccess.getRulesetAccess().getSelectorsAssignment_1_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__Ruleset__Group_4__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group_4__0__Impl

+	rule__Ruleset__Group_4__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group_4__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getDeclarationsAssignment_4_0()); }

+(rule__Ruleset__DeclarationsAssignment_4_0)

+{ after(grammarAccess.getRulesetAccess().getDeclarationsAssignment_4_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Ruleset__Group_4__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group_4__1__Impl

+	rule__Ruleset__Group_4__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group_4__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getGroup_4_1()); }

+(rule__Ruleset__Group_4_1__0)*

+{ after(grammarAccess.getRulesetAccess().getGroup_4_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Ruleset__Group_4__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group_4__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group_4__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getSemicolonKeyword_4_2()); }

+(

+	';' 

+)?

+{ after(grammarAccess.getRulesetAccess().getSemicolonKeyword_4_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__Ruleset__Group_4_1__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group_4_1__0__Impl

+	rule__Ruleset__Group_4_1__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group_4_1__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getSemicolonKeyword_4_1_0()); }

+

+	';' 

+

+{ after(grammarAccess.getRulesetAccess().getSemicolonKeyword_4_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Ruleset__Group_4_1__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Ruleset__Group_4_1__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__Group_4_1__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getDeclarationsAssignment_4_1_1()); }

+(rule__Ruleset__DeclarationsAssignment_4_1_1)

+{ after(grammarAccess.getRulesetAccess().getDeclarationsAssignment_4_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Selector__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Selector__Group__0__Impl

+	rule__Selector__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getSimpleselectorsAssignment_0()); }

+(rule__Selector__SimpleselectorsAssignment_0)

+{ after(grammarAccess.getSelectorAccess().getSimpleselectorsAssignment_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Selector__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Selector__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getAlternatives_1()); }

+(rule__Selector__Alternatives_1)?

+{ after(grammarAccess.getSelectorAccess().getAlternatives_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Selector__Group_1_0__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Selector__Group_1_0__0__Impl

+	rule__Selector__Group_1_0__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__Group_1_0__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getCombinatorAssignment_1_0_0()); }

+(rule__Selector__CombinatorAssignment_1_0_0)

+{ after(grammarAccess.getSelectorAccess().getCombinatorAssignment_1_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Selector__Group_1_0__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Selector__Group_1_0__1__Impl

+	rule__Selector__Group_1_0__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__Group_1_0__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_0_1()); }

+(	RULE_WS)*

+{ after(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Selector__Group_1_0__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Selector__Group_1_0__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__Group_1_0__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getSelectorAssignment_1_0_2()); }

+(rule__Selector__SelectorAssignment_1_0_2)

+{ after(grammarAccess.getSelectorAccess().getSelectorAssignment_1_0_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__Selector__Group_1_1__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Selector__Group_1_1__0__Impl

+	rule__Selector__Group_1_1__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__Group_1_1__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+(

+{ before(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0()); }

+(	RULE_WS)

+{ after(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0()); }

+)

+(

+{ before(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0()); }

+(	RULE_WS)*

+{ after(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0()); }

+)

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Selector__Group_1_1__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Selector__Group_1_1__1__Impl

+	rule__Selector__Group_1_1__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__Group_1_1__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getGroup_1_1_1()); }

+(rule__Selector__Group_1_1_1__0)?

+{ after(grammarAccess.getSelectorAccess().getGroup_1_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Selector__Group_1_1__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Selector__Group_1_1__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__Group_1_1__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getSelectorAssignment_1_1_2()); }

+(rule__Selector__SelectorAssignment_1_1_2)

+{ after(grammarAccess.getSelectorAccess().getSelectorAssignment_1_1_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__Selector__Group_1_1_1__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Selector__Group_1_1_1__0__Impl

+	rule__Selector__Group_1_1_1__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__Group_1_1_1__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getCombinatorAssignment_1_1_1_0()); }

+(rule__Selector__CombinatorAssignment_1_1_1_0)

+{ after(grammarAccess.getSelectorAccess().getCombinatorAssignment_1_1_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Selector__Group_1_1_1__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Selector__Group_1_1_1__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__Group_1_1_1__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_1_1()); }

+(	RULE_WS)*

+{ after(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__SimpleSelectorForNegation__Group_0__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__SimpleSelectorForNegation__Group_0__0__Impl

+	rule__SimpleSelectorForNegation__Group_0__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__SimpleSelectorForNegation__Group_0__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimpleSelectorForNegationAccess().getAlternatives_0_0()); }

+(rule__SimpleSelectorForNegation__Alternatives_0_0)

+{ after(grammarAccess.getSimpleSelectorForNegationAccess().getAlternatives_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__SimpleSelectorForNegation__Group_0__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__SimpleSelectorForNegation__Group_0__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__SimpleSelectorForNegation__Group_0__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_0_1()); }

+(rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1)*

+{ after(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Simple_selector__Group_0__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Simple_selector__Group_0__0__Impl

+	rule__Simple_selector__Group_0__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Simple_selector__Group_0__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimple_selectorAccess().getAlternatives_0_0()); }

+(rule__Simple_selector__Alternatives_0_0)

+{ after(grammarAccess.getSimple_selectorAccess().getAlternatives_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Simple_selector__Group_0__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Simple_selector__Group_0__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Simple_selector__Group_0__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_0_1()); }

+(rule__Simple_selector__SubSelectorsAssignment_0_1)*

+{ after(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__AttributeSelector__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__AttributeSelector__Group__0__Impl

+	rule__AttributeSelector__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__AttributeSelector__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getAttributeSelectorAccess().getAttributeSelectorAction_0()); }

+(

+

+)

+{ after(grammarAccess.getAttributeSelectorAccess().getAttributeSelectorAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__AttributeSelector__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__AttributeSelector__Group__1__Impl

+	rule__AttributeSelector__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__AttributeSelector__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getAttributeSelectorAccess().getLeftSquareBracketKeyword_1()); }

+

+	'[' 

+

+{ after(grammarAccess.getAttributeSelectorAccess().getLeftSquareBracketKeyword_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__AttributeSelector__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__AttributeSelector__Group__2__Impl

+	rule__AttributeSelector__Group__3

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__AttributeSelector__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getAttributeSelectorAccess().getNameAssignment_2()); }

+(rule__AttributeSelector__NameAssignment_2)

+{ after(grammarAccess.getAttributeSelectorAccess().getNameAssignment_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__AttributeSelector__Group__3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__AttributeSelector__Group__3__Impl

+	rule__AttributeSelector__Group__4

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__AttributeSelector__Group__3__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getAttributeSelectorAccess().getGroup_3()); }

+(rule__AttributeSelector__Group_3__0)?

+{ after(grammarAccess.getAttributeSelectorAccess().getGroup_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__AttributeSelector__Group__4

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__AttributeSelector__Group__4__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__AttributeSelector__Group__4__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getAttributeSelectorAccess().getRightSquareBracketKeyword_4()); }

+

+	']' 

+

+{ after(grammarAccess.getAttributeSelectorAccess().getRightSquareBracketKeyword_4()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+

+

+

+

+rule__AttributeSelector__Group_3__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__AttributeSelector__Group_3__0__Impl

+	rule__AttributeSelector__Group_3__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__AttributeSelector__Group_3__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getAttributeSelectorAccess().getOpAssignment_3_0()); }

+(rule__AttributeSelector__OpAssignment_3_0)

+{ after(grammarAccess.getAttributeSelectorAccess().getOpAssignment_3_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__AttributeSelector__Group_3__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__AttributeSelector__Group_3__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__AttributeSelector__Group_3__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getAttributeSelectorAccess().getValueAssignment_3_1()); }

+(rule__AttributeSelector__ValueAssignment_3_1)

+{ after(grammarAccess.getAttributeSelectorAccess().getValueAssignment_3_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__ClassSelector__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ClassSelector__Group__0__Impl

+	rule__ClassSelector__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ClassSelector__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getClassSelectorAccess().getClassSelectorAction_0()); }

+(

+

+)

+{ after(grammarAccess.getClassSelectorAccess().getClassSelectorAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__ClassSelector__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ClassSelector__Group__1__Impl

+	rule__ClassSelector__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ClassSelector__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getClassSelectorAccess().getFullStopKeyword_1()); }

+

+	'.' 

+

+{ after(grammarAccess.getClassSelectorAccess().getFullStopKeyword_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__ClassSelector__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ClassSelector__Group__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ClassSelector__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getClassSelectorAccess().getNameAssignment_2()); }

+(rule__ClassSelector__NameAssignment_2)

+{ after(grammarAccess.getClassSelectorAccess().getNameAssignment_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__ElementSelector__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ElementSelector__Group__0__Impl

+	rule__ElementSelector__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ElementSelector__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getElementSelectorAccess().getElementSelectorAction_0()); }

+(

+

+)

+{ after(grammarAccess.getElementSelectorAccess().getElementSelectorAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__ElementSelector__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ElementSelector__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ElementSelector__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getElementSelectorAccess().getNameAssignment_1()); }

+(rule__ElementSelector__NameAssignment_1)

+{ after(grammarAccess.getElementSelectorAccess().getNameAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__UniversalSelector__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__UniversalSelector__Group__0__Impl

+	rule__UniversalSelector__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__UniversalSelector__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getUniversalSelectorAccess().getUniversalSelectorAction_0()); }

+(

+

+)

+{ after(grammarAccess.getUniversalSelectorAccess().getUniversalSelectorAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__UniversalSelector__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__UniversalSelector__Group__1__Impl

+	rule__UniversalSelector__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__UniversalSelector__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getUniversalSelectorAccess().getNamespaceAssignment_1()); }

+(rule__UniversalSelector__NamespaceAssignment_1)?

+{ after(grammarAccess.getUniversalSelectorAccess().getNamespaceAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__UniversalSelector__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__UniversalSelector__Group__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__UniversalSelector__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getUniversalSelectorAccess().getAsteriskKeyword_2()); }

+

+	'*' 

+

+{ after(grammarAccess.getUniversalSelectorAccess().getAsteriskKeyword_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__IdSelector__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__IdSelector__Group__0__Impl

+	rule__IdSelector__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__IdSelector__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdSelectorAccess().getIdSelectorAction_0()); }

+(

+

+)

+{ after(grammarAccess.getIdSelectorAccess().getIdSelectorAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__IdSelector__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__IdSelector__Group__1__Impl

+	rule__IdSelector__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__IdSelector__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdSelectorAccess().getHASHMARKTerminalRuleCall_1()); }

+	RULE_HASHMARK

+{ after(grammarAccess.getIdSelectorAccess().getHASHMARKTerminalRuleCall_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__IdSelector__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__IdSelector__Group__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__IdSelector__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdSelectorAccess().getNameAssignment_2()); }

+(rule__IdSelector__NameAssignment_2)

+{ after(grammarAccess.getIdSelectorAccess().getNameAssignment_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__Css_namespace_prefix__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Css_namespace_prefix__Group__0__Impl

+	rule__Css_namespace_prefix__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_namespace_prefix__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_namespace_prefixAccess().getAlternatives_0()); }

+(rule__Css_namespace_prefix__Alternatives_0)?

+{ after(grammarAccess.getCss_namespace_prefixAccess().getAlternatives_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Css_namespace_prefix__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Css_namespace_prefix__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_namespace_prefix__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_namespace_prefixAccess().getVerticalLineKeyword_1()); }

+

+	'|' 

+

+{ after(grammarAccess.getCss_namespace_prefixAccess().getVerticalLineKeyword_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Css_declaration__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Css_declaration__Group__0__Impl

+	rule__Css_declaration__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_declaration__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_0()); }

+(	RULE_WS)*

+{ after(grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Css_declaration__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Css_declaration__Group__1__Impl

+	rule__Css_declaration__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_declaration__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_declarationAccess().getPropertyAssignment_1()); }

+(rule__Css_declaration__PropertyAssignment_1)

+{ after(grammarAccess.getCss_declarationAccess().getPropertyAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Css_declaration__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Css_declaration__Group__2__Impl

+	rule__Css_declaration__Group__3

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_declaration__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_2()); }

+(	RULE_WS)*

+{ after(grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Css_declaration__Group__3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Css_declaration__Group__3__Impl

+	rule__Css_declaration__Group__4

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_declaration__Group__3__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_declarationAccess().getCOLONTerminalRuleCall_3()); }

+	RULE_COLON

+{ after(grammarAccess.getCss_declarationAccess().getCOLONTerminalRuleCall_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Css_declaration__Group__4

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Css_declaration__Group__4__Impl

+	rule__Css_declaration__Group__5

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_declaration__Group__4__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+(

+{ before(grammarAccess.getCss_declarationAccess().getValueTokensAssignment_4()); }

+(rule__Css_declaration__ValueTokensAssignment_4)

+{ after(grammarAccess.getCss_declarationAccess().getValueTokensAssignment_4()); }

+)

+(

+{ before(grammarAccess.getCss_declarationAccess().getValueTokensAssignment_4()); }

+(rule__Css_declaration__ValueTokensAssignment_4)*

+{ after(grammarAccess.getCss_declarationAccess().getValueTokensAssignment_4()); }

+)

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Css_declaration__Group__5

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Css_declaration__Group__5__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_declaration__Group__5__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_declarationAccess().getImportantAssignment_5()); }

+(rule__Css_declaration__ImportantAssignment_5)?

+{ after(grammarAccess.getCss_declarationAccess().getImportantAssignment_5()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+rule__Css_property__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Css_property__Group__0__Impl

+	rule__Css_property__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_property__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_propertyAccess().getCss_propertyAction_0()); }

+(

+

+)

+{ after(grammarAccess.getCss_propertyAccess().getCss_propertyAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Css_property__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Css_property__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_property__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_propertyAccess().getNameAssignment_1()); }

+(rule__Css_property__NameAssignment_1)

+{ after(grammarAccess.getCss_propertyAccess().getNameAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__PseudoClass__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__PseudoClass__Group__0__Impl

+	rule__PseudoClass__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClass__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_0()); }

+	RULE_COLON

+{ after(grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__PseudoClass__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__PseudoClass__Group__1__Impl

+	rule__PseudoClass__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClass__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_1()); }

+(	RULE_COLON)?

+{ after(grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__PseudoClass__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__PseudoClass__Group__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClass__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassAccess().getPseudoClassNameParserRuleCall_2()); }

+	rulePseudoClassName

+{ after(grammarAccess.getPseudoClassAccess().getPseudoClassNameParserRuleCall_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__PseudoClassFunction__Group_0__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__PseudoClassFunction__Group_0__0__Impl

+	rule__PseudoClassFunction__Group_0__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassFunction__Group_0__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getNotAssignment_0_0()); }

+(rule__PseudoClassFunction__NotAssignment_0_0)

+{ after(grammarAccess.getPseudoClassFunctionAccess().getNotAssignment_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__PseudoClassFunction__Group_0__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__PseudoClassFunction__Group_0__1__Impl

+	rule__PseudoClassFunction__Group_0__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassFunction__Group_0__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getParamSelectorAssignment_0_1()); }

+(rule__PseudoClassFunction__ParamSelectorAssignment_0_1)

+{ after(grammarAccess.getPseudoClassFunctionAccess().getParamSelectorAssignment_0_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__PseudoClassFunction__Group_0__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__PseudoClassFunction__Group_0__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassFunction__Group_0__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_0_2()); }

+

+	')' 

+

+{ after(grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_0_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__PseudoClassFunction__Group_1__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__PseudoClassFunction__Group_1__0__Impl

+	rule__PseudoClassFunction__Group_1__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassFunction__Group_1__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getCOLONTerminalRuleCall_1_0()); }

+	RULE_COLON

+{ after(grammarAccess.getPseudoClassFunctionAccess().getCOLONTerminalRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__PseudoClassFunction__Group_1__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__PseudoClassFunction__Group_1__1__Impl

+	rule__PseudoClassFunction__Group_1__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassFunction__Group_1__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getNameAssignment_1_1()); }

+(rule__PseudoClassFunction__NameAssignment_1_1)

+{ after(grammarAccess.getPseudoClassFunctionAccess().getNameAssignment_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__PseudoClassFunction__Group_1__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__PseudoClassFunction__Group_1__2__Impl

+	rule__PseudoClassFunction__Group_1__3

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassFunction__Group_1__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getLeftParenthesisKeyword_1_2()); }

+

+	'(' 

+

+{ after(grammarAccess.getPseudoClassFunctionAccess().getLeftParenthesisKeyword_1_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__PseudoClassFunction__Group_1__3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__PseudoClassFunction__Group_1__3__Impl

+	rule__PseudoClassFunction__Group_1__4

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassFunction__Group_1__3__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getParamsAssignment_1_3()); }

+(rule__PseudoClassFunction__ParamsAssignment_1_3)*

+{ after(grammarAccess.getPseudoClassFunctionAccess().getParamsAssignment_1_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__PseudoClassFunction__Group_1__4

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__PseudoClassFunction__Group_1__4__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassFunction__Group_1__4__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_1_4()); }

+

+	')' 

+

+{ after(grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_1_4()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+

+

+

+

+rule__NotFunctionCall__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__NotFunctionCall__Group__0__Impl

+	rule__NotFunctionCall__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__NotFunctionCall__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getNotFunctionCallAccess().getCOLONTerminalRuleCall_0()); }

+	RULE_COLON

+{ after(grammarAccess.getNotFunctionCallAccess().getCOLONTerminalRuleCall_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__NotFunctionCall__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__NotFunctionCall__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__NotFunctionCall__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getNotFunctionCallAccess().getNotKeyword_1()); }

+

+	'not(' 

+

+{ after(grammarAccess.getNotFunctionCallAccess().getNotKeyword_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__SymbolTok__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__SymbolTok__Group__0__Impl

+	rule__SymbolTok__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__SymbolTok__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSymbolTokAccess().getSymbolTokAction_0()); }

+(

+

+)

+{ after(grammarAccess.getSymbolTokAccess().getSymbolTokAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__SymbolTok__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__SymbolTok__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__SymbolTok__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSymbolTokAccess().getSymbolAssignment_1()); }

+(rule__SymbolTok__SymbolAssignment_1)

+{ after(grammarAccess.getSymbolTokAccess().getSymbolAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__WSTok__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__WSTok__Group__0__Impl

+	rule__WSTok__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__WSTok__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getWSTokAccess().getWSTokAction_0()); }

+(

+

+)

+{ after(grammarAccess.getWSTokAccess().getWSTokAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__WSTok__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__WSTok__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__WSTok__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getWSTokAccess().getWSTerminalRuleCall_1()); }

+	RULE_WS

+{ after(grammarAccess.getWSTokAccess().getWSTerminalRuleCall_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__StringTok__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__StringTok__Group__0__Impl

+	rule__StringTok__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__StringTok__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStringTokAccess().getStringTokAction_0()); }

+(

+

+)

+{ after(grammarAccess.getStringTokAccess().getStringTokAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__StringTok__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__StringTok__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__StringTok__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStringTokAccess().getValueAssignment_1()); }

+(rule__StringTok__ValueAssignment_1)

+{ after(grammarAccess.getStringTokAccess().getValueAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__NumberTok__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__NumberTok__Group__0__Impl

+	rule__NumberTok__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__NumberTok__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getNumberTokAccess().getNumberTokAction_0()); }

+(

+

+)

+{ after(grammarAccess.getNumberTokAccess().getNumberTokAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__NumberTok__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__NumberTok__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__NumberTok__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getNumberTokAccess().getValAssignment_1()); }

+(rule__NumberTok__ValAssignment_1)

+{ after(grammarAccess.getNumberTokAccess().getValAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__UrlTok__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__UrlTok__Group__0__Impl

+	rule__UrlTok__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__UrlTok__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getUrlTokAccess().getUrlTokAction_0()); }

+(

+

+)

+{ after(grammarAccess.getUrlTokAccess().getUrlTokAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__UrlTok__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__UrlTok__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__UrlTok__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getUrlTokAccess().getUrlAssignment_1()); }

+(rule__UrlTok__UrlAssignment_1)

+{ after(grammarAccess.getUrlTokAccess().getUrlAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__ColorTok__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ColorTok__Group__0__Impl

+	rule__ColorTok__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ColorTok__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getColorTokAccess().getColorTokAction_0()); }

+(

+

+)

+{ after(grammarAccess.getColorTokAccess().getColorTokAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__ColorTok__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ColorTok__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ColorTok__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getColorTokAccess().getValueAssignment_1()); }

+(rule__ColorTok__ValueAssignment_1)

+{ after(grammarAccess.getColorTokAccess().getValueAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__IdentifierOrFuncTok__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__IdentifierOrFuncTok__Group__0__Impl

+	rule__IdentifierOrFuncTok__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__IdentifierOrFuncTok__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierOrFuncTokAccess().getIdentifierTokAction_0()); }

+(

+

+)

+{ after(grammarAccess.getIdentifierOrFuncTokAccess().getIdentifierTokAction_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__IdentifierOrFuncTok__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__IdentifierOrFuncTok__Group__1__Impl

+	rule__IdentifierOrFuncTok__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__IdentifierOrFuncTok__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierOrFuncTokAccess().getNameAssignment_1()); }

+(rule__IdentifierOrFuncTok__NameAssignment_1)

+{ after(grammarAccess.getIdentifierOrFuncTokAccess().getNameAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__IdentifierOrFuncTok__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__IdentifierOrFuncTok__Group__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__IdentifierOrFuncTok__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierOrFuncTokAccess().getGroup_2()); }

+(rule__IdentifierOrFuncTok__Group_2__0)?

+{ after(grammarAccess.getIdentifierOrFuncTokAccess().getGroup_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__IdentifierOrFuncTok__Group_2__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__IdentifierOrFuncTok__Group_2__0__Impl

+	rule__IdentifierOrFuncTok__Group_2__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__IdentifierOrFuncTok__Group_2__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierOrFuncTokAccess().getFuncTokNameAction_2_0()); }

+(

+

+)

+{ after(grammarAccess.getIdentifierOrFuncTokAccess().getFuncTokNameAction_2_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__IdentifierOrFuncTok__Group_2__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__IdentifierOrFuncTok__Group_2__1__Impl

+	rule__IdentifierOrFuncTok__Group_2__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__IdentifierOrFuncTok__Group_2__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierOrFuncTokAccess().getLeftParenthesisKeyword_2_1()); }

+

+	'(' 

+

+{ after(grammarAccess.getIdentifierOrFuncTokAccess().getLeftParenthesisKeyword_2_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__IdentifierOrFuncTok__Group_2__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__IdentifierOrFuncTok__Group_2__2__Impl

+	rule__IdentifierOrFuncTok__Group_2__3

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__IdentifierOrFuncTok__Group_2__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+(

+{ before(grammarAccess.getIdentifierOrFuncTokAccess().getParamsAssignment_2_2()); }

+(rule__IdentifierOrFuncTok__ParamsAssignment_2_2)

+{ after(grammarAccess.getIdentifierOrFuncTokAccess().getParamsAssignment_2_2()); }

+)

+(

+{ before(grammarAccess.getIdentifierOrFuncTokAccess().getParamsAssignment_2_2()); }

+(rule__IdentifierOrFuncTok__ParamsAssignment_2_2)*

+{ after(grammarAccess.getIdentifierOrFuncTokAccess().getParamsAssignment_2_2()); }

+)

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__IdentifierOrFuncTok__Group_2__3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__IdentifierOrFuncTok__Group_2__3__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__IdentifierOrFuncTok__Group_2__3__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierOrFuncTokAccess().getRightParenthesisKeyword_2_3()); }

+

+	')' 

+

+{ after(grammarAccess.getIdentifierOrFuncTokAccess().getRightParenthesisKeyword_2_3()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+

+

+rule__URLType__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__URLType__Group__0__Impl

+	rule__URLType__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__URLType__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getURLTypeAccess().getUrlKeyword_0()); }

+

+	'url(' 

+

+{ after(grammarAccess.getURLTypeAccess().getUrlKeyword_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__URLType__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__URLType__Group__1__Impl

+	rule__URLType__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__URLType__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getURLTypeAccess().getUrlAssignment_1()); }

+(rule__URLType__UrlAssignment_1)

+{ after(grammarAccess.getURLTypeAccess().getUrlAssignment_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__URLType__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__URLType__Group__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__URLType__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getURLTypeAccess().getRightParenthesisKeyword_2()); }

+

+	')' 

+

+{ after(grammarAccess.getURLTypeAccess().getRightParenthesisKeyword_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__ValidURLSymbol__Group_18__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ValidURLSymbol__Group_18__0__Impl

+	rule__ValidURLSymbol__Group_18__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ValidURLSymbol__Group_18__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getValidURLSymbolAccess().getEqualsSignKeyword_18_0()); }

+

+	'=' 

+

+{ after(grammarAccess.getValidURLSymbolAccess().getEqualsSignKeyword_18_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__ValidURLSymbol__Group_18__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ValidURLSymbol__Group_18__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ValidURLSymbol__Group_18__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getValidURLSymbolAccess().getKeywordHackParserRuleCall_18_1()); }

+	ruleKeywordHack

+{ after(grammarAccess.getValidURLSymbolAccess().getKeywordHackParserRuleCall_18_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__ValidURL__Group_1_10__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ValidURL__Group_1_10__0__Impl

+	rule__ValidURL__Group_1_10__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ValidURL__Group_1_10__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getValidURLAccess().getPERCENTTerminalRuleCall_1_10_0()); }

+	RULE_PERCENT

+{ after(grammarAccess.getValidURLAccess().getPERCENTTerminalRuleCall_1_10_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__ValidURL__Group_1_10__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ValidURL__Group_1_10__1__Impl

+	rule__ValidURL__Group_1_10__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ValidURL__Group_1_10__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getValidURLAccess().getAlternatives_1_10_1()); }

+(rule__ValidURL__Alternatives_1_10_1)

+{ after(grammarAccess.getValidURLAccess().getAlternatives_1_10_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__ValidURL__Group_1_10__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__ValidURL__Group_1_10__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ValidURL__Group_1_10__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getValidURLAccess().getAlternatives_1_10_2()); }

+(rule__ValidURL__Alternatives_1_10_2)

+{ after(grammarAccess.getValidURLAccess().getAlternatives_1_10_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__Identifier__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Identifier__Group__0__Impl

+	rule__Identifier__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Identifier__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_0()); }

+(	RULE_DASH)?

+{ after(grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Identifier__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Identifier__Group__1__Impl

+	rule__Identifier__Group__2

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Identifier__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierAccess().getAlternatives_1()); }

+(rule__Identifier__Alternatives_1)

+{ after(grammarAccess.getIdentifierAccess().getAlternatives_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Identifier__Group__2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Identifier__Group__2__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Identifier__Group__2__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierAccess().getGroup_2()); }

+(rule__Identifier__Group_2__0)*

+{ after(grammarAccess.getIdentifierAccess().getGroup_2()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+

+

+rule__Identifier__Group_2__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Identifier__Group_2__0__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Identifier__Group_2__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierAccess().getAlternatives_2_0()); }

+(rule__Identifier__Alternatives_2_0)

+{ after(grammarAccess.getIdentifierAccess().getAlternatives_2_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+rule__Num__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Num__Group__0__Impl

+	rule__Num__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Num__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getNumAccess().getAlternatives_0()); }

+(rule__Num__Alternatives_0)?

+{ after(grammarAccess.getNumAccess().getAlternatives_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Num__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Num__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Num__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getNumAccess().getAlternatives_1()); }

+(rule__Num__Alternatives_1)

+{ after(grammarAccess.getNumAccess().getAlternatives_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Num__Group_1_0__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Num__Group_1_0__0__Impl

+	rule__Num__Group_1_0__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Num__Group_1_0__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getNumAccess().getFullStopKeyword_1_0_0()); }

+

+	'.' 

+

+{ after(grammarAccess.getNumAccess().getFullStopKeyword_1_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Num__Group_1_0__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Num__Group_1_0__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Num__Group_1_0__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+(

+{ before(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_0_1()); }

+(	RULE_ONE_INT)

+{ after(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_0_1()); }

+)

+(

+{ before(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_0_1()); }

+(	RULE_ONE_INT)*

+{ after(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_0_1()); }

+)

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Num__Group_1_1__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Num__Group_1_1__0__Impl

+	rule__Num__Group_1_1__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Num__Group_1_1__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+(

+{ before(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_0()); }

+(	RULE_ONE_INT)

+{ after(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_0()); }

+)

+(

+{ before(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_0()); }

+(	RULE_ONE_INT)*

+{ after(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_0()); }

+)

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Num__Group_1_1__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Num__Group_1_1__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Num__Group_1_1__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getNumAccess().getGroup_1_1_1()); }

+(rule__Num__Group_1_1_1__0)?

+{ after(grammarAccess.getNumAccess().getGroup_1_1_1()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Num__Group_1_1_1__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Num__Group_1_1_1__0__Impl

+	rule__Num__Group_1_1_1__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Num__Group_1_1_1__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getNumAccess().getFullStopKeyword_1_1_1_0()); }

+(

+	'.' 

+)

+{ after(grammarAccess.getNumAccess().getFullStopKeyword_1_1_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Num__Group_1_1_1__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Num__Group_1_1_1__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Num__Group_1_1_1__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+(

+{ before(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_1_1()); }

+(	RULE_ONE_INT)

+{ after(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_1_1()); }

+)

+(

+{ before(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_1_1()); }

+(	RULE_ONE_INT)*

+{ after(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_1_1()); }

+)

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Hex__Group__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Hex__Group__0__Impl

+	rule__Hex__Group__1

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Hex__Group__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getHexAccess().getHASHMARKTerminalRuleCall_0()); }

+	RULE_HASHMARK

+{ after(grammarAccess.getHexAccess().getHASHMARKTerminalRuleCall_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+rule__Hex__Group__1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Hex__Group__1__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Hex__Group__1__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+(

+{ before(grammarAccess.getHexAccess().getGroup_1()); }

+(rule__Hex__Group_1__0)

+{ after(grammarAccess.getHexAccess().getGroup_1()); }

+)

+(

+{ before(grammarAccess.getHexAccess().getGroup_1()); }

+(rule__Hex__Group_1__0)*

+{ after(grammarAccess.getHexAccess().getGroup_1()); }

+)

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+

+rule__Hex__Group_1__0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+	rule__Hex__Group_1__0__Impl

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Hex__Group_1__0__Impl

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getHexAccess().getAlternatives_1_0()); }

+(rule__Hex__Alternatives_1_0)

+{ after(grammarAccess.getHexAccess().getAlternatives_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+

+

+

+rule__Stylesheet__CharsetAssignment_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStylesheetAccess().getCharsetCharsetParserRuleCall_0_0()); }

+	rulecharset{ after(grammarAccess.getStylesheetAccess().getCharsetCharsetParserRuleCall_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Stylesheet__ImportsAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStylesheetAccess().getImportsImportExpressionParserRuleCall_1_0()); }

+	ruleimportExpression{ after(grammarAccess.getStylesheetAccess().getImportsImportExpressionParserRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Stylesheet__RulesetAssignment_2_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStylesheetAccess().getRulesetRulesetParserRuleCall_2_0_0()); }

+	ruleruleset{ after(grammarAccess.getStylesheetAccess().getRulesetRulesetParserRuleCall_2_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Stylesheet__MediaAssignment_2_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStylesheetAccess().getMediaMediaParserRuleCall_2_1_0()); }

+	rulemedia{ after(grammarAccess.getStylesheetAccess().getMediaMediaParserRuleCall_2_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Stylesheet__PageAssignment_2_2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStylesheetAccess().getPagePageParserRuleCall_2_2_0()); }

+	rulepage{ after(grammarAccess.getStylesheetAccess().getPagePageParserRuleCall_2_2_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Stylesheet__Font_faceAssignment_2_3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStylesheetAccess().getFont_faceFont_faceParserRuleCall_2_3_0()); }

+	rulefont_face{ after(grammarAccess.getStylesheetAccess().getFont_faceFont_faceParserRuleCall_2_3_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Stylesheet__KeyframesAssignment_2_4

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStylesheetAccess().getKeyframesKeyframesParserRuleCall_2_4_0()); }

+	rulekeyframes{ after(grammarAccess.getStylesheetAccess().getKeyframesKeyframesParserRuleCall_2_4_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Charset__CharsetAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCharsetAccess().getCharsetCSSSTRINGTerminalRuleCall_1_0()); }

+	RULE_CSSSTRING{ after(grammarAccess.getCharsetAccess().getCharsetCSSSTRINGTerminalRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ImportExpression__ValueAssignment_1_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getImportExpressionAccess().getValueCSSSTRINGTerminalRuleCall_1_0_0()); }

+	RULE_CSSSTRING{ after(grammarAccess.getImportExpressionAccess().getValueCSSSTRINGTerminalRuleCall_1_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ImportExpression__MediaListAssignment_1_1_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getImportExpressionAccess().getMediaListMedia_listParserRuleCall_1_1_1_0()); }

+	rulemedia_list{ after(grammarAccess.getImportExpressionAccess().getMediaListMedia_listParserRuleCall_1_1_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Page__PseudoPageAssignment_2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPageAccess().getPseudoPagePseudo_pageParserRuleCall_2_0()); }

+	rulepseudo_page{ after(grammarAccess.getPageAccess().getPseudoPagePseudo_pageParserRuleCall_2_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Page__DeclarationsAssignment_4

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_4_0()); }

+	rulecss_declaration{ after(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_4_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Page__DeclarationsAssignment_5_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_5_1_0()); }

+	rulecss_declaration{ after(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_5_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Media__MedialistAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getMediaAccess().getMedialistMedia_listParserRuleCall_1_0()); }

+	rulemedia_list{ after(grammarAccess.getMediaAccess().getMedialistMedia_listParserRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Media__RulesetsAssignment_3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getMediaAccess().getRulesetsRulesetParserRuleCall_3_0()); }

+	ruleruleset{ after(grammarAccess.getMediaAccess().getRulesetsRulesetParserRuleCall_3_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Font_face__DeclarationsAssignment_3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_3_0()); }

+	rulecss_declaration{ after(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_3_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Font_face__DeclarationsAssignment_4_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_4_1_0()); }

+	rulecss_declaration{ after(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_4_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframes__NameAssignment_2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframesAccess().getNameIdentifierParserRuleCall_2_0()); }

+	ruleIdentifier{ after(grammarAccess.getKeyframesAccess().getNameIdentifierParserRuleCall_2_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframes__KeyframeselectorsAssignment_4

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_4_0()); }

+	rulekeyframe_selector{ after(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_4_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframes__KeyframeselectorsAssignment_5_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_5_1_0()); }

+	rulekeyframe_selector{ after(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_5_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__TypeAssignment_0_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getTypeIdentifierParserRuleCall_0_0_0()); }

+	ruleIdentifier{ after(grammarAccess.getKeyframe_selectorAccess().getTypeIdentifierParserRuleCall_0_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__PercentageAssignment_0_1_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getPercentageNumParserRuleCall_0_1_0_0()); }

+	ruleNum{ after(grammarAccess.getKeyframe_selectorAccess().getPercentageNumParserRuleCall_0_1_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__DeclarationsAssignment_2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_2_0()); }

+	rulecss_declaration{ after(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_2_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Keyframe_selector__DeclarationsAssignment_3_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_3_1_0()); }

+	rulecss_declaration{ after(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_3_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__SelectorsAssignment_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0()); }

+	ruleselector{ after(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__SelectorsAssignment_1_2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0()); }

+	ruleselector{ after(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__DeclarationsAssignment_4_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_0_0()); }

+	rulecss_declaration{ after(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Ruleset__DeclarationsAssignment_4_1_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_1_1_0()); }

+	rulecss_declaration{ after(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_1_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__SimpleselectorsAssignment_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getSimpleselectorsSimple_selectorParserRuleCall_0_0()); }

+	rulesimple_selector{ after(grammarAccess.getSelectorAccess().getSimpleselectorsSimple_selectorParserRuleCall_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__CombinatorAssignment_1_0_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_0_0_0()); }

+	rulecombinator{ after(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_0_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__SelectorAssignment_1_0_2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_0_2_0()); }

+	ruleselector{ after(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_0_2_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__CombinatorAssignment_1_1_1_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0_0()); }

+	rulecombinator{ after(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Selector__SelectorAssignment_1_1_2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_1_2_0()); }

+	ruleselector{ after(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_1_2_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__SimpleSelectorForNegation__ElementAssignment_0_0_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimpleSelectorForNegationAccess().getElementElementSelectorParserRuleCall_0_0_0_0()); }

+	ruleElementSelector{ after(grammarAccess.getSimpleSelectorForNegationAccess().getElementElementSelectorParserRuleCall_0_0_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimpleSelectorForNegationAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0()); }

+	ruleUniversalSelector{ after(grammarAccess.getSimpleSelectorForNegationAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_0_1_0()); }

+	ruleSubSelectorForNegation{ after(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_0_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__SimpleSelectorForNegation__SubSelectorsAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_1_0()); }

+	ruleSubSelectorForNegation{ after(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Simple_selector__ElementAssignment_0_0_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimple_selectorAccess().getElementElementSelectorParserRuleCall_0_0_0_0()); }

+	ruleElementSelector{ after(grammarAccess.getSimple_selectorAccess().getElementElementSelectorParserRuleCall_0_0_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Simple_selector__UniversalAssignment_0_0_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimple_selectorAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0()); }

+	ruleUniversalSelector{ after(grammarAccess.getSimple_selectorAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Simple_selector__SubSelectorsAssignment_0_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_0_1_0()); }

+	ruleSubSelector{ after(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_0_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Simple_selector__SubSelectorsAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_1_0()); }

+	ruleSubSelector{ after(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__AttributeSelector__NameAssignment_2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getAttributeSelectorAccess().getNameIdentifierParserRuleCall_2_0()); }

+	ruleIdentifier{ after(grammarAccess.getAttributeSelectorAccess().getNameIdentifierParserRuleCall_2_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__AttributeSelector__OpAssignment_3_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getAttributeSelectorAccess().getOpAlternatives_3_0_0()); }

+(rule__AttributeSelector__OpAlternatives_3_0_0)

+{ after(grammarAccess.getAttributeSelectorAccess().getOpAlternatives_3_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__AttributeSelector__ValueAssignment_3_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getAttributeSelectorAccess().getValueAlternatives_3_1_0()); }

+(rule__AttributeSelector__ValueAlternatives_3_1_0)

+{ after(grammarAccess.getAttributeSelectorAccess().getValueAlternatives_3_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ClassSelector__NameAssignment_2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getClassSelectorAccess().getNameIdentifierParserRuleCall_2_0()); }

+	ruleIdentifier{ after(grammarAccess.getClassSelectorAccess().getNameIdentifierParserRuleCall_2_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ElementSelector__NameAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getElementSelectorAccess().getNameIdentifierParserRuleCall_1_0()); }

+	ruleIdentifier{ after(grammarAccess.getElementSelectorAccess().getNameIdentifierParserRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__UniversalSelector__NamespaceAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getUniversalSelectorAccess().getNamespaceCss_namespace_prefixParserRuleCall_1_0()); }

+	rulecss_namespace_prefix{ after(grammarAccess.getUniversalSelectorAccess().getNamespaceCss_namespace_prefixParserRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__IdSelector__NameAssignment_2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdSelectorAccess().getNameIdentifierParserRuleCall_2_0()); }

+	ruleIdentifier{ after(grammarAccess.getIdSelectorAccess().getNameIdentifierParserRuleCall_2_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_declaration__PropertyAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_declarationAccess().getPropertyCss_propertyParserRuleCall_1_0()); }

+	rulecss_property{ after(grammarAccess.getCss_declarationAccess().getPropertyCss_propertyParserRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_declaration__ValueTokensAssignment_4

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_declarationAccess().getValueTokensCssTokParserRuleCall_4_0()); }

+	ruleCssTok{ after(grammarAccess.getCss_declarationAccess().getValueTokensCssTokParserRuleCall_4_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_declaration__ImportantAssignment_5

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_declarationAccess().getImportantIMPORTANT_SYMTerminalRuleCall_5_0()); }

+	RULE_IMPORTANT_SYM{ after(grammarAccess.getCss_declarationAccess().getImportantIMPORTANT_SYMTerminalRuleCall_5_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__Css_property__NameAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getCss_propertyAccess().getNameValidPropertyIdentParserRuleCall_1_0()); }

+	ruleValidPropertyIdent{ after(grammarAccess.getCss_propertyAccess().getNameValidPropertyIdentParserRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassName__NameAssignment

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassNameAccess().getNameIdentifierParserRuleCall_0()); }

+	ruleIdentifier{ after(grammarAccess.getPseudoClassNameAccess().getNameIdentifierParserRuleCall_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassFunction__NotAssignment_0_0

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getNotNotFunctionCallParserRuleCall_0_0_0()); }

+	ruleNotFunctionCall{ after(grammarAccess.getPseudoClassFunctionAccess().getNotNotFunctionCallParserRuleCall_0_0_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassFunction__ParamSelectorAssignment_0_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getParamSelectorSimpleSelectorForNegationParserRuleCall_0_1_0()); }

+	ruleSimpleSelectorForNegation{ after(grammarAccess.getPseudoClassFunctionAccess().getParamSelectorSimpleSelectorForNegationParserRuleCall_0_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassFunction__NameAssignment_1_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getNameIdentifierParserRuleCall_1_1_0()); }

+	ruleIdentifier{ after(grammarAccess.getPseudoClassFunctionAccess().getNameIdentifierParserRuleCall_1_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__PseudoClassFunction__ParamsAssignment_1_3

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getPseudoClassFunctionAccess().getParamsCssTokParserRuleCall_1_3_0()); }

+	ruleCssTok{ after(grammarAccess.getPseudoClassFunctionAccess().getParamsCssTokParserRuleCall_1_3_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__SymbolTok__SymbolAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getSymbolTokAccess().getSymbolAlternatives_1_0()); }

+(rule__SymbolTok__SymbolAlternatives_1_0)

+{ after(grammarAccess.getSymbolTokAccess().getSymbolAlternatives_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__StringTok__ValueAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getStringTokAccess().getValueCSSSTRINGTerminalRuleCall_1_0()); }

+	RULE_CSSSTRING{ after(grammarAccess.getStringTokAccess().getValueCSSSTRINGTerminalRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__NumberTok__ValAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getNumberTokAccess().getValNumParserRuleCall_1_0()); }

+	ruleNum{ after(grammarAccess.getNumberTokAccess().getValNumParserRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__UrlTok__UrlAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getUrlTokAccess().getUrlURLTypeParserRuleCall_1_0()); }

+	ruleURLType{ after(grammarAccess.getUrlTokAccess().getUrlURLTypeParserRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__ColorTok__ValueAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getColorTokAccess().getValueHexParserRuleCall_1_0()); }

+	ruleHex{ after(grammarAccess.getColorTokAccess().getValueHexParserRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__IdentifierOrFuncTok__NameAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierOrFuncTokAccess().getNameIdentifierParserRuleCall_1_0()); }

+	ruleIdentifier{ after(grammarAccess.getIdentifierOrFuncTokAccess().getNameIdentifierParserRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__IdentifierOrFuncTok__ParamsAssignment_2_2

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getIdentifierOrFuncTokAccess().getParamsCssTokParserRuleCall_2_2_0()); }

+	ruleCssTok{ after(grammarAccess.getIdentifierOrFuncTokAccess().getParamsCssTokParserRuleCall_2_2_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+rule__URLType__UrlAssignment_1

+    @init {

+		int stackSize = keepStackSize();

+    }

+:

+(

+{ before(grammarAccess.getURLTypeAccess().getUrlValidURLParserRuleCall_1_0()); }

+	ruleValidURL{ after(grammarAccess.getURLTypeAccess().getUrlValidURLParserRuleCall_1_0()); }

+)

+

+;

+finally {

+	restoreStackSize(stackSize);

+}

+

+

+RULE_IMPORTANT_SYM : '!important';

+

+RULE_ONE_INT : '0'..'9';

+

+RULE_ONE_HEX_LETTER : ('a'..'f'|'A'..'F');

+

+RULE_ONE_NON_HEX_LETTER : ('g'..'z'|'G'..'Z');

+

+RULE_UNDERSCORE : '_';

+

+RULE_DASH : '-';

+

+RULE_PLUS : '+';

+

+RULE_HASHMARK : '#';

+

+RULE_COMMA : ',';

+

+RULE_PERCENT : '%';

+

+RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';

+

+RULE_WS : (' '|'\t'|'\r'|'\n')+;

+

+RULE_CSSSTRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'0'..'9'|'a'..'f'|'A'..'F'|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'0'..'9'|'a'..'f'|'A'..'F'|'\\')|~(('\\'|'\'')))* '\'');

+

+RULE_INCLUDES : '~=';

+

+RULE_DASHMATCH : '|=';

+

+RULE_COLON : ':';

+

+

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.tokens b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.tokens
new file mode 100644
index 00000000000..cd00576f6ac
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.tokens
@@ -0,0 +1,106 @@
+'!'=45

+'$'=46

+'$='=33

+'&'=47

+'('=62

+')'=61

+'*'=36

+'*='=34

+'.'=39

+'/'=40

+';'=48

+'='=35

+'>'=37

+'?'=41

+'@'=44

+'@CHARSET'=21

+'@FONT-FACE'=29

+'@IMPORT'=23

+'@KEYFRAMES'=31

+'@MEDIA'=27

+'@PAGE'=25

+'@charset'=20

+'@font-face'=28

+'@import'=22

+'@keyframes'=30

+'@media'=26

+'@page'=24

+'['=42

+'\\ '=53

+'\\"'=57

+'\\('=54

+'\\)'=55

+'\\\''=56

+']'=43

+'^='=32

+'no'=50

+'not'=49

+'not('=63

+'ur'=52

+'url'=51

+'url('=64

+'{'=58

+'|'=60

+'}'=59

+'~'=38

+RULE_COLON=12

+RULE_COMMA=8

+RULE_CSSSTRING=6

+RULE_DASH=10

+RULE_DASHMATCH=5

+RULE_HASHMARK=13

+RULE_IMPORTANT_SYM=18

+RULE_INCLUDES=4

+RULE_ML_COMMENT=19

+RULE_ONE_HEX_LETTER=14

+RULE_ONE_INT=16

+RULE_ONE_NON_HEX_LETTER=15

+RULE_PERCENT=9

+RULE_PLUS=7

+RULE_UNDERSCORE=11

+RULE_WS=17

+T__20=20

+T__21=21

+T__22=22

+T__23=23

+T__24=24

+T__25=25

+T__26=26

+T__27=27

+T__28=28

+T__29=29

+T__30=30

+T__31=31

+T__32=32

+T__33=33

+T__34=34

+T__35=35

+T__36=36

+T__37=37

+T__38=38

+T__39=39

+T__40=40

+T__41=41

+T__42=42

+T__43=43

+T__44=44

+T__45=45

+T__46=46

+T__47=47

+T__48=48

+T__49=49

+T__50=50

+T__51=51

+T__52=52

+T__53=53

+T__54=54

+T__55=55

+T__56=56

+T__57=57

+T__58=58

+T__59=59

+T__60=60

+T__61=61

+T__62=62

+T__63=63

+T__64=64

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSSLexer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSSLexer.java
new file mode 100644
index 00000000000..de6151ac446
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSSLexer.java
@@ -0,0 +1,2179 @@
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal;

+

+// Hack: Use our own Lexer superclass by means of import.

+// Currently there is no other way to specify the superclass for the lexer.

+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;

+

+import org.antlr.runtime.*;

+

+@SuppressWarnings("all")

+public class InternalCSSLexer extends Lexer {

+	public static final int T__64 = 64;

+	public static final int T__29 = 29;

+	public static final int T__28 = 28;

+	public static final int T__27 = 27;

+	public static final int T__62 = 62;

+	public static final int T__26 = 26;

+	public static final int T__63 = 63;

+	public static final int T__25 = 25;

+	public static final int T__24 = 24;

+	public static final int T__23 = 23;

+	public static final int RULE_INCLUDES = 4;

+	public static final int T__22 = 22;

+	public static final int T__21 = 21;

+	public static final int T__20 = 20;

+	public static final int RULE_ONE_INT = 16;

+	public static final int RULE_PERCENT = 9;

+	public static final int T__61 = 61;

+	public static final int EOF = -1;

+	public static final int T__60 = 60;

+	public static final int T__55 = 55;

+	public static final int T__56 = 56;

+	public static final int T__57 = 57;

+	public static final int T__58 = 58;

+	public static final int T__51 = 51;

+	public static final int T__52 = 52;

+	public static final int T__53 = 53;

+	public static final int T__54 = 54;

+	public static final int RULE_ONE_NON_HEX_LETTER = 15;

+	public static final int T__59 = 59;

+	public static final int T__50 = 50;

+	public static final int T__42 = 42;

+	public static final int T__43 = 43;

+	public static final int T__40 = 40;

+	public static final int T__41 = 41;

+	public static final int T__46 = 46;

+	public static final int T__47 = 47;

+	public static final int T__44 = 44;

+	public static final int T__45 = 45;

+	public static final int T__48 = 48;

+	public static final int T__49 = 49;

+	public static final int RULE_UNDERSCORE = 11;

+	public static final int RULE_PLUS = 7;

+	public static final int RULE_ONE_HEX_LETTER = 14;

+	public static final int RULE_COMMA = 8;

+	public static final int RULE_HASHMARK = 13;

+	public static final int RULE_ML_COMMENT = 19;

+	public static final int RULE_DASHMATCH = 5;

+	public static final int T__30 = 30;

+	public static final int T__31 = 31;

+	public static final int RULE_COLON = 12;

+	public static final int T__32 = 32;

+	public static final int T__33 = 33;

+	public static final int T__34 = 34;

+	public static final int T__35 = 35;

+	public static final int T__36 = 36;

+	public static final int T__37 = 37;

+	public static final int T__38 = 38;

+	public static final int T__39 = 39;

+	public static final int RULE_CSSSTRING = 6;

+	public static final int RULE_IMPORTANT_SYM = 18;

+	public static final int RULE_WS = 17;

+	public static final int RULE_DASH = 10;

+

+	// delegates

+	// delegators

+

+	public InternalCSSLexer() {

+		;

+	}

+

+	public InternalCSSLexer(CharStream input) {

+		this(input, new RecognizerSharedState());

+	}

+

+	public InternalCSSLexer(CharStream input, RecognizerSharedState state) {

+		super(input, state);

+

+	}

+

+	@Override

+	public String getGrammarFileName() {

+		return "../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g";

+	}

+

+	// $ANTLR start "T__20"

+	public final void mT__20() throws RecognitionException {

+		try {

+			int _type = T__20;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:11:7: ( '@charset' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:11:9: '@charset'

+			{

+				match("@charset");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__20"

+

+	// $ANTLR start "T__21"

+	public final void mT__21() throws RecognitionException {

+		try {

+			int _type = T__21;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:12:7: ( '@CHARSET' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:12:9: '@CHARSET'

+			{

+				match("@CHARSET");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__21"

+

+	// $ANTLR start "T__22"

+	public final void mT__22() throws RecognitionException {

+		try {

+			int _type = T__22;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:13:7: ( '@import' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:13:9: '@import'

+			{

+				match("@import");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__22"

+

+	// $ANTLR start "T__23"

+	public final void mT__23() throws RecognitionException {

+		try {

+			int _type = T__23;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:14:7: ( '@IMPORT' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:14:9: '@IMPORT'

+			{

+				match("@IMPORT");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__23"

+

+	// $ANTLR start "T__24"

+	public final void mT__24() throws RecognitionException {

+		try {

+			int _type = T__24;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:15:7: ( '@page' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:15:9: '@page'

+			{

+				match("@page");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__24"

+

+	// $ANTLR start "T__25"

+	public final void mT__25() throws RecognitionException {

+		try {

+			int _type = T__25;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:16:7: ( '@PAGE' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:16:9: '@PAGE'

+			{

+				match("@PAGE");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__25"

+

+	// $ANTLR start "T__26"

+	public final void mT__26() throws RecognitionException {

+		try {

+			int _type = T__26;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:17:7: ( '@media' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:17:9: '@media'

+			{

+				match("@media");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__26"

+

+	// $ANTLR start "T__27"

+	public final void mT__27() throws RecognitionException {

+		try {

+			int _type = T__27;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:18:7: ( '@MEDIA' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:18:9: '@MEDIA'

+			{

+				match("@MEDIA");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__27"

+

+	// $ANTLR start "T__28"

+	public final void mT__28() throws RecognitionException {

+		try {

+			int _type = T__28;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:19:7: ( '@font-face' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:19:9: '@font-face'

+			{

+				match("@font-face");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__28"

+

+	// $ANTLR start "T__29"

+	public final void mT__29() throws RecognitionException {

+		try {

+			int _type = T__29;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:20:7: ( '@FONT-FACE' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:20:9: '@FONT-FACE'

+			{

+				match("@FONT-FACE");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__29"

+

+	// $ANTLR start "T__30"

+	public final void mT__30() throws RecognitionException {

+		try {

+			int _type = T__30;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:21:7: ( '@keyframes' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:21:9: '@keyframes'

+			{

+				match("@keyframes");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__30"

+

+	// $ANTLR start "T__31"

+	public final void mT__31() throws RecognitionException {

+		try {

+			int _type = T__31;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:22:7: ( '@KEYFRAMES' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:22:9: '@KEYFRAMES'

+			{

+				match("@KEYFRAMES");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__31"

+

+	// $ANTLR start "T__32"

+	public final void mT__32() throws RecognitionException {

+		try {

+			int _type = T__32;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:23:7: ( '^=' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:23:9: '^='

+			{

+				match("^=");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__32"

+

+	// $ANTLR start "T__33"

+	public final void mT__33() throws RecognitionException {

+		try {

+			int _type = T__33;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:24:7: ( '$=' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:24:9: '$='

+			{

+				match("$=");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__33"

+

+	// $ANTLR start "T__34"

+	public final void mT__34() throws RecognitionException {

+		try {

+			int _type = T__34;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:25:7: ( '*=' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:25:9: '*='

+			{

+				match("*=");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__34"

+

+	// $ANTLR start "T__35"

+	public final void mT__35() throws RecognitionException {

+		try {

+			int _type = T__35;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:26:7: ( '=' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:26:9: '='

+			{

+				match('=');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__35"

+

+	// $ANTLR start "T__36"

+	public final void mT__36() throws RecognitionException {

+		try {

+			int _type = T__36;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:27:7: ( '*' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:27:9: '*'

+			{

+				match('*');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__36"

+

+	// $ANTLR start "T__37"

+	public final void mT__37() throws RecognitionException {

+		try {

+			int _type = T__37;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:28:7: ( '>' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:28:9: '>'

+			{

+				match('>');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__37"

+

+	// $ANTLR start "T__38"

+	public final void mT__38() throws RecognitionException {

+		try {

+			int _type = T__38;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:29:7: ( '~' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:29:9: '~'

+			{

+				match('~');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__38"

+

+	// $ANTLR start "T__39"

+	public final void mT__39() throws RecognitionException {

+		try {

+			int _type = T__39;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:30:7: ( '.' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:30:9: '.'

+			{

+				match('.');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__39"

+

+	// $ANTLR start "T__40"

+	public final void mT__40() throws RecognitionException {

+		try {

+			int _type = T__40;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:31:7: ( '/' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:31:9: '/'

+			{

+				match('/');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__40"

+

+	// $ANTLR start "T__41"

+	public final void mT__41() throws RecognitionException {

+		try {

+			int _type = T__41;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:32:7: ( '?' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:32:9: '?'

+			{

+				match('?');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__41"

+

+	// $ANTLR start "T__42"

+	public final void mT__42() throws RecognitionException {

+		try {

+			int _type = T__42;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:33:7: ( '[' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:33:9: '['

+			{

+				match('[');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__42"

+

+	// $ANTLR start "T__43"

+	public final void mT__43() throws RecognitionException {

+		try {

+			int _type = T__43;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:34:7: ( ']' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:34:9: ']'

+			{

+				match(']');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__43"

+

+	// $ANTLR start "T__44"

+	public final void mT__44() throws RecognitionException {

+		try {

+			int _type = T__44;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:35:7: ( '@' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:35:9: '@'

+			{

+				match('@');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__44"

+

+	// $ANTLR start "T__45"

+	public final void mT__45() throws RecognitionException {

+		try {

+			int _type = T__45;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:36:7: ( '!' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:36:9: '!'

+			{

+				match('!');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__45"

+

+	// $ANTLR start "T__46"

+	public final void mT__46() throws RecognitionException {

+		try {

+			int _type = T__46;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:37:7: ( '$' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:37:9: '$'

+			{

+				match('$');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__46"

+

+	// $ANTLR start "T__47"

+	public final void mT__47() throws RecognitionException {

+		try {

+			int _type = T__47;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:38:7: ( '&' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:38:9: '&'

+			{

+				match('&');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__47"

+

+	// $ANTLR start "T__48"

+	public final void mT__48() throws RecognitionException {

+		try {

+			int _type = T__48;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:39:7: ( ';' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:39:9: ';'

+			{

+				match(';');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__48"

+

+	// $ANTLR start "T__49"

+	public final void mT__49() throws RecognitionException {

+		try {

+			int _type = T__49;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:40:7: ( 'not' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:40:9: 'not'

+			{

+				match("not");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__49"

+

+	// $ANTLR start "T__50"

+	public final void mT__50() throws RecognitionException {

+		try {

+			int _type = T__50;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:41:7: ( 'no' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:41:9: 'no'

+			{

+				match("no");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__50"

+

+	// $ANTLR start "T__51"

+	public final void mT__51() throws RecognitionException {

+		try {

+			int _type = T__51;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:42:7: ( 'url' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:42:9: 'url'

+			{

+				match("url");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__51"

+

+	// $ANTLR start "T__52"

+	public final void mT__52() throws RecognitionException {

+		try {

+			int _type = T__52;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:43:7: ( 'ur' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:43:9: 'ur'

+			{

+				match("ur");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__52"

+

+	// $ANTLR start "T__53"

+	public final void mT__53() throws RecognitionException {

+		try {

+			int _type = T__53;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:44:7: ( '\\\\ ' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:44:9: '\\\\ '

+			{

+				match("\\ ");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__53"

+

+	// $ANTLR start "T__54"

+	public final void mT__54() throws RecognitionException {

+		try {

+			int _type = T__54;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:45:7: ( '\\\\(' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:45:9: '\\\\('

+			{

+				match("\\(");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__54"

+

+	// $ANTLR start "T__55"

+	public final void mT__55() throws RecognitionException {

+		try {

+			int _type = T__55;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:46:7: ( '\\\\)' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:46:9: '\\\\)'

+			{

+				match("\\)");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__55"

+

+	// $ANTLR start "T__56"

+	public final void mT__56() throws RecognitionException {

+		try {

+			int _type = T__56;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:47:7: ( '\\\\\\'' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:47:9: '\\\\\\''

+			{

+				match("\\'");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__56"

+

+	// $ANTLR start "T__57"

+	public final void mT__57() throws RecognitionException {

+		try {

+			int _type = T__57;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:48:7: ( '\\\\\"' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:48:9: '\\\\\"'

+			{

+				match("\\\"");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__57"

+

+	// $ANTLR start "T__58"

+	public final void mT__58() throws RecognitionException {

+		try {

+			int _type = T__58;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:49:7: ( '{' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:49:9: '{'

+			{

+				match('{');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__58"

+

+	// $ANTLR start "T__59"

+	public final void mT__59() throws RecognitionException {

+		try {

+			int _type = T__59;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:50:7: ( '}' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:50:9: '}'

+			{

+				match('}');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__59"

+

+	// $ANTLR start "T__60"

+	public final void mT__60() throws RecognitionException {

+		try {

+			int _type = T__60;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:51:7: ( '|' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:51:9: '|'

+			{

+				match('|');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__60"

+

+	// $ANTLR start "T__61"

+	public final void mT__61() throws RecognitionException {

+		try {

+			int _type = T__61;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:52:7: ( ')' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:52:9: ')'

+			{

+				match(')');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__61"

+

+	// $ANTLR start "T__62"

+	public final void mT__62() throws RecognitionException {

+		try {

+			int _type = T__62;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:53:7: ( '(' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:53:9: '('

+			{

+				match('(');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__62"

+

+	// $ANTLR start "T__63"

+	public final void mT__63() throws RecognitionException {

+		try {

+			int _type = T__63;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:54:7: ( 'not(' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:54:9: 'not('

+			{

+				match("not(");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__63"

+

+	// $ANTLR start "T__64"

+	public final void mT__64() throws RecognitionException {

+		try {

+			int _type = T__64;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:55:7: ( 'url(' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:55:9: 'url('

+			{

+				match("url(");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__64"

+

+	// $ANTLR start "RULE_IMPORTANT_SYM"

+	public final void mRULE_IMPORTANT_SYM() throws RecognitionException {

+		try {

+			int _type = RULE_IMPORTANT_SYM;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8942:20: ( '!important' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8942:22: '!important'

+			{

+				match("!important");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_IMPORTANT_SYM"

+

+	// $ANTLR start "RULE_ONE_INT"

+	public final void mRULE_ONE_INT() throws RecognitionException {

+		try {

+			int _type = RULE_ONE_INT;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8944:14: ( '0' .. '9' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8944:16: '0' .. '9'

+			{

+				matchRange('0', '9');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_ONE_INT"

+

+	// $ANTLR start "RULE_ONE_HEX_LETTER"

+	public final void mRULE_ONE_HEX_LETTER() throws RecognitionException {

+		try {

+			int _type = RULE_ONE_HEX_LETTER;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8946:21: ( ( 'a' .. 'f' | 'A' .. 'F' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8946:23: ( 'a' .. 'f' | 'A' .. 'F' )

+			{

+				if ((input.LA(1) >= 'A' && input.LA(1) <= 'F') || (input.LA(1) >= 'a' && input.LA(1) <= 'f')) {

+					input.consume();

+

+				}

+				else {

+					MismatchedSetException mse = new MismatchedSetException(null, input);

+					recover(mse);

+					throw mse;

+				}

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_ONE_HEX_LETTER"

+

+	// $ANTLR start "RULE_ONE_NON_HEX_LETTER"

+	public final void mRULE_ONE_NON_HEX_LETTER() throws RecognitionException {

+		try {

+			int _type = RULE_ONE_NON_HEX_LETTER;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8948:25: ( ( 'g' .. 'z' | 'G' .. 'Z' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8948:27: ( 'g' .. 'z' | 'G' .. 'Z' )

+			{

+				if ((input.LA(1) >= 'G' && input.LA(1) <= 'Z') || (input.LA(1) >= 'g' && input.LA(1) <= 'z')) {

+					input.consume();

+

+				}

+				else {

+					MismatchedSetException mse = new MismatchedSetException(null, input);

+					recover(mse);

+					throw mse;

+				}

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_ONE_NON_HEX_LETTER"

+

+	// $ANTLR start "RULE_UNDERSCORE"

+	public final void mRULE_UNDERSCORE() throws RecognitionException {

+		try {

+			int _type = RULE_UNDERSCORE;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8950:17: ( '_' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8950:19: '_'

+			{

+				match('_');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_UNDERSCORE"

+

+	// $ANTLR start "RULE_DASH"

+	public final void mRULE_DASH() throws RecognitionException {

+		try {

+			int _type = RULE_DASH;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8952:11: ( '-' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8952:13: '-'

+			{

+				match('-');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_DASH"

+

+	// $ANTLR start "RULE_PLUS"

+	public final void mRULE_PLUS() throws RecognitionException {

+		try {

+			int _type = RULE_PLUS;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8954:11: ( '+' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8954:13: '+'

+			{

+				match('+');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_PLUS"

+

+	// $ANTLR start "RULE_HASHMARK"

+	public final void mRULE_HASHMARK() throws RecognitionException {

+		try {

+			int _type = RULE_HASHMARK;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8956:15: ( '#' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8956:17: '#'

+			{

+				match('#');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_HASHMARK"

+

+	// $ANTLR start "RULE_COMMA"

+	public final void mRULE_COMMA() throws RecognitionException {

+		try {

+			int _type = RULE_COMMA;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8958:12: ( ',' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8958:14: ','

+			{

+				match(',');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_COMMA"

+

+	// $ANTLR start "RULE_PERCENT"

+	public final void mRULE_PERCENT() throws RecognitionException {

+		try {

+			int _type = RULE_PERCENT;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8960:14: ( '%' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8960:16: '%'

+			{

+				match('%');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_PERCENT"

+

+	// $ANTLR start "RULE_ML_COMMENT"

+	public final void mRULE_ML_COMMENT() throws RecognitionException {

+		try {

+			int _type = RULE_ML_COMMENT;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8962:17: ( '/*' ( options {greedy=false; } : . )* '*/' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8962:19: '/*' ( options {greedy=false; } : . )* '*/'

+			{

+				match("/*");

+

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8962:24: ( options {greedy=false; } : . )*

+				loop1: do {

+					int alt1 = 2;

+					int LA1_0 = input.LA(1);

+

+					if ((LA1_0 == '*')) {

+						int LA1_1 = input.LA(2);

+

+						if ((LA1_1 == '/')) {

+							alt1 = 2;

+						}

+						else if (((LA1_1 >= '\u0000' && LA1_1 <= '.') || (LA1_1 >= '0' && LA1_1 <= '\uFFFF'))) {

+							alt1 = 1;

+						}

+

+

+					}

+					else if (((LA1_0 >= '\u0000' && LA1_0 <= ')') || (LA1_0 >= '+' && LA1_0 <= '\uFFFF'))) {

+						alt1 = 1;

+					}

+

+

+					switch (alt1) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8962:52: .

+					{

+						matchAny();

+

+					}

+						break;

+

+					default:

+						break loop1;

+					}

+				} while (true);

+

+				match("*/");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_ML_COMMENT"

+

+	// $ANTLR start "RULE_WS"

+	public final void mRULE_WS() throws RecognitionException {

+		try {

+			int _type = RULE_WS;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8964:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8964:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8964:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

+				int cnt2 = 0;

+				loop2: do {

+					int alt2 = 2;

+					int LA2_0 = input.LA(1);

+

+					if (((LA2_0 >= '\t' && LA2_0 <= '\n') || LA2_0 == '\r' || LA2_0 == ' ')) {

+						alt2 = 1;

+					}

+

+

+					switch (alt2) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:

+					{

+						if ((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') {

+							input.consume();

+

+						}

+						else {

+							MismatchedSetException mse = new MismatchedSetException(null, input);

+							recover(mse);

+							throw mse;

+						}

+

+

+					}

+						break;

+

+					default:

+						if (cnt2 >= 1) {

+							break loop2;

+						}

+						EarlyExitException eee =

+								new EarlyExitException(2, input);

+						throw eee;

+					}

+					cnt2++;

+				} while (true);

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_WS"

+

+	// $ANTLR start "RULE_CSSSTRING"

+	public final void mRULE_CSSSTRING() throws RecognitionException {

+		try {

+			int _type = RULE_CSSSTRING;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8966:16: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' ..

+			// 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8966:18: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f'

+			// | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8966:18: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' ..

+				// 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

+				int alt5 = 2;

+				int LA5_0 = input.LA(1);

+

+				if ((LA5_0 == '\"')) {

+					alt5 = 1;

+				}

+				else if ((LA5_0 == '\'')) {

+					alt5 = 2;

+				}

+				else {

+					NoViableAltException nvae =

+							new NoViableAltException("", 5, 0, input);

+

+					throw nvae;

+				}

+				switch (alt5) {

+				case 1:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8966:19: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' ..

+				// 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'

+				{

+					match('\"');

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8966:23: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' ..

+					// 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*

+					loop3: do {

+						int alt3 = 3;

+						int LA3_0 = input.LA(1);

+

+						if ((LA3_0 == '\\')) {

+							alt3 = 1;

+						}

+						else if (((LA3_0 >= '\u0000' && LA3_0 <= '!') || (LA3_0 >= '#' && LA3_0 <= '[') || (LA3_0 >= ']' && LA3_0 <= '\uFFFF'))) {

+							alt3 = 2;

+						}

+

+

+						switch (alt3) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8966:24: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' ..

+						// 'f' | 'A' .. 'F' | '\\\\' )

+						{

+							match('\\');

+							if (input.LA(1) == '\"' || input.LA(1) == '\'' || (input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'F') || input.LA(1) == '\\' || (input.LA(1) >= 'a' && input.LA(1) <= 'f') || input.LA(1) == 'n'

+									|| input.LA(1) == 'r' || (input.LA(1) >= 't' && input.LA(1) <= 'u')) {

+								input.consume();

+

+							}

+							else {

+								MismatchedSetException mse = new MismatchedSetException(null, input);

+								recover(mse);

+								throw mse;

+							}

+

+

+						}

+							break;

+						case 2:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8966:96: ~ ( ( '\\\\' | '\"' ) )

+						{

+							if ((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) {

+								input.consume();

+

+							}

+							else {

+								MismatchedSetException mse = new MismatchedSetException(null, input);

+								recover(mse);

+								throw mse;

+							}

+

+

+						}

+							break;

+

+						default:

+							break loop3;

+						}

+					} while (true);

+

+					match('\"');

+

+				}

+					break;

+				case 2:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8966:116: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' ..

+				// 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''

+				{

+					match('\'');

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8966:121: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' ..

+					// 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*

+					loop4: do {

+						int alt4 = 3;

+						int LA4_0 = input.LA(1);

+

+						if ((LA4_0 == '\\')) {

+							alt4 = 1;

+						}

+						else if (((LA4_0 >= '\u0000' && LA4_0 <= '&') || (LA4_0 >= '(' && LA4_0 <= '[') || (LA4_0 >= ']' && LA4_0 <= '\uFFFF'))) {

+							alt4 = 2;

+						}

+

+

+						switch (alt4) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8966:122: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' ..

+						// 'f' | 'A' .. 'F' | '\\\\' )

+						{

+							match('\\');

+							if (input.LA(1) == '\"' || input.LA(1) == '\'' || (input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'F') || input.LA(1) == '\\' || (input.LA(1) >= 'a' && input.LA(1) <= 'f') || input.LA(1) == 'n'

+									|| input.LA(1) == 'r' || (input.LA(1) >= 't' && input.LA(1) <= 'u')) {

+								input.consume();

+

+							}

+							else {

+								MismatchedSetException mse = new MismatchedSetException(null, input);

+								recover(mse);

+								throw mse;

+							}

+

+

+						}

+							break;

+						case 2:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8966:194: ~ ( ( '\\\\' | '\\'' ) )

+						{

+							if ((input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) {

+								input.consume();

+

+							}

+							else {

+								MismatchedSetException mse = new MismatchedSetException(null, input);

+								recover(mse);

+								throw mse;

+							}

+

+

+						}

+							break;

+

+						default:

+							break loop4;

+						}

+					} while (true);

+

+					match('\'');

+

+				}

+					break;

+

+				}

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_CSSSTRING"

+

+	// $ANTLR start "RULE_INCLUDES"

+	public final void mRULE_INCLUDES() throws RecognitionException {

+		try {

+			int _type = RULE_INCLUDES;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8968:15: ( '~=' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8968:17: '~='

+			{

+				match("~=");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_INCLUDES"

+

+	// $ANTLR start "RULE_DASHMATCH"

+	public final void mRULE_DASHMATCH() throws RecognitionException {

+		try {

+			int _type = RULE_DASHMATCH;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8970:16: ( '|=' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8970:18: '|='

+			{

+				match("|=");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_DASHMATCH"

+

+	// $ANTLR start "RULE_COLON"

+	public final void mRULE_COLON() throws RecognitionException {

+		try {

+			int _type = RULE_COLON;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8972:12: ( ':' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8972:14: ':'

+			{

+				match(':');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_COLON"

+

+	@Override

+	public void mTokens() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:8: ( T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 |

+		// T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 |

+		// T__63 | T__64 | RULE_IMPORTANT_SYM | RULE_ONE_INT | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_UNDERSCORE | RULE_DASH | RULE_PLUS | RULE_HASHMARK | RULE_COMMA | RULE_PERCENT | RULE_ML_COMMENT | RULE_WS | RULE_CSSSTRING | RULE_INCLUDES |

+		// RULE_DASHMATCH | RULE_COLON )

+		int alt6 = 61;

+		alt6 = dfa6.predict(input);

+		switch (alt6) {

+		case 1:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:10: T__20

+		{

+			mT__20();

+

+		}

+			break;

+		case 2:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:16: T__21

+		{

+			mT__21();

+

+		}

+			break;

+		case 3:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:22: T__22

+		{

+			mT__22();

+

+		}

+			break;

+		case 4:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:28: T__23

+		{

+			mT__23();

+

+		}

+			break;

+		case 5:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:34: T__24

+		{

+			mT__24();

+

+		}

+			break;

+		case 6:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:40: T__25

+		{

+			mT__25();

+

+		}

+			break;

+		case 7:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:46: T__26

+		{

+			mT__26();

+

+		}

+			break;

+		case 8:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:52: T__27

+		{

+			mT__27();

+

+		}

+			break;

+		case 9:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:58: T__28

+		{

+			mT__28();

+

+		}

+			break;

+		case 10:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:64: T__29

+		{

+			mT__29();

+

+		}

+			break;

+		case 11:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:70: T__30

+		{

+			mT__30();

+

+		}

+			break;

+		case 12:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:76: T__31

+		{

+			mT__31();

+

+		}

+			break;

+		case 13:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:82: T__32

+		{

+			mT__32();

+

+		}

+			break;

+		case 14:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:88: T__33

+		{

+			mT__33();

+

+		}

+			break;

+		case 15:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:94: T__34

+		{

+			mT__34();

+

+		}

+			break;

+		case 16:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:100: T__35

+		{

+			mT__35();

+

+		}

+			break;

+		case 17:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:106: T__36

+		{

+			mT__36();

+

+		}

+			break;

+		case 18:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:112: T__37

+		{

+			mT__37();

+

+		}

+			break;

+		case 19:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:118: T__38

+		{

+			mT__38();

+

+		}

+			break;

+		case 20:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:124: T__39

+		{

+			mT__39();

+

+		}

+			break;

+		case 21:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:130: T__40

+		{

+			mT__40();

+

+		}

+			break;

+		case 22:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:136: T__41

+		{

+			mT__41();

+

+		}

+			break;

+		case 23:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:142: T__42

+		{

+			mT__42();

+

+		}

+			break;

+		case 24:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:148: T__43

+		{

+			mT__43();

+

+		}

+			break;

+		case 25:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:154: T__44

+		{

+			mT__44();

+

+		}

+			break;

+		case 26:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:160: T__45

+		{

+			mT__45();

+

+		}

+			break;

+		case 27:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:166: T__46

+		{

+			mT__46();

+

+		}

+			break;

+		case 28:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:172: T__47

+		{

+			mT__47();

+

+		}

+			break;

+		case 29:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:178: T__48

+		{

+			mT__48();

+

+		}

+			break;

+		case 30:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:184: T__49

+		{

+			mT__49();

+

+		}

+			break;

+		case 31:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:190: T__50

+		{

+			mT__50();

+

+		}

+			break;

+		case 32:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:196: T__51

+		{

+			mT__51();

+

+		}

+			break;

+		case 33:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:202: T__52

+		{

+			mT__52();

+

+		}

+			break;

+		case 34:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:208: T__53

+		{

+			mT__53();

+

+		}

+			break;

+		case 35:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:214: T__54

+		{

+			mT__54();

+

+		}

+			break;

+		case 36:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:220: T__55

+		{

+			mT__55();

+

+		}

+			break;

+		case 37:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:226: T__56

+		{

+			mT__56();

+

+		}

+			break;

+		case 38:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:232: T__57

+		{

+			mT__57();

+

+		}

+			break;

+		case 39:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:238: T__58

+		{

+			mT__58();

+

+		}

+			break;

+		case 40:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:244: T__59

+		{

+			mT__59();

+

+		}

+			break;

+		case 41:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:250: T__60

+		{

+			mT__60();

+

+		}

+			break;

+		case 42:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:256: T__61

+		{

+			mT__61();

+

+		}

+			break;

+		case 43:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:262: T__62

+		{

+			mT__62();

+

+		}

+			break;

+		case 44:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:268: T__63

+		{

+			mT__63();

+

+		}

+			break;

+		case 45:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:274: T__64

+		{

+			mT__64();

+

+		}

+			break;

+		case 46:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:280: RULE_IMPORTANT_SYM

+		{

+			mRULE_IMPORTANT_SYM();

+

+		}

+			break;

+		case 47:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:299: RULE_ONE_INT

+		{

+			mRULE_ONE_INT();

+

+		}

+			break;

+		case 48:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:312: RULE_ONE_HEX_LETTER

+		{

+			mRULE_ONE_HEX_LETTER();

+

+		}

+			break;

+		case 49:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:332: RULE_ONE_NON_HEX_LETTER

+		{

+			mRULE_ONE_NON_HEX_LETTER();

+

+		}

+			break;

+		case 50:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:356: RULE_UNDERSCORE

+		{

+			mRULE_UNDERSCORE();

+

+		}

+			break;

+		case 51:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:372: RULE_DASH

+		{

+			mRULE_DASH();

+

+		}

+			break;

+		case 52:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:382: RULE_PLUS

+		{

+			mRULE_PLUS();

+

+		}

+			break;

+		case 53:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:392: RULE_HASHMARK

+		{

+			mRULE_HASHMARK();

+

+		}

+			break;

+		case 54:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:406: RULE_COMMA

+		{

+			mRULE_COMMA();

+

+		}

+			break;

+		case 55:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:417: RULE_PERCENT

+		{

+			mRULE_PERCENT();

+

+		}

+			break;

+		case 56:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:430: RULE_ML_COMMENT

+		{

+			mRULE_ML_COMMENT();

+

+		}

+			break;

+		case 57:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:446: RULE_WS

+		{

+			mRULE_WS();

+

+		}

+			break;

+		case 58:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:454: RULE_CSSSTRING

+		{

+			mRULE_CSSSTRING();

+

+		}

+			break;

+		case 59:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:469: RULE_INCLUDES

+		{

+			mRULE_INCLUDES();

+

+		}

+			break;

+		case 60:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:483: RULE_DASHMATCH

+		{

+			mRULE_DASHMATCH();

+

+		}

+			break;

+		case 61:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1:498: RULE_COLON

+		{

+			mRULE_COLON();

+

+		}

+			break;

+

+		}

+

+	}

+

+

+	protected DFA6 dfa6 = new DFA6(this);

+	static final String DFA6_eotS =

+			"\1\uffff\1\60\1\uffff\1\62\1\64\2\uffff\1\66\1\uffff\1\70\3\uffff" +

+					"\1\72\2\uffff\2\32\3\uffff\1\103\45\uffff\1\105\1\107\7\uffff\1" +

+					"\111\1\uffff\1\113\5\uffff";

+	static final String DFA6_eofS =

+			"\114\uffff";

+	static final String DFA6_minS =

+			"\1\11\1\103\1\uffff\2\75\2\uffff\1\75\1\uffff\1\52\3\uffff\1\151" +

+					"\2\uffff\1\157\1\162\1\40\2\uffff\1\75\45\uffff\1\164\1\154\7\uffff" +

+					"\1\50\1\uffff\1\50\5\uffff";

+	static final String DFA6_maxS =

+			"\1\176\1\160\1\uffff\2\75\2\uffff\1\75\1\uffff\1\52\3\uffff\1\151" +

+					"\2\uffff\1\157\1\162\1\51\2\uffff\1\75\45\uffff\1\164\1\154\7\uffff" +

+					"\1\50\1\uffff\1\50\5\uffff";

+	static final String DFA6_acceptS =

+			"\2\uffff\1\15\2\uffff\1\20\1\22\1\uffff\1\24\1\uffff\1\26\1\27" +

+					"\1\30\1\uffff\1\34\1\35\3\uffff\1\47\1\50\1\uffff\1\52\1\53\1\57" +

+					"\1\60\1\61\1\62\1\63\1\64\1\65\1\66\1\67\1\71\1\72\1\75\1\1\1\2" +

+					"\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\31\1\16\1\33\1\17" +

+					"\1\21\1\73\1\23\1\70\1\25\1\56\1\32\2\uffff\1\42\1\43\1\44\1\45" +

+					"\1\46\1\74\1\51\1\uffff\1\37\1\uffff\1\41\1\54\1\36\1\55\1\40";

+	static final String DFA6_specialS =

+			"\114\uffff}>";

+	static final String[] DFA6_transitionS = {

+			"\2\41\2\uffff\1\41\22\uffff\1\41\1\15\1\42\1\36\1\3\1\40\1" +

+					"\16\1\42\1\27\1\26\1\4\1\35\1\37\1\34\1\10\1\11\12\30\1\43\1" +

+					"\17\1\uffff\1\5\1\6\1\12\1\1\6\31\24\32\1\13\1\22\1\14\1\2\1" +

+					"\33\1\uffff\6\31\7\32\1\20\6\32\1\21\5\32\1\23\1\25\1\24\1\7",

+			"\1\45\2\uffff\1\55\2\uffff\1\47\1\uffff\1\57\1\uffff\1\53" +

+					"\2\uffff\1\51\22\uffff\1\44\2\uffff\1\54\2\uffff\1\46\1\uffff" +

+					"\1\56\1\uffff\1\52\2\uffff\1\50",

+			"",

+			"\1\61",

+			"\1\63",

+			"",

+			"",

+			"\1\65",

+			"",

+			"\1\67",

+			"",

+			"",

+			"",

+			"\1\71",

+			"",

+			"",

+			"\1\73",

+			"\1\74",

+			"\1\75\1\uffff\1\101\4\uffff\1\100\1\76\1\77",

+			"",

+			"",

+			"\1\102",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"\1\104",

+			"\1\106",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"\1\110",

+			"",

+			"\1\112",

+			"",

+			"",

+			"",

+			"",

+			""

+	};

+

+	static final short[] DFA6_eot = DFA.unpackEncodedString(DFA6_eotS);

+	static final short[] DFA6_eof = DFA.unpackEncodedString(DFA6_eofS);

+	static final char[] DFA6_min = DFA.unpackEncodedStringToUnsignedChars(DFA6_minS);

+	static final char[] DFA6_max = DFA.unpackEncodedStringToUnsignedChars(DFA6_maxS);

+	static final short[] DFA6_accept = DFA.unpackEncodedString(DFA6_acceptS);

+	static final short[] DFA6_special = DFA.unpackEncodedString(DFA6_specialS);

+	static final short[][] DFA6_transition;

+

+	static {

+		int numStates = DFA6_transitionS.length;

+		DFA6_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA6_transition[i] = DFA.unpackEncodedString(DFA6_transitionS[i]);

+		}

+	}

+

+	class DFA6 extends DFA {

+

+		public DFA6(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 6;

+			this.eot = DFA6_eot;

+			this.eof = DFA6_eof;

+			this.min = DFA6_min;

+			this.max = DFA6_max;

+			this.accept = DFA6_accept;

+			this.special = DFA6_special;

+			this.transition = DFA6_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "1:1: Tokens : ( T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | RULE_IMPORTANT_SYM | RULE_ONE_INT | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_UNDERSCORE | RULE_DASH | RULE_PLUS | RULE_HASHMARK | RULE_COMMA | RULE_PERCENT | RULE_ML_COMMENT | RULE_WS | RULE_CSSSTRING | RULE_INCLUDES | RULE_DASHMATCH | RULE_COLON );";

+		}

+	}

+

+

+}
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSSParser.java
new file mode 100644
index 00000000000..41fb15f7c12
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSSParser.java
@@ -0,0 +1,29629 @@
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal;

+

+import org.eclipse.xtext.*;

+import org.eclipse.xtext.parser.antlr.XtextTokenStream;

+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;

+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;

+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.DFA;

+import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;

+

+import org.antlr.runtime.*;

+

+@SuppressWarnings("all")

+public class InternalCSSParser extends AbstractInternalContentAssistParser {

+	public static final String[] tokenNames = new String[] {

+			"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INCLUDES", "RULE_DASHMATCH", "RULE_CSSSTRING", "RULE_PLUS", "RULE_COMMA", "RULE_PERCENT", "RULE_DASH", "RULE_UNDERSCORE", "RULE_COLON", "RULE_HASHMARK", "RULE_ONE_HEX_LETTER",

+			"RULE_ONE_NON_HEX_LETTER", "RULE_ONE_INT", "RULE_WS", "RULE_IMPORTANT_SYM", "RULE_ML_COMMENT", "'@charset'", "'@CHARSET'", "'@import'", "'@IMPORT'", "'@page'", "'@PAGE'", "'@media'", "'@MEDIA'", "'@font-face'", "'@FONT-FACE'", "'@keyframes'",

+			"'@KEYFRAMES'", "'^='", "'$='", "'*='", "'='", "'*'", "'>'", "'~'", "'.'", "'/'", "'?'", "'['", "']'", "'@'", "'!'", "'$'", "'&'", "';'", "'not'", "'no'", "'url'", "'ur'", "'\\\\ '", "'\\\\('", "'\\\\)'", "'\\\\\\''", "'\\\\\"'", "'{'", "'}'",

+			"'|'", "')'", "'('", "'not('", "'url('"

+	};

+	public static final int T__64 = 64;

+	public static final int T__29 = 29;

+	public static final int T__28 = 28;

+	public static final int T__62 = 62;

+	public static final int T__27 = 27;

+	public static final int T__63 = 63;

+	public static final int T__26 = 26;

+	public static final int T__25 = 25;

+	public static final int T__24 = 24;

+	public static final int RULE_INCLUDES = 4;

+	public static final int T__23 = 23;

+	public static final int T__22 = 22;

+	public static final int T__21 = 21;

+	public static final int T__20 = 20;

+	public static final int RULE_ONE_INT = 16;

+	public static final int RULE_PERCENT = 9;

+	public static final int T__61 = 61;

+	public static final int T__60 = 60;

+	public static final int EOF = -1;

+	public static final int T__55 = 55;

+	public static final int T__56 = 56;

+	public static final int T__57 = 57;

+	public static final int T__58 = 58;

+	public static final int T__51 = 51;

+	public static final int T__52 = 52;

+	public static final int T__53 = 53;

+	public static final int T__54 = 54;

+	public static final int RULE_ONE_NON_HEX_LETTER = 15;

+	public static final int T__59 = 59;

+	public static final int T__50 = 50;

+	public static final int T__42 = 42;

+	public static final int T__43 = 43;

+	public static final int T__40 = 40;

+	public static final int T__41 = 41;

+	public static final int T__46 = 46;

+	public static final int T__47 = 47;

+	public static final int T__44 = 44;

+	public static final int T__45 = 45;

+	public static final int T__48 = 48;

+	public static final int T__49 = 49;

+	public static final int RULE_UNDERSCORE = 11;

+	public static final int RULE_PLUS = 7;

+	public static final int RULE_ONE_HEX_LETTER = 14;

+	public static final int RULE_COMMA = 8;

+	public static final int RULE_HASHMARK = 13;

+	public static final int RULE_ML_COMMENT = 19;

+	public static final int RULE_DASHMATCH = 5;

+	public static final int T__30 = 30;

+	public static final int RULE_COLON = 12;

+	public static final int T__31 = 31;

+	public static final int T__32 = 32;

+	public static final int T__33 = 33;

+	public static final int T__34 = 34;

+	public static final int T__35 = 35;

+	public static final int T__36 = 36;

+	public static final int T__37 = 37;

+	public static final int T__38 = 38;

+	public static final int T__39 = 39;

+	public static final int RULE_CSSSTRING = 6;

+	public static final int RULE_IMPORTANT_SYM = 18;

+	public static final int RULE_WS = 17;

+	public static final int RULE_DASH = 10;

+

+	// delegates

+	// delegators

+

+

+	public InternalCSSParser(TokenStream input) {

+		this(input, new RecognizerSharedState());

+	}

+

+	public InternalCSSParser(TokenStream input, RecognizerSharedState state) {

+		super(input, state);

+

+	}

+

+

+	@Override

+	public String[] getTokenNames() {

+		return InternalCSSParser.tokenNames;

+	}

+

+	@Override

+	public String getGrammarFileName() {

+		return "../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g";

+	}

+

+

+

+	private CSSGrammarAccess grammarAccess;

+

+	public void setGrammarAccess(CSSGrammarAccess grammarAccess) {

+		this.grammarAccess = grammarAccess;

+	}

+

+	@Override

+	protected Grammar getGrammar() {

+		return grammarAccess.getGrammar();

+	}

+

+	@Override

+	protected String getValueForTokenName(String tokenName) {

+		return tokenName;

+	}

+

+

+

+

+	// $ANTLR start "entryRulestylesheet"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:61:1: entryRulestylesheet : rulestylesheet EOF ;

+	public final void entryRulestylesheet() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:62:1: ( rulestylesheet EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:63:1: rulestylesheet EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getStylesheetRule());

+				}

+				pushFollow(FOLLOW_rulestylesheet_in_entryRulestylesheet67);

+				rulestylesheet();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getStylesheetRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulestylesheet74);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulestylesheet"

+

+

+	// $ANTLR start "rulestylesheet"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:70:1: rulestylesheet : ( ( rule__Stylesheet__Group__0 ) ) ;

+	public final void rulestylesheet() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:74:2: ( ( ( rule__Stylesheet__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:75:1: ( ( rule__Stylesheet__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:75:1: ( ( rule__Stylesheet__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:76:1: ( rule__Stylesheet__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:77:1: ( rule__Stylesheet__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:77:2: rule__Stylesheet__Group__0

+					{

+						pushFollow(FOLLOW_rule__Stylesheet__Group__0_in_rulestylesheet100);

+						rule__Stylesheet__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulestylesheet"

+

+

+	// $ANTLR start "entryRulecharset"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:89:1: entryRulecharset : rulecharset EOF ;

+	public final void entryRulecharset() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:90:1: ( rulecharset EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:91:1: rulecharset EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getCharsetRule());

+				}

+				pushFollow(FOLLOW_rulecharset_in_entryRulecharset127);

+				rulecharset();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getCharsetRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulecharset134);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulecharset"

+

+

+	// $ANTLR start "rulecharset"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:98:1: rulecharset : ( ( rule__Charset__Group__0 ) ) ;

+	public final void rulecharset() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:102:2: ( ( ( rule__Charset__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:103:1: ( ( rule__Charset__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:103:1: ( ( rule__Charset__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:104:1: ( rule__Charset__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCharsetAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:105:1: ( rule__Charset__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:105:2: rule__Charset__Group__0

+					{

+						pushFollow(FOLLOW_rule__Charset__Group__0_in_rulecharset160);

+						rule__Charset__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCharsetAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulecharset"

+

+

+	// $ANTLR start "entryRuleimportExpression"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:117:1: entryRuleimportExpression : ruleimportExpression EOF ;

+	public final void entryRuleimportExpression() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:118:1: ( ruleimportExpression EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:119:1: ruleimportExpression EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getImportExpressionRule());

+				}

+				pushFollow(FOLLOW_ruleimportExpression_in_entryRuleimportExpression187);

+				ruleimportExpression();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getImportExpressionRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleimportExpression194);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleimportExpression"

+

+

+	// $ANTLR start "ruleimportExpression"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:126:1: ruleimportExpression : ( ( rule__ImportExpression__Group__0 ) ) ;

+	public final void ruleimportExpression() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:130:2: ( ( ( rule__ImportExpression__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:131:1: ( ( rule__ImportExpression__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:131:1: ( ( rule__ImportExpression__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:132:1: ( rule__ImportExpression__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getImportExpressionAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:133:1: ( rule__ImportExpression__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:133:2: rule__ImportExpression__Group__0

+					{

+						pushFollow(FOLLOW_rule__ImportExpression__Group__0_in_ruleimportExpression220);

+						rule__ImportExpression__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getImportExpressionAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleimportExpression"

+

+

+	// $ANTLR start "entryRulepage"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:145:1: entryRulepage : rulepage EOF ;

+	public final void entryRulepage() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:146:1: ( rulepage EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:147:1: rulepage EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getPageRule());

+				}

+				pushFollow(FOLLOW_rulepage_in_entryRulepage247);

+				rulepage();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getPageRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulepage254);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulepage"

+

+

+	// $ANTLR start "rulepage"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:154:1: rulepage : ( ( rule__Page__Group__0 ) ) ;

+	public final void rulepage() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:158:2: ( ( ( rule__Page__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:159:1: ( ( rule__Page__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:159:1: ( ( rule__Page__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:160:1: ( rule__Page__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:161:1: ( rule__Page__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:161:2: rule__Page__Group__0

+					{

+						pushFollow(FOLLOW_rule__Page__Group__0_in_rulepage280);

+						rule__Page__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulepage"

+

+

+	// $ANTLR start "entryRulepseudo_page"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:173:1: entryRulepseudo_page : rulepseudo_page EOF ;

+	public final void entryRulepseudo_page() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:174:1: ( rulepseudo_page EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:175:1: rulepseudo_page EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getPseudo_pageRule());

+				}

+				pushFollow(FOLLOW_rulepseudo_page_in_entryRulepseudo_page307);

+				rulepseudo_page();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getPseudo_pageRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulepseudo_page314);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulepseudo_page"

+

+

+	// $ANTLR start "rulepseudo_page"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:182:1: rulepseudo_page : ( ( rule__Pseudo_page__Group__0 ) ) ;

+	public final void rulepseudo_page() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:186:2: ( ( ( rule__Pseudo_page__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:187:1: ( ( rule__Pseudo_page__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:187:1: ( ( rule__Pseudo_page__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:188:1: ( rule__Pseudo_page__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudo_pageAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:189:1: ( rule__Pseudo_page__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:189:2: rule__Pseudo_page__Group__0

+					{

+						pushFollow(FOLLOW_rule__Pseudo_page__Group__0_in_rulepseudo_page340);

+						rule__Pseudo_page__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudo_pageAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulepseudo_page"

+

+

+	// $ANTLR start "entryRulemedia"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:201:1: entryRulemedia : rulemedia EOF ;

+	public final void entryRulemedia() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:202:1: ( rulemedia EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:203:1: rulemedia EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getMediaRule());

+				}

+				pushFollow(FOLLOW_rulemedia_in_entryRulemedia367);

+				rulemedia();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getMediaRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulemedia374);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulemedia"

+

+

+	// $ANTLR start "rulemedia"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:210:1: rulemedia : ( ( rule__Media__Group__0 ) ) ;

+	public final void rulemedia() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:214:2: ( ( ( rule__Media__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:215:1: ( ( rule__Media__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:215:1: ( ( rule__Media__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:216:1: ( rule__Media__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMediaAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:217:1: ( rule__Media__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:217:2: rule__Media__Group__0

+					{

+						pushFollow(FOLLOW_rule__Media__Group__0_in_rulemedia400);

+						rule__Media__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMediaAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulemedia"

+

+

+	// $ANTLR start "entryRulemedia_list"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:229:1: entryRulemedia_list : rulemedia_list EOF ;

+	public final void entryRulemedia_list() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:230:1: ( rulemedia_list EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:231:1: rulemedia_list EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getMedia_listRule());

+				}

+				pushFollow(FOLLOW_rulemedia_list_in_entryRulemedia_list427);

+				rulemedia_list();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getMedia_listRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulemedia_list434);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulemedia_list"

+

+

+	// $ANTLR start "rulemedia_list"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:238:1: rulemedia_list : ( ( rule__Media_list__Group__0 ) ) ;

+	public final void rulemedia_list() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:242:2: ( ( ( rule__Media_list__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:243:1: ( ( rule__Media_list__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:243:1: ( ( rule__Media_list__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:244:1: ( rule__Media_list__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMedia_listAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:245:1: ( rule__Media_list__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:245:2: rule__Media_list__Group__0

+					{

+						pushFollow(FOLLOW_rule__Media_list__Group__0_in_rulemedia_list460);

+						rule__Media_list__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMedia_listAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulemedia_list"

+

+

+	// $ANTLR start "entryRulemedium"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:257:1: entryRulemedium : rulemedium EOF ;

+	public final void entryRulemedium() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:258:1: ( rulemedium EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:259:1: rulemedium EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getMediumRule());

+				}

+				pushFollow(FOLLOW_rulemedium_in_entryRulemedium487);

+				rulemedium();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getMediumRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulemedium494);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulemedium"

+

+

+	// $ANTLR start "rulemedium"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:266:1: rulemedium : ( ruleIdentifier ) ;

+	public final void rulemedium() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:270:2: ( ( ruleIdentifier ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:271:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:271:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:272:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMediumAccess().getIdentifierParserRuleCall());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rulemedium520);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMediumAccess().getIdentifierParserRuleCall());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulemedium"

+

+

+	// $ANTLR start "entryRulefont_face"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:285:1: entryRulefont_face : rulefont_face EOF ;

+	public final void entryRulefont_face() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:286:1: ( rulefont_face EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:287:1: rulefont_face EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getFont_faceRule());

+				}

+				pushFollow(FOLLOW_rulefont_face_in_entryRulefont_face546);

+				rulefont_face();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getFont_faceRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulefont_face553);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulefont_face"

+

+

+	// $ANTLR start "rulefont_face"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:294:1: rulefont_face : ( ( rule__Font_face__Group__0 ) ) ;

+	public final void rulefont_face() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:298:2: ( ( ( rule__Font_face__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:299:1: ( ( rule__Font_face__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:299:1: ( ( rule__Font_face__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:300:1: ( rule__Font_face__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getFont_faceAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:301:1: ( rule__Font_face__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:301:2: rule__Font_face__Group__0

+					{

+						pushFollow(FOLLOW_rule__Font_face__Group__0_in_rulefont_face579);

+						rule__Font_face__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getFont_faceAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulefont_face"

+

+

+	// $ANTLR start "entryRulekeyframes"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:313:1: entryRulekeyframes : rulekeyframes EOF ;

+	public final void entryRulekeyframes() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:314:1: ( rulekeyframes EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:315:1: rulekeyframes EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getKeyframesRule());

+				}

+				pushFollow(FOLLOW_rulekeyframes_in_entryRulekeyframes606);

+				rulekeyframes();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getKeyframesRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulekeyframes613);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulekeyframes"

+

+

+	// $ANTLR start "rulekeyframes"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:322:1: rulekeyframes : ( ( rule__Keyframes__Group__0 ) ) ;

+	public final void rulekeyframes() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:326:2: ( ( ( rule__Keyframes__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:327:1: ( ( rule__Keyframes__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:327:1: ( ( rule__Keyframes__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:328:1: ( rule__Keyframes__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:329:1: ( rule__Keyframes__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:329:2: rule__Keyframes__Group__0

+					{

+						pushFollow(FOLLOW_rule__Keyframes__Group__0_in_rulekeyframes639);

+						rule__Keyframes__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulekeyframes"

+

+

+	// $ANTLR start "entryRulekeyframe_selector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:341:1: entryRulekeyframe_selector : rulekeyframe_selector EOF ;

+	public final void entryRulekeyframe_selector() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:342:1: ( rulekeyframe_selector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:343:1: rulekeyframe_selector EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getKeyframe_selectorRule());

+				}

+				pushFollow(FOLLOW_rulekeyframe_selector_in_entryRulekeyframe_selector666);

+				rulekeyframe_selector();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getKeyframe_selectorRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulekeyframe_selector673);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulekeyframe_selector"

+

+

+	// $ANTLR start "rulekeyframe_selector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:350:1: rulekeyframe_selector : ( ( rule__Keyframe_selector__Group__0 ) ) ;

+	public final void rulekeyframe_selector() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:354:2: ( ( ( rule__Keyframe_selector__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:355:1: ( ( rule__Keyframe_selector__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:355:1: ( ( rule__Keyframe_selector__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:356:1: ( rule__Keyframe_selector__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:357:1: ( rule__Keyframe_selector__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:357:2: rule__Keyframe_selector__Group__0

+					{

+						pushFollow(FOLLOW_rule__Keyframe_selector__Group__0_in_rulekeyframe_selector699);

+						rule__Keyframe_selector__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulekeyframe_selector"

+

+

+	// $ANTLR start "entryRuleruleset"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:369:1: entryRuleruleset : ruleruleset EOF ;

+	public final void entryRuleruleset() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:370:1: ( ruleruleset EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:371:1: ruleruleset EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getRulesetRule());

+				}

+				pushFollow(FOLLOW_ruleruleset_in_entryRuleruleset726);

+				ruleruleset();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getRulesetRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleruleset733);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleruleset"

+

+

+	// $ANTLR start "ruleruleset"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:378:1: ruleruleset : ( ( rule__Ruleset__Group__0 ) ) ;

+	public final void ruleruleset() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:382:2: ( ( ( rule__Ruleset__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:383:1: ( ( rule__Ruleset__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:383:1: ( ( rule__Ruleset__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:384:1: ( rule__Ruleset__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:385:1: ( rule__Ruleset__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:385:2: rule__Ruleset__Group__0

+					{

+						pushFollow(FOLLOW_rule__Ruleset__Group__0_in_ruleruleset759);

+						rule__Ruleset__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleruleset"

+

+

+	// $ANTLR start "entryRuleselector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:397:1: entryRuleselector : ruleselector EOF ;

+	public final void entryRuleselector() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:401:1: ( ruleselector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:402:1: ruleselector EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleselector_in_entryRuleselector791);

+				ruleselector();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getSelectorRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleselector798);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleselector"

+

+

+	// $ANTLR start "ruleselector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:412:1: ruleselector : ( ( rule__Selector__Group__0 ) ) ;

+	public final void ruleselector() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:417:2: ( ( ( rule__Selector__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:418:1: ( ( rule__Selector__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:418:1: ( ( rule__Selector__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:419:1: ( rule__Selector__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:420:1: ( rule__Selector__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:420:2: rule__Selector__Group__0

+					{

+						pushFollow(FOLLOW_rule__Selector__Group__0_in_ruleselector828);

+						rule__Selector__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleselector"

+

+

+	// $ANTLR start "entryRuleSimpleSelectorForNegation"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:433:1: entryRuleSimpleSelectorForNegation : ruleSimpleSelectorForNegation EOF ;

+	public final void entryRuleSimpleSelectorForNegation() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:434:1: ( ruleSimpleSelectorForNegation EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:435:1: ruleSimpleSelectorForNegation EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getSimpleSelectorForNegationRule());

+				}

+				pushFollow(FOLLOW_ruleSimpleSelectorForNegation_in_entryRuleSimpleSelectorForNegation855);

+				ruleSimpleSelectorForNegation();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getSimpleSelectorForNegationRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleSimpleSelectorForNegation862);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleSimpleSelectorForNegation"

+

+

+	// $ANTLR start "ruleSimpleSelectorForNegation"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:442:1: ruleSimpleSelectorForNegation : ( ( rule__SimpleSelectorForNegation__Alternatives ) ) ;

+	public final void ruleSimpleSelectorForNegation() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:446:2: ( ( ( rule__SimpleSelectorForNegation__Alternatives ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:447:1: ( ( rule__SimpleSelectorForNegation__Alternatives ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:447:1: ( ( rule__SimpleSelectorForNegation__Alternatives ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:448:1: ( rule__SimpleSelectorForNegation__Alternatives )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimpleSelectorForNegationAccess().getAlternatives());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:449:1: ( rule__SimpleSelectorForNegation__Alternatives )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:449:2: rule__SimpleSelectorForNegation__Alternatives

+					{

+						pushFollow(FOLLOW_rule__SimpleSelectorForNegation__Alternatives_in_ruleSimpleSelectorForNegation888);

+						rule__SimpleSelectorForNegation__Alternatives();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimpleSelectorForNegationAccess().getAlternatives());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleSimpleSelectorForNegation"

+

+

+	// $ANTLR start "entryRuleSubSelectorForNegation"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:461:1: entryRuleSubSelectorForNegation : ruleSubSelectorForNegation EOF ;

+	public final void entryRuleSubSelectorForNegation() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:462:1: ( ruleSubSelectorForNegation EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:463:1: ruleSubSelectorForNegation EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getSubSelectorForNegationRule());

+				}

+				pushFollow(FOLLOW_ruleSubSelectorForNegation_in_entryRuleSubSelectorForNegation915);

+				ruleSubSelectorForNegation();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getSubSelectorForNegationRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleSubSelectorForNegation922);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleSubSelectorForNegation"

+

+

+	// $ANTLR start "ruleSubSelectorForNegation"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:470:1: ruleSubSelectorForNegation : ( ( rule__SubSelectorForNegation__Alternatives ) ) ;

+	public final void ruleSubSelectorForNegation() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:474:2: ( ( ( rule__SubSelectorForNegation__Alternatives ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:475:1: ( ( rule__SubSelectorForNegation__Alternatives ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:475:1: ( ( rule__SubSelectorForNegation__Alternatives ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:476:1: ( rule__SubSelectorForNegation__Alternatives )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSubSelectorForNegationAccess().getAlternatives());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:477:1: ( rule__SubSelectorForNegation__Alternatives )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:477:2: rule__SubSelectorForNegation__Alternatives

+					{

+						pushFollow(FOLLOW_rule__SubSelectorForNegation__Alternatives_in_ruleSubSelectorForNegation948);

+						rule__SubSelectorForNegation__Alternatives();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSubSelectorForNegationAccess().getAlternatives());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleSubSelectorForNegation"

+

+

+	// $ANTLR start "entryRulesimple_selector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:489:1: entryRulesimple_selector : rulesimple_selector EOF ;

+	public final void entryRulesimple_selector() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:493:1: ( rulesimple_selector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:494:1: rulesimple_selector EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getSimple_selectorRule());

+				}

+				pushFollow(FOLLOW_rulesimple_selector_in_entryRulesimple_selector980);

+				rulesimple_selector();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getSimple_selectorRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulesimple_selector987);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulesimple_selector"

+

+

+	// $ANTLR start "rulesimple_selector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:504:1: rulesimple_selector : ( ( rule__Simple_selector__Alternatives ) ) ;

+	public final void rulesimple_selector() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:509:2: ( ( ( rule__Simple_selector__Alternatives ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:510:1: ( ( rule__Simple_selector__Alternatives ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:510:1: ( ( rule__Simple_selector__Alternatives ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:511:1: ( rule__Simple_selector__Alternatives )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimple_selectorAccess().getAlternatives());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:512:1: ( rule__Simple_selector__Alternatives )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:512:2: rule__Simple_selector__Alternatives

+					{

+						pushFollow(FOLLOW_rule__Simple_selector__Alternatives_in_rulesimple_selector1017);

+						rule__Simple_selector__Alternatives();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimple_selectorAccess().getAlternatives());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulesimple_selector"

+

+

+	// $ANTLR start "entryRuleSubSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:525:1: entryRuleSubSelector : ruleSubSelector EOF ;

+	public final void entryRuleSubSelector() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:526:1: ( ruleSubSelector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:527:1: ruleSubSelector EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getSubSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleSubSelector_in_entryRuleSubSelector1044);

+				ruleSubSelector();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getSubSelectorRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleSubSelector1051);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleSubSelector"

+

+

+	// $ANTLR start "ruleSubSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:534:1: ruleSubSelector : ( ( rule__SubSelector__Alternatives ) ) ;

+	public final void ruleSubSelector() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:538:2: ( ( ( rule__SubSelector__Alternatives ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:539:1: ( ( rule__SubSelector__Alternatives ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:539:1: ( ( rule__SubSelector__Alternatives ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:540:1: ( rule__SubSelector__Alternatives )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSubSelectorAccess().getAlternatives());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:541:1: ( rule__SubSelector__Alternatives )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:541:2: rule__SubSelector__Alternatives

+					{

+						pushFollow(FOLLOW_rule__SubSelector__Alternatives_in_ruleSubSelector1077);

+						rule__SubSelector__Alternatives();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSubSelectorAccess().getAlternatives());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleSubSelector"

+

+

+	// $ANTLR start "entryRuleAttributeSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:553:1: entryRuleAttributeSelector : ruleAttributeSelector EOF ;

+	public final void entryRuleAttributeSelector() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:554:1: ( ruleAttributeSelector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:555:1: ruleAttributeSelector EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getAttributeSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleAttributeSelector_in_entryRuleAttributeSelector1104);

+				ruleAttributeSelector();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getAttributeSelectorRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleAttributeSelector1111);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleAttributeSelector"

+

+

+	// $ANTLR start "ruleAttributeSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:562:1: ruleAttributeSelector : ( ( rule__AttributeSelector__Group__0 ) ) ;

+	public final void ruleAttributeSelector() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:566:2: ( ( ( rule__AttributeSelector__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:567:1: ( ( rule__AttributeSelector__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:567:1: ( ( rule__AttributeSelector__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:568:1: ( rule__AttributeSelector__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:569:1: ( rule__AttributeSelector__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:569:2: rule__AttributeSelector__Group__0

+					{

+						pushFollow(FOLLOW_rule__AttributeSelector__Group__0_in_ruleAttributeSelector1137);

+						rule__AttributeSelector__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleAttributeSelector"

+

+

+	// $ANTLR start "entryRuleClassSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:581:1: entryRuleClassSelector : ruleClassSelector EOF ;

+	public final void entryRuleClassSelector() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:582:1: ( ruleClassSelector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:583:1: ruleClassSelector EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getClassSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleClassSelector_in_entryRuleClassSelector1164);

+				ruleClassSelector();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getClassSelectorRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleClassSelector1171);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleClassSelector"

+

+

+	// $ANTLR start "ruleClassSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:590:1: ruleClassSelector : ( ( rule__ClassSelector__Group__0 ) ) ;

+	public final void ruleClassSelector() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:594:2: ( ( ( rule__ClassSelector__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:595:1: ( ( rule__ClassSelector__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:595:1: ( ( rule__ClassSelector__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:596:1: ( rule__ClassSelector__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getClassSelectorAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:597:1: ( rule__ClassSelector__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:597:2: rule__ClassSelector__Group__0

+					{

+						pushFollow(FOLLOW_rule__ClassSelector__Group__0_in_ruleClassSelector1197);

+						rule__ClassSelector__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getClassSelectorAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleClassSelector"

+

+

+	// $ANTLR start "entryRuleElementSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:609:1: entryRuleElementSelector : ruleElementSelector EOF ;

+	public final void entryRuleElementSelector() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:610:1: ( ruleElementSelector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:611:1: ruleElementSelector EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getElementSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleElementSelector_in_entryRuleElementSelector1224);

+				ruleElementSelector();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getElementSelectorRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleElementSelector1231);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleElementSelector"

+

+

+	// $ANTLR start "ruleElementSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:618:1: ruleElementSelector : ( ( rule__ElementSelector__Group__0 ) ) ;

+	public final void ruleElementSelector() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:622:2: ( ( ( rule__ElementSelector__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:623:1: ( ( rule__ElementSelector__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:623:1: ( ( rule__ElementSelector__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:624:1: ( rule__ElementSelector__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getElementSelectorAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:625:1: ( rule__ElementSelector__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:625:2: rule__ElementSelector__Group__0

+					{

+						pushFollow(FOLLOW_rule__ElementSelector__Group__0_in_ruleElementSelector1257);

+						rule__ElementSelector__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getElementSelectorAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleElementSelector"

+

+

+	// $ANTLR start "entryRuleUniversalSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:637:1: entryRuleUniversalSelector : ruleUniversalSelector EOF ;

+	public final void entryRuleUniversalSelector() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:638:1: ( ruleUniversalSelector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:639:1: ruleUniversalSelector EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getUniversalSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleUniversalSelector_in_entryRuleUniversalSelector1284);

+				ruleUniversalSelector();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getUniversalSelectorRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleUniversalSelector1291);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleUniversalSelector"

+

+

+	// $ANTLR start "ruleUniversalSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:646:1: ruleUniversalSelector : ( ( rule__UniversalSelector__Group__0 ) ) ;

+	public final void ruleUniversalSelector() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:650:2: ( ( ( rule__UniversalSelector__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:651:1: ( ( rule__UniversalSelector__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:651:1: ( ( rule__UniversalSelector__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:652:1: ( rule__UniversalSelector__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getUniversalSelectorAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:653:1: ( rule__UniversalSelector__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:653:2: rule__UniversalSelector__Group__0

+					{

+						pushFollow(FOLLOW_rule__UniversalSelector__Group__0_in_ruleUniversalSelector1317);

+						rule__UniversalSelector__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getUniversalSelectorAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleUniversalSelector"

+

+

+	// $ANTLR start "entryRuleIdSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:665:1: entryRuleIdSelector : ruleIdSelector EOF ;

+	public final void entryRuleIdSelector() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:666:1: ( ruleIdSelector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:667:1: ruleIdSelector EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getIdSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleIdSelector_in_entryRuleIdSelector1344);

+				ruleIdSelector();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getIdSelectorRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleIdSelector1351);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleIdSelector"

+

+

+	// $ANTLR start "ruleIdSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:674:1: ruleIdSelector : ( ( rule__IdSelector__Group__0 ) ) ;

+	public final void ruleIdSelector() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:678:2: ( ( ( rule__IdSelector__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:679:1: ( ( rule__IdSelector__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:679:1: ( ( rule__IdSelector__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:680:1: ( rule__IdSelector__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdSelectorAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:681:1: ( rule__IdSelector__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:681:2: rule__IdSelector__Group__0

+					{

+						pushFollow(FOLLOW_rule__IdSelector__Group__0_in_ruleIdSelector1377);

+						rule__IdSelector__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdSelectorAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleIdSelector"

+

+

+	// $ANTLR start "entryRulecss_namespace_prefix"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:693:1: entryRulecss_namespace_prefix : rulecss_namespace_prefix EOF ;

+	public final void entryRulecss_namespace_prefix() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:694:1: ( rulecss_namespace_prefix EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:695:1: rulecss_namespace_prefix EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getCss_namespace_prefixRule());

+				}

+				pushFollow(FOLLOW_rulecss_namespace_prefix_in_entryRulecss_namespace_prefix1404);

+				rulecss_namespace_prefix();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getCss_namespace_prefixRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulecss_namespace_prefix1411);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulecss_namespace_prefix"

+

+

+	// $ANTLR start "rulecss_namespace_prefix"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:702:1: rulecss_namespace_prefix : ( ( rule__Css_namespace_prefix__Group__0 ) ) ;

+	public final void rulecss_namespace_prefix() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:706:2: ( ( ( rule__Css_namespace_prefix__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:707:1: ( ( rule__Css_namespace_prefix__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:707:1: ( ( rule__Css_namespace_prefix__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:708:1: ( rule__Css_namespace_prefix__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_namespace_prefixAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:709:1: ( rule__Css_namespace_prefix__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:709:2: rule__Css_namespace_prefix__Group__0

+					{

+						pushFollow(FOLLOW_rule__Css_namespace_prefix__Group__0_in_rulecss_namespace_prefix1437);

+						rule__Css_namespace_prefix__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_namespace_prefixAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulecss_namespace_prefix"

+

+

+	// $ANTLR start "entryRulecss_declaration"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:721:1: entryRulecss_declaration : rulecss_declaration EOF ;

+	public final void entryRulecss_declaration() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:725:1: ( rulecss_declaration EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:726:1: rulecss_declaration EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getCss_declarationRule());

+				}

+				pushFollow(FOLLOW_rulecss_declaration_in_entryRulecss_declaration1469);

+				rulecss_declaration();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getCss_declarationRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulecss_declaration1476);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulecss_declaration"

+

+

+	// $ANTLR start "rulecss_declaration"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:736:1: rulecss_declaration : ( ( rule__Css_declaration__Group__0 ) ) ;

+	public final void rulecss_declaration() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:741:2: ( ( ( rule__Css_declaration__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:742:1: ( ( rule__Css_declaration__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:742:1: ( ( rule__Css_declaration__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:743:1: ( rule__Css_declaration__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_declarationAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:744:1: ( rule__Css_declaration__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:744:2: rule__Css_declaration__Group__0

+					{

+						pushFollow(FOLLOW_rule__Css_declaration__Group__0_in_rulecss_declaration1506);

+						rule__Css_declaration__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_declarationAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulecss_declaration"

+

+

+	// $ANTLR start "entryRulecss_property"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:757:1: entryRulecss_property : rulecss_property EOF ;

+	public final void entryRulecss_property() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:758:1: ( rulecss_property EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:759:1: rulecss_property EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getCss_propertyRule());

+				}

+				pushFollow(FOLLOW_rulecss_property_in_entryRulecss_property1533);

+				rulecss_property();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getCss_propertyRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulecss_property1540);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulecss_property"

+

+

+	// $ANTLR start "rulecss_property"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:766:1: rulecss_property : ( ( rule__Css_property__Group__0 ) ) ;

+	public final void rulecss_property() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:770:2: ( ( ( rule__Css_property__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:771:1: ( ( rule__Css_property__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:771:1: ( ( rule__Css_property__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:772:1: ( rule__Css_property__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_propertyAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:773:1: ( rule__Css_property__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:773:2: rule__Css_property__Group__0

+					{

+						pushFollow(FOLLOW_rule__Css_property__Group__0_in_rulecss_property1566);

+						rule__Css_property__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_propertyAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulecss_property"

+

+

+	// $ANTLR start "entryRuleValidPropertyIdent"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:785:1: entryRuleValidPropertyIdent : ruleValidPropertyIdent EOF ;

+	public final void entryRuleValidPropertyIdent() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:786:1: ( ruleValidPropertyIdent EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:787:1: ruleValidPropertyIdent EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getValidPropertyIdentRule());

+				}

+				pushFollow(FOLLOW_ruleValidPropertyIdent_in_entryRuleValidPropertyIdent1593);

+				ruleValidPropertyIdent();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getValidPropertyIdentRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleValidPropertyIdent1600);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleValidPropertyIdent"

+

+

+	// $ANTLR start "ruleValidPropertyIdent"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:794:1: ruleValidPropertyIdent : ( ruleIdentifier ) ;

+	public final void ruleValidPropertyIdent() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:798:2: ( ( ruleIdentifier ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:799:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:799:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:800:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidPropertyIdentAccess().getIdentifierParserRuleCall());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_ruleValidPropertyIdent1626);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidPropertyIdentAccess().getIdentifierParserRuleCall());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleValidPropertyIdent"

+

+

+	// $ANTLR start "entryRulePseudoClassOrFunc"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:813:1: entryRulePseudoClassOrFunc : rulePseudoClassOrFunc EOF ;

+	public final void entryRulePseudoClassOrFunc() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:814:1: ( rulePseudoClassOrFunc EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:815:1: rulePseudoClassOrFunc EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getPseudoClassOrFuncRule());

+				}

+				pushFollow(FOLLOW_rulePseudoClassOrFunc_in_entryRulePseudoClassOrFunc1652);

+				rulePseudoClassOrFunc();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getPseudoClassOrFuncRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulePseudoClassOrFunc1659);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulePseudoClassOrFunc"

+

+

+	// $ANTLR start "rulePseudoClassOrFunc"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:822:1: rulePseudoClassOrFunc : ( ( rule__PseudoClassOrFunc__Alternatives ) ) ;

+	public final void rulePseudoClassOrFunc() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:826:2: ( ( ( rule__PseudoClassOrFunc__Alternatives ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:827:1: ( ( rule__PseudoClassOrFunc__Alternatives ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:827:1: ( ( rule__PseudoClassOrFunc__Alternatives ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:828:1: ( rule__PseudoClassOrFunc__Alternatives )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassOrFuncAccess().getAlternatives());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:829:1: ( rule__PseudoClassOrFunc__Alternatives )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:829:2: rule__PseudoClassOrFunc__Alternatives

+					{

+						pushFollow(FOLLOW_rule__PseudoClassOrFunc__Alternatives_in_rulePseudoClassOrFunc1685);

+						rule__PseudoClassOrFunc__Alternatives();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassOrFuncAccess().getAlternatives());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulePseudoClassOrFunc"

+

+

+	// $ANTLR start "entryRulePseudoClass"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:841:1: entryRulePseudoClass : rulePseudoClass EOF ;

+	public final void entryRulePseudoClass() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:842:1: ( rulePseudoClass EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:843:1: rulePseudoClass EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getPseudoClassRule());

+				}

+				pushFollow(FOLLOW_rulePseudoClass_in_entryRulePseudoClass1712);

+				rulePseudoClass();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getPseudoClassRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulePseudoClass1719);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulePseudoClass"

+

+

+	// $ANTLR start "rulePseudoClass"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:850:1: rulePseudoClass : ( ( rule__PseudoClass__Group__0 ) ) ;

+	public final void rulePseudoClass() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:854:2: ( ( ( rule__PseudoClass__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:855:1: ( ( rule__PseudoClass__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:855:1: ( ( rule__PseudoClass__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:856:1: ( rule__PseudoClass__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:857:1: ( rule__PseudoClass__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:857:2: rule__PseudoClass__Group__0

+					{

+						pushFollow(FOLLOW_rule__PseudoClass__Group__0_in_rulePseudoClass1745);

+						rule__PseudoClass__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulePseudoClass"

+

+

+	// $ANTLR start "entryRulePseudoClassName"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:869:1: entryRulePseudoClassName : rulePseudoClassName EOF ;

+	public final void entryRulePseudoClassName() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:870:1: ( rulePseudoClassName EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:871:1: rulePseudoClassName EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getPseudoClassNameRule());

+				}

+				pushFollow(FOLLOW_rulePseudoClassName_in_entryRulePseudoClassName1772);

+				rulePseudoClassName();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getPseudoClassNameRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulePseudoClassName1779);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulePseudoClassName"

+

+

+	// $ANTLR start "rulePseudoClassName"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:878:1: rulePseudoClassName : ( ( rule__PseudoClassName__NameAssignment ) ) ;

+	public final void rulePseudoClassName() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:882:2: ( ( ( rule__PseudoClassName__NameAssignment ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:883:1: ( ( rule__PseudoClassName__NameAssignment ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:883:1: ( ( rule__PseudoClassName__NameAssignment ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:884:1: ( rule__PseudoClassName__NameAssignment )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassNameAccess().getNameAssignment());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:885:1: ( rule__PseudoClassName__NameAssignment )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:885:2: rule__PseudoClassName__NameAssignment

+					{

+						pushFollow(FOLLOW_rule__PseudoClassName__NameAssignment_in_rulePseudoClassName1805);

+						rule__PseudoClassName__NameAssignment();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassNameAccess().getNameAssignment());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulePseudoClassName"

+

+

+	// $ANTLR start "entryRulePseudoClassFunction"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:897:1: entryRulePseudoClassFunction : rulePseudoClassFunction EOF ;

+	public final void entryRulePseudoClassFunction() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:898:1: ( rulePseudoClassFunction EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:899:1: rulePseudoClassFunction EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getPseudoClassFunctionRule());

+				}

+				pushFollow(FOLLOW_rulePseudoClassFunction_in_entryRulePseudoClassFunction1832);

+				rulePseudoClassFunction();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getPseudoClassFunctionRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulePseudoClassFunction1839);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulePseudoClassFunction"

+

+

+	// $ANTLR start "rulePseudoClassFunction"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:906:1: rulePseudoClassFunction : ( ( rule__PseudoClassFunction__Alternatives ) ) ;

+	public final void rulePseudoClassFunction() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:910:2: ( ( ( rule__PseudoClassFunction__Alternatives ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:911:1: ( ( rule__PseudoClassFunction__Alternatives ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:911:1: ( ( rule__PseudoClassFunction__Alternatives ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:912:1: ( rule__PseudoClassFunction__Alternatives )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getAlternatives());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:913:1: ( rule__PseudoClassFunction__Alternatives )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:913:2: rule__PseudoClassFunction__Alternatives

+					{

+						pushFollow(FOLLOW_rule__PseudoClassFunction__Alternatives_in_rulePseudoClassFunction1865);

+						rule__PseudoClassFunction__Alternatives();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getAlternatives());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulePseudoClassFunction"

+

+

+	// $ANTLR start "entryRuleNotFunctionCall"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:925:1: entryRuleNotFunctionCall : ruleNotFunctionCall EOF ;

+	public final void entryRuleNotFunctionCall() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:929:1: ( ruleNotFunctionCall EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:930:1: ruleNotFunctionCall EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getNotFunctionCallRule());

+				}

+				pushFollow(FOLLOW_ruleNotFunctionCall_in_entryRuleNotFunctionCall1897);

+				ruleNotFunctionCall();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getNotFunctionCallRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleNotFunctionCall1904);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleNotFunctionCall"

+

+

+	// $ANTLR start "ruleNotFunctionCall"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:940:1: ruleNotFunctionCall : ( ( rule__NotFunctionCall__Group__0 ) ) ;

+	public final void ruleNotFunctionCall() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:945:2: ( ( ( rule__NotFunctionCall__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:946:1: ( ( rule__NotFunctionCall__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:946:1: ( ( rule__NotFunctionCall__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:947:1: ( rule__NotFunctionCall__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNotFunctionCallAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:948:1: ( rule__NotFunctionCall__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:948:2: rule__NotFunctionCall__Group__0

+					{

+						pushFollow(FOLLOW_rule__NotFunctionCall__Group__0_in_ruleNotFunctionCall1934);

+						rule__NotFunctionCall__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNotFunctionCallAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleNotFunctionCall"

+

+

+	// $ANTLR start "entryRulecombinator"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:961:1: entryRulecombinator : rulecombinator EOF ;

+	public final void entryRulecombinator() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:962:1: ( rulecombinator EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:963:1: rulecombinator EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getCombinatorRule());

+				}

+				pushFollow(FOLLOW_rulecombinator_in_entryRulecombinator1961);

+				rulecombinator();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getCombinatorRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulecombinator1968);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRulecombinator"

+

+

+	// $ANTLR start "rulecombinator"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:970:1: rulecombinator : ( ( rule__Combinator__Alternatives ) ) ;

+	public final void rulecombinator() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:974:2: ( ( ( rule__Combinator__Alternatives ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:975:1: ( ( rule__Combinator__Alternatives ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:975:1: ( ( rule__Combinator__Alternatives ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:976:1: ( rule__Combinator__Alternatives )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCombinatorAccess().getAlternatives());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:977:1: ( rule__Combinator__Alternatives )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:977:2: rule__Combinator__Alternatives

+					{

+						pushFollow(FOLLOW_rule__Combinator__Alternatives_in_rulecombinator1994);

+						rule__Combinator__Alternatives();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCombinatorAccess().getAlternatives());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rulecombinator"

+

+

+	// $ANTLR start "entryRuleSymbolTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:993:1: entryRuleSymbolTok : ruleSymbolTok EOF ;

+	public final void entryRuleSymbolTok() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:994:1: ( ruleSymbolTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:995:1: ruleSymbolTok EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getSymbolTokRule());

+				}

+				pushFollow(FOLLOW_ruleSymbolTok_in_entryRuleSymbolTok2025);

+				ruleSymbolTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getSymbolTokRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleSymbolTok2032);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleSymbolTok"

+

+

+	// $ANTLR start "ruleSymbolTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1002:1: ruleSymbolTok : ( ( rule__SymbolTok__Group__0 ) ) ;

+	public final void ruleSymbolTok() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1006:2: ( ( ( rule__SymbolTok__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1007:1: ( ( rule__SymbolTok__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1007:1: ( ( rule__SymbolTok__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1008:1: ( rule__SymbolTok__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSymbolTokAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1009:1: ( rule__SymbolTok__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1009:2: rule__SymbolTok__Group__0

+					{

+						pushFollow(FOLLOW_rule__SymbolTok__Group__0_in_ruleSymbolTok2058);

+						rule__SymbolTok__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSymbolTokAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleSymbolTok"

+

+

+	// $ANTLR start "entryRuleWSTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1021:1: entryRuleWSTok : ruleWSTok EOF ;

+	public final void entryRuleWSTok() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1022:1: ( ruleWSTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1023:1: ruleWSTok EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getWSTokRule());

+				}

+				pushFollow(FOLLOW_ruleWSTok_in_entryRuleWSTok2085);

+				ruleWSTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getWSTokRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleWSTok2092);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleWSTok"

+

+

+	// $ANTLR start "ruleWSTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1030:1: ruleWSTok : ( ( rule__WSTok__Group__0 ) ) ;

+	public final void ruleWSTok() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1034:2: ( ( ( rule__WSTok__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1035:1: ( ( rule__WSTok__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1035:1: ( ( rule__WSTok__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1036:1: ( rule__WSTok__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getWSTokAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1037:1: ( rule__WSTok__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1037:2: rule__WSTok__Group__0

+					{

+						pushFollow(FOLLOW_rule__WSTok__Group__0_in_ruleWSTok2118);

+						rule__WSTok__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getWSTokAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleWSTok"

+

+

+	// $ANTLR start "entryRuleStringTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1049:1: entryRuleStringTok : ruleStringTok EOF ;

+	public final void entryRuleStringTok() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1050:1: ( ruleStringTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1051:1: ruleStringTok EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getStringTokRule());

+				}

+				pushFollow(FOLLOW_ruleStringTok_in_entryRuleStringTok2145);

+				ruleStringTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getStringTokRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleStringTok2152);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleStringTok"

+

+

+	// $ANTLR start "ruleStringTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1058:1: ruleStringTok : ( ( rule__StringTok__Group__0 ) ) ;

+	public final void ruleStringTok() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1062:2: ( ( ( rule__StringTok__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1063:1: ( ( rule__StringTok__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1063:1: ( ( rule__StringTok__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1064:1: ( rule__StringTok__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStringTokAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1065:1: ( rule__StringTok__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1065:2: rule__StringTok__Group__0

+					{

+						pushFollow(FOLLOW_rule__StringTok__Group__0_in_ruleStringTok2178);

+						rule__StringTok__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStringTokAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleStringTok"

+

+

+	// $ANTLR start "entryRuleNumberTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1077:1: entryRuleNumberTok : ruleNumberTok EOF ;

+	public final void entryRuleNumberTok() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1081:1: ( ruleNumberTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1082:1: ruleNumberTok EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getNumberTokRule());

+				}

+				pushFollow(FOLLOW_ruleNumberTok_in_entryRuleNumberTok2210);

+				ruleNumberTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getNumberTokRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleNumberTok2217);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleNumberTok"

+

+

+	// $ANTLR start "ruleNumberTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1092:1: ruleNumberTok : ( ( rule__NumberTok__Group__0 ) ) ;

+	public final void ruleNumberTok() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1097:2: ( ( ( rule__NumberTok__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1098:1: ( ( rule__NumberTok__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1098:1: ( ( rule__NumberTok__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1099:1: ( rule__NumberTok__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumberTokAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1100:1: ( rule__NumberTok__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1100:2: rule__NumberTok__Group__0

+					{

+						pushFollow(FOLLOW_rule__NumberTok__Group__0_in_ruleNumberTok2247);

+						rule__NumberTok__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumberTokAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleNumberTok"

+

+

+	// $ANTLR start "entryRuleUrlTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1113:1: entryRuleUrlTok : ruleUrlTok EOF ;

+	public final void entryRuleUrlTok() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1114:1: ( ruleUrlTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1115:1: ruleUrlTok EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getUrlTokRule());

+				}

+				pushFollow(FOLLOW_ruleUrlTok_in_entryRuleUrlTok2274);

+				ruleUrlTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getUrlTokRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleUrlTok2281);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleUrlTok"

+

+

+	// $ANTLR start "ruleUrlTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1122:1: ruleUrlTok : ( ( rule__UrlTok__Group__0 ) ) ;

+	public final void ruleUrlTok() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1126:2: ( ( ( rule__UrlTok__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1127:1: ( ( rule__UrlTok__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1127:1: ( ( rule__UrlTok__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1128:1: ( rule__UrlTok__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getUrlTokAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1129:1: ( rule__UrlTok__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1129:2: rule__UrlTok__Group__0

+					{

+						pushFollow(FOLLOW_rule__UrlTok__Group__0_in_ruleUrlTok2307);

+						rule__UrlTok__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getUrlTokAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleUrlTok"

+

+

+	// $ANTLR start "entryRuleColorTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1141:1: entryRuleColorTok : ruleColorTok EOF ;

+	public final void entryRuleColorTok() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1145:1: ( ruleColorTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1146:1: ruleColorTok EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getColorTokRule());

+				}

+				pushFollow(FOLLOW_ruleColorTok_in_entryRuleColorTok2339);

+				ruleColorTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getColorTokRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleColorTok2346);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleColorTok"

+

+

+	// $ANTLR start "ruleColorTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1156:1: ruleColorTok : ( ( rule__ColorTok__Group__0 ) ) ;

+	public final void ruleColorTok() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1161:2: ( ( ( rule__ColorTok__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1162:1: ( ( rule__ColorTok__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1162:1: ( ( rule__ColorTok__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1163:1: ( rule__ColorTok__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getColorTokAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1164:1: ( rule__ColorTok__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1164:2: rule__ColorTok__Group__0

+					{

+						pushFollow(FOLLOW_rule__ColorTok__Group__0_in_ruleColorTok2376);

+						rule__ColorTok__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getColorTokAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleColorTok"

+

+

+	// $ANTLR start "entryRuleIdentifierOrFuncTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1177:1: entryRuleIdentifierOrFuncTok : ruleIdentifierOrFuncTok EOF ;

+	public final void entryRuleIdentifierOrFuncTok() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1181:1: ( ruleIdentifierOrFuncTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1182:1: ruleIdentifierOrFuncTok EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getIdentifierOrFuncTokRule());

+				}

+				pushFollow(FOLLOW_ruleIdentifierOrFuncTok_in_entryRuleIdentifierOrFuncTok2408);

+				ruleIdentifierOrFuncTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getIdentifierOrFuncTokRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleIdentifierOrFuncTok2415);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleIdentifierOrFuncTok"

+

+

+	// $ANTLR start "ruleIdentifierOrFuncTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1192:1: ruleIdentifierOrFuncTok : ( ( rule__IdentifierOrFuncTok__Group__0 ) ) ;

+	public final void ruleIdentifierOrFuncTok() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1197:2: ( ( ( rule__IdentifierOrFuncTok__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1198:1: ( ( rule__IdentifierOrFuncTok__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1198:1: ( ( rule__IdentifierOrFuncTok__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1199:1: ( rule__IdentifierOrFuncTok__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierOrFuncTokAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1200:1: ( rule__IdentifierOrFuncTok__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1200:2: rule__IdentifierOrFuncTok__Group__0

+					{

+						pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group__0_in_ruleIdentifierOrFuncTok2445);

+						rule__IdentifierOrFuncTok__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierOrFuncTokAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleIdentifierOrFuncTok"

+

+

+	// $ANTLR start "entryRuleCssTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1213:1: entryRuleCssTok : ruleCssTok EOF ;

+	public final void entryRuleCssTok() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1217:1: ( ruleCssTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1218:1: ruleCssTok EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getCssTokRule());

+				}

+				pushFollow(FOLLOW_ruleCssTok_in_entryRuleCssTok2477);

+				ruleCssTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getCssTokRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleCssTok2484);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleCssTok"

+

+

+	// $ANTLR start "ruleCssTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1228:1: ruleCssTok : ( ( rule__CssTok__Alternatives ) ) ;

+	public final void ruleCssTok() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1233:2: ( ( ( rule__CssTok__Alternatives ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1234:1: ( ( rule__CssTok__Alternatives ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1234:1: ( ( rule__CssTok__Alternatives ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1235:1: ( rule__CssTok__Alternatives )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCssTokAccess().getAlternatives());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1236:1: ( rule__CssTok__Alternatives )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1236:2: rule__CssTok__Alternatives

+					{

+						pushFollow(FOLLOW_rule__CssTok__Alternatives_in_ruleCssTok2514);

+						rule__CssTok__Alternatives();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCssTokAccess().getAlternatives());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleCssTok"

+

+

+	// $ANTLR start "entryRuleURLType"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1249:1: entryRuleURLType : ruleURLType EOF ;

+	public final void entryRuleURLType() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1253:1: ( ruleURLType EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1254:1: ruleURLType EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getURLTypeRule());

+				}

+				pushFollow(FOLLOW_ruleURLType_in_entryRuleURLType2546);

+				ruleURLType();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getURLTypeRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleURLType2553);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleURLType"

+

+

+	// $ANTLR start "ruleURLType"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1264:1: ruleURLType : ( ( rule__URLType__Group__0 ) ) ;

+	public final void ruleURLType() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1269:2: ( ( ( rule__URLType__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1270:1: ( ( rule__URLType__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1270:1: ( ( rule__URLType__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1271:1: ( rule__URLType__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getURLTypeAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1272:1: ( rule__URLType__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1272:2: rule__URLType__Group__0

+					{

+						pushFollow(FOLLOW_rule__URLType__Group__0_in_ruleURLType2583);

+						rule__URLType__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getURLTypeAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleURLType"

+

+

+	// $ANTLR start "entryRuleValidURLSymbol"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1285:1: entryRuleValidURLSymbol : ruleValidURLSymbol EOF ;

+	public final void entryRuleValidURLSymbol() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1286:1: ( ruleValidURLSymbol EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1287:1: ruleValidURLSymbol EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getValidURLSymbolRule());

+				}

+				pushFollow(FOLLOW_ruleValidURLSymbol_in_entryRuleValidURLSymbol2610);

+				ruleValidURLSymbol();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getValidURLSymbolRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleValidURLSymbol2617);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleValidURLSymbol"

+

+

+	// $ANTLR start "ruleValidURLSymbol"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1294:1: ruleValidURLSymbol : ( ( rule__ValidURLSymbol__Alternatives ) ) ;

+	public final void ruleValidURLSymbol() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1298:2: ( ( ( rule__ValidURLSymbol__Alternatives ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1299:1: ( ( rule__ValidURLSymbol__Alternatives ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1299:1: ( ( rule__ValidURLSymbol__Alternatives ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1300:1: ( rule__ValidURLSymbol__Alternatives )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getAlternatives());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1301:1: ( rule__ValidURLSymbol__Alternatives )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1301:2: rule__ValidURLSymbol__Alternatives

+					{

+						pushFollow(FOLLOW_rule__ValidURLSymbol__Alternatives_in_ruleValidURLSymbol2643);

+						rule__ValidURLSymbol__Alternatives();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getAlternatives());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleValidURLSymbol"

+

+

+	// $ANTLR start "entryRuleKeywordHack"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1313:1: entryRuleKeywordHack : ruleKeywordHack EOF ;

+	public final void entryRuleKeywordHack() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1314:1: ( ruleKeywordHack EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1315:1: ruleKeywordHack EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getKeywordHackRule());

+				}

+				pushFollow(FOLLOW_ruleKeywordHack_in_entryRuleKeywordHack2670);

+				ruleKeywordHack();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getKeywordHackRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleKeywordHack2677);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleKeywordHack"

+

+

+	// $ANTLR start "ruleKeywordHack"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1322:1: ruleKeywordHack : ( ( rule__KeywordHack__Alternatives ) ) ;

+	public final void ruleKeywordHack() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1326:2: ( ( ( rule__KeywordHack__Alternatives ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1327:1: ( ( rule__KeywordHack__Alternatives ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1327:1: ( ( rule__KeywordHack__Alternatives ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1328:1: ( rule__KeywordHack__Alternatives )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeywordHackAccess().getAlternatives());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1329:1: ( rule__KeywordHack__Alternatives )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1329:2: rule__KeywordHack__Alternatives

+					{

+						pushFollow(FOLLOW_rule__KeywordHack__Alternatives_in_ruleKeywordHack2703);

+						rule__KeywordHack__Alternatives();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeywordHackAccess().getAlternatives());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleKeywordHack"

+

+

+	// $ANTLR start "entryRuleValidURL"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1341:1: entryRuleValidURL : ruleValidURL EOF ;

+	public final void entryRuleValidURL() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1345:1: ( ruleValidURL EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1346:1: ruleValidURL EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getValidURLRule());

+				}

+				pushFollow(FOLLOW_ruleValidURL_in_entryRuleValidURL2735);

+				ruleValidURL();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getValidURLRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleValidURL2742);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleValidURL"

+

+

+	// $ANTLR start "ruleValidURL"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1356:1: ruleValidURL : ( ( rule__ValidURL__Alternatives ) ) ;

+	public final void ruleValidURL() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1361:2: ( ( ( rule__ValidURL__Alternatives ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1362:1: ( ( rule__ValidURL__Alternatives ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1362:1: ( ( rule__ValidURL__Alternatives ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1363:1: ( rule__ValidURL__Alternatives )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getAlternatives());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1364:1: ( rule__ValidURL__Alternatives )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1364:2: rule__ValidURL__Alternatives

+					{

+						pushFollow(FOLLOW_rule__ValidURL__Alternatives_in_ruleValidURL2772);

+						rule__ValidURL__Alternatives();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getAlternatives());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleValidURL"

+

+

+	// $ANTLR start "entryRuleIdentifier"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1377:1: entryRuleIdentifier : ruleIdentifier EOF ;

+	public final void entryRuleIdentifier() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1381:1: ( ruleIdentifier EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1382:1: ruleIdentifier EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getIdentifierRule());

+				}

+				pushFollow(FOLLOW_ruleIdentifier_in_entryRuleIdentifier2804);

+				ruleIdentifier();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getIdentifierRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleIdentifier2811);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleIdentifier"

+

+

+	// $ANTLR start "ruleIdentifier"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1392:1: ruleIdentifier : ( ( rule__Identifier__Group__0 ) ) ;

+	public final void ruleIdentifier() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1397:2: ( ( ( rule__Identifier__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1398:1: ( ( rule__Identifier__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1398:1: ( ( rule__Identifier__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1399:1: ( rule__Identifier__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1400:1: ( rule__Identifier__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1400:2: rule__Identifier__Group__0

+					{

+						pushFollow(FOLLOW_rule__Identifier__Group__0_in_ruleIdentifier2841);

+						rule__Identifier__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleIdentifier"

+

+

+	// $ANTLR start "entryRuleNum"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1413:1: entryRuleNum : ruleNum EOF ;

+	public final void entryRuleNum() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1417:1: ( ruleNum EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1418:1: ruleNum EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getNumRule());

+				}

+				pushFollow(FOLLOW_ruleNum_in_entryRuleNum2873);

+				ruleNum();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getNumRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleNum2880);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleNum"

+

+

+	// $ANTLR start "ruleNum"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1428:1: ruleNum : ( ( rule__Num__Group__0 ) ) ;

+	public final void ruleNum() throws RecognitionException {

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1433:2: ( ( ( rule__Num__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1434:1: ( ( rule__Num__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1434:1: ( ( rule__Num__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1435:1: ( rule__Num__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1436:1: ( rule__Num__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1436:2: rule__Num__Group__0

+					{

+						pushFollow(FOLLOW_rule__Num__Group__0_in_ruleNum2910);

+						rule__Num__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+			myHiddenTokenState.restore();

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleNum"

+

+

+	// $ANTLR start "entryRuleHex"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1449:1: entryRuleHex : ruleHex EOF ;

+	public final void entryRuleHex() throws RecognitionException {

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1450:1: ( ruleHex EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1451:1: ruleHex EOF

+			{

+				if (state.backtracking == 0) {

+					before(grammarAccess.getHexRule());

+				}

+				pushFollow(FOLLOW_ruleHex_in_entryRuleHex2937);

+				ruleHex();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				if (state.backtracking == 0) {

+					after(grammarAccess.getHexRule());

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleHex2944);

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+		}

+		return;

+	}

+

+	// $ANTLR end "entryRuleHex"

+

+

+	// $ANTLR start "ruleHex"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1458:1: ruleHex : ( ( rule__Hex__Group__0 ) ) ;

+	public final void ruleHex() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1462:2: ( ( ( rule__Hex__Group__0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1463:1: ( ( rule__Hex__Group__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1463:1: ( ( rule__Hex__Group__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1464:1: ( rule__Hex__Group__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getHexAccess().getGroup());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1465:1: ( rule__Hex__Group__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1465:2: rule__Hex__Group__0

+					{

+						pushFollow(FOLLOW_rule__Hex__Group__0_in_ruleHex2970);

+						rule__Hex__Group__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getHexAccess().getGroup());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "ruleHex"

+

+

+	// $ANTLR start "rule__Stylesheet__Alternatives_2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1477:1: rule__Stylesheet__Alternatives_2 : ( ( ( rule__Stylesheet__RulesetAssignment_2_0 ) ) | ( (

+	// rule__Stylesheet__MediaAssignment_2_1 ) ) | ( ( rule__Stylesheet__PageAssignment_2_2 ) ) | ( ( rule__Stylesheet__Font_faceAssignment_2_3 ) ) | ( ( rule__Stylesheet__KeyframesAssignment_2_4 ) ) );

+	public final void rule__Stylesheet__Alternatives_2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1481:1: ( ( ( rule__Stylesheet__RulesetAssignment_2_0 ) ) | ( ( rule__Stylesheet__MediaAssignment_2_1

+			// ) ) | ( ( rule__Stylesheet__PageAssignment_2_2 ) ) | ( ( rule__Stylesheet__Font_faceAssignment_2_3 ) ) | ( ( rule__Stylesheet__KeyframesAssignment_2_4 ) ) )

+			int alt1 = 5;

+			switch (input.LA(1)) {

+			case RULE_DASH:

+			case RULE_UNDERSCORE:

+			case RULE_COLON:

+			case RULE_HASHMARK:

+			case RULE_ONE_HEX_LETTER:

+			case RULE_ONE_NON_HEX_LETTER:

+			case 36:

+			case 39:

+			case 42:

+			case 49:

+			case 50:

+			case 51:

+			case 52:

+			case 60: {

+				alt1 = 1;

+			}

+				break;

+			case 26:

+			case 27: {

+				alt1 = 2;

+			}

+				break;

+			case 24:

+			case 25: {

+				alt1 = 3;

+			}

+				break;

+			case 28:

+			case 29: {

+				alt1 = 4;

+			}

+				break;

+			case 30:

+			case 31: {

+				alt1 = 5;

+			}

+				break;

+			default:

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 1, 0, input);

+

+				throw nvae;

+			}

+

+			switch (alt1) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1482:1: ( ( rule__Stylesheet__RulesetAssignment_2_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1482:1: ( ( rule__Stylesheet__RulesetAssignment_2_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1483:1: ( rule__Stylesheet__RulesetAssignment_2_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getRulesetAssignment_2_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1484:1: ( rule__Stylesheet__RulesetAssignment_2_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1484:2: rule__Stylesheet__RulesetAssignment_2_0

+					{

+						pushFollow(FOLLOW_rule__Stylesheet__RulesetAssignment_2_0_in_rule__Stylesheet__Alternatives_23006);

+						rule__Stylesheet__RulesetAssignment_2_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getRulesetAssignment_2_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1488:6: ( ( rule__Stylesheet__MediaAssignment_2_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1488:6: ( ( rule__Stylesheet__MediaAssignment_2_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1489:1: ( rule__Stylesheet__MediaAssignment_2_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getMediaAssignment_2_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1490:1: ( rule__Stylesheet__MediaAssignment_2_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1490:2: rule__Stylesheet__MediaAssignment_2_1

+					{

+						pushFollow(FOLLOW_rule__Stylesheet__MediaAssignment_2_1_in_rule__Stylesheet__Alternatives_23024);

+						rule__Stylesheet__MediaAssignment_2_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getMediaAssignment_2_1());

+					}

+

+				}

+

+

+			}

+				break;

+			case 3:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1494:6: ( ( rule__Stylesheet__PageAssignment_2_2 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1494:6: ( ( rule__Stylesheet__PageAssignment_2_2 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1495:1: ( rule__Stylesheet__PageAssignment_2_2 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getPageAssignment_2_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1496:1: ( rule__Stylesheet__PageAssignment_2_2 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1496:2: rule__Stylesheet__PageAssignment_2_2

+					{

+						pushFollow(FOLLOW_rule__Stylesheet__PageAssignment_2_2_in_rule__Stylesheet__Alternatives_23042);

+						rule__Stylesheet__PageAssignment_2_2();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getPageAssignment_2_2());

+					}

+

+				}

+

+

+			}

+				break;

+			case 4:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1500:6: ( ( rule__Stylesheet__Font_faceAssignment_2_3 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1500:6: ( ( rule__Stylesheet__Font_faceAssignment_2_3 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1501:1: ( rule__Stylesheet__Font_faceAssignment_2_3 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getFont_faceAssignment_2_3());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1502:1: ( rule__Stylesheet__Font_faceAssignment_2_3 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1502:2: rule__Stylesheet__Font_faceAssignment_2_3

+					{

+						pushFollow(FOLLOW_rule__Stylesheet__Font_faceAssignment_2_3_in_rule__Stylesheet__Alternatives_23060);

+						rule__Stylesheet__Font_faceAssignment_2_3();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getFont_faceAssignment_2_3());

+					}

+

+				}

+

+

+			}

+				break;

+			case 5:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1506:6: ( ( rule__Stylesheet__KeyframesAssignment_2_4 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1506:6: ( ( rule__Stylesheet__KeyframesAssignment_2_4 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1507:1: ( rule__Stylesheet__KeyframesAssignment_2_4 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getKeyframesAssignment_2_4());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1508:1: ( rule__Stylesheet__KeyframesAssignment_2_4 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1508:2: rule__Stylesheet__KeyframesAssignment_2_4

+					{

+						pushFollow(FOLLOW_rule__Stylesheet__KeyframesAssignment_2_4_in_rule__Stylesheet__Alternatives_23078);

+						rule__Stylesheet__KeyframesAssignment_2_4();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getKeyframesAssignment_2_4());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__Alternatives_2"

+

+

+	// $ANTLR start "rule__Charset__Alternatives_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1517:1: rule__Charset__Alternatives_0 : ( ( '@charset' ) | ( '@CHARSET' ) );

+	public final void rule__Charset__Alternatives_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1521:1: ( ( '@charset' ) | ( '@CHARSET' ) )

+			int alt2 = 2;

+			int LA2_0 = input.LA(1);

+

+			if ((LA2_0 == 20)) {

+				alt2 = 1;

+			}

+			else if ((LA2_0 == 21)) {

+				alt2 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 2, 0, input);

+

+				throw nvae;

+			}

+			switch (alt2) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1522:1: ( '@charset' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1522:1: ( '@charset' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1523:1: '@charset'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCharsetAccess().getCharsetKeyword_0_0());

+					}

+					match(input, 20, FOLLOW_20_in_rule__Charset__Alternatives_03112);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCharsetAccess().getCharsetKeyword_0_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1530:6: ( '@CHARSET' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1530:6: ( '@CHARSET' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1531:1: '@CHARSET'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCharsetAccess().getCHARSETKeyword_0_1());

+					}

+					match(input, 21, FOLLOW_21_in_rule__Charset__Alternatives_03132);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCharsetAccess().getCHARSETKeyword_0_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Charset__Alternatives_0"

+

+

+	// $ANTLR start "rule__ImportExpression__Alternatives_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1543:1: rule__ImportExpression__Alternatives_0 : ( ( '@import' ) | ( '@IMPORT' ) );

+	public final void rule__ImportExpression__Alternatives_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1547:1: ( ( '@import' ) | ( '@IMPORT' ) )

+			int alt3 = 2;

+			int LA3_0 = input.LA(1);

+

+			if ((LA3_0 == 22)) {

+				alt3 = 1;

+			}

+			else if ((LA3_0 == 23)) {

+				alt3 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 3, 0, input);

+

+				throw nvae;

+			}

+			switch (alt3) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1548:1: ( '@import' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1548:1: ( '@import' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1549:1: '@import'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getImportExpressionAccess().getImportKeyword_0_0());

+					}

+					match(input, 22, FOLLOW_22_in_rule__ImportExpression__Alternatives_03167);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getImportExpressionAccess().getImportKeyword_0_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1556:6: ( '@IMPORT' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1556:6: ( '@IMPORT' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1557:1: '@IMPORT'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getImportExpressionAccess().getIMPORTKeyword_0_1());

+					}

+					match(input, 23, FOLLOW_23_in_rule__ImportExpression__Alternatives_03187);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getImportExpressionAccess().getIMPORTKeyword_0_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__Alternatives_0"

+

+

+	// $ANTLR start "rule__ImportExpression__Alternatives_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1569:1: rule__ImportExpression__Alternatives_1 : ( ( ( rule__ImportExpression__ValueAssignment_1_0 ) ) | ( (

+	// rule__ImportExpression__Group_1_1__0 ) ) );

+	public final void rule__ImportExpression__Alternatives_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1573:1: ( ( ( rule__ImportExpression__ValueAssignment_1_0 ) ) | ( (

+			// rule__ImportExpression__Group_1_1__0 ) ) )

+			int alt4 = 2;

+			int LA4_0 = input.LA(1);

+

+			if ((LA4_0 == RULE_CSSSTRING)) {

+				alt4 = 1;

+			}

+			else if ((LA4_0 == 64)) {

+				alt4 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 4, 0, input);

+

+				throw nvae;

+			}

+			switch (alt4) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1574:1: ( ( rule__ImportExpression__ValueAssignment_1_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1574:1: ( ( rule__ImportExpression__ValueAssignment_1_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1575:1: ( rule__ImportExpression__ValueAssignment_1_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getImportExpressionAccess().getValueAssignment_1_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1576:1: ( rule__ImportExpression__ValueAssignment_1_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1576:2: rule__ImportExpression__ValueAssignment_1_0

+					{

+						pushFollow(FOLLOW_rule__ImportExpression__ValueAssignment_1_0_in_rule__ImportExpression__Alternatives_13221);

+						rule__ImportExpression__ValueAssignment_1_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getImportExpressionAccess().getValueAssignment_1_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1580:6: ( ( rule__ImportExpression__Group_1_1__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1580:6: ( ( rule__ImportExpression__Group_1_1__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1581:1: ( rule__ImportExpression__Group_1_1__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getImportExpressionAccess().getGroup_1_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1582:1: ( rule__ImportExpression__Group_1_1__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1582:2: rule__ImportExpression__Group_1_1__0

+					{

+						pushFollow(FOLLOW_rule__ImportExpression__Group_1_1__0_in_rule__ImportExpression__Alternatives_13239);

+						rule__ImportExpression__Group_1_1__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getImportExpressionAccess().getGroup_1_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__Alternatives_1"

+

+

+	// $ANTLR start "rule__Page__Alternatives_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1591:1: rule__Page__Alternatives_1 : ( ( '@page' ) | ( '@PAGE' ) );

+	public final void rule__Page__Alternatives_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1595:1: ( ( '@page' ) | ( '@PAGE' ) )

+			int alt5 = 2;

+			int LA5_0 = input.LA(1);

+

+			if ((LA5_0 == 24)) {

+				alt5 = 1;

+			}

+			else if ((LA5_0 == 25)) {

+				alt5 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 5, 0, input);

+

+				throw nvae;

+			}

+			switch (alt5) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1596:1: ( '@page' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1596:1: ( '@page' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1597:1: '@page'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getPageKeyword_1_0());

+					}

+					match(input, 24, FOLLOW_24_in_rule__Page__Alternatives_13273);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getPageKeyword_1_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1604:6: ( '@PAGE' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1604:6: ( '@PAGE' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1605:1: '@PAGE'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getPAGEKeyword_1_1());

+					}

+					match(input, 25, FOLLOW_25_in_rule__Page__Alternatives_13293);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getPAGEKeyword_1_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Alternatives_1"

+

+

+	// $ANTLR start "rule__Media__Alternatives_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1617:1: rule__Media__Alternatives_0 : ( ( '@media' ) | ( '@MEDIA' ) );

+	public final void rule__Media__Alternatives_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1621:1: ( ( '@media' ) | ( '@MEDIA' ) )

+			int alt6 = 2;

+			int LA6_0 = input.LA(1);

+

+			if ((LA6_0 == 26)) {

+				alt6 = 1;

+			}

+			else if ((LA6_0 == 27)) {

+				alt6 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 6, 0, input);

+

+				throw nvae;

+			}

+			switch (alt6) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1622:1: ( '@media' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1622:1: ( '@media' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1623:1: '@media'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMediaAccess().getMediaKeyword_0_0());

+					}

+					match(input, 26, FOLLOW_26_in_rule__Media__Alternatives_03328);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMediaAccess().getMediaKeyword_0_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1630:6: ( '@MEDIA' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1630:6: ( '@MEDIA' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1631:1: '@MEDIA'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMediaAccess().getMEDIAKeyword_0_1());

+					}

+					match(input, 27, FOLLOW_27_in_rule__Media__Alternatives_03348);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMediaAccess().getMEDIAKeyword_0_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media__Alternatives_0"

+

+

+	// $ANTLR start "rule__Font_face__Alternatives_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1643:1: rule__Font_face__Alternatives_1 : ( ( '@font-face' ) | ( '@FONT-FACE' ) );

+	public final void rule__Font_face__Alternatives_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1647:1: ( ( '@font-face' ) | ( '@FONT-FACE' ) )

+			int alt7 = 2;

+			int LA7_0 = input.LA(1);

+

+			if ((LA7_0 == 28)) {

+				alt7 = 1;

+			}

+			else if ((LA7_0 == 29)) {

+				alt7 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 7, 0, input);

+

+				throw nvae;

+			}

+			switch (alt7) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1648:1: ( '@font-face' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1648:1: ( '@font-face' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1649:1: '@font-face'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getFont_faceAccess().getFontFaceKeyword_1_0());

+					}

+					match(input, 28, FOLLOW_28_in_rule__Font_face__Alternatives_13383);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getFont_faceAccess().getFontFaceKeyword_1_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1656:6: ( '@FONT-FACE' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1656:6: ( '@FONT-FACE' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1657:1: '@FONT-FACE'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getFont_faceAccess().getFONTFACEKeyword_1_1());

+					}

+					match(input, 29, FOLLOW_29_in_rule__Font_face__Alternatives_13403);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getFont_faceAccess().getFONTFACEKeyword_1_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Alternatives_1"

+

+

+	// $ANTLR start "rule__Keyframes__Alternatives_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1669:1: rule__Keyframes__Alternatives_1 : ( ( '@keyframes' ) | ( '@KEYFRAMES' ) );

+	public final void rule__Keyframes__Alternatives_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1673:1: ( ( '@keyframes' ) | ( '@KEYFRAMES' ) )

+			int alt8 = 2;

+			int LA8_0 = input.LA(1);

+

+			if ((LA8_0 == 30)) {

+				alt8 = 1;

+			}

+			else if ((LA8_0 == 31)) {

+				alt8 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 8, 0, input);

+

+				throw nvae;

+			}

+			switch (alt8) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1674:1: ( '@keyframes' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1674:1: ( '@keyframes' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1675:1: '@keyframes'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getKeyframesKeyword_1_0());

+					}

+					match(input, 30, FOLLOW_30_in_rule__Keyframes__Alternatives_13438);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getKeyframesKeyword_1_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1682:6: ( '@KEYFRAMES' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1682:6: ( '@KEYFRAMES' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1683:1: '@KEYFRAMES'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getKEYFRAMESKeyword_1_1());

+					}

+					match(input, 31, FOLLOW_31_in_rule__Keyframes__Alternatives_13458);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getKEYFRAMESKeyword_1_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Alternatives_1"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Alternatives_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1695:1: rule__Keyframe_selector__Alternatives_0 : ( ( ( rule__Keyframe_selector__TypeAssignment_0_0 ) ) | ( (

+	// rule__Keyframe_selector__Group_0_1__0 ) ) );

+	public final void rule__Keyframe_selector__Alternatives_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1699:1: ( ( ( rule__Keyframe_selector__TypeAssignment_0_0 ) ) | ( (

+			// rule__Keyframe_selector__Group_0_1__0 ) ) )

+			int alt9 = 2;

+			switch (input.LA(1)) {

+			case RULE_DASH: {

+				int LA9_1 = input.LA(2);

+

+				if ((LA9_1 == RULE_ONE_INT || LA9_1 == 39)) {

+					alt9 = 2;

+				}

+				else if ((LA9_1 == RULE_UNDERSCORE || (LA9_1 >= RULE_ONE_HEX_LETTER && LA9_1 <= RULE_ONE_NON_HEX_LETTER) || (LA9_1 >= 49 && LA9_1 <= 52))) {

+					alt9 = 1;

+				}

+				else {

+					if (state.backtracking > 0) {

+						state.failed = true;

+						return;

+					}

+					NoViableAltException nvae =

+							new NoViableAltException("", 9, 1, input);

+

+					throw nvae;

+				}

+			}

+				break;

+			case RULE_UNDERSCORE:

+			case RULE_ONE_HEX_LETTER:

+			case RULE_ONE_NON_HEX_LETTER:

+			case 49:

+			case 50:

+			case 51:

+			case 52: {

+				alt9 = 1;

+			}

+				break;

+			case RULE_PLUS:

+			case RULE_ONE_INT:

+			case 39: {

+				alt9 = 2;

+			}

+				break;

+			default:

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 9, 0, input);

+

+				throw nvae;

+			}

+

+			switch (alt9) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1700:1: ( ( rule__Keyframe_selector__TypeAssignment_0_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1700:1: ( ( rule__Keyframe_selector__TypeAssignment_0_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1701:1: ( rule__Keyframe_selector__TypeAssignment_0_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getTypeAssignment_0_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1702:1: ( rule__Keyframe_selector__TypeAssignment_0_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1702:2: rule__Keyframe_selector__TypeAssignment_0_0

+					{

+						pushFollow(FOLLOW_rule__Keyframe_selector__TypeAssignment_0_0_in_rule__Keyframe_selector__Alternatives_03492);

+						rule__Keyframe_selector__TypeAssignment_0_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getTypeAssignment_0_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1706:6: ( ( rule__Keyframe_selector__Group_0_1__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1706:6: ( ( rule__Keyframe_selector__Group_0_1__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1707:1: ( rule__Keyframe_selector__Group_0_1__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getGroup_0_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1708:1: ( rule__Keyframe_selector__Group_0_1__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1708:2: rule__Keyframe_selector__Group_0_1__0

+					{

+						pushFollow(FOLLOW_rule__Keyframe_selector__Group_0_1__0_in_rule__Keyframe_selector__Alternatives_03510);

+						rule__Keyframe_selector__Group_0_1__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getGroup_0_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Alternatives_0"

+

+

+	// $ANTLR start "rule__Selector__Alternatives_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1717:1: rule__Selector__Alternatives_1 : ( ( ( rule__Selector__Group_1_0__0 ) ) | ( (

+	// rule__Selector__Group_1_1__0 ) ) );

+	public final void rule__Selector__Alternatives_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1721:1: ( ( ( rule__Selector__Group_1_0__0 ) ) | ( ( rule__Selector__Group_1_1__0 ) ) )

+			int alt10 = 2;

+			int LA10_0 = input.LA(1);

+

+			if ((LA10_0 == RULE_PLUS || (LA10_0 >= 37 && LA10_0 <= 38))) {

+				alt10 = 1;

+			}

+			else if ((LA10_0 == RULE_WS)) {

+				alt10 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 10, 0, input);

+

+				throw nvae;

+			}

+			switch (alt10) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1722:1: ( ( rule__Selector__Group_1_0__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1722:1: ( ( rule__Selector__Group_1_0__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1723:1: ( rule__Selector__Group_1_0__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getGroup_1_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1724:1: ( rule__Selector__Group_1_0__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1724:2: rule__Selector__Group_1_0__0

+					{

+						pushFollow(FOLLOW_rule__Selector__Group_1_0__0_in_rule__Selector__Alternatives_13543);

+						rule__Selector__Group_1_0__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getGroup_1_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1728:6: ( ( rule__Selector__Group_1_1__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1728:6: ( ( rule__Selector__Group_1_1__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1729:1: ( rule__Selector__Group_1_1__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getGroup_1_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1730:1: ( rule__Selector__Group_1_1__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1730:2: rule__Selector__Group_1_1__0

+					{

+						pushFollow(FOLLOW_rule__Selector__Group_1_1__0_in_rule__Selector__Alternatives_13561);

+						rule__Selector__Group_1_1__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getGroup_1_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Alternatives_1"

+

+

+	// $ANTLR start "rule__SimpleSelectorForNegation__Alternatives"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1739:1: rule__SimpleSelectorForNegation__Alternatives : ( ( ( rule__SimpleSelectorForNegation__Group_0__0 ) )

+	// | ( ( ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 ) ) ( ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 )* ) ) );

+	public final void rule__SimpleSelectorForNegation__Alternatives() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1743:1: ( ( ( rule__SimpleSelectorForNegation__Group_0__0 ) ) | ( ( (

+			// rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 ) ) ( ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 )* ) ) )

+			int alt12 = 2;

+			int LA12_0 = input.LA(1);

+

+			if (((LA12_0 >= RULE_DASH && LA12_0 <= RULE_UNDERSCORE) || (LA12_0 >= RULE_ONE_HEX_LETTER && LA12_0 <= RULE_ONE_NON_HEX_LETTER) || LA12_0 == 36 || (LA12_0 >= 49 && LA12_0 <= 52) || LA12_0 == 60)) {

+				alt12 = 1;

+			}

+			else if (((LA12_0 >= RULE_COLON && LA12_0 <= RULE_HASHMARK) || LA12_0 == 39 || LA12_0 == 42)) {

+				alt12 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 12, 0, input);

+

+				throw nvae;

+			}

+			switch (alt12) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1744:1: ( ( rule__SimpleSelectorForNegation__Group_0__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1744:1: ( ( rule__SimpleSelectorForNegation__Group_0__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1745:1: ( rule__SimpleSelectorForNegation__Group_0__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimpleSelectorForNegationAccess().getGroup_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1746:1: ( rule__SimpleSelectorForNegation__Group_0__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1746:2: rule__SimpleSelectorForNegation__Group_0__0

+					{

+						pushFollow(FOLLOW_rule__SimpleSelectorForNegation__Group_0__0_in_rule__SimpleSelectorForNegation__Alternatives3594);

+						rule__SimpleSelectorForNegation__Group_0__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimpleSelectorForNegationAccess().getGroup_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1750:6: ( ( ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 ) ) ( (

+			// rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 )* ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1750:6: ( ( ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 ) ) ( (

+				// rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 )* ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1751:1: ( ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 ) ) ( (

+				// rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 )* )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1751:1: ( ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1752:1: ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 )

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_1());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1753:1: ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1753:2: rule__SimpleSelectorForNegation__SubSelectorsAssignment_1

+						{

+							pushFollow(FOLLOW_rule__SimpleSelectorForNegation__SubSelectorsAssignment_1_in_rule__SimpleSelectorForNegation__Alternatives3614);

+							rule__SimpleSelectorForNegation__SubSelectorsAssignment_1();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_1());

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1756:1: ( ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 )* )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1757:1: ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 )*

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_1());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1758:1: ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 )*

+						loop11: do {

+							int alt11 = 2;

+							int LA11_0 = input.LA(1);

+

+							if (((LA11_0 >= RULE_COLON && LA11_0 <= RULE_HASHMARK) || LA11_0 == 39 || LA11_0 == 42)) {

+								alt11 = 1;

+							}

+

+

+							switch (alt11) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1758:2: rule__SimpleSelectorForNegation__SubSelectorsAssignment_1

+							{

+								pushFollow(FOLLOW_rule__SimpleSelectorForNegation__SubSelectorsAssignment_1_in_rule__SimpleSelectorForNegation__Alternatives3626);

+								rule__SimpleSelectorForNegation__SubSelectorsAssignment_1();

+

+								state._fsp--;

+								if (state.failed) {

+									return;

+								}

+

+							}

+								break;

+

+							default:

+								break loop11;

+							}

+						} while (true);

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_1());

+						}

+

+					}

+

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SimpleSelectorForNegation__Alternatives"

+

+

+	// $ANTLR start "rule__SimpleSelectorForNegation__Alternatives_0_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1768:1: rule__SimpleSelectorForNegation__Alternatives_0_0 : ( ( (

+	// rule__SimpleSelectorForNegation__ElementAssignment_0_0_0 ) ) | ( ( rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1 ) ) );

+	public final void rule__SimpleSelectorForNegation__Alternatives_0_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1772:1: ( ( ( rule__SimpleSelectorForNegation__ElementAssignment_0_0_0 ) ) | ( (

+			// rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1 ) ) )

+			int alt13 = 2;

+			alt13 = dfa13.predict(input);

+			switch (alt13) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1773:1: ( ( rule__SimpleSelectorForNegation__ElementAssignment_0_0_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1773:1: ( ( rule__SimpleSelectorForNegation__ElementAssignment_0_0_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1774:1: ( rule__SimpleSelectorForNegation__ElementAssignment_0_0_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimpleSelectorForNegationAccess().getElementAssignment_0_0_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1775:1: ( rule__SimpleSelectorForNegation__ElementAssignment_0_0_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1775:2: rule__SimpleSelectorForNegation__ElementAssignment_0_0_0

+					{

+						pushFollow(FOLLOW_rule__SimpleSelectorForNegation__ElementAssignment_0_0_0_in_rule__SimpleSelectorForNegation__Alternatives_0_03662);

+						rule__SimpleSelectorForNegation__ElementAssignment_0_0_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimpleSelectorForNegationAccess().getElementAssignment_0_0_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1779:6: ( ( rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1779:6: ( ( rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1780:1: ( rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimpleSelectorForNegationAccess().getUniversalAssignment_0_0_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1781:1: ( rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1781:2: rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1

+					{

+						pushFollow(FOLLOW_rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1_in_rule__SimpleSelectorForNegation__Alternatives_0_03680);

+						rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimpleSelectorForNegationAccess().getUniversalAssignment_0_0_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SimpleSelectorForNegation__Alternatives_0_0"

+

+

+	// $ANTLR start "rule__SubSelectorForNegation__Alternatives"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1790:1: rule__SubSelectorForNegation__Alternatives : ( ( ruleIdSelector ) | ( ruleClassSelector ) | (

+	// ruleAttributeSelector ) | ( rulePseudoClass ) );

+	public final void rule__SubSelectorForNegation__Alternatives() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1794:1: ( ( ruleIdSelector ) | ( ruleClassSelector ) | ( ruleAttributeSelector ) | ( rulePseudoClass

+			// ) )

+			int alt14 = 4;

+			switch (input.LA(1)) {

+			case RULE_HASHMARK: {

+				alt14 = 1;

+			}

+				break;

+			case 39: {

+				alt14 = 2;

+			}

+				break;

+			case 42: {

+				alt14 = 3;

+			}

+				break;

+			case RULE_COLON: {

+				alt14 = 4;

+			}

+				break;

+			default:

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 14, 0, input);

+

+				throw nvae;

+			}

+

+			switch (alt14) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1795:1: ( ruleIdSelector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1795:1: ( ruleIdSelector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1796:1: ruleIdSelector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSubSelectorForNegationAccess().getIdSelectorParserRuleCall_0());

+					}

+					pushFollow(FOLLOW_ruleIdSelector_in_rule__SubSelectorForNegation__Alternatives3713);

+					ruleIdSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSubSelectorForNegationAccess().getIdSelectorParserRuleCall_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1801:6: ( ruleClassSelector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1801:6: ( ruleClassSelector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1802:1: ruleClassSelector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSubSelectorForNegationAccess().getClassSelectorParserRuleCall_1());

+					}

+					pushFollow(FOLLOW_ruleClassSelector_in_rule__SubSelectorForNegation__Alternatives3730);

+					ruleClassSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSubSelectorForNegationAccess().getClassSelectorParserRuleCall_1());

+					}

+

+				}

+

+

+			}

+				break;

+			case 3:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1807:6: ( ruleAttributeSelector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1807:6: ( ruleAttributeSelector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1808:1: ruleAttributeSelector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSubSelectorForNegationAccess().getAttributeSelectorParserRuleCall_2());

+					}

+					pushFollow(FOLLOW_ruleAttributeSelector_in_rule__SubSelectorForNegation__Alternatives3747);

+					ruleAttributeSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSubSelectorForNegationAccess().getAttributeSelectorParserRuleCall_2());

+					}

+

+				}

+

+

+			}

+				break;

+			case 4:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1813:6: ( rulePseudoClass )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1813:6: ( rulePseudoClass )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1814:1: rulePseudoClass

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSubSelectorForNegationAccess().getPseudoClassParserRuleCall_3());

+					}

+					pushFollow(FOLLOW_rulePseudoClass_in_rule__SubSelectorForNegation__Alternatives3764);

+					rulePseudoClass();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSubSelectorForNegationAccess().getPseudoClassParserRuleCall_3());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SubSelectorForNegation__Alternatives"

+

+

+	// $ANTLR start "rule__Simple_selector__Alternatives"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1824:1: rule__Simple_selector__Alternatives : ( ( ( rule__Simple_selector__Group_0__0 ) ) | ( ( (

+	// rule__Simple_selector__SubSelectorsAssignment_1 ) ) ( ( rule__Simple_selector__SubSelectorsAssignment_1 )* ) ) );

+	public final void rule__Simple_selector__Alternatives() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1828:1: ( ( ( rule__Simple_selector__Group_0__0 ) ) | ( ( (

+			// rule__Simple_selector__SubSelectorsAssignment_1 ) ) ( ( rule__Simple_selector__SubSelectorsAssignment_1 )* ) ) )

+			int alt16 = 2;

+			int LA16_0 = input.LA(1);

+

+			if (((LA16_0 >= RULE_DASH && LA16_0 <= RULE_UNDERSCORE) || (LA16_0 >= RULE_ONE_HEX_LETTER && LA16_0 <= RULE_ONE_NON_HEX_LETTER) || LA16_0 == 36 || (LA16_0 >= 49 && LA16_0 <= 52) || LA16_0 == 60)) {

+				alt16 = 1;

+			}

+			else if (((LA16_0 >= RULE_COLON && LA16_0 <= RULE_HASHMARK) || LA16_0 == 39 || LA16_0 == 42)) {

+				alt16 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 16, 0, input);

+

+				throw nvae;

+			}

+			switch (alt16) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1829:1: ( ( rule__Simple_selector__Group_0__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1829:1: ( ( rule__Simple_selector__Group_0__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1830:1: ( rule__Simple_selector__Group_0__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimple_selectorAccess().getGroup_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1831:1: ( rule__Simple_selector__Group_0__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1831:2: rule__Simple_selector__Group_0__0

+					{

+						pushFollow(FOLLOW_rule__Simple_selector__Group_0__0_in_rule__Simple_selector__Alternatives3796);

+						rule__Simple_selector__Group_0__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimple_selectorAccess().getGroup_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1835:6: ( ( ( rule__Simple_selector__SubSelectorsAssignment_1 ) ) ( (

+			// rule__Simple_selector__SubSelectorsAssignment_1 )* ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1835:6: ( ( ( rule__Simple_selector__SubSelectorsAssignment_1 ) ) ( (

+				// rule__Simple_selector__SubSelectorsAssignment_1 )* ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1836:1: ( ( rule__Simple_selector__SubSelectorsAssignment_1 ) ) ( (

+				// rule__Simple_selector__SubSelectorsAssignment_1 )* )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1836:1: ( ( rule__Simple_selector__SubSelectorsAssignment_1 ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1837:1: ( rule__Simple_selector__SubSelectorsAssignment_1 )

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_1());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1838:1: ( rule__Simple_selector__SubSelectorsAssignment_1 )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1838:2: rule__Simple_selector__SubSelectorsAssignment_1

+						{

+							pushFollow(FOLLOW_rule__Simple_selector__SubSelectorsAssignment_1_in_rule__Simple_selector__Alternatives3816);

+							rule__Simple_selector__SubSelectorsAssignment_1();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_1());

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1841:1: ( ( rule__Simple_selector__SubSelectorsAssignment_1 )* )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1842:1: ( rule__Simple_selector__SubSelectorsAssignment_1 )*

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_1());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1843:1: ( rule__Simple_selector__SubSelectorsAssignment_1 )*

+						loop15: do {

+							int alt15 = 2;

+							int LA15_0 = input.LA(1);

+

+							if (((LA15_0 >= RULE_COLON && LA15_0 <= RULE_HASHMARK) || LA15_0 == 39 || LA15_0 == 42)) {

+								alt15 = 1;

+							}

+

+

+							switch (alt15) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1843:2: rule__Simple_selector__SubSelectorsAssignment_1

+							{

+								pushFollow(FOLLOW_rule__Simple_selector__SubSelectorsAssignment_1_in_rule__Simple_selector__Alternatives3828);

+								rule__Simple_selector__SubSelectorsAssignment_1();

+

+								state._fsp--;

+								if (state.failed) {

+									return;

+								}

+

+							}

+								break;

+

+							default:

+								break loop15;

+							}

+						} while (true);

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_1());

+						}

+

+					}

+

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Simple_selector__Alternatives"

+

+

+	// $ANTLR start "rule__Simple_selector__Alternatives_0_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1853:1: rule__Simple_selector__Alternatives_0_0 : ( ( ( rule__Simple_selector__ElementAssignment_0_0_0 ) ) |

+	// ( ( rule__Simple_selector__UniversalAssignment_0_0_1 ) ) );

+	public final void rule__Simple_selector__Alternatives_0_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1857:1: ( ( ( rule__Simple_selector__ElementAssignment_0_0_0 ) ) | ( (

+			// rule__Simple_selector__UniversalAssignment_0_0_1 ) ) )

+			int alt17 = 2;

+			alt17 = dfa17.predict(input);

+			switch (alt17) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1858:1: ( ( rule__Simple_selector__ElementAssignment_0_0_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1858:1: ( ( rule__Simple_selector__ElementAssignment_0_0_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1859:1: ( rule__Simple_selector__ElementAssignment_0_0_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimple_selectorAccess().getElementAssignment_0_0_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1860:1: ( rule__Simple_selector__ElementAssignment_0_0_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1860:2: rule__Simple_selector__ElementAssignment_0_0_0

+					{

+						pushFollow(FOLLOW_rule__Simple_selector__ElementAssignment_0_0_0_in_rule__Simple_selector__Alternatives_0_03864);

+						rule__Simple_selector__ElementAssignment_0_0_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimple_selectorAccess().getElementAssignment_0_0_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1864:6: ( ( rule__Simple_selector__UniversalAssignment_0_0_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1864:6: ( ( rule__Simple_selector__UniversalAssignment_0_0_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1865:1: ( rule__Simple_selector__UniversalAssignment_0_0_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimple_selectorAccess().getUniversalAssignment_0_0_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1866:1: ( rule__Simple_selector__UniversalAssignment_0_0_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1866:2: rule__Simple_selector__UniversalAssignment_0_0_1

+					{

+						pushFollow(FOLLOW_rule__Simple_selector__UniversalAssignment_0_0_1_in_rule__Simple_selector__Alternatives_0_03882);

+						rule__Simple_selector__UniversalAssignment_0_0_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimple_selectorAccess().getUniversalAssignment_0_0_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Simple_selector__Alternatives_0_0"

+

+

+	// $ANTLR start "rule__SubSelector__Alternatives"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1875:1: rule__SubSelector__Alternatives : ( ( ruleIdSelector ) | ( ruleClassSelector ) | (

+	// ruleAttributeSelector ) | ( rulePseudoClassOrFunc ) );

+	public final void rule__SubSelector__Alternatives() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1879:1: ( ( ruleIdSelector ) | ( ruleClassSelector ) | ( ruleAttributeSelector ) | (

+			// rulePseudoClassOrFunc ) )

+			int alt18 = 4;

+			switch (input.LA(1)) {

+			case RULE_HASHMARK: {

+				alt18 = 1;

+			}

+				break;

+			case 39: {

+				alt18 = 2;

+			}

+				break;

+			case 42: {

+				alt18 = 3;

+			}

+				break;

+			case RULE_COLON: {

+				alt18 = 4;

+			}

+				break;

+			default:

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 18, 0, input);

+

+				throw nvae;

+			}

+

+			switch (alt18) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1880:1: ( ruleIdSelector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1880:1: ( ruleIdSelector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1881:1: ruleIdSelector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSubSelectorAccess().getIdSelectorParserRuleCall_0());

+					}

+					pushFollow(FOLLOW_ruleIdSelector_in_rule__SubSelector__Alternatives3915);

+					ruleIdSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSubSelectorAccess().getIdSelectorParserRuleCall_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1886:6: ( ruleClassSelector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1886:6: ( ruleClassSelector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1887:1: ruleClassSelector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSubSelectorAccess().getClassSelectorParserRuleCall_1());

+					}

+					pushFollow(FOLLOW_ruleClassSelector_in_rule__SubSelector__Alternatives3932);

+					ruleClassSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSubSelectorAccess().getClassSelectorParserRuleCall_1());

+					}

+

+				}

+

+

+			}

+				break;

+			case 3:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1892:6: ( ruleAttributeSelector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1892:6: ( ruleAttributeSelector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1893:1: ruleAttributeSelector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSubSelectorAccess().getAttributeSelectorParserRuleCall_2());

+					}

+					pushFollow(FOLLOW_ruleAttributeSelector_in_rule__SubSelector__Alternatives3949);

+					ruleAttributeSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSubSelectorAccess().getAttributeSelectorParserRuleCall_2());

+					}

+

+				}

+

+

+			}

+				break;

+			case 4:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1898:6: ( rulePseudoClassOrFunc )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1898:6: ( rulePseudoClassOrFunc )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1899:1: rulePseudoClassOrFunc

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSubSelectorAccess().getPseudoClassOrFuncParserRuleCall_3());

+					}

+					pushFollow(FOLLOW_rulePseudoClassOrFunc_in_rule__SubSelector__Alternatives3966);

+					rulePseudoClassOrFunc();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSubSelectorAccess().getPseudoClassOrFuncParserRuleCall_3());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SubSelector__Alternatives"

+

+

+	// $ANTLR start "rule__AttributeSelector__OpAlternatives_3_0_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1909:1: rule__AttributeSelector__OpAlternatives_3_0_0 : ( ( '^=' ) | ( '$=' ) | ( '*=' ) | ( '=' ) | (

+	// RULE_INCLUDES ) | ( RULE_DASHMATCH ) );

+	public final void rule__AttributeSelector__OpAlternatives_3_0_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1913:1: ( ( '^=' ) | ( '$=' ) | ( '*=' ) | ( '=' ) | ( RULE_INCLUDES ) | ( RULE_DASHMATCH ) )

+			int alt19 = 6;

+			switch (input.LA(1)) {

+			case 32: {

+				alt19 = 1;

+			}

+				break;

+			case 33: {

+				alt19 = 2;

+			}

+				break;

+			case 34: {

+				alt19 = 3;

+			}

+				break;

+			case 35: {

+				alt19 = 4;

+			}

+				break;

+			case RULE_INCLUDES: {

+				alt19 = 5;

+			}

+				break;

+			case RULE_DASHMATCH: {

+				alt19 = 6;

+			}

+				break;

+			default:

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 19, 0, input);

+

+				throw nvae;

+			}

+

+			switch (alt19) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1914:1: ( '^=' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1914:1: ( '^=' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1915:1: '^='

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getOpCircumflexAccentEqualsSignKeyword_3_0_0_0());

+					}

+					match(input, 32, FOLLOW_32_in_rule__AttributeSelector__OpAlternatives_3_0_03999);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getOpCircumflexAccentEqualsSignKeyword_3_0_0_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1922:6: ( '$=' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1922:6: ( '$=' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1923:1: '$='

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getOpDollarSignEqualsSignKeyword_3_0_0_1());

+					}

+					match(input, 33, FOLLOW_33_in_rule__AttributeSelector__OpAlternatives_3_0_04019);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getOpDollarSignEqualsSignKeyword_3_0_0_1());

+					}

+

+				}

+

+

+			}

+				break;

+			case 3:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1930:6: ( '*=' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1930:6: ( '*=' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1931:1: '*='

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getOpAsteriskEqualsSignKeyword_3_0_0_2());

+					}

+					match(input, 34, FOLLOW_34_in_rule__AttributeSelector__OpAlternatives_3_0_04039);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getOpAsteriskEqualsSignKeyword_3_0_0_2());

+					}

+

+				}

+

+

+			}

+				break;

+			case 4:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1938:6: ( '=' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1938:6: ( '=' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1939:1: '='

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getOpEqualsSignKeyword_3_0_0_3());

+					}

+					match(input, 35, FOLLOW_35_in_rule__AttributeSelector__OpAlternatives_3_0_04059);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getOpEqualsSignKeyword_3_0_0_3());

+					}

+

+				}

+

+

+			}

+				break;

+			case 5:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1946:6: ( RULE_INCLUDES )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1946:6: ( RULE_INCLUDES )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1947:1: RULE_INCLUDES

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getOpINCLUDESTerminalRuleCall_3_0_0_4());

+					}

+					match(input, RULE_INCLUDES, FOLLOW_RULE_INCLUDES_in_rule__AttributeSelector__OpAlternatives_3_0_04078);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getOpINCLUDESTerminalRuleCall_3_0_0_4());

+					}

+

+				}

+

+

+			}

+				break;

+			case 6:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1952:6: ( RULE_DASHMATCH )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1952:6: ( RULE_DASHMATCH )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1953:1: RULE_DASHMATCH

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getOpDASHMATCHTerminalRuleCall_3_0_0_5());

+					}

+					match(input, RULE_DASHMATCH, FOLLOW_RULE_DASHMATCH_in_rule__AttributeSelector__OpAlternatives_3_0_04095);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getOpDASHMATCHTerminalRuleCall_3_0_0_5());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__OpAlternatives_3_0_0"

+

+

+	// $ANTLR start "rule__AttributeSelector__ValueAlternatives_3_1_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1963:1: rule__AttributeSelector__ValueAlternatives_3_1_0 : ( ( ruleIdentifier ) | ( RULE_CSSSTRING ) );

+	public final void rule__AttributeSelector__ValueAlternatives_3_1_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1967:1: ( ( ruleIdentifier ) | ( RULE_CSSSTRING ) )

+			int alt20 = 2;

+			int LA20_0 = input.LA(1);

+

+			if (((LA20_0 >= RULE_DASH && LA20_0 <= RULE_UNDERSCORE) || (LA20_0 >= RULE_ONE_HEX_LETTER && LA20_0 <= RULE_ONE_NON_HEX_LETTER) || (LA20_0 >= 49 && LA20_0 <= 52))) {

+				alt20 = 1;

+			}

+			else if ((LA20_0 == RULE_CSSSTRING)) {

+				alt20 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 20, 0, input);

+

+				throw nvae;

+			}

+			switch (alt20) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1968:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1968:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1969:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getValueIdentifierParserRuleCall_3_1_0_0());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rule__AttributeSelector__ValueAlternatives_3_1_04127);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getValueIdentifierParserRuleCall_3_1_0_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1974:6: ( RULE_CSSSTRING )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1974:6: ( RULE_CSSSTRING )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1975:1: RULE_CSSSTRING

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getValueCSSSTRINGTerminalRuleCall_3_1_0_1());

+					}

+					match(input, RULE_CSSSTRING, FOLLOW_RULE_CSSSTRING_in_rule__AttributeSelector__ValueAlternatives_3_1_04144);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getValueCSSSTRINGTerminalRuleCall_3_1_0_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__ValueAlternatives_3_1_0"

+

+

+	// $ANTLR start "rule__Css_namespace_prefix__Alternatives_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1985:1: rule__Css_namespace_prefix__Alternatives_0 : ( ( ruleIdentifier ) | ( '*' ) );

+	public final void rule__Css_namespace_prefix__Alternatives_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1989:1: ( ( ruleIdentifier ) | ( '*' ) )

+			int alt21 = 2;

+			int LA21_0 = input.LA(1);

+

+			if (((LA21_0 >= RULE_DASH && LA21_0 <= RULE_UNDERSCORE) || (LA21_0 >= RULE_ONE_HEX_LETTER && LA21_0 <= RULE_ONE_NON_HEX_LETTER) || (LA21_0 >= 49 && LA21_0 <= 52))) {

+				alt21 = 1;

+			}

+			else if ((LA21_0 == 36)) {

+				alt21 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 21, 0, input);

+

+				throw nvae;

+			}

+			switch (alt21) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1990:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1990:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1991:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_namespace_prefixAccess().getIdentifierParserRuleCall_0_0());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rule__Css_namespace_prefix__Alternatives_04176);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_namespace_prefixAccess().getIdentifierParserRuleCall_0_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1996:6: ( '*' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1996:6: ( '*' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:1997:1: '*'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_namespace_prefixAccess().getAsteriskKeyword_0_1());

+					}

+					match(input, 36, FOLLOW_36_in_rule__Css_namespace_prefix__Alternatives_04194);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_namespace_prefixAccess().getAsteriskKeyword_0_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_namespace_prefix__Alternatives_0"

+

+

+	// $ANTLR start "rule__PseudoClassOrFunc__Alternatives"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2009:1: rule__PseudoClassOrFunc__Alternatives : ( ( rulePseudoClass ) | ( rulePseudoClassFunction ) );

+	public final void rule__PseudoClassOrFunc__Alternatives() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2013:1: ( ( rulePseudoClass ) | ( rulePseudoClassFunction ) )

+			int alt22 = 2;

+			alt22 = dfa22.predict(input);

+			switch (alt22) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2014:1: ( rulePseudoClass )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2014:1: ( rulePseudoClass )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2015:1: rulePseudoClass

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassParserRuleCall_0());

+					}

+					pushFollow(FOLLOW_rulePseudoClass_in_rule__PseudoClassOrFunc__Alternatives4228);

+					rulePseudoClass();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassParserRuleCall_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2020:6: ( rulePseudoClassFunction )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2020:6: ( rulePseudoClassFunction )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2021:1: rulePseudoClassFunction

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassFunctionParserRuleCall_1());

+					}

+					pushFollow(FOLLOW_rulePseudoClassFunction_in_rule__PseudoClassOrFunc__Alternatives4245);

+					rulePseudoClassFunction();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassFunctionParserRuleCall_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassOrFunc__Alternatives"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Alternatives"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2031:1: rule__PseudoClassFunction__Alternatives : ( ( ( rule__PseudoClassFunction__Group_0__0 ) ) | ( (

+	// rule__PseudoClassFunction__Group_1__0 ) ) );

+	public final void rule__PseudoClassFunction__Alternatives() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2035:1: ( ( ( rule__PseudoClassFunction__Group_0__0 ) ) | ( ( rule__PseudoClassFunction__Group_1__0 )

+			// ) )

+			int alt23 = 2;

+			int LA23_0 = input.LA(1);

+

+			if ((LA23_0 == RULE_COLON)) {

+				int LA23_1 = input.LA(2);

+

+				if ((LA23_1 == 63)) {

+					alt23 = 1;

+				}

+				else if (((LA23_1 >= RULE_DASH && LA23_1 <= RULE_UNDERSCORE) || (LA23_1 >= RULE_ONE_HEX_LETTER && LA23_1 <= RULE_ONE_NON_HEX_LETTER) || (LA23_1 >= 49 && LA23_1 <= 52))) {

+					alt23 = 2;

+				}

+				else {

+					if (state.backtracking > 0) {

+						state.failed = true;

+						return;

+					}

+					NoViableAltException nvae =

+							new NoViableAltException("", 23, 1, input);

+

+					throw nvae;

+				}

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 23, 0, input);

+

+				throw nvae;

+			}

+			switch (alt23) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2036:1: ( ( rule__PseudoClassFunction__Group_0__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2036:1: ( ( rule__PseudoClassFunction__Group_0__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2037:1: ( rule__PseudoClassFunction__Group_0__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getGroup_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2038:1: ( rule__PseudoClassFunction__Group_0__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2038:2: rule__PseudoClassFunction__Group_0__0

+					{

+						pushFollow(FOLLOW_rule__PseudoClassFunction__Group_0__0_in_rule__PseudoClassFunction__Alternatives4277);

+						rule__PseudoClassFunction__Group_0__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getGroup_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2042:6: ( ( rule__PseudoClassFunction__Group_1__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2042:6: ( ( rule__PseudoClassFunction__Group_1__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2043:1: ( rule__PseudoClassFunction__Group_1__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getGroup_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2044:1: ( rule__PseudoClassFunction__Group_1__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2044:2: rule__PseudoClassFunction__Group_1__0

+					{

+						pushFollow(FOLLOW_rule__PseudoClassFunction__Group_1__0_in_rule__PseudoClassFunction__Alternatives4295);

+						rule__PseudoClassFunction__Group_1__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getGroup_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Alternatives"

+

+

+	// $ANTLR start "rule__Combinator__Alternatives"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2053:1: rule__Combinator__Alternatives : ( ( RULE_PLUS ) | ( '>' ) | ( '~' ) );

+	public final void rule__Combinator__Alternatives() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2057:1: ( ( RULE_PLUS ) | ( '>' ) | ( '~' ) )

+			int alt24 = 3;

+			switch (input.LA(1)) {

+			case RULE_PLUS: {

+				alt24 = 1;

+			}

+				break;

+			case 37: {

+				alt24 = 2;

+			}

+				break;

+			case 38: {

+				alt24 = 3;

+			}

+				break;

+			default:

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 24, 0, input);

+

+				throw nvae;

+			}

+

+			switch (alt24) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2058:1: ( RULE_PLUS )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2058:1: ( RULE_PLUS )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2059:1: RULE_PLUS

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCombinatorAccess().getPLUSTerminalRuleCall_0());

+					}

+					match(input, RULE_PLUS, FOLLOW_RULE_PLUS_in_rule__Combinator__Alternatives4328);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCombinatorAccess().getPLUSTerminalRuleCall_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2064:6: ( '>' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2064:6: ( '>' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2065:1: '>'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCombinatorAccess().getGreaterThanSignKeyword_1());

+					}

+					match(input, 37, FOLLOW_37_in_rule__Combinator__Alternatives4346);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCombinatorAccess().getGreaterThanSignKeyword_1());

+					}

+

+				}

+

+

+			}

+				break;

+			case 3:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2072:6: ( '~' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2072:6: ( '~' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2073:1: '~'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCombinatorAccess().getTildeKeyword_2());

+					}

+					match(input, 38, FOLLOW_38_in_rule__Combinator__Alternatives4366);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCombinatorAccess().getTildeKeyword_2());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Combinator__Alternatives"

+

+

+	// $ANTLR start "rule__SymbolTok__SymbolAlternatives_1_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2087:1: rule__SymbolTok__SymbolAlternatives_1_0 : ( ( RULE_COMMA ) | ( RULE_PERCENT ) );

+	public final void rule__SymbolTok__SymbolAlternatives_1_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2091:1: ( ( RULE_COMMA ) | ( RULE_PERCENT ) )

+			int alt25 = 2;

+			int LA25_0 = input.LA(1);

+

+			if ((LA25_0 == RULE_COMMA)) {

+				alt25 = 1;

+			}

+			else if ((LA25_0 == RULE_PERCENT)) {

+				alt25 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 25, 0, input);

+

+				throw nvae;

+			}

+			switch (alt25) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2092:1: ( RULE_COMMA )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2092:1: ( RULE_COMMA )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2093:1: RULE_COMMA

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSymbolTokAccess().getSymbolCOMMATerminalRuleCall_1_0_0());

+					}

+					match(input, RULE_COMMA, FOLLOW_RULE_COMMA_in_rule__SymbolTok__SymbolAlternatives_1_04402);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSymbolTokAccess().getSymbolCOMMATerminalRuleCall_1_0_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2098:6: ( RULE_PERCENT )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2098:6: ( RULE_PERCENT )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2099:1: RULE_PERCENT

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSymbolTokAccess().getSymbolPERCENTTerminalRuleCall_1_0_1());

+					}

+					match(input, RULE_PERCENT, FOLLOW_RULE_PERCENT_in_rule__SymbolTok__SymbolAlternatives_1_04419);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSymbolTokAccess().getSymbolPERCENTTerminalRuleCall_1_0_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SymbolTok__SymbolAlternatives_1_0"

+

+

+	// $ANTLR start "rule__CssTok__Alternatives"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2109:1: rule__CssTok__Alternatives : ( ( ruleIdentifierOrFuncTok ) | ( ruleSymbolTok ) | ( ruleWSTok ) | (

+	// ruleStringTok ) | ( ruleNumberTok ) | ( ruleUrlTok ) | ( ruleColorTok ) );

+	public final void rule__CssTok__Alternatives() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2113:1: ( ( ruleIdentifierOrFuncTok ) | ( ruleSymbolTok ) | ( ruleWSTok ) | ( ruleStringTok ) | (

+			// ruleNumberTok ) | ( ruleUrlTok ) | ( ruleColorTok ) )

+			int alt26 = 7;

+			switch (input.LA(1)) {

+			case RULE_DASH: {

+				int LA26_1 = input.LA(2);

+

+				if ((LA26_1 == RULE_UNDERSCORE || (LA26_1 >= RULE_ONE_HEX_LETTER && LA26_1 <= RULE_ONE_NON_HEX_LETTER) || (LA26_1 >= 49 && LA26_1 <= 52))) {

+					alt26 = 1;

+				}

+				else if ((LA26_1 == RULE_ONE_INT || LA26_1 == 39)) {

+					alt26 = 5;

+				}

+				else {

+					if (state.backtracking > 0) {

+						state.failed = true;

+						return;

+					}

+					NoViableAltException nvae =

+							new NoViableAltException("", 26, 1, input);

+

+					throw nvae;

+				}

+			}

+				break;

+			case RULE_UNDERSCORE:

+			case RULE_ONE_HEX_LETTER:

+			case RULE_ONE_NON_HEX_LETTER:

+			case 49:

+			case 50:

+			case 51:

+			case 52: {

+				alt26 = 1;

+			}

+				break;

+			case RULE_COMMA:

+			case RULE_PERCENT: {

+				alt26 = 2;

+			}

+				break;

+			case RULE_WS: {

+				alt26 = 3;

+			}

+				break;

+			case RULE_CSSSTRING: {

+				alt26 = 4;

+			}

+				break;

+			case RULE_PLUS:

+			case RULE_ONE_INT:

+			case 39: {

+				alt26 = 5;

+			}

+				break;

+			case 64: {

+				alt26 = 6;

+			}

+				break;

+			case RULE_HASHMARK: {

+				alt26 = 7;

+			}

+				break;

+			default:

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 26, 0, input);

+

+				throw nvae;

+			}

+

+			switch (alt26) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2114:1: ( ruleIdentifierOrFuncTok )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2114:1: ( ruleIdentifierOrFuncTok )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2115:1: ruleIdentifierOrFuncTok

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCssTokAccess().getIdentifierOrFuncTokParserRuleCall_0());

+					}

+					pushFollow(FOLLOW_ruleIdentifierOrFuncTok_in_rule__CssTok__Alternatives4451);

+					ruleIdentifierOrFuncTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCssTokAccess().getIdentifierOrFuncTokParserRuleCall_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2120:6: ( ruleSymbolTok )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2120:6: ( ruleSymbolTok )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2121:1: ruleSymbolTok

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCssTokAccess().getSymbolTokParserRuleCall_1());

+					}

+					pushFollow(FOLLOW_ruleSymbolTok_in_rule__CssTok__Alternatives4468);

+					ruleSymbolTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCssTokAccess().getSymbolTokParserRuleCall_1());

+					}

+

+				}

+

+

+			}

+				break;

+			case 3:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2126:6: ( ruleWSTok )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2126:6: ( ruleWSTok )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2127:1: ruleWSTok

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCssTokAccess().getWSTokParserRuleCall_2());

+					}

+					pushFollow(FOLLOW_ruleWSTok_in_rule__CssTok__Alternatives4485);

+					ruleWSTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCssTokAccess().getWSTokParserRuleCall_2());

+					}

+

+				}

+

+

+			}

+				break;

+			case 4:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2132:6: ( ruleStringTok )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2132:6: ( ruleStringTok )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2133:1: ruleStringTok

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCssTokAccess().getStringTokParserRuleCall_3());

+					}

+					pushFollow(FOLLOW_ruleStringTok_in_rule__CssTok__Alternatives4502);

+					ruleStringTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCssTokAccess().getStringTokParserRuleCall_3());

+					}

+

+				}

+

+

+			}

+				break;

+			case 5:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2138:6: ( ruleNumberTok )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2138:6: ( ruleNumberTok )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2139:1: ruleNumberTok

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCssTokAccess().getNumberTokParserRuleCall_4());

+					}

+					pushFollow(FOLLOW_ruleNumberTok_in_rule__CssTok__Alternatives4519);

+					ruleNumberTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCssTokAccess().getNumberTokParserRuleCall_4());

+					}

+

+				}

+

+

+			}

+				break;

+			case 6:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2144:6: ( ruleUrlTok )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2144:6: ( ruleUrlTok )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2145:1: ruleUrlTok

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCssTokAccess().getUrlTokParserRuleCall_5());

+					}

+					pushFollow(FOLLOW_ruleUrlTok_in_rule__CssTok__Alternatives4536);

+					ruleUrlTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCssTokAccess().getUrlTokParserRuleCall_5());

+					}

+

+				}

+

+

+			}

+				break;

+			case 7:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2150:6: ( ruleColorTok )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2150:6: ( ruleColorTok )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2151:1: ruleColorTok

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCssTokAccess().getColorTokParserRuleCall_6());

+					}

+					pushFollow(FOLLOW_ruleColorTok_in_rule__CssTok__Alternatives4553);

+					ruleColorTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCssTokAccess().getColorTokParserRuleCall_6());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__CssTok__Alternatives"

+

+

+	// $ANTLR start "rule__ValidURLSymbol__Alternatives"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2161:1: rule__ValidURLSymbol__Alternatives : ( ( RULE_DASH ) | ( '.' ) | ( RULE_UNDERSCORE ) | ( '~' ) | (

+	// RULE_COLON ) | ( '/' ) | ( '?' ) | ( RULE_HASHMARK ) | ( '[' ) | ( ']' ) | ( '@' ) | ( '!' ) | ( '$' ) | ( '&' ) | ( '*' ) | ( RULE_PLUS ) | ( RULE_COMMA ) | ( ';' ) | ( ( rule__ValidURLSymbol__Group_18__0 ) ) );

+	public final void rule__ValidURLSymbol__Alternatives() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2165:1: ( ( RULE_DASH ) | ( '.' ) | ( RULE_UNDERSCORE ) | ( '~' ) | ( RULE_COLON ) | ( '/' ) | ( '?'

+			// ) | ( RULE_HASHMARK ) | ( '[' ) | ( ']' ) | ( '@' ) | ( '!' ) | ( '$' ) | ( '&' ) | ( '*' ) | ( RULE_PLUS ) | ( RULE_COMMA ) | ( ';' ) | ( ( rule__ValidURLSymbol__Group_18__0 ) ) )

+			int alt27 = 19;

+			switch (input.LA(1)) {

+			case RULE_DASH: {

+				alt27 = 1;

+			}

+				break;

+			case 39: {

+				alt27 = 2;

+			}

+				break;

+			case RULE_UNDERSCORE: {

+				alt27 = 3;

+			}

+				break;

+			case 38: {

+				alt27 = 4;

+			}

+				break;

+			case RULE_COLON: {

+				alt27 = 5;

+			}

+				break;

+			case 40: {

+				alt27 = 6;

+			}

+				break;

+			case 41: {

+				alt27 = 7;

+			}

+				break;

+			case RULE_HASHMARK: {

+				alt27 = 8;

+			}

+				break;

+			case 42: {

+				alt27 = 9;

+			}

+				break;

+			case 43: {

+				alt27 = 10;

+			}

+				break;

+			case 44: {

+				alt27 = 11;

+			}

+				break;

+			case 45: {

+				alt27 = 12;

+			}

+				break;

+			case 46: {

+				alt27 = 13;

+			}

+				break;

+			case 47: {

+				alt27 = 14;

+			}

+				break;

+			case 36: {

+				alt27 = 15;

+			}

+				break;

+			case RULE_PLUS: {

+				alt27 = 16;

+			}

+				break;

+			case RULE_COMMA: {

+				alt27 = 17;

+			}

+				break;

+			case 48: {

+				alt27 = 18;

+			}

+				break;

+			case 35: {

+				alt27 = 19;

+			}

+				break;

+			default:

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 27, 0, input);

+

+				throw nvae;

+			}

+

+			switch (alt27) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2166:1: ( RULE_DASH )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2166:1: ( RULE_DASH )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2167:1: RULE_DASH

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getDASHTerminalRuleCall_0());

+					}

+					match(input, RULE_DASH, FOLLOW_RULE_DASH_in_rule__ValidURLSymbol__Alternatives4585);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getDASHTerminalRuleCall_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2172:6: ( '.' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2172:6: ( '.' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2173:1: '.'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getFullStopKeyword_1());

+					}

+					match(input, 39, FOLLOW_39_in_rule__ValidURLSymbol__Alternatives4603);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getFullStopKeyword_1());

+					}

+

+				}

+

+

+			}

+				break;

+			case 3:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2180:6: ( RULE_UNDERSCORE )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2180:6: ( RULE_UNDERSCORE )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2181:1: RULE_UNDERSCORE

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getUNDERSCORETerminalRuleCall_2());

+					}

+					match(input, RULE_UNDERSCORE, FOLLOW_RULE_UNDERSCORE_in_rule__ValidURLSymbol__Alternatives4622);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getUNDERSCORETerminalRuleCall_2());

+					}

+

+				}

+

+

+			}

+				break;

+			case 4:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2186:6: ( '~' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2186:6: ( '~' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2187:1: '~'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getTildeKeyword_3());

+					}

+					match(input, 38, FOLLOW_38_in_rule__ValidURLSymbol__Alternatives4640);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getTildeKeyword_3());

+					}

+

+				}

+

+

+			}

+				break;

+			case 5:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2194:6: ( RULE_COLON )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2194:6: ( RULE_COLON )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2195:1: RULE_COLON

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getCOLONTerminalRuleCall_4());

+					}

+					match(input, RULE_COLON, FOLLOW_RULE_COLON_in_rule__ValidURLSymbol__Alternatives4659);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getCOLONTerminalRuleCall_4());

+					}

+

+				}

+

+

+			}

+				break;

+			case 6:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2200:6: ( '/' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2200:6: ( '/' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2201:1: '/'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getSolidusKeyword_5());

+					}

+					match(input, 40, FOLLOW_40_in_rule__ValidURLSymbol__Alternatives4677);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getSolidusKeyword_5());

+					}

+

+				}

+

+

+			}

+				break;

+			case 7:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2208:6: ( '?' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2208:6: ( '?' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2209:1: '?'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getQuestionMarkKeyword_6());

+					}

+					match(input, 41, FOLLOW_41_in_rule__ValidURLSymbol__Alternatives4697);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getQuestionMarkKeyword_6());

+					}

+

+				}

+

+

+			}

+				break;

+			case 8:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2216:6: ( RULE_HASHMARK )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2216:6: ( RULE_HASHMARK )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2217:1: RULE_HASHMARK

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getHASHMARKTerminalRuleCall_7());

+					}

+					match(input, RULE_HASHMARK, FOLLOW_RULE_HASHMARK_in_rule__ValidURLSymbol__Alternatives4716);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getHASHMARKTerminalRuleCall_7());

+					}

+

+				}

+

+

+			}

+				break;

+			case 9:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2222:6: ( '[' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2222:6: ( '[' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2223:1: '['

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getLeftSquareBracketKeyword_8());

+					}

+					match(input, 42, FOLLOW_42_in_rule__ValidURLSymbol__Alternatives4734);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getLeftSquareBracketKeyword_8());

+					}

+

+				}

+

+

+			}

+				break;

+			case 10:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2230:6: ( ']' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2230:6: ( ']' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2231:1: ']'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getRightSquareBracketKeyword_9());

+					}

+					match(input, 43, FOLLOW_43_in_rule__ValidURLSymbol__Alternatives4754);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getRightSquareBracketKeyword_9());

+					}

+

+				}

+

+

+			}

+				break;

+			case 11:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2238:6: ( '@' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2238:6: ( '@' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2239:1: '@'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getCommercialAtKeyword_10());

+					}

+					match(input, 44, FOLLOW_44_in_rule__ValidURLSymbol__Alternatives4774);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getCommercialAtKeyword_10());

+					}

+

+				}

+

+

+			}

+				break;

+			case 12:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2246:6: ( '!' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2246:6: ( '!' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2247:1: '!'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getExclamationMarkKeyword_11());

+					}

+					match(input, 45, FOLLOW_45_in_rule__ValidURLSymbol__Alternatives4794);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getExclamationMarkKeyword_11());

+					}

+

+				}

+

+

+			}

+				break;

+			case 13:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2254:6: ( '$' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2254:6: ( '$' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2255:1: '$'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getDollarSignKeyword_12());

+					}

+					match(input, 46, FOLLOW_46_in_rule__ValidURLSymbol__Alternatives4814);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getDollarSignKeyword_12());

+					}

+

+				}

+

+

+			}

+				break;

+			case 14:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2262:6: ( '&' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2262:6: ( '&' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2263:1: '&'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getAmpersandKeyword_13());

+					}

+					match(input, 47, FOLLOW_47_in_rule__ValidURLSymbol__Alternatives4834);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getAmpersandKeyword_13());

+					}

+

+				}

+

+

+			}

+				break;

+			case 15:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2270:6: ( '*' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2270:6: ( '*' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2271:1: '*'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getAsteriskKeyword_14());

+					}

+					match(input, 36, FOLLOW_36_in_rule__ValidURLSymbol__Alternatives4854);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getAsteriskKeyword_14());

+					}

+

+				}

+

+

+			}

+				break;

+			case 16:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2278:6: ( RULE_PLUS )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2278:6: ( RULE_PLUS )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2279:1: RULE_PLUS

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getPLUSTerminalRuleCall_15());

+					}

+					match(input, RULE_PLUS, FOLLOW_RULE_PLUS_in_rule__ValidURLSymbol__Alternatives4873);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getPLUSTerminalRuleCall_15());

+					}

+

+				}

+

+

+			}

+				break;

+			case 17:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2284:6: ( RULE_COMMA )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2284:6: ( RULE_COMMA )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2285:1: RULE_COMMA

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getCOMMATerminalRuleCall_16());

+					}

+					match(input, RULE_COMMA, FOLLOW_RULE_COMMA_in_rule__ValidURLSymbol__Alternatives4890);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getCOMMATerminalRuleCall_16());

+					}

+

+				}

+

+

+			}

+				break;

+			case 18:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2290:6: ( ';' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2290:6: ( ';' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2291:1: ';'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getSemicolonKeyword_17());

+					}

+					match(input, 48, FOLLOW_48_in_rule__ValidURLSymbol__Alternatives4908);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getSemicolonKeyword_17());

+					}

+

+				}

+

+

+			}

+				break;

+			case 19:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2298:6: ( ( rule__ValidURLSymbol__Group_18__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2298:6: ( ( rule__ValidURLSymbol__Group_18__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2299:1: ( rule__ValidURLSymbol__Group_18__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getGroup_18());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2300:1: ( rule__ValidURLSymbol__Group_18__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2300:2: rule__ValidURLSymbol__Group_18__0

+					{

+						pushFollow(FOLLOW_rule__ValidURLSymbol__Group_18__0_in_rule__ValidURLSymbol__Alternatives4927);

+						rule__ValidURLSymbol__Group_18__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getGroup_18());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURLSymbol__Alternatives"

+

+

+	// $ANTLR start "rule__KeywordHack__Alternatives"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2309:1: rule__KeywordHack__Alternatives : ( ( 'not' ) | ( 'no' ) | ( 'url' ) | ( 'ur' ) );

+	public final void rule__KeywordHack__Alternatives() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2313:1: ( ( 'not' ) | ( 'no' ) | ( 'url' ) | ( 'ur' ) )

+			int alt28 = 4;

+			switch (input.LA(1)) {

+			case 49: {

+				alt28 = 1;

+			}

+				break;

+			case 50: {

+				alt28 = 2;

+			}

+				break;

+			case 51: {

+				alt28 = 3;

+			}

+				break;

+			case 52: {

+				alt28 = 4;

+			}

+				break;

+			default:

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 28, 0, input);

+

+				throw nvae;

+			}

+

+			switch (alt28) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2314:1: ( 'not' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2314:1: ( 'not' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2315:1: 'not'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeywordHackAccess().getNotKeyword_0());

+					}

+					match(input, 49, FOLLOW_49_in_rule__KeywordHack__Alternatives4961);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeywordHackAccess().getNotKeyword_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2322:6: ( 'no' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2322:6: ( 'no' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2323:1: 'no'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeywordHackAccess().getNoKeyword_1());

+					}

+					match(input, 50, FOLLOW_50_in_rule__KeywordHack__Alternatives4981);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeywordHackAccess().getNoKeyword_1());

+					}

+

+				}

+

+

+			}

+				break;

+			case 3:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2330:6: ( 'url' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2330:6: ( 'url' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2331:1: 'url'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeywordHackAccess().getUrlKeyword_2());

+					}

+					match(input, 51, FOLLOW_51_in_rule__KeywordHack__Alternatives5001);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeywordHackAccess().getUrlKeyword_2());

+					}

+

+				}

+

+

+			}

+				break;

+			case 4:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2338:6: ( 'ur' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2338:6: ( 'ur' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2339:1: 'ur'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeywordHackAccess().getUrKeyword_3());

+					}

+					match(input, 52, FOLLOW_52_in_rule__KeywordHack__Alternatives5021);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeywordHackAccess().getUrKeyword_3());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__KeywordHack__Alternatives"

+

+

+	// $ANTLR start "rule__ValidURL__Alternatives"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2351:1: rule__ValidURL__Alternatives : ( ( RULE_CSSSTRING ) | ( ( ( rule__ValidURL__Alternatives_1 ) ) ( (

+	// rule__ValidURL__Alternatives_1 )* ) ) );

+	public final void rule__ValidURL__Alternatives() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2355:1: ( ( RULE_CSSSTRING ) | ( ( ( rule__ValidURL__Alternatives_1 ) ) ( (

+			// rule__ValidURL__Alternatives_1 )* ) ) )

+			int alt30 = 2;

+			int LA30_0 = input.LA(1);

+

+			if ((LA30_0 == RULE_CSSSTRING)) {

+				alt30 = 1;

+			}

+			else if (((LA30_0 >= RULE_PLUS && LA30_0 <= RULE_ONE_INT) || (LA30_0 >= 35 && LA30_0 <= 36) || (LA30_0 >= 38 && LA30_0 <= 57))) {

+				alt30 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 30, 0, input);

+

+				throw nvae;

+			}

+			switch (alt30) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2356:1: ( RULE_CSSSTRING )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2356:1: ( RULE_CSSSTRING )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2357:1: RULE_CSSSTRING

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getCSSSTRINGTerminalRuleCall_0());

+					}

+					match(input, RULE_CSSSTRING, FOLLOW_RULE_CSSSTRING_in_rule__ValidURL__Alternatives5055);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getCSSSTRINGTerminalRuleCall_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2362:6: ( ( ( rule__ValidURL__Alternatives_1 ) ) ( ( rule__ValidURL__Alternatives_1 )* ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2362:6: ( ( ( rule__ValidURL__Alternatives_1 ) ) ( ( rule__ValidURL__Alternatives_1 )* ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2363:1: ( ( rule__ValidURL__Alternatives_1 ) ) ( ( rule__ValidURL__Alternatives_1 )* )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2363:1: ( ( rule__ValidURL__Alternatives_1 ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2364:1: ( rule__ValidURL__Alternatives_1 )

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getValidURLAccess().getAlternatives_1());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2365:1: ( rule__ValidURL__Alternatives_1 )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2365:2: rule__ValidURL__Alternatives_1

+						{

+							pushFollow(FOLLOW_rule__ValidURL__Alternatives_1_in_rule__ValidURL__Alternatives5074);

+							rule__ValidURL__Alternatives_1();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getValidURLAccess().getAlternatives_1());

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2368:1: ( ( rule__ValidURL__Alternatives_1 )* )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2369:1: ( rule__ValidURL__Alternatives_1 )*

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getValidURLAccess().getAlternatives_1());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2370:1: ( rule__ValidURL__Alternatives_1 )*

+						loop29: do {

+							int alt29 = 2;

+							int LA29_0 = input.LA(1);

+

+							if (((LA29_0 >= RULE_PLUS && LA29_0 <= RULE_ONE_INT) || (LA29_0 >= 35 && LA29_0 <= 36) || (LA29_0 >= 38 && LA29_0 <= 57))) {

+								alt29 = 1;

+							}

+

+

+							switch (alt29) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2370:2: rule__ValidURL__Alternatives_1

+							{

+								pushFollow(FOLLOW_rule__ValidURL__Alternatives_1_in_rule__ValidURL__Alternatives5086);

+								rule__ValidURL__Alternatives_1();

+

+								state._fsp--;

+								if (state.failed) {

+									return;

+								}

+

+							}

+								break;

+

+							default:

+								break loop29;

+							}

+						} while (true);

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getValidURLAccess().getAlternatives_1());

+						}

+

+					}

+

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURL__Alternatives"

+

+

+	// $ANTLR start "rule__ValidURL__Alternatives_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2380:1: rule__ValidURL__Alternatives_1 : ( ( ruleValidURLSymbol ) | ( ruleKeywordHack ) | (

+	// RULE_ONE_HEX_LETTER ) | ( RULE_ONE_NON_HEX_LETTER ) | ( RULE_ONE_INT ) | ( '\\\\ ' ) | ( '\\\\(' ) | ( '\\\\)' ) | ( '\\\\\\'' ) | ( '\\\\\"' ) | ( ( rule__ValidURL__Group_1_10__0 ) ) );

+	public final void rule__ValidURL__Alternatives_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2384:1: ( ( ruleValidURLSymbol ) | ( ruleKeywordHack ) | ( RULE_ONE_HEX_LETTER ) | (

+			// RULE_ONE_NON_HEX_LETTER ) | ( RULE_ONE_INT ) | ( '\\\\ ' ) | ( '\\\\(' ) | ( '\\\\)' ) | ( '\\\\\\'' ) | ( '\\\\\"' ) | ( ( rule__ValidURL__Group_1_10__0 ) ) )

+			int alt31 = 11;

+			switch (input.LA(1)) {

+			case RULE_PLUS:

+			case RULE_COMMA:

+			case RULE_DASH:

+			case RULE_UNDERSCORE:

+			case RULE_COLON:

+			case RULE_HASHMARK:

+			case 35:

+			case 36:

+			case 38:

+			case 39:

+			case 40:

+			case 41:

+			case 42:

+			case 43:

+			case 44:

+			case 45:

+			case 46:

+			case 47:

+			case 48: {

+				alt31 = 1;

+			}

+				break;

+			case 49:

+			case 50:

+			case 51:

+			case 52: {

+				alt31 = 2;

+			}

+				break;

+			case RULE_ONE_HEX_LETTER: {

+				alt31 = 3;

+			}

+				break;

+			case RULE_ONE_NON_HEX_LETTER: {

+				alt31 = 4;

+			}

+				break;

+			case RULE_ONE_INT: {

+				alt31 = 5;

+			}

+				break;

+			case 53: {

+				alt31 = 6;

+			}

+				break;

+			case 54: {

+				alt31 = 7;

+			}

+				break;

+			case 55: {

+				alt31 = 8;

+			}

+				break;

+			case 56: {

+				alt31 = 9;

+			}

+				break;

+			case 57: {

+				alt31 = 10;

+			}

+				break;

+			case RULE_PERCENT: {

+				alt31 = 11;

+			}

+				break;

+			default:

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 31, 0, input);

+

+				throw nvae;

+			}

+

+			switch (alt31) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2385:1: ( ruleValidURLSymbol )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2385:1: ( ruleValidURLSymbol )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2386:1: ruleValidURLSymbol

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getValidURLSymbolParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_ruleValidURLSymbol_in_rule__ValidURL__Alternatives_15122);

+					ruleValidURLSymbol();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getValidURLSymbolParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2391:6: ( ruleKeywordHack )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2391:6: ( ruleKeywordHack )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2392:1: ruleKeywordHack

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getKeywordHackParserRuleCall_1_1());

+					}

+					pushFollow(FOLLOW_ruleKeywordHack_in_rule__ValidURL__Alternatives_15139);

+					ruleKeywordHack();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getKeywordHackParserRuleCall_1_1());

+					}

+

+				}

+

+

+			}

+				break;

+			case 3:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2397:6: ( RULE_ONE_HEX_LETTER )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2397:6: ( RULE_ONE_HEX_LETTER )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2398:1: RULE_ONE_HEX_LETTER

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_2());

+					}

+					match(input, RULE_ONE_HEX_LETTER, FOLLOW_RULE_ONE_HEX_LETTER_in_rule__ValidURL__Alternatives_15156);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_2());

+					}

+

+				}

+

+

+			}

+				break;

+			case 4:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2403:6: ( RULE_ONE_NON_HEX_LETTER )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2403:6: ( RULE_ONE_NON_HEX_LETTER )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2404:1: RULE_ONE_NON_HEX_LETTER

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_3());

+					}

+					match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_RULE_ONE_NON_HEX_LETTER_in_rule__ValidURL__Alternatives_15173);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_3());

+					}

+

+				}

+

+

+			}

+				break;

+			case 5:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2409:6: ( RULE_ONE_INT )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2409:6: ( RULE_ONE_INT )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2410:1: RULE_ONE_INT

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_4());

+					}

+					match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_rule__ValidURL__Alternatives_15190);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_4());

+					}

+

+				}

+

+

+			}

+				break;

+			case 6:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2415:6: ( '\\\\ ' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2415:6: ( '\\\\ ' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2416:1: '\\\\ '

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getReverseSolidusSpaceKeyword_1_5());

+					}

+					match(input, 53, FOLLOW_53_in_rule__ValidURL__Alternatives_15208);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getReverseSolidusSpaceKeyword_1_5());

+					}

+

+				}

+

+

+			}

+				break;

+			case 7:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2423:6: ( '\\\\(' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2423:6: ( '\\\\(' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2424:1: '\\\\('

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getReverseSolidusLeftParenthesisKeyword_1_6());

+					}

+					match(input, 54, FOLLOW_54_in_rule__ValidURL__Alternatives_15228);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getReverseSolidusLeftParenthesisKeyword_1_6());

+					}

+

+				}

+

+

+			}

+				break;

+			case 8:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2431:6: ( '\\\\)' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2431:6: ( '\\\\)' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2432:1: '\\\\)'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getReverseSolidusRightParenthesisKeyword_1_7());

+					}

+					match(input, 55, FOLLOW_55_in_rule__ValidURL__Alternatives_15248);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getReverseSolidusRightParenthesisKeyword_1_7());

+					}

+

+				}

+

+

+			}

+				break;

+			case 9:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2439:6: ( '\\\\\\'' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2439:6: ( '\\\\\\'' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2440:1: '\\\\\\''

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getReverseSolidusApostropheKeyword_1_8());

+					}

+					match(input, 56, FOLLOW_56_in_rule__ValidURL__Alternatives_15268);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getReverseSolidusApostropheKeyword_1_8());

+					}

+

+				}

+

+

+			}

+				break;

+			case 10:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2447:6: ( '\\\\\"' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2447:6: ( '\\\\\"' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2448:1: '\\\\\"'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getReverseSolidusQuotationMarkKeyword_1_9());

+					}

+					match(input, 57, FOLLOW_57_in_rule__ValidURL__Alternatives_15288);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getReverseSolidusQuotationMarkKeyword_1_9());

+					}

+

+				}

+

+

+			}

+				break;

+			case 11:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2455:6: ( ( rule__ValidURL__Group_1_10__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2455:6: ( ( rule__ValidURL__Group_1_10__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2456:1: ( rule__ValidURL__Group_1_10__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getGroup_1_10());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2457:1: ( rule__ValidURL__Group_1_10__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2457:2: rule__ValidURL__Group_1_10__0

+					{

+						pushFollow(FOLLOW_rule__ValidURL__Group_1_10__0_in_rule__ValidURL__Alternatives_15307);

+						rule__ValidURL__Group_1_10__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getGroup_1_10());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURL__Alternatives_1"

+

+

+	// $ANTLR start "rule__ValidURL__Alternatives_1_10_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2466:1: rule__ValidURL__Alternatives_1_10_1 : ( ( RULE_ONE_INT ) | ( RULE_ONE_HEX_LETTER ) );

+	public final void rule__ValidURL__Alternatives_1_10_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2470:1: ( ( RULE_ONE_INT ) | ( RULE_ONE_HEX_LETTER ) )

+			int alt32 = 2;

+			int LA32_0 = input.LA(1);

+

+			if ((LA32_0 == RULE_ONE_INT)) {

+				alt32 = 1;

+			}

+			else if ((LA32_0 == RULE_ONE_HEX_LETTER)) {

+				alt32 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 32, 0, input);

+

+				throw nvae;

+			}

+			switch (alt32) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2471:1: ( RULE_ONE_INT )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2471:1: ( RULE_ONE_INT )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2472:1: RULE_ONE_INT

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_1_0());

+					}

+					match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_rule__ValidURL__Alternatives_1_10_15340);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_1_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2477:6: ( RULE_ONE_HEX_LETTER )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2477:6: ( RULE_ONE_HEX_LETTER )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2478:1: RULE_ONE_HEX_LETTER

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_1_1());

+					}

+					match(input, RULE_ONE_HEX_LETTER, FOLLOW_RULE_ONE_HEX_LETTER_in_rule__ValidURL__Alternatives_1_10_15357);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_1_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURL__Alternatives_1_10_1"

+

+

+	// $ANTLR start "rule__ValidURL__Alternatives_1_10_2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2488:1: rule__ValidURL__Alternatives_1_10_2 : ( ( RULE_ONE_INT ) | ( RULE_ONE_HEX_LETTER ) );

+	public final void rule__ValidURL__Alternatives_1_10_2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2492:1: ( ( RULE_ONE_INT ) | ( RULE_ONE_HEX_LETTER ) )

+			int alt33 = 2;

+			int LA33_0 = input.LA(1);

+

+			if ((LA33_0 == RULE_ONE_INT)) {

+				alt33 = 1;

+			}

+			else if ((LA33_0 == RULE_ONE_HEX_LETTER)) {

+				alt33 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 33, 0, input);

+

+				throw nvae;

+			}

+			switch (alt33) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2493:1: ( RULE_ONE_INT )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2493:1: ( RULE_ONE_INT )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2494:1: RULE_ONE_INT

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_2_0());

+					}

+					match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_rule__ValidURL__Alternatives_1_10_25389);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_2_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2499:6: ( RULE_ONE_HEX_LETTER )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2499:6: ( RULE_ONE_HEX_LETTER )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2500:1: RULE_ONE_HEX_LETTER

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_2_1());

+					}

+					match(input, RULE_ONE_HEX_LETTER, FOLLOW_RULE_ONE_HEX_LETTER_in_rule__ValidURL__Alternatives_1_10_25406);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_2_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURL__Alternatives_1_10_2"

+

+

+	// $ANTLR start "rule__Identifier__Alternatives_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2510:1: rule__Identifier__Alternatives_1 : ( ( RULE_UNDERSCORE ) | ( RULE_ONE_HEX_LETTER ) | (

+	// RULE_ONE_NON_HEX_LETTER ) | ( ruleKeywordHack ) );

+	public final void rule__Identifier__Alternatives_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2514:1: ( ( RULE_UNDERSCORE ) | ( RULE_ONE_HEX_LETTER ) | ( RULE_ONE_NON_HEX_LETTER ) | (

+			// ruleKeywordHack ) )

+			int alt34 = 4;

+			switch (input.LA(1)) {

+			case RULE_UNDERSCORE: {

+				alt34 = 1;

+			}

+				break;

+			case RULE_ONE_HEX_LETTER: {

+				alt34 = 2;

+			}

+				break;

+			case RULE_ONE_NON_HEX_LETTER: {

+				alt34 = 3;

+			}

+				break;

+			case 49:

+			case 50:

+			case 51:

+			case 52: {

+				alt34 = 4;

+			}

+				break;

+			default:

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 34, 0, input);

+

+				throw nvae;

+			}

+

+			switch (alt34) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2515:1: ( RULE_UNDERSCORE )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2515:1: ( RULE_UNDERSCORE )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2516:1: RULE_UNDERSCORE

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_1_0());

+					}

+					match(input, RULE_UNDERSCORE, FOLLOW_RULE_UNDERSCORE_in_rule__Identifier__Alternatives_15438);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2521:6: ( RULE_ONE_HEX_LETTER )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2521:6: ( RULE_ONE_HEX_LETTER )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2522:1: RULE_ONE_HEX_LETTER

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_1_1());

+					}

+					match(input, RULE_ONE_HEX_LETTER, FOLLOW_RULE_ONE_HEX_LETTER_in_rule__Identifier__Alternatives_15455);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_1_1());

+					}

+

+				}

+

+

+			}

+				break;

+			case 3:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2527:6: ( RULE_ONE_NON_HEX_LETTER )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2527:6: ( RULE_ONE_NON_HEX_LETTER )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2528:1: RULE_ONE_NON_HEX_LETTER

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_2());

+					}

+					match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_RULE_ONE_NON_HEX_LETTER_in_rule__Identifier__Alternatives_15472);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_2());

+					}

+

+				}

+

+

+			}

+				break;

+			case 4:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2533:6: ( ruleKeywordHack )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2533:6: ( ruleKeywordHack )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2534:1: ruleKeywordHack

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_1_3());

+					}

+					pushFollow(FOLLOW_ruleKeywordHack_in_rule__Identifier__Alternatives_15489);

+					ruleKeywordHack();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_1_3());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Identifier__Alternatives_1"

+

+

+	// $ANTLR start "rule__Identifier__Alternatives_2_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2544:1: rule__Identifier__Alternatives_2_0 : ( ( RULE_UNDERSCORE ) | ( RULE_DASH ) | ( RULE_ONE_HEX_LETTER )

+	// | ( RULE_ONE_NON_HEX_LETTER ) | ( RULE_ONE_INT ) | ( ruleKeywordHack ) );

+	public final void rule__Identifier__Alternatives_2_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2548:1: ( ( RULE_UNDERSCORE ) | ( RULE_DASH ) | ( RULE_ONE_HEX_LETTER ) | ( RULE_ONE_NON_HEX_LETTER )

+			// | ( RULE_ONE_INT ) | ( ruleKeywordHack ) )

+			int alt35 = 6;

+			switch (input.LA(1)) {

+			case RULE_UNDERSCORE: {

+				alt35 = 1;

+			}

+				break;

+			case RULE_DASH: {

+				alt35 = 2;

+			}

+				break;

+			case RULE_ONE_HEX_LETTER: {

+				alt35 = 3;

+			}

+				break;

+			case RULE_ONE_NON_HEX_LETTER: {

+				alt35 = 4;

+			}

+				break;

+			case RULE_ONE_INT: {

+				alt35 = 5;

+			}

+				break;

+			case 49:

+			case 50:

+			case 51:

+			case 52: {

+				alt35 = 6;

+			}

+				break;

+			default:

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 35, 0, input);

+

+				throw nvae;

+			}

+

+			switch (alt35) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2549:1: ( RULE_UNDERSCORE )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2549:1: ( RULE_UNDERSCORE )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2550:1: RULE_UNDERSCORE

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_2_0_0());

+					}

+					match(input, RULE_UNDERSCORE, FOLLOW_RULE_UNDERSCORE_in_rule__Identifier__Alternatives_2_05521);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_2_0_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2555:6: ( RULE_DASH )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2555:6: ( RULE_DASH )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2556:1: RULE_DASH

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_2_0_1());

+					}

+					match(input, RULE_DASH, FOLLOW_RULE_DASH_in_rule__Identifier__Alternatives_2_05538);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_2_0_1());

+					}

+

+				}

+

+

+			}

+				break;

+			case 3:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2561:6: ( RULE_ONE_HEX_LETTER )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2561:6: ( RULE_ONE_HEX_LETTER )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2562:1: RULE_ONE_HEX_LETTER

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_2_0_2());

+					}

+					match(input, RULE_ONE_HEX_LETTER, FOLLOW_RULE_ONE_HEX_LETTER_in_rule__Identifier__Alternatives_2_05555);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_2_0_2());

+					}

+

+				}

+

+

+			}

+				break;

+			case 4:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2567:6: ( RULE_ONE_NON_HEX_LETTER )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2567:6: ( RULE_ONE_NON_HEX_LETTER )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2568:1: RULE_ONE_NON_HEX_LETTER

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_2_0_3());

+					}

+					match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_RULE_ONE_NON_HEX_LETTER_in_rule__Identifier__Alternatives_2_05572);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_2_0_3());

+					}

+

+				}

+

+

+			}

+				break;

+			case 5:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2573:6: ( RULE_ONE_INT )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2573:6: ( RULE_ONE_INT )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2574:1: RULE_ONE_INT

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getONE_INTTerminalRuleCall_2_0_4());

+					}

+					match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_rule__Identifier__Alternatives_2_05589);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getONE_INTTerminalRuleCall_2_0_4());

+					}

+

+				}

+

+

+			}

+				break;

+			case 6:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2579:6: ( ruleKeywordHack )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2579:6: ( ruleKeywordHack )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2580:1: ruleKeywordHack

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_2_0_5());

+					}

+					pushFollow(FOLLOW_ruleKeywordHack_in_rule__Identifier__Alternatives_2_05606);

+					ruleKeywordHack();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_2_0_5());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Identifier__Alternatives_2_0"

+

+

+	// $ANTLR start "rule__Num__Alternatives_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2590:1: rule__Num__Alternatives_0 : ( ( RULE_PLUS ) | ( RULE_DASH ) );

+	public final void rule__Num__Alternatives_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2594:1: ( ( RULE_PLUS ) | ( RULE_DASH ) )

+			int alt36 = 2;

+			int LA36_0 = input.LA(1);

+

+			if ((LA36_0 == RULE_PLUS)) {

+				alt36 = 1;

+			}

+			else if ((LA36_0 == RULE_DASH)) {

+				alt36 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 36, 0, input);

+

+				throw nvae;

+			}

+			switch (alt36) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2595:1: ( RULE_PLUS )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2595:1: ( RULE_PLUS )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2596:1: RULE_PLUS

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumAccess().getPLUSTerminalRuleCall_0_0());

+					}

+					match(input, RULE_PLUS, FOLLOW_RULE_PLUS_in_rule__Num__Alternatives_05638);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumAccess().getPLUSTerminalRuleCall_0_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2601:6: ( RULE_DASH )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2601:6: ( RULE_DASH )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2602:1: RULE_DASH

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumAccess().getDASHTerminalRuleCall_0_1());

+					}

+					match(input, RULE_DASH, FOLLOW_RULE_DASH_in_rule__Num__Alternatives_05655);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumAccess().getDASHTerminalRuleCall_0_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Alternatives_0"

+

+

+	// $ANTLR start "rule__Num__Alternatives_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2612:1: rule__Num__Alternatives_1 : ( ( ( rule__Num__Group_1_0__0 ) ) | ( ( rule__Num__Group_1_1__0 ) ) );

+	public final void rule__Num__Alternatives_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2616:1: ( ( ( rule__Num__Group_1_0__0 ) ) | ( ( rule__Num__Group_1_1__0 ) ) )

+			int alt37 = 2;

+			int LA37_0 = input.LA(1);

+

+			if ((LA37_0 == 39)) {

+				alt37 = 1;

+			}

+			else if ((LA37_0 == RULE_ONE_INT)) {

+				alt37 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 37, 0, input);

+

+				throw nvae;

+			}

+			switch (alt37) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2617:1: ( ( rule__Num__Group_1_0__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2617:1: ( ( rule__Num__Group_1_0__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2618:1: ( rule__Num__Group_1_0__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumAccess().getGroup_1_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2619:1: ( rule__Num__Group_1_0__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2619:2: rule__Num__Group_1_0__0

+					{

+						pushFollow(FOLLOW_rule__Num__Group_1_0__0_in_rule__Num__Alternatives_15687);

+						rule__Num__Group_1_0__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumAccess().getGroup_1_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2623:6: ( ( rule__Num__Group_1_1__0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2623:6: ( ( rule__Num__Group_1_1__0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2624:1: ( rule__Num__Group_1_1__0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumAccess().getGroup_1_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2625:1: ( rule__Num__Group_1_1__0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2625:2: rule__Num__Group_1_1__0

+					{

+						pushFollow(FOLLOW_rule__Num__Group_1_1__0_in_rule__Num__Alternatives_15705);

+						rule__Num__Group_1_1__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumAccess().getGroup_1_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Alternatives_1"

+

+

+	// $ANTLR start "rule__Hex__Alternatives_1_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2634:1: rule__Hex__Alternatives_1_0 : ( ( RULE_ONE_INT ) | ( RULE_ONE_HEX_LETTER ) );

+	public final void rule__Hex__Alternatives_1_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2638:1: ( ( RULE_ONE_INT ) | ( RULE_ONE_HEX_LETTER ) )

+			int alt38 = 2;

+			int LA38_0 = input.LA(1);

+

+			if ((LA38_0 == RULE_ONE_INT)) {

+				alt38 = 1;

+			}

+			else if ((LA38_0 == RULE_ONE_HEX_LETTER)) {

+				alt38 = 2;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 38, 0, input);

+

+				throw nvae;

+			}

+			switch (alt38) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2639:1: ( RULE_ONE_INT )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2639:1: ( RULE_ONE_INT )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2640:1: RULE_ONE_INT

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getHexAccess().getONE_INTTerminalRuleCall_1_0_0());

+					}

+					match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_rule__Hex__Alternatives_1_05738);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getHexAccess().getONE_INTTerminalRuleCall_1_0_0());

+					}

+

+				}

+

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2645:6: ( RULE_ONE_HEX_LETTER )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2645:6: ( RULE_ONE_HEX_LETTER )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2646:1: RULE_ONE_HEX_LETTER

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getHexAccess().getONE_HEX_LETTERTerminalRuleCall_1_0_1());

+					}

+					match(input, RULE_ONE_HEX_LETTER, FOLLOW_RULE_ONE_HEX_LETTER_in_rule__Hex__Alternatives_1_05755);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getHexAccess().getONE_HEX_LETTERTerminalRuleCall_1_0_1());

+					}

+

+				}

+

+

+			}

+				break;

+

+			}

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Hex__Alternatives_1_0"

+

+

+	// $ANTLR start "rule__Stylesheet__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2658:1: rule__Stylesheet__Group__0 : rule__Stylesheet__Group__0__Impl rule__Stylesheet__Group__1 ;

+	public final void rule__Stylesheet__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2662:1: ( rule__Stylesheet__Group__0__Impl rule__Stylesheet__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2663:2: rule__Stylesheet__Group__0__Impl rule__Stylesheet__Group__1

+			{

+				pushFollow(FOLLOW_rule__Stylesheet__Group__0__Impl_in_rule__Stylesheet__Group__05785);

+				rule__Stylesheet__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Stylesheet__Group__1_in_rule__Stylesheet__Group__05788);

+				rule__Stylesheet__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__Group__0"

+

+

+	// $ANTLR start "rule__Stylesheet__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2670:1: rule__Stylesheet__Group__0__Impl : ( ( rule__Stylesheet__CharsetAssignment_0 )? ) ;

+	public final void rule__Stylesheet__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2674:1: ( ( ( rule__Stylesheet__CharsetAssignment_0 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2675:1: ( ( rule__Stylesheet__CharsetAssignment_0 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2675:1: ( ( rule__Stylesheet__CharsetAssignment_0 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2676:1: ( rule__Stylesheet__CharsetAssignment_0 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getCharsetAssignment_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2677:1: ( rule__Stylesheet__CharsetAssignment_0 )?

+					int alt39 = 2;

+					int LA39_0 = input.LA(1);

+

+					if (((LA39_0 >= 20 && LA39_0 <= 21))) {

+						alt39 = 1;

+					}

+					switch (alt39) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2677:2: rule__Stylesheet__CharsetAssignment_0

+					{

+						pushFollow(FOLLOW_rule__Stylesheet__CharsetAssignment_0_in_rule__Stylesheet__Group__0__Impl5815);

+						rule__Stylesheet__CharsetAssignment_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getCharsetAssignment_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Stylesheet__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2687:1: rule__Stylesheet__Group__1 : rule__Stylesheet__Group__1__Impl rule__Stylesheet__Group__2 ;

+	public final void rule__Stylesheet__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2691:1: ( rule__Stylesheet__Group__1__Impl rule__Stylesheet__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2692:2: rule__Stylesheet__Group__1__Impl rule__Stylesheet__Group__2

+			{

+				pushFollow(FOLLOW_rule__Stylesheet__Group__1__Impl_in_rule__Stylesheet__Group__15846);

+				rule__Stylesheet__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Stylesheet__Group__2_in_rule__Stylesheet__Group__15849);

+				rule__Stylesheet__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__Group__1"

+

+

+	// $ANTLR start "rule__Stylesheet__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2699:1: rule__Stylesheet__Group__1__Impl : ( ( rule__Stylesheet__ImportsAssignment_1 )* ) ;

+	public final void rule__Stylesheet__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2703:1: ( ( ( rule__Stylesheet__ImportsAssignment_1 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2704:1: ( ( rule__Stylesheet__ImportsAssignment_1 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2704:1: ( ( rule__Stylesheet__ImportsAssignment_1 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2705:1: ( rule__Stylesheet__ImportsAssignment_1 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getImportsAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2706:1: ( rule__Stylesheet__ImportsAssignment_1 )*

+					loop40: do {

+						int alt40 = 2;

+						int LA40_0 = input.LA(1);

+

+						if (((LA40_0 >= 22 && LA40_0 <= 23))) {

+							alt40 = 1;

+						}

+

+

+						switch (alt40) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2706:2: rule__Stylesheet__ImportsAssignment_1

+						{

+							pushFollow(FOLLOW_rule__Stylesheet__ImportsAssignment_1_in_rule__Stylesheet__Group__1__Impl5876);

+							rule__Stylesheet__ImportsAssignment_1();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop40;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getImportsAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Stylesheet__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2716:1: rule__Stylesheet__Group__2 : rule__Stylesheet__Group__2__Impl ;

+	public final void rule__Stylesheet__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2720:1: ( rule__Stylesheet__Group__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2721:2: rule__Stylesheet__Group__2__Impl

+			{

+				pushFollow(FOLLOW_rule__Stylesheet__Group__2__Impl_in_rule__Stylesheet__Group__25907);

+				rule__Stylesheet__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__Group__2"

+

+

+	// $ANTLR start "rule__Stylesheet__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2727:1: rule__Stylesheet__Group__2__Impl : ( ( rule__Stylesheet__Alternatives_2 )* ) ;

+	public final void rule__Stylesheet__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2731:1: ( ( ( rule__Stylesheet__Alternatives_2 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2732:1: ( ( rule__Stylesheet__Alternatives_2 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2732:1: ( ( rule__Stylesheet__Alternatives_2 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2733:1: ( rule__Stylesheet__Alternatives_2 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getAlternatives_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2734:1: ( rule__Stylesheet__Alternatives_2 )*

+					loop41: do {

+						int alt41 = 2;

+						int LA41_0 = input.LA(1);

+

+						if (((LA41_0 >= RULE_DASH && LA41_0 <= RULE_ONE_NON_HEX_LETTER) || (LA41_0 >= 24 && LA41_0 <= 31) || LA41_0 == 36 || LA41_0 == 39 || LA41_0 == 42 || (LA41_0 >= 49 && LA41_0 <= 52) || LA41_0 == 60)) {

+							alt41 = 1;

+						}

+

+

+						switch (alt41) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2734:2: rule__Stylesheet__Alternatives_2

+						{

+							pushFollow(FOLLOW_rule__Stylesheet__Alternatives_2_in_rule__Stylesheet__Group__2__Impl5934);

+							rule__Stylesheet__Alternatives_2();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop41;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getAlternatives_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__Group__2__Impl"

+

+

+	// $ANTLR start "rule__Charset__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2750:1: rule__Charset__Group__0 : rule__Charset__Group__0__Impl rule__Charset__Group__1 ;

+	public final void rule__Charset__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2754:1: ( rule__Charset__Group__0__Impl rule__Charset__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2755:2: rule__Charset__Group__0__Impl rule__Charset__Group__1

+			{

+				pushFollow(FOLLOW_rule__Charset__Group__0__Impl_in_rule__Charset__Group__05971);

+				rule__Charset__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Charset__Group__1_in_rule__Charset__Group__05974);

+				rule__Charset__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Charset__Group__0"

+

+

+	// $ANTLR start "rule__Charset__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2762:1: rule__Charset__Group__0__Impl : ( ( rule__Charset__Alternatives_0 ) ) ;

+	public final void rule__Charset__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2766:1: ( ( ( rule__Charset__Alternatives_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2767:1: ( ( rule__Charset__Alternatives_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2767:1: ( ( rule__Charset__Alternatives_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2768:1: ( rule__Charset__Alternatives_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCharsetAccess().getAlternatives_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2769:1: ( rule__Charset__Alternatives_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2769:2: rule__Charset__Alternatives_0

+					{

+						pushFollow(FOLLOW_rule__Charset__Alternatives_0_in_rule__Charset__Group__0__Impl6001);

+						rule__Charset__Alternatives_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCharsetAccess().getAlternatives_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Charset__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Charset__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2779:1: rule__Charset__Group__1 : rule__Charset__Group__1__Impl rule__Charset__Group__2 ;

+	public final void rule__Charset__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2783:1: ( rule__Charset__Group__1__Impl rule__Charset__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2784:2: rule__Charset__Group__1__Impl rule__Charset__Group__2

+			{

+				pushFollow(FOLLOW_rule__Charset__Group__1__Impl_in_rule__Charset__Group__16031);

+				rule__Charset__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Charset__Group__2_in_rule__Charset__Group__16034);

+				rule__Charset__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Charset__Group__1"

+

+

+	// $ANTLR start "rule__Charset__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2791:1: rule__Charset__Group__1__Impl : ( ( rule__Charset__CharsetAssignment_1 ) ) ;

+	public final void rule__Charset__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2795:1: ( ( ( rule__Charset__CharsetAssignment_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2796:1: ( ( rule__Charset__CharsetAssignment_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2796:1: ( ( rule__Charset__CharsetAssignment_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2797:1: ( rule__Charset__CharsetAssignment_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCharsetAccess().getCharsetAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2798:1: ( rule__Charset__CharsetAssignment_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2798:2: rule__Charset__CharsetAssignment_1

+					{

+						pushFollow(FOLLOW_rule__Charset__CharsetAssignment_1_in_rule__Charset__Group__1__Impl6061);

+						rule__Charset__CharsetAssignment_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCharsetAccess().getCharsetAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Charset__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Charset__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2808:1: rule__Charset__Group__2 : rule__Charset__Group__2__Impl ;

+	public final void rule__Charset__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2812:1: ( rule__Charset__Group__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2813:2: rule__Charset__Group__2__Impl

+			{

+				pushFollow(FOLLOW_rule__Charset__Group__2__Impl_in_rule__Charset__Group__26091);

+				rule__Charset__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Charset__Group__2"

+

+

+	// $ANTLR start "rule__Charset__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2819:1: rule__Charset__Group__2__Impl : ( ';' ) ;

+	public final void rule__Charset__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2823:1: ( ( ';' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2824:1: ( ';' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2824:1: ( ';' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2825:1: ';'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCharsetAccess().getSemicolonKeyword_2());

+					}

+					match(input, 48, FOLLOW_48_in_rule__Charset__Group__2__Impl6119);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCharsetAccess().getSemicolonKeyword_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Charset__Group__2__Impl"

+

+

+	// $ANTLR start "rule__ImportExpression__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2844:1: rule__ImportExpression__Group__0 : rule__ImportExpression__Group__0__Impl

+	// rule__ImportExpression__Group__1 ;

+	public final void rule__ImportExpression__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2848:1: ( rule__ImportExpression__Group__0__Impl rule__ImportExpression__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2849:2: rule__ImportExpression__Group__0__Impl rule__ImportExpression__Group__1

+			{

+				pushFollow(FOLLOW_rule__ImportExpression__Group__0__Impl_in_rule__ImportExpression__Group__06156);

+				rule__ImportExpression__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__ImportExpression__Group__1_in_rule__ImportExpression__Group__06159);

+				rule__ImportExpression__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__Group__0"

+

+

+	// $ANTLR start "rule__ImportExpression__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2856:1: rule__ImportExpression__Group__0__Impl : ( ( rule__ImportExpression__Alternatives_0 ) ) ;

+	public final void rule__ImportExpression__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2860:1: ( ( ( rule__ImportExpression__Alternatives_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2861:1: ( ( rule__ImportExpression__Alternatives_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2861:1: ( ( rule__ImportExpression__Alternatives_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2862:1: ( rule__ImportExpression__Alternatives_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getImportExpressionAccess().getAlternatives_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2863:1: ( rule__ImportExpression__Alternatives_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2863:2: rule__ImportExpression__Alternatives_0

+					{

+						pushFollow(FOLLOW_rule__ImportExpression__Alternatives_0_in_rule__ImportExpression__Group__0__Impl6186);

+						rule__ImportExpression__Alternatives_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getImportExpressionAccess().getAlternatives_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__Group__0__Impl"

+

+

+	// $ANTLR start "rule__ImportExpression__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2873:1: rule__ImportExpression__Group__1 : rule__ImportExpression__Group__1__Impl

+	// rule__ImportExpression__Group__2 ;

+	public final void rule__ImportExpression__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2877:1: ( rule__ImportExpression__Group__1__Impl rule__ImportExpression__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2878:2: rule__ImportExpression__Group__1__Impl rule__ImportExpression__Group__2

+			{

+				pushFollow(FOLLOW_rule__ImportExpression__Group__1__Impl_in_rule__ImportExpression__Group__16216);

+				rule__ImportExpression__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__ImportExpression__Group__2_in_rule__ImportExpression__Group__16219);

+				rule__ImportExpression__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__Group__1"

+

+

+	// $ANTLR start "rule__ImportExpression__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2885:1: rule__ImportExpression__Group__1__Impl : ( ( rule__ImportExpression__Alternatives_1 ) ) ;

+	public final void rule__ImportExpression__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2889:1: ( ( ( rule__ImportExpression__Alternatives_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2890:1: ( ( rule__ImportExpression__Alternatives_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2890:1: ( ( rule__ImportExpression__Alternatives_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2891:1: ( rule__ImportExpression__Alternatives_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getImportExpressionAccess().getAlternatives_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2892:1: ( rule__ImportExpression__Alternatives_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2892:2: rule__ImportExpression__Alternatives_1

+					{

+						pushFollow(FOLLOW_rule__ImportExpression__Alternatives_1_in_rule__ImportExpression__Group__1__Impl6246);

+						rule__ImportExpression__Alternatives_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getImportExpressionAccess().getAlternatives_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__Group__1__Impl"

+

+

+	// $ANTLR start "rule__ImportExpression__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2902:1: rule__ImportExpression__Group__2 : rule__ImportExpression__Group__2__Impl ;

+	public final void rule__ImportExpression__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2906:1: ( rule__ImportExpression__Group__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2907:2: rule__ImportExpression__Group__2__Impl

+			{

+				pushFollow(FOLLOW_rule__ImportExpression__Group__2__Impl_in_rule__ImportExpression__Group__26276);

+				rule__ImportExpression__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__Group__2"

+

+

+	// $ANTLR start "rule__ImportExpression__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2913:1: rule__ImportExpression__Group__2__Impl : ( ';' ) ;

+	public final void rule__ImportExpression__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2917:1: ( ( ';' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2918:1: ( ';' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2918:1: ( ';' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2919:1: ';'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getImportExpressionAccess().getSemicolonKeyword_2());

+					}

+					match(input, 48, FOLLOW_48_in_rule__ImportExpression__Group__2__Impl6304);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getImportExpressionAccess().getSemicolonKeyword_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__Group__2__Impl"

+

+

+	// $ANTLR start "rule__ImportExpression__Group_1_1__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2938:1: rule__ImportExpression__Group_1_1__0 : rule__ImportExpression__Group_1_1__0__Impl

+	// rule__ImportExpression__Group_1_1__1 ;

+	public final void rule__ImportExpression__Group_1_1__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2942:1: ( rule__ImportExpression__Group_1_1__0__Impl rule__ImportExpression__Group_1_1__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2943:2: rule__ImportExpression__Group_1_1__0__Impl rule__ImportExpression__Group_1_1__1

+			{

+				pushFollow(FOLLOW_rule__ImportExpression__Group_1_1__0__Impl_in_rule__ImportExpression__Group_1_1__06341);

+				rule__ImportExpression__Group_1_1__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__ImportExpression__Group_1_1__1_in_rule__ImportExpression__Group_1_1__06344);

+				rule__ImportExpression__Group_1_1__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__Group_1_1__0"

+

+

+	// $ANTLR start "rule__ImportExpression__Group_1_1__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2950:1: rule__ImportExpression__Group_1_1__0__Impl : ( ruleURLType ) ;

+	public final void rule__ImportExpression__Group_1_1__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2954:1: ( ( ruleURLType ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2955:1: ( ruleURLType )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2955:1: ( ruleURLType )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2956:1: ruleURLType

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getImportExpressionAccess().getURLTypeParserRuleCall_1_1_0());

+					}

+					pushFollow(FOLLOW_ruleURLType_in_rule__ImportExpression__Group_1_1__0__Impl6371);

+					ruleURLType();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getImportExpressionAccess().getURLTypeParserRuleCall_1_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__Group_1_1__0__Impl"

+

+

+	// $ANTLR start "rule__ImportExpression__Group_1_1__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2967:1: rule__ImportExpression__Group_1_1__1 : rule__ImportExpression__Group_1_1__1__Impl ;

+	public final void rule__ImportExpression__Group_1_1__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2971:1: ( rule__ImportExpression__Group_1_1__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2972:2: rule__ImportExpression__Group_1_1__1__Impl

+			{

+				pushFollow(FOLLOW_rule__ImportExpression__Group_1_1__1__Impl_in_rule__ImportExpression__Group_1_1__16400);

+				rule__ImportExpression__Group_1_1__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__Group_1_1__1"

+

+

+	// $ANTLR start "rule__ImportExpression__Group_1_1__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2978:1: rule__ImportExpression__Group_1_1__1__Impl : ( ( rule__ImportExpression__MediaListAssignment_1_1_1 )?

+	// ) ;

+	public final void rule__ImportExpression__Group_1_1__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2982:1: ( ( ( rule__ImportExpression__MediaListAssignment_1_1_1 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2983:1: ( ( rule__ImportExpression__MediaListAssignment_1_1_1 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2983:1: ( ( rule__ImportExpression__MediaListAssignment_1_1_1 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2984:1: ( rule__ImportExpression__MediaListAssignment_1_1_1 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getImportExpressionAccess().getMediaListAssignment_1_1_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2985:1: ( rule__ImportExpression__MediaListAssignment_1_1_1 )?

+					int alt42 = 2;

+					int LA42_0 = input.LA(1);

+

+					if (((LA42_0 >= RULE_DASH && LA42_0 <= RULE_UNDERSCORE) || (LA42_0 >= RULE_ONE_HEX_LETTER && LA42_0 <= RULE_ONE_NON_HEX_LETTER) || (LA42_0 >= 49 && LA42_0 <= 52))) {

+						alt42 = 1;

+					}

+					switch (alt42) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2985:2: rule__ImportExpression__MediaListAssignment_1_1_1

+					{

+						pushFollow(FOLLOW_rule__ImportExpression__MediaListAssignment_1_1_1_in_rule__ImportExpression__Group_1_1__1__Impl6427);

+						rule__ImportExpression__MediaListAssignment_1_1_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getImportExpressionAccess().getMediaListAssignment_1_1_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__Group_1_1__1__Impl"

+

+

+	// $ANTLR start "rule__Page__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:2999:1: rule__Page__Group__0 : rule__Page__Group__0__Impl rule__Page__Group__1 ;

+	public final void rule__Page__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3003:1: ( rule__Page__Group__0__Impl rule__Page__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3004:2: rule__Page__Group__0__Impl rule__Page__Group__1

+			{

+				pushFollow(FOLLOW_rule__Page__Group__0__Impl_in_rule__Page__Group__06462);

+				rule__Page__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Page__Group__1_in_rule__Page__Group__06465);

+				rule__Page__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__0"

+

+

+	// $ANTLR start "rule__Page__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3011:1: rule__Page__Group__0__Impl : ( () ) ;

+	public final void rule__Page__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3015:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3016:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3016:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3017:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getPageAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3018:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3020:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getPageAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Page__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3030:1: rule__Page__Group__1 : rule__Page__Group__1__Impl rule__Page__Group__2 ;

+	public final void rule__Page__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3034:1: ( rule__Page__Group__1__Impl rule__Page__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3035:2: rule__Page__Group__1__Impl rule__Page__Group__2

+			{

+				pushFollow(FOLLOW_rule__Page__Group__1__Impl_in_rule__Page__Group__16523);

+				rule__Page__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Page__Group__2_in_rule__Page__Group__16526);

+				rule__Page__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__1"

+

+

+	// $ANTLR start "rule__Page__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3042:1: rule__Page__Group__1__Impl : ( ( rule__Page__Alternatives_1 ) ) ;

+	public final void rule__Page__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3046:1: ( ( ( rule__Page__Alternatives_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3047:1: ( ( rule__Page__Alternatives_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3047:1: ( ( rule__Page__Alternatives_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3048:1: ( rule__Page__Alternatives_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getAlternatives_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3049:1: ( rule__Page__Alternatives_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3049:2: rule__Page__Alternatives_1

+					{

+						pushFollow(FOLLOW_rule__Page__Alternatives_1_in_rule__Page__Group__1__Impl6553);

+						rule__Page__Alternatives_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getAlternatives_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Page__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3059:1: rule__Page__Group__2 : rule__Page__Group__2__Impl rule__Page__Group__3 ;

+	public final void rule__Page__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3063:1: ( rule__Page__Group__2__Impl rule__Page__Group__3 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3064:2: rule__Page__Group__2__Impl rule__Page__Group__3

+			{

+				pushFollow(FOLLOW_rule__Page__Group__2__Impl_in_rule__Page__Group__26583);

+				rule__Page__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Page__Group__3_in_rule__Page__Group__26586);

+				rule__Page__Group__3();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__2"

+

+

+	// $ANTLR start "rule__Page__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3071:1: rule__Page__Group__2__Impl : ( ( rule__Page__PseudoPageAssignment_2 )? ) ;

+	public final void rule__Page__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3075:1: ( ( ( rule__Page__PseudoPageAssignment_2 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3076:1: ( ( rule__Page__PseudoPageAssignment_2 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3076:1: ( ( rule__Page__PseudoPageAssignment_2 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3077:1: ( rule__Page__PseudoPageAssignment_2 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getPseudoPageAssignment_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3078:1: ( rule__Page__PseudoPageAssignment_2 )?

+					int alt43 = 2;

+					int LA43_0 = input.LA(1);

+

+					if ((LA43_0 == RULE_COLON)) {

+						alt43 = 1;

+					}

+					switch (alt43) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3078:2: rule__Page__PseudoPageAssignment_2

+					{

+						pushFollow(FOLLOW_rule__Page__PseudoPageAssignment_2_in_rule__Page__Group__2__Impl6613);

+						rule__Page__PseudoPageAssignment_2();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getPseudoPageAssignment_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__2__Impl"

+

+

+	// $ANTLR start "rule__Page__Group__3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3088:1: rule__Page__Group__3 : rule__Page__Group__3__Impl rule__Page__Group__4 ;

+	public final void rule__Page__Group__3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3092:1: ( rule__Page__Group__3__Impl rule__Page__Group__4 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3093:2: rule__Page__Group__3__Impl rule__Page__Group__4

+			{

+				pushFollow(FOLLOW_rule__Page__Group__3__Impl_in_rule__Page__Group__36644);

+				rule__Page__Group__3__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Page__Group__4_in_rule__Page__Group__36647);

+				rule__Page__Group__4();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__3"

+

+

+	// $ANTLR start "rule__Page__Group__3__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3100:1: rule__Page__Group__3__Impl : ( '{' ) ;

+	public final void rule__Page__Group__3__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3104:1: ( ( '{' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3105:1: ( '{' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3105:1: ( '{' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3106:1: '{'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_3());

+					}

+					match(input, 58, FOLLOW_58_in_rule__Page__Group__3__Impl6675);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_3());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__3__Impl"

+

+

+	// $ANTLR start "rule__Page__Group__4"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3119:1: rule__Page__Group__4 : rule__Page__Group__4__Impl rule__Page__Group__5 ;

+	public final void rule__Page__Group__4() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3123:1: ( rule__Page__Group__4__Impl rule__Page__Group__5 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3124:2: rule__Page__Group__4__Impl rule__Page__Group__5

+			{

+				pushFollow(FOLLOW_rule__Page__Group__4__Impl_in_rule__Page__Group__46706);

+				rule__Page__Group__4__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Page__Group__5_in_rule__Page__Group__46709);

+				rule__Page__Group__5();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__4"

+

+

+	// $ANTLR start "rule__Page__Group__4__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3131:1: rule__Page__Group__4__Impl : ( ( rule__Page__DeclarationsAssignment_4 )? ) ;

+	public final void rule__Page__Group__4__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3135:1: ( ( ( rule__Page__DeclarationsAssignment_4 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3136:1: ( ( rule__Page__DeclarationsAssignment_4 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3136:1: ( ( rule__Page__DeclarationsAssignment_4 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3137:1: ( rule__Page__DeclarationsAssignment_4 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getDeclarationsAssignment_4());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3138:1: ( rule__Page__DeclarationsAssignment_4 )?

+					int alt44 = 2;

+					int LA44_0 = input.LA(1);

+

+					if (((LA44_0 >= RULE_DASH && LA44_0 <= RULE_UNDERSCORE) || (LA44_0 >= RULE_ONE_HEX_LETTER && LA44_0 <= RULE_ONE_NON_HEX_LETTER) || LA44_0 == RULE_WS || (LA44_0 >= 49 && LA44_0 <= 52))) {

+						alt44 = 1;

+					}

+					switch (alt44) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3138:2: rule__Page__DeclarationsAssignment_4

+					{

+						pushFollow(FOLLOW_rule__Page__DeclarationsAssignment_4_in_rule__Page__Group__4__Impl6736);

+						rule__Page__DeclarationsAssignment_4();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getDeclarationsAssignment_4());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__4__Impl"

+

+

+	// $ANTLR start "rule__Page__Group__5"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3148:1: rule__Page__Group__5 : rule__Page__Group__5__Impl rule__Page__Group__6 ;

+	public final void rule__Page__Group__5() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3152:1: ( rule__Page__Group__5__Impl rule__Page__Group__6 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3153:2: rule__Page__Group__5__Impl rule__Page__Group__6

+			{

+				pushFollow(FOLLOW_rule__Page__Group__5__Impl_in_rule__Page__Group__56767);

+				rule__Page__Group__5__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Page__Group__6_in_rule__Page__Group__56770);

+				rule__Page__Group__6();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__5"

+

+

+	// $ANTLR start "rule__Page__Group__5__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3160:1: rule__Page__Group__5__Impl : ( ( rule__Page__Group_5__0 )* ) ;

+	public final void rule__Page__Group__5__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3164:1: ( ( ( rule__Page__Group_5__0 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3165:1: ( ( rule__Page__Group_5__0 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3165:1: ( ( rule__Page__Group_5__0 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3166:1: ( rule__Page__Group_5__0 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getGroup_5());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3167:1: ( rule__Page__Group_5__0 )*

+					loop45: do {

+						int alt45 = 2;

+						int LA45_0 = input.LA(1);

+

+						if ((LA45_0 == 48)) {

+							alt45 = 1;

+						}

+

+

+						switch (alt45) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3167:2: rule__Page__Group_5__0

+						{

+							pushFollow(FOLLOW_rule__Page__Group_5__0_in_rule__Page__Group__5__Impl6797);

+							rule__Page__Group_5__0();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop45;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getGroup_5());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__5__Impl"

+

+

+	// $ANTLR start "rule__Page__Group__6"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3177:1: rule__Page__Group__6 : rule__Page__Group__6__Impl ;

+	public final void rule__Page__Group__6() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3181:1: ( rule__Page__Group__6__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3182:2: rule__Page__Group__6__Impl

+			{

+				pushFollow(FOLLOW_rule__Page__Group__6__Impl_in_rule__Page__Group__66828);

+				rule__Page__Group__6__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__6"

+

+

+	// $ANTLR start "rule__Page__Group__6__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3188:1: rule__Page__Group__6__Impl : ( '}' ) ;

+	public final void rule__Page__Group__6__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3192:1: ( ( '}' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3193:1: ( '}' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3193:1: ( '}' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3194:1: '}'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getRightCurlyBracketKeyword_6());

+					}

+					match(input, 59, FOLLOW_59_in_rule__Page__Group__6__Impl6856);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getRightCurlyBracketKeyword_6());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group__6__Impl"

+

+

+	// $ANTLR start "rule__Page__Group_5__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3221:1: rule__Page__Group_5__0 : rule__Page__Group_5__0__Impl rule__Page__Group_5__1 ;

+	public final void rule__Page__Group_5__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3225:1: ( rule__Page__Group_5__0__Impl rule__Page__Group_5__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3226:2: rule__Page__Group_5__0__Impl rule__Page__Group_5__1

+			{

+				pushFollow(FOLLOW_rule__Page__Group_5__0__Impl_in_rule__Page__Group_5__06901);

+				rule__Page__Group_5__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Page__Group_5__1_in_rule__Page__Group_5__06904);

+				rule__Page__Group_5__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group_5__0"

+

+

+	// $ANTLR start "rule__Page__Group_5__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3233:1: rule__Page__Group_5__0__Impl : ( ';' ) ;

+	public final void rule__Page__Group_5__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3237:1: ( ( ';' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3238:1: ( ';' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3238:1: ( ';' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3239:1: ';'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getSemicolonKeyword_5_0());

+					}

+					match(input, 48, FOLLOW_48_in_rule__Page__Group_5__0__Impl6932);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getSemicolonKeyword_5_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group_5__0__Impl"

+

+

+	// $ANTLR start "rule__Page__Group_5__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3252:1: rule__Page__Group_5__1 : rule__Page__Group_5__1__Impl ;

+	public final void rule__Page__Group_5__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3256:1: ( rule__Page__Group_5__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3257:2: rule__Page__Group_5__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Page__Group_5__1__Impl_in_rule__Page__Group_5__16963);

+				rule__Page__Group_5__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group_5__1"

+

+

+	// $ANTLR start "rule__Page__Group_5__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3263:1: rule__Page__Group_5__1__Impl : ( ( rule__Page__DeclarationsAssignment_5_1 )? ) ;

+	public final void rule__Page__Group_5__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3267:1: ( ( ( rule__Page__DeclarationsAssignment_5_1 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3268:1: ( ( rule__Page__DeclarationsAssignment_5_1 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3268:1: ( ( rule__Page__DeclarationsAssignment_5_1 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3269:1: ( rule__Page__DeclarationsAssignment_5_1 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getDeclarationsAssignment_5_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3270:1: ( rule__Page__DeclarationsAssignment_5_1 )?

+					int alt46 = 2;

+					int LA46_0 = input.LA(1);

+

+					if (((LA46_0 >= RULE_DASH && LA46_0 <= RULE_UNDERSCORE) || (LA46_0 >= RULE_ONE_HEX_LETTER && LA46_0 <= RULE_ONE_NON_HEX_LETTER) || LA46_0 == RULE_WS || (LA46_0 >= 49 && LA46_0 <= 52))) {

+						alt46 = 1;

+					}

+					switch (alt46) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3270:2: rule__Page__DeclarationsAssignment_5_1

+					{

+						pushFollow(FOLLOW_rule__Page__DeclarationsAssignment_5_1_in_rule__Page__Group_5__1__Impl6990);

+						rule__Page__DeclarationsAssignment_5_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getDeclarationsAssignment_5_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__Group_5__1__Impl"

+

+

+	// $ANTLR start "rule__Pseudo_page__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3284:1: rule__Pseudo_page__Group__0 : rule__Pseudo_page__Group__0__Impl rule__Pseudo_page__Group__1 ;

+	public final void rule__Pseudo_page__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3288:1: ( rule__Pseudo_page__Group__0__Impl rule__Pseudo_page__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3289:2: rule__Pseudo_page__Group__0__Impl rule__Pseudo_page__Group__1

+			{

+				pushFollow(FOLLOW_rule__Pseudo_page__Group__0__Impl_in_rule__Pseudo_page__Group__07025);

+				rule__Pseudo_page__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Pseudo_page__Group__1_in_rule__Pseudo_page__Group__07028);

+				rule__Pseudo_page__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Pseudo_page__Group__0"

+

+

+	// $ANTLR start "rule__Pseudo_page__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3296:1: rule__Pseudo_page__Group__0__Impl : ( RULE_COLON ) ;

+	public final void rule__Pseudo_page__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3300:1: ( ( RULE_COLON ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3301:1: ( RULE_COLON )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3301:1: ( RULE_COLON )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3302:1: RULE_COLON

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudo_pageAccess().getCOLONTerminalRuleCall_0());

+					}

+					match(input, RULE_COLON, FOLLOW_RULE_COLON_in_rule__Pseudo_page__Group__0__Impl7055);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudo_pageAccess().getCOLONTerminalRuleCall_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Pseudo_page__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Pseudo_page__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3313:1: rule__Pseudo_page__Group__1 : rule__Pseudo_page__Group__1__Impl ;

+	public final void rule__Pseudo_page__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3317:1: ( rule__Pseudo_page__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3318:2: rule__Pseudo_page__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Pseudo_page__Group__1__Impl_in_rule__Pseudo_page__Group__17084);

+				rule__Pseudo_page__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Pseudo_page__Group__1"

+

+

+	// $ANTLR start "rule__Pseudo_page__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3324:1: rule__Pseudo_page__Group__1__Impl : ( ruleIdentifier ) ;

+	public final void rule__Pseudo_page__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3328:1: ( ( ruleIdentifier ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3329:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3329:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3330:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudo_pageAccess().getIdentifierParserRuleCall_1());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rule__Pseudo_page__Group__1__Impl7111);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudo_pageAccess().getIdentifierParserRuleCall_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Pseudo_page__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Media__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3345:1: rule__Media__Group__0 : rule__Media__Group__0__Impl rule__Media__Group__1 ;

+	public final void rule__Media__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3349:1: ( rule__Media__Group__0__Impl rule__Media__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3350:2: rule__Media__Group__0__Impl rule__Media__Group__1

+			{

+				pushFollow(FOLLOW_rule__Media__Group__0__Impl_in_rule__Media__Group__07144);

+				rule__Media__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Media__Group__1_in_rule__Media__Group__07147);

+				rule__Media__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media__Group__0"

+

+

+	// $ANTLR start "rule__Media__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3357:1: rule__Media__Group__0__Impl : ( ( rule__Media__Alternatives_0 ) ) ;

+	public final void rule__Media__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3361:1: ( ( ( rule__Media__Alternatives_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3362:1: ( ( rule__Media__Alternatives_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3362:1: ( ( rule__Media__Alternatives_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3363:1: ( rule__Media__Alternatives_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMediaAccess().getAlternatives_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3364:1: ( rule__Media__Alternatives_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3364:2: rule__Media__Alternatives_0

+					{

+						pushFollow(FOLLOW_rule__Media__Alternatives_0_in_rule__Media__Group__0__Impl7174);

+						rule__Media__Alternatives_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMediaAccess().getAlternatives_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Media__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3374:1: rule__Media__Group__1 : rule__Media__Group__1__Impl rule__Media__Group__2 ;

+	public final void rule__Media__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3378:1: ( rule__Media__Group__1__Impl rule__Media__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3379:2: rule__Media__Group__1__Impl rule__Media__Group__2

+			{

+				pushFollow(FOLLOW_rule__Media__Group__1__Impl_in_rule__Media__Group__17204);

+				rule__Media__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Media__Group__2_in_rule__Media__Group__17207);

+				rule__Media__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media__Group__1"

+

+

+	// $ANTLR start "rule__Media__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3386:1: rule__Media__Group__1__Impl : ( ( rule__Media__MedialistAssignment_1 ) ) ;

+	public final void rule__Media__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3390:1: ( ( ( rule__Media__MedialistAssignment_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3391:1: ( ( rule__Media__MedialistAssignment_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3391:1: ( ( rule__Media__MedialistAssignment_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3392:1: ( rule__Media__MedialistAssignment_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMediaAccess().getMedialistAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3393:1: ( rule__Media__MedialistAssignment_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3393:2: rule__Media__MedialistAssignment_1

+					{

+						pushFollow(FOLLOW_rule__Media__MedialistAssignment_1_in_rule__Media__Group__1__Impl7234);

+						rule__Media__MedialistAssignment_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMediaAccess().getMedialistAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Media__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3403:1: rule__Media__Group__2 : rule__Media__Group__2__Impl rule__Media__Group__3 ;

+	public final void rule__Media__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3407:1: ( rule__Media__Group__2__Impl rule__Media__Group__3 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3408:2: rule__Media__Group__2__Impl rule__Media__Group__3

+			{

+				pushFollow(FOLLOW_rule__Media__Group__2__Impl_in_rule__Media__Group__27264);

+				rule__Media__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Media__Group__3_in_rule__Media__Group__27267);

+				rule__Media__Group__3();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media__Group__2"

+

+

+	// $ANTLR start "rule__Media__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3415:1: rule__Media__Group__2__Impl : ( '{' ) ;

+	public final void rule__Media__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3419:1: ( ( '{' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3420:1: ( '{' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3420:1: ( '{' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3421:1: '{'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_2());

+					}

+					match(input, 58, FOLLOW_58_in_rule__Media__Group__2__Impl7295);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media__Group__2__Impl"

+

+

+	// $ANTLR start "rule__Media__Group__3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3434:1: rule__Media__Group__3 : rule__Media__Group__3__Impl rule__Media__Group__4 ;

+	public final void rule__Media__Group__3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3438:1: ( rule__Media__Group__3__Impl rule__Media__Group__4 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3439:2: rule__Media__Group__3__Impl rule__Media__Group__4

+			{

+				pushFollow(FOLLOW_rule__Media__Group__3__Impl_in_rule__Media__Group__37326);

+				rule__Media__Group__3__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Media__Group__4_in_rule__Media__Group__37329);

+				rule__Media__Group__4();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media__Group__3"

+

+

+	// $ANTLR start "rule__Media__Group__3__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3446:1: rule__Media__Group__3__Impl : ( ( rule__Media__RulesetsAssignment_3 )* ) ;

+	public final void rule__Media__Group__3__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3450:1: ( ( ( rule__Media__RulesetsAssignment_3 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3451:1: ( ( rule__Media__RulesetsAssignment_3 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3451:1: ( ( rule__Media__RulesetsAssignment_3 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3452:1: ( rule__Media__RulesetsAssignment_3 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMediaAccess().getRulesetsAssignment_3());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3453:1: ( rule__Media__RulesetsAssignment_3 )*

+					loop47: do {

+						int alt47 = 2;

+						int LA47_0 = input.LA(1);

+

+						if (((LA47_0 >= RULE_DASH && LA47_0 <= RULE_ONE_NON_HEX_LETTER) || LA47_0 == 36 || LA47_0 == 39 || LA47_0 == 42 || (LA47_0 >= 49 && LA47_0 <= 52) || LA47_0 == 60)) {

+							alt47 = 1;

+						}

+

+

+						switch (alt47) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3453:2: rule__Media__RulesetsAssignment_3

+						{

+							pushFollow(FOLLOW_rule__Media__RulesetsAssignment_3_in_rule__Media__Group__3__Impl7356);

+							rule__Media__RulesetsAssignment_3();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop47;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMediaAccess().getRulesetsAssignment_3());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media__Group__3__Impl"

+

+

+	// $ANTLR start "rule__Media__Group__4"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3463:1: rule__Media__Group__4 : rule__Media__Group__4__Impl ;

+	public final void rule__Media__Group__4() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3467:1: ( rule__Media__Group__4__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3468:2: rule__Media__Group__4__Impl

+			{

+				pushFollow(FOLLOW_rule__Media__Group__4__Impl_in_rule__Media__Group__47387);

+				rule__Media__Group__4__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media__Group__4"

+

+

+	// $ANTLR start "rule__Media__Group__4__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3474:1: rule__Media__Group__4__Impl : ( '}' ) ;

+	public final void rule__Media__Group__4__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3478:1: ( ( '}' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3479:1: ( '}' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3479:1: ( '}' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3480:1: '}'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_4());

+					}

+					match(input, 59, FOLLOW_59_in_rule__Media__Group__4__Impl7415);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_4());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media__Group__4__Impl"

+

+

+	// $ANTLR start "rule__Media_list__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3503:1: rule__Media_list__Group__0 : rule__Media_list__Group__0__Impl rule__Media_list__Group__1 ;

+	public final void rule__Media_list__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3507:1: ( rule__Media_list__Group__0__Impl rule__Media_list__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3508:2: rule__Media_list__Group__0__Impl rule__Media_list__Group__1

+			{

+				pushFollow(FOLLOW_rule__Media_list__Group__0__Impl_in_rule__Media_list__Group__07456);

+				rule__Media_list__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Media_list__Group__1_in_rule__Media_list__Group__07459);

+				rule__Media_list__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media_list__Group__0"

+

+

+	// $ANTLR start "rule__Media_list__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3515:1: rule__Media_list__Group__0__Impl : ( rulemedium ) ;

+	public final void rule__Media_list__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3519:1: ( ( rulemedium ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3520:1: ( rulemedium )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3520:1: ( rulemedium )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3521:1: rulemedium

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_0());

+					}

+					pushFollow(FOLLOW_rulemedium_in_rule__Media_list__Group__0__Impl7486);

+					rulemedium();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media_list__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Media_list__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3532:1: rule__Media_list__Group__1 : rule__Media_list__Group__1__Impl ;

+	public final void rule__Media_list__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3536:1: ( rule__Media_list__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3537:2: rule__Media_list__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Media_list__Group__1__Impl_in_rule__Media_list__Group__17515);

+				rule__Media_list__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media_list__Group__1"

+

+

+	// $ANTLR start "rule__Media_list__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3543:1: rule__Media_list__Group__1__Impl : ( ( rule__Media_list__Group_1__0 )* ) ;

+	public final void rule__Media_list__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3547:1: ( ( ( rule__Media_list__Group_1__0 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3548:1: ( ( rule__Media_list__Group_1__0 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3548:1: ( ( rule__Media_list__Group_1__0 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3549:1: ( rule__Media_list__Group_1__0 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMedia_listAccess().getGroup_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3550:1: ( rule__Media_list__Group_1__0 )*

+					loop48: do {

+						int alt48 = 2;

+						int LA48_0 = input.LA(1);

+

+						if ((LA48_0 == RULE_COMMA)) {

+							alt48 = 1;

+						}

+

+

+						switch (alt48) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3550:2: rule__Media_list__Group_1__0

+						{

+							pushFollow(FOLLOW_rule__Media_list__Group_1__0_in_rule__Media_list__Group__1__Impl7542);

+							rule__Media_list__Group_1__0();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop48;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMedia_listAccess().getGroup_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media_list__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Media_list__Group_1__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3564:1: rule__Media_list__Group_1__0 : rule__Media_list__Group_1__0__Impl rule__Media_list__Group_1__1 ;

+	public final void rule__Media_list__Group_1__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3568:1: ( rule__Media_list__Group_1__0__Impl rule__Media_list__Group_1__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3569:2: rule__Media_list__Group_1__0__Impl rule__Media_list__Group_1__1

+			{

+				pushFollow(FOLLOW_rule__Media_list__Group_1__0__Impl_in_rule__Media_list__Group_1__07577);

+				rule__Media_list__Group_1__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Media_list__Group_1__1_in_rule__Media_list__Group_1__07580);

+				rule__Media_list__Group_1__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media_list__Group_1__0"

+

+

+	// $ANTLR start "rule__Media_list__Group_1__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3576:1: rule__Media_list__Group_1__0__Impl : ( RULE_COMMA ) ;

+	public final void rule__Media_list__Group_1__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3580:1: ( ( RULE_COMMA ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3581:1: ( RULE_COMMA )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3581:1: ( RULE_COMMA )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3582:1: RULE_COMMA

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMedia_listAccess().getCOMMATerminalRuleCall_1_0());

+					}

+					match(input, RULE_COMMA, FOLLOW_RULE_COMMA_in_rule__Media_list__Group_1__0__Impl7607);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMedia_listAccess().getCOMMATerminalRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media_list__Group_1__0__Impl"

+

+

+	// $ANTLR start "rule__Media_list__Group_1__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3593:1: rule__Media_list__Group_1__1 : rule__Media_list__Group_1__1__Impl ;

+	public final void rule__Media_list__Group_1__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3597:1: ( rule__Media_list__Group_1__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3598:2: rule__Media_list__Group_1__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Media_list__Group_1__1__Impl_in_rule__Media_list__Group_1__17636);

+				rule__Media_list__Group_1__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media_list__Group_1__1"

+

+

+	// $ANTLR start "rule__Media_list__Group_1__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3604:1: rule__Media_list__Group_1__1__Impl : ( rulemedium ) ;

+	public final void rule__Media_list__Group_1__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3608:1: ( ( rulemedium ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3609:1: ( rulemedium )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3609:1: ( rulemedium )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3610:1: rulemedium

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_1_1());

+					}

+					pushFollow(FOLLOW_rulemedium_in_rule__Media_list__Group_1__1__Impl7663);

+					rulemedium();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_1_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media_list__Group_1__1__Impl"

+

+

+	// $ANTLR start "rule__Font_face__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3625:1: rule__Font_face__Group__0 : rule__Font_face__Group__0__Impl rule__Font_face__Group__1 ;

+	public final void rule__Font_face__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3629:1: ( rule__Font_face__Group__0__Impl rule__Font_face__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3630:2: rule__Font_face__Group__0__Impl rule__Font_face__Group__1

+			{

+				pushFollow(FOLLOW_rule__Font_face__Group__0__Impl_in_rule__Font_face__Group__07696);

+				rule__Font_face__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Font_face__Group__1_in_rule__Font_face__Group__07699);

+				rule__Font_face__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group__0"

+

+

+	// $ANTLR start "rule__Font_face__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3637:1: rule__Font_face__Group__0__Impl : ( () ) ;

+	public final void rule__Font_face__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3641:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3642:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3642:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3643:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getFont_faceAccess().getFont_faceAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3644:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3646:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getFont_faceAccess().getFont_faceAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Font_face__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3656:1: rule__Font_face__Group__1 : rule__Font_face__Group__1__Impl rule__Font_face__Group__2 ;

+	public final void rule__Font_face__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3660:1: ( rule__Font_face__Group__1__Impl rule__Font_face__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3661:2: rule__Font_face__Group__1__Impl rule__Font_face__Group__2

+			{

+				pushFollow(FOLLOW_rule__Font_face__Group__1__Impl_in_rule__Font_face__Group__17757);

+				rule__Font_face__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Font_face__Group__2_in_rule__Font_face__Group__17760);

+				rule__Font_face__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group__1"

+

+

+	// $ANTLR start "rule__Font_face__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3668:1: rule__Font_face__Group__1__Impl : ( ( rule__Font_face__Alternatives_1 ) ) ;

+	public final void rule__Font_face__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3672:1: ( ( ( rule__Font_face__Alternatives_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3673:1: ( ( rule__Font_face__Alternatives_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3673:1: ( ( rule__Font_face__Alternatives_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3674:1: ( rule__Font_face__Alternatives_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getFont_faceAccess().getAlternatives_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3675:1: ( rule__Font_face__Alternatives_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3675:2: rule__Font_face__Alternatives_1

+					{

+						pushFollow(FOLLOW_rule__Font_face__Alternatives_1_in_rule__Font_face__Group__1__Impl7787);

+						rule__Font_face__Alternatives_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getFont_faceAccess().getAlternatives_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Font_face__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3685:1: rule__Font_face__Group__2 : rule__Font_face__Group__2__Impl rule__Font_face__Group__3 ;

+	public final void rule__Font_face__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3689:1: ( rule__Font_face__Group__2__Impl rule__Font_face__Group__3 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3690:2: rule__Font_face__Group__2__Impl rule__Font_face__Group__3

+			{

+				pushFollow(FOLLOW_rule__Font_face__Group__2__Impl_in_rule__Font_face__Group__27817);

+				rule__Font_face__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Font_face__Group__3_in_rule__Font_face__Group__27820);

+				rule__Font_face__Group__3();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group__2"

+

+

+	// $ANTLR start "rule__Font_face__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3697:1: rule__Font_face__Group__2__Impl : ( '{' ) ;

+	public final void rule__Font_face__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3701:1: ( ( '{' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3702:1: ( '{' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3702:1: ( '{' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3703:1: '{'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getFont_faceAccess().getLeftCurlyBracketKeyword_2());

+					}

+					match(input, 58, FOLLOW_58_in_rule__Font_face__Group__2__Impl7848);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getFont_faceAccess().getLeftCurlyBracketKeyword_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group__2__Impl"

+

+

+	// $ANTLR start "rule__Font_face__Group__3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3716:1: rule__Font_face__Group__3 : rule__Font_face__Group__3__Impl rule__Font_face__Group__4 ;

+	public final void rule__Font_face__Group__3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3720:1: ( rule__Font_face__Group__3__Impl rule__Font_face__Group__4 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3721:2: rule__Font_face__Group__3__Impl rule__Font_face__Group__4

+			{

+				pushFollow(FOLLOW_rule__Font_face__Group__3__Impl_in_rule__Font_face__Group__37879);

+				rule__Font_face__Group__3__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Font_face__Group__4_in_rule__Font_face__Group__37882);

+				rule__Font_face__Group__4();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group__3"

+

+

+	// $ANTLR start "rule__Font_face__Group__3__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3728:1: rule__Font_face__Group__3__Impl : ( ( rule__Font_face__DeclarationsAssignment_3 )? ) ;

+	public final void rule__Font_face__Group__3__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3732:1: ( ( ( rule__Font_face__DeclarationsAssignment_3 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3733:1: ( ( rule__Font_face__DeclarationsAssignment_3 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3733:1: ( ( rule__Font_face__DeclarationsAssignment_3 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3734:1: ( rule__Font_face__DeclarationsAssignment_3 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getFont_faceAccess().getDeclarationsAssignment_3());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3735:1: ( rule__Font_face__DeclarationsAssignment_3 )?

+					int alt49 = 2;

+					int LA49_0 = input.LA(1);

+

+					if (((LA49_0 >= RULE_DASH && LA49_0 <= RULE_UNDERSCORE) || (LA49_0 >= RULE_ONE_HEX_LETTER && LA49_0 <= RULE_ONE_NON_HEX_LETTER) || LA49_0 == RULE_WS || (LA49_0 >= 49 && LA49_0 <= 52))) {

+						alt49 = 1;

+					}

+					switch (alt49) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3735:2: rule__Font_face__DeclarationsAssignment_3

+					{

+						pushFollow(FOLLOW_rule__Font_face__DeclarationsAssignment_3_in_rule__Font_face__Group__3__Impl7909);

+						rule__Font_face__DeclarationsAssignment_3();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getFont_faceAccess().getDeclarationsAssignment_3());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group__3__Impl"

+

+

+	// $ANTLR start "rule__Font_face__Group__4"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3745:1: rule__Font_face__Group__4 : rule__Font_face__Group__4__Impl rule__Font_face__Group__5 ;

+	public final void rule__Font_face__Group__4() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3749:1: ( rule__Font_face__Group__4__Impl rule__Font_face__Group__5 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3750:2: rule__Font_face__Group__4__Impl rule__Font_face__Group__5

+			{

+				pushFollow(FOLLOW_rule__Font_face__Group__4__Impl_in_rule__Font_face__Group__47940);

+				rule__Font_face__Group__4__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Font_face__Group__5_in_rule__Font_face__Group__47943);

+				rule__Font_face__Group__5();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group__4"

+

+

+	// $ANTLR start "rule__Font_face__Group__4__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3757:1: rule__Font_face__Group__4__Impl : ( ( rule__Font_face__Group_4__0 )* ) ;

+	public final void rule__Font_face__Group__4__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3761:1: ( ( ( rule__Font_face__Group_4__0 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3762:1: ( ( rule__Font_face__Group_4__0 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3762:1: ( ( rule__Font_face__Group_4__0 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3763:1: ( rule__Font_face__Group_4__0 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getFont_faceAccess().getGroup_4());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3764:1: ( rule__Font_face__Group_4__0 )*

+					loop50: do {

+						int alt50 = 2;

+						int LA50_0 = input.LA(1);

+

+						if ((LA50_0 == 48)) {

+							alt50 = 1;

+						}

+

+

+						switch (alt50) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3764:2: rule__Font_face__Group_4__0

+						{

+							pushFollow(FOLLOW_rule__Font_face__Group_4__0_in_rule__Font_face__Group__4__Impl7970);

+							rule__Font_face__Group_4__0();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop50;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getFont_faceAccess().getGroup_4());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group__4__Impl"

+

+

+	// $ANTLR start "rule__Font_face__Group__5"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3774:1: rule__Font_face__Group__5 : rule__Font_face__Group__5__Impl ;

+	public final void rule__Font_face__Group__5() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3778:1: ( rule__Font_face__Group__5__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3779:2: rule__Font_face__Group__5__Impl

+			{

+				pushFollow(FOLLOW_rule__Font_face__Group__5__Impl_in_rule__Font_face__Group__58001);

+				rule__Font_face__Group__5__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group__5"

+

+

+	// $ANTLR start "rule__Font_face__Group__5__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3785:1: rule__Font_face__Group__5__Impl : ( '}' ) ;

+	public final void rule__Font_face__Group__5__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3789:1: ( ( '}' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3790:1: ( '}' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3790:1: ( '}' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3791:1: '}'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getFont_faceAccess().getRightCurlyBracketKeyword_5());

+					}

+					match(input, 59, FOLLOW_59_in_rule__Font_face__Group__5__Impl8029);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getFont_faceAccess().getRightCurlyBracketKeyword_5());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group__5__Impl"

+

+

+	// $ANTLR start "rule__Font_face__Group_4__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3816:1: rule__Font_face__Group_4__0 : rule__Font_face__Group_4__0__Impl rule__Font_face__Group_4__1 ;

+	public final void rule__Font_face__Group_4__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3820:1: ( rule__Font_face__Group_4__0__Impl rule__Font_face__Group_4__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3821:2: rule__Font_face__Group_4__0__Impl rule__Font_face__Group_4__1

+			{

+				pushFollow(FOLLOW_rule__Font_face__Group_4__0__Impl_in_rule__Font_face__Group_4__08072);

+				rule__Font_face__Group_4__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Font_face__Group_4__1_in_rule__Font_face__Group_4__08075);

+				rule__Font_face__Group_4__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group_4__0"

+

+

+	// $ANTLR start "rule__Font_face__Group_4__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3828:1: rule__Font_face__Group_4__0__Impl : ( ';' ) ;

+	public final void rule__Font_face__Group_4__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3832:1: ( ( ';' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3833:1: ( ';' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3833:1: ( ';' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3834:1: ';'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0());

+					}

+					match(input, 48, FOLLOW_48_in_rule__Font_face__Group_4__0__Impl8103);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group_4__0__Impl"

+

+

+	// $ANTLR start "rule__Font_face__Group_4__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3847:1: rule__Font_face__Group_4__1 : rule__Font_face__Group_4__1__Impl ;

+	public final void rule__Font_face__Group_4__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3851:1: ( rule__Font_face__Group_4__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3852:2: rule__Font_face__Group_4__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Font_face__Group_4__1__Impl_in_rule__Font_face__Group_4__18134);

+				rule__Font_face__Group_4__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group_4__1"

+

+

+	// $ANTLR start "rule__Font_face__Group_4__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3858:1: rule__Font_face__Group_4__1__Impl : ( ( rule__Font_face__DeclarationsAssignment_4_1 )? ) ;

+	public final void rule__Font_face__Group_4__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3862:1: ( ( ( rule__Font_face__DeclarationsAssignment_4_1 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3863:1: ( ( rule__Font_face__DeclarationsAssignment_4_1 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3863:1: ( ( rule__Font_face__DeclarationsAssignment_4_1 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3864:1: ( rule__Font_face__DeclarationsAssignment_4_1 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getFont_faceAccess().getDeclarationsAssignment_4_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3865:1: ( rule__Font_face__DeclarationsAssignment_4_1 )?

+					int alt51 = 2;

+					int LA51_0 = input.LA(1);

+

+					if (((LA51_0 >= RULE_DASH && LA51_0 <= RULE_UNDERSCORE) || (LA51_0 >= RULE_ONE_HEX_LETTER && LA51_0 <= RULE_ONE_NON_HEX_LETTER) || LA51_0 == RULE_WS || (LA51_0 >= 49 && LA51_0 <= 52))) {

+						alt51 = 1;

+					}

+					switch (alt51) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3865:2: rule__Font_face__DeclarationsAssignment_4_1

+					{

+						pushFollow(FOLLOW_rule__Font_face__DeclarationsAssignment_4_1_in_rule__Font_face__Group_4__1__Impl8161);

+						rule__Font_face__DeclarationsAssignment_4_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getFont_faceAccess().getDeclarationsAssignment_4_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__Group_4__1__Impl"

+

+

+	// $ANTLR start "rule__Keyframes__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3879:1: rule__Keyframes__Group__0 : rule__Keyframes__Group__0__Impl rule__Keyframes__Group__1 ;

+	public final void rule__Keyframes__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3883:1: ( rule__Keyframes__Group__0__Impl rule__Keyframes__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3884:2: rule__Keyframes__Group__0__Impl rule__Keyframes__Group__1

+			{

+				pushFollow(FOLLOW_rule__Keyframes__Group__0__Impl_in_rule__Keyframes__Group__08196);

+				rule__Keyframes__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Keyframes__Group__1_in_rule__Keyframes__Group__08199);

+				rule__Keyframes__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__0"

+

+

+	// $ANTLR start "rule__Keyframes__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3891:1: rule__Keyframes__Group__0__Impl : ( () ) ;

+	public final void rule__Keyframes__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3895:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3896:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3896:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3897:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getFont_faceAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3898:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3900:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getFont_faceAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Keyframes__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3910:1: rule__Keyframes__Group__1 : rule__Keyframes__Group__1__Impl rule__Keyframes__Group__2 ;

+	public final void rule__Keyframes__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3914:1: ( rule__Keyframes__Group__1__Impl rule__Keyframes__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3915:2: rule__Keyframes__Group__1__Impl rule__Keyframes__Group__2

+			{

+				pushFollow(FOLLOW_rule__Keyframes__Group__1__Impl_in_rule__Keyframes__Group__18257);

+				rule__Keyframes__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Keyframes__Group__2_in_rule__Keyframes__Group__18260);

+				rule__Keyframes__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__1"

+

+

+	// $ANTLR start "rule__Keyframes__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3922:1: rule__Keyframes__Group__1__Impl : ( ( rule__Keyframes__Alternatives_1 ) ) ;

+	public final void rule__Keyframes__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3926:1: ( ( ( rule__Keyframes__Alternatives_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3927:1: ( ( rule__Keyframes__Alternatives_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3927:1: ( ( rule__Keyframes__Alternatives_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3928:1: ( rule__Keyframes__Alternatives_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getAlternatives_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3929:1: ( rule__Keyframes__Alternatives_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3929:2: rule__Keyframes__Alternatives_1

+					{

+						pushFollow(FOLLOW_rule__Keyframes__Alternatives_1_in_rule__Keyframes__Group__1__Impl8287);

+						rule__Keyframes__Alternatives_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getAlternatives_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Keyframes__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3939:1: rule__Keyframes__Group__2 : rule__Keyframes__Group__2__Impl rule__Keyframes__Group__3 ;

+	public final void rule__Keyframes__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3943:1: ( rule__Keyframes__Group__2__Impl rule__Keyframes__Group__3 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3944:2: rule__Keyframes__Group__2__Impl rule__Keyframes__Group__3

+			{

+				pushFollow(FOLLOW_rule__Keyframes__Group__2__Impl_in_rule__Keyframes__Group__28317);

+				rule__Keyframes__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Keyframes__Group__3_in_rule__Keyframes__Group__28320);

+				rule__Keyframes__Group__3();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__2"

+

+

+	// $ANTLR start "rule__Keyframes__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3951:1: rule__Keyframes__Group__2__Impl : ( ( rule__Keyframes__NameAssignment_2 ) ) ;

+	public final void rule__Keyframes__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3955:1: ( ( ( rule__Keyframes__NameAssignment_2 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3956:1: ( ( rule__Keyframes__NameAssignment_2 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3956:1: ( ( rule__Keyframes__NameAssignment_2 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3957:1: ( rule__Keyframes__NameAssignment_2 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getNameAssignment_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3958:1: ( rule__Keyframes__NameAssignment_2 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3958:2: rule__Keyframes__NameAssignment_2

+					{

+						pushFollow(FOLLOW_rule__Keyframes__NameAssignment_2_in_rule__Keyframes__Group__2__Impl8347);

+						rule__Keyframes__NameAssignment_2();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getNameAssignment_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__2__Impl"

+

+

+	// $ANTLR start "rule__Keyframes__Group__3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3968:1: rule__Keyframes__Group__3 : rule__Keyframes__Group__3__Impl rule__Keyframes__Group__4 ;

+	public final void rule__Keyframes__Group__3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3972:1: ( rule__Keyframes__Group__3__Impl rule__Keyframes__Group__4 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3973:2: rule__Keyframes__Group__3__Impl rule__Keyframes__Group__4

+			{

+				pushFollow(FOLLOW_rule__Keyframes__Group__3__Impl_in_rule__Keyframes__Group__38377);

+				rule__Keyframes__Group__3__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Keyframes__Group__4_in_rule__Keyframes__Group__38380);

+				rule__Keyframes__Group__4();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__3"

+

+

+	// $ANTLR start "rule__Keyframes__Group__3__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3980:1: rule__Keyframes__Group__3__Impl : ( '{' ) ;

+	public final void rule__Keyframes__Group__3__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3984:1: ( ( '{' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3985:1: ( '{' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3985:1: ( '{' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3986:1: '{'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getLeftCurlyBracketKeyword_3());

+					}

+					match(input, 58, FOLLOW_58_in_rule__Keyframes__Group__3__Impl8408);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getLeftCurlyBracketKeyword_3());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__3__Impl"

+

+

+	// $ANTLR start "rule__Keyframes__Group__4"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:3999:1: rule__Keyframes__Group__4 : rule__Keyframes__Group__4__Impl rule__Keyframes__Group__5 ;

+	public final void rule__Keyframes__Group__4() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4003:1: ( rule__Keyframes__Group__4__Impl rule__Keyframes__Group__5 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4004:2: rule__Keyframes__Group__4__Impl rule__Keyframes__Group__5

+			{

+				pushFollow(FOLLOW_rule__Keyframes__Group__4__Impl_in_rule__Keyframes__Group__48439);

+				rule__Keyframes__Group__4__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Keyframes__Group__5_in_rule__Keyframes__Group__48442);

+				rule__Keyframes__Group__5();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__4"

+

+

+	// $ANTLR start "rule__Keyframes__Group__4__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4011:1: rule__Keyframes__Group__4__Impl : ( ( rule__Keyframes__KeyframeselectorsAssignment_4 )? ) ;

+	public final void rule__Keyframes__Group__4__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4015:1: ( ( ( rule__Keyframes__KeyframeselectorsAssignment_4 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4016:1: ( ( rule__Keyframes__KeyframeselectorsAssignment_4 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4016:1: ( ( rule__Keyframes__KeyframeselectorsAssignment_4 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4017:1: ( rule__Keyframes__KeyframeselectorsAssignment_4 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getKeyframeselectorsAssignment_4());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4018:1: ( rule__Keyframes__KeyframeselectorsAssignment_4 )?

+					int alt52 = 2;

+					int LA52_0 = input.LA(1);

+

+					if ((LA52_0 == RULE_PLUS || (LA52_0 >= RULE_DASH && LA52_0 <= RULE_UNDERSCORE) || (LA52_0 >= RULE_ONE_HEX_LETTER && LA52_0 <= RULE_ONE_INT) || LA52_0 == 39 || (LA52_0 >= 49 && LA52_0 <= 52))) {

+						alt52 = 1;

+					}

+					switch (alt52) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4018:2: rule__Keyframes__KeyframeselectorsAssignment_4

+					{

+						pushFollow(FOLLOW_rule__Keyframes__KeyframeselectorsAssignment_4_in_rule__Keyframes__Group__4__Impl8469);

+						rule__Keyframes__KeyframeselectorsAssignment_4();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getKeyframeselectorsAssignment_4());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__4__Impl"

+

+

+	// $ANTLR start "rule__Keyframes__Group__5"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4028:1: rule__Keyframes__Group__5 : rule__Keyframes__Group__5__Impl rule__Keyframes__Group__6 ;

+	public final void rule__Keyframes__Group__5() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4032:1: ( rule__Keyframes__Group__5__Impl rule__Keyframes__Group__6 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4033:2: rule__Keyframes__Group__5__Impl rule__Keyframes__Group__6

+			{

+				pushFollow(FOLLOW_rule__Keyframes__Group__5__Impl_in_rule__Keyframes__Group__58500);

+				rule__Keyframes__Group__5__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Keyframes__Group__6_in_rule__Keyframes__Group__58503);

+				rule__Keyframes__Group__6();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__5"

+

+

+	// $ANTLR start "rule__Keyframes__Group__5__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4040:1: rule__Keyframes__Group__5__Impl : ( ( rule__Keyframes__Group_5__0 )* ) ;

+	public final void rule__Keyframes__Group__5__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4044:1: ( ( ( rule__Keyframes__Group_5__0 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4045:1: ( ( rule__Keyframes__Group_5__0 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4045:1: ( ( rule__Keyframes__Group_5__0 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4046:1: ( rule__Keyframes__Group_5__0 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getGroup_5());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4047:1: ( rule__Keyframes__Group_5__0 )*

+					loop53: do {

+						int alt53 = 2;

+						int LA53_0 = input.LA(1);

+

+						if ((LA53_0 == 48)) {

+							alt53 = 1;

+						}

+

+

+						switch (alt53) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4047:2: rule__Keyframes__Group_5__0

+						{

+							pushFollow(FOLLOW_rule__Keyframes__Group_5__0_in_rule__Keyframes__Group__5__Impl8530);

+							rule__Keyframes__Group_5__0();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop53;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getGroup_5());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__5__Impl"

+

+

+	// $ANTLR start "rule__Keyframes__Group__6"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4057:1: rule__Keyframes__Group__6 : rule__Keyframes__Group__6__Impl ;

+	public final void rule__Keyframes__Group__6() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4061:1: ( rule__Keyframes__Group__6__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4062:2: rule__Keyframes__Group__6__Impl

+			{

+				pushFollow(FOLLOW_rule__Keyframes__Group__6__Impl_in_rule__Keyframes__Group__68561);

+				rule__Keyframes__Group__6__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__6"

+

+

+	// $ANTLR start "rule__Keyframes__Group__6__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4068:1: rule__Keyframes__Group__6__Impl : ( '}' ) ;

+	public final void rule__Keyframes__Group__6__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4072:1: ( ( '}' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4073:1: ( '}' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4073:1: ( '}' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4074:1: '}'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getRightCurlyBracketKeyword_6());

+					}

+					match(input, 59, FOLLOW_59_in_rule__Keyframes__Group__6__Impl8589);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getRightCurlyBracketKeyword_6());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group__6__Impl"

+

+

+	// $ANTLR start "rule__Keyframes__Group_5__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4101:1: rule__Keyframes__Group_5__0 : rule__Keyframes__Group_5__0__Impl rule__Keyframes__Group_5__1 ;

+	public final void rule__Keyframes__Group_5__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4105:1: ( rule__Keyframes__Group_5__0__Impl rule__Keyframes__Group_5__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4106:2: rule__Keyframes__Group_5__0__Impl rule__Keyframes__Group_5__1

+			{

+				pushFollow(FOLLOW_rule__Keyframes__Group_5__0__Impl_in_rule__Keyframes__Group_5__08634);

+				rule__Keyframes__Group_5__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Keyframes__Group_5__1_in_rule__Keyframes__Group_5__08637);

+				rule__Keyframes__Group_5__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group_5__0"

+

+

+	// $ANTLR start "rule__Keyframes__Group_5__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4113:1: rule__Keyframes__Group_5__0__Impl : ( ';' ) ;

+	public final void rule__Keyframes__Group_5__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4117:1: ( ( ';' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4118:1: ( ';' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4118:1: ( ';' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4119:1: ';'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0());

+					}

+					match(input, 48, FOLLOW_48_in_rule__Keyframes__Group_5__0__Impl8665);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group_5__0__Impl"

+

+

+	// $ANTLR start "rule__Keyframes__Group_5__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4132:1: rule__Keyframes__Group_5__1 : rule__Keyframes__Group_5__1__Impl ;

+	public final void rule__Keyframes__Group_5__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4136:1: ( rule__Keyframes__Group_5__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4137:2: rule__Keyframes__Group_5__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Keyframes__Group_5__1__Impl_in_rule__Keyframes__Group_5__18696);

+				rule__Keyframes__Group_5__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group_5__1"

+

+

+	// $ANTLR start "rule__Keyframes__Group_5__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4143:1: rule__Keyframes__Group_5__1__Impl : ( ( rule__Keyframes__KeyframeselectorsAssignment_5_1 )? ) ;

+	public final void rule__Keyframes__Group_5__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4147:1: ( ( ( rule__Keyframes__KeyframeselectorsAssignment_5_1 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4148:1: ( ( rule__Keyframes__KeyframeselectorsAssignment_5_1 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4148:1: ( ( rule__Keyframes__KeyframeselectorsAssignment_5_1 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4149:1: ( rule__Keyframes__KeyframeselectorsAssignment_5_1 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getKeyframeselectorsAssignment_5_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4150:1: ( rule__Keyframes__KeyframeselectorsAssignment_5_1 )?

+					int alt54 = 2;

+					int LA54_0 = input.LA(1);

+

+					if ((LA54_0 == RULE_PLUS || (LA54_0 >= RULE_DASH && LA54_0 <= RULE_UNDERSCORE) || (LA54_0 >= RULE_ONE_HEX_LETTER && LA54_0 <= RULE_ONE_INT) || LA54_0 == 39 || (LA54_0 >= 49 && LA54_0 <= 52))) {

+						alt54 = 1;

+					}

+					switch (alt54) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4150:2: rule__Keyframes__KeyframeselectorsAssignment_5_1

+					{

+						pushFollow(FOLLOW_rule__Keyframes__KeyframeselectorsAssignment_5_1_in_rule__Keyframes__Group_5__1__Impl8723);

+						rule__Keyframes__KeyframeselectorsAssignment_5_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getKeyframeselectorsAssignment_5_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__Group_5__1__Impl"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4164:1: rule__Keyframe_selector__Group__0 : rule__Keyframe_selector__Group__0__Impl

+	// rule__Keyframe_selector__Group__1 ;

+	public final void rule__Keyframe_selector__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4168:1: ( rule__Keyframe_selector__Group__0__Impl rule__Keyframe_selector__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4169:2: rule__Keyframe_selector__Group__0__Impl rule__Keyframe_selector__Group__1

+			{

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group__0__Impl_in_rule__Keyframe_selector__Group__08758);

+				rule__Keyframe_selector__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group__1_in_rule__Keyframe_selector__Group__08761);

+				rule__Keyframe_selector__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group__0"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4176:1: rule__Keyframe_selector__Group__0__Impl : ( ( rule__Keyframe_selector__Alternatives_0 ) ) ;

+	public final void rule__Keyframe_selector__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4180:1: ( ( ( rule__Keyframe_selector__Alternatives_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4181:1: ( ( rule__Keyframe_selector__Alternatives_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4181:1: ( ( rule__Keyframe_selector__Alternatives_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4182:1: ( rule__Keyframe_selector__Alternatives_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getAlternatives_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4183:1: ( rule__Keyframe_selector__Alternatives_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4183:2: rule__Keyframe_selector__Alternatives_0

+					{

+						pushFollow(FOLLOW_rule__Keyframe_selector__Alternatives_0_in_rule__Keyframe_selector__Group__0__Impl8788);

+						rule__Keyframe_selector__Alternatives_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getAlternatives_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4193:1: rule__Keyframe_selector__Group__1 : rule__Keyframe_selector__Group__1__Impl

+	// rule__Keyframe_selector__Group__2 ;

+	public final void rule__Keyframe_selector__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4197:1: ( rule__Keyframe_selector__Group__1__Impl rule__Keyframe_selector__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4198:2: rule__Keyframe_selector__Group__1__Impl rule__Keyframe_selector__Group__2

+			{

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group__1__Impl_in_rule__Keyframe_selector__Group__18818);

+				rule__Keyframe_selector__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group__2_in_rule__Keyframe_selector__Group__18821);

+				rule__Keyframe_selector__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group__1"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4205:1: rule__Keyframe_selector__Group__1__Impl : ( '{' ) ;

+	public final void rule__Keyframe_selector__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4209:1: ( ( '{' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4210:1: ( '{' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4210:1: ( '{' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4211:1: '{'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getLeftCurlyBracketKeyword_1());

+					}

+					match(input, 58, FOLLOW_58_in_rule__Keyframe_selector__Group__1__Impl8849);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getLeftCurlyBracketKeyword_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4224:1: rule__Keyframe_selector__Group__2 : rule__Keyframe_selector__Group__2__Impl

+	// rule__Keyframe_selector__Group__3 ;

+	public final void rule__Keyframe_selector__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4228:1: ( rule__Keyframe_selector__Group__2__Impl rule__Keyframe_selector__Group__3 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4229:2: rule__Keyframe_selector__Group__2__Impl rule__Keyframe_selector__Group__3

+			{

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group__2__Impl_in_rule__Keyframe_selector__Group__28880);

+				rule__Keyframe_selector__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group__3_in_rule__Keyframe_selector__Group__28883);

+				rule__Keyframe_selector__Group__3();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group__2"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4236:1: rule__Keyframe_selector__Group__2__Impl : ( ( rule__Keyframe_selector__DeclarationsAssignment_2 )? )

+	// ;

+	public final void rule__Keyframe_selector__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4240:1: ( ( ( rule__Keyframe_selector__DeclarationsAssignment_2 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4241:1: ( ( rule__Keyframe_selector__DeclarationsAssignment_2 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4241:1: ( ( rule__Keyframe_selector__DeclarationsAssignment_2 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4242:1: ( rule__Keyframe_selector__DeclarationsAssignment_2 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getDeclarationsAssignment_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4243:1: ( rule__Keyframe_selector__DeclarationsAssignment_2 )?

+					int alt55 = 2;

+					int LA55_0 = input.LA(1);

+

+					if (((LA55_0 >= RULE_DASH && LA55_0 <= RULE_UNDERSCORE) || (LA55_0 >= RULE_ONE_HEX_LETTER && LA55_0 <= RULE_ONE_NON_HEX_LETTER) || LA55_0 == RULE_WS || (LA55_0 >= 49 && LA55_0 <= 52))) {

+						alt55 = 1;

+					}

+					switch (alt55) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4243:2: rule__Keyframe_selector__DeclarationsAssignment_2

+					{

+						pushFollow(FOLLOW_rule__Keyframe_selector__DeclarationsAssignment_2_in_rule__Keyframe_selector__Group__2__Impl8910);

+						rule__Keyframe_selector__DeclarationsAssignment_2();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getDeclarationsAssignment_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group__2__Impl"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group__3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4253:1: rule__Keyframe_selector__Group__3 : rule__Keyframe_selector__Group__3__Impl

+	// rule__Keyframe_selector__Group__4 ;

+	public final void rule__Keyframe_selector__Group__3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4257:1: ( rule__Keyframe_selector__Group__3__Impl rule__Keyframe_selector__Group__4 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4258:2: rule__Keyframe_selector__Group__3__Impl rule__Keyframe_selector__Group__4

+			{

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group__3__Impl_in_rule__Keyframe_selector__Group__38941);

+				rule__Keyframe_selector__Group__3__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group__4_in_rule__Keyframe_selector__Group__38944);

+				rule__Keyframe_selector__Group__4();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group__3"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group__3__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4265:1: rule__Keyframe_selector__Group__3__Impl : ( ( rule__Keyframe_selector__Group_3__0 )* ) ;

+	public final void rule__Keyframe_selector__Group__3__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4269:1: ( ( ( rule__Keyframe_selector__Group_3__0 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4270:1: ( ( rule__Keyframe_selector__Group_3__0 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4270:1: ( ( rule__Keyframe_selector__Group_3__0 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4271:1: ( rule__Keyframe_selector__Group_3__0 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getGroup_3());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4272:1: ( rule__Keyframe_selector__Group_3__0 )*

+					loop56: do {

+						int alt56 = 2;

+						int LA56_0 = input.LA(1);

+

+						if ((LA56_0 == 48)) {

+							alt56 = 1;

+						}

+

+

+						switch (alt56) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4272:2: rule__Keyframe_selector__Group_3__0

+						{

+							pushFollow(FOLLOW_rule__Keyframe_selector__Group_3__0_in_rule__Keyframe_selector__Group__3__Impl8971);

+							rule__Keyframe_selector__Group_3__0();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop56;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getGroup_3());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group__3__Impl"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group__4"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4282:1: rule__Keyframe_selector__Group__4 : rule__Keyframe_selector__Group__4__Impl ;

+	public final void rule__Keyframe_selector__Group__4() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4286:1: ( rule__Keyframe_selector__Group__4__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4287:2: rule__Keyframe_selector__Group__4__Impl

+			{

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group__4__Impl_in_rule__Keyframe_selector__Group__49002);

+				rule__Keyframe_selector__Group__4__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group__4"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group__4__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4293:1: rule__Keyframe_selector__Group__4__Impl : ( '}' ) ;

+	public final void rule__Keyframe_selector__Group__4__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4297:1: ( ( '}' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4298:1: ( '}' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4298:1: ( '}' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4299:1: '}'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getRightCurlyBracketKeyword_4());

+					}

+					match(input, 59, FOLLOW_59_in_rule__Keyframe_selector__Group__4__Impl9030);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getRightCurlyBracketKeyword_4());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group__4__Impl"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group_0_1__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4322:1: rule__Keyframe_selector__Group_0_1__0 : rule__Keyframe_selector__Group_0_1__0__Impl

+	// rule__Keyframe_selector__Group_0_1__1 ;

+	public final void rule__Keyframe_selector__Group_0_1__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4326:1: ( rule__Keyframe_selector__Group_0_1__0__Impl rule__Keyframe_selector__Group_0_1__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4327:2: rule__Keyframe_selector__Group_0_1__0__Impl rule__Keyframe_selector__Group_0_1__1

+			{

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group_0_1__0__Impl_in_rule__Keyframe_selector__Group_0_1__09071);

+				rule__Keyframe_selector__Group_0_1__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group_0_1__1_in_rule__Keyframe_selector__Group_0_1__09074);

+				rule__Keyframe_selector__Group_0_1__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group_0_1__0"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group_0_1__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4334:1: rule__Keyframe_selector__Group_0_1__0__Impl : ( ( rule__Keyframe_selector__PercentageAssignment_0_1_0

+	// ) ) ;

+	public final void rule__Keyframe_selector__Group_0_1__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4338:1: ( ( ( rule__Keyframe_selector__PercentageAssignment_0_1_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4339:1: ( ( rule__Keyframe_selector__PercentageAssignment_0_1_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4339:1: ( ( rule__Keyframe_selector__PercentageAssignment_0_1_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4340:1: ( rule__Keyframe_selector__PercentageAssignment_0_1_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getPercentageAssignment_0_1_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4341:1: ( rule__Keyframe_selector__PercentageAssignment_0_1_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4341:2: rule__Keyframe_selector__PercentageAssignment_0_1_0

+					{

+						pushFollow(FOLLOW_rule__Keyframe_selector__PercentageAssignment_0_1_0_in_rule__Keyframe_selector__Group_0_1__0__Impl9101);

+						rule__Keyframe_selector__PercentageAssignment_0_1_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getPercentageAssignment_0_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group_0_1__0__Impl"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group_0_1__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4351:1: rule__Keyframe_selector__Group_0_1__1 : rule__Keyframe_selector__Group_0_1__1__Impl ;

+	public final void rule__Keyframe_selector__Group_0_1__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4355:1: ( rule__Keyframe_selector__Group_0_1__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4356:2: rule__Keyframe_selector__Group_0_1__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group_0_1__1__Impl_in_rule__Keyframe_selector__Group_0_1__19131);

+				rule__Keyframe_selector__Group_0_1__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group_0_1__1"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group_0_1__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4362:1: rule__Keyframe_selector__Group_0_1__1__Impl : ( RULE_PERCENT ) ;

+	public final void rule__Keyframe_selector__Group_0_1__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4366:1: ( ( RULE_PERCENT ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4367:1: ( RULE_PERCENT )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4367:1: ( RULE_PERCENT )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4368:1: RULE_PERCENT

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getPERCENTTerminalRuleCall_0_1_1());

+					}

+					match(input, RULE_PERCENT, FOLLOW_RULE_PERCENT_in_rule__Keyframe_selector__Group_0_1__1__Impl9158);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getPERCENTTerminalRuleCall_0_1_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group_0_1__1__Impl"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group_3__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4383:1: rule__Keyframe_selector__Group_3__0 : rule__Keyframe_selector__Group_3__0__Impl

+	// rule__Keyframe_selector__Group_3__1 ;

+	public final void rule__Keyframe_selector__Group_3__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4387:1: ( rule__Keyframe_selector__Group_3__0__Impl rule__Keyframe_selector__Group_3__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4388:2: rule__Keyframe_selector__Group_3__0__Impl rule__Keyframe_selector__Group_3__1

+			{

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group_3__0__Impl_in_rule__Keyframe_selector__Group_3__09191);

+				rule__Keyframe_selector__Group_3__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group_3__1_in_rule__Keyframe_selector__Group_3__09194);

+				rule__Keyframe_selector__Group_3__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group_3__0"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group_3__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4395:1: rule__Keyframe_selector__Group_3__0__Impl : ( ';' ) ;

+	public final void rule__Keyframe_selector__Group_3__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4399:1: ( ( ';' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4400:1: ( ';' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4400:1: ( ';' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4401:1: ';'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0());

+					}

+					match(input, 48, FOLLOW_48_in_rule__Keyframe_selector__Group_3__0__Impl9222);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group_3__0__Impl"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group_3__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4414:1: rule__Keyframe_selector__Group_3__1 : rule__Keyframe_selector__Group_3__1__Impl ;

+	public final void rule__Keyframe_selector__Group_3__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4418:1: ( rule__Keyframe_selector__Group_3__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4419:2: rule__Keyframe_selector__Group_3__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Keyframe_selector__Group_3__1__Impl_in_rule__Keyframe_selector__Group_3__19253);

+				rule__Keyframe_selector__Group_3__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group_3__1"

+

+

+	// $ANTLR start "rule__Keyframe_selector__Group_3__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4425:1: rule__Keyframe_selector__Group_3__1__Impl : ( ( rule__Keyframe_selector__DeclarationsAssignment_3_1

+	// )? ) ;

+	public final void rule__Keyframe_selector__Group_3__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4429:1: ( ( ( rule__Keyframe_selector__DeclarationsAssignment_3_1 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4430:1: ( ( rule__Keyframe_selector__DeclarationsAssignment_3_1 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4430:1: ( ( rule__Keyframe_selector__DeclarationsAssignment_3_1 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4431:1: ( rule__Keyframe_selector__DeclarationsAssignment_3_1 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getDeclarationsAssignment_3_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4432:1: ( rule__Keyframe_selector__DeclarationsAssignment_3_1 )?

+					int alt57 = 2;

+					int LA57_0 = input.LA(1);

+

+					if (((LA57_0 >= RULE_DASH && LA57_0 <= RULE_UNDERSCORE) || (LA57_0 >= RULE_ONE_HEX_LETTER && LA57_0 <= RULE_ONE_NON_HEX_LETTER) || LA57_0 == RULE_WS || (LA57_0 >= 49 && LA57_0 <= 52))) {

+						alt57 = 1;

+					}

+					switch (alt57) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4432:2: rule__Keyframe_selector__DeclarationsAssignment_3_1

+					{

+						pushFollow(FOLLOW_rule__Keyframe_selector__DeclarationsAssignment_3_1_in_rule__Keyframe_selector__Group_3__1__Impl9280);

+						rule__Keyframe_selector__DeclarationsAssignment_3_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getDeclarationsAssignment_3_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__Group_3__1__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4446:1: rule__Ruleset__Group__0 : rule__Ruleset__Group__0__Impl rule__Ruleset__Group__1 ;

+	public final void rule__Ruleset__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4450:1: ( rule__Ruleset__Group__0__Impl rule__Ruleset__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4451:2: rule__Ruleset__Group__0__Impl rule__Ruleset__Group__1

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group__0__Impl_in_rule__Ruleset__Group__09315);

+				rule__Ruleset__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Ruleset__Group__1_in_rule__Ruleset__Group__09318);

+				rule__Ruleset__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group__0"

+

+

+	// $ANTLR start "rule__Ruleset__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4458:1: rule__Ruleset__Group__0__Impl : ( ( rule__Ruleset__SelectorsAssignment_0 ) ) ;

+	public final void rule__Ruleset__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4462:1: ( ( ( rule__Ruleset__SelectorsAssignment_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4463:1: ( ( rule__Ruleset__SelectorsAssignment_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4463:1: ( ( rule__Ruleset__SelectorsAssignment_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4464:1: ( rule__Ruleset__SelectorsAssignment_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getSelectorsAssignment_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4465:1: ( rule__Ruleset__SelectorsAssignment_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4465:2: rule__Ruleset__SelectorsAssignment_0

+					{

+						pushFollow(FOLLOW_rule__Ruleset__SelectorsAssignment_0_in_rule__Ruleset__Group__0__Impl9345);

+						rule__Ruleset__SelectorsAssignment_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getSelectorsAssignment_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4475:1: rule__Ruleset__Group__1 : rule__Ruleset__Group__1__Impl rule__Ruleset__Group__2 ;

+	public final void rule__Ruleset__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4479:1: ( rule__Ruleset__Group__1__Impl rule__Ruleset__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4480:2: rule__Ruleset__Group__1__Impl rule__Ruleset__Group__2

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group__1__Impl_in_rule__Ruleset__Group__19375);

+				rule__Ruleset__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Ruleset__Group__2_in_rule__Ruleset__Group__19378);

+				rule__Ruleset__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group__1"

+

+

+	// $ANTLR start "rule__Ruleset__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4487:1: rule__Ruleset__Group__1__Impl : ( ( rule__Ruleset__Group_1__0 )* ) ;

+	public final void rule__Ruleset__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4491:1: ( ( ( rule__Ruleset__Group_1__0 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4492:1: ( ( rule__Ruleset__Group_1__0 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4492:1: ( ( rule__Ruleset__Group_1__0 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4493:1: ( rule__Ruleset__Group_1__0 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getGroup_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4494:1: ( rule__Ruleset__Group_1__0 )*

+					loop58: do {

+						int alt58 = 2;

+						alt58 = dfa58.predict(input);

+						switch (alt58) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4494:2: rule__Ruleset__Group_1__0

+						{

+							pushFollow(FOLLOW_rule__Ruleset__Group_1__0_in_rule__Ruleset__Group__1__Impl9405);

+							rule__Ruleset__Group_1__0();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop58;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getGroup_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4504:1: rule__Ruleset__Group__2 : rule__Ruleset__Group__2__Impl rule__Ruleset__Group__3 ;

+	public final void rule__Ruleset__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4508:1: ( rule__Ruleset__Group__2__Impl rule__Ruleset__Group__3 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4509:2: rule__Ruleset__Group__2__Impl rule__Ruleset__Group__3

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group__2__Impl_in_rule__Ruleset__Group__29436);

+				rule__Ruleset__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Ruleset__Group__3_in_rule__Ruleset__Group__29439);

+				rule__Ruleset__Group__3();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group__2"

+

+

+	// $ANTLR start "rule__Ruleset__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4516:1: rule__Ruleset__Group__2__Impl : ( ( RULE_WS )* ) ;

+	public final void rule__Ruleset__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4520:1: ( ( ( RULE_WS )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4521:1: ( ( RULE_WS )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4521:1: ( ( RULE_WS )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4522:1: ( RULE_WS )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4523:1: ( RULE_WS )*

+					loop59: do {

+						int alt59 = 2;

+						int LA59_0 = input.LA(1);

+

+						if ((LA59_0 == RULE_WS)) {

+							alt59 = 1;

+						}

+

+

+						switch (alt59) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4523:3: RULE_WS

+						{

+							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Ruleset__Group__2__Impl9467);

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop59;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group__2__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group__3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4533:1: rule__Ruleset__Group__3 : rule__Ruleset__Group__3__Impl rule__Ruleset__Group__4 ;

+	public final void rule__Ruleset__Group__3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4537:1: ( rule__Ruleset__Group__3__Impl rule__Ruleset__Group__4 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4538:2: rule__Ruleset__Group__3__Impl rule__Ruleset__Group__4

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group__3__Impl_in_rule__Ruleset__Group__39498);

+				rule__Ruleset__Group__3__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Ruleset__Group__4_in_rule__Ruleset__Group__39501);

+				rule__Ruleset__Group__4();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group__3"

+

+

+	// $ANTLR start "rule__Ruleset__Group__3__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4545:1: rule__Ruleset__Group__3__Impl : ( '{' ) ;

+	public final void rule__Ruleset__Group__3__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4549:1: ( ( '{' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4550:1: ( '{' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4550:1: ( '{' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4551:1: '{'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_3());

+					}

+					match(input, 58, FOLLOW_58_in_rule__Ruleset__Group__3__Impl9529);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_3());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group__3__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group__4"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4564:1: rule__Ruleset__Group__4 : rule__Ruleset__Group__4__Impl rule__Ruleset__Group__5 ;

+	public final void rule__Ruleset__Group__4() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4568:1: ( rule__Ruleset__Group__4__Impl rule__Ruleset__Group__5 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4569:2: rule__Ruleset__Group__4__Impl rule__Ruleset__Group__5

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group__4__Impl_in_rule__Ruleset__Group__49560);

+				rule__Ruleset__Group__4__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Ruleset__Group__5_in_rule__Ruleset__Group__49563);

+				rule__Ruleset__Group__5();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group__4"

+

+

+	// $ANTLR start "rule__Ruleset__Group__4__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4576:1: rule__Ruleset__Group__4__Impl : ( ( rule__Ruleset__Group_4__0 )? ) ;

+	public final void rule__Ruleset__Group__4__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4580:1: ( ( ( rule__Ruleset__Group_4__0 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4581:1: ( ( rule__Ruleset__Group_4__0 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4581:1: ( ( rule__Ruleset__Group_4__0 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4582:1: ( rule__Ruleset__Group_4__0 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getGroup_4());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4583:1: ( rule__Ruleset__Group_4__0 )?

+					int alt60 = 2;

+					int LA60_0 = input.LA(1);

+

+					if (((LA60_0 >= RULE_DASH && LA60_0 <= RULE_UNDERSCORE) || (LA60_0 >= RULE_ONE_HEX_LETTER && LA60_0 <= RULE_ONE_NON_HEX_LETTER) || LA60_0 == RULE_WS || (LA60_0 >= 49 && LA60_0 <= 52))) {

+						alt60 = 1;

+					}

+					switch (alt60) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4583:2: rule__Ruleset__Group_4__0

+					{

+						pushFollow(FOLLOW_rule__Ruleset__Group_4__0_in_rule__Ruleset__Group__4__Impl9590);

+						rule__Ruleset__Group_4__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getGroup_4());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group__4__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group__5"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4593:1: rule__Ruleset__Group__5 : rule__Ruleset__Group__5__Impl ;

+	public final void rule__Ruleset__Group__5() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4597:1: ( rule__Ruleset__Group__5__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4598:2: rule__Ruleset__Group__5__Impl

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group__5__Impl_in_rule__Ruleset__Group__59621);

+				rule__Ruleset__Group__5__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group__5"

+

+

+	// $ANTLR start "rule__Ruleset__Group__5__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4604:1: rule__Ruleset__Group__5__Impl : ( '}' ) ;

+	public final void rule__Ruleset__Group__5__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4608:1: ( ( '}' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4609:1: ( '}' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4609:1: ( '}' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4610:1: '}'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_5());

+					}

+					match(input, 59, FOLLOW_59_in_rule__Ruleset__Group__5__Impl9649);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_5());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group__5__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group_1__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4635:1: rule__Ruleset__Group_1__0 : rule__Ruleset__Group_1__0__Impl rule__Ruleset__Group_1__1 ;

+	public final void rule__Ruleset__Group_1__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4639:1: ( rule__Ruleset__Group_1__0__Impl rule__Ruleset__Group_1__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4640:2: rule__Ruleset__Group_1__0__Impl rule__Ruleset__Group_1__1

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group_1__0__Impl_in_rule__Ruleset__Group_1__09692);

+				rule__Ruleset__Group_1__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Ruleset__Group_1__1_in_rule__Ruleset__Group_1__09695);

+				rule__Ruleset__Group_1__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_1__0"

+

+

+	// $ANTLR start "rule__Ruleset__Group_1__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4647:1: rule__Ruleset__Group_1__0__Impl : ( ( RULE_WS )* ) ;

+	public final void rule__Ruleset__Group_1__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4651:1: ( ( ( RULE_WS )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4652:1: ( ( RULE_WS )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4652:1: ( ( RULE_WS )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4653:1: ( RULE_WS )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4654:1: ( RULE_WS )*

+					loop61: do {

+						int alt61 = 2;

+						int LA61_0 = input.LA(1);

+

+						if ((LA61_0 == RULE_WS)) {

+							alt61 = 1;

+						}

+

+

+						switch (alt61) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4654:3: RULE_WS

+						{

+							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Ruleset__Group_1__0__Impl9723);

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop61;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_1__0__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group_1__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4664:1: rule__Ruleset__Group_1__1 : rule__Ruleset__Group_1__1__Impl rule__Ruleset__Group_1__2 ;

+	public final void rule__Ruleset__Group_1__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4668:1: ( rule__Ruleset__Group_1__1__Impl rule__Ruleset__Group_1__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4669:2: rule__Ruleset__Group_1__1__Impl rule__Ruleset__Group_1__2

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group_1__1__Impl_in_rule__Ruleset__Group_1__19754);

+				rule__Ruleset__Group_1__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Ruleset__Group_1__2_in_rule__Ruleset__Group_1__19757);

+				rule__Ruleset__Group_1__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_1__1"

+

+

+	// $ANTLR start "rule__Ruleset__Group_1__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4676:1: rule__Ruleset__Group_1__1__Impl : ( RULE_COMMA ) ;

+	public final void rule__Ruleset__Group_1__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4680:1: ( ( RULE_COMMA ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4681:1: ( RULE_COMMA )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4681:1: ( RULE_COMMA )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4682:1: RULE_COMMA

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getCOMMATerminalRuleCall_1_1());

+					}

+					match(input, RULE_COMMA, FOLLOW_RULE_COMMA_in_rule__Ruleset__Group_1__1__Impl9784);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getCOMMATerminalRuleCall_1_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_1__1__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group_1__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4693:1: rule__Ruleset__Group_1__2 : rule__Ruleset__Group_1__2__Impl ;

+	public final void rule__Ruleset__Group_1__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4697:1: ( rule__Ruleset__Group_1__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4698:2: rule__Ruleset__Group_1__2__Impl

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group_1__2__Impl_in_rule__Ruleset__Group_1__29813);

+				rule__Ruleset__Group_1__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_1__2"

+

+

+	// $ANTLR start "rule__Ruleset__Group_1__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4704:1: rule__Ruleset__Group_1__2__Impl : ( ( rule__Ruleset__SelectorsAssignment_1_2 ) ) ;

+	public final void rule__Ruleset__Group_1__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4708:1: ( ( ( rule__Ruleset__SelectorsAssignment_1_2 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4709:1: ( ( rule__Ruleset__SelectorsAssignment_1_2 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4709:1: ( ( rule__Ruleset__SelectorsAssignment_1_2 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4710:1: ( rule__Ruleset__SelectorsAssignment_1_2 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getSelectorsAssignment_1_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4711:1: ( rule__Ruleset__SelectorsAssignment_1_2 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4711:2: rule__Ruleset__SelectorsAssignment_1_2

+					{

+						pushFollow(FOLLOW_rule__Ruleset__SelectorsAssignment_1_2_in_rule__Ruleset__Group_1__2__Impl9840);

+						rule__Ruleset__SelectorsAssignment_1_2();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getSelectorsAssignment_1_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_1__2__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group_4__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4727:1: rule__Ruleset__Group_4__0 : rule__Ruleset__Group_4__0__Impl rule__Ruleset__Group_4__1 ;

+	public final void rule__Ruleset__Group_4__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4731:1: ( rule__Ruleset__Group_4__0__Impl rule__Ruleset__Group_4__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4732:2: rule__Ruleset__Group_4__0__Impl rule__Ruleset__Group_4__1

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group_4__0__Impl_in_rule__Ruleset__Group_4__09876);

+				rule__Ruleset__Group_4__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Ruleset__Group_4__1_in_rule__Ruleset__Group_4__09879);

+				rule__Ruleset__Group_4__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_4__0"

+

+

+	// $ANTLR start "rule__Ruleset__Group_4__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4739:1: rule__Ruleset__Group_4__0__Impl : ( ( rule__Ruleset__DeclarationsAssignment_4_0 ) ) ;

+	public final void rule__Ruleset__Group_4__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4743:1: ( ( ( rule__Ruleset__DeclarationsAssignment_4_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4744:1: ( ( rule__Ruleset__DeclarationsAssignment_4_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4744:1: ( ( rule__Ruleset__DeclarationsAssignment_4_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4745:1: ( rule__Ruleset__DeclarationsAssignment_4_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getDeclarationsAssignment_4_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4746:1: ( rule__Ruleset__DeclarationsAssignment_4_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4746:2: rule__Ruleset__DeclarationsAssignment_4_0

+					{

+						pushFollow(FOLLOW_rule__Ruleset__DeclarationsAssignment_4_0_in_rule__Ruleset__Group_4__0__Impl9906);

+						rule__Ruleset__DeclarationsAssignment_4_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getDeclarationsAssignment_4_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_4__0__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group_4__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4756:1: rule__Ruleset__Group_4__1 : rule__Ruleset__Group_4__1__Impl rule__Ruleset__Group_4__2 ;

+	public final void rule__Ruleset__Group_4__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4760:1: ( rule__Ruleset__Group_4__1__Impl rule__Ruleset__Group_4__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4761:2: rule__Ruleset__Group_4__1__Impl rule__Ruleset__Group_4__2

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group_4__1__Impl_in_rule__Ruleset__Group_4__19936);

+				rule__Ruleset__Group_4__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Ruleset__Group_4__2_in_rule__Ruleset__Group_4__19939);

+				rule__Ruleset__Group_4__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_4__1"

+

+

+	// $ANTLR start "rule__Ruleset__Group_4__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4768:1: rule__Ruleset__Group_4__1__Impl : ( ( rule__Ruleset__Group_4_1__0 )* ) ;

+	public final void rule__Ruleset__Group_4__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4772:1: ( ( ( rule__Ruleset__Group_4_1__0 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4773:1: ( ( rule__Ruleset__Group_4_1__0 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4773:1: ( ( rule__Ruleset__Group_4_1__0 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4774:1: ( rule__Ruleset__Group_4_1__0 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getGroup_4_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4775:1: ( rule__Ruleset__Group_4_1__0 )*

+					loop62: do {

+						int alt62 = 2;

+						int LA62_0 = input.LA(1);

+

+						if ((LA62_0 == 48)) {

+							int LA62_1 = input.LA(2);

+

+							if (((LA62_1 >= RULE_DASH && LA62_1 <= RULE_UNDERSCORE) || (LA62_1 >= RULE_ONE_HEX_LETTER && LA62_1 <= RULE_ONE_NON_HEX_LETTER) || LA62_1 == RULE_WS || (LA62_1 >= 49 && LA62_1 <= 52))) {

+								alt62 = 1;

+							}

+

+

+						}

+

+

+						switch (alt62) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4775:2: rule__Ruleset__Group_4_1__0

+						{

+							pushFollow(FOLLOW_rule__Ruleset__Group_4_1__0_in_rule__Ruleset__Group_4__1__Impl9966);

+							rule__Ruleset__Group_4_1__0();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop62;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getGroup_4_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_4__1__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group_4__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4785:1: rule__Ruleset__Group_4__2 : rule__Ruleset__Group_4__2__Impl ;

+	public final void rule__Ruleset__Group_4__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4789:1: ( rule__Ruleset__Group_4__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4790:2: rule__Ruleset__Group_4__2__Impl

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group_4__2__Impl_in_rule__Ruleset__Group_4__29997);

+				rule__Ruleset__Group_4__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_4__2"

+

+

+	// $ANTLR start "rule__Ruleset__Group_4__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4796:1: rule__Ruleset__Group_4__2__Impl : ( ( ';' )? ) ;

+	public final void rule__Ruleset__Group_4__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4800:1: ( ( ( ';' )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4801:1: ( ( ';' )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4801:1: ( ( ';' )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4802:1: ( ';' )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getSemicolonKeyword_4_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4803:1: ( ';' )?

+					int alt63 = 2;

+					int LA63_0 = input.LA(1);

+

+					if ((LA63_0 == 48)) {

+						alt63 = 1;

+					}

+					switch (alt63) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4804:2: ';'

+					{

+						match(input, 48, FOLLOW_48_in_rule__Ruleset__Group_4__2__Impl10026);

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getSemicolonKeyword_4_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_4__2__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group_4_1__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4821:1: rule__Ruleset__Group_4_1__0 : rule__Ruleset__Group_4_1__0__Impl rule__Ruleset__Group_4_1__1 ;

+	public final void rule__Ruleset__Group_4_1__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4825:1: ( rule__Ruleset__Group_4_1__0__Impl rule__Ruleset__Group_4_1__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4826:2: rule__Ruleset__Group_4_1__0__Impl rule__Ruleset__Group_4_1__1

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group_4_1__0__Impl_in_rule__Ruleset__Group_4_1__010065);

+				rule__Ruleset__Group_4_1__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Ruleset__Group_4_1__1_in_rule__Ruleset__Group_4_1__010068);

+				rule__Ruleset__Group_4_1__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_4_1__0"

+

+

+	// $ANTLR start "rule__Ruleset__Group_4_1__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4833:1: rule__Ruleset__Group_4_1__0__Impl : ( ';' ) ;

+	public final void rule__Ruleset__Group_4_1__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4837:1: ( ( ';' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4838:1: ( ';' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4838:1: ( ';' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4839:1: ';'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getSemicolonKeyword_4_1_0());

+					}

+					match(input, 48, FOLLOW_48_in_rule__Ruleset__Group_4_1__0__Impl10096);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getSemicolonKeyword_4_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_4_1__0__Impl"

+

+

+	// $ANTLR start "rule__Ruleset__Group_4_1__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4852:1: rule__Ruleset__Group_4_1__1 : rule__Ruleset__Group_4_1__1__Impl ;

+	public final void rule__Ruleset__Group_4_1__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4856:1: ( rule__Ruleset__Group_4_1__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4857:2: rule__Ruleset__Group_4_1__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Ruleset__Group_4_1__1__Impl_in_rule__Ruleset__Group_4_1__110127);

+				rule__Ruleset__Group_4_1__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_4_1__1"

+

+

+	// $ANTLR start "rule__Ruleset__Group_4_1__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4863:1: rule__Ruleset__Group_4_1__1__Impl : ( ( rule__Ruleset__DeclarationsAssignment_4_1_1 ) ) ;

+	public final void rule__Ruleset__Group_4_1__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4867:1: ( ( ( rule__Ruleset__DeclarationsAssignment_4_1_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4868:1: ( ( rule__Ruleset__DeclarationsAssignment_4_1_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4868:1: ( ( rule__Ruleset__DeclarationsAssignment_4_1_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4869:1: ( rule__Ruleset__DeclarationsAssignment_4_1_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getDeclarationsAssignment_4_1_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4870:1: ( rule__Ruleset__DeclarationsAssignment_4_1_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4870:2: rule__Ruleset__DeclarationsAssignment_4_1_1

+					{

+						pushFollow(FOLLOW_rule__Ruleset__DeclarationsAssignment_4_1_1_in_rule__Ruleset__Group_4_1__1__Impl10154);

+						rule__Ruleset__DeclarationsAssignment_4_1_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getDeclarationsAssignment_4_1_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__Group_4_1__1__Impl"

+

+

+	// $ANTLR start "rule__Selector__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4884:1: rule__Selector__Group__0 : rule__Selector__Group__0__Impl rule__Selector__Group__1 ;

+	public final void rule__Selector__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4888:1: ( rule__Selector__Group__0__Impl rule__Selector__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4889:2: rule__Selector__Group__0__Impl rule__Selector__Group__1

+			{

+				pushFollow(FOLLOW_rule__Selector__Group__0__Impl_in_rule__Selector__Group__010188);

+				rule__Selector__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Selector__Group__1_in_rule__Selector__Group__010191);

+				rule__Selector__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group__0"

+

+

+	// $ANTLR start "rule__Selector__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4896:1: rule__Selector__Group__0__Impl : ( ( rule__Selector__SimpleselectorsAssignment_0 ) ) ;

+	public final void rule__Selector__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4900:1: ( ( ( rule__Selector__SimpleselectorsAssignment_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4901:1: ( ( rule__Selector__SimpleselectorsAssignment_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4901:1: ( ( rule__Selector__SimpleselectorsAssignment_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4902:1: ( rule__Selector__SimpleselectorsAssignment_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getSimpleselectorsAssignment_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4903:1: ( rule__Selector__SimpleselectorsAssignment_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4903:2: rule__Selector__SimpleselectorsAssignment_0

+					{

+						pushFollow(FOLLOW_rule__Selector__SimpleselectorsAssignment_0_in_rule__Selector__Group__0__Impl10218);

+						rule__Selector__SimpleselectorsAssignment_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getSimpleselectorsAssignment_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Selector__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4913:1: rule__Selector__Group__1 : rule__Selector__Group__1__Impl ;

+	public final void rule__Selector__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4917:1: ( rule__Selector__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4918:2: rule__Selector__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Selector__Group__1__Impl_in_rule__Selector__Group__110248);

+				rule__Selector__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group__1"

+

+

+	// $ANTLR start "rule__Selector__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4924:1: rule__Selector__Group__1__Impl : ( ( rule__Selector__Alternatives_1 )? ) ;

+	public final void rule__Selector__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4928:1: ( ( ( rule__Selector__Alternatives_1 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4929:1: ( ( rule__Selector__Alternatives_1 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4929:1: ( ( rule__Selector__Alternatives_1 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4930:1: ( rule__Selector__Alternatives_1 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getAlternatives_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4931:1: ( rule__Selector__Alternatives_1 )?

+					int alt64 = 2;

+					alt64 = dfa64.predict(input);

+					switch (alt64) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4931:2: rule__Selector__Alternatives_1

+					{

+						pushFollow(FOLLOW_rule__Selector__Alternatives_1_in_rule__Selector__Group__1__Impl10275);

+						rule__Selector__Alternatives_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getAlternatives_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Selector__Group_1_0__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4945:1: rule__Selector__Group_1_0__0 : rule__Selector__Group_1_0__0__Impl rule__Selector__Group_1_0__1 ;

+	public final void rule__Selector__Group_1_0__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4949:1: ( rule__Selector__Group_1_0__0__Impl rule__Selector__Group_1_0__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4950:2: rule__Selector__Group_1_0__0__Impl rule__Selector__Group_1_0__1

+			{

+				pushFollow(FOLLOW_rule__Selector__Group_1_0__0__Impl_in_rule__Selector__Group_1_0__010310);

+				rule__Selector__Group_1_0__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Selector__Group_1_0__1_in_rule__Selector__Group_1_0__010313);

+				rule__Selector__Group_1_0__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_0__0"

+

+

+	// $ANTLR start "rule__Selector__Group_1_0__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4957:1: rule__Selector__Group_1_0__0__Impl : ( ( rule__Selector__CombinatorAssignment_1_0_0 ) ) ;

+	public final void rule__Selector__Group_1_0__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4961:1: ( ( ( rule__Selector__CombinatorAssignment_1_0_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4962:1: ( ( rule__Selector__CombinatorAssignment_1_0_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4962:1: ( ( rule__Selector__CombinatorAssignment_1_0_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4963:1: ( rule__Selector__CombinatorAssignment_1_0_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getCombinatorAssignment_1_0_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4964:1: ( rule__Selector__CombinatorAssignment_1_0_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4964:2: rule__Selector__CombinatorAssignment_1_0_0

+					{

+						pushFollow(FOLLOW_rule__Selector__CombinatorAssignment_1_0_0_in_rule__Selector__Group_1_0__0__Impl10340);

+						rule__Selector__CombinatorAssignment_1_0_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getCombinatorAssignment_1_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_0__0__Impl"

+

+

+	// $ANTLR start "rule__Selector__Group_1_0__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4974:1: rule__Selector__Group_1_0__1 : rule__Selector__Group_1_0__1__Impl rule__Selector__Group_1_0__2 ;

+	public final void rule__Selector__Group_1_0__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4978:1: ( rule__Selector__Group_1_0__1__Impl rule__Selector__Group_1_0__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4979:2: rule__Selector__Group_1_0__1__Impl rule__Selector__Group_1_0__2

+			{

+				pushFollow(FOLLOW_rule__Selector__Group_1_0__1__Impl_in_rule__Selector__Group_1_0__110370);

+				rule__Selector__Group_1_0__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Selector__Group_1_0__2_in_rule__Selector__Group_1_0__110373);

+				rule__Selector__Group_1_0__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_0__1"

+

+

+	// $ANTLR start "rule__Selector__Group_1_0__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4986:1: rule__Selector__Group_1_0__1__Impl : ( ( RULE_WS )* ) ;

+	public final void rule__Selector__Group_1_0__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4990:1: ( ( ( RULE_WS )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4991:1: ( ( RULE_WS )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4991:1: ( ( RULE_WS )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4992:1: ( RULE_WS )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_0_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4993:1: ( RULE_WS )*

+					loop65: do {

+						int alt65 = 2;

+						int LA65_0 = input.LA(1);

+

+						if ((LA65_0 == RULE_WS)) {

+							alt65 = 1;

+						}

+

+

+						switch (alt65) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:4993:3: RULE_WS

+						{

+							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Selector__Group_1_0__1__Impl10401);

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop65;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_0_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_0__1__Impl"

+

+

+	// $ANTLR start "rule__Selector__Group_1_0__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5003:1: rule__Selector__Group_1_0__2 : rule__Selector__Group_1_0__2__Impl ;

+	public final void rule__Selector__Group_1_0__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5007:1: ( rule__Selector__Group_1_0__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5008:2: rule__Selector__Group_1_0__2__Impl

+			{

+				pushFollow(FOLLOW_rule__Selector__Group_1_0__2__Impl_in_rule__Selector__Group_1_0__210432);

+				rule__Selector__Group_1_0__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_0__2"

+

+

+	// $ANTLR start "rule__Selector__Group_1_0__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5014:1: rule__Selector__Group_1_0__2__Impl : ( ( rule__Selector__SelectorAssignment_1_0_2 ) ) ;

+	public final void rule__Selector__Group_1_0__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5018:1: ( ( ( rule__Selector__SelectorAssignment_1_0_2 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5019:1: ( ( rule__Selector__SelectorAssignment_1_0_2 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5019:1: ( ( rule__Selector__SelectorAssignment_1_0_2 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5020:1: ( rule__Selector__SelectorAssignment_1_0_2 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getSelectorAssignment_1_0_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5021:1: ( rule__Selector__SelectorAssignment_1_0_2 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5021:2: rule__Selector__SelectorAssignment_1_0_2

+					{

+						pushFollow(FOLLOW_rule__Selector__SelectorAssignment_1_0_2_in_rule__Selector__Group_1_0__2__Impl10459);

+						rule__Selector__SelectorAssignment_1_0_2();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getSelectorAssignment_1_0_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_0__2__Impl"

+

+

+	// $ANTLR start "rule__Selector__Group_1_1__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5037:1: rule__Selector__Group_1_1__0 : rule__Selector__Group_1_1__0__Impl rule__Selector__Group_1_1__1 ;

+	public final void rule__Selector__Group_1_1__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5041:1: ( rule__Selector__Group_1_1__0__Impl rule__Selector__Group_1_1__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5042:2: rule__Selector__Group_1_1__0__Impl rule__Selector__Group_1_1__1

+			{

+				pushFollow(FOLLOW_rule__Selector__Group_1_1__0__Impl_in_rule__Selector__Group_1_1__010495);

+				rule__Selector__Group_1_1__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Selector__Group_1_1__1_in_rule__Selector__Group_1_1__010498);

+				rule__Selector__Group_1_1__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_1__0"

+

+

+	// $ANTLR start "rule__Selector__Group_1_1__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5049:1: rule__Selector__Group_1_1__0__Impl : ( ( ( RULE_WS ) ) ( ( RULE_WS )* ) ) ;

+	public final void rule__Selector__Group_1_1__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5053:1: ( ( ( ( RULE_WS ) ) ( ( RULE_WS )* ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5054:1: ( ( ( RULE_WS ) ) ( ( RULE_WS )* ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5054:1: ( ( ( RULE_WS ) ) ( ( RULE_WS )* ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5055:1: ( ( RULE_WS ) ) ( ( RULE_WS )* )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5055:1: ( ( RULE_WS ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5056:1: ( RULE_WS )

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5057:1: ( RULE_WS )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5057:3: RULE_WS

+						{

+							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Selector__Group_1_1__0__Impl10528);

+							if (state.failed) {

+								return;

+							}

+

+						}

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0());

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5060:1: ( ( RULE_WS )* )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5061:1: ( RULE_WS )*

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5062:1: ( RULE_WS )*

+						loop66: do {

+							int alt66 = 2;

+							int LA66_0 = input.LA(1);

+

+							if ((LA66_0 == RULE_WS)) {

+								alt66 = 1;

+							}

+

+

+							switch (alt66) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5062:3: RULE_WS

+							{

+								match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Selector__Group_1_1__0__Impl10541);

+								if (state.failed) {

+									return;

+								}

+

+							}

+								break;

+

+							default:

+								break loop66;

+							}

+						} while (true);

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0());

+						}

+

+					}

+

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_1__0__Impl"

+

+

+	// $ANTLR start "rule__Selector__Group_1_1__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5073:1: rule__Selector__Group_1_1__1 : rule__Selector__Group_1_1__1__Impl rule__Selector__Group_1_1__2 ;

+	public final void rule__Selector__Group_1_1__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5077:1: ( rule__Selector__Group_1_1__1__Impl rule__Selector__Group_1_1__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5078:2: rule__Selector__Group_1_1__1__Impl rule__Selector__Group_1_1__2

+			{

+				pushFollow(FOLLOW_rule__Selector__Group_1_1__1__Impl_in_rule__Selector__Group_1_1__110574);

+				rule__Selector__Group_1_1__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Selector__Group_1_1__2_in_rule__Selector__Group_1_1__110577);

+				rule__Selector__Group_1_1__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_1__1"

+

+

+	// $ANTLR start "rule__Selector__Group_1_1__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5085:1: rule__Selector__Group_1_1__1__Impl : ( ( rule__Selector__Group_1_1_1__0 )? ) ;

+	public final void rule__Selector__Group_1_1__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5089:1: ( ( ( rule__Selector__Group_1_1_1__0 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5090:1: ( ( rule__Selector__Group_1_1_1__0 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5090:1: ( ( rule__Selector__Group_1_1_1__0 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5091:1: ( rule__Selector__Group_1_1_1__0 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getGroup_1_1_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5092:1: ( rule__Selector__Group_1_1_1__0 )?

+					int alt67 = 2;

+					int LA67_0 = input.LA(1);

+

+					if ((LA67_0 == RULE_PLUS || (LA67_0 >= 37 && LA67_0 <= 38))) {

+						alt67 = 1;

+					}

+					switch (alt67) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5092:2: rule__Selector__Group_1_1_1__0

+					{

+						pushFollow(FOLLOW_rule__Selector__Group_1_1_1__0_in_rule__Selector__Group_1_1__1__Impl10604);

+						rule__Selector__Group_1_1_1__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getGroup_1_1_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_1__1__Impl"

+

+

+	// $ANTLR start "rule__Selector__Group_1_1__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5102:1: rule__Selector__Group_1_1__2 : rule__Selector__Group_1_1__2__Impl ;

+	public final void rule__Selector__Group_1_1__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5106:1: ( rule__Selector__Group_1_1__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5107:2: rule__Selector__Group_1_1__2__Impl

+			{

+				pushFollow(FOLLOW_rule__Selector__Group_1_1__2__Impl_in_rule__Selector__Group_1_1__210635);

+				rule__Selector__Group_1_1__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_1__2"

+

+

+	// $ANTLR start "rule__Selector__Group_1_1__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5113:1: rule__Selector__Group_1_1__2__Impl : ( ( rule__Selector__SelectorAssignment_1_1_2 ) ) ;

+	public final void rule__Selector__Group_1_1__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5117:1: ( ( ( rule__Selector__SelectorAssignment_1_1_2 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5118:1: ( ( rule__Selector__SelectorAssignment_1_1_2 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5118:1: ( ( rule__Selector__SelectorAssignment_1_1_2 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5119:1: ( rule__Selector__SelectorAssignment_1_1_2 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getSelectorAssignment_1_1_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5120:1: ( rule__Selector__SelectorAssignment_1_1_2 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5120:2: rule__Selector__SelectorAssignment_1_1_2

+					{

+						pushFollow(FOLLOW_rule__Selector__SelectorAssignment_1_1_2_in_rule__Selector__Group_1_1__2__Impl10662);

+						rule__Selector__SelectorAssignment_1_1_2();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getSelectorAssignment_1_1_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_1__2__Impl"

+

+

+	// $ANTLR start "rule__Selector__Group_1_1_1__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5136:1: rule__Selector__Group_1_1_1__0 : rule__Selector__Group_1_1_1__0__Impl rule__Selector__Group_1_1_1__1

+	// ;

+	public final void rule__Selector__Group_1_1_1__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5140:1: ( rule__Selector__Group_1_1_1__0__Impl rule__Selector__Group_1_1_1__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5141:2: rule__Selector__Group_1_1_1__0__Impl rule__Selector__Group_1_1_1__1

+			{

+				pushFollow(FOLLOW_rule__Selector__Group_1_1_1__0__Impl_in_rule__Selector__Group_1_1_1__010698);

+				rule__Selector__Group_1_1_1__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Selector__Group_1_1_1__1_in_rule__Selector__Group_1_1_1__010701);

+				rule__Selector__Group_1_1_1__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_1_1__0"

+

+

+	// $ANTLR start "rule__Selector__Group_1_1_1__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5148:1: rule__Selector__Group_1_1_1__0__Impl : ( ( rule__Selector__CombinatorAssignment_1_1_1_0 ) ) ;

+	public final void rule__Selector__Group_1_1_1__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5152:1: ( ( ( rule__Selector__CombinatorAssignment_1_1_1_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5153:1: ( ( rule__Selector__CombinatorAssignment_1_1_1_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5153:1: ( ( rule__Selector__CombinatorAssignment_1_1_1_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5154:1: ( rule__Selector__CombinatorAssignment_1_1_1_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getCombinatorAssignment_1_1_1_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5155:1: ( rule__Selector__CombinatorAssignment_1_1_1_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5155:2: rule__Selector__CombinatorAssignment_1_1_1_0

+					{

+						pushFollow(FOLLOW_rule__Selector__CombinatorAssignment_1_1_1_0_in_rule__Selector__Group_1_1_1__0__Impl10728);

+						rule__Selector__CombinatorAssignment_1_1_1_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getCombinatorAssignment_1_1_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_1_1__0__Impl"

+

+

+	// $ANTLR start "rule__Selector__Group_1_1_1__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5165:1: rule__Selector__Group_1_1_1__1 : rule__Selector__Group_1_1_1__1__Impl ;

+	public final void rule__Selector__Group_1_1_1__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5169:1: ( rule__Selector__Group_1_1_1__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5170:2: rule__Selector__Group_1_1_1__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Selector__Group_1_1_1__1__Impl_in_rule__Selector__Group_1_1_1__110758);

+				rule__Selector__Group_1_1_1__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_1_1__1"

+

+

+	// $ANTLR start "rule__Selector__Group_1_1_1__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5176:1: rule__Selector__Group_1_1_1__1__Impl : ( ( RULE_WS )* ) ;

+	public final void rule__Selector__Group_1_1_1__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5180:1: ( ( ( RULE_WS )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5181:1: ( ( RULE_WS )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5181:1: ( ( RULE_WS )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5182:1: ( RULE_WS )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_1_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5183:1: ( RULE_WS )*

+					loop68: do {

+						int alt68 = 2;

+						int LA68_0 = input.LA(1);

+

+						if ((LA68_0 == RULE_WS)) {

+							alt68 = 1;

+						}

+

+

+						switch (alt68) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5183:3: RULE_WS

+						{

+							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Selector__Group_1_1_1__1__Impl10786);

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop68;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_1_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__Group_1_1_1__1__Impl"

+

+

+	// $ANTLR start "rule__SimpleSelectorForNegation__Group_0__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5197:1: rule__SimpleSelectorForNegation__Group_0__0 : rule__SimpleSelectorForNegation__Group_0__0__Impl

+	// rule__SimpleSelectorForNegation__Group_0__1 ;

+	public final void rule__SimpleSelectorForNegation__Group_0__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5201:1: ( rule__SimpleSelectorForNegation__Group_0__0__Impl

+			// rule__SimpleSelectorForNegation__Group_0__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5202:2: rule__SimpleSelectorForNegation__Group_0__0__Impl rule__SimpleSelectorForNegation__Group_0__1

+			{

+				pushFollow(FOLLOW_rule__SimpleSelectorForNegation__Group_0__0__Impl_in_rule__SimpleSelectorForNegation__Group_0__010821);

+				rule__SimpleSelectorForNegation__Group_0__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__SimpleSelectorForNegation__Group_0__1_in_rule__SimpleSelectorForNegation__Group_0__010824);

+				rule__SimpleSelectorForNegation__Group_0__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SimpleSelectorForNegation__Group_0__0"

+

+

+	// $ANTLR start "rule__SimpleSelectorForNegation__Group_0__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5209:1: rule__SimpleSelectorForNegation__Group_0__0__Impl : ( (

+	// rule__SimpleSelectorForNegation__Alternatives_0_0 ) ) ;

+	public final void rule__SimpleSelectorForNegation__Group_0__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5213:1: ( ( ( rule__SimpleSelectorForNegation__Alternatives_0_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5214:1: ( ( rule__SimpleSelectorForNegation__Alternatives_0_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5214:1: ( ( rule__SimpleSelectorForNegation__Alternatives_0_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5215:1: ( rule__SimpleSelectorForNegation__Alternatives_0_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimpleSelectorForNegationAccess().getAlternatives_0_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5216:1: ( rule__SimpleSelectorForNegation__Alternatives_0_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5216:2: rule__SimpleSelectorForNegation__Alternatives_0_0

+					{

+						pushFollow(FOLLOW_rule__SimpleSelectorForNegation__Alternatives_0_0_in_rule__SimpleSelectorForNegation__Group_0__0__Impl10851);

+						rule__SimpleSelectorForNegation__Alternatives_0_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimpleSelectorForNegationAccess().getAlternatives_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SimpleSelectorForNegation__Group_0__0__Impl"

+

+

+	// $ANTLR start "rule__SimpleSelectorForNegation__Group_0__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5226:1: rule__SimpleSelectorForNegation__Group_0__1 : rule__SimpleSelectorForNegation__Group_0__1__Impl ;

+	public final void rule__SimpleSelectorForNegation__Group_0__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5230:1: ( rule__SimpleSelectorForNegation__Group_0__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5231:2: rule__SimpleSelectorForNegation__Group_0__1__Impl

+			{

+				pushFollow(FOLLOW_rule__SimpleSelectorForNegation__Group_0__1__Impl_in_rule__SimpleSelectorForNegation__Group_0__110881);

+				rule__SimpleSelectorForNegation__Group_0__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SimpleSelectorForNegation__Group_0__1"

+

+

+	// $ANTLR start "rule__SimpleSelectorForNegation__Group_0__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5237:1: rule__SimpleSelectorForNegation__Group_0__1__Impl : ( (

+	// rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1 )* ) ;

+	public final void rule__SimpleSelectorForNegation__Group_0__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5241:1: ( ( ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5242:1: ( ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5242:1: ( ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5243:1: ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_0_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5244:1: ( rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1 )*

+					loop69: do {

+						int alt69 = 2;

+						int LA69_0 = input.LA(1);

+

+						if (((LA69_0 >= RULE_COLON && LA69_0 <= RULE_HASHMARK) || LA69_0 == 39 || LA69_0 == 42)) {

+							alt69 = 1;

+						}

+

+

+						switch (alt69) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5244:2: rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1

+						{

+							pushFollow(FOLLOW_rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1_in_rule__SimpleSelectorForNegation__Group_0__1__Impl10908);

+							rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop69;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsAssignment_0_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SimpleSelectorForNegation__Group_0__1__Impl"

+

+

+	// $ANTLR start "rule__Simple_selector__Group_0__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5258:1: rule__Simple_selector__Group_0__0 : rule__Simple_selector__Group_0__0__Impl

+	// rule__Simple_selector__Group_0__1 ;

+	public final void rule__Simple_selector__Group_0__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5262:1: ( rule__Simple_selector__Group_0__0__Impl rule__Simple_selector__Group_0__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5263:2: rule__Simple_selector__Group_0__0__Impl rule__Simple_selector__Group_0__1

+			{

+				pushFollow(FOLLOW_rule__Simple_selector__Group_0__0__Impl_in_rule__Simple_selector__Group_0__010943);

+				rule__Simple_selector__Group_0__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Simple_selector__Group_0__1_in_rule__Simple_selector__Group_0__010946);

+				rule__Simple_selector__Group_0__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Simple_selector__Group_0__0"

+

+

+	// $ANTLR start "rule__Simple_selector__Group_0__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5270:1: rule__Simple_selector__Group_0__0__Impl : ( ( rule__Simple_selector__Alternatives_0_0 ) ) ;

+	public final void rule__Simple_selector__Group_0__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5274:1: ( ( ( rule__Simple_selector__Alternatives_0_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5275:1: ( ( rule__Simple_selector__Alternatives_0_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5275:1: ( ( rule__Simple_selector__Alternatives_0_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5276:1: ( rule__Simple_selector__Alternatives_0_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimple_selectorAccess().getAlternatives_0_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5277:1: ( rule__Simple_selector__Alternatives_0_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5277:2: rule__Simple_selector__Alternatives_0_0

+					{

+						pushFollow(FOLLOW_rule__Simple_selector__Alternatives_0_0_in_rule__Simple_selector__Group_0__0__Impl10973);

+						rule__Simple_selector__Alternatives_0_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimple_selectorAccess().getAlternatives_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Simple_selector__Group_0__0__Impl"

+

+

+	// $ANTLR start "rule__Simple_selector__Group_0__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5287:1: rule__Simple_selector__Group_0__1 : rule__Simple_selector__Group_0__1__Impl ;

+	public final void rule__Simple_selector__Group_0__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5291:1: ( rule__Simple_selector__Group_0__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5292:2: rule__Simple_selector__Group_0__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Simple_selector__Group_0__1__Impl_in_rule__Simple_selector__Group_0__111003);

+				rule__Simple_selector__Group_0__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Simple_selector__Group_0__1"

+

+

+	// $ANTLR start "rule__Simple_selector__Group_0__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5298:1: rule__Simple_selector__Group_0__1__Impl : ( ( rule__Simple_selector__SubSelectorsAssignment_0_1 )* )

+	// ;

+	public final void rule__Simple_selector__Group_0__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5302:1: ( ( ( rule__Simple_selector__SubSelectorsAssignment_0_1 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5303:1: ( ( rule__Simple_selector__SubSelectorsAssignment_0_1 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5303:1: ( ( rule__Simple_selector__SubSelectorsAssignment_0_1 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5304:1: ( rule__Simple_selector__SubSelectorsAssignment_0_1 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_0_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5305:1: ( rule__Simple_selector__SubSelectorsAssignment_0_1 )*

+					loop70: do {

+						int alt70 = 2;

+						int LA70_0 = input.LA(1);

+

+						if (((LA70_0 >= RULE_COLON && LA70_0 <= RULE_HASHMARK) || LA70_0 == 39 || LA70_0 == 42)) {

+							alt70 = 1;

+						}

+

+

+						switch (alt70) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5305:2: rule__Simple_selector__SubSelectorsAssignment_0_1

+						{

+							pushFollow(FOLLOW_rule__Simple_selector__SubSelectorsAssignment_0_1_in_rule__Simple_selector__Group_0__1__Impl11030);

+							rule__Simple_selector__SubSelectorsAssignment_0_1();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop70;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimple_selectorAccess().getSubSelectorsAssignment_0_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Simple_selector__Group_0__1__Impl"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5319:1: rule__AttributeSelector__Group__0 : rule__AttributeSelector__Group__0__Impl

+	// rule__AttributeSelector__Group__1 ;

+	public final void rule__AttributeSelector__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5323:1: ( rule__AttributeSelector__Group__0__Impl rule__AttributeSelector__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5324:2: rule__AttributeSelector__Group__0__Impl rule__AttributeSelector__Group__1

+			{

+				pushFollow(FOLLOW_rule__AttributeSelector__Group__0__Impl_in_rule__AttributeSelector__Group__011065);

+				rule__AttributeSelector__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__AttributeSelector__Group__1_in_rule__AttributeSelector__Group__011068);

+				rule__AttributeSelector__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group__0"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5331:1: rule__AttributeSelector__Group__0__Impl : ( () ) ;

+	public final void rule__AttributeSelector__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5335:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5336:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5336:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5337:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getAttributeSelectorAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5338:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5340:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getAttributeSelectorAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group__0__Impl"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5350:1: rule__AttributeSelector__Group__1 : rule__AttributeSelector__Group__1__Impl

+	// rule__AttributeSelector__Group__2 ;

+	public final void rule__AttributeSelector__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5354:1: ( rule__AttributeSelector__Group__1__Impl rule__AttributeSelector__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5355:2: rule__AttributeSelector__Group__1__Impl rule__AttributeSelector__Group__2

+			{

+				pushFollow(FOLLOW_rule__AttributeSelector__Group__1__Impl_in_rule__AttributeSelector__Group__111126);

+				rule__AttributeSelector__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__AttributeSelector__Group__2_in_rule__AttributeSelector__Group__111129);

+				rule__AttributeSelector__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group__1"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5362:1: rule__AttributeSelector__Group__1__Impl : ( '[' ) ;

+	public final void rule__AttributeSelector__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5366:1: ( ( '[' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5367:1: ( '[' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5367:1: ( '[' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5368:1: '['

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getLeftSquareBracketKeyword_1());

+					}

+					match(input, 42, FOLLOW_42_in_rule__AttributeSelector__Group__1__Impl11157);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getLeftSquareBracketKeyword_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group__1__Impl"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5381:1: rule__AttributeSelector__Group__2 : rule__AttributeSelector__Group__2__Impl

+	// rule__AttributeSelector__Group__3 ;

+	public final void rule__AttributeSelector__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5385:1: ( rule__AttributeSelector__Group__2__Impl rule__AttributeSelector__Group__3 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5386:2: rule__AttributeSelector__Group__2__Impl rule__AttributeSelector__Group__3

+			{

+				pushFollow(FOLLOW_rule__AttributeSelector__Group__2__Impl_in_rule__AttributeSelector__Group__211188);

+				rule__AttributeSelector__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__AttributeSelector__Group__3_in_rule__AttributeSelector__Group__211191);

+				rule__AttributeSelector__Group__3();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group__2"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5393:1: rule__AttributeSelector__Group__2__Impl : ( ( rule__AttributeSelector__NameAssignment_2 ) ) ;

+	public final void rule__AttributeSelector__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5397:1: ( ( ( rule__AttributeSelector__NameAssignment_2 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5398:1: ( ( rule__AttributeSelector__NameAssignment_2 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5398:1: ( ( rule__AttributeSelector__NameAssignment_2 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5399:1: ( rule__AttributeSelector__NameAssignment_2 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getNameAssignment_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5400:1: ( rule__AttributeSelector__NameAssignment_2 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5400:2: rule__AttributeSelector__NameAssignment_2

+					{

+						pushFollow(FOLLOW_rule__AttributeSelector__NameAssignment_2_in_rule__AttributeSelector__Group__2__Impl11218);

+						rule__AttributeSelector__NameAssignment_2();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getNameAssignment_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group__2__Impl"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group__3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5410:1: rule__AttributeSelector__Group__3 : rule__AttributeSelector__Group__3__Impl

+	// rule__AttributeSelector__Group__4 ;

+	public final void rule__AttributeSelector__Group__3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5414:1: ( rule__AttributeSelector__Group__3__Impl rule__AttributeSelector__Group__4 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5415:2: rule__AttributeSelector__Group__3__Impl rule__AttributeSelector__Group__4

+			{

+				pushFollow(FOLLOW_rule__AttributeSelector__Group__3__Impl_in_rule__AttributeSelector__Group__311248);

+				rule__AttributeSelector__Group__3__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__AttributeSelector__Group__4_in_rule__AttributeSelector__Group__311251);

+				rule__AttributeSelector__Group__4();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group__3"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group__3__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5422:1: rule__AttributeSelector__Group__3__Impl : ( ( rule__AttributeSelector__Group_3__0 )? ) ;

+	public final void rule__AttributeSelector__Group__3__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5426:1: ( ( ( rule__AttributeSelector__Group_3__0 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5427:1: ( ( rule__AttributeSelector__Group_3__0 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5427:1: ( ( rule__AttributeSelector__Group_3__0 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5428:1: ( rule__AttributeSelector__Group_3__0 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getGroup_3());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5429:1: ( rule__AttributeSelector__Group_3__0 )?

+					int alt71 = 2;

+					int LA71_0 = input.LA(1);

+

+					if (((LA71_0 >= RULE_INCLUDES && LA71_0 <= RULE_DASHMATCH) || (LA71_0 >= 32 && LA71_0 <= 35))) {

+						alt71 = 1;

+					}

+					switch (alt71) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5429:2: rule__AttributeSelector__Group_3__0

+					{

+						pushFollow(FOLLOW_rule__AttributeSelector__Group_3__0_in_rule__AttributeSelector__Group__3__Impl11278);

+						rule__AttributeSelector__Group_3__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getGroup_3());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group__3__Impl"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group__4"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5439:1: rule__AttributeSelector__Group__4 : rule__AttributeSelector__Group__4__Impl ;

+	public final void rule__AttributeSelector__Group__4() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5443:1: ( rule__AttributeSelector__Group__4__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5444:2: rule__AttributeSelector__Group__4__Impl

+			{

+				pushFollow(FOLLOW_rule__AttributeSelector__Group__4__Impl_in_rule__AttributeSelector__Group__411309);

+				rule__AttributeSelector__Group__4__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group__4"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group__4__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5450:1: rule__AttributeSelector__Group__4__Impl : ( ']' ) ;

+	public final void rule__AttributeSelector__Group__4__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5454:1: ( ( ']' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5455:1: ( ']' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5455:1: ( ']' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5456:1: ']'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getRightSquareBracketKeyword_4());

+					}

+					match(input, 43, FOLLOW_43_in_rule__AttributeSelector__Group__4__Impl11337);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getRightSquareBracketKeyword_4());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group__4__Impl"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group_3__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5479:1: rule__AttributeSelector__Group_3__0 : rule__AttributeSelector__Group_3__0__Impl

+	// rule__AttributeSelector__Group_3__1 ;

+	public final void rule__AttributeSelector__Group_3__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5483:1: ( rule__AttributeSelector__Group_3__0__Impl rule__AttributeSelector__Group_3__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5484:2: rule__AttributeSelector__Group_3__0__Impl rule__AttributeSelector__Group_3__1

+			{

+				pushFollow(FOLLOW_rule__AttributeSelector__Group_3__0__Impl_in_rule__AttributeSelector__Group_3__011378);

+				rule__AttributeSelector__Group_3__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__AttributeSelector__Group_3__1_in_rule__AttributeSelector__Group_3__011381);

+				rule__AttributeSelector__Group_3__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group_3__0"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group_3__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5491:1: rule__AttributeSelector__Group_3__0__Impl : ( ( rule__AttributeSelector__OpAssignment_3_0 ) ) ;

+	public final void rule__AttributeSelector__Group_3__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5495:1: ( ( ( rule__AttributeSelector__OpAssignment_3_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5496:1: ( ( rule__AttributeSelector__OpAssignment_3_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5496:1: ( ( rule__AttributeSelector__OpAssignment_3_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5497:1: ( rule__AttributeSelector__OpAssignment_3_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getOpAssignment_3_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5498:1: ( rule__AttributeSelector__OpAssignment_3_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5498:2: rule__AttributeSelector__OpAssignment_3_0

+					{

+						pushFollow(FOLLOW_rule__AttributeSelector__OpAssignment_3_0_in_rule__AttributeSelector__Group_3__0__Impl11408);

+						rule__AttributeSelector__OpAssignment_3_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getOpAssignment_3_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group_3__0__Impl"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group_3__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5508:1: rule__AttributeSelector__Group_3__1 : rule__AttributeSelector__Group_3__1__Impl ;

+	public final void rule__AttributeSelector__Group_3__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5512:1: ( rule__AttributeSelector__Group_3__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5513:2: rule__AttributeSelector__Group_3__1__Impl

+			{

+				pushFollow(FOLLOW_rule__AttributeSelector__Group_3__1__Impl_in_rule__AttributeSelector__Group_3__111438);

+				rule__AttributeSelector__Group_3__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group_3__1"

+

+

+	// $ANTLR start "rule__AttributeSelector__Group_3__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5519:1: rule__AttributeSelector__Group_3__1__Impl : ( ( rule__AttributeSelector__ValueAssignment_3_1 ) ) ;

+	public final void rule__AttributeSelector__Group_3__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5523:1: ( ( ( rule__AttributeSelector__ValueAssignment_3_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5524:1: ( ( rule__AttributeSelector__ValueAssignment_3_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5524:1: ( ( rule__AttributeSelector__ValueAssignment_3_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5525:1: ( rule__AttributeSelector__ValueAssignment_3_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getValueAssignment_3_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5526:1: ( rule__AttributeSelector__ValueAssignment_3_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5526:2: rule__AttributeSelector__ValueAssignment_3_1

+					{

+						pushFollow(FOLLOW_rule__AttributeSelector__ValueAssignment_3_1_in_rule__AttributeSelector__Group_3__1__Impl11465);

+						rule__AttributeSelector__ValueAssignment_3_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getValueAssignment_3_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__Group_3__1__Impl"

+

+

+	// $ANTLR start "rule__ClassSelector__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5540:1: rule__ClassSelector__Group__0 : rule__ClassSelector__Group__0__Impl rule__ClassSelector__Group__1 ;

+	public final void rule__ClassSelector__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5544:1: ( rule__ClassSelector__Group__0__Impl rule__ClassSelector__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5545:2: rule__ClassSelector__Group__0__Impl rule__ClassSelector__Group__1

+			{

+				pushFollow(FOLLOW_rule__ClassSelector__Group__0__Impl_in_rule__ClassSelector__Group__011499);

+				rule__ClassSelector__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__ClassSelector__Group__1_in_rule__ClassSelector__Group__011502);

+				rule__ClassSelector__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ClassSelector__Group__0"

+

+

+	// $ANTLR start "rule__ClassSelector__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5552:1: rule__ClassSelector__Group__0__Impl : ( () ) ;

+	public final void rule__ClassSelector__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5556:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5557:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5557:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5558:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getClassSelectorAccess().getClassSelectorAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5559:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5561:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getClassSelectorAccess().getClassSelectorAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ClassSelector__Group__0__Impl"

+

+

+	// $ANTLR start "rule__ClassSelector__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5571:1: rule__ClassSelector__Group__1 : rule__ClassSelector__Group__1__Impl rule__ClassSelector__Group__2 ;

+	public final void rule__ClassSelector__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5575:1: ( rule__ClassSelector__Group__1__Impl rule__ClassSelector__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5576:2: rule__ClassSelector__Group__1__Impl rule__ClassSelector__Group__2

+			{

+				pushFollow(FOLLOW_rule__ClassSelector__Group__1__Impl_in_rule__ClassSelector__Group__111560);

+				rule__ClassSelector__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__ClassSelector__Group__2_in_rule__ClassSelector__Group__111563);

+				rule__ClassSelector__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ClassSelector__Group__1"

+

+

+	// $ANTLR start "rule__ClassSelector__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5583:1: rule__ClassSelector__Group__1__Impl : ( '.' ) ;

+	public final void rule__ClassSelector__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5587:1: ( ( '.' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5588:1: ( '.' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5588:1: ( '.' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5589:1: '.'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getClassSelectorAccess().getFullStopKeyword_1());

+					}

+					match(input, 39, FOLLOW_39_in_rule__ClassSelector__Group__1__Impl11591);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getClassSelectorAccess().getFullStopKeyword_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ClassSelector__Group__1__Impl"

+

+

+	// $ANTLR start "rule__ClassSelector__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5602:1: rule__ClassSelector__Group__2 : rule__ClassSelector__Group__2__Impl ;

+	public final void rule__ClassSelector__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5606:1: ( rule__ClassSelector__Group__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5607:2: rule__ClassSelector__Group__2__Impl

+			{

+				pushFollow(FOLLOW_rule__ClassSelector__Group__2__Impl_in_rule__ClassSelector__Group__211622);

+				rule__ClassSelector__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ClassSelector__Group__2"

+

+

+	// $ANTLR start "rule__ClassSelector__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5613:1: rule__ClassSelector__Group__2__Impl : ( ( rule__ClassSelector__NameAssignment_2 ) ) ;

+	public final void rule__ClassSelector__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5617:1: ( ( ( rule__ClassSelector__NameAssignment_2 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5618:1: ( ( rule__ClassSelector__NameAssignment_2 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5618:1: ( ( rule__ClassSelector__NameAssignment_2 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5619:1: ( rule__ClassSelector__NameAssignment_2 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getClassSelectorAccess().getNameAssignment_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5620:1: ( rule__ClassSelector__NameAssignment_2 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5620:2: rule__ClassSelector__NameAssignment_2

+					{

+						pushFollow(FOLLOW_rule__ClassSelector__NameAssignment_2_in_rule__ClassSelector__Group__2__Impl11649);

+						rule__ClassSelector__NameAssignment_2();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getClassSelectorAccess().getNameAssignment_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ClassSelector__Group__2__Impl"

+

+

+	// $ANTLR start "rule__ElementSelector__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5636:1: rule__ElementSelector__Group__0 : rule__ElementSelector__Group__0__Impl

+	// rule__ElementSelector__Group__1 ;

+	public final void rule__ElementSelector__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5640:1: ( rule__ElementSelector__Group__0__Impl rule__ElementSelector__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5641:2: rule__ElementSelector__Group__0__Impl rule__ElementSelector__Group__1

+			{

+				pushFollow(FOLLOW_rule__ElementSelector__Group__0__Impl_in_rule__ElementSelector__Group__011685);

+				rule__ElementSelector__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__ElementSelector__Group__1_in_rule__ElementSelector__Group__011688);

+				rule__ElementSelector__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ElementSelector__Group__0"

+

+

+	// $ANTLR start "rule__ElementSelector__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5648:1: rule__ElementSelector__Group__0__Impl : ( () ) ;

+	public final void rule__ElementSelector__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5652:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5653:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5653:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5654:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getElementSelectorAccess().getElementSelectorAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5655:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5657:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getElementSelectorAccess().getElementSelectorAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ElementSelector__Group__0__Impl"

+

+

+	// $ANTLR start "rule__ElementSelector__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5667:1: rule__ElementSelector__Group__1 : rule__ElementSelector__Group__1__Impl ;

+	public final void rule__ElementSelector__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5671:1: ( rule__ElementSelector__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5672:2: rule__ElementSelector__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__ElementSelector__Group__1__Impl_in_rule__ElementSelector__Group__111746);

+				rule__ElementSelector__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ElementSelector__Group__1"

+

+

+	// $ANTLR start "rule__ElementSelector__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5678:1: rule__ElementSelector__Group__1__Impl : ( ( rule__ElementSelector__NameAssignment_1 ) ) ;

+	public final void rule__ElementSelector__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5682:1: ( ( ( rule__ElementSelector__NameAssignment_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5683:1: ( ( rule__ElementSelector__NameAssignment_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5683:1: ( ( rule__ElementSelector__NameAssignment_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5684:1: ( rule__ElementSelector__NameAssignment_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getElementSelectorAccess().getNameAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5685:1: ( rule__ElementSelector__NameAssignment_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5685:2: rule__ElementSelector__NameAssignment_1

+					{

+						pushFollow(FOLLOW_rule__ElementSelector__NameAssignment_1_in_rule__ElementSelector__Group__1__Impl11773);

+						rule__ElementSelector__NameAssignment_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getElementSelectorAccess().getNameAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ElementSelector__Group__1__Impl"

+

+

+	// $ANTLR start "rule__UniversalSelector__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5699:1: rule__UniversalSelector__Group__0 : rule__UniversalSelector__Group__0__Impl

+	// rule__UniversalSelector__Group__1 ;

+	public final void rule__UniversalSelector__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5703:1: ( rule__UniversalSelector__Group__0__Impl rule__UniversalSelector__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5704:2: rule__UniversalSelector__Group__0__Impl rule__UniversalSelector__Group__1

+			{

+				pushFollow(FOLLOW_rule__UniversalSelector__Group__0__Impl_in_rule__UniversalSelector__Group__011807);

+				rule__UniversalSelector__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__UniversalSelector__Group__1_in_rule__UniversalSelector__Group__011810);

+				rule__UniversalSelector__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__UniversalSelector__Group__0"

+

+

+	// $ANTLR start "rule__UniversalSelector__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5711:1: rule__UniversalSelector__Group__0__Impl : ( () ) ;

+	public final void rule__UniversalSelector__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5715:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5716:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5716:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5717:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getUniversalSelectorAccess().getUniversalSelectorAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5718:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5720:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getUniversalSelectorAccess().getUniversalSelectorAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__UniversalSelector__Group__0__Impl"

+

+

+	// $ANTLR start "rule__UniversalSelector__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5730:1: rule__UniversalSelector__Group__1 : rule__UniversalSelector__Group__1__Impl

+	// rule__UniversalSelector__Group__2 ;

+	public final void rule__UniversalSelector__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5734:1: ( rule__UniversalSelector__Group__1__Impl rule__UniversalSelector__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5735:2: rule__UniversalSelector__Group__1__Impl rule__UniversalSelector__Group__2

+			{

+				pushFollow(FOLLOW_rule__UniversalSelector__Group__1__Impl_in_rule__UniversalSelector__Group__111868);

+				rule__UniversalSelector__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__UniversalSelector__Group__2_in_rule__UniversalSelector__Group__111871);

+				rule__UniversalSelector__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__UniversalSelector__Group__1"

+

+

+	// $ANTLR start "rule__UniversalSelector__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5742:1: rule__UniversalSelector__Group__1__Impl : ( ( rule__UniversalSelector__NamespaceAssignment_1 )? ) ;

+	public final void rule__UniversalSelector__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5746:1: ( ( ( rule__UniversalSelector__NamespaceAssignment_1 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5747:1: ( ( rule__UniversalSelector__NamespaceAssignment_1 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5747:1: ( ( rule__UniversalSelector__NamespaceAssignment_1 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5748:1: ( rule__UniversalSelector__NamespaceAssignment_1 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getUniversalSelectorAccess().getNamespaceAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5749:1: ( rule__UniversalSelector__NamespaceAssignment_1 )?

+					int alt72 = 2;

+					int LA72_0 = input.LA(1);

+

+					if (((LA72_0 >= RULE_DASH && LA72_0 <= RULE_UNDERSCORE) || (LA72_0 >= RULE_ONE_HEX_LETTER && LA72_0 <= RULE_ONE_NON_HEX_LETTER) || (LA72_0 >= 49 && LA72_0 <= 52) || LA72_0 == 60)) {

+						alt72 = 1;

+					}

+					else if ((LA72_0 == 36)) {

+						int LA72_2 = input.LA(2);

+

+						if ((LA72_2 == 60)) {

+							alt72 = 1;

+						}

+					}

+					switch (alt72) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5749:2: rule__UniversalSelector__NamespaceAssignment_1

+					{

+						pushFollow(FOLLOW_rule__UniversalSelector__NamespaceAssignment_1_in_rule__UniversalSelector__Group__1__Impl11898);

+						rule__UniversalSelector__NamespaceAssignment_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getUniversalSelectorAccess().getNamespaceAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__UniversalSelector__Group__1__Impl"

+

+

+	// $ANTLR start "rule__UniversalSelector__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5759:1: rule__UniversalSelector__Group__2 : rule__UniversalSelector__Group__2__Impl ;

+	public final void rule__UniversalSelector__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5763:1: ( rule__UniversalSelector__Group__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5764:2: rule__UniversalSelector__Group__2__Impl

+			{

+				pushFollow(FOLLOW_rule__UniversalSelector__Group__2__Impl_in_rule__UniversalSelector__Group__211929);

+				rule__UniversalSelector__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__UniversalSelector__Group__2"

+

+

+	// $ANTLR start "rule__UniversalSelector__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5770:1: rule__UniversalSelector__Group__2__Impl : ( '*' ) ;

+	public final void rule__UniversalSelector__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5774:1: ( ( '*' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5775:1: ( '*' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5775:1: ( '*' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5776:1: '*'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getUniversalSelectorAccess().getAsteriskKeyword_2());

+					}

+					match(input, 36, FOLLOW_36_in_rule__UniversalSelector__Group__2__Impl11957);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getUniversalSelectorAccess().getAsteriskKeyword_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__UniversalSelector__Group__2__Impl"

+

+

+	// $ANTLR start "rule__IdSelector__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5795:1: rule__IdSelector__Group__0 : rule__IdSelector__Group__0__Impl rule__IdSelector__Group__1 ;

+	public final void rule__IdSelector__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5799:1: ( rule__IdSelector__Group__0__Impl rule__IdSelector__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5800:2: rule__IdSelector__Group__0__Impl rule__IdSelector__Group__1

+			{

+				pushFollow(FOLLOW_rule__IdSelector__Group__0__Impl_in_rule__IdSelector__Group__011994);

+				rule__IdSelector__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__IdSelector__Group__1_in_rule__IdSelector__Group__011997);

+				rule__IdSelector__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdSelector__Group__0"

+

+

+	// $ANTLR start "rule__IdSelector__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5807:1: rule__IdSelector__Group__0__Impl : ( () ) ;

+	public final void rule__IdSelector__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5811:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5812:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5812:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5813:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdSelectorAccess().getIdSelectorAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5814:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5816:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdSelectorAccess().getIdSelectorAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdSelector__Group__0__Impl"

+

+

+	// $ANTLR start "rule__IdSelector__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5826:1: rule__IdSelector__Group__1 : rule__IdSelector__Group__1__Impl rule__IdSelector__Group__2 ;

+	public final void rule__IdSelector__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5830:1: ( rule__IdSelector__Group__1__Impl rule__IdSelector__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5831:2: rule__IdSelector__Group__1__Impl rule__IdSelector__Group__2

+			{

+				pushFollow(FOLLOW_rule__IdSelector__Group__1__Impl_in_rule__IdSelector__Group__112055);

+				rule__IdSelector__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__IdSelector__Group__2_in_rule__IdSelector__Group__112058);

+				rule__IdSelector__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdSelector__Group__1"

+

+

+	// $ANTLR start "rule__IdSelector__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5838:1: rule__IdSelector__Group__1__Impl : ( RULE_HASHMARK ) ;

+	public final void rule__IdSelector__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5842:1: ( ( RULE_HASHMARK ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5843:1: ( RULE_HASHMARK )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5843:1: ( RULE_HASHMARK )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5844:1: RULE_HASHMARK

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdSelectorAccess().getHASHMARKTerminalRuleCall_1());

+					}

+					match(input, RULE_HASHMARK, FOLLOW_RULE_HASHMARK_in_rule__IdSelector__Group__1__Impl12085);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdSelectorAccess().getHASHMARKTerminalRuleCall_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdSelector__Group__1__Impl"

+

+

+	// $ANTLR start "rule__IdSelector__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5855:1: rule__IdSelector__Group__2 : rule__IdSelector__Group__2__Impl ;

+	public final void rule__IdSelector__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5859:1: ( rule__IdSelector__Group__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5860:2: rule__IdSelector__Group__2__Impl

+			{

+				pushFollow(FOLLOW_rule__IdSelector__Group__2__Impl_in_rule__IdSelector__Group__212114);

+				rule__IdSelector__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdSelector__Group__2"

+

+

+	// $ANTLR start "rule__IdSelector__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5866:1: rule__IdSelector__Group__2__Impl : ( ( rule__IdSelector__NameAssignment_2 ) ) ;

+	public final void rule__IdSelector__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5870:1: ( ( ( rule__IdSelector__NameAssignment_2 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5871:1: ( ( rule__IdSelector__NameAssignment_2 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5871:1: ( ( rule__IdSelector__NameAssignment_2 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5872:1: ( rule__IdSelector__NameAssignment_2 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdSelectorAccess().getNameAssignment_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5873:1: ( rule__IdSelector__NameAssignment_2 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5873:2: rule__IdSelector__NameAssignment_2

+					{

+						pushFollow(FOLLOW_rule__IdSelector__NameAssignment_2_in_rule__IdSelector__Group__2__Impl12141);

+						rule__IdSelector__NameAssignment_2();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdSelectorAccess().getNameAssignment_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdSelector__Group__2__Impl"

+

+

+	// $ANTLR start "rule__Css_namespace_prefix__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5889:1: rule__Css_namespace_prefix__Group__0 : rule__Css_namespace_prefix__Group__0__Impl

+	// rule__Css_namespace_prefix__Group__1 ;

+	public final void rule__Css_namespace_prefix__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5893:1: ( rule__Css_namespace_prefix__Group__0__Impl rule__Css_namespace_prefix__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5894:2: rule__Css_namespace_prefix__Group__0__Impl rule__Css_namespace_prefix__Group__1

+			{

+				pushFollow(FOLLOW_rule__Css_namespace_prefix__Group__0__Impl_in_rule__Css_namespace_prefix__Group__012177);

+				rule__Css_namespace_prefix__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Css_namespace_prefix__Group__1_in_rule__Css_namespace_prefix__Group__012180);

+				rule__Css_namespace_prefix__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_namespace_prefix__Group__0"

+

+

+	// $ANTLR start "rule__Css_namespace_prefix__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5901:1: rule__Css_namespace_prefix__Group__0__Impl : ( ( rule__Css_namespace_prefix__Alternatives_0 )? ) ;

+	public final void rule__Css_namespace_prefix__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5905:1: ( ( ( rule__Css_namespace_prefix__Alternatives_0 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5906:1: ( ( rule__Css_namespace_prefix__Alternatives_0 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5906:1: ( ( rule__Css_namespace_prefix__Alternatives_0 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5907:1: ( rule__Css_namespace_prefix__Alternatives_0 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_namespace_prefixAccess().getAlternatives_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5908:1: ( rule__Css_namespace_prefix__Alternatives_0 )?

+					int alt73 = 2;

+					int LA73_0 = input.LA(1);

+

+					if (((LA73_0 >= RULE_DASH && LA73_0 <= RULE_UNDERSCORE) || (LA73_0 >= RULE_ONE_HEX_LETTER && LA73_0 <= RULE_ONE_NON_HEX_LETTER) || LA73_0 == 36 || (LA73_0 >= 49 && LA73_0 <= 52))) {

+						alt73 = 1;

+					}

+					switch (alt73) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5908:2: rule__Css_namespace_prefix__Alternatives_0

+					{

+						pushFollow(FOLLOW_rule__Css_namespace_prefix__Alternatives_0_in_rule__Css_namespace_prefix__Group__0__Impl12207);

+						rule__Css_namespace_prefix__Alternatives_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_namespace_prefixAccess().getAlternatives_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_namespace_prefix__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Css_namespace_prefix__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5918:1: rule__Css_namespace_prefix__Group__1 : rule__Css_namespace_prefix__Group__1__Impl ;

+	public final void rule__Css_namespace_prefix__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5922:1: ( rule__Css_namespace_prefix__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5923:2: rule__Css_namespace_prefix__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Css_namespace_prefix__Group__1__Impl_in_rule__Css_namespace_prefix__Group__112238);

+				rule__Css_namespace_prefix__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_namespace_prefix__Group__1"

+

+

+	// $ANTLR start "rule__Css_namespace_prefix__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5929:1: rule__Css_namespace_prefix__Group__1__Impl : ( '|' ) ;

+	public final void rule__Css_namespace_prefix__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5933:1: ( ( '|' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5934:1: ( '|' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5934:1: ( '|' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5935:1: '|'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_namespace_prefixAccess().getVerticalLineKeyword_1());

+					}

+					match(input, 60, FOLLOW_60_in_rule__Css_namespace_prefix__Group__1__Impl12266);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_namespace_prefixAccess().getVerticalLineKeyword_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_namespace_prefix__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Css_declaration__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5952:1: rule__Css_declaration__Group__0 : rule__Css_declaration__Group__0__Impl

+	// rule__Css_declaration__Group__1 ;

+	public final void rule__Css_declaration__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5956:1: ( rule__Css_declaration__Group__0__Impl rule__Css_declaration__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5957:2: rule__Css_declaration__Group__0__Impl rule__Css_declaration__Group__1

+			{

+				pushFollow(FOLLOW_rule__Css_declaration__Group__0__Impl_in_rule__Css_declaration__Group__012301);

+				rule__Css_declaration__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Css_declaration__Group__1_in_rule__Css_declaration__Group__012304);

+				rule__Css_declaration__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__Group__0"

+

+

+	// $ANTLR start "rule__Css_declaration__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5964:1: rule__Css_declaration__Group__0__Impl : ( ( RULE_WS )* ) ;

+	public final void rule__Css_declaration__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5968:1: ( ( ( RULE_WS )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5969:1: ( ( RULE_WS )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5969:1: ( ( RULE_WS )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5970:1: ( RULE_WS )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5971:1: ( RULE_WS )*

+					loop74: do {

+						int alt74 = 2;

+						int LA74_0 = input.LA(1);

+

+						if ((LA74_0 == RULE_WS)) {

+							alt74 = 1;

+						}

+

+

+						switch (alt74) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5971:3: RULE_WS

+						{

+							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Css_declaration__Group__0__Impl12332);

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop74;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Css_declaration__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5981:1: rule__Css_declaration__Group__1 : rule__Css_declaration__Group__1__Impl

+	// rule__Css_declaration__Group__2 ;

+	public final void rule__Css_declaration__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5985:1: ( rule__Css_declaration__Group__1__Impl rule__Css_declaration__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5986:2: rule__Css_declaration__Group__1__Impl rule__Css_declaration__Group__2

+			{

+				pushFollow(FOLLOW_rule__Css_declaration__Group__1__Impl_in_rule__Css_declaration__Group__112363);

+				rule__Css_declaration__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Css_declaration__Group__2_in_rule__Css_declaration__Group__112366);

+				rule__Css_declaration__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__Group__1"

+

+

+	// $ANTLR start "rule__Css_declaration__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5993:1: rule__Css_declaration__Group__1__Impl : ( ( rule__Css_declaration__PropertyAssignment_1 ) ) ;

+	public final void rule__Css_declaration__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5997:1: ( ( ( rule__Css_declaration__PropertyAssignment_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5998:1: ( ( rule__Css_declaration__PropertyAssignment_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5998:1: ( ( rule__Css_declaration__PropertyAssignment_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:5999:1: ( rule__Css_declaration__PropertyAssignment_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_declarationAccess().getPropertyAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6000:1: ( rule__Css_declaration__PropertyAssignment_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6000:2: rule__Css_declaration__PropertyAssignment_1

+					{

+						pushFollow(FOLLOW_rule__Css_declaration__PropertyAssignment_1_in_rule__Css_declaration__Group__1__Impl12393);

+						rule__Css_declaration__PropertyAssignment_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_declarationAccess().getPropertyAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Css_declaration__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6010:1: rule__Css_declaration__Group__2 : rule__Css_declaration__Group__2__Impl

+	// rule__Css_declaration__Group__3 ;

+	public final void rule__Css_declaration__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6014:1: ( rule__Css_declaration__Group__2__Impl rule__Css_declaration__Group__3 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6015:2: rule__Css_declaration__Group__2__Impl rule__Css_declaration__Group__3

+			{

+				pushFollow(FOLLOW_rule__Css_declaration__Group__2__Impl_in_rule__Css_declaration__Group__212423);

+				rule__Css_declaration__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Css_declaration__Group__3_in_rule__Css_declaration__Group__212426);

+				rule__Css_declaration__Group__3();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__Group__2"

+

+

+	// $ANTLR start "rule__Css_declaration__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6022:1: rule__Css_declaration__Group__2__Impl : ( ( RULE_WS )* ) ;

+	public final void rule__Css_declaration__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6026:1: ( ( ( RULE_WS )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6027:1: ( ( RULE_WS )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6027:1: ( ( RULE_WS )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6028:1: ( RULE_WS )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6029:1: ( RULE_WS )*

+					loop75: do {

+						int alt75 = 2;

+						int LA75_0 = input.LA(1);

+

+						if ((LA75_0 == RULE_WS)) {

+							alt75 = 1;

+						}

+

+

+						switch (alt75) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6029:3: RULE_WS

+						{

+							match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__Css_declaration__Group__2__Impl12454);

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop75;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__Group__2__Impl"

+

+

+	// $ANTLR start "rule__Css_declaration__Group__3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6039:1: rule__Css_declaration__Group__3 : rule__Css_declaration__Group__3__Impl

+	// rule__Css_declaration__Group__4 ;

+	public final void rule__Css_declaration__Group__3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6043:1: ( rule__Css_declaration__Group__3__Impl rule__Css_declaration__Group__4 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6044:2: rule__Css_declaration__Group__3__Impl rule__Css_declaration__Group__4

+			{

+				pushFollow(FOLLOW_rule__Css_declaration__Group__3__Impl_in_rule__Css_declaration__Group__312485);

+				rule__Css_declaration__Group__3__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Css_declaration__Group__4_in_rule__Css_declaration__Group__312488);

+				rule__Css_declaration__Group__4();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__Group__3"

+

+

+	// $ANTLR start "rule__Css_declaration__Group__3__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6051:1: rule__Css_declaration__Group__3__Impl : ( RULE_COLON ) ;

+	public final void rule__Css_declaration__Group__3__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6055:1: ( ( RULE_COLON ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6056:1: ( RULE_COLON )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6056:1: ( RULE_COLON )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6057:1: RULE_COLON

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_declarationAccess().getCOLONTerminalRuleCall_3());

+					}

+					match(input, RULE_COLON, FOLLOW_RULE_COLON_in_rule__Css_declaration__Group__3__Impl12515);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_declarationAccess().getCOLONTerminalRuleCall_3());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__Group__3__Impl"

+

+

+	// $ANTLR start "rule__Css_declaration__Group__4"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6068:1: rule__Css_declaration__Group__4 : rule__Css_declaration__Group__4__Impl

+	// rule__Css_declaration__Group__5 ;

+	public final void rule__Css_declaration__Group__4() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6072:1: ( rule__Css_declaration__Group__4__Impl rule__Css_declaration__Group__5 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6073:2: rule__Css_declaration__Group__4__Impl rule__Css_declaration__Group__5

+			{

+				pushFollow(FOLLOW_rule__Css_declaration__Group__4__Impl_in_rule__Css_declaration__Group__412544);

+				rule__Css_declaration__Group__4__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Css_declaration__Group__5_in_rule__Css_declaration__Group__412547);

+				rule__Css_declaration__Group__5();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__Group__4"

+

+

+	// $ANTLR start "rule__Css_declaration__Group__4__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6080:1: rule__Css_declaration__Group__4__Impl : ( ( ( rule__Css_declaration__ValueTokensAssignment_4 ) ) ( (

+	// rule__Css_declaration__ValueTokensAssignment_4 )* ) ) ;

+	public final void rule__Css_declaration__Group__4__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6084:1: ( ( ( ( rule__Css_declaration__ValueTokensAssignment_4 ) ) ( (

+			// rule__Css_declaration__ValueTokensAssignment_4 )* ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6085:1: ( ( ( rule__Css_declaration__ValueTokensAssignment_4 ) ) ( (

+			// rule__Css_declaration__ValueTokensAssignment_4 )* ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6085:1: ( ( ( rule__Css_declaration__ValueTokensAssignment_4 ) ) ( (

+				// rule__Css_declaration__ValueTokensAssignment_4 )* ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6086:1: ( ( rule__Css_declaration__ValueTokensAssignment_4 ) ) ( (

+				// rule__Css_declaration__ValueTokensAssignment_4 )* )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6086:1: ( ( rule__Css_declaration__ValueTokensAssignment_4 ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6087:1: ( rule__Css_declaration__ValueTokensAssignment_4 )

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getCss_declarationAccess().getValueTokensAssignment_4());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6088:1: ( rule__Css_declaration__ValueTokensAssignment_4 )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6088:2: rule__Css_declaration__ValueTokensAssignment_4

+						{

+							pushFollow(FOLLOW_rule__Css_declaration__ValueTokensAssignment_4_in_rule__Css_declaration__Group__4__Impl12576);

+							rule__Css_declaration__ValueTokensAssignment_4();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getCss_declarationAccess().getValueTokensAssignment_4());

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6091:1: ( ( rule__Css_declaration__ValueTokensAssignment_4 )* )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6092:1: ( rule__Css_declaration__ValueTokensAssignment_4 )*

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getCss_declarationAccess().getValueTokensAssignment_4());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6093:1: ( rule__Css_declaration__ValueTokensAssignment_4 )*

+						loop76: do {

+							int alt76 = 2;

+							int LA76_0 = input.LA(1);

+

+							if (((LA76_0 >= RULE_CSSSTRING && LA76_0 <= RULE_UNDERSCORE) || (LA76_0 >= RULE_HASHMARK && LA76_0 <= RULE_WS) || LA76_0 == 39 || (LA76_0 >= 49 && LA76_0 <= 52) || LA76_0 == 64)) {

+								alt76 = 1;

+							}

+

+

+							switch (alt76) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6093:2: rule__Css_declaration__ValueTokensAssignment_4

+							{

+								pushFollow(FOLLOW_rule__Css_declaration__ValueTokensAssignment_4_in_rule__Css_declaration__Group__4__Impl12588);

+								rule__Css_declaration__ValueTokensAssignment_4();

+

+								state._fsp--;

+								if (state.failed) {

+									return;

+								}

+

+							}

+								break;

+

+							default:

+								break loop76;

+							}

+						} while (true);

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getCss_declarationAccess().getValueTokensAssignment_4());

+						}

+

+					}

+

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__Group__4__Impl"

+

+

+	// $ANTLR start "rule__Css_declaration__Group__5"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6104:1: rule__Css_declaration__Group__5 : rule__Css_declaration__Group__5__Impl ;

+	public final void rule__Css_declaration__Group__5() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6108:1: ( rule__Css_declaration__Group__5__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6109:2: rule__Css_declaration__Group__5__Impl

+			{

+				pushFollow(FOLLOW_rule__Css_declaration__Group__5__Impl_in_rule__Css_declaration__Group__512621);

+				rule__Css_declaration__Group__5__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__Group__5"

+

+

+	// $ANTLR start "rule__Css_declaration__Group__5__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6115:1: rule__Css_declaration__Group__5__Impl : ( ( rule__Css_declaration__ImportantAssignment_5 )? ) ;

+	public final void rule__Css_declaration__Group__5__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6119:1: ( ( ( rule__Css_declaration__ImportantAssignment_5 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6120:1: ( ( rule__Css_declaration__ImportantAssignment_5 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6120:1: ( ( rule__Css_declaration__ImportantAssignment_5 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6121:1: ( rule__Css_declaration__ImportantAssignment_5 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_declarationAccess().getImportantAssignment_5());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6122:1: ( rule__Css_declaration__ImportantAssignment_5 )?

+					int alt77 = 2;

+					int LA77_0 = input.LA(1);

+

+					if ((LA77_0 == RULE_IMPORTANT_SYM)) {

+						alt77 = 1;

+					}

+					switch (alt77) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6122:2: rule__Css_declaration__ImportantAssignment_5

+					{

+						pushFollow(FOLLOW_rule__Css_declaration__ImportantAssignment_5_in_rule__Css_declaration__Group__5__Impl12648);

+						rule__Css_declaration__ImportantAssignment_5();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_declarationAccess().getImportantAssignment_5());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__Group__5__Impl"

+

+

+	// $ANTLR start "rule__Css_property__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6144:1: rule__Css_property__Group__0 : rule__Css_property__Group__0__Impl rule__Css_property__Group__1 ;

+	public final void rule__Css_property__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6148:1: ( rule__Css_property__Group__0__Impl rule__Css_property__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6149:2: rule__Css_property__Group__0__Impl rule__Css_property__Group__1

+			{

+				pushFollow(FOLLOW_rule__Css_property__Group__0__Impl_in_rule__Css_property__Group__012691);

+				rule__Css_property__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Css_property__Group__1_in_rule__Css_property__Group__012694);

+				rule__Css_property__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_property__Group__0"

+

+

+	// $ANTLR start "rule__Css_property__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6156:1: rule__Css_property__Group__0__Impl : ( () ) ;

+	public final void rule__Css_property__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6160:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6161:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6161:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6162:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_propertyAccess().getCss_propertyAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6163:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6165:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_propertyAccess().getCss_propertyAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_property__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Css_property__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6175:1: rule__Css_property__Group__1 : rule__Css_property__Group__1__Impl ;

+	public final void rule__Css_property__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6179:1: ( rule__Css_property__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6180:2: rule__Css_property__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Css_property__Group__1__Impl_in_rule__Css_property__Group__112752);

+				rule__Css_property__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_property__Group__1"

+

+

+	// $ANTLR start "rule__Css_property__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6186:1: rule__Css_property__Group__1__Impl : ( ( rule__Css_property__NameAssignment_1 ) ) ;

+	public final void rule__Css_property__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6190:1: ( ( ( rule__Css_property__NameAssignment_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6191:1: ( ( rule__Css_property__NameAssignment_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6191:1: ( ( rule__Css_property__NameAssignment_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6192:1: ( rule__Css_property__NameAssignment_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_propertyAccess().getNameAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6193:1: ( rule__Css_property__NameAssignment_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6193:2: rule__Css_property__NameAssignment_1

+					{

+						pushFollow(FOLLOW_rule__Css_property__NameAssignment_1_in_rule__Css_property__Group__1__Impl12779);

+						rule__Css_property__NameAssignment_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_propertyAccess().getNameAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_property__Group__1__Impl"

+

+

+	// $ANTLR start "rule__PseudoClass__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6207:1: rule__PseudoClass__Group__0 : rule__PseudoClass__Group__0__Impl rule__PseudoClass__Group__1 ;

+	public final void rule__PseudoClass__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6211:1: ( rule__PseudoClass__Group__0__Impl rule__PseudoClass__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6212:2: rule__PseudoClass__Group__0__Impl rule__PseudoClass__Group__1

+			{

+				pushFollow(FOLLOW_rule__PseudoClass__Group__0__Impl_in_rule__PseudoClass__Group__012813);

+				rule__PseudoClass__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__PseudoClass__Group__1_in_rule__PseudoClass__Group__012816);

+				rule__PseudoClass__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClass__Group__0"

+

+

+	// $ANTLR start "rule__PseudoClass__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6219:1: rule__PseudoClass__Group__0__Impl : ( RULE_COLON ) ;

+	public final void rule__PseudoClass__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6223:1: ( ( RULE_COLON ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6224:1: ( RULE_COLON )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6224:1: ( RULE_COLON )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6225:1: RULE_COLON

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_0());

+					}

+					match(input, RULE_COLON, FOLLOW_RULE_COLON_in_rule__PseudoClass__Group__0__Impl12843);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClass__Group__0__Impl"

+

+

+	// $ANTLR start "rule__PseudoClass__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6236:1: rule__PseudoClass__Group__1 : rule__PseudoClass__Group__1__Impl rule__PseudoClass__Group__2 ;

+	public final void rule__PseudoClass__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6240:1: ( rule__PseudoClass__Group__1__Impl rule__PseudoClass__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6241:2: rule__PseudoClass__Group__1__Impl rule__PseudoClass__Group__2

+			{

+				pushFollow(FOLLOW_rule__PseudoClass__Group__1__Impl_in_rule__PseudoClass__Group__112872);

+				rule__PseudoClass__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__PseudoClass__Group__2_in_rule__PseudoClass__Group__112875);

+				rule__PseudoClass__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClass__Group__1"

+

+

+	// $ANTLR start "rule__PseudoClass__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6248:1: rule__PseudoClass__Group__1__Impl : ( ( RULE_COLON )? ) ;

+	public final void rule__PseudoClass__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6252:1: ( ( ( RULE_COLON )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6253:1: ( ( RULE_COLON )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6253:1: ( ( RULE_COLON )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6254:1: ( RULE_COLON )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6255:1: ( RULE_COLON )?

+					int alt78 = 2;

+					int LA78_0 = input.LA(1);

+

+					if ((LA78_0 == RULE_COLON)) {

+						alt78 = 1;

+					}

+					switch (alt78) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6255:3: RULE_COLON

+					{

+						match(input, RULE_COLON, FOLLOW_RULE_COLON_in_rule__PseudoClass__Group__1__Impl12903);

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClass__Group__1__Impl"

+

+

+	// $ANTLR start "rule__PseudoClass__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6265:1: rule__PseudoClass__Group__2 : rule__PseudoClass__Group__2__Impl ;

+	public final void rule__PseudoClass__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6269:1: ( rule__PseudoClass__Group__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6270:2: rule__PseudoClass__Group__2__Impl

+			{

+				pushFollow(FOLLOW_rule__PseudoClass__Group__2__Impl_in_rule__PseudoClass__Group__212934);

+				rule__PseudoClass__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClass__Group__2"

+

+

+	// $ANTLR start "rule__PseudoClass__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6276:1: rule__PseudoClass__Group__2__Impl : ( rulePseudoClassName ) ;

+	public final void rule__PseudoClass__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6280:1: ( ( rulePseudoClassName ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6281:1: ( rulePseudoClassName )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6281:1: ( rulePseudoClassName )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6282:1: rulePseudoClassName

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassAccess().getPseudoClassNameParserRuleCall_2());

+					}

+					pushFollow(FOLLOW_rulePseudoClassName_in_rule__PseudoClass__Group__2__Impl12961);

+					rulePseudoClassName();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassAccess().getPseudoClassNameParserRuleCall_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClass__Group__2__Impl"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_0__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6299:1: rule__PseudoClassFunction__Group_0__0 : rule__PseudoClassFunction__Group_0__0__Impl

+	// rule__PseudoClassFunction__Group_0__1 ;

+	public final void rule__PseudoClassFunction__Group_0__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6303:1: ( rule__PseudoClassFunction__Group_0__0__Impl rule__PseudoClassFunction__Group_0__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6304:2: rule__PseudoClassFunction__Group_0__0__Impl rule__PseudoClassFunction__Group_0__1

+			{

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_0__0__Impl_in_rule__PseudoClassFunction__Group_0__012996);

+				rule__PseudoClassFunction__Group_0__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_0__1_in_rule__PseudoClassFunction__Group_0__012999);

+				rule__PseudoClassFunction__Group_0__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_0__0"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_0__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6311:1: rule__PseudoClassFunction__Group_0__0__Impl : ( ( rule__PseudoClassFunction__NotAssignment_0_0 ) ) ;

+	public final void rule__PseudoClassFunction__Group_0__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6315:1: ( ( ( rule__PseudoClassFunction__NotAssignment_0_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6316:1: ( ( rule__PseudoClassFunction__NotAssignment_0_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6316:1: ( ( rule__PseudoClassFunction__NotAssignment_0_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6317:1: ( rule__PseudoClassFunction__NotAssignment_0_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getNotAssignment_0_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6318:1: ( rule__PseudoClassFunction__NotAssignment_0_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6318:2: rule__PseudoClassFunction__NotAssignment_0_0

+					{

+						pushFollow(FOLLOW_rule__PseudoClassFunction__NotAssignment_0_0_in_rule__PseudoClassFunction__Group_0__0__Impl13026);

+						rule__PseudoClassFunction__NotAssignment_0_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getNotAssignment_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_0__0__Impl"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_0__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6328:1: rule__PseudoClassFunction__Group_0__1 : rule__PseudoClassFunction__Group_0__1__Impl

+	// rule__PseudoClassFunction__Group_0__2 ;

+	public final void rule__PseudoClassFunction__Group_0__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6332:1: ( rule__PseudoClassFunction__Group_0__1__Impl rule__PseudoClassFunction__Group_0__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6333:2: rule__PseudoClassFunction__Group_0__1__Impl rule__PseudoClassFunction__Group_0__2

+			{

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_0__1__Impl_in_rule__PseudoClassFunction__Group_0__113056);

+				rule__PseudoClassFunction__Group_0__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_0__2_in_rule__PseudoClassFunction__Group_0__113059);

+				rule__PseudoClassFunction__Group_0__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_0__1"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_0__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6340:1: rule__PseudoClassFunction__Group_0__1__Impl : ( (

+	// rule__PseudoClassFunction__ParamSelectorAssignment_0_1 ) ) ;

+	public final void rule__PseudoClassFunction__Group_0__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6344:1: ( ( ( rule__PseudoClassFunction__ParamSelectorAssignment_0_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6345:1: ( ( rule__PseudoClassFunction__ParamSelectorAssignment_0_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6345:1: ( ( rule__PseudoClassFunction__ParamSelectorAssignment_0_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6346:1: ( rule__PseudoClassFunction__ParamSelectorAssignment_0_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getParamSelectorAssignment_0_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6347:1: ( rule__PseudoClassFunction__ParamSelectorAssignment_0_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6347:2: rule__PseudoClassFunction__ParamSelectorAssignment_0_1

+					{

+						pushFollow(FOLLOW_rule__PseudoClassFunction__ParamSelectorAssignment_0_1_in_rule__PseudoClassFunction__Group_0__1__Impl13086);

+						rule__PseudoClassFunction__ParamSelectorAssignment_0_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getParamSelectorAssignment_0_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_0__1__Impl"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_0__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6357:1: rule__PseudoClassFunction__Group_0__2 : rule__PseudoClassFunction__Group_0__2__Impl ;

+	public final void rule__PseudoClassFunction__Group_0__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6361:1: ( rule__PseudoClassFunction__Group_0__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6362:2: rule__PseudoClassFunction__Group_0__2__Impl

+			{

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_0__2__Impl_in_rule__PseudoClassFunction__Group_0__213116);

+				rule__PseudoClassFunction__Group_0__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_0__2"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_0__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6368:1: rule__PseudoClassFunction__Group_0__2__Impl : ( ')' ) ;

+	public final void rule__PseudoClassFunction__Group_0__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6372:1: ( ( ')' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6373:1: ( ')' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6373:1: ( ')' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6374:1: ')'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_0_2());

+					}

+					match(input, 61, FOLLOW_61_in_rule__PseudoClassFunction__Group_0__2__Impl13144);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_0_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_0__2__Impl"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_1__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6393:1: rule__PseudoClassFunction__Group_1__0 : rule__PseudoClassFunction__Group_1__0__Impl

+	// rule__PseudoClassFunction__Group_1__1 ;

+	public final void rule__PseudoClassFunction__Group_1__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6397:1: ( rule__PseudoClassFunction__Group_1__0__Impl rule__PseudoClassFunction__Group_1__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6398:2: rule__PseudoClassFunction__Group_1__0__Impl rule__PseudoClassFunction__Group_1__1

+			{

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_1__0__Impl_in_rule__PseudoClassFunction__Group_1__013181);

+				rule__PseudoClassFunction__Group_1__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_1__1_in_rule__PseudoClassFunction__Group_1__013184);

+				rule__PseudoClassFunction__Group_1__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_1__0"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_1__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6405:1: rule__PseudoClassFunction__Group_1__0__Impl : ( RULE_COLON ) ;

+	public final void rule__PseudoClassFunction__Group_1__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6409:1: ( ( RULE_COLON ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6410:1: ( RULE_COLON )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6410:1: ( RULE_COLON )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6411:1: RULE_COLON

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getCOLONTerminalRuleCall_1_0());

+					}

+					match(input, RULE_COLON, FOLLOW_RULE_COLON_in_rule__PseudoClassFunction__Group_1__0__Impl13211);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getCOLONTerminalRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_1__0__Impl"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_1__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6422:1: rule__PseudoClassFunction__Group_1__1 : rule__PseudoClassFunction__Group_1__1__Impl

+	// rule__PseudoClassFunction__Group_1__2 ;

+	public final void rule__PseudoClassFunction__Group_1__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6426:1: ( rule__PseudoClassFunction__Group_1__1__Impl rule__PseudoClassFunction__Group_1__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6427:2: rule__PseudoClassFunction__Group_1__1__Impl rule__PseudoClassFunction__Group_1__2

+			{

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_1__1__Impl_in_rule__PseudoClassFunction__Group_1__113240);

+				rule__PseudoClassFunction__Group_1__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_1__2_in_rule__PseudoClassFunction__Group_1__113243);

+				rule__PseudoClassFunction__Group_1__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_1__1"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_1__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6434:1: rule__PseudoClassFunction__Group_1__1__Impl : ( ( rule__PseudoClassFunction__NameAssignment_1_1 ) ) ;

+	public final void rule__PseudoClassFunction__Group_1__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6438:1: ( ( ( rule__PseudoClassFunction__NameAssignment_1_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6439:1: ( ( rule__PseudoClassFunction__NameAssignment_1_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6439:1: ( ( rule__PseudoClassFunction__NameAssignment_1_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6440:1: ( rule__PseudoClassFunction__NameAssignment_1_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getNameAssignment_1_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6441:1: ( rule__PseudoClassFunction__NameAssignment_1_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6441:2: rule__PseudoClassFunction__NameAssignment_1_1

+					{

+						pushFollow(FOLLOW_rule__PseudoClassFunction__NameAssignment_1_1_in_rule__PseudoClassFunction__Group_1__1__Impl13270);

+						rule__PseudoClassFunction__NameAssignment_1_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getNameAssignment_1_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_1__1__Impl"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_1__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6451:1: rule__PseudoClassFunction__Group_1__2 : rule__PseudoClassFunction__Group_1__2__Impl

+	// rule__PseudoClassFunction__Group_1__3 ;

+	public final void rule__PseudoClassFunction__Group_1__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6455:1: ( rule__PseudoClassFunction__Group_1__2__Impl rule__PseudoClassFunction__Group_1__3 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6456:2: rule__PseudoClassFunction__Group_1__2__Impl rule__PseudoClassFunction__Group_1__3

+			{

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_1__2__Impl_in_rule__PseudoClassFunction__Group_1__213300);

+				rule__PseudoClassFunction__Group_1__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_1__3_in_rule__PseudoClassFunction__Group_1__213303);

+				rule__PseudoClassFunction__Group_1__3();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_1__2"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_1__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6463:1: rule__PseudoClassFunction__Group_1__2__Impl : ( '(' ) ;

+	public final void rule__PseudoClassFunction__Group_1__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6467:1: ( ( '(' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6468:1: ( '(' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6468:1: ( '(' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6469:1: '('

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getLeftParenthesisKeyword_1_2());

+					}

+					match(input, 62, FOLLOW_62_in_rule__PseudoClassFunction__Group_1__2__Impl13331);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getLeftParenthesisKeyword_1_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_1__2__Impl"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_1__3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6482:1: rule__PseudoClassFunction__Group_1__3 : rule__PseudoClassFunction__Group_1__3__Impl

+	// rule__PseudoClassFunction__Group_1__4 ;

+	public final void rule__PseudoClassFunction__Group_1__3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6486:1: ( rule__PseudoClassFunction__Group_1__3__Impl rule__PseudoClassFunction__Group_1__4 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6487:2: rule__PseudoClassFunction__Group_1__3__Impl rule__PseudoClassFunction__Group_1__4

+			{

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_1__3__Impl_in_rule__PseudoClassFunction__Group_1__313362);

+				rule__PseudoClassFunction__Group_1__3__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_1__4_in_rule__PseudoClassFunction__Group_1__313365);

+				rule__PseudoClassFunction__Group_1__4();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_1__3"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_1__3__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6494:1: rule__PseudoClassFunction__Group_1__3__Impl : ( ( rule__PseudoClassFunction__ParamsAssignment_1_3 )*

+	// ) ;

+	public final void rule__PseudoClassFunction__Group_1__3__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6498:1: ( ( ( rule__PseudoClassFunction__ParamsAssignment_1_3 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6499:1: ( ( rule__PseudoClassFunction__ParamsAssignment_1_3 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6499:1: ( ( rule__PseudoClassFunction__ParamsAssignment_1_3 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6500:1: ( rule__PseudoClassFunction__ParamsAssignment_1_3 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getParamsAssignment_1_3());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6501:1: ( rule__PseudoClassFunction__ParamsAssignment_1_3 )*

+					loop79: do {

+						int alt79 = 2;

+						int LA79_0 = input.LA(1);

+

+						if (((LA79_0 >= RULE_CSSSTRING && LA79_0 <= RULE_UNDERSCORE) || (LA79_0 >= RULE_HASHMARK && LA79_0 <= RULE_WS) || LA79_0 == 39 || (LA79_0 >= 49 && LA79_0 <= 52) || LA79_0 == 64)) {

+							alt79 = 1;

+						}

+

+

+						switch (alt79) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6501:2: rule__PseudoClassFunction__ParamsAssignment_1_3

+						{

+							pushFollow(FOLLOW_rule__PseudoClassFunction__ParamsAssignment_1_3_in_rule__PseudoClassFunction__Group_1__3__Impl13392);

+							rule__PseudoClassFunction__ParamsAssignment_1_3();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop79;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getParamsAssignment_1_3());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_1__3__Impl"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_1__4"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6511:1: rule__PseudoClassFunction__Group_1__4 : rule__PseudoClassFunction__Group_1__4__Impl ;

+	public final void rule__PseudoClassFunction__Group_1__4() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6515:1: ( rule__PseudoClassFunction__Group_1__4__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6516:2: rule__PseudoClassFunction__Group_1__4__Impl

+			{

+				pushFollow(FOLLOW_rule__PseudoClassFunction__Group_1__4__Impl_in_rule__PseudoClassFunction__Group_1__413423);

+				rule__PseudoClassFunction__Group_1__4__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_1__4"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__Group_1__4__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6522:1: rule__PseudoClassFunction__Group_1__4__Impl : ( ')' ) ;

+	public final void rule__PseudoClassFunction__Group_1__4__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6526:1: ( ( ')' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6527:1: ( ')' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6527:1: ( ')' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6528:1: ')'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_1_4());

+					}

+					match(input, 61, FOLLOW_61_in_rule__PseudoClassFunction__Group_1__4__Impl13451);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_1_4());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__Group_1__4__Impl"

+

+

+	// $ANTLR start "rule__NotFunctionCall__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6551:1: rule__NotFunctionCall__Group__0 : rule__NotFunctionCall__Group__0__Impl

+	// rule__NotFunctionCall__Group__1 ;

+	public final void rule__NotFunctionCall__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6555:1: ( rule__NotFunctionCall__Group__0__Impl rule__NotFunctionCall__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6556:2: rule__NotFunctionCall__Group__0__Impl rule__NotFunctionCall__Group__1

+			{

+				pushFollow(FOLLOW_rule__NotFunctionCall__Group__0__Impl_in_rule__NotFunctionCall__Group__013492);

+				rule__NotFunctionCall__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__NotFunctionCall__Group__1_in_rule__NotFunctionCall__Group__013495);

+				rule__NotFunctionCall__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__NotFunctionCall__Group__0"

+

+

+	// $ANTLR start "rule__NotFunctionCall__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6563:1: rule__NotFunctionCall__Group__0__Impl : ( RULE_COLON ) ;

+	public final void rule__NotFunctionCall__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6567:1: ( ( RULE_COLON ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6568:1: ( RULE_COLON )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6568:1: ( RULE_COLON )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6569:1: RULE_COLON

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNotFunctionCallAccess().getCOLONTerminalRuleCall_0());

+					}

+					match(input, RULE_COLON, FOLLOW_RULE_COLON_in_rule__NotFunctionCall__Group__0__Impl13522);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNotFunctionCallAccess().getCOLONTerminalRuleCall_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__NotFunctionCall__Group__0__Impl"

+

+

+	// $ANTLR start "rule__NotFunctionCall__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6580:1: rule__NotFunctionCall__Group__1 : rule__NotFunctionCall__Group__1__Impl ;

+	public final void rule__NotFunctionCall__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6584:1: ( rule__NotFunctionCall__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6585:2: rule__NotFunctionCall__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__NotFunctionCall__Group__1__Impl_in_rule__NotFunctionCall__Group__113551);

+				rule__NotFunctionCall__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__NotFunctionCall__Group__1"

+

+

+	// $ANTLR start "rule__NotFunctionCall__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6591:1: rule__NotFunctionCall__Group__1__Impl : ( 'not(' ) ;

+	public final void rule__NotFunctionCall__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6595:1: ( ( 'not(' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6596:1: ( 'not(' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6596:1: ( 'not(' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6597:1: 'not('

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNotFunctionCallAccess().getNotKeyword_1());

+					}

+					match(input, 63, FOLLOW_63_in_rule__NotFunctionCall__Group__1__Impl13579);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNotFunctionCallAccess().getNotKeyword_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__NotFunctionCall__Group__1__Impl"

+

+

+	// $ANTLR start "rule__SymbolTok__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6614:1: rule__SymbolTok__Group__0 : rule__SymbolTok__Group__0__Impl rule__SymbolTok__Group__1 ;

+	public final void rule__SymbolTok__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6618:1: ( rule__SymbolTok__Group__0__Impl rule__SymbolTok__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6619:2: rule__SymbolTok__Group__0__Impl rule__SymbolTok__Group__1

+			{

+				pushFollow(FOLLOW_rule__SymbolTok__Group__0__Impl_in_rule__SymbolTok__Group__013614);

+				rule__SymbolTok__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__SymbolTok__Group__1_in_rule__SymbolTok__Group__013617);

+				rule__SymbolTok__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SymbolTok__Group__0"

+

+

+	// $ANTLR start "rule__SymbolTok__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6626:1: rule__SymbolTok__Group__0__Impl : ( () ) ;

+	public final void rule__SymbolTok__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6630:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6631:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6631:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6632:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSymbolTokAccess().getSymbolTokAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6633:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6635:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSymbolTokAccess().getSymbolTokAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SymbolTok__Group__0__Impl"

+

+

+	// $ANTLR start "rule__SymbolTok__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6645:1: rule__SymbolTok__Group__1 : rule__SymbolTok__Group__1__Impl ;

+	public final void rule__SymbolTok__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6649:1: ( rule__SymbolTok__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6650:2: rule__SymbolTok__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__SymbolTok__Group__1__Impl_in_rule__SymbolTok__Group__113675);

+				rule__SymbolTok__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SymbolTok__Group__1"

+

+

+	// $ANTLR start "rule__SymbolTok__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6656:1: rule__SymbolTok__Group__1__Impl : ( ( rule__SymbolTok__SymbolAssignment_1 ) ) ;

+	public final void rule__SymbolTok__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6660:1: ( ( ( rule__SymbolTok__SymbolAssignment_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6661:1: ( ( rule__SymbolTok__SymbolAssignment_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6661:1: ( ( rule__SymbolTok__SymbolAssignment_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6662:1: ( rule__SymbolTok__SymbolAssignment_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSymbolTokAccess().getSymbolAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6663:1: ( rule__SymbolTok__SymbolAssignment_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6663:2: rule__SymbolTok__SymbolAssignment_1

+					{

+						pushFollow(FOLLOW_rule__SymbolTok__SymbolAssignment_1_in_rule__SymbolTok__Group__1__Impl13702);

+						rule__SymbolTok__SymbolAssignment_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSymbolTokAccess().getSymbolAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SymbolTok__Group__1__Impl"

+

+

+	// $ANTLR start "rule__WSTok__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6677:1: rule__WSTok__Group__0 : rule__WSTok__Group__0__Impl rule__WSTok__Group__1 ;

+	public final void rule__WSTok__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6681:1: ( rule__WSTok__Group__0__Impl rule__WSTok__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6682:2: rule__WSTok__Group__0__Impl rule__WSTok__Group__1

+			{

+				pushFollow(FOLLOW_rule__WSTok__Group__0__Impl_in_rule__WSTok__Group__013736);

+				rule__WSTok__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__WSTok__Group__1_in_rule__WSTok__Group__013739);

+				rule__WSTok__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__WSTok__Group__0"

+

+

+	// $ANTLR start "rule__WSTok__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6689:1: rule__WSTok__Group__0__Impl : ( () ) ;

+	public final void rule__WSTok__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6693:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6694:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6694:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6695:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getWSTokAccess().getWSTokAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6696:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6698:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getWSTokAccess().getWSTokAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__WSTok__Group__0__Impl"

+

+

+	// $ANTLR start "rule__WSTok__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6708:1: rule__WSTok__Group__1 : rule__WSTok__Group__1__Impl ;

+	public final void rule__WSTok__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6712:1: ( rule__WSTok__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6713:2: rule__WSTok__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__WSTok__Group__1__Impl_in_rule__WSTok__Group__113797);

+				rule__WSTok__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__WSTok__Group__1"

+

+

+	// $ANTLR start "rule__WSTok__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6719:1: rule__WSTok__Group__1__Impl : ( RULE_WS ) ;

+	public final void rule__WSTok__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6723:1: ( ( RULE_WS ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6724:1: ( RULE_WS )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6724:1: ( RULE_WS )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6725:1: RULE_WS

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getWSTokAccess().getWSTerminalRuleCall_1());

+					}

+					match(input, RULE_WS, FOLLOW_RULE_WS_in_rule__WSTok__Group__1__Impl13824);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getWSTokAccess().getWSTerminalRuleCall_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__WSTok__Group__1__Impl"

+

+

+	// $ANTLR start "rule__StringTok__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6740:1: rule__StringTok__Group__0 : rule__StringTok__Group__0__Impl rule__StringTok__Group__1 ;

+	public final void rule__StringTok__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6744:1: ( rule__StringTok__Group__0__Impl rule__StringTok__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6745:2: rule__StringTok__Group__0__Impl rule__StringTok__Group__1

+			{

+				pushFollow(FOLLOW_rule__StringTok__Group__0__Impl_in_rule__StringTok__Group__013857);

+				rule__StringTok__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__StringTok__Group__1_in_rule__StringTok__Group__013860);

+				rule__StringTok__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__StringTok__Group__0"

+

+

+	// $ANTLR start "rule__StringTok__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6752:1: rule__StringTok__Group__0__Impl : ( () ) ;

+	public final void rule__StringTok__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6756:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6757:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6757:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6758:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStringTokAccess().getStringTokAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6759:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6761:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStringTokAccess().getStringTokAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__StringTok__Group__0__Impl"

+

+

+	// $ANTLR start "rule__StringTok__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6771:1: rule__StringTok__Group__1 : rule__StringTok__Group__1__Impl ;

+	public final void rule__StringTok__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6775:1: ( rule__StringTok__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6776:2: rule__StringTok__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__StringTok__Group__1__Impl_in_rule__StringTok__Group__113918);

+				rule__StringTok__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__StringTok__Group__1"

+

+

+	// $ANTLR start "rule__StringTok__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6782:1: rule__StringTok__Group__1__Impl : ( ( rule__StringTok__ValueAssignment_1 ) ) ;

+	public final void rule__StringTok__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6786:1: ( ( ( rule__StringTok__ValueAssignment_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6787:1: ( ( rule__StringTok__ValueAssignment_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6787:1: ( ( rule__StringTok__ValueAssignment_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6788:1: ( rule__StringTok__ValueAssignment_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStringTokAccess().getValueAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6789:1: ( rule__StringTok__ValueAssignment_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6789:2: rule__StringTok__ValueAssignment_1

+					{

+						pushFollow(FOLLOW_rule__StringTok__ValueAssignment_1_in_rule__StringTok__Group__1__Impl13945);

+						rule__StringTok__ValueAssignment_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStringTokAccess().getValueAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__StringTok__Group__1__Impl"

+

+

+	// $ANTLR start "rule__NumberTok__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6803:1: rule__NumberTok__Group__0 : rule__NumberTok__Group__0__Impl rule__NumberTok__Group__1 ;

+	public final void rule__NumberTok__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6807:1: ( rule__NumberTok__Group__0__Impl rule__NumberTok__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6808:2: rule__NumberTok__Group__0__Impl rule__NumberTok__Group__1

+			{

+				pushFollow(FOLLOW_rule__NumberTok__Group__0__Impl_in_rule__NumberTok__Group__013979);

+				rule__NumberTok__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__NumberTok__Group__1_in_rule__NumberTok__Group__013982);

+				rule__NumberTok__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__NumberTok__Group__0"

+

+

+	// $ANTLR start "rule__NumberTok__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6815:1: rule__NumberTok__Group__0__Impl : ( () ) ;

+	public final void rule__NumberTok__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6819:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6820:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6820:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6821:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumberTokAccess().getNumberTokAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6822:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6824:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumberTokAccess().getNumberTokAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__NumberTok__Group__0__Impl"

+

+

+	// $ANTLR start "rule__NumberTok__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6834:1: rule__NumberTok__Group__1 : rule__NumberTok__Group__1__Impl ;

+	public final void rule__NumberTok__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6838:1: ( rule__NumberTok__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6839:2: rule__NumberTok__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__NumberTok__Group__1__Impl_in_rule__NumberTok__Group__114040);

+				rule__NumberTok__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__NumberTok__Group__1"

+

+

+	// $ANTLR start "rule__NumberTok__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6845:1: rule__NumberTok__Group__1__Impl : ( ( rule__NumberTok__ValAssignment_1 ) ) ;

+	public final void rule__NumberTok__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6849:1: ( ( ( rule__NumberTok__ValAssignment_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6850:1: ( ( rule__NumberTok__ValAssignment_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6850:1: ( ( rule__NumberTok__ValAssignment_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6851:1: ( rule__NumberTok__ValAssignment_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumberTokAccess().getValAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6852:1: ( rule__NumberTok__ValAssignment_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6852:2: rule__NumberTok__ValAssignment_1

+					{

+						pushFollow(FOLLOW_rule__NumberTok__ValAssignment_1_in_rule__NumberTok__Group__1__Impl14067);

+						rule__NumberTok__ValAssignment_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumberTokAccess().getValAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__NumberTok__Group__1__Impl"

+

+

+	// $ANTLR start "rule__UrlTok__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6866:1: rule__UrlTok__Group__0 : rule__UrlTok__Group__0__Impl rule__UrlTok__Group__1 ;

+	public final void rule__UrlTok__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6870:1: ( rule__UrlTok__Group__0__Impl rule__UrlTok__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6871:2: rule__UrlTok__Group__0__Impl rule__UrlTok__Group__1

+			{

+				pushFollow(FOLLOW_rule__UrlTok__Group__0__Impl_in_rule__UrlTok__Group__014101);

+				rule__UrlTok__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__UrlTok__Group__1_in_rule__UrlTok__Group__014104);

+				rule__UrlTok__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__UrlTok__Group__0"

+

+

+	// $ANTLR start "rule__UrlTok__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6878:1: rule__UrlTok__Group__0__Impl : ( () ) ;

+	public final void rule__UrlTok__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6882:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6883:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6883:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6884:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getUrlTokAccess().getUrlTokAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6885:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6887:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getUrlTokAccess().getUrlTokAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__UrlTok__Group__0__Impl"

+

+

+	// $ANTLR start "rule__UrlTok__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6897:1: rule__UrlTok__Group__1 : rule__UrlTok__Group__1__Impl ;

+	public final void rule__UrlTok__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6901:1: ( rule__UrlTok__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6902:2: rule__UrlTok__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__UrlTok__Group__1__Impl_in_rule__UrlTok__Group__114162);

+				rule__UrlTok__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__UrlTok__Group__1"

+

+

+	// $ANTLR start "rule__UrlTok__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6908:1: rule__UrlTok__Group__1__Impl : ( ( rule__UrlTok__UrlAssignment_1 ) ) ;

+	public final void rule__UrlTok__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6912:1: ( ( ( rule__UrlTok__UrlAssignment_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6913:1: ( ( rule__UrlTok__UrlAssignment_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6913:1: ( ( rule__UrlTok__UrlAssignment_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6914:1: ( rule__UrlTok__UrlAssignment_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getUrlTokAccess().getUrlAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6915:1: ( rule__UrlTok__UrlAssignment_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6915:2: rule__UrlTok__UrlAssignment_1

+					{

+						pushFollow(FOLLOW_rule__UrlTok__UrlAssignment_1_in_rule__UrlTok__Group__1__Impl14189);

+						rule__UrlTok__UrlAssignment_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getUrlTokAccess().getUrlAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__UrlTok__Group__1__Impl"

+

+

+	// $ANTLR start "rule__ColorTok__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6929:1: rule__ColorTok__Group__0 : rule__ColorTok__Group__0__Impl rule__ColorTok__Group__1 ;

+	public final void rule__ColorTok__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6933:1: ( rule__ColorTok__Group__0__Impl rule__ColorTok__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6934:2: rule__ColorTok__Group__0__Impl rule__ColorTok__Group__1

+			{

+				pushFollow(FOLLOW_rule__ColorTok__Group__0__Impl_in_rule__ColorTok__Group__014223);

+				rule__ColorTok__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__ColorTok__Group__1_in_rule__ColorTok__Group__014226);

+				rule__ColorTok__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ColorTok__Group__0"

+

+

+	// $ANTLR start "rule__ColorTok__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6941:1: rule__ColorTok__Group__0__Impl : ( () ) ;

+	public final void rule__ColorTok__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6945:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6946:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6946:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6947:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getColorTokAccess().getColorTokAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6948:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6950:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getColorTokAccess().getColorTokAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ColorTok__Group__0__Impl"

+

+

+	// $ANTLR start "rule__ColorTok__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6960:1: rule__ColorTok__Group__1 : rule__ColorTok__Group__1__Impl ;

+	public final void rule__ColorTok__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6964:1: ( rule__ColorTok__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6965:2: rule__ColorTok__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__ColorTok__Group__1__Impl_in_rule__ColorTok__Group__114284);

+				rule__ColorTok__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ColorTok__Group__1"

+

+

+	// $ANTLR start "rule__ColorTok__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6971:1: rule__ColorTok__Group__1__Impl : ( ( rule__ColorTok__ValueAssignment_1 ) ) ;

+	public final void rule__ColorTok__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6975:1: ( ( ( rule__ColorTok__ValueAssignment_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6976:1: ( ( rule__ColorTok__ValueAssignment_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6976:1: ( ( rule__ColorTok__ValueAssignment_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6977:1: ( rule__ColorTok__ValueAssignment_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getColorTokAccess().getValueAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6978:1: ( rule__ColorTok__ValueAssignment_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6978:2: rule__ColorTok__ValueAssignment_1

+					{

+						pushFollow(FOLLOW_rule__ColorTok__ValueAssignment_1_in_rule__ColorTok__Group__1__Impl14311);

+						rule__ColorTok__ValueAssignment_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getColorTokAccess().getValueAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ColorTok__Group__1__Impl"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6992:1: rule__IdentifierOrFuncTok__Group__0 : rule__IdentifierOrFuncTok__Group__0__Impl

+	// rule__IdentifierOrFuncTok__Group__1 ;

+	public final void rule__IdentifierOrFuncTok__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6996:1: ( rule__IdentifierOrFuncTok__Group__0__Impl rule__IdentifierOrFuncTok__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:6997:2: rule__IdentifierOrFuncTok__Group__0__Impl rule__IdentifierOrFuncTok__Group__1

+			{

+				pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group__0__Impl_in_rule__IdentifierOrFuncTok__Group__014345);

+				rule__IdentifierOrFuncTok__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group__1_in_rule__IdentifierOrFuncTok__Group__014348);

+				rule__IdentifierOrFuncTok__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group__0"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7004:1: rule__IdentifierOrFuncTok__Group__0__Impl : ( () ) ;

+	public final void rule__IdentifierOrFuncTok__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7008:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7009:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7009:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7010:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierOrFuncTokAccess().getIdentifierTokAction_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7011:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7013:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierOrFuncTokAccess().getIdentifierTokAction_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group__0__Impl"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7023:1: rule__IdentifierOrFuncTok__Group__1 : rule__IdentifierOrFuncTok__Group__1__Impl

+	// rule__IdentifierOrFuncTok__Group__2 ;

+	public final void rule__IdentifierOrFuncTok__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7027:1: ( rule__IdentifierOrFuncTok__Group__1__Impl rule__IdentifierOrFuncTok__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7028:2: rule__IdentifierOrFuncTok__Group__1__Impl rule__IdentifierOrFuncTok__Group__2

+			{

+				pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group__1__Impl_in_rule__IdentifierOrFuncTok__Group__114406);

+				rule__IdentifierOrFuncTok__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group__2_in_rule__IdentifierOrFuncTok__Group__114409);

+				rule__IdentifierOrFuncTok__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group__1"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7035:1: rule__IdentifierOrFuncTok__Group__1__Impl : ( ( rule__IdentifierOrFuncTok__NameAssignment_1 ) ) ;

+	public final void rule__IdentifierOrFuncTok__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7039:1: ( ( ( rule__IdentifierOrFuncTok__NameAssignment_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7040:1: ( ( rule__IdentifierOrFuncTok__NameAssignment_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7040:1: ( ( rule__IdentifierOrFuncTok__NameAssignment_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7041:1: ( rule__IdentifierOrFuncTok__NameAssignment_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierOrFuncTokAccess().getNameAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7042:1: ( rule__IdentifierOrFuncTok__NameAssignment_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7042:2: rule__IdentifierOrFuncTok__NameAssignment_1

+					{

+						pushFollow(FOLLOW_rule__IdentifierOrFuncTok__NameAssignment_1_in_rule__IdentifierOrFuncTok__Group__1__Impl14436);

+						rule__IdentifierOrFuncTok__NameAssignment_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierOrFuncTokAccess().getNameAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group__1__Impl"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7052:1: rule__IdentifierOrFuncTok__Group__2 : rule__IdentifierOrFuncTok__Group__2__Impl ;

+	public final void rule__IdentifierOrFuncTok__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7056:1: ( rule__IdentifierOrFuncTok__Group__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7057:2: rule__IdentifierOrFuncTok__Group__2__Impl

+			{

+				pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group__2__Impl_in_rule__IdentifierOrFuncTok__Group__214466);

+				rule__IdentifierOrFuncTok__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group__2"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7063:1: rule__IdentifierOrFuncTok__Group__2__Impl : ( ( rule__IdentifierOrFuncTok__Group_2__0 )? ) ;

+	public final void rule__IdentifierOrFuncTok__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7067:1: ( ( ( rule__IdentifierOrFuncTok__Group_2__0 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7068:1: ( ( rule__IdentifierOrFuncTok__Group_2__0 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7068:1: ( ( rule__IdentifierOrFuncTok__Group_2__0 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7069:1: ( rule__IdentifierOrFuncTok__Group_2__0 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierOrFuncTokAccess().getGroup_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7070:1: ( rule__IdentifierOrFuncTok__Group_2__0 )?

+					int alt80 = 2;

+					int LA80_0 = input.LA(1);

+

+					if ((LA80_0 == 62)) {

+						alt80 = 1;

+					}

+					switch (alt80) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7070:2: rule__IdentifierOrFuncTok__Group_2__0

+					{

+						pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group_2__0_in_rule__IdentifierOrFuncTok__Group__2__Impl14493);

+						rule__IdentifierOrFuncTok__Group_2__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierOrFuncTokAccess().getGroup_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group__2__Impl"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group_2__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7086:1: rule__IdentifierOrFuncTok__Group_2__0 : rule__IdentifierOrFuncTok__Group_2__0__Impl

+	// rule__IdentifierOrFuncTok__Group_2__1 ;

+	public final void rule__IdentifierOrFuncTok__Group_2__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7090:1: ( rule__IdentifierOrFuncTok__Group_2__0__Impl rule__IdentifierOrFuncTok__Group_2__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7091:2: rule__IdentifierOrFuncTok__Group_2__0__Impl rule__IdentifierOrFuncTok__Group_2__1

+			{

+				pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group_2__0__Impl_in_rule__IdentifierOrFuncTok__Group_2__014530);

+				rule__IdentifierOrFuncTok__Group_2__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group_2__1_in_rule__IdentifierOrFuncTok__Group_2__014533);

+				rule__IdentifierOrFuncTok__Group_2__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group_2__0"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group_2__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7098:1: rule__IdentifierOrFuncTok__Group_2__0__Impl : ( () ) ;

+	public final void rule__IdentifierOrFuncTok__Group_2__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7102:1: ( ( () ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7103:1: ( () )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7103:1: ( () )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7104:1: ()

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierOrFuncTokAccess().getFuncTokNameAction_2_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7105:1: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7107:1:

+					{

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierOrFuncTokAccess().getFuncTokNameAction_2_0());

+					}

+

+				}

+

+

+			}

+

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group_2__0__Impl"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group_2__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7117:1: rule__IdentifierOrFuncTok__Group_2__1 : rule__IdentifierOrFuncTok__Group_2__1__Impl

+	// rule__IdentifierOrFuncTok__Group_2__2 ;

+	public final void rule__IdentifierOrFuncTok__Group_2__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7121:1: ( rule__IdentifierOrFuncTok__Group_2__1__Impl rule__IdentifierOrFuncTok__Group_2__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7122:2: rule__IdentifierOrFuncTok__Group_2__1__Impl rule__IdentifierOrFuncTok__Group_2__2

+			{

+				pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group_2__1__Impl_in_rule__IdentifierOrFuncTok__Group_2__114591);

+				rule__IdentifierOrFuncTok__Group_2__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group_2__2_in_rule__IdentifierOrFuncTok__Group_2__114594);

+				rule__IdentifierOrFuncTok__Group_2__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group_2__1"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group_2__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7129:1: rule__IdentifierOrFuncTok__Group_2__1__Impl : ( '(' ) ;

+	public final void rule__IdentifierOrFuncTok__Group_2__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7133:1: ( ( '(' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7134:1: ( '(' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7134:1: ( '(' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7135:1: '('

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierOrFuncTokAccess().getLeftParenthesisKeyword_2_1());

+					}

+					match(input, 62, FOLLOW_62_in_rule__IdentifierOrFuncTok__Group_2__1__Impl14622);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierOrFuncTokAccess().getLeftParenthesisKeyword_2_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group_2__1__Impl"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group_2__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7148:1: rule__IdentifierOrFuncTok__Group_2__2 : rule__IdentifierOrFuncTok__Group_2__2__Impl

+	// rule__IdentifierOrFuncTok__Group_2__3 ;

+	public final void rule__IdentifierOrFuncTok__Group_2__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7152:1: ( rule__IdentifierOrFuncTok__Group_2__2__Impl rule__IdentifierOrFuncTok__Group_2__3 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7153:2: rule__IdentifierOrFuncTok__Group_2__2__Impl rule__IdentifierOrFuncTok__Group_2__3

+			{

+				pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group_2__2__Impl_in_rule__IdentifierOrFuncTok__Group_2__214653);

+				rule__IdentifierOrFuncTok__Group_2__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group_2__3_in_rule__IdentifierOrFuncTok__Group_2__214656);

+				rule__IdentifierOrFuncTok__Group_2__3();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group_2__2"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group_2__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7160:1: rule__IdentifierOrFuncTok__Group_2__2__Impl : ( ( ( rule__IdentifierOrFuncTok__ParamsAssignment_2_2 )

+	// ) ( ( rule__IdentifierOrFuncTok__ParamsAssignment_2_2 )* ) ) ;

+	public final void rule__IdentifierOrFuncTok__Group_2__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7164:1: ( ( ( ( rule__IdentifierOrFuncTok__ParamsAssignment_2_2 ) ) ( (

+			// rule__IdentifierOrFuncTok__ParamsAssignment_2_2 )* ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7165:1: ( ( ( rule__IdentifierOrFuncTok__ParamsAssignment_2_2 ) ) ( (

+			// rule__IdentifierOrFuncTok__ParamsAssignment_2_2 )* ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7165:1: ( ( ( rule__IdentifierOrFuncTok__ParamsAssignment_2_2 ) ) ( (

+				// rule__IdentifierOrFuncTok__ParamsAssignment_2_2 )* ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7166:1: ( ( rule__IdentifierOrFuncTok__ParamsAssignment_2_2 ) ) ( (

+				// rule__IdentifierOrFuncTok__ParamsAssignment_2_2 )* )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7166:1: ( ( rule__IdentifierOrFuncTok__ParamsAssignment_2_2 ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7167:1: ( rule__IdentifierOrFuncTok__ParamsAssignment_2_2 )

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getIdentifierOrFuncTokAccess().getParamsAssignment_2_2());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7168:1: ( rule__IdentifierOrFuncTok__ParamsAssignment_2_2 )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7168:2: rule__IdentifierOrFuncTok__ParamsAssignment_2_2

+						{

+							pushFollow(FOLLOW_rule__IdentifierOrFuncTok__ParamsAssignment_2_2_in_rule__IdentifierOrFuncTok__Group_2__2__Impl14685);

+							rule__IdentifierOrFuncTok__ParamsAssignment_2_2();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getIdentifierOrFuncTokAccess().getParamsAssignment_2_2());

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7171:1: ( ( rule__IdentifierOrFuncTok__ParamsAssignment_2_2 )* )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7172:1: ( rule__IdentifierOrFuncTok__ParamsAssignment_2_2 )*

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getIdentifierOrFuncTokAccess().getParamsAssignment_2_2());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7173:1: ( rule__IdentifierOrFuncTok__ParamsAssignment_2_2 )*

+						loop81: do {

+							int alt81 = 2;

+							int LA81_0 = input.LA(1);

+

+							if (((LA81_0 >= RULE_CSSSTRING && LA81_0 <= RULE_UNDERSCORE) || (LA81_0 >= RULE_HASHMARK && LA81_0 <= RULE_WS) || LA81_0 == 39 || (LA81_0 >= 49 && LA81_0 <= 52) || LA81_0 == 64)) {

+								alt81 = 1;

+							}

+

+

+							switch (alt81) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7173:2: rule__IdentifierOrFuncTok__ParamsAssignment_2_2

+							{

+								pushFollow(FOLLOW_rule__IdentifierOrFuncTok__ParamsAssignment_2_2_in_rule__IdentifierOrFuncTok__Group_2__2__Impl14697);

+								rule__IdentifierOrFuncTok__ParamsAssignment_2_2();

+

+								state._fsp--;

+								if (state.failed) {

+									return;

+								}

+

+							}

+								break;

+

+							default:

+								break loop81;

+							}

+						} while (true);

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getIdentifierOrFuncTokAccess().getParamsAssignment_2_2());

+						}

+

+					}

+

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group_2__2__Impl"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group_2__3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7184:1: rule__IdentifierOrFuncTok__Group_2__3 : rule__IdentifierOrFuncTok__Group_2__3__Impl ;

+	public final void rule__IdentifierOrFuncTok__Group_2__3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7188:1: ( rule__IdentifierOrFuncTok__Group_2__3__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7189:2: rule__IdentifierOrFuncTok__Group_2__3__Impl

+			{

+				pushFollow(FOLLOW_rule__IdentifierOrFuncTok__Group_2__3__Impl_in_rule__IdentifierOrFuncTok__Group_2__314730);

+				rule__IdentifierOrFuncTok__Group_2__3__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group_2__3"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__Group_2__3__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7195:1: rule__IdentifierOrFuncTok__Group_2__3__Impl : ( ')' ) ;

+	public final void rule__IdentifierOrFuncTok__Group_2__3__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7199:1: ( ( ')' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7200:1: ( ')' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7200:1: ( ')' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7201:1: ')'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierOrFuncTokAccess().getRightParenthesisKeyword_2_3());

+					}

+					match(input, 61, FOLLOW_61_in_rule__IdentifierOrFuncTok__Group_2__3__Impl14758);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierOrFuncTokAccess().getRightParenthesisKeyword_2_3());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__Group_2__3__Impl"

+

+

+	// $ANTLR start "rule__URLType__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7222:1: rule__URLType__Group__0 : rule__URLType__Group__0__Impl rule__URLType__Group__1 ;

+	public final void rule__URLType__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7226:1: ( rule__URLType__Group__0__Impl rule__URLType__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7227:2: rule__URLType__Group__0__Impl rule__URLType__Group__1

+			{

+				pushFollow(FOLLOW_rule__URLType__Group__0__Impl_in_rule__URLType__Group__014797);

+				rule__URLType__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__URLType__Group__1_in_rule__URLType__Group__014800);

+				rule__URLType__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__URLType__Group__0"

+

+

+	// $ANTLR start "rule__URLType__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7234:1: rule__URLType__Group__0__Impl : ( 'url(' ) ;

+	public final void rule__URLType__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7238:1: ( ( 'url(' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7239:1: ( 'url(' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7239:1: ( 'url(' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7240:1: 'url('

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getURLTypeAccess().getUrlKeyword_0());

+					}

+					match(input, 64, FOLLOW_64_in_rule__URLType__Group__0__Impl14828);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getURLTypeAccess().getUrlKeyword_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__URLType__Group__0__Impl"

+

+

+	// $ANTLR start "rule__URLType__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7253:1: rule__URLType__Group__1 : rule__URLType__Group__1__Impl rule__URLType__Group__2 ;

+	public final void rule__URLType__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7257:1: ( rule__URLType__Group__1__Impl rule__URLType__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7258:2: rule__URLType__Group__1__Impl rule__URLType__Group__2

+			{

+				pushFollow(FOLLOW_rule__URLType__Group__1__Impl_in_rule__URLType__Group__114859);

+				rule__URLType__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__URLType__Group__2_in_rule__URLType__Group__114862);

+				rule__URLType__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__URLType__Group__1"

+

+

+	// $ANTLR start "rule__URLType__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7265:1: rule__URLType__Group__1__Impl : ( ( rule__URLType__UrlAssignment_1 ) ) ;

+	public final void rule__URLType__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7269:1: ( ( ( rule__URLType__UrlAssignment_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7270:1: ( ( rule__URLType__UrlAssignment_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7270:1: ( ( rule__URLType__UrlAssignment_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7271:1: ( rule__URLType__UrlAssignment_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getURLTypeAccess().getUrlAssignment_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7272:1: ( rule__URLType__UrlAssignment_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7272:2: rule__URLType__UrlAssignment_1

+					{

+						pushFollow(FOLLOW_rule__URLType__UrlAssignment_1_in_rule__URLType__Group__1__Impl14889);

+						rule__URLType__UrlAssignment_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getURLTypeAccess().getUrlAssignment_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__URLType__Group__1__Impl"

+

+

+	// $ANTLR start "rule__URLType__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7282:1: rule__URLType__Group__2 : rule__URLType__Group__2__Impl ;

+	public final void rule__URLType__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7286:1: ( rule__URLType__Group__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7287:2: rule__URLType__Group__2__Impl

+			{

+				pushFollow(FOLLOW_rule__URLType__Group__2__Impl_in_rule__URLType__Group__214919);

+				rule__URLType__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__URLType__Group__2"

+

+

+	// $ANTLR start "rule__URLType__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7293:1: rule__URLType__Group__2__Impl : ( ')' ) ;

+	public final void rule__URLType__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7297:1: ( ( ')' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7298:1: ( ')' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7298:1: ( ')' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7299:1: ')'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getURLTypeAccess().getRightParenthesisKeyword_2());

+					}

+					match(input, 61, FOLLOW_61_in_rule__URLType__Group__2__Impl14947);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getURLTypeAccess().getRightParenthesisKeyword_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__URLType__Group__2__Impl"

+

+

+	// $ANTLR start "rule__ValidURLSymbol__Group_18__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7318:1: rule__ValidURLSymbol__Group_18__0 : rule__ValidURLSymbol__Group_18__0__Impl

+	// rule__ValidURLSymbol__Group_18__1 ;

+	public final void rule__ValidURLSymbol__Group_18__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7322:1: ( rule__ValidURLSymbol__Group_18__0__Impl rule__ValidURLSymbol__Group_18__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7323:2: rule__ValidURLSymbol__Group_18__0__Impl rule__ValidURLSymbol__Group_18__1

+			{

+				pushFollow(FOLLOW_rule__ValidURLSymbol__Group_18__0__Impl_in_rule__ValidURLSymbol__Group_18__014984);

+				rule__ValidURLSymbol__Group_18__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__ValidURLSymbol__Group_18__1_in_rule__ValidURLSymbol__Group_18__014987);

+				rule__ValidURLSymbol__Group_18__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURLSymbol__Group_18__0"

+

+

+	// $ANTLR start "rule__ValidURLSymbol__Group_18__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7330:1: rule__ValidURLSymbol__Group_18__0__Impl : ( '=' ) ;

+	public final void rule__ValidURLSymbol__Group_18__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7334:1: ( ( '=' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7335:1: ( '=' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7335:1: ( '=' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7336:1: '='

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getEqualsSignKeyword_18_0());

+					}

+					match(input, 35, FOLLOW_35_in_rule__ValidURLSymbol__Group_18__0__Impl15015);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getEqualsSignKeyword_18_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURLSymbol__Group_18__0__Impl"

+

+

+	// $ANTLR start "rule__ValidURLSymbol__Group_18__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7349:1: rule__ValidURLSymbol__Group_18__1 : rule__ValidURLSymbol__Group_18__1__Impl ;

+	public final void rule__ValidURLSymbol__Group_18__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7353:1: ( rule__ValidURLSymbol__Group_18__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7354:2: rule__ValidURLSymbol__Group_18__1__Impl

+			{

+				pushFollow(FOLLOW_rule__ValidURLSymbol__Group_18__1__Impl_in_rule__ValidURLSymbol__Group_18__115046);

+				rule__ValidURLSymbol__Group_18__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURLSymbol__Group_18__1"

+

+

+	// $ANTLR start "rule__ValidURLSymbol__Group_18__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7360:1: rule__ValidURLSymbol__Group_18__1__Impl : ( ruleKeywordHack ) ;

+	public final void rule__ValidURLSymbol__Group_18__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7364:1: ( ( ruleKeywordHack ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7365:1: ( ruleKeywordHack )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7365:1: ( ruleKeywordHack )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7366:1: ruleKeywordHack

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLSymbolAccess().getKeywordHackParserRuleCall_18_1());

+					}

+					pushFollow(FOLLOW_ruleKeywordHack_in_rule__ValidURLSymbol__Group_18__1__Impl15073);

+					ruleKeywordHack();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLSymbolAccess().getKeywordHackParserRuleCall_18_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURLSymbol__Group_18__1__Impl"

+

+

+	// $ANTLR start "rule__ValidURL__Group_1_10__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7381:1: rule__ValidURL__Group_1_10__0 : rule__ValidURL__Group_1_10__0__Impl rule__ValidURL__Group_1_10__1 ;

+	public final void rule__ValidURL__Group_1_10__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7385:1: ( rule__ValidURL__Group_1_10__0__Impl rule__ValidURL__Group_1_10__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7386:2: rule__ValidURL__Group_1_10__0__Impl rule__ValidURL__Group_1_10__1

+			{

+				pushFollow(FOLLOW_rule__ValidURL__Group_1_10__0__Impl_in_rule__ValidURL__Group_1_10__015106);

+				rule__ValidURL__Group_1_10__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__ValidURL__Group_1_10__1_in_rule__ValidURL__Group_1_10__015109);

+				rule__ValidURL__Group_1_10__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURL__Group_1_10__0"

+

+

+	// $ANTLR start "rule__ValidURL__Group_1_10__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7393:1: rule__ValidURL__Group_1_10__0__Impl : ( RULE_PERCENT ) ;

+	public final void rule__ValidURL__Group_1_10__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7397:1: ( ( RULE_PERCENT ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7398:1: ( RULE_PERCENT )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7398:1: ( RULE_PERCENT )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7399:1: RULE_PERCENT

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getPERCENTTerminalRuleCall_1_10_0());

+					}

+					match(input, RULE_PERCENT, FOLLOW_RULE_PERCENT_in_rule__ValidURL__Group_1_10__0__Impl15136);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getPERCENTTerminalRuleCall_1_10_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURL__Group_1_10__0__Impl"

+

+

+	// $ANTLR start "rule__ValidURL__Group_1_10__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7410:1: rule__ValidURL__Group_1_10__1 : rule__ValidURL__Group_1_10__1__Impl rule__ValidURL__Group_1_10__2 ;

+	public final void rule__ValidURL__Group_1_10__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7414:1: ( rule__ValidURL__Group_1_10__1__Impl rule__ValidURL__Group_1_10__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7415:2: rule__ValidURL__Group_1_10__1__Impl rule__ValidURL__Group_1_10__2

+			{

+				pushFollow(FOLLOW_rule__ValidURL__Group_1_10__1__Impl_in_rule__ValidURL__Group_1_10__115165);

+				rule__ValidURL__Group_1_10__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__ValidURL__Group_1_10__2_in_rule__ValidURL__Group_1_10__115168);

+				rule__ValidURL__Group_1_10__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURL__Group_1_10__1"

+

+

+	// $ANTLR start "rule__ValidURL__Group_1_10__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7422:1: rule__ValidURL__Group_1_10__1__Impl : ( ( rule__ValidURL__Alternatives_1_10_1 ) ) ;

+	public final void rule__ValidURL__Group_1_10__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7426:1: ( ( ( rule__ValidURL__Alternatives_1_10_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7427:1: ( ( rule__ValidURL__Alternatives_1_10_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7427:1: ( ( rule__ValidURL__Alternatives_1_10_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7428:1: ( rule__ValidURL__Alternatives_1_10_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getAlternatives_1_10_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7429:1: ( rule__ValidURL__Alternatives_1_10_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7429:2: rule__ValidURL__Alternatives_1_10_1

+					{

+						pushFollow(FOLLOW_rule__ValidURL__Alternatives_1_10_1_in_rule__ValidURL__Group_1_10__1__Impl15195);

+						rule__ValidURL__Alternatives_1_10_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getAlternatives_1_10_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURL__Group_1_10__1__Impl"

+

+

+	// $ANTLR start "rule__ValidURL__Group_1_10__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7439:1: rule__ValidURL__Group_1_10__2 : rule__ValidURL__Group_1_10__2__Impl ;

+	public final void rule__ValidURL__Group_1_10__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7443:1: ( rule__ValidURL__Group_1_10__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7444:2: rule__ValidURL__Group_1_10__2__Impl

+			{

+				pushFollow(FOLLOW_rule__ValidURL__Group_1_10__2__Impl_in_rule__ValidURL__Group_1_10__215225);

+				rule__ValidURL__Group_1_10__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURL__Group_1_10__2"

+

+

+	// $ANTLR start "rule__ValidURL__Group_1_10__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7450:1: rule__ValidURL__Group_1_10__2__Impl : ( ( rule__ValidURL__Alternatives_1_10_2 ) ) ;

+	public final void rule__ValidURL__Group_1_10__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7454:1: ( ( ( rule__ValidURL__Alternatives_1_10_2 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7455:1: ( ( rule__ValidURL__Alternatives_1_10_2 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7455:1: ( ( rule__ValidURL__Alternatives_1_10_2 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7456:1: ( rule__ValidURL__Alternatives_1_10_2 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getValidURLAccess().getAlternatives_1_10_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7457:1: ( rule__ValidURL__Alternatives_1_10_2 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7457:2: rule__ValidURL__Alternatives_1_10_2

+					{

+						pushFollow(FOLLOW_rule__ValidURL__Alternatives_1_10_2_in_rule__ValidURL__Group_1_10__2__Impl15252);

+						rule__ValidURL__Alternatives_1_10_2();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getValidURLAccess().getAlternatives_1_10_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ValidURL__Group_1_10__2__Impl"

+

+

+	// $ANTLR start "rule__Identifier__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7473:1: rule__Identifier__Group__0 : rule__Identifier__Group__0__Impl rule__Identifier__Group__1 ;

+	public final void rule__Identifier__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7477:1: ( rule__Identifier__Group__0__Impl rule__Identifier__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7478:2: rule__Identifier__Group__0__Impl rule__Identifier__Group__1

+			{

+				pushFollow(FOLLOW_rule__Identifier__Group__0__Impl_in_rule__Identifier__Group__015288);

+				rule__Identifier__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Identifier__Group__1_in_rule__Identifier__Group__015291);

+				rule__Identifier__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Identifier__Group__0"

+

+

+	// $ANTLR start "rule__Identifier__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7485:1: rule__Identifier__Group__0__Impl : ( ( RULE_DASH )? ) ;

+	public final void rule__Identifier__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7489:1: ( ( ( RULE_DASH )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7490:1: ( ( RULE_DASH )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7490:1: ( ( RULE_DASH )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7491:1: ( RULE_DASH )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7492:1: ( RULE_DASH )?

+					int alt82 = 2;

+					int LA82_0 = input.LA(1);

+

+					if ((LA82_0 == RULE_DASH)) {

+						alt82 = 1;

+					}

+					switch (alt82) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7492:3: RULE_DASH

+					{

+						match(input, RULE_DASH, FOLLOW_RULE_DASH_in_rule__Identifier__Group__0__Impl15319);

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Identifier__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Identifier__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7502:1: rule__Identifier__Group__1 : rule__Identifier__Group__1__Impl rule__Identifier__Group__2 ;

+	public final void rule__Identifier__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7506:1: ( rule__Identifier__Group__1__Impl rule__Identifier__Group__2 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7507:2: rule__Identifier__Group__1__Impl rule__Identifier__Group__2

+			{

+				pushFollow(FOLLOW_rule__Identifier__Group__1__Impl_in_rule__Identifier__Group__115350);

+				rule__Identifier__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Identifier__Group__2_in_rule__Identifier__Group__115353);

+				rule__Identifier__Group__2();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Identifier__Group__1"

+

+

+	// $ANTLR start "rule__Identifier__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7514:1: rule__Identifier__Group__1__Impl : ( ( rule__Identifier__Alternatives_1 ) ) ;

+	public final void rule__Identifier__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7518:1: ( ( ( rule__Identifier__Alternatives_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7519:1: ( ( rule__Identifier__Alternatives_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7519:1: ( ( rule__Identifier__Alternatives_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7520:1: ( rule__Identifier__Alternatives_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getAlternatives_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7521:1: ( rule__Identifier__Alternatives_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7521:2: rule__Identifier__Alternatives_1

+					{

+						pushFollow(FOLLOW_rule__Identifier__Alternatives_1_in_rule__Identifier__Group__1__Impl15380);

+						rule__Identifier__Alternatives_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getAlternatives_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Identifier__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Identifier__Group__2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7531:1: rule__Identifier__Group__2 : rule__Identifier__Group__2__Impl ;

+	public final void rule__Identifier__Group__2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7535:1: ( rule__Identifier__Group__2__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7536:2: rule__Identifier__Group__2__Impl

+			{

+				pushFollow(FOLLOW_rule__Identifier__Group__2__Impl_in_rule__Identifier__Group__215410);

+				rule__Identifier__Group__2__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Identifier__Group__2"

+

+

+	// $ANTLR start "rule__Identifier__Group__2__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7542:1: rule__Identifier__Group__2__Impl : ( ( rule__Identifier__Group_2__0 )* ) ;

+	public final void rule__Identifier__Group__2__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7546:1: ( ( ( rule__Identifier__Group_2__0 )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7547:1: ( ( rule__Identifier__Group_2__0 )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7547:1: ( ( rule__Identifier__Group_2__0 )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7548:1: ( rule__Identifier__Group_2__0 )*

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getGroup_2());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7549:1: ( rule__Identifier__Group_2__0 )*

+					loop83: do {

+						int alt83 = 2;

+						alt83 = dfa83.predict(input);

+						switch (alt83) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7549:2: rule__Identifier__Group_2__0

+						{

+							pushFollow(FOLLOW_rule__Identifier__Group_2__0_in_rule__Identifier__Group__2__Impl15437);

+							rule__Identifier__Group_2__0();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+							break;

+

+						default:

+							break loop83;

+						}

+					} while (true);

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getGroup_2());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Identifier__Group__2__Impl"

+

+

+	// $ANTLR start "rule__Identifier__Group_2__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7565:1: rule__Identifier__Group_2__0 : rule__Identifier__Group_2__0__Impl ;

+	public final void rule__Identifier__Group_2__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7569:1: ( rule__Identifier__Group_2__0__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7570:2: rule__Identifier__Group_2__0__Impl

+			{

+				pushFollow(FOLLOW_rule__Identifier__Group_2__0__Impl_in_rule__Identifier__Group_2__015474);

+				rule__Identifier__Group_2__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Identifier__Group_2__0"

+

+

+	// $ANTLR start "rule__Identifier__Group_2__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7576:1: rule__Identifier__Group_2__0__Impl : ( ( rule__Identifier__Alternatives_2_0 ) ) ;

+	public final void rule__Identifier__Group_2__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7580:1: ( ( ( rule__Identifier__Alternatives_2_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7581:1: ( ( rule__Identifier__Alternatives_2_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7581:1: ( ( rule__Identifier__Alternatives_2_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7582:1: ( rule__Identifier__Alternatives_2_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierAccess().getAlternatives_2_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7583:1: ( rule__Identifier__Alternatives_2_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7583:2: rule__Identifier__Alternatives_2_0

+					{

+						pushFollow(FOLLOW_rule__Identifier__Alternatives_2_0_in_rule__Identifier__Group_2__0__Impl15501);

+						rule__Identifier__Alternatives_2_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierAccess().getAlternatives_2_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Identifier__Group_2__0__Impl"

+

+

+	// $ANTLR start "rule__Num__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7595:1: rule__Num__Group__0 : rule__Num__Group__0__Impl rule__Num__Group__1 ;

+	public final void rule__Num__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7599:1: ( rule__Num__Group__0__Impl rule__Num__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7600:2: rule__Num__Group__0__Impl rule__Num__Group__1

+			{

+				pushFollow(FOLLOW_rule__Num__Group__0__Impl_in_rule__Num__Group__015533);

+				rule__Num__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Num__Group__1_in_rule__Num__Group__015536);

+				rule__Num__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group__0"

+

+

+	// $ANTLR start "rule__Num__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7607:1: rule__Num__Group__0__Impl : ( ( rule__Num__Alternatives_0 )? ) ;

+	public final void rule__Num__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7611:1: ( ( ( rule__Num__Alternatives_0 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7612:1: ( ( rule__Num__Alternatives_0 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7612:1: ( ( rule__Num__Alternatives_0 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7613:1: ( rule__Num__Alternatives_0 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumAccess().getAlternatives_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7614:1: ( rule__Num__Alternatives_0 )?

+					int alt84 = 2;

+					int LA84_0 = input.LA(1);

+

+					if ((LA84_0 == RULE_PLUS || LA84_0 == RULE_DASH)) {

+						alt84 = 1;

+					}

+					switch (alt84) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7614:2: rule__Num__Alternatives_0

+					{

+						pushFollow(FOLLOW_rule__Num__Alternatives_0_in_rule__Num__Group__0__Impl15563);

+						rule__Num__Alternatives_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumAccess().getAlternatives_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Num__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7624:1: rule__Num__Group__1 : rule__Num__Group__1__Impl ;

+	public final void rule__Num__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7628:1: ( rule__Num__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7629:2: rule__Num__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Num__Group__1__Impl_in_rule__Num__Group__115594);

+				rule__Num__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group__1"

+

+

+	// $ANTLR start "rule__Num__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7635:1: rule__Num__Group__1__Impl : ( ( rule__Num__Alternatives_1 ) ) ;

+	public final void rule__Num__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7639:1: ( ( ( rule__Num__Alternatives_1 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7640:1: ( ( rule__Num__Alternatives_1 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7640:1: ( ( rule__Num__Alternatives_1 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7641:1: ( rule__Num__Alternatives_1 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumAccess().getAlternatives_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7642:1: ( rule__Num__Alternatives_1 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7642:2: rule__Num__Alternatives_1

+					{

+						pushFollow(FOLLOW_rule__Num__Alternatives_1_in_rule__Num__Group__1__Impl15621);

+						rule__Num__Alternatives_1();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumAccess().getAlternatives_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Num__Group_1_0__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7656:1: rule__Num__Group_1_0__0 : rule__Num__Group_1_0__0__Impl rule__Num__Group_1_0__1 ;

+	public final void rule__Num__Group_1_0__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7660:1: ( rule__Num__Group_1_0__0__Impl rule__Num__Group_1_0__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7661:2: rule__Num__Group_1_0__0__Impl rule__Num__Group_1_0__1

+			{

+				pushFollow(FOLLOW_rule__Num__Group_1_0__0__Impl_in_rule__Num__Group_1_0__015655);

+				rule__Num__Group_1_0__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Num__Group_1_0__1_in_rule__Num__Group_1_0__015658);

+				rule__Num__Group_1_0__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group_1_0__0"

+

+

+	// $ANTLR start "rule__Num__Group_1_0__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7668:1: rule__Num__Group_1_0__0__Impl : ( '.' ) ;

+	public final void rule__Num__Group_1_0__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7672:1: ( ( '.' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7673:1: ( '.' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7673:1: ( '.' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7674:1: '.'

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumAccess().getFullStopKeyword_1_0_0());

+					}

+					match(input, 39, FOLLOW_39_in_rule__Num__Group_1_0__0__Impl15686);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumAccess().getFullStopKeyword_1_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group_1_0__0__Impl"

+

+

+	// $ANTLR start "rule__Num__Group_1_0__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7687:1: rule__Num__Group_1_0__1 : rule__Num__Group_1_0__1__Impl ;

+	public final void rule__Num__Group_1_0__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7691:1: ( rule__Num__Group_1_0__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7692:2: rule__Num__Group_1_0__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Num__Group_1_0__1__Impl_in_rule__Num__Group_1_0__115717);

+				rule__Num__Group_1_0__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group_1_0__1"

+

+

+	// $ANTLR start "rule__Num__Group_1_0__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7698:1: rule__Num__Group_1_0__1__Impl : ( ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* ) ) ;

+	public final void rule__Num__Group_1_0__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7702:1: ( ( ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7703:1: ( ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7703:1: ( ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7704:1: ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7704:1: ( ( RULE_ONE_INT ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7705:1: ( RULE_ONE_INT )

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_0_1());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7706:1: ( RULE_ONE_INT )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7706:3: RULE_ONE_INT

+						{

+							match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_rule__Num__Group_1_0__1__Impl15747);

+							if (state.failed) {

+								return;

+							}

+

+						}

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_0_1());

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7709:1: ( ( RULE_ONE_INT )* )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7710:1: ( RULE_ONE_INT )*

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_0_1());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7711:1: ( RULE_ONE_INT )*

+						loop85: do {

+							int alt85 = 2;

+							int LA85_0 = input.LA(1);

+

+							if ((LA85_0 == RULE_ONE_INT)) {

+								int LA85_2 = input.LA(2);

+

+								if ((synpred136_InternalCSS())) {

+									alt85 = 1;

+								}

+

+

+							}

+

+

+							switch (alt85) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7711:3: RULE_ONE_INT

+							{

+								match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_rule__Num__Group_1_0__1__Impl15760);

+								if (state.failed) {

+									return;

+								}

+

+							}

+								break;

+

+							default:

+								break loop85;

+							}

+						} while (true);

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_0_1());

+						}

+

+					}

+

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group_1_0__1__Impl"

+

+

+	// $ANTLR start "rule__Num__Group_1_1__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7726:1: rule__Num__Group_1_1__0 : rule__Num__Group_1_1__0__Impl rule__Num__Group_1_1__1 ;

+	public final void rule__Num__Group_1_1__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7730:1: ( rule__Num__Group_1_1__0__Impl rule__Num__Group_1_1__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7731:2: rule__Num__Group_1_1__0__Impl rule__Num__Group_1_1__1

+			{

+				pushFollow(FOLLOW_rule__Num__Group_1_1__0__Impl_in_rule__Num__Group_1_1__015797);

+				rule__Num__Group_1_1__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Num__Group_1_1__1_in_rule__Num__Group_1_1__015800);

+				rule__Num__Group_1_1__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group_1_1__0"

+

+

+	// $ANTLR start "rule__Num__Group_1_1__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7738:1: rule__Num__Group_1_1__0__Impl : ( ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* ) ) ;

+	public final void rule__Num__Group_1_1__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7742:1: ( ( ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7743:1: ( ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7743:1: ( ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7744:1: ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7744:1: ( ( RULE_ONE_INT ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7745:1: ( RULE_ONE_INT )

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_0());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7746:1: ( RULE_ONE_INT )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7746:3: RULE_ONE_INT

+						{

+							match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_rule__Num__Group_1_1__0__Impl15830);

+							if (state.failed) {

+								return;

+							}

+

+						}

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_0());

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7749:1: ( ( RULE_ONE_INT )* )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7750:1: ( RULE_ONE_INT )*

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_0());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7751:1: ( RULE_ONE_INT )*

+						loop86: do {

+							int alt86 = 2;

+							int LA86_0 = input.LA(1);

+

+							if ((LA86_0 == RULE_ONE_INT)) {

+								int LA86_2 = input.LA(2);

+

+								if ((synpred137_InternalCSS())) {

+									alt86 = 1;

+								}

+

+

+							}

+

+

+							switch (alt86) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7751:3: RULE_ONE_INT

+							{

+								match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_rule__Num__Group_1_1__0__Impl15843);

+								if (state.failed) {

+									return;

+								}

+

+							}

+								break;

+

+							default:

+								break loop86;

+							}

+						} while (true);

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_0());

+						}

+

+					}

+

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group_1_1__0__Impl"

+

+

+	// $ANTLR start "rule__Num__Group_1_1__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7762:1: rule__Num__Group_1_1__1 : rule__Num__Group_1_1__1__Impl ;

+	public final void rule__Num__Group_1_1__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7766:1: ( rule__Num__Group_1_1__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7767:2: rule__Num__Group_1_1__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Num__Group_1_1__1__Impl_in_rule__Num__Group_1_1__115876);

+				rule__Num__Group_1_1__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group_1_1__1"

+

+

+	// $ANTLR start "rule__Num__Group_1_1__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7773:1: rule__Num__Group_1_1__1__Impl : ( ( rule__Num__Group_1_1_1__0 )? ) ;

+	public final void rule__Num__Group_1_1__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7777:1: ( ( ( rule__Num__Group_1_1_1__0 )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7778:1: ( ( rule__Num__Group_1_1_1__0 )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7778:1: ( ( rule__Num__Group_1_1_1__0 )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7779:1: ( rule__Num__Group_1_1_1__0 )?

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumAccess().getGroup_1_1_1());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7780:1: ( rule__Num__Group_1_1_1__0 )?

+					int alt87 = 2;

+					int LA87_0 = input.LA(1);

+

+					if ((LA87_0 == 39)) {

+						int LA87_1 = input.LA(2);

+

+						if ((LA87_1 == RULE_ONE_INT)) {

+							int LA87_3 = input.LA(3);

+

+							if ((synpred138_InternalCSS())) {

+								alt87 = 1;

+							}

+						}

+					}

+					switch (alt87) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7780:2: rule__Num__Group_1_1_1__0

+					{

+						pushFollow(FOLLOW_rule__Num__Group_1_1_1__0_in_rule__Num__Group_1_1__1__Impl15903);

+						rule__Num__Group_1_1_1__0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumAccess().getGroup_1_1_1());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group_1_1__1__Impl"

+

+

+	// $ANTLR start "rule__Num__Group_1_1_1__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7794:1: rule__Num__Group_1_1_1__0 : rule__Num__Group_1_1_1__0__Impl rule__Num__Group_1_1_1__1 ;

+	public final void rule__Num__Group_1_1_1__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7798:1: ( rule__Num__Group_1_1_1__0__Impl rule__Num__Group_1_1_1__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7799:2: rule__Num__Group_1_1_1__0__Impl rule__Num__Group_1_1_1__1

+			{

+				pushFollow(FOLLOW_rule__Num__Group_1_1_1__0__Impl_in_rule__Num__Group_1_1_1__015938);

+				rule__Num__Group_1_1_1__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Num__Group_1_1_1__1_in_rule__Num__Group_1_1_1__015941);

+				rule__Num__Group_1_1_1__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group_1_1_1__0"

+

+

+	// $ANTLR start "rule__Num__Group_1_1_1__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7806:1: rule__Num__Group_1_1_1__0__Impl : ( ( '.' ) ) ;

+	public final void rule__Num__Group_1_1_1__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7810:1: ( ( ( '.' ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7811:1: ( ( '.' ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7811:1: ( ( '.' ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7812:1: ( '.' )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumAccess().getFullStopKeyword_1_1_1_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7813:1: ( '.' )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7814:2: '.'

+					{

+						match(input, 39, FOLLOW_39_in_rule__Num__Group_1_1_1__0__Impl15970);

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumAccess().getFullStopKeyword_1_1_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group_1_1_1__0__Impl"

+

+

+	// $ANTLR start "rule__Num__Group_1_1_1__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7825:1: rule__Num__Group_1_1_1__1 : rule__Num__Group_1_1_1__1__Impl ;

+	public final void rule__Num__Group_1_1_1__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7829:1: ( rule__Num__Group_1_1_1__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7830:2: rule__Num__Group_1_1_1__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Num__Group_1_1_1__1__Impl_in_rule__Num__Group_1_1_1__116002);

+				rule__Num__Group_1_1_1__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group_1_1_1__1"

+

+

+	// $ANTLR start "rule__Num__Group_1_1_1__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7836:1: rule__Num__Group_1_1_1__1__Impl : ( ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* ) ) ;

+	public final void rule__Num__Group_1_1_1__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7840:1: ( ( ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7841:1: ( ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7841:1: ( ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7842:1: ( ( RULE_ONE_INT ) ) ( ( RULE_ONE_INT )* )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7842:1: ( ( RULE_ONE_INT ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7843:1: ( RULE_ONE_INT )

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_1_1());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7844:1: ( RULE_ONE_INT )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7844:3: RULE_ONE_INT

+						{

+							match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_rule__Num__Group_1_1_1__1__Impl16032);

+							if (state.failed) {

+								return;

+							}

+

+						}

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_1_1());

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7847:1: ( ( RULE_ONE_INT )* )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7848:1: ( RULE_ONE_INT )*

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_1_1());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7849:1: ( RULE_ONE_INT )*

+						loop88: do {

+							int alt88 = 2;

+							int LA88_0 = input.LA(1);

+

+							if ((LA88_0 == RULE_ONE_INT)) {

+								int LA88_2 = input.LA(2);

+

+								if ((synpred139_InternalCSS())) {

+									alt88 = 1;

+								}

+

+

+							}

+

+

+							switch (alt88) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7849:3: RULE_ONE_INT

+							{

+								match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_rule__Num__Group_1_1_1__1__Impl16045);

+								if (state.failed) {

+									return;

+								}

+

+							}

+								break;

+

+							default:

+								break loop88;

+							}

+						} while (true);

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_1_1());

+						}

+

+					}

+

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Num__Group_1_1_1__1__Impl"

+

+

+	// $ANTLR start "rule__Hex__Group__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7864:1: rule__Hex__Group__0 : rule__Hex__Group__0__Impl rule__Hex__Group__1 ;

+	public final void rule__Hex__Group__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7868:1: ( rule__Hex__Group__0__Impl rule__Hex__Group__1 )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7869:2: rule__Hex__Group__0__Impl rule__Hex__Group__1

+			{

+				pushFollow(FOLLOW_rule__Hex__Group__0__Impl_in_rule__Hex__Group__016082);

+				rule__Hex__Group__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+				pushFollow(FOLLOW_rule__Hex__Group__1_in_rule__Hex__Group__016085);

+				rule__Hex__Group__1();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Hex__Group__0"

+

+

+	// $ANTLR start "rule__Hex__Group__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7876:1: rule__Hex__Group__0__Impl : ( RULE_HASHMARK ) ;

+	public final void rule__Hex__Group__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7880:1: ( ( RULE_HASHMARK ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7881:1: ( RULE_HASHMARK )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7881:1: ( RULE_HASHMARK )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7882:1: RULE_HASHMARK

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getHexAccess().getHASHMARKTerminalRuleCall_0());

+					}

+					match(input, RULE_HASHMARK, FOLLOW_RULE_HASHMARK_in_rule__Hex__Group__0__Impl16112);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getHexAccess().getHASHMARKTerminalRuleCall_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Hex__Group__0__Impl"

+

+

+	// $ANTLR start "rule__Hex__Group__1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7893:1: rule__Hex__Group__1 : rule__Hex__Group__1__Impl ;

+	public final void rule__Hex__Group__1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7897:1: ( rule__Hex__Group__1__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7898:2: rule__Hex__Group__1__Impl

+			{

+				pushFollow(FOLLOW_rule__Hex__Group__1__Impl_in_rule__Hex__Group__116141);

+				rule__Hex__Group__1__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Hex__Group__1"

+

+

+	// $ANTLR start "rule__Hex__Group__1__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7904:1: rule__Hex__Group__1__Impl : ( ( ( rule__Hex__Group_1__0 ) ) ( ( rule__Hex__Group_1__0 )* ) ) ;

+	public final void rule__Hex__Group__1__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7908:1: ( ( ( ( rule__Hex__Group_1__0 ) ) ( ( rule__Hex__Group_1__0 )* ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7909:1: ( ( ( rule__Hex__Group_1__0 ) ) ( ( rule__Hex__Group_1__0 )* ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7909:1: ( ( ( rule__Hex__Group_1__0 ) ) ( ( rule__Hex__Group_1__0 )* ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7910:1: ( ( rule__Hex__Group_1__0 ) ) ( ( rule__Hex__Group_1__0 )* )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7910:1: ( ( rule__Hex__Group_1__0 ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7911:1: ( rule__Hex__Group_1__0 )

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getHexAccess().getGroup_1());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7912:1: ( rule__Hex__Group_1__0 )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7912:2: rule__Hex__Group_1__0

+						{

+							pushFollow(FOLLOW_rule__Hex__Group_1__0_in_rule__Hex__Group__1__Impl16170);

+							rule__Hex__Group_1__0();

+

+							state._fsp--;

+							if (state.failed) {

+								return;

+							}

+

+						}

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getHexAccess().getGroup_1());

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7915:1: ( ( rule__Hex__Group_1__0 )* )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7916:1: ( rule__Hex__Group_1__0 )*

+					{

+						if (state.backtracking == 0) {

+							before(grammarAccess.getHexAccess().getGroup_1());

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7917:1: ( rule__Hex__Group_1__0 )*

+						loop89: do {

+							int alt89 = 2;

+							int LA89_0 = input.LA(1);

+

+							if ((LA89_0 == RULE_ONE_HEX_LETTER)) {

+								int LA89_2 = input.LA(2);

+

+								if ((synpred140_InternalCSS())) {

+									alt89 = 1;

+								}

+

+

+							}

+							else if ((LA89_0 == RULE_ONE_INT)) {

+								int LA89_3 = input.LA(2);

+

+								if ((synpred140_InternalCSS())) {

+									alt89 = 1;

+								}

+

+

+							}

+

+

+							switch (alt89) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7917:2: rule__Hex__Group_1__0

+							{

+								pushFollow(FOLLOW_rule__Hex__Group_1__0_in_rule__Hex__Group__1__Impl16182);

+								rule__Hex__Group_1__0();

+

+								state._fsp--;

+								if (state.failed) {

+									return;

+								}

+

+							}

+								break;

+

+							default:

+								break loop89;

+							}

+						} while (true);

+

+						if (state.backtracking == 0) {

+							after(grammarAccess.getHexAccess().getGroup_1());

+						}

+

+					}

+

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Hex__Group__1__Impl"

+

+

+	// $ANTLR start "rule__Hex__Group_1__0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7932:1: rule__Hex__Group_1__0 : rule__Hex__Group_1__0__Impl ;

+	public final void rule__Hex__Group_1__0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7936:1: ( rule__Hex__Group_1__0__Impl )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7937:2: rule__Hex__Group_1__0__Impl

+			{

+				pushFollow(FOLLOW_rule__Hex__Group_1__0__Impl_in_rule__Hex__Group_1__016219);

+				rule__Hex__Group_1__0__Impl();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Hex__Group_1__0"

+

+

+	// $ANTLR start "rule__Hex__Group_1__0__Impl"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7943:1: rule__Hex__Group_1__0__Impl : ( ( rule__Hex__Alternatives_1_0 ) ) ;

+	public final void rule__Hex__Group_1__0__Impl() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7947:1: ( ( ( rule__Hex__Alternatives_1_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7948:1: ( ( rule__Hex__Alternatives_1_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7948:1: ( ( rule__Hex__Alternatives_1_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7949:1: ( rule__Hex__Alternatives_1_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getHexAccess().getAlternatives_1_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7950:1: ( rule__Hex__Alternatives_1_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7950:2: rule__Hex__Alternatives_1_0

+					{

+						pushFollow(FOLLOW_rule__Hex__Alternatives_1_0_in_rule__Hex__Group_1__0__Impl16246);

+						rule__Hex__Alternatives_1_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getHexAccess().getAlternatives_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Hex__Group_1__0__Impl"

+

+

+	// $ANTLR start "rule__Stylesheet__CharsetAssignment_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7963:1: rule__Stylesheet__CharsetAssignment_0 : ( rulecharset ) ;

+	public final void rule__Stylesheet__CharsetAssignment_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7967:1: ( ( rulecharset ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7968:1: ( rulecharset )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7968:1: ( rulecharset )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7969:1: rulecharset

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getCharsetCharsetParserRuleCall_0_0());

+					}

+					pushFollow(FOLLOW_rulecharset_in_rule__Stylesheet__CharsetAssignment_016283);

+					rulecharset();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getCharsetCharsetParserRuleCall_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__CharsetAssignment_0"

+

+

+	// $ANTLR start "rule__Stylesheet__ImportsAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7978:1: rule__Stylesheet__ImportsAssignment_1 : ( ruleimportExpression ) ;

+	public final void rule__Stylesheet__ImportsAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7982:1: ( ( ruleimportExpression ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7983:1: ( ruleimportExpression )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7983:1: ( ruleimportExpression )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7984:1: ruleimportExpression

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getImportsImportExpressionParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_ruleimportExpression_in_rule__Stylesheet__ImportsAssignment_116314);

+					ruleimportExpression();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getImportsImportExpressionParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__ImportsAssignment_1"

+

+

+	// $ANTLR start "rule__Stylesheet__RulesetAssignment_2_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7993:1: rule__Stylesheet__RulesetAssignment_2_0 : ( ruleruleset ) ;

+	public final void rule__Stylesheet__RulesetAssignment_2_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7997:1: ( ( ruleruleset ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7998:1: ( ruleruleset )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7998:1: ( ruleruleset )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7999:1: ruleruleset

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getRulesetRulesetParserRuleCall_2_0_0());

+					}

+					pushFollow(FOLLOW_ruleruleset_in_rule__Stylesheet__RulesetAssignment_2_016345);

+					ruleruleset();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getRulesetRulesetParserRuleCall_2_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__RulesetAssignment_2_0"

+

+

+	// $ANTLR start "rule__Stylesheet__MediaAssignment_2_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8008:1: rule__Stylesheet__MediaAssignment_2_1 : ( rulemedia ) ;

+	public final void rule__Stylesheet__MediaAssignment_2_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8012:1: ( ( rulemedia ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8013:1: ( rulemedia )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8013:1: ( rulemedia )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8014:1: rulemedia

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getMediaMediaParserRuleCall_2_1_0());

+					}

+					pushFollow(FOLLOW_rulemedia_in_rule__Stylesheet__MediaAssignment_2_116376);

+					rulemedia();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getMediaMediaParserRuleCall_2_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__MediaAssignment_2_1"

+

+

+	// $ANTLR start "rule__Stylesheet__PageAssignment_2_2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8023:1: rule__Stylesheet__PageAssignment_2_2 : ( rulepage ) ;

+	public final void rule__Stylesheet__PageAssignment_2_2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8027:1: ( ( rulepage ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8028:1: ( rulepage )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8028:1: ( rulepage )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8029:1: rulepage

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getPagePageParserRuleCall_2_2_0());

+					}

+					pushFollow(FOLLOW_rulepage_in_rule__Stylesheet__PageAssignment_2_216407);

+					rulepage();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getPagePageParserRuleCall_2_2_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__PageAssignment_2_2"

+

+

+	// $ANTLR start "rule__Stylesheet__Font_faceAssignment_2_3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8038:1: rule__Stylesheet__Font_faceAssignment_2_3 : ( rulefont_face ) ;

+	public final void rule__Stylesheet__Font_faceAssignment_2_3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8042:1: ( ( rulefont_face ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8043:1: ( rulefont_face )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8043:1: ( rulefont_face )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8044:1: rulefont_face

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getFont_faceFont_faceParserRuleCall_2_3_0());

+					}

+					pushFollow(FOLLOW_rulefont_face_in_rule__Stylesheet__Font_faceAssignment_2_316438);

+					rulefont_face();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getFont_faceFont_faceParserRuleCall_2_3_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__Font_faceAssignment_2_3"

+

+

+	// $ANTLR start "rule__Stylesheet__KeyframesAssignment_2_4"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8053:1: rule__Stylesheet__KeyframesAssignment_2_4 : ( rulekeyframes ) ;

+	public final void rule__Stylesheet__KeyframesAssignment_2_4() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8057:1: ( ( rulekeyframes ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8058:1: ( rulekeyframes )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8058:1: ( rulekeyframes )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8059:1: rulekeyframes

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStylesheetAccess().getKeyframesKeyframesParserRuleCall_2_4_0());

+					}

+					pushFollow(FOLLOW_rulekeyframes_in_rule__Stylesheet__KeyframesAssignment_2_416469);

+					rulekeyframes();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStylesheetAccess().getKeyframesKeyframesParserRuleCall_2_4_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Stylesheet__KeyframesAssignment_2_4"

+

+

+	// $ANTLR start "rule__Charset__CharsetAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8068:1: rule__Charset__CharsetAssignment_1 : ( RULE_CSSSTRING ) ;

+	public final void rule__Charset__CharsetAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8072:1: ( ( RULE_CSSSTRING ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8073:1: ( RULE_CSSSTRING )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8073:1: ( RULE_CSSSTRING )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8074:1: RULE_CSSSTRING

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCharsetAccess().getCharsetCSSSTRINGTerminalRuleCall_1_0());

+					}

+					match(input, RULE_CSSSTRING, FOLLOW_RULE_CSSSTRING_in_rule__Charset__CharsetAssignment_116500);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCharsetAccess().getCharsetCSSSTRINGTerminalRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Charset__CharsetAssignment_1"

+

+

+	// $ANTLR start "rule__ImportExpression__ValueAssignment_1_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8083:1: rule__ImportExpression__ValueAssignment_1_0 : ( RULE_CSSSTRING ) ;

+	public final void rule__ImportExpression__ValueAssignment_1_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8087:1: ( ( RULE_CSSSTRING ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8088:1: ( RULE_CSSSTRING )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8088:1: ( RULE_CSSSTRING )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8089:1: RULE_CSSSTRING

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getImportExpressionAccess().getValueCSSSTRINGTerminalRuleCall_1_0_0());

+					}

+					match(input, RULE_CSSSTRING, FOLLOW_RULE_CSSSTRING_in_rule__ImportExpression__ValueAssignment_1_016531);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getImportExpressionAccess().getValueCSSSTRINGTerminalRuleCall_1_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__ValueAssignment_1_0"

+

+

+	// $ANTLR start "rule__ImportExpression__MediaListAssignment_1_1_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8098:1: rule__ImportExpression__MediaListAssignment_1_1_1 : ( rulemedia_list ) ;

+	public final void rule__ImportExpression__MediaListAssignment_1_1_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8102:1: ( ( rulemedia_list ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8103:1: ( rulemedia_list )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8103:1: ( rulemedia_list )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8104:1: rulemedia_list

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getImportExpressionAccess().getMediaListMedia_listParserRuleCall_1_1_1_0());

+					}

+					pushFollow(FOLLOW_rulemedia_list_in_rule__ImportExpression__MediaListAssignment_1_1_116562);

+					rulemedia_list();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getImportExpressionAccess().getMediaListMedia_listParserRuleCall_1_1_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ImportExpression__MediaListAssignment_1_1_1"

+

+

+	// $ANTLR start "rule__Page__PseudoPageAssignment_2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8113:1: rule__Page__PseudoPageAssignment_2 : ( rulepseudo_page ) ;

+	public final void rule__Page__PseudoPageAssignment_2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8117:1: ( ( rulepseudo_page ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8118:1: ( rulepseudo_page )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8118:1: ( rulepseudo_page )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8119:1: rulepseudo_page

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getPseudoPagePseudo_pageParserRuleCall_2_0());

+					}

+					pushFollow(FOLLOW_rulepseudo_page_in_rule__Page__PseudoPageAssignment_216593);

+					rulepseudo_page();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getPseudoPagePseudo_pageParserRuleCall_2_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__PseudoPageAssignment_2"

+

+

+	// $ANTLR start "rule__Page__DeclarationsAssignment_4"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8128:1: rule__Page__DeclarationsAssignment_4 : ( rulecss_declaration ) ;

+	public final void rule__Page__DeclarationsAssignment_4() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8132:1: ( ( rulecss_declaration ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8133:1: ( rulecss_declaration )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8133:1: ( rulecss_declaration )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8134:1: rulecss_declaration

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_4_0());

+					}

+					pushFollow(FOLLOW_rulecss_declaration_in_rule__Page__DeclarationsAssignment_416624);

+					rulecss_declaration();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_4_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__DeclarationsAssignment_4"

+

+

+	// $ANTLR start "rule__Page__DeclarationsAssignment_5_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8143:1: rule__Page__DeclarationsAssignment_5_1 : ( rulecss_declaration ) ;

+	public final void rule__Page__DeclarationsAssignment_5_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8147:1: ( ( rulecss_declaration ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8148:1: ( rulecss_declaration )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8148:1: ( rulecss_declaration )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8149:1: rulecss_declaration

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_5_1_0());

+					}

+					pushFollow(FOLLOW_rulecss_declaration_in_rule__Page__DeclarationsAssignment_5_116655);

+					rulecss_declaration();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_5_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Page__DeclarationsAssignment_5_1"

+

+

+	// $ANTLR start "rule__Media__MedialistAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8158:1: rule__Media__MedialistAssignment_1 : ( rulemedia_list ) ;

+	public final void rule__Media__MedialistAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8162:1: ( ( rulemedia_list ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8163:1: ( rulemedia_list )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8163:1: ( rulemedia_list )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8164:1: rulemedia_list

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMediaAccess().getMedialistMedia_listParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_rulemedia_list_in_rule__Media__MedialistAssignment_116686);

+					rulemedia_list();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMediaAccess().getMedialistMedia_listParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media__MedialistAssignment_1"

+

+

+	// $ANTLR start "rule__Media__RulesetsAssignment_3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8173:1: rule__Media__RulesetsAssignment_3 : ( ruleruleset ) ;

+	public final void rule__Media__RulesetsAssignment_3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8177:1: ( ( ruleruleset ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8178:1: ( ruleruleset )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8178:1: ( ruleruleset )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8179:1: ruleruleset

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getMediaAccess().getRulesetsRulesetParserRuleCall_3_0());

+					}

+					pushFollow(FOLLOW_ruleruleset_in_rule__Media__RulesetsAssignment_316717);

+					ruleruleset();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getMediaAccess().getRulesetsRulesetParserRuleCall_3_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Media__RulesetsAssignment_3"

+

+

+	// $ANTLR start "rule__Font_face__DeclarationsAssignment_3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8188:1: rule__Font_face__DeclarationsAssignment_3 : ( rulecss_declaration ) ;

+	public final void rule__Font_face__DeclarationsAssignment_3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8192:1: ( ( rulecss_declaration ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8193:1: ( rulecss_declaration )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8193:1: ( rulecss_declaration )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8194:1: rulecss_declaration

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_3_0());

+					}

+					pushFollow(FOLLOW_rulecss_declaration_in_rule__Font_face__DeclarationsAssignment_316748);

+					rulecss_declaration();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_3_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__DeclarationsAssignment_3"

+

+

+	// $ANTLR start "rule__Font_face__DeclarationsAssignment_4_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8203:1: rule__Font_face__DeclarationsAssignment_4_1 : ( rulecss_declaration ) ;

+	public final void rule__Font_face__DeclarationsAssignment_4_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8207:1: ( ( rulecss_declaration ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8208:1: ( rulecss_declaration )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8208:1: ( rulecss_declaration )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8209:1: rulecss_declaration

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_4_1_0());

+					}

+					pushFollow(FOLLOW_rulecss_declaration_in_rule__Font_face__DeclarationsAssignment_4_116779);

+					rulecss_declaration();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_4_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Font_face__DeclarationsAssignment_4_1"

+

+

+	// $ANTLR start "rule__Keyframes__NameAssignment_2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8218:1: rule__Keyframes__NameAssignment_2 : ( ruleIdentifier ) ;

+	public final void rule__Keyframes__NameAssignment_2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8222:1: ( ( ruleIdentifier ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8223:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8223:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8224:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getNameIdentifierParserRuleCall_2_0());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rule__Keyframes__NameAssignment_216810);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getNameIdentifierParserRuleCall_2_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__NameAssignment_2"

+

+

+	// $ANTLR start "rule__Keyframes__KeyframeselectorsAssignment_4"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8233:1: rule__Keyframes__KeyframeselectorsAssignment_4 : ( rulekeyframe_selector ) ;

+	public final void rule__Keyframes__KeyframeselectorsAssignment_4() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8237:1: ( ( rulekeyframe_selector ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8238:1: ( rulekeyframe_selector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8238:1: ( rulekeyframe_selector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8239:1: rulekeyframe_selector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_4_0());

+					}

+					pushFollow(FOLLOW_rulekeyframe_selector_in_rule__Keyframes__KeyframeselectorsAssignment_416841);

+					rulekeyframe_selector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_4_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__KeyframeselectorsAssignment_4"

+

+

+	// $ANTLR start "rule__Keyframes__KeyframeselectorsAssignment_5_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8248:1: rule__Keyframes__KeyframeselectorsAssignment_5_1 : ( rulekeyframe_selector ) ;

+	public final void rule__Keyframes__KeyframeselectorsAssignment_5_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8252:1: ( ( rulekeyframe_selector ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8253:1: ( rulekeyframe_selector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8253:1: ( rulekeyframe_selector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8254:1: rulekeyframe_selector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_5_1_0());

+					}

+					pushFollow(FOLLOW_rulekeyframe_selector_in_rule__Keyframes__KeyframeselectorsAssignment_5_116872);

+					rulekeyframe_selector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_5_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframes__KeyframeselectorsAssignment_5_1"

+

+

+	// $ANTLR start "rule__Keyframe_selector__TypeAssignment_0_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8263:1: rule__Keyframe_selector__TypeAssignment_0_0 : ( ruleIdentifier ) ;

+	public final void rule__Keyframe_selector__TypeAssignment_0_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8267:1: ( ( ruleIdentifier ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8268:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8268:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8269:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getTypeIdentifierParserRuleCall_0_0_0());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rule__Keyframe_selector__TypeAssignment_0_016903);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getTypeIdentifierParserRuleCall_0_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__TypeAssignment_0_0"

+

+

+	// $ANTLR start "rule__Keyframe_selector__PercentageAssignment_0_1_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8278:1: rule__Keyframe_selector__PercentageAssignment_0_1_0 : ( ruleNum ) ;

+	public final void rule__Keyframe_selector__PercentageAssignment_0_1_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8282:1: ( ( ruleNum ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8283:1: ( ruleNum )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8283:1: ( ruleNum )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8284:1: ruleNum

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getPercentageNumParserRuleCall_0_1_0_0());

+					}

+					pushFollow(FOLLOW_ruleNum_in_rule__Keyframe_selector__PercentageAssignment_0_1_016934);

+					ruleNum();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getPercentageNumParserRuleCall_0_1_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__PercentageAssignment_0_1_0"

+

+

+	// $ANTLR start "rule__Keyframe_selector__DeclarationsAssignment_2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8293:1: rule__Keyframe_selector__DeclarationsAssignment_2 : ( rulecss_declaration ) ;

+	public final void rule__Keyframe_selector__DeclarationsAssignment_2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8297:1: ( ( rulecss_declaration ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8298:1: ( rulecss_declaration )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8298:1: ( rulecss_declaration )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8299:1: rulecss_declaration

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_2_0());

+					}

+					pushFollow(FOLLOW_rulecss_declaration_in_rule__Keyframe_selector__DeclarationsAssignment_216965);

+					rulecss_declaration();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_2_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__DeclarationsAssignment_2"

+

+

+	// $ANTLR start "rule__Keyframe_selector__DeclarationsAssignment_3_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8308:1: rule__Keyframe_selector__DeclarationsAssignment_3_1 : ( rulecss_declaration ) ;

+	public final void rule__Keyframe_selector__DeclarationsAssignment_3_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8312:1: ( ( rulecss_declaration ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8313:1: ( rulecss_declaration )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8313:1: ( rulecss_declaration )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8314:1: rulecss_declaration

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_3_1_0());

+					}

+					pushFollow(FOLLOW_rulecss_declaration_in_rule__Keyframe_selector__DeclarationsAssignment_3_116996);

+					rulecss_declaration();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_3_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Keyframe_selector__DeclarationsAssignment_3_1"

+

+

+	// $ANTLR start "rule__Ruleset__SelectorsAssignment_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8323:1: rule__Ruleset__SelectorsAssignment_0 : ( ruleselector ) ;

+	public final void rule__Ruleset__SelectorsAssignment_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8327:1: ( ( ruleselector ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8328:1: ( ruleselector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8328:1: ( ruleselector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8329:1: ruleselector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0());

+					}

+					pushFollow(FOLLOW_ruleselector_in_rule__Ruleset__SelectorsAssignment_017027);

+					ruleselector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__SelectorsAssignment_0"

+

+

+	// $ANTLR start "rule__Ruleset__SelectorsAssignment_1_2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8338:1: rule__Ruleset__SelectorsAssignment_1_2 : ( ruleselector ) ;

+	public final void rule__Ruleset__SelectorsAssignment_1_2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8342:1: ( ( ruleselector ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8343:1: ( ruleselector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8343:1: ( ruleselector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8344:1: ruleselector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0());

+					}

+					pushFollow(FOLLOW_ruleselector_in_rule__Ruleset__SelectorsAssignment_1_217058);

+					ruleselector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__SelectorsAssignment_1_2"

+

+

+	// $ANTLR start "rule__Ruleset__DeclarationsAssignment_4_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8353:1: rule__Ruleset__DeclarationsAssignment_4_0 : ( rulecss_declaration ) ;

+	public final void rule__Ruleset__DeclarationsAssignment_4_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8357:1: ( ( rulecss_declaration ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8358:1: ( rulecss_declaration )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8358:1: ( rulecss_declaration )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8359:1: rulecss_declaration

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_0_0());

+					}

+					pushFollow(FOLLOW_rulecss_declaration_in_rule__Ruleset__DeclarationsAssignment_4_017089);

+					rulecss_declaration();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__DeclarationsAssignment_4_0"

+

+

+	// $ANTLR start "rule__Ruleset__DeclarationsAssignment_4_1_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8368:1: rule__Ruleset__DeclarationsAssignment_4_1_1 : ( rulecss_declaration ) ;

+	public final void rule__Ruleset__DeclarationsAssignment_4_1_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8372:1: ( ( rulecss_declaration ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8373:1: ( rulecss_declaration )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8373:1: ( rulecss_declaration )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8374:1: rulecss_declaration

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_1_1_0());

+					}

+					pushFollow(FOLLOW_rulecss_declaration_in_rule__Ruleset__DeclarationsAssignment_4_1_117120);

+					rulecss_declaration();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_1_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Ruleset__DeclarationsAssignment_4_1_1"

+

+

+	// $ANTLR start "rule__Selector__SimpleselectorsAssignment_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8383:1: rule__Selector__SimpleselectorsAssignment_0 : ( rulesimple_selector ) ;

+	public final void rule__Selector__SimpleselectorsAssignment_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8387:1: ( ( rulesimple_selector ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8388:1: ( rulesimple_selector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8388:1: ( rulesimple_selector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8389:1: rulesimple_selector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getSimpleselectorsSimple_selectorParserRuleCall_0_0());

+					}

+					pushFollow(FOLLOW_rulesimple_selector_in_rule__Selector__SimpleselectorsAssignment_017151);

+					rulesimple_selector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getSimpleselectorsSimple_selectorParserRuleCall_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__SimpleselectorsAssignment_0"

+

+

+	// $ANTLR start "rule__Selector__CombinatorAssignment_1_0_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8398:1: rule__Selector__CombinatorAssignment_1_0_0 : ( rulecombinator ) ;

+	public final void rule__Selector__CombinatorAssignment_1_0_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8402:1: ( ( rulecombinator ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8403:1: ( rulecombinator )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8403:1: ( rulecombinator )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8404:1: rulecombinator

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_0_0_0());

+					}

+					pushFollow(FOLLOW_rulecombinator_in_rule__Selector__CombinatorAssignment_1_0_017182);

+					rulecombinator();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_0_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__CombinatorAssignment_1_0_0"

+

+

+	// $ANTLR start "rule__Selector__SelectorAssignment_1_0_2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8413:1: rule__Selector__SelectorAssignment_1_0_2 : ( ruleselector ) ;

+	public final void rule__Selector__SelectorAssignment_1_0_2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8417:1: ( ( ruleselector ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8418:1: ( ruleselector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8418:1: ( ruleselector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8419:1: ruleselector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_0_2_0());

+					}

+					pushFollow(FOLLOW_ruleselector_in_rule__Selector__SelectorAssignment_1_0_217213);

+					ruleselector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_0_2_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__SelectorAssignment_1_0_2"

+

+

+	// $ANTLR start "rule__Selector__CombinatorAssignment_1_1_1_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8428:1: rule__Selector__CombinatorAssignment_1_1_1_0 : ( rulecombinator ) ;

+	public final void rule__Selector__CombinatorAssignment_1_1_1_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8432:1: ( ( rulecombinator ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8433:1: ( rulecombinator )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8433:1: ( rulecombinator )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8434:1: rulecombinator

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0_0());

+					}

+					pushFollow(FOLLOW_rulecombinator_in_rule__Selector__CombinatorAssignment_1_1_1_017244);

+					rulecombinator();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__CombinatorAssignment_1_1_1_0"

+

+

+	// $ANTLR start "rule__Selector__SelectorAssignment_1_1_2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8443:1: rule__Selector__SelectorAssignment_1_1_2 : ( ruleselector ) ;

+	public final void rule__Selector__SelectorAssignment_1_1_2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8447:1: ( ( ruleselector ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8448:1: ( ruleselector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8448:1: ( ruleselector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8449:1: ruleselector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_1_2_0());

+					}

+					pushFollow(FOLLOW_ruleselector_in_rule__Selector__SelectorAssignment_1_1_217275);

+					ruleselector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_1_2_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Selector__SelectorAssignment_1_1_2"

+

+

+	// $ANTLR start "rule__SimpleSelectorForNegation__ElementAssignment_0_0_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8458:1: rule__SimpleSelectorForNegation__ElementAssignment_0_0_0 : ( ruleElementSelector ) ;

+	public final void rule__SimpleSelectorForNegation__ElementAssignment_0_0_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8462:1: ( ( ruleElementSelector ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8463:1: ( ruleElementSelector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8463:1: ( ruleElementSelector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8464:1: ruleElementSelector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimpleSelectorForNegationAccess().getElementElementSelectorParserRuleCall_0_0_0_0());

+					}

+					pushFollow(FOLLOW_ruleElementSelector_in_rule__SimpleSelectorForNegation__ElementAssignment_0_0_017306);

+					ruleElementSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimpleSelectorForNegationAccess().getElementElementSelectorParserRuleCall_0_0_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SimpleSelectorForNegation__ElementAssignment_0_0_0"

+

+

+	// $ANTLR start "rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8473:1: rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1 : ( ruleUniversalSelector ) ;

+	public final void rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8477:1: ( ( ruleUniversalSelector ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8478:1: ( ruleUniversalSelector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8478:1: ( ruleUniversalSelector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8479:1: ruleUniversalSelector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimpleSelectorForNegationAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0());

+					}

+					pushFollow(FOLLOW_ruleUniversalSelector_in_rule__SimpleSelectorForNegation__UniversalAssignment_0_0_117337);

+					ruleUniversalSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimpleSelectorForNegationAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1"

+

+

+	// $ANTLR start "rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8488:1: rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1 : ( ruleSubSelectorForNegation ) ;

+	public final void rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8492:1: ( ( ruleSubSelectorForNegation ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8493:1: ( ruleSubSelectorForNegation )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8493:1: ( ruleSubSelectorForNegation )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8494:1: ruleSubSelectorForNegation

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_0_1_0());

+					}

+					pushFollow(FOLLOW_ruleSubSelectorForNegation_in_rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_117368);

+					ruleSubSelectorForNegation();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_0_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1"

+

+

+	// $ANTLR start "rule__SimpleSelectorForNegation__SubSelectorsAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8503:1: rule__SimpleSelectorForNegation__SubSelectorsAssignment_1 : ( ruleSubSelectorForNegation ) ;

+	public final void rule__SimpleSelectorForNegation__SubSelectorsAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8507:1: ( ( ruleSubSelectorForNegation ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8508:1: ( ruleSubSelectorForNegation )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8508:1: ( ruleSubSelectorForNegation )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8509:1: ruleSubSelectorForNegation

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_ruleSubSelectorForNegation_in_rule__SimpleSelectorForNegation__SubSelectorsAssignment_117399);

+					ruleSubSelectorForNegation();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SimpleSelectorForNegation__SubSelectorsAssignment_1"

+

+

+	// $ANTLR start "rule__Simple_selector__ElementAssignment_0_0_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8518:1: rule__Simple_selector__ElementAssignment_0_0_0 : ( ruleElementSelector ) ;

+	public final void rule__Simple_selector__ElementAssignment_0_0_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8522:1: ( ( ruleElementSelector ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8523:1: ( ruleElementSelector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8523:1: ( ruleElementSelector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8524:1: ruleElementSelector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimple_selectorAccess().getElementElementSelectorParserRuleCall_0_0_0_0());

+					}

+					pushFollow(FOLLOW_ruleElementSelector_in_rule__Simple_selector__ElementAssignment_0_0_017430);

+					ruleElementSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimple_selectorAccess().getElementElementSelectorParserRuleCall_0_0_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Simple_selector__ElementAssignment_0_0_0"

+

+

+	// $ANTLR start "rule__Simple_selector__UniversalAssignment_0_0_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8533:1: rule__Simple_selector__UniversalAssignment_0_0_1 : ( ruleUniversalSelector ) ;

+	public final void rule__Simple_selector__UniversalAssignment_0_0_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8537:1: ( ( ruleUniversalSelector ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8538:1: ( ruleUniversalSelector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8538:1: ( ruleUniversalSelector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8539:1: ruleUniversalSelector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimple_selectorAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0());

+					}

+					pushFollow(FOLLOW_ruleUniversalSelector_in_rule__Simple_selector__UniversalAssignment_0_0_117461);

+					ruleUniversalSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimple_selectorAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Simple_selector__UniversalAssignment_0_0_1"

+

+

+	// $ANTLR start "rule__Simple_selector__SubSelectorsAssignment_0_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8548:1: rule__Simple_selector__SubSelectorsAssignment_0_1 : ( ruleSubSelector ) ;

+	public final void rule__Simple_selector__SubSelectorsAssignment_0_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8552:1: ( ( ruleSubSelector ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8553:1: ( ruleSubSelector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8553:1: ( ruleSubSelector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8554:1: ruleSubSelector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_0_1_0());

+					}

+					pushFollow(FOLLOW_ruleSubSelector_in_rule__Simple_selector__SubSelectorsAssignment_0_117492);

+					ruleSubSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_0_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Simple_selector__SubSelectorsAssignment_0_1"

+

+

+	// $ANTLR start "rule__Simple_selector__SubSelectorsAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8563:1: rule__Simple_selector__SubSelectorsAssignment_1 : ( ruleSubSelector ) ;

+	public final void rule__Simple_selector__SubSelectorsAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8567:1: ( ( ruleSubSelector ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8568:1: ( ruleSubSelector )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8568:1: ( ruleSubSelector )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8569:1: ruleSubSelector

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_ruleSubSelector_in_rule__Simple_selector__SubSelectorsAssignment_117523);

+					ruleSubSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Simple_selector__SubSelectorsAssignment_1"

+

+

+	// $ANTLR start "rule__AttributeSelector__NameAssignment_2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8578:1: rule__AttributeSelector__NameAssignment_2 : ( ruleIdentifier ) ;

+	public final void rule__AttributeSelector__NameAssignment_2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8582:1: ( ( ruleIdentifier ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8583:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8583:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8584:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getNameIdentifierParserRuleCall_2_0());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rule__AttributeSelector__NameAssignment_217554);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getNameIdentifierParserRuleCall_2_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__NameAssignment_2"

+

+

+	// $ANTLR start "rule__AttributeSelector__OpAssignment_3_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8593:1: rule__AttributeSelector__OpAssignment_3_0 : ( ( rule__AttributeSelector__OpAlternatives_3_0_0 ) ) ;

+	public final void rule__AttributeSelector__OpAssignment_3_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8597:1: ( ( ( rule__AttributeSelector__OpAlternatives_3_0_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8598:1: ( ( rule__AttributeSelector__OpAlternatives_3_0_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8598:1: ( ( rule__AttributeSelector__OpAlternatives_3_0_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8599:1: ( rule__AttributeSelector__OpAlternatives_3_0_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getOpAlternatives_3_0_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8600:1: ( rule__AttributeSelector__OpAlternatives_3_0_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8600:2: rule__AttributeSelector__OpAlternatives_3_0_0

+					{

+						pushFollow(FOLLOW_rule__AttributeSelector__OpAlternatives_3_0_0_in_rule__AttributeSelector__OpAssignment_3_017585);

+						rule__AttributeSelector__OpAlternatives_3_0_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getOpAlternatives_3_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__OpAssignment_3_0"

+

+

+	// $ANTLR start "rule__AttributeSelector__ValueAssignment_3_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8609:1: rule__AttributeSelector__ValueAssignment_3_1 : ( ( rule__AttributeSelector__ValueAlternatives_3_1_0 )

+	// ) ;

+	public final void rule__AttributeSelector__ValueAssignment_3_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8613:1: ( ( ( rule__AttributeSelector__ValueAlternatives_3_1_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8614:1: ( ( rule__AttributeSelector__ValueAlternatives_3_1_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8614:1: ( ( rule__AttributeSelector__ValueAlternatives_3_1_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8615:1: ( rule__AttributeSelector__ValueAlternatives_3_1_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getAttributeSelectorAccess().getValueAlternatives_3_1_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8616:1: ( rule__AttributeSelector__ValueAlternatives_3_1_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8616:2: rule__AttributeSelector__ValueAlternatives_3_1_0

+					{

+						pushFollow(FOLLOW_rule__AttributeSelector__ValueAlternatives_3_1_0_in_rule__AttributeSelector__ValueAssignment_3_117618);

+						rule__AttributeSelector__ValueAlternatives_3_1_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getAttributeSelectorAccess().getValueAlternatives_3_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__AttributeSelector__ValueAssignment_3_1"

+

+

+	// $ANTLR start "rule__ClassSelector__NameAssignment_2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8625:1: rule__ClassSelector__NameAssignment_2 : ( ruleIdentifier ) ;

+	public final void rule__ClassSelector__NameAssignment_2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8629:1: ( ( ruleIdentifier ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8630:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8630:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8631:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getClassSelectorAccess().getNameIdentifierParserRuleCall_2_0());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rule__ClassSelector__NameAssignment_217651);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getClassSelectorAccess().getNameIdentifierParserRuleCall_2_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ClassSelector__NameAssignment_2"

+

+

+	// $ANTLR start "rule__ElementSelector__NameAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8640:1: rule__ElementSelector__NameAssignment_1 : ( ruleIdentifier ) ;

+	public final void rule__ElementSelector__NameAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8644:1: ( ( ruleIdentifier ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8645:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8645:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8646:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getElementSelectorAccess().getNameIdentifierParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rule__ElementSelector__NameAssignment_117682);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getElementSelectorAccess().getNameIdentifierParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ElementSelector__NameAssignment_1"

+

+

+	// $ANTLR start "rule__UniversalSelector__NamespaceAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8655:1: rule__UniversalSelector__NamespaceAssignment_1 : ( rulecss_namespace_prefix ) ;

+	public final void rule__UniversalSelector__NamespaceAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8659:1: ( ( rulecss_namespace_prefix ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8660:1: ( rulecss_namespace_prefix )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8660:1: ( rulecss_namespace_prefix )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8661:1: rulecss_namespace_prefix

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getUniversalSelectorAccess().getNamespaceCss_namespace_prefixParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_rulecss_namespace_prefix_in_rule__UniversalSelector__NamespaceAssignment_117713);

+					rulecss_namespace_prefix();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getUniversalSelectorAccess().getNamespaceCss_namespace_prefixParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__UniversalSelector__NamespaceAssignment_1"

+

+

+	// $ANTLR start "rule__IdSelector__NameAssignment_2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8670:1: rule__IdSelector__NameAssignment_2 : ( ruleIdentifier ) ;

+	public final void rule__IdSelector__NameAssignment_2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8674:1: ( ( ruleIdentifier ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8675:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8675:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8676:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdSelectorAccess().getNameIdentifierParserRuleCall_2_0());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rule__IdSelector__NameAssignment_217744);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdSelectorAccess().getNameIdentifierParserRuleCall_2_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdSelector__NameAssignment_2"

+

+

+	// $ANTLR start "rule__Css_declaration__PropertyAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8685:1: rule__Css_declaration__PropertyAssignment_1 : ( rulecss_property ) ;

+	public final void rule__Css_declaration__PropertyAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8689:1: ( ( rulecss_property ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8690:1: ( rulecss_property )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8690:1: ( rulecss_property )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8691:1: rulecss_property

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_declarationAccess().getPropertyCss_propertyParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_rulecss_property_in_rule__Css_declaration__PropertyAssignment_117775);

+					rulecss_property();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_declarationAccess().getPropertyCss_propertyParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__PropertyAssignment_1"

+

+

+	// $ANTLR start "rule__Css_declaration__ValueTokensAssignment_4"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8700:1: rule__Css_declaration__ValueTokensAssignment_4 : ( ruleCssTok ) ;

+	public final void rule__Css_declaration__ValueTokensAssignment_4() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8704:1: ( ( ruleCssTok ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8705:1: ( ruleCssTok )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8705:1: ( ruleCssTok )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8706:1: ruleCssTok

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_declarationAccess().getValueTokensCssTokParserRuleCall_4_0());

+					}

+					pushFollow(FOLLOW_ruleCssTok_in_rule__Css_declaration__ValueTokensAssignment_417806);

+					ruleCssTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_declarationAccess().getValueTokensCssTokParserRuleCall_4_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__ValueTokensAssignment_4"

+

+

+	// $ANTLR start "rule__Css_declaration__ImportantAssignment_5"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8715:1: rule__Css_declaration__ImportantAssignment_5 : ( RULE_IMPORTANT_SYM ) ;

+	public final void rule__Css_declaration__ImportantAssignment_5() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8719:1: ( ( RULE_IMPORTANT_SYM ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8720:1: ( RULE_IMPORTANT_SYM )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8720:1: ( RULE_IMPORTANT_SYM )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8721:1: RULE_IMPORTANT_SYM

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_declarationAccess().getImportantIMPORTANT_SYMTerminalRuleCall_5_0());

+					}

+					match(input, RULE_IMPORTANT_SYM, FOLLOW_RULE_IMPORTANT_SYM_in_rule__Css_declaration__ImportantAssignment_517837);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_declarationAccess().getImportantIMPORTANT_SYMTerminalRuleCall_5_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_declaration__ImportantAssignment_5"

+

+

+	// $ANTLR start "rule__Css_property__NameAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8730:1: rule__Css_property__NameAssignment_1 : ( ruleValidPropertyIdent ) ;

+	public final void rule__Css_property__NameAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8734:1: ( ( ruleValidPropertyIdent ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8735:1: ( ruleValidPropertyIdent )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8735:1: ( ruleValidPropertyIdent )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8736:1: ruleValidPropertyIdent

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getCss_propertyAccess().getNameValidPropertyIdentParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_ruleValidPropertyIdent_in_rule__Css_property__NameAssignment_117868);

+					ruleValidPropertyIdent();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getCss_propertyAccess().getNameValidPropertyIdentParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__Css_property__NameAssignment_1"

+

+

+	// $ANTLR start "rule__PseudoClassName__NameAssignment"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8745:1: rule__PseudoClassName__NameAssignment : ( ruleIdentifier ) ;

+	public final void rule__PseudoClassName__NameAssignment() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8749:1: ( ( ruleIdentifier ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8750:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8750:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8751:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassNameAccess().getNameIdentifierParserRuleCall_0());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rule__PseudoClassName__NameAssignment17899);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassNameAccess().getNameIdentifierParserRuleCall_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassName__NameAssignment"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__NotAssignment_0_0"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8760:1: rule__PseudoClassFunction__NotAssignment_0_0 : ( ruleNotFunctionCall ) ;

+	public final void rule__PseudoClassFunction__NotAssignment_0_0() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8764:1: ( ( ruleNotFunctionCall ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8765:1: ( ruleNotFunctionCall )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8765:1: ( ruleNotFunctionCall )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8766:1: ruleNotFunctionCall

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getNotNotFunctionCallParserRuleCall_0_0_0());

+					}

+					pushFollow(FOLLOW_ruleNotFunctionCall_in_rule__PseudoClassFunction__NotAssignment_0_017930);

+					ruleNotFunctionCall();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getNotNotFunctionCallParserRuleCall_0_0_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__NotAssignment_0_0"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__ParamSelectorAssignment_0_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8775:1: rule__PseudoClassFunction__ParamSelectorAssignment_0_1 : ( ruleSimpleSelectorForNegation ) ;

+	public final void rule__PseudoClassFunction__ParamSelectorAssignment_0_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8779:1: ( ( ruleSimpleSelectorForNegation ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8780:1: ( ruleSimpleSelectorForNegation )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8780:1: ( ruleSimpleSelectorForNegation )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8781:1: ruleSimpleSelectorForNegation

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getParamSelectorSimpleSelectorForNegationParserRuleCall_0_1_0());

+					}

+					pushFollow(FOLLOW_ruleSimpleSelectorForNegation_in_rule__PseudoClassFunction__ParamSelectorAssignment_0_117961);

+					ruleSimpleSelectorForNegation();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getParamSelectorSimpleSelectorForNegationParserRuleCall_0_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__ParamSelectorAssignment_0_1"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__NameAssignment_1_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8790:1: rule__PseudoClassFunction__NameAssignment_1_1 : ( ruleIdentifier ) ;

+	public final void rule__PseudoClassFunction__NameAssignment_1_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8794:1: ( ( ruleIdentifier ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8795:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8795:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8796:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getNameIdentifierParserRuleCall_1_1_0());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rule__PseudoClassFunction__NameAssignment_1_117992);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getNameIdentifierParserRuleCall_1_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__NameAssignment_1_1"

+

+

+	// $ANTLR start "rule__PseudoClassFunction__ParamsAssignment_1_3"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8805:1: rule__PseudoClassFunction__ParamsAssignment_1_3 : ( ruleCssTok ) ;

+	public final void rule__PseudoClassFunction__ParamsAssignment_1_3() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8809:1: ( ( ruleCssTok ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8810:1: ( ruleCssTok )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8810:1: ( ruleCssTok )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8811:1: ruleCssTok

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getPseudoClassFunctionAccess().getParamsCssTokParserRuleCall_1_3_0());

+					}

+					pushFollow(FOLLOW_ruleCssTok_in_rule__PseudoClassFunction__ParamsAssignment_1_318023);

+					ruleCssTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getPseudoClassFunctionAccess().getParamsCssTokParserRuleCall_1_3_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__PseudoClassFunction__ParamsAssignment_1_3"

+

+

+	// $ANTLR start "rule__SymbolTok__SymbolAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8820:1: rule__SymbolTok__SymbolAssignment_1 : ( ( rule__SymbolTok__SymbolAlternatives_1_0 ) ) ;

+	public final void rule__SymbolTok__SymbolAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8824:1: ( ( ( rule__SymbolTok__SymbolAlternatives_1_0 ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8825:1: ( ( rule__SymbolTok__SymbolAlternatives_1_0 ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8825:1: ( ( rule__SymbolTok__SymbolAlternatives_1_0 ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8826:1: ( rule__SymbolTok__SymbolAlternatives_1_0 )

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getSymbolTokAccess().getSymbolAlternatives_1_0());

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8827:1: ( rule__SymbolTok__SymbolAlternatives_1_0 )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8827:2: rule__SymbolTok__SymbolAlternatives_1_0

+					{

+						pushFollow(FOLLOW_rule__SymbolTok__SymbolAlternatives_1_0_in_rule__SymbolTok__SymbolAssignment_118054);

+						rule__SymbolTok__SymbolAlternatives_1_0();

+

+						state._fsp--;

+						if (state.failed) {

+							return;

+						}

+

+					}

+

+					if (state.backtracking == 0) {

+						after(grammarAccess.getSymbolTokAccess().getSymbolAlternatives_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__SymbolTok__SymbolAssignment_1"

+

+

+	// $ANTLR start "rule__StringTok__ValueAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8836:1: rule__StringTok__ValueAssignment_1 : ( RULE_CSSSTRING ) ;

+	public final void rule__StringTok__ValueAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8840:1: ( ( RULE_CSSSTRING ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8841:1: ( RULE_CSSSTRING )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8841:1: ( RULE_CSSSTRING )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8842:1: RULE_CSSSTRING

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getStringTokAccess().getValueCSSSTRINGTerminalRuleCall_1_0());

+					}

+					match(input, RULE_CSSSTRING, FOLLOW_RULE_CSSSTRING_in_rule__StringTok__ValueAssignment_118087);

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getStringTokAccess().getValueCSSSTRINGTerminalRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__StringTok__ValueAssignment_1"

+

+

+	// $ANTLR start "rule__NumberTok__ValAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8851:1: rule__NumberTok__ValAssignment_1 : ( ruleNum ) ;

+	public final void rule__NumberTok__ValAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8855:1: ( ( ruleNum ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8856:1: ( ruleNum )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8856:1: ( ruleNum )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8857:1: ruleNum

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getNumberTokAccess().getValNumParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_ruleNum_in_rule__NumberTok__ValAssignment_118118);

+					ruleNum();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getNumberTokAccess().getValNumParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__NumberTok__ValAssignment_1"

+

+

+	// $ANTLR start "rule__UrlTok__UrlAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8866:1: rule__UrlTok__UrlAssignment_1 : ( ruleURLType ) ;

+	public final void rule__UrlTok__UrlAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8870:1: ( ( ruleURLType ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8871:1: ( ruleURLType )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8871:1: ( ruleURLType )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8872:1: ruleURLType

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getUrlTokAccess().getUrlURLTypeParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_ruleURLType_in_rule__UrlTok__UrlAssignment_118149);

+					ruleURLType();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getUrlTokAccess().getUrlURLTypeParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__UrlTok__UrlAssignment_1"

+

+

+	// $ANTLR start "rule__ColorTok__ValueAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8881:1: rule__ColorTok__ValueAssignment_1 : ( ruleHex ) ;

+	public final void rule__ColorTok__ValueAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8885:1: ( ( ruleHex ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8886:1: ( ruleHex )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8886:1: ( ruleHex )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8887:1: ruleHex

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getColorTokAccess().getValueHexParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_ruleHex_in_rule__ColorTok__ValueAssignment_118180);

+					ruleHex();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getColorTokAccess().getValueHexParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__ColorTok__ValueAssignment_1"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__NameAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8896:1: rule__IdentifierOrFuncTok__NameAssignment_1 : ( ruleIdentifier ) ;

+	public final void rule__IdentifierOrFuncTok__NameAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8900:1: ( ( ruleIdentifier ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8901:1: ( ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8901:1: ( ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8902:1: ruleIdentifier

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierOrFuncTokAccess().getNameIdentifierParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rule__IdentifierOrFuncTok__NameAssignment_118211);

+					ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierOrFuncTokAccess().getNameIdentifierParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__NameAssignment_1"

+

+

+	// $ANTLR start "rule__IdentifierOrFuncTok__ParamsAssignment_2_2"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8911:1: rule__IdentifierOrFuncTok__ParamsAssignment_2_2 : ( ruleCssTok ) ;

+	public final void rule__IdentifierOrFuncTok__ParamsAssignment_2_2() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8915:1: ( ( ruleCssTok ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8916:1: ( ruleCssTok )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8916:1: ( ruleCssTok )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8917:1: ruleCssTok

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getIdentifierOrFuncTokAccess().getParamsCssTokParserRuleCall_2_2_0());

+					}

+					pushFollow(FOLLOW_ruleCssTok_in_rule__IdentifierOrFuncTok__ParamsAssignment_2_218242);

+					ruleCssTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getIdentifierOrFuncTokAccess().getParamsCssTokParserRuleCall_2_2_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__IdentifierOrFuncTok__ParamsAssignment_2_2"

+

+

+	// $ANTLR start "rule__URLType__UrlAssignment_1"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8926:1: rule__URLType__UrlAssignment_1 : ( ruleValidURL ) ;

+	public final void rule__URLType__UrlAssignment_1() throws RecognitionException {

+

+		int stackSize = keepStackSize();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8930:1: ( ( ruleValidURL ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8931:1: ( ruleValidURL )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8931:1: ( ruleValidURL )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:8932:1: ruleValidURL

+				{

+					if (state.backtracking == 0) {

+						before(grammarAccess.getURLTypeAccess().getUrlValidURLParserRuleCall_1_0());

+					}

+					pushFollow(FOLLOW_ruleValidURL_in_rule__URLType__UrlAssignment_118273);

+					ruleValidURL();

+

+					state._fsp--;

+					if (state.failed) {

+						return;

+					}

+					if (state.backtracking == 0) {

+						after(grammarAccess.getURLTypeAccess().getUrlValidURLParserRuleCall_1_0());

+					}

+

+				}

+

+

+			}

+

+		} catch (RecognitionException re) {

+			reportError(re);

+			recover(input, re);

+		} finally {

+

+			restoreStackSize(stackSize);

+

+		}

+		return;

+	}

+

+	// $ANTLR end "rule__URLType__UrlAssignment_1"

+

+	// $ANTLR start synpred134_InternalCSS

+	public final void synpred134_InternalCSS_fragment() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7549:2: ( rule__Identifier__Group_2__0 )

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7549:2: rule__Identifier__Group_2__0

+		{

+			pushFollow(FOLLOW_rule__Identifier__Group_2__0_in_synpred134_InternalCSS15437);

+			rule__Identifier__Group_2__0();

+

+			state._fsp--;

+			if (state.failed) {

+				return;

+			}

+

+		}

+	}

+

+	// $ANTLR end synpred134_InternalCSS

+

+	// $ANTLR start synpred136_InternalCSS

+	public final void synpred136_InternalCSS_fragment() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7711:3: ( RULE_ONE_INT )

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7711:3: RULE_ONE_INT

+		{

+			match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_synpred136_InternalCSS15760);

+			if (state.failed) {

+				return;

+			}

+

+		}

+	}

+

+	// $ANTLR end synpred136_InternalCSS

+

+	// $ANTLR start synpred137_InternalCSS

+	public final void synpred137_InternalCSS_fragment() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7751:3: ( RULE_ONE_INT )

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7751:3: RULE_ONE_INT

+		{

+			match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_synpred137_InternalCSS15843);

+			if (state.failed) {

+				return;

+			}

+

+		}

+	}

+

+	// $ANTLR end synpred137_InternalCSS

+

+	// $ANTLR start synpred138_InternalCSS

+	public final void synpred138_InternalCSS_fragment() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7780:2: ( rule__Num__Group_1_1_1__0 )

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7780:2: rule__Num__Group_1_1_1__0

+		{

+			pushFollow(FOLLOW_rule__Num__Group_1_1_1__0_in_synpred138_InternalCSS15903);

+			rule__Num__Group_1_1_1__0();

+

+			state._fsp--;

+			if (state.failed) {

+				return;

+			}

+

+		}

+	}

+

+	// $ANTLR end synpred138_InternalCSS

+

+	// $ANTLR start synpred139_InternalCSS

+	public final void synpred139_InternalCSS_fragment() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7849:3: ( RULE_ONE_INT )

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7849:3: RULE_ONE_INT

+		{

+			match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_synpred139_InternalCSS16045);

+			if (state.failed) {

+				return;

+			}

+

+		}

+	}

+

+	// $ANTLR end synpred139_InternalCSS

+

+	// $ANTLR start synpred140_InternalCSS

+	public final void synpred140_InternalCSS_fragment() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7917:2: ( rule__Hex__Group_1__0 )

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.g:7917:2: rule__Hex__Group_1__0

+		{

+			pushFollow(FOLLOW_rule__Hex__Group_1__0_in_synpred140_InternalCSS16182);

+			rule__Hex__Group_1__0();

+

+			state._fsp--;

+			if (state.failed) {

+				return;

+			}

+

+		}

+	}

+

+	// $ANTLR end synpred140_InternalCSS

+

+	// Delegated rules

+

+	public final boolean synpred139_InternalCSS() {

+		state.backtracking++;

+		int start = input.mark();

+		try {

+			synpred139_InternalCSS_fragment(); // can never throw exception

+		} catch (RecognitionException re) {

+			System.err.println("impossible: " + re);

+		}

+		boolean success = !state.failed;

+		input.rewind(start);

+		state.backtracking--;

+		state.failed = false;

+		return success;

+	}

+

+	public final boolean synpred137_InternalCSS() {

+		state.backtracking++;

+		int start = input.mark();

+		try {

+			synpred137_InternalCSS_fragment(); // can never throw exception

+		} catch (RecognitionException re) {

+			System.err.println("impossible: " + re);

+		}

+		boolean success = !state.failed;

+		input.rewind(start);

+		state.backtracking--;

+		state.failed = false;

+		return success;

+	}

+

+	public final boolean synpred134_InternalCSS() {

+		state.backtracking++;

+		int start = input.mark();

+		try {

+			synpred134_InternalCSS_fragment(); // can never throw exception

+		} catch (RecognitionException re) {

+			System.err.println("impossible: " + re);

+		}

+		boolean success = !state.failed;

+		input.rewind(start);

+		state.backtracking--;

+		state.failed = false;

+		return success;

+	}

+

+	public final boolean synpred140_InternalCSS() {

+		state.backtracking++;

+		int start = input.mark();

+		try {

+			synpred140_InternalCSS_fragment(); // can never throw exception

+		} catch (RecognitionException re) {

+			System.err.println("impossible: " + re);

+		}

+		boolean success = !state.failed;

+		input.rewind(start);

+		state.backtracking--;

+		state.failed = false;

+		return success;

+	}

+

+	public final boolean synpred136_InternalCSS() {

+		state.backtracking++;

+		int start = input.mark();

+		try {

+			synpred136_InternalCSS_fragment(); // can never throw exception

+		} catch (RecognitionException re) {

+			System.err.println("impossible: " + re);

+		}

+		boolean success = !state.failed;

+		input.rewind(start);

+		state.backtracking--;

+		state.failed = false;

+		return success;

+	}

+

+	public final boolean synpred138_InternalCSS() {

+		state.backtracking++;

+		int start = input.mark();

+		try {

+			synpred138_InternalCSS_fragment(); // can never throw exception

+		} catch (RecognitionException re) {

+			System.err.println("impossible: " + re);

+		}

+		boolean success = !state.failed;

+		input.rewind(start);

+		state.backtracking--;

+		state.failed = false;

+		return success;

+	}

+

+

+	protected DFA13 dfa13 = new DFA13(this);

+	protected DFA17 dfa17 = new DFA17(this);

+	protected DFA22 dfa22 = new DFA22(this);

+	protected DFA58 dfa58 = new DFA58(this);

+	protected DFA64 dfa64 = new DFA64(this);

+	protected DFA83 dfa83 = new DFA83(this);

+	static final String DFA13_eotS =

+			"\24\uffff";

+	static final String DFA13_eofS =

+			"\2\uffff\7\23\1\uffff\11\23\1\uffff";

+	static final String DFA13_minS =

+			"\1\12\1\13\7\12\1\uffff\11\12\1\uffff";

+	static final String DFA13_maxS =

+			"\1\74\1\64\7\75\1\uffff\11\75\1\uffff";

+	static final String DFA13_acceptS =

+			"\11\uffff\1\2\11\uffff\1\1";

+	static final String DFA13_specialS =

+			"\24\uffff}>";

+	static final String[] DFA13_transitionS = {

+			"\1\1\1\2\2\uffff\1\3\1\4\24\uffff\1\11\14\uffff\1\5\1\6\1\7" +

+					"\1\10\7\uffff\1\11",

+			"\1\2\2\uffff\1\3\1\4\41\uffff\1\5\1\6\1\7\1\10",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			"\1\13\1\12\2\23\1\14\1\15\1\16\26\uffff\1\23\2\uffff\1\23" +

+					"\6\uffff\1\17\1\20\1\21\1\22\7\uffff\1\11\1\23",

+			""

+	};

+

+	static final short[] DFA13_eot = DFA.unpackEncodedString(DFA13_eotS);

+	static final short[] DFA13_eof = DFA.unpackEncodedString(DFA13_eofS);

+	static final char[] DFA13_min = DFA.unpackEncodedStringToUnsignedChars(DFA13_minS);

+	static final char[] DFA13_max = DFA.unpackEncodedStringToUnsignedChars(DFA13_maxS);

+	static final short[] DFA13_accept = DFA.unpackEncodedString(DFA13_acceptS);

+	static final short[] DFA13_special = DFA.unpackEncodedString(DFA13_specialS);

+	static final short[][] DFA13_transition;

+

+	static {

+		int numStates = DFA13_transitionS.length;

+		DFA13_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA13_transition[i] = org.antlr.runtime.DFA.unpackEncodedString(DFA13_transitionS[i]);

+		}

+	}

+

+	class DFA13 extends DFA {

+

+		public DFA13(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 13;

+			this.eot = DFA13_eot;

+			this.eof = DFA13_eof;

+			this.min = DFA13_min;

+			this.max = DFA13_max;

+			this.accept = DFA13_accept;

+			this.special = DFA13_special;

+			this.transition = DFA13_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "1768:1: rule__SimpleSelectorForNegation__Alternatives_0_0 : ( ( ( rule__SimpleSelectorForNegation__ElementAssignment_0_0_0 ) ) | ( ( rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1 ) ) );";

+		}

+	}

+

+	static final String DFA17_eotS =

+			"\24\uffff";

+	static final String DFA17_eofS =

+			"\2\uffff\7\23\1\uffff\11\23\1\uffff";

+	static final String DFA17_minS =

+			"\1\12\1\13\7\7\1\uffff\11\7\1\uffff";

+	static final String DFA17_maxS =

+			"\1\74\1\64\7\74\1\uffff\11\74\1\uffff";

+	static final String DFA17_acceptS =

+			"\11\uffff\1\2\11\uffff\1\1";

+	static final String DFA17_specialS =

+			"\24\uffff}>";

+	static final String[] DFA17_transitionS = {

+			"\1\1\1\2\2\uffff\1\3\1\4\24\uffff\1\11\14\uffff\1\5\1\6\1\7" +

+					"\1\10\7\uffff\1\11",

+			"\1\2\2\uffff\1\3\1\4\41\uffff\1\5\1\6\1\7\1\10",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			"\2\23\1\uffff\1\13\1\12\2\23\1\14\1\15\1\16\1\23\23\uffff" +

+					"\3\23\2\uffff\1\23\6\uffff\1\17\1\20\1\21\1\22\5\uffff\1\23" +

+					"\1\uffff\1\11",

+			""

+	};

+

+	static final short[] DFA17_eot = DFA.unpackEncodedString(DFA17_eotS);

+	static final short[] DFA17_eof = DFA.unpackEncodedString(DFA17_eofS);

+	static final char[] DFA17_min = DFA.unpackEncodedStringToUnsignedChars(DFA17_minS);

+	static final char[] DFA17_max = DFA.unpackEncodedStringToUnsignedChars(DFA17_maxS);

+	static final short[] DFA17_accept = DFA.unpackEncodedString(DFA17_acceptS);

+	static final short[] DFA17_special = DFA.unpackEncodedString(DFA17_specialS);

+	static final short[][] DFA17_transition;

+

+	static {

+		int numStates = DFA17_transitionS.length;

+		DFA17_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA17_transition[i] = org.antlr.runtime.DFA.unpackEncodedString(DFA17_transitionS[i]);

+		}

+	}

+

+	class DFA17 extends DFA {

+

+		public DFA17(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 17;

+			this.eot = DFA17_eot;

+			this.eof = DFA17_eof;

+			this.min = DFA17_min;

+			this.max = DFA17_max;

+			this.accept = DFA17_accept;

+			this.special = DFA17_special;

+			this.transition = DFA17_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "1853:1: rule__Simple_selector__Alternatives_0_0 : ( ( ( rule__Simple_selector__ElementAssignment_0_0_0 ) ) | ( ( rule__Simple_selector__UniversalAssignment_0_0_1 ) ) );";

+		}

+	}

+

+	static final String DFA22_eotS =

+			"\25\uffff";

+	static final String DFA22_eofS =

+			"\5\uffff\20\3";

+	static final String DFA22_minS =

+			"\1\14\1\12\2\uffff\1\13\20\7";

+	static final String DFA22_maxS =

+			"\1\14\1\77\2\uffff\1\64\20\76";

+	static final String DFA22_acceptS =

+			"\2\uffff\1\2\1\1\21\uffff";

+	static final String DFA22_specialS =

+			"\25\uffff}>";

+	static final String[] DFA22_transitionS = {

+			"\1\1",

+			"\1\4\1\5\1\3\1\uffff\1\6\1\7\41\uffff\1\10\1\11\1\12\1\13" +

+					"\12\uffff\1\2",

+			"",

+			"",

+			"\1\5\2\uffff\1\6\1\7\41\uffff\1\10\1\11\1\12\1\13",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2",

+			"\2\3\1\uffff\1\15\1\14\2\3\1\16\1\17\1\20\1\3\23\uffff\3\3" +

+					"\2\uffff\1\3\6\uffff\1\21\1\22\1\23\1\24\5\uffff\1\3\3\uffff" +

+					"\1\2"

+	};

+

+	static final short[] DFA22_eot = DFA.unpackEncodedString(DFA22_eotS);

+	static final short[] DFA22_eof = DFA.unpackEncodedString(DFA22_eofS);

+	static final char[] DFA22_min = DFA.unpackEncodedStringToUnsignedChars(DFA22_minS);

+	static final char[] DFA22_max = DFA.unpackEncodedStringToUnsignedChars(DFA22_maxS);

+	static final short[] DFA22_accept = DFA.unpackEncodedString(DFA22_acceptS);

+	static final short[] DFA22_special = DFA.unpackEncodedString(DFA22_specialS);

+	static final short[][] DFA22_transition;

+

+	static {

+		int numStates = DFA22_transitionS.length;

+		DFA22_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA22_transition[i] = org.antlr.runtime.DFA.unpackEncodedString(DFA22_transitionS[i]);

+		}

+	}

+

+	class DFA22 extends DFA {

+

+		public DFA22(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 22;

+			this.eot = DFA22_eot;

+			this.eof = DFA22_eof;

+			this.min = DFA22_min;

+			this.max = DFA22_max;

+			this.accept = DFA22_accept;

+			this.special = DFA22_special;

+			this.transition = DFA22_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "2009:1: rule__PseudoClassOrFunc__Alternatives : ( ( rulePseudoClass ) | ( rulePseudoClassFunction ) );";

+		}

+	}

+

+	static final String DFA58_eotS =

+			"\4\uffff";

+	static final String DFA58_eofS =

+			"\4\uffff";

+	static final String DFA58_minS =

+			"\2\10\2\uffff";

+	static final String DFA58_maxS =

+			"\2\72\2\uffff";

+	static final String DFA58_acceptS =

+			"\2\uffff\1\2\1\1";

+	static final String DFA58_specialS =

+			"\4\uffff}>";

+	static final String[] DFA58_transitionS = {

+			"\1\3\10\uffff\1\1\50\uffff\1\2",

+			"\1\3\10\uffff\1\1\50\uffff\1\2",

+			"",

+			""

+	};

+

+	static final short[] DFA58_eot = DFA.unpackEncodedString(DFA58_eotS);

+	static final short[] DFA58_eof = DFA.unpackEncodedString(DFA58_eofS);

+	static final char[] DFA58_min = DFA.unpackEncodedStringToUnsignedChars(DFA58_minS);

+	static final char[] DFA58_max = DFA.unpackEncodedStringToUnsignedChars(DFA58_maxS);

+	static final short[] DFA58_accept = DFA.unpackEncodedString(DFA58_acceptS);

+	static final short[] DFA58_special = DFA.unpackEncodedString(DFA58_specialS);

+	static final short[][] DFA58_transition;

+

+	static {

+		int numStates = DFA58_transitionS.length;

+		DFA58_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA58_transition[i] = org.antlr.runtime.DFA.unpackEncodedString(DFA58_transitionS[i]);

+		}

+	}

+

+	class DFA58 extends DFA {

+

+		public DFA58(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 58;

+			this.eot = DFA58_eot;

+			this.eof = DFA58_eof;

+			this.min = DFA58_min;

+			this.max = DFA58_max;

+			this.accept = DFA58_accept;

+			this.special = DFA58_special;

+			this.transition = DFA58_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "()* loopback of 4494:1: ( rule__Ruleset__Group_1__0 )*";

+		}

+	}

+

+	static final String DFA64_eotS =

+			"\5\uffff";

+	static final String DFA64_eofS =

+			"\1\3\4\uffff";

+	static final String DFA64_minS =

+			"\1\7\1\uffff\1\7\1\uffff\1\7";

+	static final String DFA64_maxS =

+			"\1\72\1\uffff\1\74\1\uffff\1\74";

+	static final String DFA64_acceptS =

+			"\1\uffff\1\1\1\uffff\1\2\1\uffff";

+	static final String DFA64_specialS =

+			"\5\uffff}>";

+	static final String[] DFA64_transitionS = {

+			"\1\1\1\3\10\uffff\1\2\23\uffff\2\1\23\uffff\1\3",

+			"",

+			"\1\1\1\3\1\uffff\6\1\1\uffff\1\4\22\uffff\4\1\2\uffff\1\1" +

+					"\6\uffff\4\1\5\uffff\1\3\1\uffff\1\1",

+			"",

+			"\1\1\1\3\1\uffff\6\1\1\uffff\1\4\22\uffff\4\1\2\uffff\1\1" +

+					"\6\uffff\4\1\5\uffff\1\3\1\uffff\1\1"

+	};

+

+	static final short[] DFA64_eot = DFA.unpackEncodedString(DFA64_eotS);

+	static final short[] DFA64_eof = DFA.unpackEncodedString(DFA64_eofS);

+	static final char[] DFA64_min = DFA.unpackEncodedStringToUnsignedChars(DFA64_minS);

+	static final char[] DFA64_max = DFA.unpackEncodedStringToUnsignedChars(DFA64_maxS);

+	static final short[] DFA64_accept = DFA.unpackEncodedString(DFA64_acceptS);

+	static final short[] DFA64_special = DFA.unpackEncodedString(DFA64_specialS);

+	static final short[][] DFA64_transition;

+

+	static {

+		int numStates = DFA64_transitionS.length;

+		DFA64_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA64_transition[i] = org.antlr.runtime.DFA.unpackEncodedString(DFA64_transitionS[i]);

+		}

+	}

+

+	class DFA64 extends DFA {

+

+		public DFA64(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 64;

+			this.eot = DFA64_eot;

+			this.eof = DFA64_eof;

+			this.min = DFA64_min;

+			this.max = DFA64_max;

+			this.accept = DFA64_accept;

+			this.special = DFA64_special;

+			this.transition = DFA64_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "4931:1: ( rule__Selector__Alternatives_1 )?";

+		}

+	}

+

+	static final String DFA83_eotS =

+			"\14\uffff";

+	static final String DFA83_eofS =

+			"\1\1\13\uffff";

+	static final String DFA83_minS =

+			"\1\4\1\uffff\11\0\1\uffff";

+	static final String DFA83_maxS =

+			"\1\100\1\uffff\11\0\1\uffff";

+	static final String DFA83_acceptS =

+			"\1\uffff\1\2\11\uffff\1\1";

+	static final String DFA83_specialS =

+			"\2\uffff\1\5\1\4\1\7\1\6\1\10\1\0\1\2\1\1\1\3\1\uffff}>";

+	static final String[] DFA83_transitionS = {

+			"\6\1\1\2\1\3\2\1\1\4\1\5\1\12\2\1\15\uffff\4\1\1\uffff\3\1" +

+					"\2\uffff\2\1\4\uffff\1\1\1\6\1\7\1\10\1\11\5\uffff\5\1\1\uffff" +

+					"\1\1",

+			"",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			""

+	};

+

+	static final short[] DFA83_eot = DFA.unpackEncodedString(DFA83_eotS);

+	static final short[] DFA83_eof = DFA.unpackEncodedString(DFA83_eofS);

+	static final char[] DFA83_min = DFA.unpackEncodedStringToUnsignedChars(DFA83_minS);

+	static final char[] DFA83_max = DFA.unpackEncodedStringToUnsignedChars(DFA83_maxS);

+	static final short[] DFA83_accept = DFA.unpackEncodedString(DFA83_acceptS);

+	static final short[] DFA83_special = DFA.unpackEncodedString(DFA83_specialS);

+	static final short[][] DFA83_transition;

+

+	static {

+		int numStates = DFA83_transitionS.length;

+		DFA83_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA83_transition[i] = org.antlr.runtime.DFA.unpackEncodedString(DFA83_transitionS[i]);

+		}

+	}

+

+	class DFA83 extends DFA {

+

+		public DFA83(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 83;

+			this.eot = DFA83_eot;

+			this.eof = DFA83_eof;

+			this.min = DFA83_min;

+			this.max = DFA83_max;

+			this.accept = DFA83_accept;

+			this.special = DFA83_special;

+			this.transition = DFA83_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "()* loopback of 7549:1: ( rule__Identifier__Group_2__0 )*";

+		}

+

+		@Override

+		public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {

+			TokenStream input = (TokenStream) _input;

+			int _s = s;

+			switch (s) {

+			case 0:

+				int LA83_7 = input.LA(1);

+

+

+				int index83_7 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred134_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index83_7);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 1:

+				int LA83_9 = input.LA(1);

+

+

+				int index83_9 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred134_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index83_9);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 2:

+				int LA83_8 = input.LA(1);

+

+

+				int index83_8 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred134_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index83_8);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 3:

+				int LA83_10 = input.LA(1);

+

+

+				int index83_10 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred134_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index83_10);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 4:

+				int LA83_3 = input.LA(1);

+

+

+				int index83_3 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred134_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index83_3);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 5:

+				int LA83_2 = input.LA(1);

+

+

+				int index83_2 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred134_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index83_2);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 6:

+				int LA83_5 = input.LA(1);

+

+

+				int index83_5 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred134_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index83_5);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 7:

+				int LA83_4 = input.LA(1);

+

+

+				int index83_4 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred134_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index83_4);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 8:

+				int LA83_6 = input.LA(1);

+

+

+				int index83_6 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred134_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index83_6);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			}

+			if (state.backtracking > 0) {

+				state.failed = true;

+				return -1;

+			}

+			NoViableAltException nvae =

+					new NoViableAltException(getDescription(), 83, _s, input);

+			error(nvae);

+			throw nvae;

+		}

+	}

+

+

+	public static final BitSet FOLLOW_rulestylesheet_in_entryRulestylesheet67 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulestylesheet74 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Stylesheet__Group__0_in_rulestylesheet100 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecharset_in_entryRulecharset127 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulecharset134 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Charset__Group__0_in_rulecharset160 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleimportExpression_in_entryRuleimportExpression187 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleimportExpression194 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ImportExpression__Group__0_in_ruleimportExpression220 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulepage_in_entryRulepage247 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulepage254 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__Group__0_in_rulepage280 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulepseudo_page_in_entryRulepseudo_page307 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulepseudo_page314 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Pseudo_page__Group__0_in_rulepseudo_page340 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulemedia_in_entryRulemedia367 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulemedia374 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Media__Group__0_in_rulemedia400 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulemedia_list_in_entryRulemedia_list427 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulemedia_list434 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Media_list__Group__0_in_rulemedia_list460 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulemedium_in_entryRulemedium487 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulemedium494 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rulemedium520 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulefont_face_in_entryRulefont_face546 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulefont_face553 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Font_face__Group__0_in_rulefont_face579 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulekeyframes_in_entryRulekeyframes606 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulekeyframes613 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__0_in_rulekeyframes639 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulekeyframe_selector_in_entryRulekeyframe_selector666 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulekeyframe_selector673 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group__0_in_rulekeyframe_selector699 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleruleset_in_entryRuleruleset726 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleruleset733 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group__0_in_ruleruleset759 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleselector_in_entryRuleselector791 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleselector798 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__Group__0_in_ruleselector828 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleSimpleSelectorForNegation_in_entryRuleSimpleSelectorForNegation855 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleSimpleSelectorForNegation862 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SimpleSelectorForNegation__Alternatives_in_ruleSimpleSelectorForNegation888 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleSubSelectorForNegation_in_entryRuleSubSelectorForNegation915 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleSubSelectorForNegation922 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SubSelectorForNegation__Alternatives_in_ruleSubSelectorForNegation948 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulesimple_selector_in_entryRulesimple_selector980 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulesimple_selector987 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Simple_selector__Alternatives_in_rulesimple_selector1017 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleSubSelector_in_entryRuleSubSelector1044 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleSubSelector1051 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SubSelector__Alternatives_in_ruleSubSelector1077 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleAttributeSelector_in_entryRuleAttributeSelector1104 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleAttributeSelector1111 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group__0_in_ruleAttributeSelector1137 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleClassSelector_in_entryRuleClassSelector1164 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleClassSelector1171 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ClassSelector__Group__0_in_ruleClassSelector1197 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleElementSelector_in_entryRuleElementSelector1224 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleElementSelector1231 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ElementSelector__Group__0_in_ruleElementSelector1257 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleUniversalSelector_in_entryRuleUniversalSelector1284 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleUniversalSelector1291 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__UniversalSelector__Group__0_in_ruleUniversalSelector1317 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdSelector_in_entryRuleIdSelector1344 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleIdSelector1351 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdSelector__Group__0_in_ruleIdSelector1377 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_namespace_prefix_in_entryRulecss_namespace_prefix1404 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulecss_namespace_prefix1411 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_namespace_prefix__Group__0_in_rulecss_namespace_prefix1437 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_entryRulecss_declaration1469 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulecss_declaration1476 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_declaration__Group__0_in_rulecss_declaration1506 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_property_in_entryRulecss_property1533 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulecss_property1540 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_property__Group__0_in_rulecss_property1566 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleValidPropertyIdent_in_entryRuleValidPropertyIdent1593 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleValidPropertyIdent1600 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_ruleValidPropertyIdent1626 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClassOrFunc_in_entryRulePseudoClassOrFunc1652 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulePseudoClassOrFunc1659 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassOrFunc__Alternatives_in_rulePseudoClassOrFunc1685 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClass_in_entryRulePseudoClass1712 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulePseudoClass1719 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClass__Group__0_in_rulePseudoClass1745 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClassName_in_entryRulePseudoClassName1772 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulePseudoClassName1779 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassName__NameAssignment_in_rulePseudoClassName1805 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClassFunction_in_entryRulePseudoClassFunction1832 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulePseudoClassFunction1839 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Alternatives_in_rulePseudoClassFunction1865 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleNotFunctionCall_in_entryRuleNotFunctionCall1897 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleNotFunctionCall1904 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__NotFunctionCall__Group__0_in_ruleNotFunctionCall1934 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecombinator_in_entryRulecombinator1961 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulecombinator1968 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Combinator__Alternatives_in_rulecombinator1994 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleSymbolTok_in_entryRuleSymbolTok2025 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleSymbolTok2032 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SymbolTok__Group__0_in_ruleSymbolTok2058 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleWSTok_in_entryRuleWSTok2085 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleWSTok2092 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__WSTok__Group__0_in_ruleWSTok2118 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleStringTok_in_entryRuleStringTok2145 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleStringTok2152 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__StringTok__Group__0_in_ruleStringTok2178 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleNumberTok_in_entryRuleNumberTok2210 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleNumberTok2217 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__NumberTok__Group__0_in_ruleNumberTok2247 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleUrlTok_in_entryRuleUrlTok2274 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleUrlTok2281 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__UrlTok__Group__0_in_ruleUrlTok2307 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleColorTok_in_entryRuleColorTok2339 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleColorTok2346 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ColorTok__Group__0_in_ruleColorTok2376 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifierOrFuncTok_in_entryRuleIdentifierOrFuncTok2408 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleIdentifierOrFuncTok2415 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group__0_in_ruleIdentifierOrFuncTok2445 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleCssTok_in_entryRuleCssTok2477 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleCssTok2484 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__CssTok__Alternatives_in_ruleCssTok2514 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleURLType_in_entryRuleURLType2546 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleURLType2553 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__URLType__Group__0_in_ruleURLType2583 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleValidURLSymbol_in_entryRuleValidURLSymbol2610 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleValidURLSymbol2617 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ValidURLSymbol__Alternatives_in_ruleValidURLSymbol2643 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleKeywordHack_in_entryRuleKeywordHack2670 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleKeywordHack2677 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__KeywordHack__Alternatives_in_ruleKeywordHack2703 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleValidURL_in_entryRuleValidURL2735 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleValidURL2742 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ValidURL__Alternatives_in_ruleValidURL2772 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier2804 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier2811 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Identifier__Group__0_in_ruleIdentifier2841 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleNum_in_entryRuleNum2873 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleNum2880 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Num__Group__0_in_ruleNum2910 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleHex_in_entryRuleHex2937 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleHex2944 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Hex__Group__0_in_ruleHex2970 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Stylesheet__RulesetAssignment_2_0_in_rule__Stylesheet__Alternatives_23006 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Stylesheet__MediaAssignment_2_1_in_rule__Stylesheet__Alternatives_23024 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Stylesheet__PageAssignment_2_2_in_rule__Stylesheet__Alternatives_23042 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Stylesheet__Font_faceAssignment_2_3_in_rule__Stylesheet__Alternatives_23060 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Stylesheet__KeyframesAssignment_2_4_in_rule__Stylesheet__Alternatives_23078 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_20_in_rule__Charset__Alternatives_03112 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_21_in_rule__Charset__Alternatives_03132 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_22_in_rule__ImportExpression__Alternatives_03167 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_23_in_rule__ImportExpression__Alternatives_03187 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ImportExpression__ValueAssignment_1_0_in_rule__ImportExpression__Alternatives_13221 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ImportExpression__Group_1_1__0_in_rule__ImportExpression__Alternatives_13239 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_24_in_rule__Page__Alternatives_13273 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_25_in_rule__Page__Alternatives_13293 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_26_in_rule__Media__Alternatives_03328 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_27_in_rule__Media__Alternatives_03348 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_28_in_rule__Font_face__Alternatives_13383 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_29_in_rule__Font_face__Alternatives_13403 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_30_in_rule__Keyframes__Alternatives_13438 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_31_in_rule__Keyframes__Alternatives_13458 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__TypeAssignment_0_0_in_rule__Keyframe_selector__Alternatives_03492 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group_0_1__0_in_rule__Keyframe_selector__Alternatives_03510 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_0__0_in_rule__Selector__Alternatives_13543 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_1__0_in_rule__Selector__Alternatives_13561 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SimpleSelectorForNegation__Group_0__0_in_rule__SimpleSelectorForNegation__Alternatives3594 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SimpleSelectorForNegation__SubSelectorsAssignment_1_in_rule__SimpleSelectorForNegation__Alternatives3614 = new BitSet(new long[] { 0x0000048000003002L });

+	public static final BitSet FOLLOW_rule__SimpleSelectorForNegation__SubSelectorsAssignment_1_in_rule__SimpleSelectorForNegation__Alternatives3626 = new BitSet(new long[] { 0x0000048000003002L });

+	public static final BitSet FOLLOW_rule__SimpleSelectorForNegation__ElementAssignment_0_0_0_in_rule__SimpleSelectorForNegation__Alternatives_0_03662 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SimpleSelectorForNegation__UniversalAssignment_0_0_1_in_rule__SimpleSelectorForNegation__Alternatives_0_03680 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdSelector_in_rule__SubSelectorForNegation__Alternatives3713 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleClassSelector_in_rule__SubSelectorForNegation__Alternatives3730 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleAttributeSelector_in_rule__SubSelectorForNegation__Alternatives3747 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClass_in_rule__SubSelectorForNegation__Alternatives3764 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Simple_selector__Group_0__0_in_rule__Simple_selector__Alternatives3796 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Simple_selector__SubSelectorsAssignment_1_in_rule__Simple_selector__Alternatives3816 = new BitSet(new long[] { 0x0000048000003002L });

+	public static final BitSet FOLLOW_rule__Simple_selector__SubSelectorsAssignment_1_in_rule__Simple_selector__Alternatives3828 = new BitSet(new long[] { 0x0000048000003002L });

+	public static final BitSet FOLLOW_rule__Simple_selector__ElementAssignment_0_0_0_in_rule__Simple_selector__Alternatives_0_03864 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Simple_selector__UniversalAssignment_0_0_1_in_rule__Simple_selector__Alternatives_0_03882 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdSelector_in_rule__SubSelector__Alternatives3915 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleClassSelector_in_rule__SubSelector__Alternatives3932 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleAttributeSelector_in_rule__SubSelector__Alternatives3949 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClassOrFunc_in_rule__SubSelector__Alternatives3966 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_32_in_rule__AttributeSelector__OpAlternatives_3_0_03999 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_33_in_rule__AttributeSelector__OpAlternatives_3_0_04019 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_34_in_rule__AttributeSelector__OpAlternatives_3_0_04039 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_35_in_rule__AttributeSelector__OpAlternatives_3_0_04059 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_INCLUDES_in_rule__AttributeSelector__OpAlternatives_3_0_04078 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_DASHMATCH_in_rule__AttributeSelector__OpAlternatives_3_0_04095 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rule__AttributeSelector__ValueAlternatives_3_1_04127 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_CSSSTRING_in_rule__AttributeSelector__ValueAlternatives_3_1_04144 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rule__Css_namespace_prefix__Alternatives_04176 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_36_in_rule__Css_namespace_prefix__Alternatives_04194 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClass_in_rule__PseudoClassOrFunc__Alternatives4228 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClassFunction_in_rule__PseudoClassOrFunc__Alternatives4245 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_0__0_in_rule__PseudoClassFunction__Alternatives4277 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_1__0_in_rule__PseudoClassFunction__Alternatives4295 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_PLUS_in_rule__Combinator__Alternatives4328 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_37_in_rule__Combinator__Alternatives4346 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_38_in_rule__Combinator__Alternatives4366 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COMMA_in_rule__SymbolTok__SymbolAlternatives_1_04402 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_PERCENT_in_rule__SymbolTok__SymbolAlternatives_1_04419 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifierOrFuncTok_in_rule__CssTok__Alternatives4451 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleSymbolTok_in_rule__CssTok__Alternatives4468 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleWSTok_in_rule__CssTok__Alternatives4485 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleStringTok_in_rule__CssTok__Alternatives4502 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleNumberTok_in_rule__CssTok__Alternatives4519 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleUrlTok_in_rule__CssTok__Alternatives4536 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleColorTok_in_rule__CssTok__Alternatives4553 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_DASH_in_rule__ValidURLSymbol__Alternatives4585 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_39_in_rule__ValidURLSymbol__Alternatives4603 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_UNDERSCORE_in_rule__ValidURLSymbol__Alternatives4622 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_38_in_rule__ValidURLSymbol__Alternatives4640 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COLON_in_rule__ValidURLSymbol__Alternatives4659 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_40_in_rule__ValidURLSymbol__Alternatives4677 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_41_in_rule__ValidURLSymbol__Alternatives4697 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_HASHMARK_in_rule__ValidURLSymbol__Alternatives4716 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_42_in_rule__ValidURLSymbol__Alternatives4734 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_43_in_rule__ValidURLSymbol__Alternatives4754 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_44_in_rule__ValidURLSymbol__Alternatives4774 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_45_in_rule__ValidURLSymbol__Alternatives4794 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_46_in_rule__ValidURLSymbol__Alternatives4814 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_47_in_rule__ValidURLSymbol__Alternatives4834 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_36_in_rule__ValidURLSymbol__Alternatives4854 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_PLUS_in_rule__ValidURLSymbol__Alternatives4873 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COMMA_in_rule__ValidURLSymbol__Alternatives4890 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_48_in_rule__ValidURLSymbol__Alternatives4908 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ValidURLSymbol__Group_18__0_in_rule__ValidURLSymbol__Alternatives4927 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_49_in_rule__KeywordHack__Alternatives4961 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_50_in_rule__KeywordHack__Alternatives4981 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_51_in_rule__KeywordHack__Alternatives5001 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_52_in_rule__KeywordHack__Alternatives5021 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_CSSSTRING_in_rule__ValidURL__Alternatives5055 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ValidURL__Alternatives_1_in_rule__ValidURL__Alternatives5074 = new BitSet(new long[] { 0x03FFFFD80001FF82L });

+	public static final BitSet FOLLOW_rule__ValidURL__Alternatives_1_in_rule__ValidURL__Alternatives5086 = new BitSet(new long[] { 0x03FFFFD80001FF82L });

+	public static final BitSet FOLLOW_ruleValidURLSymbol_in_rule__ValidURL__Alternatives_15122 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleKeywordHack_in_rule__ValidURL__Alternatives_15139 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_HEX_LETTER_in_rule__ValidURL__Alternatives_15156 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_NON_HEX_LETTER_in_rule__ValidURL__Alternatives_15173 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_rule__ValidURL__Alternatives_15190 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_53_in_rule__ValidURL__Alternatives_15208 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_54_in_rule__ValidURL__Alternatives_15228 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_55_in_rule__ValidURL__Alternatives_15248 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_56_in_rule__ValidURL__Alternatives_15268 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_57_in_rule__ValidURL__Alternatives_15288 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ValidURL__Group_1_10__0_in_rule__ValidURL__Alternatives_15307 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_rule__ValidURL__Alternatives_1_10_15340 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_HEX_LETTER_in_rule__ValidURL__Alternatives_1_10_15357 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_rule__ValidURL__Alternatives_1_10_25389 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_HEX_LETTER_in_rule__ValidURL__Alternatives_1_10_25406 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_UNDERSCORE_in_rule__Identifier__Alternatives_15438 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_HEX_LETTER_in_rule__Identifier__Alternatives_15455 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_NON_HEX_LETTER_in_rule__Identifier__Alternatives_15472 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleKeywordHack_in_rule__Identifier__Alternatives_15489 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_UNDERSCORE_in_rule__Identifier__Alternatives_2_05521 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_DASH_in_rule__Identifier__Alternatives_2_05538 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_HEX_LETTER_in_rule__Identifier__Alternatives_2_05555 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_NON_HEX_LETTER_in_rule__Identifier__Alternatives_2_05572 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_rule__Identifier__Alternatives_2_05589 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleKeywordHack_in_rule__Identifier__Alternatives_2_05606 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_PLUS_in_rule__Num__Alternatives_05638 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_DASH_in_rule__Num__Alternatives_05655 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Num__Group_1_0__0_in_rule__Num__Alternatives_15687 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Num__Group_1_1__0_in_rule__Num__Alternatives_15705 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_rule__Hex__Alternatives_1_05738 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_HEX_LETTER_in_rule__Hex__Alternatives_1_05755 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Stylesheet__Group__0__Impl_in_rule__Stylesheet__Group__05785 = new BitSet(new long[] { 0x101E0490FFC0FC00L });

+	public static final BitSet FOLLOW_rule__Stylesheet__Group__1_in_rule__Stylesheet__Group__05788 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Stylesheet__CharsetAssignment_0_in_rule__Stylesheet__Group__0__Impl5815 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Stylesheet__Group__1__Impl_in_rule__Stylesheet__Group__15846 = new BitSet(new long[] { 0x101E0490FFC0FC00L });

+	public static final BitSet FOLLOW_rule__Stylesheet__Group__2_in_rule__Stylesheet__Group__15849 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Stylesheet__ImportsAssignment_1_in_rule__Stylesheet__Group__1__Impl5876 = new BitSet(new long[] { 0x0000000000C00002L });

+	public static final BitSet FOLLOW_rule__Stylesheet__Group__2__Impl_in_rule__Stylesheet__Group__25907 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Stylesheet__Alternatives_2_in_rule__Stylesheet__Group__2__Impl5934 = new BitSet(new long[] { 0x101E0490FF00FC02L });

+	public static final BitSet FOLLOW_rule__Charset__Group__0__Impl_in_rule__Charset__Group__05971 = new BitSet(new long[] { 0x0000000000000040L });

+	public static final BitSet FOLLOW_rule__Charset__Group__1_in_rule__Charset__Group__05974 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Charset__Alternatives_0_in_rule__Charset__Group__0__Impl6001 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Charset__Group__1__Impl_in_rule__Charset__Group__16031 = new BitSet(new long[] { 0x0001000000000000L });

+	public static final BitSet FOLLOW_rule__Charset__Group__2_in_rule__Charset__Group__16034 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Charset__CharsetAssignment_1_in_rule__Charset__Group__1__Impl6061 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Charset__Group__2__Impl_in_rule__Charset__Group__26091 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_48_in_rule__Charset__Group__2__Impl6119 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ImportExpression__Group__0__Impl_in_rule__ImportExpression__Group__06156 = new BitSet(new long[] { 0x0000000000000040L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_rule__ImportExpression__Group__1_in_rule__ImportExpression__Group__06159 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ImportExpression__Alternatives_0_in_rule__ImportExpression__Group__0__Impl6186 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ImportExpression__Group__1__Impl_in_rule__ImportExpression__Group__16216 = new BitSet(new long[] { 0x0001000000000000L });

+	public static final BitSet FOLLOW_rule__ImportExpression__Group__2_in_rule__ImportExpression__Group__16219 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ImportExpression__Alternatives_1_in_rule__ImportExpression__Group__1__Impl6246 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ImportExpression__Group__2__Impl_in_rule__ImportExpression__Group__26276 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_48_in_rule__ImportExpression__Group__2__Impl6304 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ImportExpression__Group_1_1__0__Impl_in_rule__ImportExpression__Group_1_1__06341 = new BitSet(new long[] { 0x001E00000000CC00L });

+	public static final BitSet FOLLOW_rule__ImportExpression__Group_1_1__1_in_rule__ImportExpression__Group_1_1__06344 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleURLType_in_rule__ImportExpression__Group_1_1__0__Impl6371 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ImportExpression__Group_1_1__1__Impl_in_rule__ImportExpression__Group_1_1__16400 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ImportExpression__MediaListAssignment_1_1_1_in_rule__ImportExpression__Group_1_1__1__Impl6427 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__Group__0__Impl_in_rule__Page__Group__06462 = new BitSet(new long[] { 0x0000000003000000L });

+	public static final BitSet FOLLOW_rule__Page__Group__1_in_rule__Page__Group__06465 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__Group__1__Impl_in_rule__Page__Group__16523 = new BitSet(new long[] { 0x0400000000001000L });

+	public static final BitSet FOLLOW_rule__Page__Group__2_in_rule__Page__Group__16526 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__Alternatives_1_in_rule__Page__Group__1__Impl6553 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__Group__2__Impl_in_rule__Page__Group__26583 = new BitSet(new long[] { 0x0400000000001000L });

+	public static final BitSet FOLLOW_rule__Page__Group__3_in_rule__Page__Group__26586 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__PseudoPageAssignment_2_in_rule__Page__Group__2__Impl6613 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__Group__3__Impl_in_rule__Page__Group__36644 = new BitSet(new long[] { 0x081F00000002CC00L });

+	public static final BitSet FOLLOW_rule__Page__Group__4_in_rule__Page__Group__36647 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_58_in_rule__Page__Group__3__Impl6675 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__Group__4__Impl_in_rule__Page__Group__46706 = new BitSet(new long[] { 0x081F00000002CC00L });

+	public static final BitSet FOLLOW_rule__Page__Group__5_in_rule__Page__Group__46709 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__DeclarationsAssignment_4_in_rule__Page__Group__4__Impl6736 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__Group__5__Impl_in_rule__Page__Group__56767 = new BitSet(new long[] { 0x081F00000002CC00L });

+	public static final BitSet FOLLOW_rule__Page__Group__6_in_rule__Page__Group__56770 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__Group_5__0_in_rule__Page__Group__5__Impl6797 = new BitSet(new long[] { 0x0001000000000002L });

+	public static final BitSet FOLLOW_rule__Page__Group__6__Impl_in_rule__Page__Group__66828 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_59_in_rule__Page__Group__6__Impl6856 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__Group_5__0__Impl_in_rule__Page__Group_5__06901 = new BitSet(new long[] { 0x001E00000002CC00L });

+	public static final BitSet FOLLOW_rule__Page__Group_5__1_in_rule__Page__Group_5__06904 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_48_in_rule__Page__Group_5__0__Impl6932 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__Group_5__1__Impl_in_rule__Page__Group_5__16963 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Page__DeclarationsAssignment_5_1_in_rule__Page__Group_5__1__Impl6990 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Pseudo_page__Group__0__Impl_in_rule__Pseudo_page__Group__07025 = new BitSet(new long[] { 0x001E00000000CC00L });

+	public static final BitSet FOLLOW_rule__Pseudo_page__Group__1_in_rule__Pseudo_page__Group__07028 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COLON_in_rule__Pseudo_page__Group__0__Impl7055 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Pseudo_page__Group__1__Impl_in_rule__Pseudo_page__Group__17084 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rule__Pseudo_page__Group__1__Impl7111 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Media__Group__0__Impl_in_rule__Media__Group__07144 = new BitSet(new long[] { 0x001E00000000CC00L });

+	public static final BitSet FOLLOW_rule__Media__Group__1_in_rule__Media__Group__07147 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Media__Alternatives_0_in_rule__Media__Group__0__Impl7174 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Media__Group__1__Impl_in_rule__Media__Group__17204 = new BitSet(new long[] { 0x0400000000000000L });

+	public static final BitSet FOLLOW_rule__Media__Group__2_in_rule__Media__Group__17207 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Media__MedialistAssignment_1_in_rule__Media__Group__1__Impl7234 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Media__Group__2__Impl_in_rule__Media__Group__27264 = new BitSet(new long[] { 0x181E04900000FC00L });

+	public static final BitSet FOLLOW_rule__Media__Group__3_in_rule__Media__Group__27267 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_58_in_rule__Media__Group__2__Impl7295 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Media__Group__3__Impl_in_rule__Media__Group__37326 = new BitSet(new long[] { 0x181E04900000FC00L });

+	public static final BitSet FOLLOW_rule__Media__Group__4_in_rule__Media__Group__37329 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Media__RulesetsAssignment_3_in_rule__Media__Group__3__Impl7356 = new BitSet(new long[] { 0x101E04900000FC02L });

+	public static final BitSet FOLLOW_rule__Media__Group__4__Impl_in_rule__Media__Group__47387 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_59_in_rule__Media__Group__4__Impl7415 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Media_list__Group__0__Impl_in_rule__Media_list__Group__07456 = new BitSet(new long[] { 0x0000000000000100L });

+	public static final BitSet FOLLOW_rule__Media_list__Group__1_in_rule__Media_list__Group__07459 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulemedium_in_rule__Media_list__Group__0__Impl7486 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Media_list__Group__1__Impl_in_rule__Media_list__Group__17515 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Media_list__Group_1__0_in_rule__Media_list__Group__1__Impl7542 = new BitSet(new long[] { 0x0000000000000102L });

+	public static final BitSet FOLLOW_rule__Media_list__Group_1__0__Impl_in_rule__Media_list__Group_1__07577 = new BitSet(new long[] { 0x001E00000000CC00L });

+	public static final BitSet FOLLOW_rule__Media_list__Group_1__1_in_rule__Media_list__Group_1__07580 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COMMA_in_rule__Media_list__Group_1__0__Impl7607 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Media_list__Group_1__1__Impl_in_rule__Media_list__Group_1__17636 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulemedium_in_rule__Media_list__Group_1__1__Impl7663 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Font_face__Group__0__Impl_in_rule__Font_face__Group__07696 = new BitSet(new long[] { 0x0000000030000000L });

+	public static final BitSet FOLLOW_rule__Font_face__Group__1_in_rule__Font_face__Group__07699 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Font_face__Group__1__Impl_in_rule__Font_face__Group__17757 = new BitSet(new long[] { 0x0400000000000000L });

+	public static final BitSet FOLLOW_rule__Font_face__Group__2_in_rule__Font_face__Group__17760 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Font_face__Alternatives_1_in_rule__Font_face__Group__1__Impl7787 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Font_face__Group__2__Impl_in_rule__Font_face__Group__27817 = new BitSet(new long[] { 0x081F00000002CC00L });

+	public static final BitSet FOLLOW_rule__Font_face__Group__3_in_rule__Font_face__Group__27820 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_58_in_rule__Font_face__Group__2__Impl7848 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Font_face__Group__3__Impl_in_rule__Font_face__Group__37879 = new BitSet(new long[] { 0x081F00000002CC00L });

+	public static final BitSet FOLLOW_rule__Font_face__Group__4_in_rule__Font_face__Group__37882 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Font_face__DeclarationsAssignment_3_in_rule__Font_face__Group__3__Impl7909 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Font_face__Group__4__Impl_in_rule__Font_face__Group__47940 = new BitSet(new long[] { 0x081F00000002CC00L });

+	public static final BitSet FOLLOW_rule__Font_face__Group__5_in_rule__Font_face__Group__47943 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Font_face__Group_4__0_in_rule__Font_face__Group__4__Impl7970 = new BitSet(new long[] { 0x0001000000000002L });

+	public static final BitSet FOLLOW_rule__Font_face__Group__5__Impl_in_rule__Font_face__Group__58001 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_59_in_rule__Font_face__Group__5__Impl8029 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Font_face__Group_4__0__Impl_in_rule__Font_face__Group_4__08072 = new BitSet(new long[] { 0x001E00000002CC00L });

+	public static final BitSet FOLLOW_rule__Font_face__Group_4__1_in_rule__Font_face__Group_4__08075 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_48_in_rule__Font_face__Group_4__0__Impl8103 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Font_face__Group_4__1__Impl_in_rule__Font_face__Group_4__18134 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Font_face__DeclarationsAssignment_4_1_in_rule__Font_face__Group_4__1__Impl8161 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__0__Impl_in_rule__Keyframes__Group__08196 = new BitSet(new long[] { 0x101E0490FF00FC00L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__1_in_rule__Keyframes__Group__08199 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__1__Impl_in_rule__Keyframes__Group__18257 = new BitSet(new long[] { 0x001E00000000CC00L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__2_in_rule__Keyframes__Group__18260 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__Alternatives_1_in_rule__Keyframes__Group__1__Impl8287 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__2__Impl_in_rule__Keyframes__Group__28317 = new BitSet(new long[] { 0x0400000000000000L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__3_in_rule__Keyframes__Group__28320 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__NameAssignment_2_in_rule__Keyframes__Group__2__Impl8347 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__3__Impl_in_rule__Keyframes__Group__38377 = new BitSet(new long[] { 0x081F00800001CC80L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__4_in_rule__Keyframes__Group__38380 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_58_in_rule__Keyframes__Group__3__Impl8408 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__4__Impl_in_rule__Keyframes__Group__48439 = new BitSet(new long[] { 0x081F00800001CC80L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__5_in_rule__Keyframes__Group__48442 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__KeyframeselectorsAssignment_4_in_rule__Keyframes__Group__4__Impl8469 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__5__Impl_in_rule__Keyframes__Group__58500 = new BitSet(new long[] { 0x081F00800001CC80L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__6_in_rule__Keyframes__Group__58503 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group_5__0_in_rule__Keyframes__Group__5__Impl8530 = new BitSet(new long[] { 0x0001000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group__6__Impl_in_rule__Keyframes__Group__68561 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_59_in_rule__Keyframes__Group__6__Impl8589 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group_5__0__Impl_in_rule__Keyframes__Group_5__08634 = new BitSet(new long[] { 0x001E00800001CC80L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group_5__1_in_rule__Keyframes__Group_5__08637 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_48_in_rule__Keyframes__Group_5__0__Impl8665 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__Group_5__1__Impl_in_rule__Keyframes__Group_5__18696 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframes__KeyframeselectorsAssignment_5_1_in_rule__Keyframes__Group_5__1__Impl8723 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group__0__Impl_in_rule__Keyframe_selector__Group__08758 = new BitSet(new long[] { 0x0400000000000000L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group__1_in_rule__Keyframe_selector__Group__08761 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Alternatives_0_in_rule__Keyframe_selector__Group__0__Impl8788 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group__1__Impl_in_rule__Keyframe_selector__Group__18818 = new BitSet(new long[] { 0x081F00000002CC00L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group__2_in_rule__Keyframe_selector__Group__18821 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_58_in_rule__Keyframe_selector__Group__1__Impl8849 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group__2__Impl_in_rule__Keyframe_selector__Group__28880 = new BitSet(new long[] { 0x081F00000002CC00L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group__3_in_rule__Keyframe_selector__Group__28883 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__DeclarationsAssignment_2_in_rule__Keyframe_selector__Group__2__Impl8910 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group__3__Impl_in_rule__Keyframe_selector__Group__38941 = new BitSet(new long[] { 0x081F00000002CC00L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group__4_in_rule__Keyframe_selector__Group__38944 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group_3__0_in_rule__Keyframe_selector__Group__3__Impl8971 = new BitSet(new long[] { 0x0001000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group__4__Impl_in_rule__Keyframe_selector__Group__49002 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_59_in_rule__Keyframe_selector__Group__4__Impl9030 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group_0_1__0__Impl_in_rule__Keyframe_selector__Group_0_1__09071 = new BitSet(new long[] { 0x0000000000000200L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group_0_1__1_in_rule__Keyframe_selector__Group_0_1__09074 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__PercentageAssignment_0_1_0_in_rule__Keyframe_selector__Group_0_1__0__Impl9101 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group_0_1__1__Impl_in_rule__Keyframe_selector__Group_0_1__19131 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_PERCENT_in_rule__Keyframe_selector__Group_0_1__1__Impl9158 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group_3__0__Impl_in_rule__Keyframe_selector__Group_3__09191 = new BitSet(new long[] { 0x001E00000002CC00L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group_3__1_in_rule__Keyframe_selector__Group_3__09194 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_48_in_rule__Keyframe_selector__Group_3__0__Impl9222 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__Group_3__1__Impl_in_rule__Keyframe_selector__Group_3__19253 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Keyframe_selector__DeclarationsAssignment_3_1_in_rule__Keyframe_selector__Group_3__1__Impl9280 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group__0__Impl_in_rule__Ruleset__Group__09315 = new BitSet(new long[] { 0x0400000000020100L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group__1_in_rule__Ruleset__Group__09318 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__SelectorsAssignment_0_in_rule__Ruleset__Group__0__Impl9345 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group__1__Impl_in_rule__Ruleset__Group__19375 = new BitSet(new long[] { 0x0400000000020100L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group__2_in_rule__Ruleset__Group__19378 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_1__0_in_rule__Ruleset__Group__1__Impl9405 = new BitSet(new long[] { 0x0000000000020102L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group__2__Impl_in_rule__Ruleset__Group__29436 = new BitSet(new long[] { 0x0400000000020100L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group__3_in_rule__Ruleset__Group__29439 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_WS_in_rule__Ruleset__Group__2__Impl9467 = new BitSet(new long[] { 0x0000000000020002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group__3__Impl_in_rule__Ruleset__Group__39498 = new BitSet(new long[] { 0x081E00000002CC00L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group__4_in_rule__Ruleset__Group__39501 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_58_in_rule__Ruleset__Group__3__Impl9529 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group__4__Impl_in_rule__Ruleset__Group__49560 = new BitSet(new long[] { 0x081E00000002CC00L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group__5_in_rule__Ruleset__Group__49563 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_4__0_in_rule__Ruleset__Group__4__Impl9590 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group__5__Impl_in_rule__Ruleset__Group__59621 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_59_in_rule__Ruleset__Group__5__Impl9649 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_1__0__Impl_in_rule__Ruleset__Group_1__09692 = new BitSet(new long[] { 0x0000000000020100L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_1__1_in_rule__Ruleset__Group_1__09695 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_WS_in_rule__Ruleset__Group_1__0__Impl9723 = new BitSet(new long[] { 0x0000000000020002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_1__1__Impl_in_rule__Ruleset__Group_1__19754 = new BitSet(new long[] { 0x101E04900000FC00L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_1__2_in_rule__Ruleset__Group_1__19757 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COMMA_in_rule__Ruleset__Group_1__1__Impl9784 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_1__2__Impl_in_rule__Ruleset__Group_1__29813 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__SelectorsAssignment_1_2_in_rule__Ruleset__Group_1__2__Impl9840 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_4__0__Impl_in_rule__Ruleset__Group_4__09876 = new BitSet(new long[] { 0x0001000000000000L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_4__1_in_rule__Ruleset__Group_4__09879 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__DeclarationsAssignment_4_0_in_rule__Ruleset__Group_4__0__Impl9906 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_4__1__Impl_in_rule__Ruleset__Group_4__19936 = new BitSet(new long[] { 0x0001000000000000L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_4__2_in_rule__Ruleset__Group_4__19939 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_4_1__0_in_rule__Ruleset__Group_4__1__Impl9966 = new BitSet(new long[] { 0x0001000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_4__2__Impl_in_rule__Ruleset__Group_4__29997 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_48_in_rule__Ruleset__Group_4__2__Impl10026 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_4_1__0__Impl_in_rule__Ruleset__Group_4_1__010065 = new BitSet(new long[] { 0x001E00000002CC00L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_4_1__1_in_rule__Ruleset__Group_4_1__010068 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_48_in_rule__Ruleset__Group_4_1__0__Impl10096 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__Group_4_1__1__Impl_in_rule__Ruleset__Group_4_1__110127 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Ruleset__DeclarationsAssignment_4_1_1_in_rule__Ruleset__Group_4_1__1__Impl10154 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__Group__0__Impl_in_rule__Selector__Group__010188 = new BitSet(new long[] { 0x0000006000020080L });

+	public static final BitSet FOLLOW_rule__Selector__Group__1_in_rule__Selector__Group__010191 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__SimpleselectorsAssignment_0_in_rule__Selector__Group__0__Impl10218 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__Group__1__Impl_in_rule__Selector__Group__110248 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__Alternatives_1_in_rule__Selector__Group__1__Impl10275 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_0__0__Impl_in_rule__Selector__Group_1_0__010310 = new BitSet(new long[] { 0x101E04900002FC00L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_0__1_in_rule__Selector__Group_1_0__010313 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__CombinatorAssignment_1_0_0_in_rule__Selector__Group_1_0__0__Impl10340 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_0__1__Impl_in_rule__Selector__Group_1_0__110370 = new BitSet(new long[] { 0x101E04900002FC00L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_0__2_in_rule__Selector__Group_1_0__110373 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_WS_in_rule__Selector__Group_1_0__1__Impl10401 = new BitSet(new long[] { 0x0000000000020002L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_0__2__Impl_in_rule__Selector__Group_1_0__210432 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__SelectorAssignment_1_0_2_in_rule__Selector__Group_1_0__2__Impl10459 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_1__0__Impl_in_rule__Selector__Group_1_1__010495 = new BitSet(new long[] { 0x101E04F00000FC80L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_1__1_in_rule__Selector__Group_1_1__010498 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_WS_in_rule__Selector__Group_1_1__0__Impl10528 = new BitSet(new long[] { 0x0000000000020002L });

+	public static final BitSet FOLLOW_RULE_WS_in_rule__Selector__Group_1_1__0__Impl10541 = new BitSet(new long[] { 0x0000000000020002L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_1__1__Impl_in_rule__Selector__Group_1_1__110574 = new BitSet(new long[] { 0x101E04F00000FC80L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_1__2_in_rule__Selector__Group_1_1__110577 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_1_1__0_in_rule__Selector__Group_1_1__1__Impl10604 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_1__2__Impl_in_rule__Selector__Group_1_1__210635 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__SelectorAssignment_1_1_2_in_rule__Selector__Group_1_1__2__Impl10662 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_1_1__0__Impl_in_rule__Selector__Group_1_1_1__010698 = new BitSet(new long[] { 0x0000000000020000L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_1_1__1_in_rule__Selector__Group_1_1_1__010701 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__CombinatorAssignment_1_1_1_0_in_rule__Selector__Group_1_1_1__0__Impl10728 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Selector__Group_1_1_1__1__Impl_in_rule__Selector__Group_1_1_1__110758 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_WS_in_rule__Selector__Group_1_1_1__1__Impl10786 = new BitSet(new long[] { 0x0000000000020002L });

+	public static final BitSet FOLLOW_rule__SimpleSelectorForNegation__Group_0__0__Impl_in_rule__SimpleSelectorForNegation__Group_0__010821 = new BitSet(new long[] { 0x0000048000003000L });

+	public static final BitSet FOLLOW_rule__SimpleSelectorForNegation__Group_0__1_in_rule__SimpleSelectorForNegation__Group_0__010824 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SimpleSelectorForNegation__Alternatives_0_0_in_rule__SimpleSelectorForNegation__Group_0__0__Impl10851 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SimpleSelectorForNegation__Group_0__1__Impl_in_rule__SimpleSelectorForNegation__Group_0__110881 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_1_in_rule__SimpleSelectorForNegation__Group_0__1__Impl10908 = new BitSet(new long[] { 0x0000048000003002L });

+	public static final BitSet FOLLOW_rule__Simple_selector__Group_0__0__Impl_in_rule__Simple_selector__Group_0__010943 = new BitSet(new long[] { 0x0000048000003000L });

+	public static final BitSet FOLLOW_rule__Simple_selector__Group_0__1_in_rule__Simple_selector__Group_0__010946 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Simple_selector__Alternatives_0_0_in_rule__Simple_selector__Group_0__0__Impl10973 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Simple_selector__Group_0__1__Impl_in_rule__Simple_selector__Group_0__111003 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Simple_selector__SubSelectorsAssignment_0_1_in_rule__Simple_selector__Group_0__1__Impl11030 = new BitSet(new long[] { 0x0000048000003002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group__0__Impl_in_rule__AttributeSelector__Group__011065 = new BitSet(new long[] { 0x0000040000000000L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group__1_in_rule__AttributeSelector__Group__011068 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group__1__Impl_in_rule__AttributeSelector__Group__111126 = new BitSet(new long[] { 0x001E00000000CC00L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group__2_in_rule__AttributeSelector__Group__111129 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_42_in_rule__AttributeSelector__Group__1__Impl11157 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group__2__Impl_in_rule__AttributeSelector__Group__211188 = new BitSet(new long[] { 0x0000080F00000030L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group__3_in_rule__AttributeSelector__Group__211191 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__NameAssignment_2_in_rule__AttributeSelector__Group__2__Impl11218 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group__3__Impl_in_rule__AttributeSelector__Group__311248 = new BitSet(new long[] { 0x0000080F00000030L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group__4_in_rule__AttributeSelector__Group__311251 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group_3__0_in_rule__AttributeSelector__Group__3__Impl11278 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group__4__Impl_in_rule__AttributeSelector__Group__411309 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_43_in_rule__AttributeSelector__Group__4__Impl11337 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group_3__0__Impl_in_rule__AttributeSelector__Group_3__011378 = new BitSet(new long[] { 0x001E00000000CC40L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group_3__1_in_rule__AttributeSelector__Group_3__011381 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__OpAssignment_3_0_in_rule__AttributeSelector__Group_3__0__Impl11408 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__Group_3__1__Impl_in_rule__AttributeSelector__Group_3__111438 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__ValueAssignment_3_1_in_rule__AttributeSelector__Group_3__1__Impl11465 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ClassSelector__Group__0__Impl_in_rule__ClassSelector__Group__011499 = new BitSet(new long[] { 0x0000008000000000L });

+	public static final BitSet FOLLOW_rule__ClassSelector__Group__1_in_rule__ClassSelector__Group__011502 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ClassSelector__Group__1__Impl_in_rule__ClassSelector__Group__111560 = new BitSet(new long[] { 0x001E00000000CC00L });

+	public static final BitSet FOLLOW_rule__ClassSelector__Group__2_in_rule__ClassSelector__Group__111563 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_39_in_rule__ClassSelector__Group__1__Impl11591 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ClassSelector__Group__2__Impl_in_rule__ClassSelector__Group__211622 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ClassSelector__NameAssignment_2_in_rule__ClassSelector__Group__2__Impl11649 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ElementSelector__Group__0__Impl_in_rule__ElementSelector__Group__011685 = new BitSet(new long[] { 0x001E00000000CC00L });

+	public static final BitSet FOLLOW_rule__ElementSelector__Group__1_in_rule__ElementSelector__Group__011688 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ElementSelector__Group__1__Impl_in_rule__ElementSelector__Group__111746 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ElementSelector__NameAssignment_1_in_rule__ElementSelector__Group__1__Impl11773 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__UniversalSelector__Group__0__Impl_in_rule__UniversalSelector__Group__011807 = new BitSet(new long[] { 0x101E00100000CC00L });

+	public static final BitSet FOLLOW_rule__UniversalSelector__Group__1_in_rule__UniversalSelector__Group__011810 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__UniversalSelector__Group__1__Impl_in_rule__UniversalSelector__Group__111868 = new BitSet(new long[] { 0x101E00100000CC00L });

+	public static final BitSet FOLLOW_rule__UniversalSelector__Group__2_in_rule__UniversalSelector__Group__111871 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__UniversalSelector__NamespaceAssignment_1_in_rule__UniversalSelector__Group__1__Impl11898 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__UniversalSelector__Group__2__Impl_in_rule__UniversalSelector__Group__211929 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_36_in_rule__UniversalSelector__Group__2__Impl11957 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdSelector__Group__0__Impl_in_rule__IdSelector__Group__011994 = new BitSet(new long[] { 0x0000000000002000L });

+	public static final BitSet FOLLOW_rule__IdSelector__Group__1_in_rule__IdSelector__Group__011997 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdSelector__Group__1__Impl_in_rule__IdSelector__Group__112055 = new BitSet(new long[] { 0x001E00000000CC00L });

+	public static final BitSet FOLLOW_rule__IdSelector__Group__2_in_rule__IdSelector__Group__112058 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_HASHMARK_in_rule__IdSelector__Group__1__Impl12085 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdSelector__Group__2__Impl_in_rule__IdSelector__Group__212114 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdSelector__NameAssignment_2_in_rule__IdSelector__Group__2__Impl12141 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_namespace_prefix__Group__0__Impl_in_rule__Css_namespace_prefix__Group__012177 = new BitSet(new long[] { 0x101E00100000CC00L });

+	public static final BitSet FOLLOW_rule__Css_namespace_prefix__Group__1_in_rule__Css_namespace_prefix__Group__012180 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_namespace_prefix__Alternatives_0_in_rule__Css_namespace_prefix__Group__0__Impl12207 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_namespace_prefix__Group__1__Impl_in_rule__Css_namespace_prefix__Group__112238 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_60_in_rule__Css_namespace_prefix__Group__1__Impl12266 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_declaration__Group__0__Impl_in_rule__Css_declaration__Group__012301 = new BitSet(new long[] { 0x001E00000002CC00L });

+	public static final BitSet FOLLOW_rule__Css_declaration__Group__1_in_rule__Css_declaration__Group__012304 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_WS_in_rule__Css_declaration__Group__0__Impl12332 = new BitSet(new long[] { 0x0000000000020002L });

+	public static final BitSet FOLLOW_rule__Css_declaration__Group__1__Impl_in_rule__Css_declaration__Group__112363 = new BitSet(new long[] { 0x0000000000021000L });

+	public static final BitSet FOLLOW_rule__Css_declaration__Group__2_in_rule__Css_declaration__Group__112366 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_declaration__PropertyAssignment_1_in_rule__Css_declaration__Group__1__Impl12393 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_declaration__Group__2__Impl_in_rule__Css_declaration__Group__212423 = new BitSet(new long[] { 0x0000000000021000L });

+	public static final BitSet FOLLOW_rule__Css_declaration__Group__3_in_rule__Css_declaration__Group__212426 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_WS_in_rule__Css_declaration__Group__2__Impl12454 = new BitSet(new long[] { 0x0000000000020002L });

+	public static final BitSet FOLLOW_rule__Css_declaration__Group__3__Impl_in_rule__Css_declaration__Group__312485 = new BitSet(new long[] { 0x001E00800003EFC0L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_rule__Css_declaration__Group__4_in_rule__Css_declaration__Group__312488 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COLON_in_rule__Css_declaration__Group__3__Impl12515 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_declaration__Group__4__Impl_in_rule__Css_declaration__Group__412544 = new BitSet(new long[] { 0x0000000000040000L });

+	public static final BitSet FOLLOW_rule__Css_declaration__Group__5_in_rule__Css_declaration__Group__412547 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_declaration__ValueTokensAssignment_4_in_rule__Css_declaration__Group__4__Impl12576 = new BitSet(new long[] { 0x001E00800003EFC2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_rule__Css_declaration__ValueTokensAssignment_4_in_rule__Css_declaration__Group__4__Impl12588 = new BitSet(new long[] { 0x001E00800003EFC2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_rule__Css_declaration__Group__5__Impl_in_rule__Css_declaration__Group__512621 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_declaration__ImportantAssignment_5_in_rule__Css_declaration__Group__5__Impl12648 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_property__Group__0__Impl_in_rule__Css_property__Group__012691 = new BitSet(new long[] { 0x001E00000002CC00L });

+	public static final BitSet FOLLOW_rule__Css_property__Group__1_in_rule__Css_property__Group__012694 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_property__Group__1__Impl_in_rule__Css_property__Group__112752 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Css_property__NameAssignment_1_in_rule__Css_property__Group__1__Impl12779 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClass__Group__0__Impl_in_rule__PseudoClass__Group__012813 = new BitSet(new long[] { 0x001E00000000DC00L });

+	public static final BitSet FOLLOW_rule__PseudoClass__Group__1_in_rule__PseudoClass__Group__012816 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COLON_in_rule__PseudoClass__Group__0__Impl12843 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClass__Group__1__Impl_in_rule__PseudoClass__Group__112872 = new BitSet(new long[] { 0x001E00000000DC00L });

+	public static final BitSet FOLLOW_rule__PseudoClass__Group__2_in_rule__PseudoClass__Group__112875 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COLON_in_rule__PseudoClass__Group__1__Impl12903 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClass__Group__2__Impl_in_rule__PseudoClass__Group__212934 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClassName_in_rule__PseudoClass__Group__2__Impl12961 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_0__0__Impl_in_rule__PseudoClassFunction__Group_0__012996 = new BitSet(new long[] { 0x101E04900000FC00L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_0__1_in_rule__PseudoClassFunction__Group_0__012999 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__NotAssignment_0_0_in_rule__PseudoClassFunction__Group_0__0__Impl13026 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_0__1__Impl_in_rule__PseudoClassFunction__Group_0__113056 = new BitSet(new long[] { 0x2000000000000000L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_0__2_in_rule__PseudoClassFunction__Group_0__113059 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__ParamSelectorAssignment_0_1_in_rule__PseudoClassFunction__Group_0__1__Impl13086 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_0__2__Impl_in_rule__PseudoClassFunction__Group_0__213116 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_61_in_rule__PseudoClassFunction__Group_0__2__Impl13144 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_1__0__Impl_in_rule__PseudoClassFunction__Group_1__013181 = new BitSet(new long[] { 0x001E00000000CC00L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_1__1_in_rule__PseudoClassFunction__Group_1__013184 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COLON_in_rule__PseudoClassFunction__Group_1__0__Impl13211 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_1__1__Impl_in_rule__PseudoClassFunction__Group_1__113240 = new BitSet(new long[] { 0x4000000000000000L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_1__2_in_rule__PseudoClassFunction__Group_1__113243 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__NameAssignment_1_1_in_rule__PseudoClassFunction__Group_1__1__Impl13270 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_1__2__Impl_in_rule__PseudoClassFunction__Group_1__213300 = new BitSet(new long[] { 0x201E00800003EFC0L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_1__3_in_rule__PseudoClassFunction__Group_1__213303 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_62_in_rule__PseudoClassFunction__Group_1__2__Impl13331 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_1__3__Impl_in_rule__PseudoClassFunction__Group_1__313362 = new BitSet(new long[] { 0x201E00800003EFC0L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_1__4_in_rule__PseudoClassFunction__Group_1__313365 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__ParamsAssignment_1_3_in_rule__PseudoClassFunction__Group_1__3__Impl13392 = new BitSet(new long[] { 0x001E00800003EFC2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_rule__PseudoClassFunction__Group_1__4__Impl_in_rule__PseudoClassFunction__Group_1__413423 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_61_in_rule__PseudoClassFunction__Group_1__4__Impl13451 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__NotFunctionCall__Group__0__Impl_in_rule__NotFunctionCall__Group__013492 = new BitSet(new long[] { 0x8000000000000000L });

+	public static final BitSet FOLLOW_rule__NotFunctionCall__Group__1_in_rule__NotFunctionCall__Group__013495 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COLON_in_rule__NotFunctionCall__Group__0__Impl13522 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__NotFunctionCall__Group__1__Impl_in_rule__NotFunctionCall__Group__113551 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_63_in_rule__NotFunctionCall__Group__1__Impl13579 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SymbolTok__Group__0__Impl_in_rule__SymbolTok__Group__013614 = new BitSet(new long[] { 0x0000000000000300L });

+	public static final BitSet FOLLOW_rule__SymbolTok__Group__1_in_rule__SymbolTok__Group__013617 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SymbolTok__Group__1__Impl_in_rule__SymbolTok__Group__113675 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SymbolTok__SymbolAssignment_1_in_rule__SymbolTok__Group__1__Impl13702 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__WSTok__Group__0__Impl_in_rule__WSTok__Group__013736 = new BitSet(new long[] { 0x0000000000020000L });

+	public static final BitSet FOLLOW_rule__WSTok__Group__1_in_rule__WSTok__Group__013739 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__WSTok__Group__1__Impl_in_rule__WSTok__Group__113797 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_WS_in_rule__WSTok__Group__1__Impl13824 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__StringTok__Group__0__Impl_in_rule__StringTok__Group__013857 = new BitSet(new long[] { 0x0000000000000040L });

+	public static final BitSet FOLLOW_rule__StringTok__Group__1_in_rule__StringTok__Group__013860 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__StringTok__Group__1__Impl_in_rule__StringTok__Group__113918 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__StringTok__ValueAssignment_1_in_rule__StringTok__Group__1__Impl13945 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__NumberTok__Group__0__Impl_in_rule__NumberTok__Group__013979 = new BitSet(new long[] { 0x001E00800001CC80L });

+	public static final BitSet FOLLOW_rule__NumberTok__Group__1_in_rule__NumberTok__Group__013982 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__NumberTok__Group__1__Impl_in_rule__NumberTok__Group__114040 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__NumberTok__ValAssignment_1_in_rule__NumberTok__Group__1__Impl14067 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__UrlTok__Group__0__Impl_in_rule__UrlTok__Group__014101 = new BitSet(new long[] { 0x0000000000000040L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_rule__UrlTok__Group__1_in_rule__UrlTok__Group__014104 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__UrlTok__Group__1__Impl_in_rule__UrlTok__Group__114162 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__UrlTok__UrlAssignment_1_in_rule__UrlTok__Group__1__Impl14189 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ColorTok__Group__0__Impl_in_rule__ColorTok__Group__014223 = new BitSet(new long[] { 0x001E00800003EFC0L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_rule__ColorTok__Group__1_in_rule__ColorTok__Group__014226 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ColorTok__Group__1__Impl_in_rule__ColorTok__Group__114284 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ColorTok__ValueAssignment_1_in_rule__ColorTok__Group__1__Impl14311 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group__0__Impl_in_rule__IdentifierOrFuncTok__Group__014345 = new BitSet(new long[] { 0x001E00000000CC00L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group__1_in_rule__IdentifierOrFuncTok__Group__014348 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group__1__Impl_in_rule__IdentifierOrFuncTok__Group__114406 = new BitSet(new long[] { 0x4000000000000000L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group__2_in_rule__IdentifierOrFuncTok__Group__114409 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__NameAssignment_1_in_rule__IdentifierOrFuncTok__Group__1__Impl14436 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group__2__Impl_in_rule__IdentifierOrFuncTok__Group__214466 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group_2__0_in_rule__IdentifierOrFuncTok__Group__2__Impl14493 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group_2__0__Impl_in_rule__IdentifierOrFuncTok__Group_2__014530 = new BitSet(new long[] { 0x4000000000000000L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group_2__1_in_rule__IdentifierOrFuncTok__Group_2__014533 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group_2__1__Impl_in_rule__IdentifierOrFuncTok__Group_2__114591 = new BitSet(new long[] { 0x001E00800003EFC0L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group_2__2_in_rule__IdentifierOrFuncTok__Group_2__114594 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_62_in_rule__IdentifierOrFuncTok__Group_2__1__Impl14622 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group_2__2__Impl_in_rule__IdentifierOrFuncTok__Group_2__214653 = new BitSet(new long[] { 0x2000000000000000L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group_2__3_in_rule__IdentifierOrFuncTok__Group_2__214656 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__ParamsAssignment_2_2_in_rule__IdentifierOrFuncTok__Group_2__2__Impl14685 = new BitSet(new long[] { 0x001E00800003EFC2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__ParamsAssignment_2_2_in_rule__IdentifierOrFuncTok__Group_2__2__Impl14697 = new BitSet(new long[] { 0x001E00800003EFC2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_rule__IdentifierOrFuncTok__Group_2__3__Impl_in_rule__IdentifierOrFuncTok__Group_2__314730 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_61_in_rule__IdentifierOrFuncTok__Group_2__3__Impl14758 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__URLType__Group__0__Impl_in_rule__URLType__Group__014797 = new BitSet(new long[] { 0x03FFFFD80001FFC0L });

+	public static final BitSet FOLLOW_rule__URLType__Group__1_in_rule__URLType__Group__014800 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_64_in_rule__URLType__Group__0__Impl14828 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__URLType__Group__1__Impl_in_rule__URLType__Group__114859 = new BitSet(new long[] { 0x2000000000000000L });

+	public static final BitSet FOLLOW_rule__URLType__Group__2_in_rule__URLType__Group__114862 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__URLType__UrlAssignment_1_in_rule__URLType__Group__1__Impl14889 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__URLType__Group__2__Impl_in_rule__URLType__Group__214919 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_61_in_rule__URLType__Group__2__Impl14947 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ValidURLSymbol__Group_18__0__Impl_in_rule__ValidURLSymbol__Group_18__014984 = new BitSet(new long[] { 0x001E000000000000L });

+	public static final BitSet FOLLOW_rule__ValidURLSymbol__Group_18__1_in_rule__ValidURLSymbol__Group_18__014987 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_35_in_rule__ValidURLSymbol__Group_18__0__Impl15015 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ValidURLSymbol__Group_18__1__Impl_in_rule__ValidURLSymbol__Group_18__115046 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleKeywordHack_in_rule__ValidURLSymbol__Group_18__1__Impl15073 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ValidURL__Group_1_10__0__Impl_in_rule__ValidURL__Group_1_10__015106 = new BitSet(new long[] { 0x0000000000014000L });

+	public static final BitSet FOLLOW_rule__ValidURL__Group_1_10__1_in_rule__ValidURL__Group_1_10__015109 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_PERCENT_in_rule__ValidURL__Group_1_10__0__Impl15136 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ValidURL__Group_1_10__1__Impl_in_rule__ValidURL__Group_1_10__115165 = new BitSet(new long[] { 0x0000000000014000L });

+	public static final BitSet FOLLOW_rule__ValidURL__Group_1_10__2_in_rule__ValidURL__Group_1_10__115168 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ValidURL__Alternatives_1_10_1_in_rule__ValidURL__Group_1_10__1__Impl15195 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ValidURL__Group_1_10__2__Impl_in_rule__ValidURL__Group_1_10__215225 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__ValidURL__Alternatives_1_10_2_in_rule__ValidURL__Group_1_10__2__Impl15252 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Identifier__Group__0__Impl_in_rule__Identifier__Group__015288 = new BitSet(new long[] { 0x001E00000000CC00L });

+	public static final BitSet FOLLOW_rule__Identifier__Group__1_in_rule__Identifier__Group__015291 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_DASH_in_rule__Identifier__Group__0__Impl15319 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Identifier__Group__1__Impl_in_rule__Identifier__Group__115350 = new BitSet(new long[] { 0x001E00000001CC00L });

+	public static final BitSet FOLLOW_rule__Identifier__Group__2_in_rule__Identifier__Group__115353 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Identifier__Alternatives_1_in_rule__Identifier__Group__1__Impl15380 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Identifier__Group__2__Impl_in_rule__Identifier__Group__215410 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Identifier__Group_2__0_in_rule__Identifier__Group__2__Impl15437 = new BitSet(new long[] { 0x001E00000001CC02L });

+	public static final BitSet FOLLOW_rule__Identifier__Group_2__0__Impl_in_rule__Identifier__Group_2__015474 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Identifier__Alternatives_2_0_in_rule__Identifier__Group_2__0__Impl15501 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Num__Group__0__Impl_in_rule__Num__Group__015533 = new BitSet(new long[] { 0x001E00800001CC80L });

+	public static final BitSet FOLLOW_rule__Num__Group__1_in_rule__Num__Group__015536 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Num__Alternatives_0_in_rule__Num__Group__0__Impl15563 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Num__Group__1__Impl_in_rule__Num__Group__115594 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Num__Alternatives_1_in_rule__Num__Group__1__Impl15621 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Num__Group_1_0__0__Impl_in_rule__Num__Group_1_0__015655 = new BitSet(new long[] { 0x0000000000010000L });

+	public static final BitSet FOLLOW_rule__Num__Group_1_0__1_in_rule__Num__Group_1_0__015658 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_39_in_rule__Num__Group_1_0__0__Impl15686 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Num__Group_1_0__1__Impl_in_rule__Num__Group_1_0__115717 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_rule__Num__Group_1_0__1__Impl15747 = new BitSet(new long[] { 0x0000000000010002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_rule__Num__Group_1_0__1__Impl15760 = new BitSet(new long[] { 0x0000000000010002L });

+	public static final BitSet FOLLOW_rule__Num__Group_1_1__0__Impl_in_rule__Num__Group_1_1__015797 = new BitSet(new long[] { 0x0000008000000000L });

+	public static final BitSet FOLLOW_rule__Num__Group_1_1__1_in_rule__Num__Group_1_1__015800 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_rule__Num__Group_1_1__0__Impl15830 = new BitSet(new long[] { 0x0000000000010002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_rule__Num__Group_1_1__0__Impl15843 = new BitSet(new long[] { 0x0000000000010002L });

+	public static final BitSet FOLLOW_rule__Num__Group_1_1__1__Impl_in_rule__Num__Group_1_1__115876 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Num__Group_1_1_1__0_in_rule__Num__Group_1_1__1__Impl15903 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Num__Group_1_1_1__0__Impl_in_rule__Num__Group_1_1_1__015938 = new BitSet(new long[] { 0x0000000000010000L });

+	public static final BitSet FOLLOW_rule__Num__Group_1_1_1__1_in_rule__Num__Group_1_1_1__015941 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_39_in_rule__Num__Group_1_1_1__0__Impl15970 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Num__Group_1_1_1__1__Impl_in_rule__Num__Group_1_1_1__116002 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_rule__Num__Group_1_1_1__1__Impl16032 = new BitSet(new long[] { 0x0000000000010002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_rule__Num__Group_1_1_1__1__Impl16045 = new BitSet(new long[] { 0x0000000000010002L });

+	public static final BitSet FOLLOW_rule__Hex__Group__0__Impl_in_rule__Hex__Group__016082 = new BitSet(new long[] { 0x0000000000014000L });

+	public static final BitSet FOLLOW_rule__Hex__Group__1_in_rule__Hex__Group__016085 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_HASHMARK_in_rule__Hex__Group__0__Impl16112 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Hex__Group__1__Impl_in_rule__Hex__Group__116141 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Hex__Group_1__0_in_rule__Hex__Group__1__Impl16170 = new BitSet(new long[] { 0x0000000000014002L });

+	public static final BitSet FOLLOW_rule__Hex__Group_1__0_in_rule__Hex__Group__1__Impl16182 = new BitSet(new long[] { 0x0000000000014002L });

+	public static final BitSet FOLLOW_rule__Hex__Group_1__0__Impl_in_rule__Hex__Group_1__016219 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Hex__Alternatives_1_0_in_rule__Hex__Group_1__0__Impl16246 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecharset_in_rule__Stylesheet__CharsetAssignment_016283 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleimportExpression_in_rule__Stylesheet__ImportsAssignment_116314 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleruleset_in_rule__Stylesheet__RulesetAssignment_2_016345 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulemedia_in_rule__Stylesheet__MediaAssignment_2_116376 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulepage_in_rule__Stylesheet__PageAssignment_2_216407 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulefont_face_in_rule__Stylesheet__Font_faceAssignment_2_316438 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulekeyframes_in_rule__Stylesheet__KeyframesAssignment_2_416469 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_CSSSTRING_in_rule__Charset__CharsetAssignment_116500 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_CSSSTRING_in_rule__ImportExpression__ValueAssignment_1_016531 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulemedia_list_in_rule__ImportExpression__MediaListAssignment_1_1_116562 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulepseudo_page_in_rule__Page__PseudoPageAssignment_216593 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rule__Page__DeclarationsAssignment_416624 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rule__Page__DeclarationsAssignment_5_116655 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulemedia_list_in_rule__Media__MedialistAssignment_116686 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleruleset_in_rule__Media__RulesetsAssignment_316717 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rule__Font_face__DeclarationsAssignment_316748 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rule__Font_face__DeclarationsAssignment_4_116779 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rule__Keyframes__NameAssignment_216810 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulekeyframe_selector_in_rule__Keyframes__KeyframeselectorsAssignment_416841 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulekeyframe_selector_in_rule__Keyframes__KeyframeselectorsAssignment_5_116872 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rule__Keyframe_selector__TypeAssignment_0_016903 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleNum_in_rule__Keyframe_selector__PercentageAssignment_0_1_016934 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rule__Keyframe_selector__DeclarationsAssignment_216965 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rule__Keyframe_selector__DeclarationsAssignment_3_116996 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleselector_in_rule__Ruleset__SelectorsAssignment_017027 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleselector_in_rule__Ruleset__SelectorsAssignment_1_217058 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rule__Ruleset__DeclarationsAssignment_4_017089 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rule__Ruleset__DeclarationsAssignment_4_1_117120 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulesimple_selector_in_rule__Selector__SimpleselectorsAssignment_017151 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecombinator_in_rule__Selector__CombinatorAssignment_1_0_017182 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleselector_in_rule__Selector__SelectorAssignment_1_0_217213 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecombinator_in_rule__Selector__CombinatorAssignment_1_1_1_017244 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleselector_in_rule__Selector__SelectorAssignment_1_1_217275 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleElementSelector_in_rule__SimpleSelectorForNegation__ElementAssignment_0_0_017306 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleUniversalSelector_in_rule__SimpleSelectorForNegation__UniversalAssignment_0_0_117337 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleSubSelectorForNegation_in_rule__SimpleSelectorForNegation__SubSelectorsAssignment_0_117368 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleSubSelectorForNegation_in_rule__SimpleSelectorForNegation__SubSelectorsAssignment_117399 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleElementSelector_in_rule__Simple_selector__ElementAssignment_0_0_017430 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleUniversalSelector_in_rule__Simple_selector__UniversalAssignment_0_0_117461 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleSubSelector_in_rule__Simple_selector__SubSelectorsAssignment_0_117492 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleSubSelector_in_rule__Simple_selector__SubSelectorsAssignment_117523 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rule__AttributeSelector__NameAssignment_217554 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__OpAlternatives_3_0_0_in_rule__AttributeSelector__OpAssignment_3_017585 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__AttributeSelector__ValueAlternatives_3_1_0_in_rule__AttributeSelector__ValueAssignment_3_117618 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rule__ClassSelector__NameAssignment_217651 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rule__ElementSelector__NameAssignment_117682 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_namespace_prefix_in_rule__UniversalSelector__NamespaceAssignment_117713 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rule__IdSelector__NameAssignment_217744 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_property_in_rule__Css_declaration__PropertyAssignment_117775 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleCssTok_in_rule__Css_declaration__ValueTokensAssignment_417806 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_IMPORTANT_SYM_in_rule__Css_declaration__ImportantAssignment_517837 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleValidPropertyIdent_in_rule__Css_property__NameAssignment_117868 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rule__PseudoClassName__NameAssignment17899 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleNotFunctionCall_in_rule__PseudoClassFunction__NotAssignment_0_017930 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleSimpleSelectorForNegation_in_rule__PseudoClassFunction__ParamSelectorAssignment_0_117961 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rule__PseudoClassFunction__NameAssignment_1_117992 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleCssTok_in_rule__PseudoClassFunction__ParamsAssignment_1_318023 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__SymbolTok__SymbolAlternatives_1_0_in_rule__SymbolTok__SymbolAssignment_118054 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_CSSSTRING_in_rule__StringTok__ValueAssignment_118087 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleNum_in_rule__NumberTok__ValAssignment_118118 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleURLType_in_rule__UrlTok__UrlAssignment_118149 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleHex_in_rule__ColorTok__ValueAssignment_118180 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rule__IdentifierOrFuncTok__NameAssignment_118211 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleCssTok_in_rule__IdentifierOrFuncTok__ParamsAssignment_2_218242 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleValidURL_in_rule__URLType__UrlAssignment_118273 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Identifier__Group_2__0_in_synpred134_InternalCSS15437 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_synpred136_InternalCSS15760 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_synpred137_InternalCSS15843 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Num__Group_1_1_1__0_in_synpred138_InternalCSS15903 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_synpred139_InternalCSS16045 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rule__Hex__Group_1__0_in_synpred140_InternalCSS16182 = new BitSet(new long[] { 0x0000000000000002L });

+

+}
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/internal/CSSActivator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/internal/CSSActivator.java
index 50f10508037..14430d49219 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/ui/internal/CSSActivator.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/internal/CSSActivator.java
@@ -1,103 +1,95 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.ui.internal;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.xtext.ui.shared.SharedStateModule;
-import org.eclipse.xtext.util.Modules2;
-import org.osgi.framework.BundleContext;
-
-import com.google.common.collect.Maps;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-
-/**
- * This class was generated. Customizations should only happen in a newly
- * introduced subclass.
- */
-public class CSSActivator extends AbstractUIPlugin {
-
-	public static final String ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS = "org.eclipse.papyrus.infra.gmfdiag.CSS";
-
-	private static final Logger logger = Logger.getLogger(CSSActivator.class);
-
-	private static CSSActivator INSTANCE;
-
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		INSTANCE = this;
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		injectors.clear();
-		INSTANCE = null;
-		super.stop(context);
-	}
-
-	public static CSSActivator getInstance() {
-		return INSTANCE;
-	}
-
-	public Injector getInjector(String language) {
-		synchronized (injectors) {
-			Injector injector = injectors.get(language);
-			if (injector == null) {
-				injectors.put(language, injector = createInjector(language));
-			}
-			return injector;
-		}
-	}
-
-	protected Injector createInjector(String language) {
-		try {
-			Module runtimeModule = getRuntimeModule(language);
-			Module sharedStateModule = getSharedStateModule();
-			Module uiModule = getUiModule(language);
-			Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule);
-			return Guice.createInjector(mergedModule);
-		} catch (Exception e) {
-			logger.error("Failed to create injector for " + language);
-			logger.error(e.getMessage(), e);
-			throw new RuntimeException("Failed to create injector for " + language, e);
-		}
-	}
-
-	protected Module getRuntimeModule(String grammar) {
-		if (ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS.equals(grammar)) {
-			return new org.eclipse.papyrus.infra.gmfdiag.CSSRuntimeModule();
-		}
-
-		throw new IllegalArgumentException(grammar);
-	}
-
-	protected Module getUiModule(String grammar) {
-		if (ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS.equals(grammar)) {
-			return new org.eclipse.papyrus.infra.gmfdiag.ui.CSSUiModule(this);
-		}
-
-		throw new IllegalArgumentException(grammar);
-	}
-
-	protected Module getSharedStateModule() {
-		return new SharedStateModule();
-	}
-
-}
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal;

+

+import java.util.Collections;

+import java.util.Map;

+

+import org.apache.log4j.Logger;

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

+import org.eclipse.xtext.ui.shared.SharedStateModule;

+import org.eclipse.xtext.util.Modules2;

+import org.osgi.framework.BundleContext;

+

+import com.google.common.collect.Maps;

+import com.google.inject.Guice;

+import com.google.inject.Injector;

+import com.google.inject.Module;

+

+/**

+ * This class was generated. Customizations should only happen in a newly

+ * introduced subclass.

+ */

+public class CSSActivator extends AbstractUIPlugin {

+

+	public static final String ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS3_CSS = "org.eclipse.papyrus.infra.gmfdiag.css3.CSS";

+

+	private static final Logger logger = Logger.getLogger(CSSActivator.class);

+

+	private static CSSActivator INSTANCE;

+

+	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));

+

+	@Override

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		INSTANCE = this;

+	}

+

+	@Override

+	public void stop(BundleContext context) throws Exception {

+		injectors.clear();

+		INSTANCE = null;

+		super.stop(context);

+	}

+

+	public static CSSActivator getInstance() {

+		return INSTANCE;

+	}

+

+	public Injector getInjector(String language) {

+		synchronized (injectors) {

+			Injector injector = injectors.get(language);

+			if (injector == null) {

+				injectors.put(language, injector = createInjector(language));

+			}

+			return injector;

+		}

+	}

+

+	protected Injector createInjector(String language) {

+		try {

+			Module runtimeModule = getRuntimeModule(language);

+			Module sharedStateModule = getSharedStateModule();

+			Module uiModule = getUiModule(language);

+			Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule);

+			return Guice.createInjector(mergedModule);

+		} catch (Exception e) {

+			logger.error("Failed to create injector for " + language);

+			logger.error(e.getMessage(), e);

+			throw new RuntimeException("Failed to create injector for " + language, e);

+		}

+	}

+

+	protected Module getRuntimeModule(String grammar) {

+		if (ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS3_CSS.equals(grammar)) {

+			return new org.eclipse.papyrus.infra.gmfdiag.css3.CSSRuntimeModule();

+		}

+

+		throw new IllegalArgumentException(grammar);

+	}

+

+	protected Module getUiModule(String grammar) {

+		if (ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS3_CSS.equals(grammar)) {

+			return new org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSUiModule(this);

+		}

+

+		throw new IllegalArgumentException(grammar);

+	}

+

+	protected Module getSharedStateModule() {

+		return new SharedStateModule();

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/CSSUiModule.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/CSSUiModule.java
index 3df001ced75..2b34ca80f4e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/ui/CSSUiModule.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/CSSUiModule.java
@@ -1,34 +1,28 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.papyrus.infra.gmfdiag.ui;
-
-import org.eclipse.papyrus.infra.gmfdiag.ui.color.CSSHighlightingConfiguration;
-import org.eclipse.papyrus.infra.gmfdiag.ui.color.CSSSemanticHighlightingCalculator;
-import org.eclipse.papyrus.infra.gmfdiag.ui.color.CSSTokenScanner;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.AbstractAntlrTokenToAttributeIdMapper;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightingConfiguration;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator;
-
-/**
- * Use this class to register components to be used within the IDE.
- */
-public class CSSUiModule extends org.eclipse.papyrus.infra.gmfdiag.ui.AbstractCSSUiModule {
-
-	public CSSUiModule(AbstractUIPlugin plugin) {
-		super(plugin);
-	}
-
-	public Class<? extends IHighlightingConfiguration> bindIHighlightingConfiguration() {
-		return CSSHighlightingConfiguration.class;
-	}
-
-	public Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {
-		return CSSSemanticHighlightingCalculator.class;
-	}
-
-	public Class<? extends AbstractAntlrTokenToAttributeIdMapper> bindAbstractAntlrTokenToAttributeIdMapper() {
-		return CSSTokenScanner.class;
-	}
-}
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.ui.highlighting.CSSHighlightingCalculator;

+import org.eclipse.papyrus.infra.gmfdiag.css3.ui.highlighting.CSSHighlightingConfiguration;

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

+import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightingConfiguration;

+import org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator;

+

+/**

+ * Use this class to register components to be used within the IDE.

+ */

+public class CSSUiModule extends org.eclipse.papyrus.infra.gmfdiag.css3.ui.AbstractCSSUiModule {

+

+	public CSSUiModule(AbstractUIPlugin plugin) {

+		super(plugin);

+	}

+

+	public Class<? extends IHighlightingConfiguration> bindIHighlightingConfiguration() {

+		return CSSHighlightingConfiguration.class;

+	}

+

+	public Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {

+		return CSSHighlightingCalculator.class;

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/CSSProposalProvider.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/CSSProposalProvider.xtend
new file mode 100644
index 00000000000..d73c99d5acb
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/CSSProposalProvider.xtend
@@ -0,0 +1,12 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.AbstractCSSProposalProvider

+

+/**

+ * see http://www.eclipse.org/Xtext/documentation.html#contentAssist on how to customize content assistant

+ */

+class CSSProposalProvider extends AbstractCSSProposalProvider {

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/highlighting/CSSHighlightingCalculator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/highlighting/CSSHighlightingCalculator.java
new file mode 100644
index 00000000000..0b764316acc
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/highlighting/CSSHighlightingCalculator.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright (c) 2011 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Christoph Caks <ccaks@bestsolution.at> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.highlighting;
+
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;
+import org.eclipse.xtext.nodemodel.ICompositeNode;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
+import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.ui.editor.syntaxcoloring.DefaultHighlightingConfiguration;
+import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightedPositionAcceptor;
+import org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator;
+
+public class CSSHighlightingCalculator implements ISemanticHighlightingCalculator {
+
+	@Override
+	public void provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor) {
+		if (resource == null) {
+			return;
+		}
+		TreeIterator<Object> it = EcoreUtil.getAllContents(resource, true);
+		while (it.hasNext()) {
+			Object o = it.next();
+			if (o instanceof ElementSelector) {
+				final ICompositeNode n = NodeModelUtils.getNode((EObject) o);
+				if (n != null) {
+					acceptor.addPosition(n.getOffset(), n.getLength(), CSSHighlightingConfiguration.ELEMENT);
+				}
+			} else if (o instanceof IdentifierTok) {
+				final ICompositeNode n = NodeModelUtils.getNode((EObject) o);
+				if (n != null) {
+					acceptor.addPosition(n.getOffset(), n.getLength(), DefaultHighlightingConfiguration.DEFAULT_ID);
+				}
+			} else if (o instanceof css_declaration) {
+				css_declaration dec = (css_declaration) o;
+				if (dec.getProperty() != null && dec.getProperty().getName() != null && dec.getProperty().getName().trim().length() > 0) {
+					ICompositeNode n = NodeModelUtils.getNode(dec);
+					if (n != null) {
+						if (n.hasChildren()) {
+							acceptor.addPosition(n.getFirstChild().getOffset(), n.getFirstChild().getLength(), CSSHighlightingConfiguration.DECLARATIONNAME);
+						}
+					}
+				}
+			} else if (o instanceof simple_selector) {
+				final ICompositeNode n = NodeModelUtils.getNode((EObject) o);
+				if (n != null) {
+					acceptor.addPosition(n.getOffset(), n.getLength(), CSSHighlightingConfiguration.SELECTOR);
+				}
+			} else if (o instanceof URLType) {
+				final URLType url = (URLType) o;
+				final ICompositeNode n = NodeModelUtils.getNode(url);
+				if (n != null) {
+					acceptor.addPosition(n.getOffset(), 4, CSSHighlightingConfiguration.FUNCTION);
+					acceptor.addPosition(n.getOffset() + 4, n.getLength() - 5, CSSHighlightingConfiguration.URL);
+					acceptor.addPosition(n.getOffset() + n.getLength() - 1, 1, CSSHighlightingConfiguration.FUNCTION);
+				}
+			} else if (o instanceof FuncTok) {
+				final FuncTok funcTok = (FuncTok) o;
+				final ICompositeNode n = NodeModelUtils.getNode(funcTok);
+				int nameLength = funcTok.getName().getName().length();
+				if (n != null) {
+					acceptor.addPosition(n.getOffset(), nameLength + 1, CSSHighlightingConfiguration.FUNCTION);
+				}
+				for (CssTok tok : ((FuncTok) o).getParams()) {
+					if (tok instanceof SymbolTok) {
+						if (",".equals(((SymbolTok) tok).getSymbol())) { //$NON-NLS-1$
+							ICompositeNode colonNode = NodeModelUtils.getNode(tok);
+							if (colonNode != null) {
+								acceptor.addPosition(colonNode.getOffset(), colonNode.getLength(), CSSHighlightingConfiguration.FUNCTION);
+							}
+						}
+					}
+				}
+				if (n != null) {
+					acceptor.addPosition(n.getOffset() + n.getLength() - 1, 1, CSSHighlightingConfiguration.FUNCTION);
+				}
+			} else if (o instanceof StringTok) {
+				final ICompositeNode n = NodeModelUtils.getNode((EObject) o);
+				if (n != null) {
+					acceptor.addPosition(n.getOffset(), n.getLength(), DefaultHighlightingConfiguration.STRING_ID);
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/highlighting/CSSHighlightingConfiguration.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/highlighting/CSSHighlightingConfiguration.java
new file mode 100644
index 00000000000..4e5b6dd6334
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/highlighting/CSSHighlightingConfiguration.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2011 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Christoph Caks <ccaks@bestsolution.at> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.highlighting;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.xtext.ui.editor.syntaxcoloring.DefaultHighlightingConfiguration;
+import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightingConfigurationAcceptor;
+import org.eclipse.xtext.ui.editor.utils.TextStyle;
+
+public class CSSHighlightingConfiguration extends DefaultHighlightingConfiguration {
+	public final static String DECLARATIONNAME = "DeclarationName";
+	public final static String SELECTOR = "Selector";
+	public final static String ELEMENT = "ELEMENT";
+	public final static String URL = "Url";
+	public final static String FUNCTION = "Function";
+
+	@Override
+	public void configure(IHighlightingConfigurationAcceptor acceptor) {
+		// from super (without the keyword)
+		acceptor.acceptDefaultHighlighting(PUNCTUATION_ID, "Punctuation character", punctuationTextStyle());
+		acceptor.acceptDefaultHighlighting(COMMENT_ID, "Comment", commentTextStyle());
+		acceptor.acceptDefaultHighlighting(STRING_ID, "String", stringTextStyle());
+		acceptor.acceptDefaultHighlighting(NUMBER_ID, "Number", numberTextStyle());
+		acceptor.acceptDefaultHighlighting(DEFAULT_ID, "Default", defaultTextStyle());
+		acceptor.acceptDefaultHighlighting(INVALID_TOKEN_ID, "Invalid Symbol", errorTextStyle());
+		// local
+		acceptor.acceptDefaultHighlighting(DECLARATIONNAME, "Declaration", crossDeclarationTextStyle());
+		acceptor.acceptDefaultHighlighting(SELECTOR, "Selector", crossSelectorTextStyle());
+		acceptor.acceptDefaultHighlighting(URL, "Url", urlTextStyle());
+		acceptor.acceptDefaultHighlighting(FUNCTION, "Function", functionTextStyle());
+		acceptor.acceptDefaultHighlighting(ELEMENT, "Element", elementTextStyle());
+	}
+
+	public TextStyle crossDeclarationTextStyle() {
+		TextStyle textStyle = defaultTextStyle().copy();
+		textStyle.setColor(new RGB(0, 153, 0));
+		return textStyle;
+	}
+
+	public TextStyle elementTextStyle() {
+		TextStyle textStyle = crossSelectorTextStyle().copy();
+		textStyle.setStyle(SWT.BOLD);
+		return textStyle;
+	}
+
+
+	public TextStyle crossSelectorTextStyle() {
+		TextStyle textStyle = defaultTextStyle().copy();
+		textStyle.setColor(new RGB(206, 123, 0));
+		return textStyle;
+	}
+
+	public TextStyle urlTextStyle() {
+		TextStyle textStyle = stringTextStyle().copy();
+		return textStyle;
+	}
+
+	public TextStyle functionTextStyle() {
+		TextStyle textStyle = defaultTextStyle().copy();
+		textStyle.setStyle(SWT.BOLD);
+		return textStyle;
+	}
+}
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSDescriptionLabelProvider.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSDescriptionLabelProvider.xtend
new file mode 100644
index 00000000000..480a54a4b31
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSDescriptionLabelProvider.xtend
@@ -0,0 +1,24 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.labeling

+

+//import org.eclipse.xtext.resource.IEObjectDescription

+

+/**

+ * Provides labels for a IEObjectDescriptions and IResourceDescriptions.

+ * 

+ * see http://www.eclipse.org/Xtext/documentation.html#labelProvider

+ */

+class CSSDescriptionLabelProvider extends org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider {

+

+	// Labels and icons can be computed like this:

+	

+//	override text(IEObjectDescription ele) {

+//		ele.name.toString

+//	}

+//	 

+//	override image(IEObjectDescription ele) {

+//		ele.EClass.name + '.gif'

+//	}	 

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSLabelProvider.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSLabelProvider.xtend
new file mode 100644
index 00000000000..a77a18c7579
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSLabelProvider.xtend
@@ -0,0 +1,29 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.labeling

+

+import com.google.inject.Inject

+

+/**

+ * Provides labels for a EObjects.

+ * 

+ * see http://www.eclipse.org/Xtext/documentation.html#labelProvider

+ */

+class CSSLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider {

+

+	@Inject

+	new(org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider delegate) {

+		super(delegate);

+	}

+

+	// Labels and icons can be computed like this:

+	

+//	def text(Greeting ele) {

+//		'A greeting to ' + ele.name

+//	}

+//

+//	def image(Greeting ele) {

+//		'Greeting.gif'

+//	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/outline/CSSOutlineTreeProvider.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/outline/CSSOutlineTreeProvider.xtend
new file mode 100644
index 00000000000..8de35448292
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/outline/CSSOutlineTreeProvider.xtend
@@ -0,0 +1,13 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.outline

+

+/**

+ * Customization of the default outline structure.

+ *

+ * see http://www.eclipse.org/Xtext/documentation.html#outline

+ */

+class CSSOutlineTreeProvider extends org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider {

+	

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/quickfix/CSSQuickfixProvider.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/quickfix/CSSQuickfixProvider.xtend
new file mode 100644
index 00000000000..10d4d9e4ff2
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/quickfix/CSSQuickfixProvider.xtend
@@ -0,0 +1,26 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.quickfix

+

+//import org.eclipse.xtext.ui.editor.quickfix.Fix

+//import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor

+//import org.eclipse.xtext.validation.Issue

+

+/**

+ * Custom quickfixes.

+ *

+ * see http://www.eclipse.org/Xtext/documentation.html#quickfixes

+ */

+class CSSQuickfixProvider extends org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider {

+

+//	@Fix(MyDslValidator::INVALID_NAME)

+//	def capitalizeName(Issue issue, IssueResolutionAcceptor acceptor) {

+//		acceptor.accept(issue, 'Capitalize name', 'Capitalize the name.', 'upcase.png') [

+//			context |

+//			val xtextDocument = context.xtextDocument

+//			val firstLetter = xtextDocument.get(issue.offset, 1)

+//			xtextDocument.replace(issue.offset, 1, firstLetter.toUpperCase)

+//		]

+//	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/xtend-gen/.gitignore b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/xtend-gen/.gitignore
index c96a04f008e..c96a04f008e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/xtend-gen/.gitignore
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/xtend-gen/.gitignore
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/.antlr-generator-3.2.0.jar b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.antlr-generator-3.2.0-patch.jar
index 42434924055..90516fd7ac7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/.antlr-generator-3.2.0.jar
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.antlr-generator-3.2.0-patch.jar
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.classpath b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.classpath
new file mode 100644
index 00000000000..d1b97f72bd5
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="src" path="xtend-gen"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.infra.gmfdiag.css.xtext).launch b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.infra.gmfdiag.css3.xtext).launch
index f6cffeb98c9..cbaa7fa655c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.infra.gmfdiag.css.xtext).launch
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.infra.gmfdiag.css3.xtext).launch
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1299248699643_13&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css.xtext&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css.xtext.generator&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css.xtext.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.infra.gmfdiag.css.xtext"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/papyrus/infra/gmfdiag/GenerateCSS.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.css.xtext"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">

+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1299248699643_13&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css3.xtext&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.generator&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

+<listEntry value="/org.eclipse.papyrus.infra.gmfdiag.css3.xtext"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

+<listEntry value="4"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">

+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>

+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

+</listAttribute>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/papyrus/infra/gmfdiag/css3/GenerateCSS.mwe2"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.css3.xtext"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>

+</launchConfiguration>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Launch Runtime Eclipse.launch b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Launch Runtime Eclipse.launch
new file mode 100644
index 00000000000..ade8fbbce35
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Launch Runtime Eclipse.launch
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">

+<booleanAttribute key="append.args" value="true"/>

+<booleanAttribute key="askclear" value="true"/>

+<booleanAttribute key="automaticAdd" value="true"/>

+<booleanAttribute key="automaticValidate" value="false"/>

+<stringAttribute key="bad_container_name" value="/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/"/>

+<stringAttribute key="bootstrap" value=""/>

+<stringAttribute key="checked" value="[NONE]"/>

+<booleanAttribute key="clearConfig" value="false"/>

+<booleanAttribute key="clearws" value="false"/>

+<booleanAttribute key="clearwslog" value="false"/>

+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Launch Runtime Eclipse"/>

+<booleanAttribute key="default" value="true"/>

+<booleanAttribute key="includeOptional" value="true"/>

+<stringAttribute key="location" value="${workspace_loc}/../runtime-EclipseXtext"/>

+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">

+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>

+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

+</listAttribute>

+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>

+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m -XX:MaxPermSize=256m"/>

+<stringAttribute key="pde.version" value="3.3"/>

+<stringAttribute key="product" value="org.eclipse.platform.ide"/>

+<booleanAttribute key="show_selected_only" value="false"/>

+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>

+<booleanAttribute key="tracing" value="false"/>

+<booleanAttribute key="useDefaultConfig" value="true"/>

+<booleanAttribute key="useDefaultConfigArea" value="true"/>

+<booleanAttribute key="useProduct" value="true"/>

+<booleanAttribute key="usefeatures" value="false"/>

+</launchConfiguration>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.project b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.project
new file mode 100644
index 00000000000..b4140ae3656
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.gmfdiag.css3.xtext</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.settings/org.eclipse.core.resources.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..99f26c0203a
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..6d0e78eaf5d
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
@@ -0,0 +1,37 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: CSS3 Xtext Editor

+Bundle-Vendor: Eclipse Modeling Project

+Bundle-Version: 1.1.0.qualifier

+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext; singleton:=true

+Bundle-ActivationPolicy: lazy

+Require-Bundle: org.eclipse.xtext;bundle-version="2.8.1";visibility:=reexport,

+ org.eclipse.equinox.common;bundle-version="3.5.0",

+ org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,

+ org.eclipse.xtext.generator;resolution:=optional,

+ org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,

+ org.eclipse.emf.codegen.ecore;resolution:=optional,

+ org.eclipse.emf.mwe.utils;resolution:=optional,

+ org.eclipse.emf.mwe2.launch;resolution:=optional,

+ org.eclipse.xtext.util,

+ org.eclipse.emf.ecore,

+ org.eclipse.emf.common,

+ org.eclipse.xtext.xbase.lib,

+ org.antlr.runtime,

+ org.eclipse.xtext.common.types,

+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional

+Import-Package: org.apache.log4j

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3,

+ org.eclipse.papyrus.infra.gmfdiag.css3.services,

+ org.eclipse.papyrus.infra.gmfdiag.css3.cSS,

+ org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl,

+ org.eclipse.papyrus.infra.gmfdiag.css3.cSS.util,

+ org.eclipse.papyrus.infra.gmfdiag.css3.serializer,

+ org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr,

+ org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal,

+ org.eclipse.papyrus.infra.gmfdiag.css3.validation,

+ org.eclipse.papyrus.infra.gmfdiag.css3.scoping,

+ org.eclipse.papyrus.infra.gmfdiag.css3.generator,

+ org.eclipse.papyrus.infra.gmfdiag.css3.formatting

+

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/about.html b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/about.html
index 209103075a7..209103075a7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/about.html
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/about.html
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/build.properties b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/build.properties
new file mode 100644
index 00000000000..f9d549534b5
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/build.properties
@@ -0,0 +1,10 @@
+source.. = src/,\
+          src-gen/,\
+          xtend-gen/
+bin.includes = model/,\
+               META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html
+
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/model/generated/CSS.ecore b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/model/generated/CSS.ecore
new file mode 100644
index 00000000000..da904afcd39
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/model/generated/CSS.ecore
@@ -0,0 +1,152 @@
+<?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="cSS" nsURI="http://www.eclipse.org/papyrus/infra/gmfdiag/css3/CSS"

+    nsPrefix="cSS">

+  <eClassifiers xsi:type="ecore:EClass" name="stylesheet">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="charset" eType="#//charset"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"

+        eType="#//importExpression" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ruleset" upperBound="-1"

+        eType="#//ruleset" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="media" upperBound="-1"

+        eType="#//media" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="page" upperBound="-1" eType="#//page"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="font_face" upperBound="-1"

+        eType="#//font_face" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="keyframes" upperBound="-1"

+        eType="#//keyframes" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="charset">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="charset" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="importExpression">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="page">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pseudoPage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="declarations" upperBound="-1"

+        eType="#//css_declaration" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="media">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="medialist" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rulesets" upperBound="-1"

+        eType="#//ruleset" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="font_face" eSuperTypes="#//keyframes">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="declarations" upperBound="-1"

+        eType="#//css_declaration" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="keyframeselectors" upperBound="-1"

+        eType="#//keyframe_selector" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="keyframes"/>

+  <eClassifiers xsi:type="ecore:EClass" name="keyframe_selector">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="declarations" upperBound="-1"

+        eType="#//css_declaration" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ruleset">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="selectors" upperBound="-1"

+        eType="#//selector" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="declarations" upperBound="-1"

+        eType="#//css_declaration" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="selector">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="simpleselectors" upperBound="-1"

+        eType="#//simple_selector" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="combinator" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="selector" eType="#//selector"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="SimpleSelectorForNegation">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="#//ElementSelector"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="universal" eType="#//UniversalSelector"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="subSelectors" upperBound="-1"

+        eType="#//CssSelector" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="CssSelector"/>

+  <eClassifiers xsi:type="ecore:EClass" name="simple_selector">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="#//ElementSelector"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="universal" eType="#//UniversalSelector"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="subSelectors" upperBound="-1"

+        eType="#//CssSelector" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ClassSelector" eSuperTypes="#//CssSelector">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ElementSelector">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="UniversalSelector">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="IdSelector" eSuperTypes="#//CssSelector">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="css_declaration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="property" eType="#//css_property"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="valueTokens" upperBound="-1"

+        eType="#//CssTok" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="important" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="css_property">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="PseudoClassOrFunc" eSuperTypes="#//CssSelector"/>

+  <eClassifiers xsi:type="ecore:EClass" name="PseudoClass" eSuperTypes="#//CssSelector #//PseudoClassOrFunc"/>

+  <eClassifiers xsi:type="ecore:EClass" name="PseudoClassName" eSuperTypes="#//PseudoClass">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="PseudoClassFunction" eSuperTypes="#//PseudoClassOrFunc">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="not" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="paramSelector" eType="#//SimpleSelectorForNegation"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1"

+        eType="#//CssTok" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="CssTok"/>

+  <eClassifiers xsi:type="ecore:EClass" name="URLType" eSuperTypes="#//importExpression">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mediaList" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="url" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AttributeSelector" eSuperTypes="#//CssSelector">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="SymbolTok" eSuperTypes="#//CssTok">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="WSTok" eSuperTypes="#//CssTok"/>

+  <eClassifiers xsi:type="ecore:EClass" name="StringTok" eSuperTypes="#//CssTok">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="NumberTok" eSuperTypes="#//CssTok">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="UrlTok" eSuperTypes="#//CssTok">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="url" eType="#//URLType"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ColorTok" eSuperTypes="#//CssTok">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="IdentifierTok" eSuperTypes="#//CssTok">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="FuncTok" eSuperTypes="#//CssTok">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="name" eType="#//IdentifierTok"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1"

+        eType="#//CssTok" containment="true"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/model/generated/CSS.genmodel b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/model/generated/CSS.genmodel
new file mode 100644
index 00000000000..c242430e32f
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/model/generated/CSS.genmodel
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen"

+    editDirectory="/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.edit/src" editorDirectory="/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.editor/src"

+    modelPluginID="org.eclipse.papyrus.infra.gmfdiag.css3.xtext" forceOverwrite="true"

+    modelName="CSS" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

+    complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.infra.gmfdiag.css3.xtext.edit"

+    editorPluginID="org.eclipse.papyrus.infra.gmfdiag.css3.xtext.editor" runtimeVersion="2.10">

+  <genPackages prefix="CSS" basePackage="org.eclipse.papyrus.infra.gmfdiag.css3" disposableProviderFactory="true"

+      fileExtensions="css" ecorePackage="CSS.ecore#/">

+    <genClasses ecoreClass="CSS.ecore#//stylesheet">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//stylesheet/charset"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//stylesheet/imports"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//stylesheet/ruleset"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//stylesheet/media"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//stylesheet/page"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//stylesheet/font_face"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//stylesheet/keyframes"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//charset">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//charset/charset"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//importExpression">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//importExpression/value"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//page">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//page/pseudoPage"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//page/declarations"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//media">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//media/medialist"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//media/rulesets"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//font_face">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//font_face/declarations"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//font_face/name"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//font_face/keyframeselectors"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//keyframes"/>

+    <genClasses ecoreClass="CSS.ecore#//keyframe_selector">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//keyframe_selector/type"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//keyframe_selector/percentage"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//keyframe_selector/declarations"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//ruleset">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//ruleset/selectors"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//ruleset/declarations"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//selector">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//selector/simpleselectors"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//selector/combinator"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//selector/selector"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//SimpleSelectorForNegation">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//SimpleSelectorForNegation/element"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//SimpleSelectorForNegation/universal"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//SimpleSelectorForNegation/subSelectors"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//CssSelector"/>

+    <genClasses ecoreClass="CSS.ecore#//simple_selector">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//simple_selector/element"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//simple_selector/universal"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//simple_selector/subSelectors"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//ClassSelector">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//ClassSelector/name"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//ElementSelector">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//ElementSelector/name"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//UniversalSelector">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//UniversalSelector/namespace"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//IdSelector">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//IdSelector/name"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//css_declaration">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//css_declaration/property"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//css_declaration/valueTokens"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//css_declaration/important"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//css_property">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//css_property/name"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//PseudoClassOrFunc"/>

+    <genClasses ecoreClass="CSS.ecore#//PseudoClass"/>

+    <genClasses ecoreClass="CSS.ecore#//PseudoClassName">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//PseudoClassName/name"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//PseudoClassFunction">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//PseudoClassFunction/not"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//PseudoClassFunction/paramSelector"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//PseudoClassFunction/name"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//PseudoClassFunction/params"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//CssTok"/>

+    <genClasses ecoreClass="CSS.ecore#//URLType">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//URLType/mediaList"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//URLType/url"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//AttributeSelector">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//AttributeSelector/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//AttributeSelector/op"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//AttributeSelector/value"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//SymbolTok">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//SymbolTok/symbol"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//WSTok"/>

+    <genClasses ecoreClass="CSS.ecore#//StringTok">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//StringTok/value"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//NumberTok">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//NumberTok/val"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//UrlTok">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//UrlTok/url"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//ColorTok">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//ColorTok/value"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//IdentifierTok">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSS.ecore#//IdentifierTok/name"/>

+    </genClasses>

+    <genClasses ecoreClass="CSS.ecore#//FuncTok">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//FuncTok/name"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSS.ecore#//FuncTok/params"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/plugin.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/plugin.xml
new file mode 100644
index 00000000000..8522092ecc5
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/plugin.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.0"?>

+

+<plugin>

+

+  <extension point="org.eclipse.emf.ecore.generated_package">

+    <package 

+       uri = "http://www.eclipse.org/papyrus/infra/gmfdiag/css3/CSS" 

+       class = "org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage"

+       genModel = "model/generated/CSS.genmodel" /> 

+	

+  </extension>

+

+

+

+</plugin>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/plugin.xml_gen b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/plugin.xml_gen
new file mode 100644
index 00000000000..8522092ecc5
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/plugin.xml_gen
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.0"?>

+

+<plugin>

+

+  <extension point="org.eclipse.emf.ecore.generated_package">

+    <package 

+       uri = "http://www.eclipse.org/papyrus/infra/gmfdiag/css3/CSS" 

+       class = "org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage"

+       genModel = "model/generated/CSS.genmodel" /> 

+	

+  </extension>

+

+

+

+</plugin>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/pom.xml
index 543a7b03be7..e5851e8c5a4 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/pom.xml
@@ -7,7 +7,7 @@
 		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.xtext</artifactId>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css3.xtext</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/AbstractCSSRuntimeModule.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/AbstractCSSRuntimeModule.java
index 097d84b3bcb..0cbe6523c8b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/AbstractCSSRuntimeModule.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/AbstractCSSRuntimeModule.java
@@ -1,195 +1,171 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag;
-
-import java.util.Properties;
-
-import org.eclipse.xtext.Constants;
-import org.eclipse.xtext.service.DefaultRuntimeModule;
-
-import com.google.inject.Binder;
-import com.google.inject.name.Names;
-
-/**
- * Manual modifications go to {org.eclipse.papyrus.infra.gmfdiag.CSSRuntimeModule}
- */
-@SuppressWarnings("all")
-public abstract class AbstractCSSRuntimeModule extends DefaultRuntimeModule {
-
-	protected Properties properties = null;
-
-	@Override
-	public void configure(Binder binder) {
-		properties = tryBindProperties(binder, "org/eclipse/papyrus/infra/gmfdiag/CSS.properties");
-		super.configure(binder);
-	}
-
-	public void configureLanguageName(Binder binder) {
-		binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.eclipse.papyrus.infra.gmfdiag.CSS");
-	}
-
-	public void configureFileExtensions(Binder binder) {
-		if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null) {
-			binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("css");
-		}
-	}
-
-	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
-	public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
-		return org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
-	@Override
-	public Class<? extends org.eclipse.xtext.serializer.sequencer.ISemanticSequencer> bindISemanticSequencer() {
-		return org.eclipse.papyrus.infra.gmfdiag.serializer.CSSSemanticSequencer.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
-	public Class<? extends org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer> bindISyntacticSequencer() {
-		return org.eclipse.papyrus.infra.gmfdiag.serializer.CSSSyntacticSequencer.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
-	@Override
-	public Class<? extends org.eclipse.xtext.serializer.ISerializer> bindISerializer() {
-		return org.eclipse.xtext.serializer.impl.Serializer.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {
-		return org.eclipse.papyrus.infra.gmfdiag.parser.antlr.CSSParser.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	@Override
-	public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {
-		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
-		return org.eclipse.papyrus.infra.gmfdiag.parser.antlr.CSSAntlrTokenFileProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() {
-		return org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal.InternalCSSLexer.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public com.google.inject.Provider<org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal.InternalCSSLexer> provideInternalCSSLexer() {
-		return org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal.InternalCSSLexer.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public void configureRuntimeLexer(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.parser.antlr.LexerBindings.RUNTIME)).to(org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal.InternalCSSLexer.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	@Override
-	public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {
-		return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.validation.JavaValidatorFragment
-	@org.eclipse.xtext.service.SingletonBinding(eager = true)
-	public Class<? extends org.eclipse.papyrus.infra.gmfdiag.validation.CSSJavaValidator> bindCSSJavaValidator() {
-		return org.eclipse.papyrus.infra.gmfdiag.validation.CSSJavaValidator.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
-	@Override
-	public Class<? extends org.eclipse.xtext.scoping.IScopeProvider> bindIScopeProvider() {
-		return org.eclipse.papyrus.infra.gmfdiag.scoping.CSSScopeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
-	public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE))
-				.to(org.eclipse.xtext.scoping.impl.ImportedNamespaceAwareLocalScopeProvider.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
-	public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
-		binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
-	}
-
-	// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
-	@Override
-	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
-		return org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	@Override
-	public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() {
-		return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public Class<? extends org.eclipse.xtext.resource.containers.IAllContainersState.Provider> bindIAllContainersState$Provider() {
-		return org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	@Override
-	public void configureIResourceDescriptions(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	@Override
-	public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE))
-				.to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
-	public Class<? extends org.eclipse.xtext.generator.IGenerator> bindIGenerator() {
-		return org.eclipse.papyrus.infra.gmfdiag.generator.CSSGenerator.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.formatting.FormatterFragment
-	@Override
-	public Class<? extends org.eclipse.xtext.formatting.IFormatter> bindIFormatter() {
-		return org.eclipse.papyrus.infra.gmfdiag.formatting.CSSFormatter.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public java.lang.ClassLoader bindClassLoaderToInstance() {
-		return getClass().getClassLoader();
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public org.eclipse.xtext.common.types.TypesFactory bindTypesFactoryToInstance() {
-		return org.eclipse.xtext.common.types.TypesFactory.eINSTANCE;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
-		return org.eclipse.xtext.common.types.access.ClasspathTypeProviderFactory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
-		return org.eclipse.xtext.common.types.xtext.ClasspathBasedTypeScopeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	@Override
-	public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
-		return org.eclipse.xtext.common.types.xtext.TypesAwareDefaultGlobalScopeProvider.class;
-	}
-
-}
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3;

+

+import java.util.Properties;

+

+import org.eclipse.xtext.Constants;

+

+import com.google.inject.Binder;

+import com.google.inject.name.Names;

+

+/**

+ * Manual modifications go to {org.eclipse.papyrus.infra.gmfdiag.css3.CSSRuntimeModule}

+ */

+@SuppressWarnings("all")

+public abstract class AbstractCSSRuntimeModule extends org.eclipse.xtext.common.types.DefaultCommonTypesRuntimeModule {

+

+	protected Properties properties = null;

+

+	@Override

+	public void configure(Binder binder) {

+		properties = tryBindProperties(binder, "org/eclipse/papyrus/infra/gmfdiag/css3/CSS.properties");

+		super.configure(binder);

+	}

+

+	public void configureLanguageName(Binder binder) {

+		binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.eclipse.papyrus.infra.gmfdiag.css3.CSS");

+	}

+

+	public void configureFileExtensions(Binder binder) {

+		if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null) {

+			binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("css");

+		}

+	}

+

+	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment

+	@Override

+	public java.lang.ClassLoader bindClassLoaderToInstance() {

+		return getClass().getClassLoader();

+	}

+

+	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment

+	public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment

+	@Override

+	public Class<? extends org.eclipse.xtext.serializer.sequencer.ISemanticSequencer> bindISemanticSequencer() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.serializer.CSSSemanticSequencer.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment

+	public Class<? extends org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer> bindISyntacticSequencer() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.serializer.CSSSyntacticSequencer.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment

+	@Override

+	public Class<? extends org.eclipse.xtext.serializer.ISerializer> bindISerializer() {

+		return org.eclipse.xtext.serializer.impl.Serializer.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

+	public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.CSSParser.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

+	@Override

+	public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {

+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

+	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.CSSAntlrTokenFileProvider.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

+	public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

+	public com.google.inject.Provider<org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer> provideInternalCSSLexer() {

+		return org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer.class);

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

+	public void configureRuntimeLexer(com.google.inject.Binder binder) {

+		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.parser.antlr.LexerBindings.RUNTIME)).to(org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer.class);

+	}

+

+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

+	@Override

+	public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {

+		return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.validation.ValidatorFragment

+	@org.eclipse.xtext.service.SingletonBinding(eager = true)

+	public Class<? extends org.eclipse.papyrus.infra.gmfdiag.css3.validation.CSSValidator> bindCSSValidator() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.validation.CSSValidator.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment

+	@Override

+	public Class<? extends org.eclipse.xtext.scoping.IScopeProvider> bindIScopeProvider() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.scoping.CSSScopeProvider.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment

+	public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {

+		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE))

+				.to(org.eclipse.xtext.scoping.impl.ImportedNamespaceAwareLocalScopeProvider.class);

+	}

+

+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment

+	public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {

+		binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);

+	}

+

+	// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment

+	@Override

+	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {

+		return org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

+	@Override

+	public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() {

+		return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

+	public Class<? extends org.eclipse.xtext.resource.containers.IAllContainersState.Provider> bindIAllContainersState$Provider() {

+		return org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

+	@Override

+	public void configureIResourceDescriptions(com.google.inject.Binder binder) {

+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);

+	}

+

+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

+	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {

+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS))

+				.to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);

+	}

+

+	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment

+	public Class<? extends org.eclipse.xtext.generator.IGenerator> bindIGenerator() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.generator.CSSGenerator.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.formatting.FormatterFragment

+	@Override

+	public Class<? extends org.eclipse.xtext.formatting.IFormatter> bindIFormatter() {

+		return org.eclipse.papyrus.infra.gmfdiag.css3.formatting.CSSFormatter.class;

+	}

+

+	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment

+	@Override

+	public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {

+		return org.eclipse.xtext.common.types.xtext.TypesAwareDefaultGlobalScopeProvider.class;

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSS.xtextbin b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSS.xtextbin
new file mode 100644
index 00000000000..39f7c462c15
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSS.xtextbin
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSSStandaloneSetupGenerated.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSStandaloneSetupGenerated.java
index 7b297d5d23b..1c0612cb1e8 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSSStandaloneSetupGenerated.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSStandaloneSetupGenerated.java
@@ -1,63 +1,60 @@
-/*****************************************************************************
- * Copyright (c) 2012-2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.ISetup;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Generated from StandaloneSetup.xpt!
- */
-@SuppressWarnings("all")
-public class CSSStandaloneSetupGenerated implements ISetup {
-
-	@Override
-	public Injector createInjectorAndDoEMFRegistration() {
-		// register default ePackages
-		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("ecore")) {
-			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("ecore", new org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl());
-		}
-		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xmi")) {
-			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xmi", new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl());
-		}
-		if (!EPackage.Registry.INSTANCE.containsKey(org.eclipse.xtext.XtextPackage.eNS_URI)) {
-			EPackage.Registry.INSTANCE.put(org.eclipse.xtext.XtextPackage.eNS_URI, org.eclipse.xtext.XtextPackage.eINSTANCE);
-		}
-
-		Injector injector = createInjector();
-		register(injector);
-		return injector;
-	}
-
-	public Injector createInjector() {
-		return Guice.createInjector(new org.eclipse.papyrus.infra.gmfdiag.CSSRuntimeModule());
-	}
-
-	public void register(Injector injector) {
-		if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/infra/gmfdiag/CSS")) {
-			EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/infra/gmfdiag/CSS", org.eclipse.papyrus.infra.gmfdiag.css.CssPackage.eINSTANCE);
-		}
-
-		org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);
-		org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class);
-		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("css", resourceFactory);
-		org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("css", serviceProvider);
-
-
-
-
-	}
-}
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3;

+

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.xtext.ISetup;

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

+

+import com.google.inject.Guice;

+import com.google.inject.Injector;

+

+/**

+ * Generated from StandaloneSetup.xpt!

+ */

+@SuppressWarnings("all")

+public class CSSStandaloneSetupGenerated implements ISetup {

+

+	@Override

+	public Injector createInjectorAndDoEMFRegistration() {

+		// register default ePackages

+		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("ecore")) {

+			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(

+					"ecore", new org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl());

+		}

+		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xmi")) {

+			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(

+					"xmi", new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl());

+		}

+		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xtextbin")) {

+			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(

+					"xtextbin", new org.eclipse.xtext.resource.impl.BinaryGrammarResourceFactoryImpl());

+		}

+		if (!EPackage.Registry.INSTANCE.containsKey(org.eclipse.xtext.XtextPackage.eNS_URI)) {

+			EPackage.Registry.INSTANCE.put(org.eclipse.xtext.XtextPackage.eNS_URI, org.eclipse.xtext.XtextPackage.eINSTANCE);

+		}

+

+		Injector injector = createInjector();

+		register(injector);

+		return injector;

+	}

+

+	public Injector createInjector() {

+		return Guice.createInjector(new org.eclipse.papyrus.infra.gmfdiag.css3.CSSRuntimeModule());

+	}

+

+	public void register(Injector injector) {

+		if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/infra/gmfdiag/css3/CSS")) {

+			EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/infra/gmfdiag/css3/CSS", org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage.eINSTANCE);

+		}

+

+		org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);

+		org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class);

+		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("css", resourceFactory);

+		org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("css", serviceProvider);

+

+

+

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/AttributeSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/AttributeSelector.java
new file mode 100644
index 00000000000..474cee59fcf
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/AttributeSelector.java
@@ -0,0 +1,110 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Attribute Selector</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getName <em>Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getOp <em>Op</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getValue <em>Value</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getAttributeSelector()

+ * @model

+ * @generated

+ */

+public interface AttributeSelector extends CssSelector

+{

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getAttributeSelector_Name()

+	 * @model

+	 * @generated

+	 */

+	String getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Op</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Op</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Op</em>' attribute.

+	 * @see #setOp(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getAttributeSelector_Op()

+	 * @model

+	 * @generated

+	 */

+	String getOp();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getOp <em>Op</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Op</em>' attribute.

+	 * @see #getOp()

+	 * @generated

+	 */

+	void setOp(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Value</em>' attribute.

+	 * @see #setValue(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getAttributeSelector_Value()

+	 * @model

+	 * @generated

+	 */

+	String getValue();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getValue <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Value</em>' attribute.

+	 * @see #getValue()

+	 * @generated

+	 */

+	void setValue(String value);

+

+} // AttributeSelector

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CSSFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CSSFactory.java
new file mode 100644
index 00000000000..ec6be060bd1
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CSSFactory.java
@@ -0,0 +1,377 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+import org.eclipse.emf.ecore.EFactory;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Factory</b> for the model.

+ * It provides a create method for each non-abstract class of the model.

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage

+ * @generated

+ */

+public interface CSSFactory extends EFactory

+{

+	/**

+	 * The singleton instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	CSSFactory eINSTANCE = org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSFactoryImpl.init();

+

+	/**

+	 * Returns a new object of class '<em>stylesheet</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>stylesheet</em>'.

+	 * @generated

+	 */

+	stylesheet createstylesheet();

+

+	/**

+	 * Returns a new object of class '<em>charset</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>charset</em>'.

+	 * @generated

+	 */

+	charset createcharset();

+

+	/**

+	 * Returns a new object of class '<em>import Expression</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>import Expression</em>'.

+	 * @generated

+	 */

+	importExpression createimportExpression();

+

+	/**

+	 * Returns a new object of class '<em>page</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>page</em>'.

+	 * @generated

+	 */

+	page createpage();

+

+	/**

+	 * Returns a new object of class '<em>media</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>media</em>'.

+	 * @generated

+	 */

+	media createmedia();

+

+	/**

+	 * Returns a new object of class '<em>font face</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>font face</em>'.

+	 * @generated

+	 */

+	font_face createfont_face();

+

+	/**

+	 * Returns a new object of class '<em>keyframes</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>keyframes</em>'.

+	 * @generated

+	 */

+	keyframes createkeyframes();

+

+	/**

+	 * Returns a new object of class '<em>keyframe selector</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>keyframe selector</em>'.

+	 * @generated

+	 */

+	keyframe_selector createkeyframe_selector();

+

+	/**

+	 * Returns a new object of class '<em>ruleset</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>ruleset</em>'.

+	 * @generated

+	 */

+	ruleset createruleset();

+

+	/**

+	 * Returns a new object of class '<em>selector</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>selector</em>'.

+	 * @generated

+	 */

+	selector createselector();

+

+	/**

+	 * Returns a new object of class '<em>Simple Selector For Negation</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Simple Selector For Negation</em>'.

+	 * @generated

+	 */

+	SimpleSelectorForNegation createSimpleSelectorForNegation();

+

+	/**

+	 * Returns a new object of class '<em>Css Selector</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Css Selector</em>'.

+	 * @generated

+	 */

+	CssSelector createCssSelector();

+

+	/**

+	 * Returns a new object of class '<em>simple selector</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>simple selector</em>'.

+	 * @generated

+	 */

+	simple_selector createsimple_selector();

+

+	/**

+	 * Returns a new object of class '<em>Class Selector</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Class Selector</em>'.

+	 * @generated

+	 */

+	ClassSelector createClassSelector();

+

+	/**

+	 * Returns a new object of class '<em>Element Selector</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Element Selector</em>'.

+	 * @generated

+	 */

+	ElementSelector createElementSelector();

+

+	/**

+	 * Returns a new object of class '<em>Universal Selector</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Universal Selector</em>'.

+	 * @generated

+	 */

+	UniversalSelector createUniversalSelector();

+

+	/**

+	 * Returns a new object of class '<em>Id Selector</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Id Selector</em>'.

+	 * @generated

+	 */

+	IdSelector createIdSelector();

+

+	/**

+	 * Returns a new object of class '<em>css declaration</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>css declaration</em>'.

+	 * @generated

+	 */

+	css_declaration createcss_declaration();

+

+	/**

+	 * Returns a new object of class '<em>css property</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>css property</em>'.

+	 * @generated

+	 */

+	css_property createcss_property();

+

+	/**

+	 * Returns a new object of class '<em>Pseudo Class Or Func</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Pseudo Class Or Func</em>'.

+	 * @generated

+	 */

+	PseudoClassOrFunc createPseudoClassOrFunc();

+

+	/**

+	 * Returns a new object of class '<em>Pseudo Class</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Pseudo Class</em>'.

+	 * @generated

+	 */

+	PseudoClass createPseudoClass();

+

+	/**

+	 * Returns a new object of class '<em>Pseudo Class Name</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Pseudo Class Name</em>'.

+	 * @generated

+	 */

+	PseudoClassName createPseudoClassName();

+

+	/**

+	 * Returns a new object of class '<em>Pseudo Class Function</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Pseudo Class Function</em>'.

+	 * @generated

+	 */

+	PseudoClassFunction createPseudoClassFunction();

+

+	/**

+	 * Returns a new object of class '<em>Css Tok</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Css Tok</em>'.

+	 * @generated

+	 */

+	CssTok createCssTok();

+

+	/**

+	 * Returns a new object of class '<em>URL Type</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>URL Type</em>'.

+	 * @generated

+	 */

+	URLType createURLType();

+

+	/**

+	 * Returns a new object of class '<em>Attribute Selector</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Attribute Selector</em>'.

+	 * @generated

+	 */

+	AttributeSelector createAttributeSelector();

+

+	/**

+	 * Returns a new object of class '<em>Symbol Tok</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Symbol Tok</em>'.

+	 * @generated

+	 */

+	SymbolTok createSymbolTok();

+

+	/**

+	 * Returns a new object of class '<em>WS Tok</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>WS Tok</em>'.

+	 * @generated

+	 */

+	WSTok createWSTok();

+

+	/**

+	 * Returns a new object of class '<em>String Tok</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>String Tok</em>'.

+	 * @generated

+	 */

+	StringTok createStringTok();

+

+	/**

+	 * Returns a new object of class '<em>Number Tok</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Number Tok</em>'.

+	 * @generated

+	 */

+	NumberTok createNumberTok();

+

+	/**

+	 * Returns a new object of class '<em>Url Tok</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Url Tok</em>'.

+	 * @generated

+	 */

+	UrlTok createUrlTok();

+

+	/**

+	 * Returns a new object of class '<em>Color Tok</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Color Tok</em>'.

+	 * @generated

+	 */

+	ColorTok createColorTok();

+

+	/**

+	 * Returns a new object of class '<em>Identifier Tok</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Identifier Tok</em>'.

+	 * @generated

+	 */

+	IdentifierTok createIdentifierTok();

+

+	/**

+	 * Returns a new object of class '<em>Func Tok</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return a new object of class '<em>Func Tok</em>'.

+	 * @generated

+	 */

+	FuncTok createFuncTok();

+

+	/**

+	 * Returns the package supported by this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the package supported by this factory.

+	 * @generated

+	 */

+	CSSPackage getCSSPackage();

+

+} // CSSFactory

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CSSPackage.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CSSPackage.java
new file mode 100644
index 00000000000..6eff98dac65
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CSSPackage.java
@@ -0,0 +1,3300 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+import org.eclipse.emf.ecore.EAttribute;

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

+import org.eclipse.emf.ecore.EPackage;

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

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Package</b> for the model.

+ * It contains accessors for the meta objects to represent

+ * <ul>

+ * <li>each class,</li>

+ * <li>each feature of each class,</li>

+ * <li>each enum,</li>

+ * <li>and each data type</li>

+ * </ul>

+ * <!-- end-user-doc -->

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSFactory

+ * @model kind="package"

+ * @generated

+ */

+public interface CSSPackage extends EPackage

+{

+	/**

+	 * The package name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	String eNAME = "cSS";

+

+	/**

+	 * The package namespace URI.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/gmfdiag/css3/CSS";

+

+	/**

+	 * The package namespace name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	String eNS_PREFIX = "cSS";

+

+	/**

+	 * The singleton instance of the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	CSSPackage eINSTANCE = org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl.init();

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl <em>stylesheet</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getstylesheet()

+	 * @generated

+	 */

+	int STYLESHEET = 0;

+

+	/**

+	 * The feature id for the '<em><b>Charset</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int STYLESHEET__CHARSET = 0;

+

+	/**

+	 * The feature id for the '<em><b>Imports</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int STYLESHEET__IMPORTS = 1;

+

+	/**

+	 * The feature id for the '<em><b>Ruleset</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int STYLESHEET__RULESET = 2;

+

+	/**

+	 * The feature id for the '<em><b>Media</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int STYLESHEET__MEDIA = 3;

+

+	/**

+	 * The feature id for the '<em><b>Page</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int STYLESHEET__PAGE = 4;

+

+	/**

+	 * The feature id for the '<em><b>Font face</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int STYLESHEET__FONT_FACE = 5;

+

+	/**

+	 * The feature id for the '<em><b>Keyframes</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int STYLESHEET__KEYFRAMES = 6;

+

+	/**

+	 * The number of structural features of the '<em>stylesheet</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int STYLESHEET_FEATURE_COUNT = 7;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.charsetImpl <em>charset</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.charsetImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getcharset()

+	 * @generated

+	 */

+	int CHARSET = 1;

+

+	/**

+	 * The feature id for the '<em><b>Charset</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CHARSET__CHARSET = 0;

+

+	/**

+	 * The number of structural features of the '<em>charset</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CHARSET_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.importExpressionImpl <em>import Expression</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.importExpressionImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getimportExpression()

+	 * @generated

+	 */

+	int IMPORT_EXPRESSION = 2;

+

+	/**

+	 * The feature id for the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int IMPORT_EXPRESSION__VALUE = 0;

+

+	/**

+	 * The number of structural features of the '<em>import Expression</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int IMPORT_EXPRESSION_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.pageImpl <em>page</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.pageImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getpage()

+	 * @generated

+	 */

+	int PAGE = 3;

+

+	/**

+	 * The feature id for the '<em><b>Pseudo Page</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PAGE__PSEUDO_PAGE = 0;

+

+	/**

+	 * The feature id for the '<em><b>Declarations</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PAGE__DECLARATIONS = 1;

+

+	/**

+	 * The number of structural features of the '<em>page</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PAGE_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.mediaImpl <em>media</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.mediaImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getmedia()

+	 * @generated

+	 */

+	int MEDIA = 4;

+

+	/**

+	 * The feature id for the '<em><b>Medialist</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int MEDIA__MEDIALIST = 0;

+

+	/**

+	 * The feature id for the '<em><b>Rulesets</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int MEDIA__RULESETS = 1;

+

+	/**

+	 * The number of structural features of the '<em>media</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int MEDIA_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframesImpl <em>keyframes</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframesImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getkeyframes()

+	 * @generated

+	 */

+	int KEYFRAMES = 6;

+

+	/**

+	 * The number of structural features of the '<em>keyframes</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int KEYFRAMES_FEATURE_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.font_faceImpl <em>font face</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.font_faceImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getfont_face()

+	 * @generated

+	 */

+	int FONT_FACE = 5;

+

+	/**

+	 * The feature id for the '<em><b>Declarations</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int FONT_FACE__DECLARATIONS = KEYFRAMES_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int FONT_FACE__NAME = KEYFRAMES_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Keyframeselectors</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int FONT_FACE__KEYFRAMESELECTORS = KEYFRAMES_FEATURE_COUNT + 2;

+

+	/**

+	 * The number of structural features of the '<em>font face</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int FONT_FACE_FEATURE_COUNT = KEYFRAMES_FEATURE_COUNT + 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframe_selectorImpl <em>keyframe selector</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframe_selectorImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getkeyframe_selector()

+	 * @generated

+	 */

+	int KEYFRAME_SELECTOR = 7;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int KEYFRAME_SELECTOR__TYPE = 0;

+

+	/**

+	 * The feature id for the '<em><b>Percentage</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int KEYFRAME_SELECTOR__PERCENTAGE = 1;

+

+	/**

+	 * The feature id for the '<em><b>Declarations</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int KEYFRAME_SELECTOR__DECLARATIONS = 2;

+

+	/**

+	 * The number of structural features of the '<em>keyframe selector</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int KEYFRAME_SELECTOR_FEATURE_COUNT = 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.rulesetImpl <em>ruleset</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.rulesetImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getruleset()

+	 * @generated

+	 */

+	int RULESET = 8;

+

+	/**

+	 * The feature id for the '<em><b>Selectors</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RULESET__SELECTORS = 0;

+

+	/**

+	 * The feature id for the '<em><b>Declarations</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RULESET__DECLARATIONS = 1;

+

+	/**

+	 * The number of structural features of the '<em>ruleset</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int RULESET_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.selectorImpl <em>selector</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.selectorImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getselector()

+	 * @generated

+	 */

+	int SELECTOR = 9;

+

+	/**

+	 * The feature id for the '<em><b>Simpleselectors</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SELECTOR__SIMPLESELECTORS = 0;

+

+	/**

+	 * The feature id for the '<em><b>Combinator</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SELECTOR__COMBINATOR = 1;

+

+	/**

+	 * The feature id for the '<em><b>Selector</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SELECTOR__SELECTOR = 2;

+

+	/**

+	 * The number of structural features of the '<em>selector</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SELECTOR_FEATURE_COUNT = 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SimpleSelectorForNegationImpl <em>Simple Selector For Negation</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SimpleSelectorForNegationImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getSimpleSelectorForNegation()

+	 * @generated

+	 */

+	int SIMPLE_SELECTOR_FOR_NEGATION = 10;

+

+	/**

+	 * The feature id for the '<em><b>Element</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT = 0;

+

+	/**

+	 * The feature id for the '<em><b>Universal</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL = 1;

+

+	/**

+	 * The feature id for the '<em><b>Sub Selectors</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS = 2;

+

+	/**

+	 * The number of structural features of the '<em>Simple Selector For Negation</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SIMPLE_SELECTOR_FOR_NEGATION_FEATURE_COUNT = 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CssSelectorImpl <em>Css Selector</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CssSelectorImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getCssSelector()

+	 * @generated

+	 */

+	int CSS_SELECTOR = 11;

+

+	/**

+	 * The number of structural features of the '<em>Css Selector</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CSS_SELECTOR_FEATURE_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.simple_selectorImpl <em>simple selector</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.simple_selectorImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getsimple_selector()

+	 * @generated

+	 */

+	int SIMPLE_SELECTOR = 12;

+

+	/**

+	 * The feature id for the '<em><b>Element</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SIMPLE_SELECTOR__ELEMENT = 0;

+

+	/**

+	 * The feature id for the '<em><b>Universal</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SIMPLE_SELECTOR__UNIVERSAL = 1;

+

+	/**

+	 * The feature id for the '<em><b>Sub Selectors</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SIMPLE_SELECTOR__SUB_SELECTORS = 2;

+

+	/**

+	 * The number of structural features of the '<em>simple selector</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SIMPLE_SELECTOR_FEATURE_COUNT = 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ClassSelectorImpl <em>Class Selector</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ClassSelectorImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getClassSelector()

+	 * @generated

+	 */

+	int CLASS_SELECTOR = 13;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CLASS_SELECTOR__NAME = CSS_SELECTOR_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Class Selector</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CLASS_SELECTOR_FEATURE_COUNT = CSS_SELECTOR_FEATURE_COUNT + 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ElementSelectorImpl <em>Element Selector</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ElementSelectorImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getElementSelector()

+	 * @generated

+	 */

+	int ELEMENT_SELECTOR = 14;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ELEMENT_SELECTOR__NAME = 0;

+

+	/**

+	 * The number of structural features of the '<em>Element Selector</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ELEMENT_SELECTOR_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UniversalSelectorImpl <em>Universal Selector</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UniversalSelectorImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getUniversalSelector()

+	 * @generated

+	 */

+	int UNIVERSAL_SELECTOR = 15;

+

+	/**

+	 * The feature id for the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int UNIVERSAL_SELECTOR__NAMESPACE = 0;

+

+	/**

+	 * The number of structural features of the '<em>Universal Selector</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int UNIVERSAL_SELECTOR_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdSelectorImpl <em>Id Selector</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdSelectorImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getIdSelector()

+	 * @generated

+	 */

+	int ID_SELECTOR = 16;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ID_SELECTOR__NAME = CSS_SELECTOR_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Id Selector</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ID_SELECTOR_FEATURE_COUNT = CSS_SELECTOR_FEATURE_COUNT + 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_declarationImpl <em>css declaration</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_declarationImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getcss_declaration()

+	 * @generated

+	 */

+	int CSS_DECLARATION = 17;

+

+	/**

+	 * The feature id for the '<em><b>Property</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CSS_DECLARATION__PROPERTY = 0;

+

+	/**

+	 * The feature id for the '<em><b>Value Tokens</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CSS_DECLARATION__VALUE_TOKENS = 1;

+

+	/**

+	 * The feature id for the '<em><b>Important</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CSS_DECLARATION__IMPORTANT = 2;

+

+	/**

+	 * The number of structural features of the '<em>css declaration</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CSS_DECLARATION_FEATURE_COUNT = 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_propertyImpl <em>css property</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_propertyImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getcss_property()

+	 * @generated

+	 */

+	int CSS_PROPERTY = 18;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CSS_PROPERTY__NAME = 0;

+

+	/**

+	 * The number of structural features of the '<em>css property</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CSS_PROPERTY_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassOrFuncImpl <em>Pseudo Class Or Func</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassOrFuncImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getPseudoClassOrFunc()

+	 * @generated

+	 */

+	int PSEUDO_CLASS_OR_FUNC = 19;

+

+	/**

+	 * The number of structural features of the '<em>Pseudo Class Or Func</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PSEUDO_CLASS_OR_FUNC_FEATURE_COUNT = CSS_SELECTOR_FEATURE_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassImpl <em>Pseudo Class</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getPseudoClass()

+	 * @generated

+	 */

+	int PSEUDO_CLASS = 20;

+

+	/**

+	 * The number of structural features of the '<em>Pseudo Class</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PSEUDO_CLASS_FEATURE_COUNT = CSS_SELECTOR_FEATURE_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassNameImpl <em>Pseudo Class Name</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassNameImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getPseudoClassName()

+	 * @generated

+	 */

+	int PSEUDO_CLASS_NAME = 21;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PSEUDO_CLASS_NAME__NAME = PSEUDO_CLASS_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Pseudo Class Name</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PSEUDO_CLASS_NAME_FEATURE_COUNT = PSEUDO_CLASS_FEATURE_COUNT + 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl <em>Pseudo Class Function</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getPseudoClassFunction()

+	 * @generated

+	 */

+	int PSEUDO_CLASS_FUNCTION = 22;

+

+	/**

+	 * The feature id for the '<em><b>Not</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PSEUDO_CLASS_FUNCTION__NOT = PSEUDO_CLASS_OR_FUNC_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Param Selector</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR = PSEUDO_CLASS_OR_FUNC_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PSEUDO_CLASS_FUNCTION__NAME = PSEUDO_CLASS_OR_FUNC_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PSEUDO_CLASS_FUNCTION__PARAMS = PSEUDO_CLASS_OR_FUNC_FEATURE_COUNT + 3;

+

+	/**

+	 * The number of structural features of the '<em>Pseudo Class Function</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int PSEUDO_CLASS_FUNCTION_FEATURE_COUNT = PSEUDO_CLASS_OR_FUNC_FEATURE_COUNT + 4;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CssTokImpl <em>Css Tok</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CssTokImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getCssTok()

+	 * @generated

+	 */

+	int CSS_TOK = 23;

+

+	/**

+	 * The number of structural features of the '<em>Css Tok</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int CSS_TOK_FEATURE_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.URLTypeImpl <em>URL Type</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.URLTypeImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getURLType()

+	 * @generated

+	 */

+	int URL_TYPE = 24;

+

+	/**

+	 * The feature id for the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int URL_TYPE__VALUE = IMPORT_EXPRESSION__VALUE;

+

+	/**

+	 * The feature id for the '<em><b>Media List</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int URL_TYPE__MEDIA_LIST = IMPORT_EXPRESSION_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Url</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int URL_TYPE__URL = IMPORT_EXPRESSION_FEATURE_COUNT + 1;

+

+	/**

+	 * The number of structural features of the '<em>URL Type</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int URL_TYPE_FEATURE_COUNT = IMPORT_EXPRESSION_FEATURE_COUNT + 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.AttributeSelectorImpl <em>Attribute Selector</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.AttributeSelectorImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getAttributeSelector()

+	 * @generated

+	 */

+	int ATTRIBUTE_SELECTOR = 25;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ATTRIBUTE_SELECTOR__NAME = CSS_SELECTOR_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Op</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ATTRIBUTE_SELECTOR__OP = CSS_SELECTOR_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ATTRIBUTE_SELECTOR__VALUE = CSS_SELECTOR_FEATURE_COUNT + 2;

+

+	/**

+	 * The number of structural features of the '<em>Attribute Selector</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int ATTRIBUTE_SELECTOR_FEATURE_COUNT = CSS_SELECTOR_FEATURE_COUNT + 3;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SymbolTokImpl <em>Symbol Tok</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SymbolTokImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getSymbolTok()

+	 * @generated

+	 */

+	int SYMBOL_TOK = 26;

+

+	/**

+	 * The feature id for the '<em><b>Symbol</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SYMBOL_TOK__SYMBOL = CSS_TOK_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Symbol Tok</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int SYMBOL_TOK_FEATURE_COUNT = CSS_TOK_FEATURE_COUNT + 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.WSTokImpl <em>WS Tok</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.WSTokImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getWSTok()

+	 * @generated

+	 */

+	int WS_TOK = 27;

+

+	/**

+	 * The number of structural features of the '<em>WS Tok</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int WS_TOK_FEATURE_COUNT = CSS_TOK_FEATURE_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.StringTokImpl <em>String Tok</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.StringTokImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getStringTok()

+	 * @generated

+	 */

+	int STRING_TOK = 28;

+

+	/**

+	 * The feature id for the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int STRING_TOK__VALUE = CSS_TOK_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>String Tok</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int STRING_TOK_FEATURE_COUNT = CSS_TOK_FEATURE_COUNT + 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.NumberTokImpl <em>Number Tok</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.NumberTokImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getNumberTok()

+	 * @generated

+	 */

+	int NUMBER_TOK = 29;

+

+	/**

+	 * The feature id for the '<em><b>Val</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int NUMBER_TOK__VAL = CSS_TOK_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Number Tok</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int NUMBER_TOK_FEATURE_COUNT = CSS_TOK_FEATURE_COUNT + 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UrlTokImpl <em>Url Tok</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UrlTokImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getUrlTok()

+	 * @generated

+	 */

+	int URL_TOK = 30;

+

+	/**

+	 * The feature id for the '<em><b>Url</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int URL_TOK__URL = CSS_TOK_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Url Tok</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int URL_TOK_FEATURE_COUNT = CSS_TOK_FEATURE_COUNT + 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ColorTokImpl <em>Color Tok</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ColorTokImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getColorTok()

+	 * @generated

+	 */

+	int COLOR_TOK = 31;

+

+	/**

+	 * The feature id for the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int COLOR_TOK__VALUE = CSS_TOK_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Color Tok</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int COLOR_TOK_FEATURE_COUNT = CSS_TOK_FEATURE_COUNT + 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdentifierTokImpl <em>Identifier Tok</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdentifierTokImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getIdentifierTok()

+	 * @generated

+	 */

+	int IDENTIFIER_TOK = 32;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int IDENTIFIER_TOK__NAME = CSS_TOK_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Identifier Tok</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int IDENTIFIER_TOK_FEATURE_COUNT = CSS_TOK_FEATURE_COUNT + 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.FuncTokImpl <em>Func Tok</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.FuncTokImpl

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getFuncTok()

+	 * @generated

+	 */

+	int FUNC_TOK = 33;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int FUNC_TOK__NAME = CSS_TOK_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int FUNC_TOK__PARAMS = CSS_TOK_FEATURE_COUNT + 1;

+

+	/**

+	 * The number of structural features of the '<em>Func Tok</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 * @ordered

+	 */

+	int FUNC_TOK_FEATURE_COUNT = CSS_TOK_FEATURE_COUNT + 2;

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet <em>stylesheet</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>stylesheet</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet

+	 * @generated

+	 */

+	EClass getstylesheet();

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getCharset <em>Charset</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference '<em>Charset</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getCharset()

+	 * @see #getstylesheet()

+	 * @generated

+	 */

+	EReference getstylesheet_Charset();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getImports <em>Imports</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Imports</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getImports()

+	 * @see #getstylesheet()

+	 * @generated

+	 */

+	EReference getstylesheet_Imports();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getRuleset <em>Ruleset</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Ruleset</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getRuleset()

+	 * @see #getstylesheet()

+	 * @generated

+	 */

+	EReference getstylesheet_Ruleset();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getMedia <em>Media</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Media</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getMedia()

+	 * @see #getstylesheet()

+	 * @generated

+	 */

+	EReference getstylesheet_Media();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getPage <em>Page</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Page</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getPage()

+	 * @see #getstylesheet()

+	 * @generated

+	 */

+	EReference getstylesheet_Page();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getFont_face <em>Font face</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Font face</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getFont_face()

+	 * @see #getstylesheet()

+	 * @generated

+	 */

+	EReference getstylesheet_Font_face();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getKeyframes <em>Keyframes</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Keyframes</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getKeyframes()

+	 * @see #getstylesheet()

+	 * @generated

+	 */

+	EReference getstylesheet_Keyframes();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset <em>charset</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>charset</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset

+	 * @generated

+	 */

+	EClass getcharset();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset#getCharset <em>Charset</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Charset</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset#getCharset()

+	 * @see #getcharset()

+	 * @generated

+	 */

+	EAttribute getcharset_Charset();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression <em>import Expression</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>import Expression</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression

+	 * @generated

+	 */

+	EClass getimportExpression();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression#getValue <em>Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Value</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression#getValue()

+	 * @see #getimportExpression()

+	 * @generated

+	 */

+	EAttribute getimportExpression_Value();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page <em>page</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>page</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page

+	 * @generated

+	 */

+	EClass getpage();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page#getPseudoPage <em>Pseudo Page</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Pseudo Page</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page#getPseudoPage()

+	 * @see #getpage()

+	 * @generated

+	 */

+	EAttribute getpage_PseudoPage();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page#getDeclarations <em>Declarations</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Declarations</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page#getDeclarations()

+	 * @see #getpage()

+	 * @generated

+	 */

+	EReference getpage_Declarations();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media <em>media</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>media</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media

+	 * @generated

+	 */

+	EClass getmedia();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media#getMedialist <em>Medialist</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Medialist</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media#getMedialist()

+	 * @see #getmedia()

+	 * @generated

+	 */

+	EAttribute getmedia_Medialist();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media#getRulesets <em>Rulesets</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Rulesets</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media#getRulesets()

+	 * @see #getmedia()

+	 * @generated

+	 */

+	EReference getmedia_Rulesets();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face <em>font face</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>font face</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face

+	 * @generated

+	 */

+	EClass getfont_face();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getDeclarations <em>Declarations</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Declarations</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getDeclarations()

+	 * @see #getfont_face()

+	 * @generated

+	 */

+	EReference getfont_face_Declarations();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getName()

+	 * @see #getfont_face()

+	 * @generated

+	 */

+	EAttribute getfont_face_Name();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getKeyframeselectors <em>Keyframeselectors</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Keyframeselectors</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getKeyframeselectors()

+	 * @see #getfont_face()

+	 * @generated

+	 */

+	EReference getfont_face_Keyframeselectors();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes <em>keyframes</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>keyframes</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes

+	 * @generated

+	 */

+	EClass getkeyframes();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector <em>keyframe selector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>keyframe selector</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector

+	 * @generated

+	 */

+	EClass getkeyframe_selector();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getType <em>Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Type</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getType()

+	 * @see #getkeyframe_selector()

+	 * @generated

+	 */

+	EAttribute getkeyframe_selector_Type();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getPercentage <em>Percentage</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Percentage</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getPercentage()

+	 * @see #getkeyframe_selector()

+	 * @generated

+	 */

+	EAttribute getkeyframe_selector_Percentage();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getDeclarations <em>Declarations</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Declarations</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getDeclarations()

+	 * @see #getkeyframe_selector()

+	 * @generated

+	 */

+	EReference getkeyframe_selector_Declarations();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset <em>ruleset</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>ruleset</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset

+	 * @generated

+	 */

+	EClass getruleset();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset#getSelectors <em>Selectors</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Selectors</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset#getSelectors()

+	 * @see #getruleset()

+	 * @generated

+	 */

+	EReference getruleset_Selectors();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset#getDeclarations <em>Declarations</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Declarations</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset#getDeclarations()

+	 * @see #getruleset()

+	 * @generated

+	 */

+	EReference getruleset_Declarations();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector <em>selector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>selector</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector

+	 * @generated

+	 */

+	EClass getselector();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getSimpleselectors <em>Simpleselectors</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Simpleselectors</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getSimpleselectors()

+	 * @see #getselector()

+	 * @generated

+	 */

+	EReference getselector_Simpleselectors();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getCombinator <em>Combinator</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Combinator</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getCombinator()

+	 * @see #getselector()

+	 * @generated

+	 */

+	EAttribute getselector_Combinator();

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getSelector <em>Selector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference '<em>Selector</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getSelector()

+	 * @see #getselector()

+	 * @generated

+	 */

+	EReference getselector_Selector();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation <em>Simple Selector For Negation</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Simple Selector For Negation</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation

+	 * @generated

+	 */

+	EClass getSimpleSelectorForNegation();

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getElement <em>Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference '<em>Element</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getElement()

+	 * @see #getSimpleSelectorForNegation()

+	 * @generated

+	 */

+	EReference getSimpleSelectorForNegation_Element();

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getUniversal <em>Universal</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference '<em>Universal</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getUniversal()

+	 * @see #getSimpleSelectorForNegation()

+	 * @generated

+	 */

+	EReference getSimpleSelectorForNegation_Universal();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getSubSelectors <em>Sub Selectors</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Sub Selectors</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getSubSelectors()

+	 * @see #getSimpleSelectorForNegation()

+	 * @generated

+	 */

+	EReference getSimpleSelectorForNegation_SubSelectors();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector <em>Css Selector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Css Selector</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector

+	 * @generated

+	 */

+	EClass getCssSelector();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector <em>simple selector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>simple selector</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector

+	 * @generated

+	 */

+	EClass getsimple_selector();

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getElement <em>Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference '<em>Element</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getElement()

+	 * @see #getsimple_selector()

+	 * @generated

+	 */

+	EReference getsimple_selector_Element();

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getUniversal <em>Universal</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference '<em>Universal</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getUniversal()

+	 * @see #getsimple_selector()

+	 * @generated

+	 */

+	EReference getsimple_selector_Universal();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getSubSelectors <em>Sub Selectors</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Sub Selectors</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getSubSelectors()

+	 * @see #getsimple_selector()

+	 * @generated

+	 */

+	EReference getsimple_selector_SubSelectors();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector <em>Class Selector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Class Selector</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector

+	 * @generated

+	 */

+	EClass getClassSelector();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector#getName()

+	 * @see #getClassSelector()

+	 * @generated

+	 */

+	EAttribute getClassSelector_Name();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector <em>Element Selector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Element Selector</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector

+	 * @generated

+	 */

+	EClass getElementSelector();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector#getName()

+	 * @see #getElementSelector()

+	 * @generated

+	 */

+	EAttribute getElementSelector_Name();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector <em>Universal Selector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Universal Selector</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector

+	 * @generated

+	 */

+	EClass getUniversalSelector();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector#getNamespace <em>Namespace</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Namespace</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector#getNamespace()

+	 * @see #getUniversalSelector()

+	 * @generated

+	 */

+	EAttribute getUniversalSelector_Namespace();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector <em>Id Selector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Id Selector</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector

+	 * @generated

+	 */

+	EClass getIdSelector();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector#getName()

+	 * @see #getIdSelector()

+	 * @generated

+	 */

+	EAttribute getIdSelector_Name();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration <em>css declaration</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>css declaration</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration

+	 * @generated

+	 */

+	EClass getcss_declaration();

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#getProperty <em>Property</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference '<em>Property</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#getProperty()

+	 * @see #getcss_declaration()

+	 * @generated

+	 */

+	EReference getcss_declaration_Property();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#getValueTokens <em>Value Tokens</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Value Tokens</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#getValueTokens()

+	 * @see #getcss_declaration()

+	 * @generated

+	 */

+	EReference getcss_declaration_ValueTokens();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#isImportant <em>Important</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Important</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#isImportant()

+	 * @see #getcss_declaration()

+	 * @generated

+	 */

+	EAttribute getcss_declaration_Important();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property <em>css property</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>css property</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property

+	 * @generated

+	 */

+	EClass getcss_property();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property#getName()

+	 * @see #getcss_property()

+	 * @generated

+	 */

+	EAttribute getcss_property_Name();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassOrFunc <em>Pseudo Class Or Func</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Pseudo Class Or Func</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassOrFunc

+	 * @generated

+	 */

+	EClass getPseudoClassOrFunc();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClass <em>Pseudo Class</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Pseudo Class</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClass

+	 * @generated

+	 */

+	EClass getPseudoClass();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName <em>Pseudo Class Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Pseudo Class Name</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName

+	 * @generated

+	 */

+	EClass getPseudoClassName();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName#getName()

+	 * @see #getPseudoClassName()

+	 * @generated

+	 */

+	EAttribute getPseudoClassName_Name();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction <em>Pseudo Class Function</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Pseudo Class Function</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction

+	 * @generated

+	 */

+	EClass getPseudoClassFunction();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#isNot <em>Not</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Not</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#isNot()

+	 * @see #getPseudoClassFunction()

+	 * @generated

+	 */

+	EAttribute getPseudoClassFunction_Not();

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getParamSelector <em>Param Selector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference '<em>Param Selector</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getParamSelector()

+	 * @see #getPseudoClassFunction()

+	 * @generated

+	 */

+	EReference getPseudoClassFunction_ParamSelector();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getName()

+	 * @see #getPseudoClassFunction()

+	 * @generated

+	 */

+	EAttribute getPseudoClassFunction_Name();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getParams <em>Params</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Params</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getParams()

+	 * @see #getPseudoClassFunction()

+	 * @generated

+	 */

+	EReference getPseudoClassFunction_Params();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok <em>Css Tok</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Css Tok</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok

+	 * @generated

+	 */

+	EClass getCssTok();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType <em>URL Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>URL Type</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType

+	 * @generated

+	 */

+	EClass getURLType();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getMediaList <em>Media List</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Media List</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getMediaList()

+	 * @see #getURLType()

+	 * @generated

+	 */

+	EAttribute getURLType_MediaList();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getUrl <em>Url</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Url</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getUrl()

+	 * @see #getURLType()

+	 * @generated

+	 */

+	EAttribute getURLType_Url();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector <em>Attribute Selector</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Attribute Selector</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector

+	 * @generated

+	 */

+	EClass getAttributeSelector();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getName()

+	 * @see #getAttributeSelector()

+	 * @generated

+	 */

+	EAttribute getAttributeSelector_Name();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getOp <em>Op</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Op</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getOp()

+	 * @see #getAttributeSelector()

+	 * @generated

+	 */

+	EAttribute getAttributeSelector_Op();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getValue <em>Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Value</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getValue()

+	 * @see #getAttributeSelector()

+	 * @generated

+	 */

+	EAttribute getAttributeSelector_Value();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok <em>Symbol Tok</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Symbol Tok</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok

+	 * @generated

+	 */

+	EClass getSymbolTok();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok#getSymbol <em>Symbol</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Symbol</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok#getSymbol()

+	 * @see #getSymbolTok()

+	 * @generated

+	 */

+	EAttribute getSymbolTok_Symbol();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.WSTok <em>WS Tok</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>WS Tok</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.WSTok

+	 * @generated

+	 */

+	EClass getWSTok();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok <em>String Tok</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>String Tok</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok

+	 * @generated

+	 */

+	EClass getStringTok();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok#getValue <em>Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Value</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok#getValue()

+	 * @see #getStringTok()

+	 * @generated

+	 */

+	EAttribute getStringTok_Value();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok <em>Number Tok</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Number Tok</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok

+	 * @generated

+	 */

+	EClass getNumberTok();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok#getVal <em>Val</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Val</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok#getVal()

+	 * @see #getNumberTok()

+	 * @generated

+	 */

+	EAttribute getNumberTok_Val();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok <em>Url Tok</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Url Tok</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok

+	 * @generated

+	 */

+	EClass getUrlTok();

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok#getUrl <em>Url</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference '<em>Url</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok#getUrl()

+	 * @see #getUrlTok()

+	 * @generated

+	 */

+	EReference getUrlTok_Url();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok <em>Color Tok</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Color Tok</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok

+	 * @generated

+	 */

+	EClass getColorTok();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok#getValue <em>Value</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Value</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok#getValue()

+	 * @see #getColorTok()

+	 * @generated

+	 */

+	EAttribute getColorTok_Value();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok <em>Identifier Tok</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Identifier Tok</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok

+	 * @generated

+	 */

+	EClass getIdentifierTok();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok#getName()

+	 * @see #getIdentifierTok()

+	 * @generated

+	 */

+	EAttribute getIdentifierTok_Name();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok <em>Func Tok</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for class '<em>Func Tok</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok

+	 * @generated

+	 */

+	EClass getFuncTok();

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok#getName()

+	 * @see #getFuncTok()

+	 * @generated

+	 */

+	EReference getFuncTok_Name();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok#getParams <em>Params</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the meta object for the containment reference list '<em>Params</em>'.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok#getParams()

+	 * @see #getFuncTok()

+	 * @generated

+	 */

+	EReference getFuncTok_Params();

+

+	/**

+	 * 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

+	 */

+	CSSFactory getCSSFactory();

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * Defines literals for the meta objects that represent

+	 * <ul>

+	 * <li>each class,</li>

+	 * <li>each feature of each class,</li>

+	 * <li>each enum,</li>

+	 * <li>and each data type</li>

+	 * </ul>

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	interface Literals

+	{

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl <em>stylesheet</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getstylesheet()

+		 * @generated

+		 */

+		EClass STYLESHEET = eINSTANCE.getstylesheet();

+

+		/**

+		 * The meta object literal for the '<em><b>Charset</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference STYLESHEET__CHARSET = eINSTANCE.getstylesheet_Charset();

+

+		/**

+		 * The meta object literal for the '<em><b>Imports</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference STYLESHEET__IMPORTS = eINSTANCE.getstylesheet_Imports();

+

+		/**

+		 * The meta object literal for the '<em><b>Ruleset</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference STYLESHEET__RULESET = eINSTANCE.getstylesheet_Ruleset();

+

+		/**

+		 * The meta object literal for the '<em><b>Media</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference STYLESHEET__MEDIA = eINSTANCE.getstylesheet_Media();

+

+		/**

+		 * The meta object literal for the '<em><b>Page</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference STYLESHEET__PAGE = eINSTANCE.getstylesheet_Page();

+

+		/**

+		 * The meta object literal for the '<em><b>Font face</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference STYLESHEET__FONT_FACE = eINSTANCE.getstylesheet_Font_face();

+

+		/**

+		 * The meta object literal for the '<em><b>Keyframes</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference STYLESHEET__KEYFRAMES = eINSTANCE.getstylesheet_Keyframes();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.charsetImpl <em>charset</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.charsetImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getcharset()

+		 * @generated

+		 */

+		EClass CHARSET = eINSTANCE.getcharset();

+

+		/**

+		 * The meta object literal for the '<em><b>Charset</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute CHARSET__CHARSET = eINSTANCE.getcharset_Charset();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.importExpressionImpl <em>import Expression</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.importExpressionImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getimportExpression()

+		 * @generated

+		 */

+		EClass IMPORT_EXPRESSION = eINSTANCE.getimportExpression();

+

+		/**

+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute IMPORT_EXPRESSION__VALUE = eINSTANCE.getimportExpression_Value();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.pageImpl <em>page</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.pageImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getpage()

+		 * @generated

+		 */

+		EClass PAGE = eINSTANCE.getpage();

+

+		/**

+		 * The meta object literal for the '<em><b>Pseudo Page</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute PAGE__PSEUDO_PAGE = eINSTANCE.getpage_PseudoPage();

+

+		/**

+		 * The meta object literal for the '<em><b>Declarations</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference PAGE__DECLARATIONS = eINSTANCE.getpage_Declarations();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.mediaImpl <em>media</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.mediaImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getmedia()

+		 * @generated

+		 */

+		EClass MEDIA = eINSTANCE.getmedia();

+

+		/**

+		 * The meta object literal for the '<em><b>Medialist</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute MEDIA__MEDIALIST = eINSTANCE.getmedia_Medialist();

+

+		/**

+		 * The meta object literal for the '<em><b>Rulesets</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference MEDIA__RULESETS = eINSTANCE.getmedia_Rulesets();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.font_faceImpl <em>font face</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.font_faceImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getfont_face()

+		 * @generated

+		 */

+		EClass FONT_FACE = eINSTANCE.getfont_face();

+

+		/**

+		 * The meta object literal for the '<em><b>Declarations</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference FONT_FACE__DECLARATIONS = eINSTANCE.getfont_face_Declarations();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute FONT_FACE__NAME = eINSTANCE.getfont_face_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Keyframeselectors</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference FONT_FACE__KEYFRAMESELECTORS = eINSTANCE.getfont_face_Keyframeselectors();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframesImpl <em>keyframes</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframesImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getkeyframes()

+		 * @generated

+		 */

+		EClass KEYFRAMES = eINSTANCE.getkeyframes();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframe_selectorImpl <em>keyframe selector</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframe_selectorImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getkeyframe_selector()

+		 * @generated

+		 */

+		EClass KEYFRAME_SELECTOR = eINSTANCE.getkeyframe_selector();

+

+		/**

+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute KEYFRAME_SELECTOR__TYPE = eINSTANCE.getkeyframe_selector_Type();

+

+		/**

+		 * The meta object literal for the '<em><b>Percentage</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute KEYFRAME_SELECTOR__PERCENTAGE = eINSTANCE.getkeyframe_selector_Percentage();

+

+		/**

+		 * The meta object literal for the '<em><b>Declarations</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference KEYFRAME_SELECTOR__DECLARATIONS = eINSTANCE.getkeyframe_selector_Declarations();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.rulesetImpl <em>ruleset</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.rulesetImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getruleset()

+		 * @generated

+		 */

+		EClass RULESET = eINSTANCE.getruleset();

+

+		/**

+		 * The meta object literal for the '<em><b>Selectors</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference RULESET__SELECTORS = eINSTANCE.getruleset_Selectors();

+

+		/**

+		 * The meta object literal for the '<em><b>Declarations</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference RULESET__DECLARATIONS = eINSTANCE.getruleset_Declarations();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.selectorImpl <em>selector</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.selectorImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getselector()

+		 * @generated

+		 */

+		EClass SELECTOR = eINSTANCE.getselector();

+

+		/**

+		 * The meta object literal for the '<em><b>Simpleselectors</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference SELECTOR__SIMPLESELECTORS = eINSTANCE.getselector_Simpleselectors();

+

+		/**

+		 * The meta object literal for the '<em><b>Combinator</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute SELECTOR__COMBINATOR = eINSTANCE.getselector_Combinator();

+

+		/**

+		 * The meta object literal for the '<em><b>Selector</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference SELECTOR__SELECTOR = eINSTANCE.getselector_Selector();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SimpleSelectorForNegationImpl <em>Simple Selector For Negation</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SimpleSelectorForNegationImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getSimpleSelectorForNegation()

+		 * @generated

+		 */

+		EClass SIMPLE_SELECTOR_FOR_NEGATION = eINSTANCE.getSimpleSelectorForNegation();

+

+		/**

+		 * The meta object literal for the '<em><b>Element</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT = eINSTANCE.getSimpleSelectorForNegation_Element();

+

+		/**

+		 * The meta object literal for the '<em><b>Universal</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL = eINSTANCE.getSimpleSelectorForNegation_Universal();

+

+		/**

+		 * The meta object literal for the '<em><b>Sub Selectors</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS = eINSTANCE.getSimpleSelectorForNegation_SubSelectors();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CssSelectorImpl <em>Css Selector</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CssSelectorImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getCssSelector()

+		 * @generated

+		 */

+		EClass CSS_SELECTOR = eINSTANCE.getCssSelector();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.simple_selectorImpl <em>simple selector</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.simple_selectorImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getsimple_selector()

+		 * @generated

+		 */

+		EClass SIMPLE_SELECTOR = eINSTANCE.getsimple_selector();

+

+		/**

+		 * The meta object literal for the '<em><b>Element</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference SIMPLE_SELECTOR__ELEMENT = eINSTANCE.getsimple_selector_Element();

+

+		/**

+		 * The meta object literal for the '<em><b>Universal</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference SIMPLE_SELECTOR__UNIVERSAL = eINSTANCE.getsimple_selector_Universal();

+

+		/**

+		 * The meta object literal for the '<em><b>Sub Selectors</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference SIMPLE_SELECTOR__SUB_SELECTORS = eINSTANCE.getsimple_selector_SubSelectors();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ClassSelectorImpl <em>Class Selector</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ClassSelectorImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getClassSelector()

+		 * @generated

+		 */

+		EClass CLASS_SELECTOR = eINSTANCE.getClassSelector();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute CLASS_SELECTOR__NAME = eINSTANCE.getClassSelector_Name();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ElementSelectorImpl <em>Element Selector</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ElementSelectorImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getElementSelector()

+		 * @generated

+		 */

+		EClass ELEMENT_SELECTOR = eINSTANCE.getElementSelector();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute ELEMENT_SELECTOR__NAME = eINSTANCE.getElementSelector_Name();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UniversalSelectorImpl <em>Universal Selector</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UniversalSelectorImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getUniversalSelector()

+		 * @generated

+		 */

+		EClass UNIVERSAL_SELECTOR = eINSTANCE.getUniversalSelector();

+

+		/**

+		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute UNIVERSAL_SELECTOR__NAMESPACE = eINSTANCE.getUniversalSelector_Namespace();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdSelectorImpl <em>Id Selector</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdSelectorImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getIdSelector()

+		 * @generated

+		 */

+		EClass ID_SELECTOR = eINSTANCE.getIdSelector();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute ID_SELECTOR__NAME = eINSTANCE.getIdSelector_Name();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_declarationImpl <em>css declaration</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_declarationImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getcss_declaration()

+		 * @generated

+		 */

+		EClass CSS_DECLARATION = eINSTANCE.getcss_declaration();

+

+		/**

+		 * The meta object literal for the '<em><b>Property</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference CSS_DECLARATION__PROPERTY = eINSTANCE.getcss_declaration_Property();

+

+		/**

+		 * The meta object literal for the '<em><b>Value Tokens</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference CSS_DECLARATION__VALUE_TOKENS = eINSTANCE.getcss_declaration_ValueTokens();

+

+		/**

+		 * The meta object literal for the '<em><b>Important</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute CSS_DECLARATION__IMPORTANT = eINSTANCE.getcss_declaration_Important();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_propertyImpl <em>css property</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_propertyImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getcss_property()

+		 * @generated

+		 */

+		EClass CSS_PROPERTY = eINSTANCE.getcss_property();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute CSS_PROPERTY__NAME = eINSTANCE.getcss_property_Name();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassOrFuncImpl <em>Pseudo Class Or Func</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassOrFuncImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getPseudoClassOrFunc()

+		 * @generated

+		 */

+		EClass PSEUDO_CLASS_OR_FUNC = eINSTANCE.getPseudoClassOrFunc();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassImpl <em>Pseudo Class</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getPseudoClass()

+		 * @generated

+		 */

+		EClass PSEUDO_CLASS = eINSTANCE.getPseudoClass();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassNameImpl <em>Pseudo Class Name</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassNameImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getPseudoClassName()

+		 * @generated

+		 */

+		EClass PSEUDO_CLASS_NAME = eINSTANCE.getPseudoClassName();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute PSEUDO_CLASS_NAME__NAME = eINSTANCE.getPseudoClassName_Name();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl <em>Pseudo Class Function</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getPseudoClassFunction()

+		 * @generated

+		 */

+		EClass PSEUDO_CLASS_FUNCTION = eINSTANCE.getPseudoClassFunction();

+

+		/**

+		 * The meta object literal for the '<em><b>Not</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute PSEUDO_CLASS_FUNCTION__NOT = eINSTANCE.getPseudoClassFunction_Not();

+

+		/**

+		 * The meta object literal for the '<em><b>Param Selector</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR = eINSTANCE.getPseudoClassFunction_ParamSelector();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute PSEUDO_CLASS_FUNCTION__NAME = eINSTANCE.getPseudoClassFunction_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Params</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference PSEUDO_CLASS_FUNCTION__PARAMS = eINSTANCE.getPseudoClassFunction_Params();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CssTokImpl <em>Css Tok</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CssTokImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getCssTok()

+		 * @generated

+		 */

+		EClass CSS_TOK = eINSTANCE.getCssTok();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.URLTypeImpl <em>URL Type</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.URLTypeImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getURLType()

+		 * @generated

+		 */

+		EClass URL_TYPE = eINSTANCE.getURLType();

+

+		/**

+		 * The meta object literal for the '<em><b>Media List</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute URL_TYPE__MEDIA_LIST = eINSTANCE.getURLType_MediaList();

+

+		/**

+		 * The meta object literal for the '<em><b>Url</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute URL_TYPE__URL = eINSTANCE.getURLType_Url();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.AttributeSelectorImpl <em>Attribute Selector</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.AttributeSelectorImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getAttributeSelector()

+		 * @generated

+		 */

+		EClass ATTRIBUTE_SELECTOR = eINSTANCE.getAttributeSelector();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute ATTRIBUTE_SELECTOR__NAME = eINSTANCE.getAttributeSelector_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Op</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute ATTRIBUTE_SELECTOR__OP = eINSTANCE.getAttributeSelector_Op();

+

+		/**

+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute ATTRIBUTE_SELECTOR__VALUE = eINSTANCE.getAttributeSelector_Value();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SymbolTokImpl <em>Symbol Tok</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SymbolTokImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getSymbolTok()

+		 * @generated

+		 */

+		EClass SYMBOL_TOK = eINSTANCE.getSymbolTok();

+

+		/**

+		 * The meta object literal for the '<em><b>Symbol</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute SYMBOL_TOK__SYMBOL = eINSTANCE.getSymbolTok_Symbol();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.WSTokImpl <em>WS Tok</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.WSTokImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getWSTok()

+		 * @generated

+		 */

+		EClass WS_TOK = eINSTANCE.getWSTok();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.StringTokImpl <em>String Tok</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.StringTokImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getStringTok()

+		 * @generated

+		 */

+		EClass STRING_TOK = eINSTANCE.getStringTok();

+

+		/**

+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute STRING_TOK__VALUE = eINSTANCE.getStringTok_Value();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.NumberTokImpl <em>Number Tok</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.NumberTokImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getNumberTok()

+		 * @generated

+		 */

+		EClass NUMBER_TOK = eINSTANCE.getNumberTok();

+

+		/**

+		 * The meta object literal for the '<em><b>Val</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute NUMBER_TOK__VAL = eINSTANCE.getNumberTok_Val();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UrlTokImpl <em>Url Tok</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UrlTokImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getUrlTok()

+		 * @generated

+		 */

+		EClass URL_TOK = eINSTANCE.getUrlTok();

+

+		/**

+		 * The meta object literal for the '<em><b>Url</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference URL_TOK__URL = eINSTANCE.getUrlTok_Url();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ColorTokImpl <em>Color Tok</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ColorTokImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getColorTok()

+		 * @generated

+		 */

+		EClass COLOR_TOK = eINSTANCE.getColorTok();

+

+		/**

+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute COLOR_TOK__VALUE = eINSTANCE.getColorTok_Value();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdentifierTokImpl <em>Identifier Tok</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdentifierTokImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getIdentifierTok()

+		 * @generated

+		 */

+		EClass IDENTIFIER_TOK = eINSTANCE.getIdentifierTok();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EAttribute IDENTIFIER_TOK__NAME = eINSTANCE.getIdentifierTok_Name();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.FuncTokImpl <em>Func Tok</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.FuncTokImpl

+		 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.CSSPackageImpl#getFuncTok()

+		 * @generated

+		 */

+		EClass FUNC_TOK = eINSTANCE.getFuncTok();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference FUNC_TOK__NAME = eINSTANCE.getFuncTok_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Params</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 *

+		 * @generated

+		 */

+		EReference FUNC_TOK__PARAMS = eINSTANCE.getFuncTok_Params();

+

+	}

+

+} // CSSPackage

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ClassSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ClassSelector.java
new file mode 100644
index 00000000000..0f68ee9ef3d
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ClassSelector.java
@@ -0,0 +1,52 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Class Selector</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector#getName <em>Name</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getClassSelector()

+ * @model

+ * @generated

+ */

+public interface ClassSelector extends CssSelector

+{

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getClassSelector_Name()

+	 * @model

+	 * @generated

+	 */

+	String getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(String value);

+

+} // ClassSelector

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ColorTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ColorTok.java
new file mode 100644
index 00000000000..29bbd869383
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ColorTok.java
@@ -0,0 +1,52 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Color Tok</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok#getValue <em>Value</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getColorTok()

+ * @model

+ * @generated

+ */

+public interface ColorTok extends CssTok

+{

+	/**

+	 * Returns the value of the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Value</em>' attribute.

+	 * @see #setValue(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getColorTok_Value()

+	 * @model

+	 * @generated

+	 */

+	String getValue();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok#getValue <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Value</em>' attribute.

+	 * @see #getValue()

+	 * @generated

+	 */

+	void setValue(String value);

+

+} // ColorTok

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssSelector.java
new file mode 100644
index 00000000000..0943ae8d34a
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssSelector.java
@@ -0,0 +1,19 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Css Selector</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getCssSelector()

+ * @model

+ * @generated

+ */

+public interface CssSelector extends EObject

+{

+} // CssSelector

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssTok.java
new file mode 100644
index 00000000000..79ca0622cae
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssTok.java
@@ -0,0 +1,19 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Css Tok</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getCssTok()

+ * @model

+ * @generated

+ */

+public interface CssTok extends EObject

+{

+} // CssTok

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ElementSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ElementSelector.java
new file mode 100644
index 00000000000..84e0866e2ed
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ElementSelector.java
@@ -0,0 +1,53 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Element Selector</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector#getName <em>Name</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getElementSelector()

+ * @model

+ * @generated

+ */

+public interface ElementSelector extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getElementSelector_Name()

+	 * @model

+	 * @generated

+	 */

+	String getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(String value);

+

+} // ElementSelector

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/FuncTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/FuncTok.java
new file mode 100644
index 00000000000..f453d1b24c2
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/FuncTok.java
@@ -0,0 +1,70 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Func Tok</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok#getName <em>Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok#getParams <em>Params</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getFuncTok()

+ * @model

+ * @generated

+ */

+public interface FuncTok extends CssTok

+{

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' containment reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Name</em>' containment reference.

+	 * @see #setName(IdentifierTok)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getFuncTok_Name()

+	 * @model containment="true"

+	 * @generated

+	 */

+	IdentifierTok getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok#getName <em>Name</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Name</em>' containment reference.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(IdentifierTok value);

+

+	/**

+	 * Returns the value of the '<em><b>Params</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Params</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>Params</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getFuncTok_Params()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<CssTok> getParams();

+

+} // FuncTok

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdSelector.java
new file mode 100644
index 00000000000..6d47e86a89f
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdSelector.java
@@ -0,0 +1,52 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Id Selector</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector#getName <em>Name</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getIdSelector()

+ * @model

+ * @generated

+ */

+public interface IdSelector extends CssSelector

+{

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getIdSelector_Name()

+	 * @model

+	 * @generated

+	 */

+	String getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(String value);

+

+} // IdSelector

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdentifierTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdentifierTok.java
new file mode 100644
index 00000000000..92d7bdb3a5b
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdentifierTok.java
@@ -0,0 +1,52 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Identifier Tok</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok#getName <em>Name</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getIdentifierTok()

+ * @model

+ * @generated

+ */

+public interface IdentifierTok extends CssTok

+{

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getIdentifierTok_Name()

+	 * @model

+	 * @generated

+	 */

+	String getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(String value);

+

+} // IdentifierTok

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/NumberTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/NumberTok.java
new file mode 100644
index 00000000000..32b5f1e6828
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/NumberTok.java
@@ -0,0 +1,52 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Number Tok</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok#getVal <em>Val</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getNumberTok()

+ * @model

+ * @generated

+ */

+public interface NumberTok extends CssTok

+{

+	/**

+	 * Returns the value of the '<em><b>Val</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Val</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Val</em>' attribute.

+	 * @see #setVal(double)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getNumberTok_Val()

+	 * @model

+	 * @generated

+	 */

+	double getVal();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok#getVal <em>Val</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Val</em>' attribute.

+	 * @see #getVal()

+	 * @generated

+	 */

+	void setVal(double value);

+

+} // NumberTok

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClass.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClass.java
new file mode 100644
index 00000000000..a8cb6363d82
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClass.java
@@ -0,0 +1,18 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Pseudo Class</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClass()

+ * @model

+ * @generated

+ */

+public interface PseudoClass extends CssSelector, PseudoClassOrFunc

+{

+} // PseudoClass

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassFunction.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassFunction.java
new file mode 100644
index 00000000000..754d44c3e18
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassFunction.java
@@ -0,0 +1,128 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Pseudo Class Function</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#isNot <em>Not</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getParamSelector <em>Param Selector</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getName <em>Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getParams <em>Params</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction()

+ * @model

+ * @generated

+ */

+public interface PseudoClassFunction extends PseudoClassOrFunc

+{

+	/**

+	 * Returns the value of the '<em><b>Not</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Not</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Not</em>' attribute.

+	 * @see #setNot(boolean)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction_Not()

+	 * @model

+	 * @generated

+	 */

+	boolean isNot();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#isNot <em>Not</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Not</em>' attribute.

+	 * @see #isNot()

+	 * @generated

+	 */

+	void setNot(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Param Selector</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Param Selector</em>' containment reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Param Selector</em>' containment reference.

+	 * @see #setParamSelector(SimpleSelectorForNegation)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction_ParamSelector()

+	 * @model containment="true"

+	 * @generated

+	 */

+	SimpleSelectorForNegation getParamSelector();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getParamSelector <em>Param Selector</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Param Selector</em>' containment reference.

+	 * @see #getParamSelector()

+	 * @generated

+	 */

+	void setParamSelector(SimpleSelectorForNegation value);

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction_Name()

+	 * @model

+	 * @generated

+	 */

+	String getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Params</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Params</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>Params</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction_Params()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<CssTok> getParams();

+

+} // PseudoClassFunction

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassName.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassName.java
new file mode 100644
index 00000000000..5d973a08d4e
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassName.java
@@ -0,0 +1,52 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Pseudo Class Name</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName#getName <em>Name</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassName()

+ * @model

+ * @generated

+ */

+public interface PseudoClassName extends PseudoClass

+{

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassName_Name()

+	 * @model

+	 * @generated

+	 */

+	String getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(String value);

+

+} // PseudoClassName

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassOrFunc.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassOrFunc.java
new file mode 100644
index 00000000000..bc093116f17
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassOrFunc.java
@@ -0,0 +1,18 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Pseudo Class Or Func</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassOrFunc()

+ * @model

+ * @generated

+ */

+public interface PseudoClassOrFunc extends CssSelector

+{

+} // PseudoClassOrFunc

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SimpleSelectorForNegation.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SimpleSelectorForNegation.java
new file mode 100644
index 00000000000..cb59af87493
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SimpleSelectorForNegation.java
@@ -0,0 +1,101 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Simple Selector For Negation</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getElement <em>Element</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getUniversal <em>Universal</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getSubSelectors <em>Sub Selectors</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSimpleSelectorForNegation()

+ * @model

+ * @generated

+ */

+public interface SimpleSelectorForNegation extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Element</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Element</em>' containment reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Element</em>' containment reference.

+	 * @see #setElement(ElementSelector)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSimpleSelectorForNegation_Element()

+	 * @model containment="true"

+	 * @generated

+	 */

+	ElementSelector getElement();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getElement <em>Element</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Element</em>' containment reference.

+	 * @see #getElement()

+	 * @generated

+	 */

+	void setElement(ElementSelector value);

+

+	/**

+	 * Returns the value of the '<em><b>Universal</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Universal</em>' containment reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Universal</em>' containment reference.

+	 * @see #setUniversal(UniversalSelector)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSimpleSelectorForNegation_Universal()

+	 * @model containment="true"

+	 * @generated

+	 */

+	UniversalSelector getUniversal();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getUniversal <em>Universal</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Universal</em>' containment reference.

+	 * @see #getUniversal()

+	 * @generated

+	 */

+	void setUniversal(UniversalSelector value);

+

+	/**

+	 * Returns the value of the '<em><b>Sub Selectors</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Sub Selectors</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>Sub Selectors</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSimpleSelectorForNegation_SubSelectors()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<CssSelector> getSubSelectors();

+

+} // SimpleSelectorForNegation

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/StringTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/StringTok.java
new file mode 100644
index 00000000000..6ccb4f5bfab
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/StringTok.java
@@ -0,0 +1,52 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>String Tok</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok#getValue <em>Value</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getStringTok()

+ * @model

+ * @generated

+ */

+public interface StringTok extends CssTok

+{

+	/**

+	 * Returns the value of the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Value</em>' attribute.

+	 * @see #setValue(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getStringTok_Value()

+	 * @model

+	 * @generated

+	 */

+	String getValue();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok#getValue <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Value</em>' attribute.

+	 * @see #getValue()

+	 * @generated

+	 */

+	void setValue(String value);

+

+} // StringTok

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SymbolTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SymbolTok.java
new file mode 100644
index 00000000000..2a61b6076cc
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SymbolTok.java
@@ -0,0 +1,52 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Symbol Tok</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok#getSymbol <em>Symbol</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSymbolTok()

+ * @model

+ * @generated

+ */

+public interface SymbolTok extends CssTok

+{

+	/**

+	 * Returns the value of the '<em><b>Symbol</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Symbol</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Symbol</em>' attribute.

+	 * @see #setSymbol(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSymbolTok_Symbol()

+	 * @model

+	 * @generated

+	 */

+	String getSymbol();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok#getSymbol <em>Symbol</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Symbol</em>' attribute.

+	 * @see #getSymbol()

+	 * @generated

+	 */

+	void setSymbol(String value);

+

+} // SymbolTok

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/URLType.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/URLType.java
new file mode 100644
index 00000000000..b2b1ea866a6
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/URLType.java
@@ -0,0 +1,81 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>URL Type</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getMediaList <em>Media List</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getUrl <em>Url</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getURLType()

+ * @model

+ * @generated

+ */

+public interface URLType extends importExpression

+{

+	/**

+	 * Returns the value of the '<em><b>Media List</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Media List</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Media List</em>' attribute.

+	 * @see #setMediaList(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getURLType_MediaList()

+	 * @model

+	 * @generated

+	 */

+	String getMediaList();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getMediaList <em>Media List</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Media List</em>' attribute.

+	 * @see #getMediaList()

+	 * @generated

+	 */

+	void setMediaList(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Url</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Url</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Url</em>' attribute.

+	 * @see #setUrl(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getURLType_Url()

+	 * @model

+	 * @generated

+	 */

+	String getUrl();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getUrl <em>Url</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Url</em>' attribute.

+	 * @see #getUrl()

+	 * @generated

+	 */

+	void setUrl(String value);

+

+} // URLType

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UniversalSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UniversalSelector.java
new file mode 100644
index 00000000000..81d1ad386d2
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UniversalSelector.java
@@ -0,0 +1,53 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Universal Selector</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector#getNamespace <em>Namespace</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getUniversalSelector()

+ * @model

+ * @generated

+ */

+public interface UniversalSelector extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Namespace</em>' attribute.

+	 * @see #setNamespace(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getUniversalSelector_Namespace()

+	 * @model

+	 * @generated

+	 */

+	String getNamespace();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector#getNamespace <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Namespace</em>' attribute.

+	 * @see #getNamespace()

+	 * @generated

+	 */

+	void setNamespace(String value);

+

+} // UniversalSelector

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UrlTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UrlTok.java
new file mode 100644
index 00000000000..6ef8c6e93c7
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UrlTok.java
@@ -0,0 +1,52 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Url Tok</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok#getUrl <em>Url</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getUrlTok()

+ * @model

+ * @generated

+ */

+public interface UrlTok extends CssTok

+{

+	/**

+	 * Returns the value of the '<em><b>Url</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Url</em>' containment reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Url</em>' containment reference.

+	 * @see #setUrl(URLType)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getUrlTok_Url()

+	 * @model containment="true"

+	 * @generated

+	 */

+	URLType getUrl();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok#getUrl <em>Url</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Url</em>' containment reference.

+	 * @see #getUrl()

+	 * @generated

+	 */

+	void setUrl(URLType value);

+

+} // UrlTok

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/WSTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/WSTok.java
new file mode 100644
index 00000000000..f23d397f241
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/WSTok.java
@@ -0,0 +1,18 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>WS Tok</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getWSTok()

+ * @model

+ * @generated

+ */

+public interface WSTok extends CssTok

+{

+} // WSTok

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/charset.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/charset.java
new file mode 100644
index 00000000000..5699218828b
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/charset.java
@@ -0,0 +1,53 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>charset</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset#getCharset <em>Charset</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcharset()

+ * @model

+ * @generated

+ */

+public interface charset extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Charset</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Charset</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Charset</em>' attribute.

+	 * @see #setCharset(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcharset_Charset()

+	 * @model

+	 * @generated

+	 */

+	String getCharset();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset#getCharset <em>Charset</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Charset</em>' attribute.

+	 * @see #getCharset()

+	 * @generated

+	 */

+	void setCharset(String value);

+

+} // charset

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_declaration.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_declaration.java
new file mode 100644
index 00000000000..0a166ede312
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_declaration.java
@@ -0,0 +1,101 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>css declaration</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#getProperty <em>Property</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#getValueTokens <em>Value Tokens</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#isImportant <em>Important</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_declaration()

+ * @model

+ * @generated

+ */

+public interface css_declaration extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Property</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Property</em>' containment reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Property</em>' containment reference.

+	 * @see #setProperty(css_property)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_declaration_Property()

+	 * @model containment="true"

+	 * @generated

+	 */

+	css_property getProperty();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#getProperty <em>Property</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Property</em>' containment reference.

+	 * @see #getProperty()

+	 * @generated

+	 */

+	void setProperty(css_property value);

+

+	/**

+	 * Returns the value of the '<em><b>Value Tokens</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Value Tokens</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>Value Tokens</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_declaration_ValueTokens()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<CssTok> getValueTokens();

+

+	/**

+	 * Returns the value of the '<em><b>Important</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Important</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Important</em>' attribute.

+	 * @see #setImportant(boolean)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_declaration_Important()

+	 * @model

+	 * @generated

+	 */

+	boolean isImportant();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#isImportant <em>Important</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Important</em>' attribute.

+	 * @see #isImportant()

+	 * @generated

+	 */

+	void setImportant(boolean value);

+

+} // css_declaration

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_property.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_property.java
new file mode 100644
index 00000000000..689d573f1b9
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_property.java
@@ -0,0 +1,53 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>css property</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property#getName <em>Name</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_property()

+ * @model

+ * @generated

+ */

+public interface css_property extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_property_Name()

+	 * @model

+	 * @generated

+	 */

+	String getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(String value);

+

+} // css_property

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/font_face.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/font_face.java
new file mode 100644
index 00000000000..33427370ef9
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/font_face.java
@@ -0,0 +1,87 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>font face</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getDeclarations <em>Declarations</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getName <em>Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getKeyframeselectors <em>Keyframeselectors</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getfont_face()

+ * @model

+ * @generated

+ */

+public interface font_face extends keyframes

+{

+	/**

+	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Declarations</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>Declarations</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getfont_face_Declarations()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<css_declaration> getDeclarations();

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getfont_face_Name()

+	 * @model

+	 * @generated

+	 */

+	String getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Keyframeselectors</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Keyframeselectors</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>Keyframeselectors</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getfont_face_Keyframeselectors()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<keyframe_selector> getKeyframeselectors();

+

+} // font_face

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/AttributeSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/AttributeSelectorImpl.java
new file mode 100644
index 00000000000..88d599f563a
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/AttributeSelectorImpl.java
@@ -0,0 +1,318 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

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

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Attribute Selector</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.AttributeSelectorImpl#getName <em>Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.AttributeSelectorImpl#getOp <em>Op</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.AttributeSelectorImpl#getValue <em>Value</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class AttributeSelectorImpl extends CssSelectorImpl implements AttributeSelector

+{

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getOp() <em>Op</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getOp()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String OP_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getOp() <em>Op</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getOp()

+	 * @generated

+	 * @ordered

+	 */

+	protected String op = OP_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String VALUE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getValue()

+	 * @generated

+	 * @ordered

+	 */

+	protected String value = VALUE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected AttributeSelectorImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.ATTRIBUTE_SELECTOR;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ATTRIBUTE_SELECTOR__NAME, oldName, name));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getOp()

+	{

+		return op;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setOp(String newOp)

+	{

+		String oldOp = op;

+		op = newOp;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ATTRIBUTE_SELECTOR__OP, oldOp, op));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getValue()

+	{

+		return value;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setValue(String newValue)

+	{

+		String oldValue = value;

+		value = newValue;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ATTRIBUTE_SELECTOR__VALUE, oldValue, value));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.ATTRIBUTE_SELECTOR__NAME:

+			return getName();

+		case CSSPackage.ATTRIBUTE_SELECTOR__OP:

+			return getOp();

+		case CSSPackage.ATTRIBUTE_SELECTOR__VALUE:

+			return getValue();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.ATTRIBUTE_SELECTOR__NAME:

+			setName((String) newValue);

+			return;

+		case CSSPackage.ATTRIBUTE_SELECTOR__OP:

+			setOp((String) newValue);

+			return;

+		case CSSPackage.ATTRIBUTE_SELECTOR__VALUE:

+			setValue((String) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.ATTRIBUTE_SELECTOR__NAME:

+			setName(NAME_EDEFAULT);

+			return;

+		case CSSPackage.ATTRIBUTE_SELECTOR__OP:

+			setOp(OP_EDEFAULT);

+			return;

+		case CSSPackage.ATTRIBUTE_SELECTOR__VALUE:

+			setValue(VALUE_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.ATTRIBUTE_SELECTOR__NAME:

+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+		case CSSPackage.ATTRIBUTE_SELECTOR__OP:

+			return OP_EDEFAULT == null ? op != null : !OP_EDEFAULT.equals(op);

+		case CSSPackage.ATTRIBUTE_SELECTOR__VALUE:

+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(", op: ");

+		result.append(op);

+		result.append(", value: ");

+		result.append(value);

+		result.append(')');

+		return result.toString();

+	}

+

+} // AttributeSelectorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CSSFactoryImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CSSFactoryImpl.java
new file mode 100644
index 00000000000..922d77efdc2
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CSSFactoryImpl.java
@@ -0,0 +1,610 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

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

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

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.impl.EFactoryImpl;

+

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

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Factory</b>.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class CSSFactoryImpl extends EFactoryImpl implements CSSFactory

+{

+	/**

+	 * Creates the default factory implementation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public static CSSFactory init()

+	{

+		try

+		{

+			CSSFactory theCSSFactory = (CSSFactory) EPackage.Registry.INSTANCE.getEFactory(CSSPackage.eNS_URI);

+			if (theCSSFactory != null)

+			{

+				return theCSSFactory;

+			}

+		} catch (Exception exception)

+		{

+			EcorePlugin.INSTANCE.log(exception);

+		}

+		return new CSSFactoryImpl();

+	}

+

+	/**

+	 * Creates an instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public CSSFactoryImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EObject create(EClass eClass)

+	{

+		switch (eClass.getClassifierID())

+		{

+		case CSSPackage.STYLESHEET:

+			return createstylesheet();

+		case CSSPackage.CHARSET:

+			return createcharset();

+		case CSSPackage.IMPORT_EXPRESSION:

+			return createimportExpression();

+		case CSSPackage.PAGE:

+			return createpage();

+		case CSSPackage.MEDIA:

+			return createmedia();

+		case CSSPackage.FONT_FACE:

+			return createfont_face();

+		case CSSPackage.KEYFRAMES:

+			return createkeyframes();

+		case CSSPackage.KEYFRAME_SELECTOR:

+			return createkeyframe_selector();

+		case CSSPackage.RULESET:

+			return createruleset();

+		case CSSPackage.SELECTOR:

+			return createselector();

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION:

+			return createSimpleSelectorForNegation();

+		case CSSPackage.CSS_SELECTOR:

+			return createCssSelector();

+		case CSSPackage.SIMPLE_SELECTOR:

+			return createsimple_selector();

+		case CSSPackage.CLASS_SELECTOR:

+			return createClassSelector();

+		case CSSPackage.ELEMENT_SELECTOR:

+			return createElementSelector();

+		case CSSPackage.UNIVERSAL_SELECTOR:

+			return createUniversalSelector();

+		case CSSPackage.ID_SELECTOR:

+			return createIdSelector();

+		case CSSPackage.CSS_DECLARATION:

+			return createcss_declaration();

+		case CSSPackage.CSS_PROPERTY:

+			return createcss_property();

+		case CSSPackage.PSEUDO_CLASS_OR_FUNC:

+			return createPseudoClassOrFunc();

+		case CSSPackage.PSEUDO_CLASS:

+			return createPseudoClass();

+		case CSSPackage.PSEUDO_CLASS_NAME:

+			return createPseudoClassName();

+		case CSSPackage.PSEUDO_CLASS_FUNCTION:

+			return createPseudoClassFunction();

+		case CSSPackage.CSS_TOK:

+			return createCssTok();

+		case CSSPackage.URL_TYPE:

+			return createURLType();

+		case CSSPackage.ATTRIBUTE_SELECTOR:

+			return createAttributeSelector();

+		case CSSPackage.SYMBOL_TOK:

+			return createSymbolTok();

+		case CSSPackage.WS_TOK:

+			return createWSTok();

+		case CSSPackage.STRING_TOK:

+			return createStringTok();

+		case CSSPackage.NUMBER_TOK:

+			return createNumberTok();

+		case CSSPackage.URL_TOK:

+			return createUrlTok();

+		case CSSPackage.COLOR_TOK:

+			return createColorTok();

+		case CSSPackage.IDENTIFIER_TOK:

+			return createIdentifierTok();

+		case CSSPackage.FUNC_TOK:

+			return createFuncTok();

+		default:

+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public stylesheet createstylesheet()

+	{

+		stylesheetImpl stylesheet = new stylesheetImpl();

+		return stylesheet;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public charset createcharset()

+	{

+		charsetImpl charset = new charsetImpl();

+		return charset;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public importExpression createimportExpression()

+	{

+		importExpressionImpl importExpression = new importExpressionImpl();

+		return importExpression;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public page createpage()

+	{

+		pageImpl page = new pageImpl();

+		return page;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public media createmedia()

+	{

+		mediaImpl media = new mediaImpl();

+		return media;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public font_face createfont_face()

+	{

+		font_faceImpl font_face = new font_faceImpl();

+		return font_face;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public keyframes createkeyframes()

+	{

+		keyframesImpl keyframes = new keyframesImpl();

+		return keyframes;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public keyframe_selector createkeyframe_selector()

+	{

+		keyframe_selectorImpl keyframe_selector = new keyframe_selectorImpl();

+		return keyframe_selector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public ruleset createruleset()

+	{

+		rulesetImpl ruleset = new rulesetImpl();

+		return ruleset;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public selector createselector()

+	{

+		selectorImpl selector = new selectorImpl();

+		return selector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public SimpleSelectorForNegation createSimpleSelectorForNegation()

+	{

+		SimpleSelectorForNegationImpl simpleSelectorForNegation = new SimpleSelectorForNegationImpl();

+		return simpleSelectorForNegation;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public CssSelector createCssSelector()

+	{

+		CssSelectorImpl cssSelector = new CssSelectorImpl();

+		return cssSelector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public simple_selector createsimple_selector()

+	{

+		simple_selectorImpl simple_selector = new simple_selectorImpl();

+		return simple_selector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public ClassSelector createClassSelector()

+	{

+		ClassSelectorImpl classSelector = new ClassSelectorImpl();

+		return classSelector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public ElementSelector createElementSelector()

+	{

+		ElementSelectorImpl elementSelector = new ElementSelectorImpl();

+		return elementSelector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public UniversalSelector createUniversalSelector()

+	{

+		UniversalSelectorImpl universalSelector = new UniversalSelectorImpl();

+		return universalSelector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public IdSelector createIdSelector()

+	{

+		IdSelectorImpl idSelector = new IdSelectorImpl();

+		return idSelector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public css_declaration createcss_declaration()

+	{

+		css_declarationImpl css_declaration = new css_declarationImpl();

+		return css_declaration;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public css_property createcss_property()

+	{

+		css_propertyImpl css_property = new css_propertyImpl();

+		return css_property;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public PseudoClassOrFunc createPseudoClassOrFunc()

+	{

+		PseudoClassOrFuncImpl pseudoClassOrFunc = new PseudoClassOrFuncImpl();

+		return pseudoClassOrFunc;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public PseudoClass createPseudoClass()

+	{

+		PseudoClassImpl pseudoClass = new PseudoClassImpl();

+		return pseudoClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public PseudoClassName createPseudoClassName()

+	{

+		PseudoClassNameImpl pseudoClassName = new PseudoClassNameImpl();

+		return pseudoClassName;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public PseudoClassFunction createPseudoClassFunction()

+	{

+		PseudoClassFunctionImpl pseudoClassFunction = new PseudoClassFunctionImpl();

+		return pseudoClassFunction;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public CssTok createCssTok()

+	{

+		CssTokImpl cssTok = new CssTokImpl();

+		return cssTok;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public URLType createURLType()

+	{

+		URLTypeImpl urlType = new URLTypeImpl();

+		return urlType;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public AttributeSelector createAttributeSelector()

+	{

+		AttributeSelectorImpl attributeSelector = new AttributeSelectorImpl();

+		return attributeSelector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public SymbolTok createSymbolTok()

+	{

+		SymbolTokImpl symbolTok = new SymbolTokImpl();

+		return symbolTok;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public WSTok createWSTok()

+	{

+		WSTokImpl wsTok = new WSTokImpl();

+		return wsTok;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public StringTok createStringTok()

+	{

+		StringTokImpl stringTok = new StringTokImpl();

+		return stringTok;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NumberTok createNumberTok()

+	{

+		NumberTokImpl numberTok = new NumberTokImpl();

+		return numberTok;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public UrlTok createUrlTok()

+	{

+		UrlTokImpl urlTok = new UrlTokImpl();

+		return urlTok;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public ColorTok createColorTok()

+	{

+		ColorTokImpl colorTok = new ColorTokImpl();

+		return colorTok;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public IdentifierTok createIdentifierTok()

+	{

+		IdentifierTokImpl identifierTok = new IdentifierTokImpl();

+		return identifierTok;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public FuncTok createFuncTok()

+	{

+		FuncTokImpl funcTok = new FuncTokImpl();

+		return funcTok;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public CSSPackage getCSSPackage()

+	{

+		return (CSSPackage) getEPackage();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @deprecated

+	 * @generated

+	 */

+	@Deprecated

+	public static CSSPackage getPackage()

+	{

+		return CSSPackage.eINSTANCE;

+	}

+

+} // CSSFactoryImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CSSPackageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CSSPackageImpl.java
new file mode 100644
index 00000000000..006f08257e7
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CSSPackageImpl.java
@@ -0,0 +1,1826 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import org.eclipse.emf.ecore.EAttribute;

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

+import org.eclipse.emf.ecore.EPackage;

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

+

+import org.eclipse.emf.ecore.impl.EPackageImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSFactory;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClass;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassOrFunc;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.WSTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Package</b>.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class CSSPackageImpl extends EPackageImpl implements CSSPackage

+{

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass stylesheetEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass charsetEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass importExpressionEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass pageEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass mediaEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass font_faceEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass keyframesEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass keyframe_selectorEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass rulesetEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass selectorEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass simpleSelectorForNegationEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass cssSelectorEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass simple_selectorEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass classSelectorEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass elementSelectorEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass universalSelectorEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass idSelectorEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass css_declarationEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass css_propertyEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass pseudoClassOrFuncEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass pseudoClassEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass pseudoClassNameEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass pseudoClassFunctionEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass cssTokEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass urlTypeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass attributeSelectorEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass symbolTokEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass wsTokEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass stringTokEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass numberTokEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass urlTokEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass colorTokEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass identifierTokEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private EClass funcTokEClass = null;

+

+	/**

+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * package URI value.

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 *

+	 * @see org.eclipse.emf.ecore.EPackage.Registry

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#eNS_URI

+	 * @see #init()

+	 * @generated

+	 */

+	private CSSPackageImpl()

+	{

+		super(eNS_URI, CSSFactory.eINSTANCE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private static boolean isInited = false;

+

+	/**

+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+	 *

+	 * <p>

+	 * This method is used to initialize {@link CSSPackage#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 CSSPackage init()

+	{

+		if (isInited) {

+			return (CSSPackage) EPackage.Registry.INSTANCE.getEPackage(CSSPackage.eNS_URI);

+		}

+

+		// Obtain or create and register package

+		CSSPackageImpl theCSSPackage = (CSSPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CSSPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CSSPackageImpl());

+

+		isInited = true;

+

+		// Create package meta-data objects

+		theCSSPackage.createPackageContents();

+

+		// Initialize created meta-data

+		theCSSPackage.initializePackageContents();

+

+		// Mark meta-data to indicate it can't be changed

+		theCSSPackage.freeze();

+

+

+		// Update the registry and return the package

+		EPackage.Registry.INSTANCE.put(CSSPackage.eNS_URI, theCSSPackage);

+		return theCSSPackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getstylesheet()

+	{

+		return stylesheetEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getstylesheet_Charset()

+	{

+		return (EReference) stylesheetEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getstylesheet_Imports()

+	{

+		return (EReference) stylesheetEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getstylesheet_Ruleset()

+	{

+		return (EReference) stylesheetEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getstylesheet_Media()

+	{

+		return (EReference) stylesheetEClass.getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getstylesheet_Page()

+	{

+		return (EReference) stylesheetEClass.getEStructuralFeatures().get(4);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getstylesheet_Font_face()

+	{

+		return (EReference) stylesheetEClass.getEStructuralFeatures().get(5);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getstylesheet_Keyframes()

+	{

+		return (EReference) stylesheetEClass.getEStructuralFeatures().get(6);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getcharset()

+	{

+		return charsetEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getcharset_Charset()

+	{

+		return (EAttribute) charsetEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getimportExpression()

+	{

+		return importExpressionEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getimportExpression_Value()

+	{

+		return (EAttribute) importExpressionEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getpage()

+	{

+		return pageEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getpage_PseudoPage()

+	{

+		return (EAttribute) pageEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getpage_Declarations()

+	{

+		return (EReference) pageEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getmedia()

+	{

+		return mediaEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getmedia_Medialist()

+	{

+		return (EAttribute) mediaEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getmedia_Rulesets()

+	{

+		return (EReference) mediaEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getfont_face()

+	{

+		return font_faceEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getfont_face_Declarations()

+	{

+		return (EReference) font_faceEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getfont_face_Name()

+	{

+		return (EAttribute) font_faceEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getfont_face_Keyframeselectors()

+	{

+		return (EReference) font_faceEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getkeyframes()

+	{

+		return keyframesEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getkeyframe_selector()

+	{

+		return keyframe_selectorEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getkeyframe_selector_Type()

+	{

+		return (EAttribute) keyframe_selectorEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getkeyframe_selector_Percentage()

+	{

+		return (EAttribute) keyframe_selectorEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getkeyframe_selector_Declarations()

+	{

+		return (EReference) keyframe_selectorEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getruleset()

+	{

+		return rulesetEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getruleset_Selectors()

+	{

+		return (EReference) rulesetEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getruleset_Declarations()

+	{

+		return (EReference) rulesetEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getselector()

+	{

+		return selectorEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getselector_Simpleselectors()

+	{

+		return (EReference) selectorEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getselector_Combinator()

+	{

+		return (EAttribute) selectorEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getselector_Selector()

+	{

+		return (EReference) selectorEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getSimpleSelectorForNegation()

+	{

+		return simpleSelectorForNegationEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getSimpleSelectorForNegation_Element()

+	{

+		return (EReference) simpleSelectorForNegationEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getSimpleSelectorForNegation_Universal()

+	{

+		return (EReference) simpleSelectorForNegationEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getSimpleSelectorForNegation_SubSelectors()

+	{

+		return (EReference) simpleSelectorForNegationEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getCssSelector()

+	{

+		return cssSelectorEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getsimple_selector()

+	{

+		return simple_selectorEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getsimple_selector_Element()

+	{

+		return (EReference) simple_selectorEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getsimple_selector_Universal()

+	{

+		return (EReference) simple_selectorEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getsimple_selector_SubSelectors()

+	{

+		return (EReference) simple_selectorEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getClassSelector()

+	{

+		return classSelectorEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getClassSelector_Name()

+	{

+		return (EAttribute) classSelectorEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getElementSelector()

+	{

+		return elementSelectorEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getElementSelector_Name()

+	{

+		return (EAttribute) elementSelectorEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getUniversalSelector()

+	{

+		return universalSelectorEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getUniversalSelector_Namespace()

+	{

+		return (EAttribute) universalSelectorEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getIdSelector()

+	{

+		return idSelectorEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getIdSelector_Name()

+	{

+		return (EAttribute) idSelectorEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getcss_declaration()

+	{

+		return css_declarationEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getcss_declaration_Property()

+	{

+		return (EReference) css_declarationEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getcss_declaration_ValueTokens()

+	{

+		return (EReference) css_declarationEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getcss_declaration_Important()

+	{

+		return (EAttribute) css_declarationEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getcss_property()

+	{

+		return css_propertyEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getcss_property_Name()

+	{

+		return (EAttribute) css_propertyEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getPseudoClassOrFunc()

+	{

+		return pseudoClassOrFuncEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getPseudoClass()

+	{

+		return pseudoClassEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getPseudoClassName()

+	{

+		return pseudoClassNameEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getPseudoClassName_Name()

+	{

+		return (EAttribute) pseudoClassNameEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getPseudoClassFunction()

+	{

+		return pseudoClassFunctionEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getPseudoClassFunction_Not()

+	{

+		return (EAttribute) pseudoClassFunctionEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getPseudoClassFunction_ParamSelector()

+	{

+		return (EReference) pseudoClassFunctionEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getPseudoClassFunction_Name()

+	{

+		return (EAttribute) pseudoClassFunctionEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getPseudoClassFunction_Params()

+	{

+		return (EReference) pseudoClassFunctionEClass.getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getCssTok()

+	{

+		return cssTokEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getURLType()

+	{

+		return urlTypeEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getURLType_MediaList()

+	{

+		return (EAttribute) urlTypeEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getURLType_Url()

+	{

+		return (EAttribute) urlTypeEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getAttributeSelector()

+	{

+		return attributeSelectorEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getAttributeSelector_Name()

+	{

+		return (EAttribute) attributeSelectorEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getAttributeSelector_Op()

+	{

+		return (EAttribute) attributeSelectorEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getAttributeSelector_Value()

+	{

+		return (EAttribute) attributeSelectorEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getSymbolTok()

+	{

+		return symbolTokEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getSymbolTok_Symbol()

+	{

+		return (EAttribute) symbolTokEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getWSTok()

+	{

+		return wsTokEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getStringTok()

+	{

+		return stringTokEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getStringTok_Value()

+	{

+		return (EAttribute) stringTokEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getNumberTok()

+	{

+		return numberTokEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getNumberTok_Val()

+	{

+		return (EAttribute) numberTokEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getUrlTok()

+	{

+		return urlTokEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getUrlTok_Url()

+	{

+		return (EReference) urlTokEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getColorTok()

+	{

+		return colorTokEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getColorTok_Value()

+	{

+		return (EAttribute) colorTokEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getIdentifierTok()

+	{

+		return identifierTokEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EAttribute getIdentifierTok_Name()

+	{

+		return (EAttribute) identifierTokEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EClass getFuncTok()

+	{

+		return funcTokEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getFuncTok_Name()

+	{

+		return (EReference) funcTokEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EReference getFuncTok_Params()

+	{

+		return (EReference) funcTokEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public CSSFactory getCSSFactory()

+	{

+		return (CSSFactory) getEFactoryInstance();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private boolean isCreated = false;

+

+	/**

+	 * Creates the meta-model objects for the package. This method is

+	 * guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public void createPackageContents()

+	{

+		if (isCreated) {

+			return;

+		}

+		isCreated = true;

+

+		// Create classes and their features

+		stylesheetEClass = createEClass(STYLESHEET);

+		createEReference(stylesheetEClass, STYLESHEET__CHARSET);

+		createEReference(stylesheetEClass, STYLESHEET__IMPORTS);

+		createEReference(stylesheetEClass, STYLESHEET__RULESET);

+		createEReference(stylesheetEClass, STYLESHEET__MEDIA);

+		createEReference(stylesheetEClass, STYLESHEET__PAGE);

+		createEReference(stylesheetEClass, STYLESHEET__FONT_FACE);

+		createEReference(stylesheetEClass, STYLESHEET__KEYFRAMES);

+

+		charsetEClass = createEClass(CHARSET);

+		createEAttribute(charsetEClass, CHARSET__CHARSET);

+

+		importExpressionEClass = createEClass(IMPORT_EXPRESSION);

+		createEAttribute(importExpressionEClass, IMPORT_EXPRESSION__VALUE);

+

+		pageEClass = createEClass(PAGE);

+		createEAttribute(pageEClass, PAGE__PSEUDO_PAGE);

+		createEReference(pageEClass, PAGE__DECLARATIONS);

+

+		mediaEClass = createEClass(MEDIA);

+		createEAttribute(mediaEClass, MEDIA__MEDIALIST);

+		createEReference(mediaEClass, MEDIA__RULESETS);

+

+		font_faceEClass = createEClass(FONT_FACE);

+		createEReference(font_faceEClass, FONT_FACE__DECLARATIONS);

+		createEAttribute(font_faceEClass, FONT_FACE__NAME);

+		createEReference(font_faceEClass, FONT_FACE__KEYFRAMESELECTORS);

+

+		keyframesEClass = createEClass(KEYFRAMES);

+

+		keyframe_selectorEClass = createEClass(KEYFRAME_SELECTOR);

+		createEAttribute(keyframe_selectorEClass, KEYFRAME_SELECTOR__TYPE);

+		createEAttribute(keyframe_selectorEClass, KEYFRAME_SELECTOR__PERCENTAGE);

+		createEReference(keyframe_selectorEClass, KEYFRAME_SELECTOR__DECLARATIONS);

+

+		rulesetEClass = createEClass(RULESET);

+		createEReference(rulesetEClass, RULESET__SELECTORS);

+		createEReference(rulesetEClass, RULESET__DECLARATIONS);

+

+		selectorEClass = createEClass(SELECTOR);

+		createEReference(selectorEClass, SELECTOR__SIMPLESELECTORS);

+		createEAttribute(selectorEClass, SELECTOR__COMBINATOR);

+		createEReference(selectorEClass, SELECTOR__SELECTOR);

+

+		simpleSelectorForNegationEClass = createEClass(SIMPLE_SELECTOR_FOR_NEGATION);

+		createEReference(simpleSelectorForNegationEClass, SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT);

+		createEReference(simpleSelectorForNegationEClass, SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL);

+		createEReference(simpleSelectorForNegationEClass, SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS);

+

+		cssSelectorEClass = createEClass(CSS_SELECTOR);

+

+		simple_selectorEClass = createEClass(SIMPLE_SELECTOR);

+		createEReference(simple_selectorEClass, SIMPLE_SELECTOR__ELEMENT);

+		createEReference(simple_selectorEClass, SIMPLE_SELECTOR__UNIVERSAL);

+		createEReference(simple_selectorEClass, SIMPLE_SELECTOR__SUB_SELECTORS);

+

+		classSelectorEClass = createEClass(CLASS_SELECTOR);

+		createEAttribute(classSelectorEClass, CLASS_SELECTOR__NAME);

+

+		elementSelectorEClass = createEClass(ELEMENT_SELECTOR);

+		createEAttribute(elementSelectorEClass, ELEMENT_SELECTOR__NAME);

+

+		universalSelectorEClass = createEClass(UNIVERSAL_SELECTOR);

+		createEAttribute(universalSelectorEClass, UNIVERSAL_SELECTOR__NAMESPACE);

+

+		idSelectorEClass = createEClass(ID_SELECTOR);

+		createEAttribute(idSelectorEClass, ID_SELECTOR__NAME);

+

+		css_declarationEClass = createEClass(CSS_DECLARATION);

+		createEReference(css_declarationEClass, CSS_DECLARATION__PROPERTY);

+		createEReference(css_declarationEClass, CSS_DECLARATION__VALUE_TOKENS);

+		createEAttribute(css_declarationEClass, CSS_DECLARATION__IMPORTANT);

+

+		css_propertyEClass = createEClass(CSS_PROPERTY);

+		createEAttribute(css_propertyEClass, CSS_PROPERTY__NAME);

+

+		pseudoClassOrFuncEClass = createEClass(PSEUDO_CLASS_OR_FUNC);

+

+		pseudoClassEClass = createEClass(PSEUDO_CLASS);

+

+		pseudoClassNameEClass = createEClass(PSEUDO_CLASS_NAME);

+		createEAttribute(pseudoClassNameEClass, PSEUDO_CLASS_NAME__NAME);

+

+		pseudoClassFunctionEClass = createEClass(PSEUDO_CLASS_FUNCTION);

+		createEAttribute(pseudoClassFunctionEClass, PSEUDO_CLASS_FUNCTION__NOT);

+		createEReference(pseudoClassFunctionEClass, PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR);

+		createEAttribute(pseudoClassFunctionEClass, PSEUDO_CLASS_FUNCTION__NAME);

+		createEReference(pseudoClassFunctionEClass, PSEUDO_CLASS_FUNCTION__PARAMS);

+

+		cssTokEClass = createEClass(CSS_TOK);

+

+		urlTypeEClass = createEClass(URL_TYPE);

+		createEAttribute(urlTypeEClass, URL_TYPE__MEDIA_LIST);

+		createEAttribute(urlTypeEClass, URL_TYPE__URL);

+

+		attributeSelectorEClass = createEClass(ATTRIBUTE_SELECTOR);

+		createEAttribute(attributeSelectorEClass, ATTRIBUTE_SELECTOR__NAME);

+		createEAttribute(attributeSelectorEClass, ATTRIBUTE_SELECTOR__OP);

+		createEAttribute(attributeSelectorEClass, ATTRIBUTE_SELECTOR__VALUE);

+

+		symbolTokEClass = createEClass(SYMBOL_TOK);

+		createEAttribute(symbolTokEClass, SYMBOL_TOK__SYMBOL);

+

+		wsTokEClass = createEClass(WS_TOK);

+

+		stringTokEClass = createEClass(STRING_TOK);

+		createEAttribute(stringTokEClass, STRING_TOK__VALUE);

+

+		numberTokEClass = createEClass(NUMBER_TOK);

+		createEAttribute(numberTokEClass, NUMBER_TOK__VAL);

+

+		urlTokEClass = createEClass(URL_TOK);

+		createEReference(urlTokEClass, URL_TOK__URL);

+

+		colorTokEClass = createEClass(COLOR_TOK);

+		createEAttribute(colorTokEClass, COLOR_TOK__VALUE);

+

+		identifierTokEClass = createEClass(IDENTIFIER_TOK);

+		createEAttribute(identifierTokEClass, IDENTIFIER_TOK__NAME);

+

+		funcTokEClass = createEClass(FUNC_TOK);

+		createEReference(funcTokEClass, FUNC_TOK__NAME);

+		createEReference(funcTokEClass, FUNC_TOK__PARAMS);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	private boolean isInitialized = false;

+

+	/**

+	 * Complete the initialization of the package and its meta-model. This

+	 * method is guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public void initializePackageContents()

+	{

+		if (isInitialized) {

+			return;

+		}

+		isInitialized = true;

+

+		// Initialize package

+		setName(eNAME);

+		setNsPrefix(eNS_PREFIX);

+		setNsURI(eNS_URI);

+

+		// Create type parameters

+

+		// Set bounds for type parameters

+

+		// Add supertypes to classes

+		font_faceEClass.getESuperTypes().add(this.getkeyframes());

+		classSelectorEClass.getESuperTypes().add(this.getCssSelector());

+		idSelectorEClass.getESuperTypes().add(this.getCssSelector());

+		pseudoClassOrFuncEClass.getESuperTypes().add(this.getCssSelector());

+		pseudoClassEClass.getESuperTypes().add(this.getCssSelector());

+		pseudoClassEClass.getESuperTypes().add(this.getPseudoClassOrFunc());

+		pseudoClassNameEClass.getESuperTypes().add(this.getPseudoClass());

+		pseudoClassFunctionEClass.getESuperTypes().add(this.getPseudoClassOrFunc());

+		urlTypeEClass.getESuperTypes().add(this.getimportExpression());

+		attributeSelectorEClass.getESuperTypes().add(this.getCssSelector());

+		symbolTokEClass.getESuperTypes().add(this.getCssTok());

+		wsTokEClass.getESuperTypes().add(this.getCssTok());

+		stringTokEClass.getESuperTypes().add(this.getCssTok());

+		numberTokEClass.getESuperTypes().add(this.getCssTok());

+		urlTokEClass.getESuperTypes().add(this.getCssTok());

+		colorTokEClass.getESuperTypes().add(this.getCssTok());

+		identifierTokEClass.getESuperTypes().add(this.getCssTok());

+		funcTokEClass.getESuperTypes().add(this.getCssTok());

+

+		// Initialize classes and features; add operations and parameters

+		initEClass(stylesheetEClass, stylesheet.class, "stylesheet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getstylesheet_Charset(), this.getcharset(), null, "charset", null, 0, 1, stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getstylesheet_Imports(), this.getimportExpression(), null, "imports", null, 0, -1, stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getstylesheet_Ruleset(), this.getruleset(), null, "ruleset", null, 0, -1, stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getstylesheet_Media(), this.getmedia(), null, "media", null, 0, -1, stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getstylesheet_Page(), this.getpage(), null, "page", null, 0, -1, stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getstylesheet_Font_face(), this.getfont_face(), null, "font_face", null, 0, -1, stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getstylesheet_Keyframes(), this.getkeyframes(), null, "keyframes", null, 0, -1, stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(charsetEClass, charset.class, "charset", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getcharset_Charset(), ecorePackage.getEString(), "charset", null, 0, 1, charset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(importExpressionEClass, importExpression.class, "importExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getimportExpression_Value(), ecorePackage.getEString(), "value", null, 0, 1, importExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(pageEClass, page.class, "page", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getpage_PseudoPage(), ecorePackage.getEString(), "pseudoPage", null, 0, 1, page.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getpage_Declarations(), this.getcss_declaration(), null, "declarations", null, 0, -1, page.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(mediaEClass, media.class, "media", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getmedia_Medialist(), ecorePackage.getEString(), "medialist", null, 0, 1, media.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getmedia_Rulesets(), this.getruleset(), null, "rulesets", null, 0, -1, media.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(font_faceEClass, font_face.class, "font_face", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getfont_face_Declarations(), this.getcss_declaration(), null, "declarations", null, 0, -1, font_face.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+				IS_ORDERED);

+		initEAttribute(getfont_face_Name(), ecorePackage.getEString(), "name", null, 0, 1, font_face.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getfont_face_Keyframeselectors(), this.getkeyframe_selector(), null, "keyframeselectors", null, 0, -1, font_face.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

+				!IS_DERIVED, IS_ORDERED);

+

+		initEClass(keyframesEClass, keyframes.class, "keyframes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(keyframe_selectorEClass, keyframe_selector.class, "keyframe_selector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getkeyframe_selector_Type(), ecorePackage.getEString(), "type", null, 0, 1, keyframe_selector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getkeyframe_selector_Percentage(), ecorePackage.getEDouble(), "percentage", null, 0, 1, keyframe_selector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getkeyframe_selector_Declarations(), this.getcss_declaration(), null, "declarations", null, 0, -1, keyframe_selector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

+				!IS_DERIVED, IS_ORDERED);

+

+		initEClass(rulesetEClass, ruleset.class, "ruleset", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getruleset_Selectors(), this.getselector(), null, "selectors", null, 0, -1, ruleset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getruleset_Declarations(), this.getcss_declaration(), null, "declarations", null, 0, -1, ruleset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(selectorEClass, selector.class, "selector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getselector_Simpleselectors(), this.getsimple_selector(), null, "simpleselectors", null, 0, -1, selector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+				IS_ORDERED);

+		initEAttribute(getselector_Combinator(), ecorePackage.getEString(), "combinator", null, 0, 1, selector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getselector_Selector(), this.getselector(), null, "selector", null, 0, 1, selector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(simpleSelectorForNegationEClass, SimpleSelectorForNegation.class, "SimpleSelectorForNegation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getSimpleSelectorForNegation_Element(), this.getElementSelector(), null, "element", null, 0, 1, SimpleSelectorForNegation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

+				!IS_DERIVED, IS_ORDERED);

+		initEReference(getSimpleSelectorForNegation_Universal(), this.getUniversalSelector(), null, "universal", null, 0, 1, SimpleSelectorForNegation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getSimpleSelectorForNegation_SubSelectors(), this.getCssSelector(), null, "subSelectors", null, 0, -1, SimpleSelectorForNegation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(cssSelectorEClass, CssSelector.class, "CssSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(simple_selectorEClass, simple_selector.class, "simple_selector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getsimple_selector_Element(), this.getElementSelector(), null, "element", null, 0, 1, simple_selector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+				IS_ORDERED);

+		initEReference(getsimple_selector_Universal(), this.getUniversalSelector(), null, "universal", null, 0, 1, simple_selector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+				IS_ORDERED);

+		initEReference(getsimple_selector_SubSelectors(), this.getCssSelector(), null, "subSelectors", null, 0, -1, simple_selector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+				IS_ORDERED);

+

+		initEClass(classSelectorEClass, ClassSelector.class, "ClassSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getClassSelector_Name(), ecorePackage.getEString(), "name", null, 0, 1, ClassSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(elementSelectorEClass, ElementSelector.class, "ElementSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getElementSelector_Name(), ecorePackage.getEString(), "name", null, 0, 1, ElementSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(universalSelectorEClass, UniversalSelector.class, "UniversalSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getUniversalSelector_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, UniversalSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(idSelectorEClass, IdSelector.class, "IdSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getIdSelector_Name(), ecorePackage.getEString(), "name", null, 0, 1, IdSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(css_declarationEClass, css_declaration.class, "css_declaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getcss_declaration_Property(), this.getcss_property(), null, "property", null, 0, 1, css_declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+				IS_ORDERED);

+		initEReference(getcss_declaration_ValueTokens(), this.getCssTok(), null, "valueTokens", null, 0, -1, css_declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+				IS_ORDERED);

+		initEAttribute(getcss_declaration_Important(), ecorePackage.getEBoolean(), "important", null, 0, 1, css_declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(css_propertyEClass, css_property.class, "css_property", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getcss_property_Name(), ecorePackage.getEString(), "name", null, 0, 1, css_property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(pseudoClassOrFuncEClass, PseudoClassOrFunc.class, "PseudoClassOrFunc", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(pseudoClassEClass, PseudoClass.class, "PseudoClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(pseudoClassNameEClass, PseudoClassName.class, "PseudoClassName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getPseudoClassName_Name(), ecorePackage.getEString(), "name", null, 0, 1, PseudoClassName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(pseudoClassFunctionEClass, PseudoClassFunction.class, "PseudoClassFunction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getPseudoClassFunction_Not(), ecorePackage.getEBoolean(), "not", null, 0, 1, PseudoClassFunction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getPseudoClassFunction_ParamSelector(), this.getSimpleSelectorForNegation(), null, "paramSelector", null, 0, 1, PseudoClassFunction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getPseudoClassFunction_Name(), ecorePackage.getEString(), "name", null, 0, 1, PseudoClassFunction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getPseudoClassFunction_Params(), this.getCssTok(), null, "params", null, 0, -1, PseudoClassFunction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(cssTokEClass, CssTok.class, "CssTok", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(urlTypeEClass, URLType.class, "URLType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getURLType_MediaList(), ecorePackage.getEString(), "mediaList", null, 0, 1, URLType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getURLType_Url(), ecorePackage.getEString(), "url", null, 0, 1, URLType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(attributeSelectorEClass, AttributeSelector.class, "AttributeSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getAttributeSelector_Name(), ecorePackage.getEString(), "name", null, 0, 1, AttributeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getAttributeSelector_Op(), ecorePackage.getEString(), "op", null, 0, 1, AttributeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getAttributeSelector_Value(), ecorePackage.getEString(), "value", null, 0, 1, AttributeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(symbolTokEClass, SymbolTok.class, "SymbolTok", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getSymbolTok_Symbol(), ecorePackage.getEString(), "symbol", null, 0, 1, SymbolTok.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(wsTokEClass, WSTok.class, "WSTok", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(stringTokEClass, StringTok.class, "StringTok", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getStringTok_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringTok.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(numberTokEClass, NumberTok.class, "NumberTok", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getNumberTok_Val(), ecorePackage.getEDouble(), "val", null, 0, 1, NumberTok.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(urlTokEClass, UrlTok.class, "UrlTok", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getUrlTok_Url(), this.getURLType(), null, "url", null, 0, 1, UrlTok.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(colorTokEClass, ColorTok.class, "ColorTok", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getColorTok_Value(), ecorePackage.getEString(), "value", null, 0, 1, ColorTok.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(identifierTokEClass, IdentifierTok.class, "IdentifierTok", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getIdentifierTok_Name(), ecorePackage.getEString(), "name", null, 0, 1, IdentifierTok.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(funcTokEClass, FuncTok.class, "FuncTok", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getFuncTok_Name(), this.getIdentifierTok(), null, "name", null, 0, 1, FuncTok.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getFuncTok_Params(), this.getCssTok(), null, "params", null, 0, -1, FuncTok.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		// Create resource

+		createResource(eNS_URI);

+	}

+

+} // CSSPackageImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ClassSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ClassSelectorImpl.java
new file mode 100644
index 00000000000..acd5c5d45ce
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ClassSelectorImpl.java
@@ -0,0 +1,192 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

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

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Class Selector</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ClassSelectorImpl#getName <em>Name</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class ClassSelectorImpl extends CssSelectorImpl implements ClassSelector

+{

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected ClassSelectorImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.CLASS_SELECTOR;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CLASS_SELECTOR__NAME, oldName, name));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.CLASS_SELECTOR__NAME:

+			return getName();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.CLASS_SELECTOR__NAME:

+			setName((String) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.CLASS_SELECTOR__NAME:

+			setName(NAME_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.CLASS_SELECTOR__NAME:

+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(')');

+		return result.toString();

+	}

+

+} // ClassSelectorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UriImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ColorTokImpl.java
index ffc21bf25b6..2034bcdc58e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UriImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ColorTokImpl.java
@@ -1,36 +1,30 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

 

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Uri;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok;

 

 /**

  * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Uri</b></em>'.

+ * An implementation of the model object '<em><b>Color Tok</b></em>'.

  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.UriImpl#getValue <em>Value</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ColorTokImpl#getValue <em>Value</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

-public class UriImpl extends TermImpl implements Uri

+public class ColorTokImpl extends CssTokImpl implements ColorTok

 {

 	/**

 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

@@ -60,7 +54,7 @@ public class UriImpl extends TermImpl implements Uri
 	 *

 	 * @generated

 	 */

-	protected UriImpl()

+	protected ColorTokImpl()

 	{

 		super();

 	}

@@ -74,7 +68,7 @@ public class UriImpl extends TermImpl implements Uri
 	@Override

 	protected EClass eStaticClass()

 	{

-		return CssPackage.Literals.URI;

+		return CSSPackage.Literals.COLOR_TOK;

 	}

 

 	/**

@@ -101,7 +95,7 @@ public class UriImpl extends TermImpl implements Uri
 		String oldValue = value;

 		value = newValue;

 		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.URI__VALUE, oldValue, value));

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.COLOR_TOK__VALUE, oldValue, value));

 		}

 	}

 

@@ -116,7 +110,7 @@ public class UriImpl extends TermImpl implements Uri
 	{

 		switch (featureID)

 		{

-		case CssPackage.URI__VALUE:

+		case CSSPackage.COLOR_TOK__VALUE:

 			return getValue();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -133,7 +127,7 @@ public class UriImpl extends TermImpl implements Uri
 	{

 		switch (featureID)

 		{

-		case CssPackage.URI__VALUE:

+		case CSSPackage.COLOR_TOK__VALUE:

 			setValue((String) newValue);

 			return;

 		}

@@ -151,7 +145,7 @@ public class UriImpl extends TermImpl implements Uri
 	{

 		switch (featureID)

 		{

-		case CssPackage.URI__VALUE:

+		case CSSPackage.COLOR_TOK__VALUE:

 			setValue(VALUE_EDEFAULT);

 			return;

 		}

@@ -169,7 +163,7 @@ public class UriImpl extends TermImpl implements Uri
 	{

 		switch (featureID)

 		{

-		case CssPackage.URI__VALUE:

+		case CSSPackage.COLOR_TOK__VALUE:

 			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

 		}

 		return super.eIsSet(featureID);

@@ -195,4 +189,4 @@ public class UriImpl extends TermImpl implements Uri
 		return result.toString();

 	}

 

-} // UriImpl

+} // ColorTokImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssSelectorImpl.java
new file mode 100644
index 00000000000..749addcbbbe
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssSelectorImpl.java
@@ -0,0 +1,44 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

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

+

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Css Selector</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class CssSelectorImpl extends MinimalEObjectImpl.Container implements CssSelector

+{

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected CssSelectorImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.CSS_SELECTOR;

+	}

+

+} // CssSelectorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssTokImpl.java
new file mode 100644
index 00000000000..2835b53f870
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssTokImpl.java
@@ -0,0 +1,44 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

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

+

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Css Tok</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class CssTokImpl extends MinimalEObjectImpl.Container implements CssTok

+{

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected CssTokImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.CSS_TOK;

+	}

+

+} // CssTokImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoPageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ElementSelectorImpl.java
index bc436a6c534..826ef7faf6b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoPageImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ElementSelectorImpl.java
@@ -1,59 +1,53 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

 

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector;

 

 /**

  * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Pseudo Page</b></em>'.

+ * An implementation of the model object '<em><b>Element Selector</b></em>'.

  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.PseudoPageImpl#getId <em>Id</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ElementSelectorImpl#getName <em>Name</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

-public class PseudoPageImpl extends MinimalEObjectImpl.Container implements PseudoPage

+public class ElementSelectorImpl extends MinimalEObjectImpl.Container implements ElementSelector

 {

 	/**

-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see #getId()

+	 * @see #getName()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final String ID_EDEFAULT = null;

+	protected static final String NAME_EDEFAULT = null;

 

 	/**

-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see #getId()

+	 * @see #getName()

 	 * @generated

 	 * @ordered

 	 */

-	protected String id = ID_EDEFAULT;

+	protected String name = NAME_EDEFAULT;

 

 	/**

 	 * <!-- begin-user-doc -->

@@ -61,7 +55,7 @@ public class PseudoPageImpl extends MinimalEObjectImpl.Container implements Pseu
 	 *

 	 * @generated

 	 */

-	protected PseudoPageImpl()

+	protected ElementSelectorImpl()

 	{

 		super();

 	}

@@ -75,7 +69,7 @@ public class PseudoPageImpl extends MinimalEObjectImpl.Container implements Pseu
 	@Override

 	protected EClass eStaticClass()

 	{

-		return CssPackage.Literals.PSEUDO_PAGE;

+		return CSSPackage.Literals.ELEMENT_SELECTOR;

 	}

 

 	/**

@@ -85,9 +79,9 @@ public class PseudoPageImpl extends MinimalEObjectImpl.Container implements Pseu
 	 * @generated

 	 */

 	@Override

-	public String getId()

+	public String getName()

 	{

-		return id;

+		return name;

 	}

 

 	/**

@@ -97,12 +91,12 @@ public class PseudoPageImpl extends MinimalEObjectImpl.Container implements Pseu
 	 * @generated

 	 */

 	@Override

-	public void setId(String newId)

+	public void setName(String newName)

 	{

-		String oldId = id;

-		id = newId;

+		String oldName = name;

+		name = newName;

 		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.PSEUDO_PAGE__ID, oldId, id));

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ELEMENT_SELECTOR__NAME, oldName, name));

 		}

 	}

 

@@ -117,8 +111,8 @@ public class PseudoPageImpl extends MinimalEObjectImpl.Container implements Pseu
 	{

 		switch (featureID)

 		{

-		case CssPackage.PSEUDO_PAGE__ID:

-			return getId();

+		case CSSPackage.ELEMENT_SELECTOR__NAME:

+			return getName();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -134,8 +128,8 @@ public class PseudoPageImpl extends MinimalEObjectImpl.Container implements Pseu
 	{

 		switch (featureID)

 		{

-		case CssPackage.PSEUDO_PAGE__ID:

-			setId((String) newValue);

+		case CSSPackage.ELEMENT_SELECTOR__NAME:

+			setName((String) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -152,8 +146,8 @@ public class PseudoPageImpl extends MinimalEObjectImpl.Container implements Pseu
 	{

 		switch (featureID)

 		{

-		case CssPackage.PSEUDO_PAGE__ID:

-			setId(ID_EDEFAULT);

+		case CSSPackage.ELEMENT_SELECTOR__NAME:

+			setName(NAME_EDEFAULT);

 			return;

 		}

 		super.eUnset(featureID);

@@ -170,8 +164,8 @@ public class PseudoPageImpl extends MinimalEObjectImpl.Container implements Pseu
 	{

 		switch (featureID)

 		{

-		case CssPackage.PSEUDO_PAGE__ID:

-			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);

+		case CSSPackage.ELEMENT_SELECTOR__NAME:

+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -190,10 +184,10 @@ public class PseudoPageImpl extends MinimalEObjectImpl.Container implements Pseu
 		}

 

 		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (id: ");

-		result.append(id);

+		result.append(" (name: ");

+		result.append(name);

 		result.append(')');

 		return result.toString();

 	}

 

-} // PseudoPageImpl

+} // ElementSelectorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/FuncTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/FuncTokImpl.java
new file mode 100644
index 00000000000..2422dd1a791
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/FuncTokImpl.java
@@ -0,0 +1,265 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Func Tok</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.FuncTokImpl#getName <em>Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.FuncTokImpl#getParams <em>Params</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class FuncTokImpl extends CssTokImpl implements FuncTok

+{

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected IdentifierTok name;

+

+	/**

+	 * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getParams()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<CssTok> params;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected FuncTokImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.FUNC_TOK;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public IdentifierTok getName()

+	{

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public NotificationChain basicSetName(IdentifierTok newName, NotificationChain msgs)

+	{

+		IdentifierTok oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.FUNC_TOK__NAME, oldName, newName);

+			if (msgs == null) {

+				msgs = notification;

+			} else {

+				msgs.add(notification);

+			}

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setName(IdentifierTok newName)

+	{

+		if (newName != name)

+		{

+			NotificationChain msgs = null;

+			if (name != null) {

+				msgs = ((InternalEObject) name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.FUNC_TOK__NAME, null, msgs);

+			}

+			if (newName != null) {

+				msgs = ((InternalEObject) newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.FUNC_TOK__NAME, null, msgs);

+			}

+			msgs = basicSetName(newName, msgs);

+			if (msgs != null) {

+				msgs.dispatch();

+			}

+		}

+		else if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.FUNC_TOK__NAME, newName, newName));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<CssTok> getParams()

+	{

+		if (params == null)

+		{

+			params = new EObjectContainmentEList<CssTok>(CssTok.class, this, CSSPackage.FUNC_TOK__PARAMS);

+		}

+		return params;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.FUNC_TOK__NAME:

+			return basicSetName(null, msgs);

+		case CSSPackage.FUNC_TOK__PARAMS:

+			return ((InternalEList<?>) getParams()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.FUNC_TOK__NAME:

+			return getName();

+		case CSSPackage.FUNC_TOK__PARAMS:

+			return getParams();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.FUNC_TOK__NAME:

+			setName((IdentifierTok) newValue);

+			return;

+		case CSSPackage.FUNC_TOK__PARAMS:

+			getParams().clear();

+			getParams().addAll((Collection<? extends CssTok>) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.FUNC_TOK__NAME:

+			setName((IdentifierTok) null);

+			return;

+		case CSSPackage.FUNC_TOK__PARAMS:

+			getParams().clear();

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.FUNC_TOK__NAME:

+			return name != null;

+		case CSSPackage.FUNC_TOK__PARAMS:

+			return params != null && !params.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // FuncTokImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdSelectorImpl.java
new file mode 100644
index 00000000000..9fbaa244d85
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdSelectorImpl.java
@@ -0,0 +1,192 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

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

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Id Selector</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdSelectorImpl#getName <em>Name</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class IdSelectorImpl extends CssSelectorImpl implements IdSelector

+{

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected IdSelectorImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.ID_SELECTOR;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ID_SELECTOR__NAME, oldName, name));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.ID_SELECTOR__NAME:

+			return getName();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.ID_SELECTOR__NAME:

+			setName((String) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.ID_SELECTOR__NAME:

+			setName(NAME_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.ID_SELECTOR__NAME:

+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(')');

+		return result.toString();

+	}

+

+} // IdSelectorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdentifierTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdentifierTokImpl.java
new file mode 100644
index 00000000000..af8d7026c05
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdentifierTokImpl.java
@@ -0,0 +1,192 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

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

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Identifier Tok</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdentifierTokImpl#getName <em>Name</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class IdentifierTokImpl extends CssTokImpl implements IdentifierTok

+{

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected IdentifierTokImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.IDENTIFIER_TOK;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.IDENTIFIER_TOK__NAME, oldName, name));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.IDENTIFIER_TOK__NAME:

+			return getName();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.IDENTIFIER_TOK__NAME:

+			setName((String) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.IDENTIFIER_TOK__NAME:

+			setName(NAME_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.IDENTIFIER_TOK__NAME:

+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(')');

+		return result.toString();

+	}

+

+} // IdentifierTokImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/NumberTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/NumberTokImpl.java
new file mode 100644
index 00000000000..8d9075a1b52
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/NumberTokImpl.java
@@ -0,0 +1,192 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

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

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Number Tok</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.NumberTokImpl#getVal <em>Val</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class NumberTokImpl extends CssTokImpl implements NumberTok

+{

+	/**

+	 * The default value of the '{@link #getVal() <em>Val</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getVal()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final double VAL_EDEFAULT = 0.0;

+

+	/**

+	 * The cached value of the '{@link #getVal() <em>Val</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getVal()

+	 * @generated

+	 * @ordered

+	 */

+	protected double val = VAL_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected NumberTokImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.NUMBER_TOK;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public double getVal()

+	{

+		return val;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setVal(double newVal)

+	{

+		double oldVal = val;

+		val = newVal;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.NUMBER_TOK__VAL, oldVal, val));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.NUMBER_TOK__VAL:

+			return getVal();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.NUMBER_TOK__VAL:

+			setVal((Double) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.NUMBER_TOK__VAL:

+			setVal(VAL_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.NUMBER_TOK__VAL:

+			return val != VAL_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (val: ");

+		result.append(val);

+		result.append(')');

+		return result.toString();

+	}

+

+} // NumberTokImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassFunctionImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassFunctionImpl.java
new file mode 100644
index 00000000000..179b9122f7d
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassFunctionImpl.java
@@ -0,0 +1,409 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Pseudo Class Function</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl#isNot <em>Not</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl#getParamSelector <em>Param Selector</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl#getName <em>Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl#getParams <em>Params</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class PseudoClassFunctionImpl extends PseudoClassOrFuncImpl implements PseudoClassFunction

+{

+	/**

+	 * The default value of the '{@link #isNot() <em>Not</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isNot()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean NOT_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isNot() <em>Not</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isNot()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean not = NOT_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getParamSelector() <em>Param Selector</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getParamSelector()

+	 * @generated

+	 * @ordered

+	 */

+	protected SimpleSelectorForNegation paramSelector;

+

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getParams()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<CssTok> params;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected PseudoClassFunctionImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.PSEUDO_CLASS_FUNCTION;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean isNot()

+	{

+		return not;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setNot(boolean newNot)

+	{

+		boolean oldNot = not;

+		not = newNot;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_FUNCTION__NOT, oldNot, not));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public SimpleSelectorForNegation getParamSelector()

+	{

+		return paramSelector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public NotificationChain basicSetParamSelector(SimpleSelectorForNegation newParamSelector, NotificationChain msgs)

+	{

+		SimpleSelectorForNegation oldParamSelector = paramSelector;

+		paramSelector = newParamSelector;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR, oldParamSelector, newParamSelector);

+			if (msgs == null) {

+				msgs = notification;

+			} else {

+				msgs.add(notification);

+			}

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setParamSelector(SimpleSelectorForNegation newParamSelector)

+	{

+		if (newParamSelector != paramSelector)

+		{

+			NotificationChain msgs = null;

+			if (paramSelector != null) {

+				msgs = ((InternalEObject) paramSelector).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR, null, msgs);

+			}

+			if (newParamSelector != null) {

+				msgs = ((InternalEObject) newParamSelector).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR, null, msgs);

+			}

+			msgs = basicSetParamSelector(newParamSelector, msgs);

+			if (msgs != null) {

+				msgs.dispatch();

+			}

+		}

+		else if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR, newParamSelector, newParamSelector));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_FUNCTION__NAME, oldName, name));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<CssTok> getParams()

+	{

+		if (params == null)

+		{

+			params = new EObjectContainmentEList<CssTok>(CssTok.class, this, CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS);

+		}

+		return params;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:

+			return basicSetParamSelector(null, msgs);

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:

+			return ((InternalEList<?>) getParams()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NOT:

+			return isNot();

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:

+			return getParamSelector();

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NAME:

+			return getName();

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:

+			return getParams();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NOT:

+			setNot((Boolean) newValue);

+			return;

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:

+			setParamSelector((SimpleSelectorForNegation) newValue);

+			return;

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NAME:

+			setName((String) newValue);

+			return;

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:

+			getParams().clear();

+			getParams().addAll((Collection<? extends CssTok>) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NOT:

+			setNot(NOT_EDEFAULT);

+			return;

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:

+			setParamSelector((SimpleSelectorForNegation) null);

+			return;

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NAME:

+			setName(NAME_EDEFAULT);

+			return;

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:

+			getParams().clear();

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NOT:

+			return not != NOT_EDEFAULT;

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:

+			return paramSelector != null;

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NAME:

+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:

+			return params != null && !params.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (not: ");

+		result.append(not);

+		result.append(", name: ");

+		result.append(name);

+		result.append(')');

+		return result.toString();

+	}

+

+} // PseudoClassFunctionImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassImpl.java
new file mode 100644
index 00000000000..f502b09005a
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassImpl.java
@@ -0,0 +1,42 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

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

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClass;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Pseudo Class</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class PseudoClassImpl extends CssSelectorImpl implements PseudoClass

+{

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected PseudoClassImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.PSEUDO_CLASS;

+	}

+

+} // PseudoClassImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassNameImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassNameImpl.java
new file mode 100644
index 00000000000..ded048616b4
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassNameImpl.java
@@ -0,0 +1,192 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

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

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Pseudo Class Name</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassNameImpl#getName <em>Name</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class PseudoClassNameImpl extends PseudoClassImpl implements PseudoClassName

+{

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected PseudoClassNameImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.PSEUDO_CLASS_NAME;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_NAME__NAME, oldName, name));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PSEUDO_CLASS_NAME__NAME:

+			return getName();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PSEUDO_CLASS_NAME__NAME:

+			setName((String) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PSEUDO_CLASS_NAME__NAME:

+			setName(NAME_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PSEUDO_CLASS_NAME__NAME:

+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(')');

+		return result.toString();

+	}

+

+} // PseudoClassNameImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassOrFuncImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassOrFuncImpl.java
new file mode 100644
index 00000000000..82e0995f22e
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassOrFuncImpl.java
@@ -0,0 +1,42 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

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

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassOrFunc;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Pseudo Class Or Func</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class PseudoClassOrFuncImpl extends CssSelectorImpl implements PseudoClassOrFunc

+{

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected PseudoClassOrFuncImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.PSEUDO_CLASS_OR_FUNC;

+	}

+

+} // PseudoClassOrFuncImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/SimpleSelectorForNegationImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/SimpleSelectorForNegationImpl.java
new file mode 100644
index 00000000000..3858a8c03b3
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/SimpleSelectorForNegationImpl.java
@@ -0,0 +1,353 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Simple Selector For Negation</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SimpleSelectorForNegationImpl#getElement <em>Element</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SimpleSelectorForNegationImpl#getUniversal <em>Universal</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SimpleSelectorForNegationImpl#getSubSelectors <em>Sub Selectors</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class SimpleSelectorForNegationImpl extends MinimalEObjectImpl.Container implements SimpleSelectorForNegation

+{

+	/**

+	 * The cached value of the '{@link #getElement() <em>Element</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getElement()

+	 * @generated

+	 * @ordered

+	 */

+	protected ElementSelector element;

+

+	/**

+	 * The cached value of the '{@link #getUniversal() <em>Universal</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getUniversal()

+	 * @generated

+	 * @ordered

+	 */

+	protected UniversalSelector universal;

+

+	/**

+	 * The cached value of the '{@link #getSubSelectors() <em>Sub Selectors</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getSubSelectors()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<CssSelector> subSelectors;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected SimpleSelectorForNegationImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.SIMPLE_SELECTOR_FOR_NEGATION;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public ElementSelector getElement()

+	{

+		return element;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public NotificationChain basicSetElement(ElementSelector newElement, NotificationChain msgs)

+	{

+		ElementSelector oldElement = element;

+		element = newElement;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT, oldElement, newElement);

+			if (msgs == null) {

+				msgs = notification;

+			} else {

+				msgs.add(notification);

+			}

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setElement(ElementSelector newElement)

+	{

+		if (newElement != element)

+		{

+			NotificationChain msgs = null;

+			if (element != null) {

+				msgs = ((InternalEObject) element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT, null, msgs);

+			}

+			if (newElement != null) {

+				msgs = ((InternalEObject) newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT, null, msgs);

+			}

+			msgs = basicSetElement(newElement, msgs);

+			if (msgs != null) {

+				msgs.dispatch();

+			}

+		}

+		else if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT, newElement, newElement));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public UniversalSelector getUniversal()

+	{

+		return universal;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public NotificationChain basicSetUniversal(UniversalSelector newUniversal, NotificationChain msgs)

+	{

+		UniversalSelector oldUniversal = universal;

+		universal = newUniversal;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL, oldUniversal, newUniversal);

+			if (msgs == null) {

+				msgs = notification;

+			} else {

+				msgs.add(notification);

+			}

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setUniversal(UniversalSelector newUniversal)

+	{

+		if (newUniversal != universal)

+		{

+			NotificationChain msgs = null;

+			if (universal != null) {

+				msgs = ((InternalEObject) universal).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL, null, msgs);

+			}

+			if (newUniversal != null) {

+				msgs = ((InternalEObject) newUniversal).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL, null, msgs);

+			}

+			msgs = basicSetUniversal(newUniversal, msgs);

+			if (msgs != null) {

+				msgs.dispatch();

+			}

+		}

+		else if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL, newUniversal, newUniversal));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<CssSelector> getSubSelectors()

+	{

+		if (subSelectors == null)

+		{

+			subSelectors = new EObjectContainmentEList<CssSelector>(CssSelector.class, this, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS);

+		}

+		return subSelectors;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:

+			return basicSetElement(null, msgs);

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:

+			return basicSetUniversal(null, msgs);

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:

+			return ((InternalEList<?>) getSubSelectors()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:

+			return getElement();

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:

+			return getUniversal();

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:

+			return getSubSelectors();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:

+			setElement((ElementSelector) newValue);

+			return;

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:

+			setUniversal((UniversalSelector) newValue);

+			return;

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:

+			getSubSelectors().clear();

+			getSubSelectors().addAll((Collection<? extends CssSelector>) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:

+			setElement((ElementSelector) null);

+			return;

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:

+			setUniversal((UniversalSelector) null);

+			return;

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:

+			getSubSelectors().clear();

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:

+			return element != null;

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:

+			return universal != null;

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:

+			return subSelectors != null && !subSelectors.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // SimpleSelectorForNegationImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NameImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/StringTokImpl.java
index cae4b63f9da..32690e9ad00 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NameImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/StringTokImpl.java
@@ -1,36 +1,30 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

 

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Name;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok;

 

 /**

  * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Name</b></em>'.

+ * An implementation of the model object '<em><b>String Tok</b></em>'.

  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.NameImpl#getValue <em>Value</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.StringTokImpl#getValue <em>Value</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

-public class NameImpl extends TermImpl implements Name

+public class StringTokImpl extends CssTokImpl implements StringTok

 {

 	/**

 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

@@ -60,7 +54,7 @@ public class NameImpl extends TermImpl implements Name
 	 *

 	 * @generated

 	 */

-	protected NameImpl()

+	protected StringTokImpl()

 	{

 		super();

 	}

@@ -74,7 +68,7 @@ public class NameImpl extends TermImpl implements Name
 	@Override

 	protected EClass eStaticClass()

 	{

-		return CssPackage.Literals.NAME;

+		return CSSPackage.Literals.STRING_TOK;

 	}

 

 	/**

@@ -101,7 +95,7 @@ public class NameImpl extends TermImpl implements Name
 		String oldValue = value;

 		value = newValue;

 		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.NAME__VALUE, oldValue, value));

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.STRING_TOK__VALUE, oldValue, value));

 		}

 	}

 

@@ -116,7 +110,7 @@ public class NameImpl extends TermImpl implements Name
 	{

 		switch (featureID)

 		{

-		case CssPackage.NAME__VALUE:

+		case CSSPackage.STRING_TOK__VALUE:

 			return getValue();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -133,7 +127,7 @@ public class NameImpl extends TermImpl implements Name
 	{

 		switch (featureID)

 		{

-		case CssPackage.NAME__VALUE:

+		case CSSPackage.STRING_TOK__VALUE:

 			setValue((String) newValue);

 			return;

 		}

@@ -151,7 +145,7 @@ public class NameImpl extends TermImpl implements Name
 	{

 		switch (featureID)

 		{

-		case CssPackage.NAME__VALUE:

+		case CSSPackage.STRING_TOK__VALUE:

 			setValue(VALUE_EDEFAULT);

 			return;

 		}

@@ -169,7 +163,7 @@ public class NameImpl extends TermImpl implements Name
 	{

 		switch (featureID)

 		{

-		case CssPackage.NAME__VALUE:

+		case CSSPackage.STRING_TOK__VALUE:

 			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

 		}

 		return super.eIsSet(featureID);

@@ -195,4 +189,4 @@ public class NameImpl extends TermImpl implements Name
 		return result.toString();

 	}

 

-} // NameImpl

+} // StringTokImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ClassImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/SymbolTokImpl.java
index 5ea80162ea8..a7d55dde2a8 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ClassImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/SymbolTokImpl.java
@@ -1,57 +1,52 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

 

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok;

 

 /**

  * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Class</b></em>'.

+ * An implementation of the model object '<em><b>Symbol Tok</b></em>'.

  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.ClassImpl#getClass_ <em>Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SymbolTokImpl#getSymbol <em>Symbol</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

-public class ClassImpl extends SelectorConditionImpl implements org.eclipse.papyrus.infra.gmfdiag.css.Class

+public class SymbolTokImpl extends CssTokImpl implements SymbolTok

 {

 	/**

-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.

+	 * The default value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see #getClass_()

+	 * @see #getSymbol()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final String CLASS_EDEFAULT = null;

+	protected static final String SYMBOL_EDEFAULT = null;

 

 	/**

-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.

+	 * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see #getClass_()

+	 * @see #getSymbol()

 	 * @generated

 	 * @ordered

 	 */

-	protected String class_ = CLASS_EDEFAULT;

+	protected String symbol = SYMBOL_EDEFAULT;

 

 	/**

 	 * <!-- begin-user-doc -->

@@ -59,7 +54,7 @@ public class ClassImpl extends SelectorConditionImpl implements org.eclipse.papy
 	 *

 	 * @generated

 	 */

-	protected ClassImpl()

+	protected SymbolTokImpl()

 	{

 		super();

 	}

@@ -73,7 +68,7 @@ public class ClassImpl extends SelectorConditionImpl implements org.eclipse.papy
 	@Override

 	protected EClass eStaticClass()

 	{

-		return CssPackage.Literals.CLASS;

+		return CSSPackage.Literals.SYMBOL_TOK;

 	}

 

 	/**

@@ -83,9 +78,9 @@ public class ClassImpl extends SelectorConditionImpl implements org.eclipse.papy
 	 * @generated

 	 */

 	@Override

-	public String getClass_()

+	public String getSymbol()

 	{

-		return class_;

+		return symbol;

 	}

 

 	/**

@@ -95,12 +90,12 @@ public class ClassImpl extends SelectorConditionImpl implements org.eclipse.papy
 	 * @generated

 	 */

 	@Override

-	public void setClass(String newClass)

+	public void setSymbol(String newSymbol)

 	{

-		String oldClass = class_;

-		class_ = newClass;

+		String oldSymbol = symbol;

+		symbol = newSymbol;

 		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.CLASS__CLASS, oldClass, class_));

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SYMBOL_TOK__SYMBOL, oldSymbol, symbol));

 		}

 	}

 

@@ -115,8 +110,8 @@ public class ClassImpl extends SelectorConditionImpl implements org.eclipse.papy
 	{

 		switch (featureID)

 		{

-		case CssPackage.CLASS__CLASS:

-			return getClass_();

+		case CSSPackage.SYMBOL_TOK__SYMBOL:

+			return getSymbol();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -132,8 +127,8 @@ public class ClassImpl extends SelectorConditionImpl implements org.eclipse.papy
 	{

 		switch (featureID)

 		{

-		case CssPackage.CLASS__CLASS:

-			setClass((String) newValue);

+		case CSSPackage.SYMBOL_TOK__SYMBOL:

+			setSymbol((String) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -150,8 +145,8 @@ public class ClassImpl extends SelectorConditionImpl implements org.eclipse.papy
 	{

 		switch (featureID)

 		{

-		case CssPackage.CLASS__CLASS:

-			setClass(CLASS_EDEFAULT);

+		case CSSPackage.SYMBOL_TOK__SYMBOL:

+			setSymbol(SYMBOL_EDEFAULT);

 			return;

 		}

 		super.eUnset(featureID);

@@ -168,8 +163,8 @@ public class ClassImpl extends SelectorConditionImpl implements org.eclipse.papy
 	{

 		switch (featureID)

 		{

-		case CssPackage.CLASS__CLASS:

-			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);

+		case CSSPackage.SYMBOL_TOK__SYMBOL:

+			return SYMBOL_EDEFAULT == null ? symbol != null : !SYMBOL_EDEFAULT.equals(symbol);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -188,10 +183,10 @@ public class ClassImpl extends SelectorConditionImpl implements org.eclipse.papy
 		}

 

 		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (class: ");

-		result.append(class_);

+		result.append(" (symbol: ");

+		result.append(symbol);

 		result.append(')');

 		return result.toString();

 	}

 

-} // ClassImpl

+} // SymbolTokImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/URLTypeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/URLTypeImpl.java
new file mode 100644
index 00000000000..5feb2682de6
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/URLTypeImpl.java
@@ -0,0 +1,255 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

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

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>URL Type</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.URLTypeImpl#getMediaList <em>Media List</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.URLTypeImpl#getUrl <em>Url</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class URLTypeImpl extends importExpressionImpl implements URLType

+{

+	/**

+	 * The default value of the '{@link #getMediaList() <em>Media List</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getMediaList()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String MEDIA_LIST_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getMediaList() <em>Media List</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getMediaList()

+	 * @generated

+	 * @ordered

+	 */

+	protected String mediaList = MEDIA_LIST_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getUrl() <em>Url</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getUrl()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String URL_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getUrl()

+	 * @generated

+	 * @ordered

+	 */

+	protected String url = URL_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected URLTypeImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.URL_TYPE;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getMediaList()

+	{

+		return mediaList;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setMediaList(String newMediaList)

+	{

+		String oldMediaList = mediaList;

+		mediaList = newMediaList;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.URL_TYPE__MEDIA_LIST, oldMediaList, mediaList));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getUrl()

+	{

+		return url;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setUrl(String newUrl)

+	{

+		String oldUrl = url;

+		url = newUrl;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.URL_TYPE__URL, oldUrl, url));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.URL_TYPE__MEDIA_LIST:

+			return getMediaList();

+		case CSSPackage.URL_TYPE__URL:

+			return getUrl();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.URL_TYPE__MEDIA_LIST:

+			setMediaList((String) newValue);

+			return;

+		case CSSPackage.URL_TYPE__URL:

+			setUrl((String) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.URL_TYPE__MEDIA_LIST:

+			setMediaList(MEDIA_LIST_EDEFAULT);

+			return;

+		case CSSPackage.URL_TYPE__URL:

+			setUrl(URL_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.URL_TYPE__MEDIA_LIST:

+			return MEDIA_LIST_EDEFAULT == null ? mediaList != null : !MEDIA_LIST_EDEFAULT.equals(mediaList);

+		case CSSPackage.URL_TYPE__URL:

+			return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (mediaList: ");

+		result.append(mediaList);

+		result.append(", url: ");

+		result.append(url);

+		result.append(')');

+		return result.toString();

+	}

+

+} // URLTypeImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UniversalSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UniversalSelectorImpl.java
new file mode 100644
index 00000000000..e697b0b4c1c
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UniversalSelectorImpl.java
@@ -0,0 +1,193 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

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

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Universal Selector</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UniversalSelectorImpl#getNamespace <em>Namespace</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class UniversalSelectorImpl extends MinimalEObjectImpl.Container implements UniversalSelector

+{

+	/**

+	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAMESPACE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getNamespace()

+	 * @generated

+	 * @ordered

+	 */

+	protected String namespace = NAMESPACE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected UniversalSelectorImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.UNIVERSAL_SELECTOR;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getNamespace()

+	{

+		return namespace;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setNamespace(String newNamespace)

+	{

+		String oldNamespace = namespace;

+		namespace = newNamespace;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE, oldNamespace, namespace));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE:

+			return getNamespace();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE:

+			setNamespace((String) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE:

+			setNamespace(NAMESPACE_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE:

+			return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (namespace: ");

+		result.append(namespace);

+		result.append(')');

+		return result.toString();

+	}

+

+} // UniversalSelectorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UrlTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UrlTokImpl.java
new file mode 100644
index 00000000000..7a08e92986f
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UrlTokImpl.java
@@ -0,0 +1,215 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Url Tok</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UrlTokImpl#getUrl <em>Url</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class UrlTokImpl extends CssTokImpl implements UrlTok

+{

+	/**

+	 * The cached value of the '{@link #getUrl() <em>Url</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getUrl()

+	 * @generated

+	 * @ordered

+	 */

+	protected URLType url;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected UrlTokImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.URL_TOK;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public URLType getUrl()

+	{

+		return url;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public NotificationChain basicSetUrl(URLType newUrl, NotificationChain msgs)

+	{

+		URLType oldUrl = url;

+		url = newUrl;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.URL_TOK__URL, oldUrl, newUrl);

+			if (msgs == null) {

+				msgs = notification;

+			} else {

+				msgs.add(notification);

+			}

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setUrl(URLType newUrl)

+	{

+		if (newUrl != url)

+		{

+			NotificationChain msgs = null;

+			if (url != null) {

+				msgs = ((InternalEObject) url).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.URL_TOK__URL, null, msgs);

+			}

+			if (newUrl != null) {

+				msgs = ((InternalEObject) newUrl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.URL_TOK__URL, null, msgs);

+			}

+			msgs = basicSetUrl(newUrl, msgs);

+			if (msgs != null) {

+				msgs.dispatch();

+			}

+		}

+		else if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.URL_TOK__URL, newUrl, newUrl));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.URL_TOK__URL:

+			return basicSetUrl(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.URL_TOK__URL:

+			return getUrl();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.URL_TOK__URL:

+			setUrl((URLType) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.URL_TOK__URL:

+			setUrl((URLType) null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.URL_TOK__URL:

+			return url != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // UrlTokImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/WSTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/WSTokImpl.java
new file mode 100644
index 00000000000..1c24bb200ab
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/WSTokImpl.java
@@ -0,0 +1,42 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

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

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.WSTok;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>WS Tok</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class WSTokImpl extends CssTokImpl implements WSTok

+{

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected WSTokImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.WS_TOK;

+	}

+

+} // WSTokImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/charsetImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/charsetImpl.java
new file mode 100644
index 00000000000..613ce03665c
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/charsetImpl.java
@@ -0,0 +1,193 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

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

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>charset</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.charsetImpl#getCharset <em>Charset</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class charsetImpl extends MinimalEObjectImpl.Container implements charset

+{

+	/**

+	 * The default value of the '{@link #getCharset() <em>Charset</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getCharset()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String CHARSET_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getCharset() <em>Charset</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getCharset()

+	 * @generated

+	 * @ordered

+	 */

+	protected String charset = CHARSET_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected charsetImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.CHARSET;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getCharset()

+	{

+		return charset;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setCharset(String newCharset)

+	{

+		String oldCharset = charset;

+		charset = newCharset;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CHARSET__CHARSET, oldCharset, charset));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.CHARSET__CHARSET:

+			return getCharset();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.CHARSET__CHARSET:

+			setCharset((String) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.CHARSET__CHARSET:

+			setCharset(CHARSET_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.CHARSET__CHARSET:

+			return CHARSET_EDEFAULT == null ? charset != null : !CHARSET_EDEFAULT.equals(charset);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (charset: ");

+		result.append(charset);

+		result.append(')');

+		return result.toString();

+	}

+

+} // charsetImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/css_declarationImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/css_declarationImpl.java
new file mode 100644
index 00000000000..4ee1178d2cb
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/css_declarationImpl.java
@@ -0,0 +1,347 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>css declaration</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_declarationImpl#getProperty <em>Property</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_declarationImpl#getValueTokens <em>Value Tokens</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_declarationImpl#isImportant <em>Important</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class css_declarationImpl extends MinimalEObjectImpl.Container implements css_declaration

+{

+	/**

+	 * The cached value of the '{@link #getProperty() <em>Property</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getProperty()

+	 * @generated

+	 * @ordered

+	 */

+	protected css_property property;

+

+	/**

+	 * The cached value of the '{@link #getValueTokens() <em>Value Tokens</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getValueTokens()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<CssTok> valueTokens;

+

+	/**

+	 * The default value of the '{@link #isImportant() <em>Important</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isImportant()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean IMPORTANT_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isImportant() <em>Important</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #isImportant()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean important = IMPORTANT_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected css_declarationImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.CSS_DECLARATION;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public css_property getProperty()

+	{

+		return property;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public NotificationChain basicSetProperty(css_property newProperty, NotificationChain msgs)

+	{

+		css_property oldProperty = property;

+		property = newProperty;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.CSS_DECLARATION__PROPERTY, oldProperty, newProperty);

+			if (msgs == null) {

+				msgs = notification;

+			} else {

+				msgs.add(notification);

+			}

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setProperty(css_property newProperty)

+	{

+		if (newProperty != property)

+		{

+			NotificationChain msgs = null;

+			if (property != null) {

+				msgs = ((InternalEObject) property).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.CSS_DECLARATION__PROPERTY, null, msgs);

+			}

+			if (newProperty != null) {

+				msgs = ((InternalEObject) newProperty).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.CSS_DECLARATION__PROPERTY, null, msgs);

+			}

+			msgs = basicSetProperty(newProperty, msgs);

+			if (msgs != null) {

+				msgs.dispatch();

+			}

+		}

+		else if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CSS_DECLARATION__PROPERTY, newProperty, newProperty));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<CssTok> getValueTokens()

+	{

+		if (valueTokens == null)

+		{

+			valueTokens = new EObjectContainmentEList<CssTok>(CssTok.class, this, CSSPackage.CSS_DECLARATION__VALUE_TOKENS);

+		}

+		return valueTokens;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean isImportant()

+	{

+		return important;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setImportant(boolean newImportant)

+	{

+		boolean oldImportant = important;

+		important = newImportant;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CSS_DECLARATION__IMPORTANT, oldImportant, important));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.CSS_DECLARATION__PROPERTY:

+			return basicSetProperty(null, msgs);

+		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:

+			return ((InternalEList<?>) getValueTokens()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.CSS_DECLARATION__PROPERTY:

+			return getProperty();

+		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:

+			return getValueTokens();

+		case CSSPackage.CSS_DECLARATION__IMPORTANT:

+			return isImportant();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.CSS_DECLARATION__PROPERTY:

+			setProperty((css_property) newValue);

+			return;

+		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:

+			getValueTokens().clear();

+			getValueTokens().addAll((Collection<? extends CssTok>) newValue);

+			return;

+		case CSSPackage.CSS_DECLARATION__IMPORTANT:

+			setImportant((Boolean) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.CSS_DECLARATION__PROPERTY:

+			setProperty((css_property) null);

+			return;

+		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:

+			getValueTokens().clear();

+			return;

+		case CSSPackage.CSS_DECLARATION__IMPORTANT:

+			setImportant(IMPORTANT_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.CSS_DECLARATION__PROPERTY:

+			return property != null;

+		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:

+			return valueTokens != null && !valueTokens.isEmpty();

+		case CSSPackage.CSS_DECLARATION__IMPORTANT:

+			return important != IMPORTANT_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (important: ");

+		result.append(important);

+		result.append(')');

+		return result.toString();

+	}

+

+} // css_declarationImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CombinatorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/css_propertyImpl.java
index 710e9dce512..7f7356be3d7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CombinatorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/css_propertyImpl.java
@@ -1,60 +1,53 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

 

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.Combinator;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.KIND;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property;

 

 /**

  * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Combinator</b></em>'.

+ * An implementation of the model object '<em><b>css property</b></em>'.

  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.CombinatorImpl#getKind <em>Kind</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_propertyImpl#getName <em>Name</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

-public class CombinatorImpl extends MinimalEObjectImpl.Container implements Combinator

+public class css_propertyImpl extends MinimalEObjectImpl.Container implements css_property

 {

 	/**

-	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see #getKind()

+	 * @see #getName()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final KIND KIND_EDEFAULT = KIND.FIRST_CHILD;

+	protected static final String NAME_EDEFAULT = null;

 

 	/**

-	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 *

-	 * @see #getKind()

+	 * @see #getName()

 	 * @generated

 	 * @ordered

 	 */

-	protected KIND kind = KIND_EDEFAULT;

+	protected String name = NAME_EDEFAULT;

 

 	/**

 	 * <!-- begin-user-doc -->

@@ -62,7 +55,7 @@ public class CombinatorImpl extends MinimalEObjectImpl.Container implements Comb
 	 *

 	 * @generated

 	 */

-	protected CombinatorImpl()

+	protected css_propertyImpl()

 	{

 		super();

 	}

@@ -76,7 +69,7 @@ public class CombinatorImpl extends MinimalEObjectImpl.Container implements Comb
 	@Override

 	protected EClass eStaticClass()

 	{

-		return CssPackage.Literals.COMBINATOR;

+		return CSSPackage.Literals.CSS_PROPERTY;

 	}

 

 	/**

@@ -86,9 +79,9 @@ public class CombinatorImpl extends MinimalEObjectImpl.Container implements Comb
 	 * @generated

 	 */

 	@Override

-	public KIND getKind()

+	public String getName()

 	{

-		return kind;

+		return name;

 	}

 

 	/**

@@ -98,12 +91,12 @@ public class CombinatorImpl extends MinimalEObjectImpl.Container implements Comb
 	 * @generated

 	 */

 	@Override

-	public void setKind(KIND newKind)

+	public void setName(String newName)

 	{

-		KIND oldKind = kind;

-		kind = newKind == null ? KIND_EDEFAULT : newKind;

+		String oldName = name;

+		name = newName;

 		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.COMBINATOR__KIND, oldKind, kind));

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CSS_PROPERTY__NAME, oldName, name));

 		}

 	}

 

@@ -118,8 +111,8 @@ public class CombinatorImpl extends MinimalEObjectImpl.Container implements Comb
 	{

 		switch (featureID)

 		{

-		case CssPackage.COMBINATOR__KIND:

-			return getKind();

+		case CSSPackage.CSS_PROPERTY__NAME:

+			return getName();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -135,8 +128,8 @@ public class CombinatorImpl extends MinimalEObjectImpl.Container implements Comb
 	{

 		switch (featureID)

 		{

-		case CssPackage.COMBINATOR__KIND:

-			setKind((KIND) newValue);

+		case CSSPackage.CSS_PROPERTY__NAME:

+			setName((String) newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -153,8 +146,8 @@ public class CombinatorImpl extends MinimalEObjectImpl.Container implements Comb
 	{

 		switch (featureID)

 		{

-		case CssPackage.COMBINATOR__KIND:

-			setKind(KIND_EDEFAULT);

+		case CSSPackage.CSS_PROPERTY__NAME:

+			setName(NAME_EDEFAULT);

 			return;

 		}

 		super.eUnset(featureID);

@@ -171,8 +164,8 @@ public class CombinatorImpl extends MinimalEObjectImpl.Container implements Comb
 	{

 		switch (featureID)

 		{

-		case CssPackage.COMBINATOR__KIND:

-			return kind != KIND_EDEFAULT;

+		case CSSPackage.CSS_PROPERTY__NAME:

+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -191,10 +184,10 @@ public class CombinatorImpl extends MinimalEObjectImpl.Container implements Comb
 		}

 

 		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (kind: ");

-		result.append(kind);

+		result.append(" (name: ");

+		result.append(name);

 		result.append(')');

 		return result.toString();

 	}

 

-} // CombinatorImpl

+} // css_propertyImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/font_faceImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/font_faceImpl.java
new file mode 100644
index 00000000000..3ccfc9b9cc6
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/font_faceImpl.java
@@ -0,0 +1,301 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>font face</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.font_faceImpl#getDeclarations <em>Declarations</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.font_faceImpl#getName <em>Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.font_faceImpl#getKeyframeselectors <em>Keyframeselectors</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class font_faceImpl extends keyframesImpl implements font_face

+{

+	/**

+	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getDeclarations()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<css_declaration> declarations;

+

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getKeyframeselectors() <em>Keyframeselectors</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getKeyframeselectors()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<keyframe_selector> keyframeselectors;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected font_faceImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.FONT_FACE;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<css_declaration> getDeclarations()

+	{

+		if (declarations == null)

+		{

+			declarations = new EObjectContainmentEList<css_declaration>(css_declaration.class, this, CSSPackage.FONT_FACE__DECLARATIONS);

+		}

+		return declarations;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getName()

+	{

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setName(String newName)

+	{

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.FONT_FACE__NAME, oldName, name));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<keyframe_selector> getKeyframeselectors()

+	{

+		if (keyframeselectors == null)

+		{

+			keyframeselectors = new EObjectContainmentEList<keyframe_selector>(keyframe_selector.class, this, CSSPackage.FONT_FACE__KEYFRAMESELECTORS);

+		}

+		return keyframeselectors;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.FONT_FACE__DECLARATIONS:

+			return ((InternalEList<?>) getDeclarations()).basicRemove(otherEnd, msgs);

+		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:

+			return ((InternalEList<?>) getKeyframeselectors()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.FONT_FACE__DECLARATIONS:

+			return getDeclarations();

+		case CSSPackage.FONT_FACE__NAME:

+			return getName();

+		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:

+			return getKeyframeselectors();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.FONT_FACE__DECLARATIONS:

+			getDeclarations().clear();

+			getDeclarations().addAll((Collection<? extends css_declaration>) newValue);

+			return;

+		case CSSPackage.FONT_FACE__NAME:

+			setName((String) newValue);

+			return;

+		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:

+			getKeyframeselectors().clear();

+			getKeyframeselectors().addAll((Collection<? extends keyframe_selector>) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.FONT_FACE__DECLARATIONS:

+			getDeclarations().clear();

+			return;

+		case CSSPackage.FONT_FACE__NAME:

+			setName(NAME_EDEFAULT);

+			return;

+		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:

+			getKeyframeselectors().clear();

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.FONT_FACE__DECLARATIONS:

+			return declarations != null && !declarations.isEmpty();

+		case CSSPackage.FONT_FACE__NAME:

+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:

+			return keyframeselectors != null && !keyframeselectors.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(')');

+		return result.toString();

+	}

+

+} // font_faceImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CSSIdImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/importExpressionImpl.java
index fecd5eb0f41..ebcbe0bc1a5 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CSSIdImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/importExpressionImpl.java
@@ -1,36 +1,31 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.impl;

+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

 

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.CSSId;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression;

 

 /**

  * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>CSS Id</b></em>'.

+ * An implementation of the model object '<em><b>import Expression</b></em>'.

  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css.impl.CSSIdImpl#getValue <em>Value</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.importExpressionImpl#getValue <em>Value</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

-public class CSSIdImpl extends SelectorConditionImpl implements CSSId

+public class importExpressionImpl extends MinimalEObjectImpl.Container implements importExpression

 {

 	/**

 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

@@ -60,7 +55,7 @@ public class CSSIdImpl extends SelectorConditionImpl implements CSSId
 	 *

 	 * @generated

 	 */

-	protected CSSIdImpl()

+	protected importExpressionImpl()

 	{

 		super();

 	}

@@ -74,7 +69,7 @@ public class CSSIdImpl extends SelectorConditionImpl implements CSSId
 	@Override

 	protected EClass eStaticClass()

 	{

-		return CssPackage.Literals.CSS_ID;

+		return CSSPackage.Literals.IMPORT_EXPRESSION;

 	}

 

 	/**

@@ -101,7 +96,7 @@ public class CSSIdImpl extends SelectorConditionImpl implements CSSId
 		String oldValue = value;

 		value = newValue;

 		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CssPackage.CSS_ID__VALUE, oldValue, value));

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.IMPORT_EXPRESSION__VALUE, oldValue, value));

 		}

 	}

 

@@ -116,7 +111,7 @@ public class CSSIdImpl extends SelectorConditionImpl implements CSSId
 	{

 		switch (featureID)

 		{

-		case CssPackage.CSS_ID__VALUE:

+		case CSSPackage.IMPORT_EXPRESSION__VALUE:

 			return getValue();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -133,7 +128,7 @@ public class CSSIdImpl extends SelectorConditionImpl implements CSSId
 	{

 		switch (featureID)

 		{

-		case CssPackage.CSS_ID__VALUE:

+		case CSSPackage.IMPORT_EXPRESSION__VALUE:

 			setValue((String) newValue);

 			return;

 		}

@@ -151,7 +146,7 @@ public class CSSIdImpl extends SelectorConditionImpl implements CSSId
 	{

 		switch (featureID)

 		{

-		case CssPackage.CSS_ID__VALUE:

+		case CSSPackage.IMPORT_EXPRESSION__VALUE:

 			setValue(VALUE_EDEFAULT);

 			return;

 		}

@@ -169,7 +164,7 @@ public class CSSIdImpl extends SelectorConditionImpl implements CSSId
 	{

 		switch (featureID)

 		{

-		case CssPackage.CSS_ID__VALUE:

+		case CSSPackage.IMPORT_EXPRESSION__VALUE:

 			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

 		}

 		return super.eIsSet(featureID);

@@ -195,4 +190,4 @@ public class CSSIdImpl extends SelectorConditionImpl implements CSSId
 		return result.toString();

 	}

 

-} // CSSIdImpl

+} // importExpressionImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframe_selectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframe_selectorImpl.java
new file mode 100644
index 00000000000..3ec5806481f
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframe_selectorImpl.java
@@ -0,0 +1,323 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>keyframe selector</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframe_selectorImpl#getType <em>Type</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframe_selectorImpl#getPercentage <em>Percentage</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframe_selectorImpl#getDeclarations <em>Declarations</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class keyframe_selectorImpl extends MinimalEObjectImpl.Container implements keyframe_selector

+{

+	/**

+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String TYPE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected String type = TYPE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getPercentage() <em>Percentage</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getPercentage()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final double PERCENTAGE_EDEFAULT = 0.0;

+

+	/**

+	 * The cached value of the '{@link #getPercentage() <em>Percentage</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getPercentage()

+	 * @generated

+	 * @ordered

+	 */

+	protected double percentage = PERCENTAGE_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getDeclarations()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<css_declaration> declarations;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected keyframe_selectorImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.KEYFRAME_SELECTOR;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getType()

+	{

+		return type;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setType(String newType)

+	{

+		String oldType = type;

+		type = newType;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.KEYFRAME_SELECTOR__TYPE, oldType, type));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public double getPercentage()

+	{

+		return percentage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setPercentage(double newPercentage)

+	{

+		double oldPercentage = percentage;

+		percentage = newPercentage;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE, oldPercentage, percentage));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<css_declaration> getDeclarations()

+	{

+		if (declarations == null)

+		{

+			declarations = new EObjectContainmentEList<css_declaration>(css_declaration.class, this, CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS);

+		}

+		return declarations;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:

+			return ((InternalEList<?>) getDeclarations()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.KEYFRAME_SELECTOR__TYPE:

+			return getType();

+		case CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE:

+			return getPercentage();

+		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:

+			return getDeclarations();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.KEYFRAME_SELECTOR__TYPE:

+			setType((String) newValue);

+			return;

+		case CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE:

+			setPercentage((Double) newValue);

+			return;

+		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:

+			getDeclarations().clear();

+			getDeclarations().addAll((Collection<? extends css_declaration>) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.KEYFRAME_SELECTOR__TYPE:

+			setType(TYPE_EDEFAULT);

+			return;

+		case CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE:

+			setPercentage(PERCENTAGE_EDEFAULT);

+			return;

+		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:

+			getDeclarations().clear();

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.KEYFRAME_SELECTOR__TYPE:

+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

+		case CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE:

+			return percentage != PERCENTAGE_EDEFAULT;

+		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:

+			return declarations != null && !declarations.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (type: ");

+		result.append(type);

+		result.append(", percentage: ");

+		result.append(percentage);

+		result.append(')');

+		return result.toString();

+	}

+

+} // keyframe_selectorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframesImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframesImpl.java
new file mode 100644
index 00000000000..f9f862948a3
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframesImpl.java
@@ -0,0 +1,44 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

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

+

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>keyframes</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * @generated

+ */

+public class keyframesImpl extends MinimalEObjectImpl.Container implements keyframes

+{

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected keyframesImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.KEYFRAMES;

+	}

+

+} // keyframesImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/mediaImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/mediaImpl.java
new file mode 100644
index 00000000000..ef752b72561
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/mediaImpl.java
@@ -0,0 +1,260 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>media</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.mediaImpl#getMedialist <em>Medialist</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.mediaImpl#getRulesets <em>Rulesets</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class mediaImpl extends MinimalEObjectImpl.Container implements media

+{

+	/**

+	 * The default value of the '{@link #getMedialist() <em>Medialist</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getMedialist()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String MEDIALIST_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getMedialist() <em>Medialist</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getMedialist()

+	 * @generated

+	 * @ordered

+	 */

+	protected String medialist = MEDIALIST_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getRulesets() <em>Rulesets</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getRulesets()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<ruleset> rulesets;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected mediaImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.MEDIA;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getMedialist()

+	{

+		return medialist;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setMedialist(String newMedialist)

+	{

+		String oldMedialist = medialist;

+		medialist = newMedialist;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.MEDIA__MEDIALIST, oldMedialist, medialist));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<ruleset> getRulesets()

+	{

+		if (rulesets == null)

+		{

+			rulesets = new EObjectContainmentEList<ruleset>(ruleset.class, this, CSSPackage.MEDIA__RULESETS);

+		}

+		return rulesets;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.MEDIA__RULESETS:

+			return ((InternalEList<?>) getRulesets()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.MEDIA__MEDIALIST:

+			return getMedialist();

+		case CSSPackage.MEDIA__RULESETS:

+			return getRulesets();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.MEDIA__MEDIALIST:

+			setMedialist((String) newValue);

+			return;

+		case CSSPackage.MEDIA__RULESETS:

+			getRulesets().clear();

+			getRulesets().addAll((Collection<? extends ruleset>) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.MEDIA__MEDIALIST:

+			setMedialist(MEDIALIST_EDEFAULT);

+			return;

+		case CSSPackage.MEDIA__RULESETS:

+			getRulesets().clear();

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.MEDIA__MEDIALIST:

+			return MEDIALIST_EDEFAULT == null ? medialist != null : !MEDIALIST_EDEFAULT.equals(medialist);

+		case CSSPackage.MEDIA__RULESETS:

+			return rulesets != null && !rulesets.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (medialist: ");

+		result.append(medialist);

+		result.append(')');

+		return result.toString();

+	}

+

+} // mediaImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/pageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/pageImpl.java
new file mode 100644
index 00000000000..12867d87b22
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/pageImpl.java
@@ -0,0 +1,260 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>page</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.pageImpl#getPseudoPage <em>Pseudo Page</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.pageImpl#getDeclarations <em>Declarations</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class pageImpl extends MinimalEObjectImpl.Container implements page

+{

+	/**

+	 * The default value of the '{@link #getPseudoPage() <em>Pseudo Page</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getPseudoPage()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String PSEUDO_PAGE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getPseudoPage() <em>Pseudo Page</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getPseudoPage()

+	 * @generated

+	 * @ordered

+	 */

+	protected String pseudoPage = PSEUDO_PAGE_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getDeclarations()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<css_declaration> declarations;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected pageImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.PAGE;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getPseudoPage()

+	{

+		return pseudoPage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setPseudoPage(String newPseudoPage)

+	{

+		String oldPseudoPage = pseudoPage;

+		pseudoPage = newPseudoPage;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PAGE__PSEUDO_PAGE, oldPseudoPage, pseudoPage));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<css_declaration> getDeclarations()

+	{

+		if (declarations == null)

+		{

+			declarations = new EObjectContainmentEList<css_declaration>(css_declaration.class, this, CSSPackage.PAGE__DECLARATIONS);

+		}

+		return declarations;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PAGE__DECLARATIONS:

+			return ((InternalEList<?>) getDeclarations()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PAGE__PSEUDO_PAGE:

+			return getPseudoPage();

+		case CSSPackage.PAGE__DECLARATIONS:

+			return getDeclarations();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PAGE__PSEUDO_PAGE:

+			setPseudoPage((String) newValue);

+			return;

+		case CSSPackage.PAGE__DECLARATIONS:

+			getDeclarations().clear();

+			getDeclarations().addAll((Collection<? extends css_declaration>) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PAGE__PSEUDO_PAGE:

+			setPseudoPage(PSEUDO_PAGE_EDEFAULT);

+			return;

+		case CSSPackage.PAGE__DECLARATIONS:

+			getDeclarations().clear();

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.PAGE__PSEUDO_PAGE:

+			return PSEUDO_PAGE_EDEFAULT == null ? pseudoPage != null : !PSEUDO_PAGE_EDEFAULT.equals(pseudoPage);

+		case CSSPackage.PAGE__DECLARATIONS:

+			return declarations != null && !declarations.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (pseudoPage: ");

+		result.append(pseudoPage);

+		result.append(')');

+		return result.toString();

+	}

+

+} // pageImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/rulesetImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/rulesetImpl.java
new file mode 100644
index 00000000000..0578d1d5d22
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/rulesetImpl.java
@@ -0,0 +1,219 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>ruleset</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.rulesetImpl#getSelectors <em>Selectors</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.rulesetImpl#getDeclarations <em>Declarations</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class rulesetImpl extends MinimalEObjectImpl.Container implements ruleset

+{

+	/**

+	 * The cached value of the '{@link #getSelectors() <em>Selectors</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getSelectors()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<selector> selectors;

+

+	/**

+	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getDeclarations()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<css_declaration> declarations;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected rulesetImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.RULESET;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<selector> getSelectors()

+	{

+		if (selectors == null)

+		{

+			selectors = new EObjectContainmentEList<selector>(selector.class, this, CSSPackage.RULESET__SELECTORS);

+		}

+		return selectors;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<css_declaration> getDeclarations()

+	{

+		if (declarations == null)

+		{

+			declarations = new EObjectContainmentEList<css_declaration>(css_declaration.class, this, CSSPackage.RULESET__DECLARATIONS);

+		}

+		return declarations;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.RULESET__SELECTORS:

+			return ((InternalEList<?>) getSelectors()).basicRemove(otherEnd, msgs);

+		case CSSPackage.RULESET__DECLARATIONS:

+			return ((InternalEList<?>) getDeclarations()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.RULESET__SELECTORS:

+			return getSelectors();

+		case CSSPackage.RULESET__DECLARATIONS:

+			return getDeclarations();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.RULESET__SELECTORS:

+			getSelectors().clear();

+			getSelectors().addAll((Collection<? extends selector>) newValue);

+			return;

+		case CSSPackage.RULESET__DECLARATIONS:

+			getDeclarations().clear();

+			getDeclarations().addAll((Collection<? extends css_declaration>) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.RULESET__SELECTORS:

+			getSelectors().clear();

+			return;

+		case CSSPackage.RULESET__DECLARATIONS:

+			getDeclarations().clear();

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.RULESET__SELECTORS:

+			return selectors != null && !selectors.isEmpty();

+		case CSSPackage.RULESET__DECLARATIONS:

+			return declarations != null && !declarations.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // rulesetImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/selectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/selectorImpl.java
new file mode 100644
index 00000000000..648ee85210e
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/selectorImpl.java
@@ -0,0 +1,346 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>selector</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.selectorImpl#getSimpleselectors <em>Simpleselectors</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.selectorImpl#getCombinator <em>Combinator</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.selectorImpl#getSelector <em>Selector</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class selectorImpl extends MinimalEObjectImpl.Container implements selector

+{

+	/**

+	 * The cached value of the '{@link #getSimpleselectors() <em>Simpleselectors</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getSimpleselectors()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<simple_selector> simpleselectors;

+

+	/**

+	 * The default value of the '{@link #getCombinator() <em>Combinator</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getCombinator()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String COMBINATOR_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getCombinator() <em>Combinator</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getCombinator()

+	 * @generated

+	 * @ordered

+	 */

+	protected String combinator = COMBINATOR_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getSelector() <em>Selector</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getSelector()

+	 * @generated

+	 * @ordered

+	 */

+	protected selector selector;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected selectorImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.SELECTOR;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<simple_selector> getSimpleselectors()

+	{

+		if (simpleselectors == null)

+		{

+			simpleselectors = new EObjectContainmentEList<simple_selector>(simple_selector.class, this, CSSPackage.SELECTOR__SIMPLESELECTORS);

+		}

+		return simpleselectors;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String getCombinator()

+	{

+		return combinator;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setCombinator(String newCombinator)

+	{

+		String oldCombinator = combinator;

+		combinator = newCombinator;

+		if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SELECTOR__COMBINATOR, oldCombinator, combinator));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public selector getSelector()

+	{

+		return selector;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public NotificationChain basicSetSelector(selector newSelector, NotificationChain msgs)

+	{

+		selector oldSelector = selector;

+		selector = newSelector;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SELECTOR__SELECTOR, oldSelector, newSelector);

+			if (msgs == null) {

+				msgs = notification;

+			} else {

+				msgs.add(notification);

+			}

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setSelector(selector newSelector)

+	{

+		if (newSelector != selector)

+		{

+			NotificationChain msgs = null;

+			if (selector != null) {

+				msgs = ((InternalEObject) selector).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SELECTOR__SELECTOR, null, msgs);

+			}

+			if (newSelector != null) {

+				msgs = ((InternalEObject) newSelector).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SELECTOR__SELECTOR, null, msgs);

+			}

+			msgs = basicSetSelector(newSelector, msgs);

+			if (msgs != null) {

+				msgs.dispatch();

+			}

+		}

+		else if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SELECTOR__SELECTOR, newSelector, newSelector));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SELECTOR__SIMPLESELECTORS:

+			return ((InternalEList<?>) getSimpleselectors()).basicRemove(otherEnd, msgs);

+		case CSSPackage.SELECTOR__SELECTOR:

+			return basicSetSelector(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SELECTOR__SIMPLESELECTORS:

+			return getSimpleselectors();

+		case CSSPackage.SELECTOR__COMBINATOR:

+			return getCombinator();

+		case CSSPackage.SELECTOR__SELECTOR:

+			return getSelector();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SELECTOR__SIMPLESELECTORS:

+			getSimpleselectors().clear();

+			getSimpleselectors().addAll((Collection<? extends simple_selector>) newValue);

+			return;

+		case CSSPackage.SELECTOR__COMBINATOR:

+			setCombinator((String) newValue);

+			return;

+		case CSSPackage.SELECTOR__SELECTOR:

+			setSelector((selector) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SELECTOR__SIMPLESELECTORS:

+			getSimpleselectors().clear();

+			return;

+		case CSSPackage.SELECTOR__COMBINATOR:

+			setCombinator(COMBINATOR_EDEFAULT);

+			return;

+		case CSSPackage.SELECTOR__SELECTOR:

+			setSelector((selector) null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SELECTOR__SIMPLESELECTORS:

+			return simpleselectors != null && !simpleselectors.isEmpty();

+		case CSSPackage.SELECTOR__COMBINATOR:

+			return COMBINATOR_EDEFAULT == null ? combinator != null : !COMBINATOR_EDEFAULT.equals(combinator);

+		case CSSPackage.SELECTOR__SELECTOR:

+			return selector != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public String toString()

+	{

+		if (eIsProxy()) {

+			return super.toString();

+		}

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (combinator: ");

+		result.append(combinator);

+		result.append(')');

+		return result.toString();

+	}

+

+} // selectorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/simple_selectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/simple_selectorImpl.java
new file mode 100644
index 00000000000..518752b5445
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/simple_selectorImpl.java
@@ -0,0 +1,353 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>simple selector</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.simple_selectorImpl#getElement <em>Element</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.simple_selectorImpl#getUniversal <em>Universal</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.simple_selectorImpl#getSubSelectors <em>Sub Selectors</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class simple_selectorImpl extends MinimalEObjectImpl.Container implements simple_selector

+{

+	/**

+	 * The cached value of the '{@link #getElement() <em>Element</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getElement()

+	 * @generated

+	 * @ordered

+	 */

+	protected ElementSelector element;

+

+	/**

+	 * The cached value of the '{@link #getUniversal() <em>Universal</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getUniversal()

+	 * @generated

+	 * @ordered

+	 */

+	protected UniversalSelector universal;

+

+	/**

+	 * The cached value of the '{@link #getSubSelectors() <em>Sub Selectors</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getSubSelectors()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<CssSelector> subSelectors;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected simple_selectorImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.SIMPLE_SELECTOR;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public ElementSelector getElement()

+	{

+		return element;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public NotificationChain basicSetElement(ElementSelector newElement, NotificationChain msgs)

+	{

+		ElementSelector oldElement = element;

+		element = newElement;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR__ELEMENT, oldElement, newElement);

+			if (msgs == null) {

+				msgs = notification;

+			} else {

+				msgs.add(notification);

+			}

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setElement(ElementSelector newElement)

+	{

+		if (newElement != element)

+		{

+			NotificationChain msgs = null;

+			if (element != null) {

+				msgs = ((InternalEObject) element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR__ELEMENT, null, msgs);

+			}

+			if (newElement != null) {

+				msgs = ((InternalEObject) newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR__ELEMENT, null, msgs);

+			}

+			msgs = basicSetElement(newElement, msgs);

+			if (msgs != null) {

+				msgs.dispatch();

+			}

+		}

+		else if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR__ELEMENT, newElement, newElement));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public UniversalSelector getUniversal()

+	{

+		return universal;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public NotificationChain basicSetUniversal(UniversalSelector newUniversal, NotificationChain msgs)

+	{

+		UniversalSelector oldUniversal = universal;

+		universal = newUniversal;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR__UNIVERSAL, oldUniversal, newUniversal);

+			if (msgs == null) {

+				msgs = notification;

+			} else {

+				msgs.add(notification);

+			}

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setUniversal(UniversalSelector newUniversal)

+	{

+		if (newUniversal != universal)

+		{

+			NotificationChain msgs = null;

+			if (universal != null) {

+				msgs = ((InternalEObject) universal).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR__UNIVERSAL, null, msgs);

+			}

+			if (newUniversal != null) {

+				msgs = ((InternalEObject) newUniversal).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR__UNIVERSAL, null, msgs);

+			}

+			msgs = basicSetUniversal(newUniversal, msgs);

+			if (msgs != null) {

+				msgs.dispatch();

+			}

+		}

+		else if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR__UNIVERSAL, newUniversal, newUniversal));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<CssSelector> getSubSelectors()

+	{

+		if (subSelectors == null)

+		{

+			subSelectors = new EObjectContainmentEList<CssSelector>(CssSelector.class, this, CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS);

+		}

+		return subSelectors;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:

+			return basicSetElement(null, msgs);

+		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:

+			return basicSetUniversal(null, msgs);

+		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:

+			return ((InternalEList<?>) getSubSelectors()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:

+			return getElement();

+		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:

+			return getUniversal();

+		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:

+			return getSubSelectors();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:

+			setElement((ElementSelector) newValue);

+			return;

+		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:

+			setUniversal((UniversalSelector) newValue);

+			return;

+		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:

+			getSubSelectors().clear();

+			getSubSelectors().addAll((Collection<? extends CssSelector>) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:

+			setElement((ElementSelector) null);

+			return;

+		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:

+			setUniversal((UniversalSelector) null);

+			return;

+		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:

+			getSubSelectors().clear();

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:

+			return element != null;

+		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:

+			return universal != null;

+		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:

+			return subSelectors != null && !subSelectors.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // simple_selectorImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/stylesheetImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/stylesheetImpl.java
new file mode 100644
index 00000000000..27ffb91be88
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/stylesheetImpl.java
@@ -0,0 +1,476 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>stylesheet</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getCharset <em>Charset</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getImports <em>Imports</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getRuleset <em>Ruleset</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getMedia <em>Media</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getPage <em>Page</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getFont_face <em>Font face</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getKeyframes <em>Keyframes</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class stylesheetImpl extends MinimalEObjectImpl.Container implements stylesheet

+{

+	/**

+	 * The cached value of the '{@link #getCharset() <em>Charset</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getCharset()

+	 * @generated

+	 * @ordered

+	 */

+	protected charset charset;

+

+	/**

+	 * The cached value of the '{@link #getImports() <em>Imports</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getImports()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<importExpression> imports;

+

+	/**

+	 * The cached value of the '{@link #getRuleset() <em>Ruleset</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getRuleset()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<ruleset> ruleset;

+

+	/**

+	 * The cached value of the '{@link #getMedia() <em>Media</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getMedia()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<media> media;

+

+	/**

+	 * The cached value of the '{@link #getPage() <em>Page</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getPage()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<page> page;

+

+	/**

+	 * The cached value of the '{@link #getFont_face() <em>Font face</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getFont_face()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<font_face> font_face;

+

+	/**

+	 * The cached value of the '{@link #getKeyframes() <em>Keyframes</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @see #getKeyframes()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<keyframes> keyframes;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	protected stylesheetImpl()

+	{

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass()

+	{

+		return CSSPackage.Literals.STYLESHEET;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public charset getCharset()

+	{

+		return charset;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	public NotificationChain basicSetCharset(charset newCharset, NotificationChain msgs)

+	{

+		charset oldCharset = charset;

+		charset = newCharset;

+		if (eNotificationRequired())

+		{

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.STYLESHEET__CHARSET, oldCharset, newCharset);

+			if (msgs == null) {

+				msgs = notification;

+			} else {

+				msgs.add(notification);

+			}

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void setCharset(charset newCharset)

+	{

+		if (newCharset != charset)

+		{

+			NotificationChain msgs = null;

+			if (charset != null) {

+				msgs = ((InternalEObject) charset).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.STYLESHEET__CHARSET, null, msgs);

+			}

+			if (newCharset != null) {

+				msgs = ((InternalEObject) newCharset).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.STYLESHEET__CHARSET, null, msgs);

+			}

+			msgs = basicSetCharset(newCharset, msgs);

+			if (msgs != null) {

+				msgs.dispatch();

+			}

+		}

+		else if (eNotificationRequired()) {

+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.STYLESHEET__CHARSET, newCharset, newCharset));

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<importExpression> getImports()

+	{

+		if (imports == null)

+		{

+			imports = new EObjectContainmentEList<importExpression>(importExpression.class, this, CSSPackage.STYLESHEET__IMPORTS);

+		}

+		return imports;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<ruleset> getRuleset()

+	{

+		if (ruleset == null)

+		{

+			ruleset = new EObjectContainmentEList<ruleset>(ruleset.class, this, CSSPackage.STYLESHEET__RULESET);

+		}

+		return ruleset;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<media> getMedia()

+	{

+		if (media == null)

+		{

+			media = new EObjectContainmentEList<media>(media.class, this, CSSPackage.STYLESHEET__MEDIA);

+		}

+		return media;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<page> getPage()

+	{

+		if (page == null)

+		{

+			page = new EObjectContainmentEList<page>(page.class, this, CSSPackage.STYLESHEET__PAGE);

+		}

+		return page;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<font_face> getFont_face()

+	{

+		if (font_face == null)

+		{

+			font_face = new EObjectContainmentEList<font_face>(font_face.class, this, CSSPackage.STYLESHEET__FONT_FACE);

+		}

+		return font_face;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public EList<keyframes> getKeyframes()

+	{

+		if (keyframes == null)

+		{

+			keyframes = new EObjectContainmentEList<keyframes>(keyframes.class, this, CSSPackage.STYLESHEET__KEYFRAMES);

+		}

+		return keyframes;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.STYLESHEET__CHARSET:

+			return basicSetCharset(null, msgs);

+		case CSSPackage.STYLESHEET__IMPORTS:

+			return ((InternalEList<?>) getImports()).basicRemove(otherEnd, msgs);

+		case CSSPackage.STYLESHEET__RULESET:

+			return ((InternalEList<?>) getRuleset()).basicRemove(otherEnd, msgs);

+		case CSSPackage.STYLESHEET__MEDIA:

+			return ((InternalEList<?>) getMedia()).basicRemove(otherEnd, msgs);

+		case CSSPackage.STYLESHEET__PAGE:

+			return ((InternalEList<?>) getPage()).basicRemove(otherEnd, msgs);

+		case CSSPackage.STYLESHEET__FONT_FACE:

+			return ((InternalEList<?>) getFont_face()).basicRemove(otherEnd, msgs);

+		case CSSPackage.STYLESHEET__KEYFRAMES:

+			return ((InternalEList<?>) getKeyframes()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.STYLESHEET__CHARSET:

+			return getCharset();

+		case CSSPackage.STYLESHEET__IMPORTS:

+			return getImports();

+		case CSSPackage.STYLESHEET__RULESET:

+			return getRuleset();

+		case CSSPackage.STYLESHEET__MEDIA:

+			return getMedia();

+		case CSSPackage.STYLESHEET__PAGE:

+			return getPage();

+		case CSSPackage.STYLESHEET__FONT_FACE:

+			return getFont_face();

+		case CSSPackage.STYLESHEET__KEYFRAMES:

+			return getKeyframes();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.STYLESHEET__CHARSET:

+			setCharset((charset) newValue);

+			return;

+		case CSSPackage.STYLESHEET__IMPORTS:

+			getImports().clear();

+			getImports().addAll((Collection<? extends importExpression>) newValue);

+			return;

+		case CSSPackage.STYLESHEET__RULESET:

+			getRuleset().clear();

+			getRuleset().addAll((Collection<? extends ruleset>) newValue);

+			return;

+		case CSSPackage.STYLESHEET__MEDIA:

+			getMedia().clear();

+			getMedia().addAll((Collection<? extends media>) newValue);

+			return;

+		case CSSPackage.STYLESHEET__PAGE:

+			getPage().clear();

+			getPage().addAll((Collection<? extends page>) newValue);

+			return;

+		case CSSPackage.STYLESHEET__FONT_FACE:

+			getFont_face().clear();

+			getFont_face().addAll((Collection<? extends font_face>) newValue);

+			return;

+		case CSSPackage.STYLESHEET__KEYFRAMES:

+			getKeyframes().clear();

+			getKeyframes().addAll((Collection<? extends keyframes>) newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.STYLESHEET__CHARSET:

+			setCharset((charset) null);

+			return;

+		case CSSPackage.STYLESHEET__IMPORTS:

+			getImports().clear();

+			return;

+		case CSSPackage.STYLESHEET__RULESET:

+			getRuleset().clear();

+			return;

+		case CSSPackage.STYLESHEET__MEDIA:

+			getMedia().clear();

+			return;

+		case CSSPackage.STYLESHEET__PAGE:

+			getPage().clear();

+			return;

+		case CSSPackage.STYLESHEET__FONT_FACE:

+			getFont_face().clear();

+			return;

+		case CSSPackage.STYLESHEET__KEYFRAMES:

+			getKeyframes().clear();

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID)

+	{

+		switch (featureID)

+		{

+		case CSSPackage.STYLESHEET__CHARSET:

+			return charset != null;

+		case CSSPackage.STYLESHEET__IMPORTS:

+			return imports != null && !imports.isEmpty();

+		case CSSPackage.STYLESHEET__RULESET:

+			return ruleset != null && !ruleset.isEmpty();

+		case CSSPackage.STYLESHEET__MEDIA:

+			return media != null && !media.isEmpty();

+		case CSSPackage.STYLESHEET__PAGE:

+			return page != null && !page.isEmpty();

+		case CSSPackage.STYLESHEET__FONT_FACE:

+			return font_face != null && !font_face.isEmpty();

+		case CSSPackage.STYLESHEET__KEYFRAMES:

+			return keyframes != null && !keyframes.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+} // stylesheetImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/importExpression.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/importExpression.java
new file mode 100644
index 00000000000..79996b56569
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/importExpression.java
@@ -0,0 +1,53 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>import Expression</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression#getValue <em>Value</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getimportExpression()

+ * @model

+ * @generated

+ */

+public interface importExpression extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Value</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Value</em>' attribute.

+	 * @see #setValue(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getimportExpression_Value()

+	 * @model

+	 * @generated

+	 */

+	String getValue();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression#getValue <em>Value</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Value</em>' attribute.

+	 * @see #getValue()

+	 * @generated

+	 */

+	void setValue(String value);

+

+} // importExpression

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframe_selector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframe_selector.java
new file mode 100644
index 00000000000..627b580e034
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframe_selector.java
@@ -0,0 +1,101 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>keyframe selector</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getType <em>Type</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getPercentage <em>Percentage</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getDeclarations <em>Declarations</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframe_selector()

+ * @model

+ * @generated

+ */

+public interface keyframe_selector extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Type</em>' attribute.

+	 * @see #setType(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframe_selector_Type()

+	 * @model

+	 * @generated

+	 */

+	String getType();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getType <em>Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Type</em>' attribute.

+	 * @see #getType()

+	 * @generated

+	 */

+	void setType(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Percentage</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Percentage</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Percentage</em>' attribute.

+	 * @see #setPercentage(double)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframe_selector_Percentage()

+	 * @model

+	 * @generated

+	 */

+	double getPercentage();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getPercentage <em>Percentage</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Percentage</em>' attribute.

+	 * @see #getPercentage()

+	 * @generated

+	 */

+	void setPercentage(double value);

+

+	/**

+	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Declarations</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>Declarations</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframe_selector_Declarations()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<css_declaration> getDeclarations();

+

+} // keyframe_selector

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframes.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframes.java
new file mode 100644
index 00000000000..67ea26c3324
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframes.java
@@ -0,0 +1,19 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>keyframes</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframes()

+ * @model

+ * @generated

+ */

+public interface keyframes extends EObject

+{

+} // keyframes

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/media.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/media.java
new file mode 100644
index 00000000000..894b232ed13
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/media.java
@@ -0,0 +1,72 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>media</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media#getMedialist <em>Medialist</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media#getRulesets <em>Rulesets</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getmedia()

+ * @model

+ * @generated

+ */

+public interface media extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Medialist</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Medialist</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Medialist</em>' attribute.

+	 * @see #setMedialist(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getmedia_Medialist()

+	 * @model

+	 * @generated

+	 */

+	String getMedialist();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media#getMedialist <em>Medialist</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Medialist</em>' attribute.

+	 * @see #getMedialist()

+	 * @generated

+	 */

+	void setMedialist(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Rulesets</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Rulesets</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>Rulesets</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getmedia_Rulesets()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<ruleset> getRulesets();

+

+} // media

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/page.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/page.java
new file mode 100644
index 00000000000..6d8d85e8067
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/page.java
@@ -0,0 +1,72 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>page</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page#getPseudoPage <em>Pseudo Page</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page#getDeclarations <em>Declarations</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getpage()

+ * @model

+ * @generated

+ */

+public interface page extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Pseudo Page</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Pseudo Page</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Pseudo Page</em>' attribute.

+	 * @see #setPseudoPage(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getpage_PseudoPage()

+	 * @model

+	 * @generated

+	 */

+	String getPseudoPage();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page#getPseudoPage <em>Pseudo Page</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Pseudo Page</em>' attribute.

+	 * @see #getPseudoPage()

+	 * @generated

+	 */

+	void setPseudoPage(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Declarations</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>Declarations</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getpage_Declarations()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<css_declaration> getDeclarations();

+

+} // page

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ruleset.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ruleset.java
new file mode 100644
index 00000000000..6a0a9e33a09
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ruleset.java
@@ -0,0 +1,60 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>ruleset</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset#getSelectors <em>Selectors</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset#getDeclarations <em>Declarations</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getruleset()

+ * @model

+ * @generated

+ */

+public interface ruleset extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Selectors</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Selectors</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>Selectors</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getruleset_Selectors()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<selector> getSelectors();

+

+	/**

+	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Declarations</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>Declarations</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getruleset_Declarations()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<css_declaration> getDeclarations();

+

+} // ruleset

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/selector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/selector.java
new file mode 100644
index 00000000000..8709431b49e
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/selector.java
@@ -0,0 +1,101 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>selector</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getSimpleselectors <em>Simpleselectors</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getCombinator <em>Combinator</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getSelector <em>Selector</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getselector()

+ * @model

+ * @generated

+ */

+public interface selector extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Simpleselectors</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Simpleselectors</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>Simpleselectors</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getselector_Simpleselectors()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<simple_selector> getSimpleselectors();

+

+	/**

+	 * Returns the value of the '<em><b>Combinator</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Combinator</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Combinator</em>' attribute.

+	 * @see #setCombinator(String)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getselector_Combinator()

+	 * @model

+	 * @generated

+	 */

+	String getCombinator();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getCombinator <em>Combinator</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Combinator</em>' attribute.

+	 * @see #getCombinator()

+	 * @generated

+	 */

+	void setCombinator(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Selector</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Selector</em>' containment reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Selector</em>' containment reference.

+	 * @see #setSelector(selector)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getselector_Selector()

+	 * @model containment="true"

+	 * @generated

+	 */

+	selector getSelector();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getSelector <em>Selector</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Selector</em>' containment reference.

+	 * @see #getSelector()

+	 * @generated

+	 */

+	void setSelector(selector value);

+

+} // selector

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/simple_selector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/simple_selector.java
new file mode 100644
index 00000000000..e0a55df5c94
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/simple_selector.java
@@ -0,0 +1,101 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>simple selector</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getElement <em>Element</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getUniversal <em>Universal</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getSubSelectors <em>Sub Selectors</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getsimple_selector()

+ * @model

+ * @generated

+ */

+public interface simple_selector extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Element</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Element</em>' containment reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Element</em>' containment reference.

+	 * @see #setElement(ElementSelector)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getsimple_selector_Element()

+	 * @model containment="true"

+	 * @generated

+	 */

+	ElementSelector getElement();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getElement <em>Element</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Element</em>' containment reference.

+	 * @see #getElement()

+	 * @generated

+	 */

+	void setElement(ElementSelector value);

+

+	/**

+	 * Returns the value of the '<em><b>Universal</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Universal</em>' containment reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Universal</em>' containment reference.

+	 * @see #setUniversal(UniversalSelector)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getsimple_selector_Universal()

+	 * @model containment="true"

+	 * @generated

+	 */

+	UniversalSelector getUniversal();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getUniversal <em>Universal</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Universal</em>' containment reference.

+	 * @see #getUniversal()

+	 * @generated

+	 */

+	void setUniversal(UniversalSelector value);

+

+	/**

+	 * Returns the value of the '<em><b>Sub Selectors</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Sub Selectors</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>Sub Selectors</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getsimple_selector_SubSelectors()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<CssSelector> getSubSelectors();

+

+} // simple_selector

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/stylesheet.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/stylesheet.java
new file mode 100644
index 00000000000..bfee56af646
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/stylesheet.java
@@ -0,0 +1,157 @@
+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

+

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

+

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

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>stylesheet</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getCharset <em>Charset</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getImports <em>Imports</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getRuleset <em>Ruleset</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getMedia <em>Media</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getPage <em>Page</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getFont_face <em>Font face</em>}</li>

+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getKeyframes <em>Keyframes</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet()

+ * @model

+ * @generated

+ */

+public interface stylesheet extends EObject

+{

+	/**

+	 * Returns the value of the '<em><b>Charset</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Charset</em>' containment reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 *

+	 * @return the value of the '<em>Charset</em>' containment reference.

+	 * @see #setCharset(charset)

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Charset()

+	 * @model containment="true"

+	 * @generated

+	 */

+	charset getCharset();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getCharset <em>Charset</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 *

+	 * @param value

+	 *            the new value of the '<em>Charset</em>' containment reference.

+	 * @see #getCharset()

+	 * @generated

+	 */

+	void setCharset(charset value);

+

+	/**

+	 * Returns the value of the '<em><b>Imports</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Imports</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>Imports</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Imports()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<importExpression> getImports();

+

+	/**

+	 * Returns the value of the '<em><b>Ruleset</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Ruleset</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>Ruleset</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Ruleset()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<ruleset> getRuleset();

+

+	/**

+	 * Returns the value of the '<em><b>Media</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Media</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>Media</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Media()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<media> getMedia();

+

+	/**

+	 * Returns the value of the '<em><b>Page</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Page</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>Page</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Page()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<page> getPage();

+

+	/**

+	 * Returns the value of the '<em><b>Font face</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Font face</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>Font face</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Font_face()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<font_face> getFont_face();

+

+	/**

+	 * Returns the value of the '<em><b>Keyframes</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Keyframes</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>Keyframes</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Keyframes()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<keyframes> getKeyframes();

+

+} // stylesheet

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssAdapterFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/util/CSSAdapterFactory.java
index 81e90b5e9a6..5481694760c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssAdapterFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/util/CSSAdapterFactory.java
@@ -1,54 +1,15 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.util;

+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.util;

 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

+

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.gmfdiag.css.Angle;

-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

-import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.CSSId;

-import org.eclipse.papyrus.infra.gmfdiag.css.Combinator;

-import org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.Content;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ems;

-import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

-import org.eclipse.papyrus.infra.gmfdiag.css.Exs;

-import org.eclipse.papyrus.infra.gmfdiag.css.Frequency;

-import org.eclipse.papyrus.infra.gmfdiag.css.Function;

-import org.eclipse.papyrus.infra.gmfdiag.css.HexColor;

-import org.eclipse.papyrus.infra.gmfdiag.css.Import;

-import org.eclipse.papyrus.infra.gmfdiag.css.Length;

-import org.eclipse.papyrus.infra.gmfdiag.css.Media;

-import org.eclipse.papyrus.infra.gmfdiag.css.Name;

-import org.eclipse.papyrus.infra.gmfdiag.css.Page;

-import org.eclipse.papyrus.infra.gmfdiag.css.Percentage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Pseudo;

-import org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css.Selector;

-import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;

-import org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.StringValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;

-import org.eclipse.papyrus.infra.gmfdiag.css.Term;

-import org.eclipse.papyrus.infra.gmfdiag.css.Time;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

-import org.eclipse.papyrus.infra.gmfdiag.css.Uri;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.*;

 

 /**

  * <!-- begin-user-doc -->

@@ -56,10 +17,10 @@ import org.eclipse.papyrus.infra.gmfdiag.css.Uri;
  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

  *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage

  * @generated

  */

-public class CssAdapterFactory extends AdapterFactoryImpl

+public class CSSAdapterFactory extends AdapterFactoryImpl

 {

 	/**

 	 * The cached model package.

@@ -68,7 +29,7 @@ public class CssAdapterFactory extends AdapterFactoryImpl
 	 *

 	 * @generated

 	 */

-	protected static CssPackage modelPackage;

+	protected static CSSPackage modelPackage;

 

 	/**

 	 * Creates an instance of the adapter factory.

@@ -77,11 +38,11 @@ public class CssAdapterFactory extends AdapterFactoryImpl
 	 *

 	 * @generated

 	 */

-	public CssAdapterFactory()

+	public CSSAdapterFactory()

 	{

 		if (modelPackage == null)

 		{

-			modelPackage = CssPackage.eINSTANCE;

+			modelPackage = CSSPackage.eINSTANCE;

 		}

 	}

 

@@ -115,217 +76,211 @@ public class CssAdapterFactory extends AdapterFactoryImpl
 	 *

 	 * @generated

 	 */

-	protected CssSwitch<Adapter> modelSwitch =

-			new CssSwitch<Adapter>()

+	protected CSSSwitch<Adapter> modelSwitch =

+			new CSSSwitch<Adapter>()

 			{

 				@Override

-				public Adapter caseStylesheet(Stylesheet object)

-				{

-					return createStylesheetAdapter();

-				}

-

-				@Override

-				public Adapter caseContent(Content object)

+				public Adapter casestylesheet(stylesheet object)

 				{

-					return createContentAdapter();

+					return createstylesheetAdapter();

 				}

 

 				@Override

-				public Adapter caseImport(Import object)

+				public Adapter casecharset(charset object)

 				{

-					return createImportAdapter();

+					return createcharsetAdapter();

 				}

 

 				@Override

-				public Adapter caseMedia(Media object)

+				public Adapter caseimportExpression(importExpression object)

 				{

-					return createMediaAdapter();

+					return createimportExpressionAdapter();

 				}

 

 				@Override

-				public Adapter casePage(Page object)

+				public Adapter casepage(page object)

 				{

-					return createPageAdapter();

+					return createpageAdapter();

 				}

 

 				@Override

-				public Adapter casePseudoPage(PseudoPage object)

+				public Adapter casemedia(media object)

 				{

-					return createPseudoPageAdapter();

+					return createmediaAdapter();

 				}

 

 				@Override

-				public Adapter caseRuleset(Ruleset object)

+				public Adapter casefont_face(font_face object)

 				{

-					return createRulesetAdapter();

+					return createfont_faceAdapter();

 				}

 

 				@Override

-				public Adapter caseSelector(Selector object)

+				public Adapter casekeyframes(keyframes object)

 				{

-					return createSelectorAdapter();

+					return createkeyframesAdapter();

 				}

 

 				@Override

-				public Adapter caseCompositeSelector(CompositeSelector object)

+				public Adapter casekeyframe_selector(keyframe_selector object)

 				{

-					return createCompositeSelectorAdapter();

+					return createkeyframe_selectorAdapter();

 				}

 

 				@Override

-				public Adapter caseSimpleSelector(SimpleSelector object)

+				public Adapter caseruleset(ruleset object)

 				{

-					return createSimpleSelectorAdapter();

+					return createrulesetAdapter();

 				}

 

 				@Override

-				public Adapter caseSelectorCondition(SelectorCondition object)

+				public Adapter caseselector(selector object)

 				{

-					return createSelectorConditionAdapter();

+					return createselectorAdapter();

 				}

 

 				@Override

-				public Adapter caseCombinator(Combinator object)

+				public Adapter caseSimpleSelectorForNegation(SimpleSelectorForNegation object)

 				{

-					return createCombinatorAdapter();

+					return createSimpleSelectorForNegationAdapter();

 				}

 

 				@Override

-				public Adapter caseDeclaration(Declaration object)

+				public Adapter caseCssSelector(CssSelector object)

 				{

-					return createDeclarationAdapter();

+					return createCssSelectorAdapter();

 				}

 

 				@Override

-				public Adapter caseExpression(Expression object)

+				public Adapter casesimple_selector(simple_selector object)

 				{

-					return createExpressionAdapter();

+					return createsimple_selectorAdapter();

 				}

 

 				@Override

-				public Adapter caseSubterm(Subterm object)

+				public Adapter caseClassSelector(ClassSelector object)

 				{

-					return createSubtermAdapter();

+					return createClassSelectorAdapter();

 				}

 

 				@Override

-				public Adapter caseTerm(Term object)

+				public Adapter caseElementSelector(ElementSelector object)

 				{

-					return createTermAdapter();

+					return createElementSelectorAdapter();

 				}

 

 				@Override

-				public Adapter caseFunction(Function object)

+				public Adapter caseUniversalSelector(UniversalSelector object)

 				{

-					return createFunctionAdapter();

+					return createUniversalSelectorAdapter();

 				}

 

 				@Override

-				public Adapter caseName(Name object)

+				public Adapter caseIdSelector(IdSelector object)

 				{

-					return createNameAdapter();

+					return createIdSelectorAdapter();

 				}

 

 				@Override

-				public Adapter caseNumber(org.eclipse.papyrus.infra.gmfdiag.css.Number object)

+				public Adapter casecss_declaration(css_declaration object)

 				{

-					return createNumberAdapter();

+					return createcss_declarationAdapter();

 				}

 

 				@Override

-				public Adapter casePercentage(Percentage object)

+				public Adapter casecss_property(css_property object)

 				{

-					return createPercentageAdapter();

+					return createcss_propertyAdapter();

 				}

 

 				@Override

-				public Adapter caseLength(Length object)

+				public Adapter casePseudoClassOrFunc(PseudoClassOrFunc object)

 				{

-					return createLengthAdapter();

+					return createPseudoClassOrFuncAdapter();

 				}

 

 				@Override

-				public Adapter caseEms(Ems object)

+				public Adapter casePseudoClass(PseudoClass object)

 				{

-					return createEmsAdapter();

+					return createPseudoClassAdapter();

 				}

 

 				@Override

-				public Adapter caseExs(Exs object)

+				public Adapter casePseudoClassName(PseudoClassName object)

 				{

-					return createExsAdapter();

+					return createPseudoClassNameAdapter();

 				}

 

 				@Override

-				public Adapter caseAngle(Angle object)

+				public Adapter casePseudoClassFunction(PseudoClassFunction object)

 				{

-					return createAngleAdapter();

+					return createPseudoClassFunctionAdapter();

 				}

 

 				@Override

-				public Adapter caseTime(Time object)

+				public Adapter caseCssTok(CssTok object)

 				{

-					return createTimeAdapter();

+					return createCssTokAdapter();

 				}

 

 				@Override

-				public Adapter caseFrequency(Frequency object)

+				public Adapter caseURLType(URLType object)

 				{

-					return createFrequencyAdapter();

+					return createURLTypeAdapter();

 				}

 

 				@Override

-				public Adapter caseUri(Uri object)

+				public Adapter caseAttributeSelector(AttributeSelector object)

 				{

-					return createUriAdapter();

+					return createAttributeSelectorAdapter();

 				}

 

 				@Override

-				public Adapter caseStringValue(StringValue object)

+				public Adapter caseSymbolTok(SymbolTok object)

 				{

-					return createStringValueAdapter();

+					return createSymbolTokAdapter();

 				}

 

 				@Override

-				public Adapter caseHexColor(HexColor object)

+				public Adapter caseWSTok(WSTok object)

 				{

-					return createHexColorAdapter();

+					return createWSTokAdapter();

 				}

 

 				@Override

-				public Adapter caseClass(org.eclipse.papyrus.infra.gmfdiag.css.Class object)

+				public Adapter caseStringTok(StringTok object)

 				{

-					return createClassAdapter();

+					return createStringTokAdapter();

 				}

 

 				@Override

-				public Adapter caseAttribute(Attribute object)

+				public Adapter caseNumberTok(NumberTok object)

 				{

-					return createAttributeAdapter();

+					return createNumberTokAdapter();

 				}

 

 				@Override

-				public Adapter caseAttributeValue(AttributeValue object)

+				public Adapter caseUrlTok(UrlTok object)

 				{

-					return createAttributeValueAdapter();

+					return createUrlTokAdapter();

 				}

 

 				@Override

-				public Adapter casePseudo(Pseudo object)

+				public Adapter caseColorTok(ColorTok object)

 				{

-					return createPseudoAdapter();

+					return createColorTokAdapter();

 				}

 

 				@Override

-				public Adapter caseCSSId(CSSId object)

+				public Adapter caseIdentifierTok(IdentifierTok object)

 				{

-					return createCSSIdAdapter();

+					return createIdentifierTokAdapter();

 				}

 

 				@Override

-				public Adapter caseUnaryOperator(UnaryOperator object)

+				public Adapter caseFuncTok(FuncTok object)

 				{

-					return createUnaryOperatorAdapter();

+					return createFuncTokAdapter();

 				}

 

 				@Override

@@ -353,561 +308,545 @@ public class CssAdapterFactory extends AdapterFactoryImpl
 

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet <em>Stylesheet</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet

-	 * @generated

-	 */

-	public Adapter createStylesheetAdapter()

-	{

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Content <em>Content</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet <em>stylesheet</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Content

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet

 	 * @generated

 	 */

-	public Adapter createContentAdapter()

+	public Adapter createstylesheetAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Import <em>Import</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset <em>charset</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Import

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset

 	 * @generated

 	 */

-	public Adapter createImportAdapter()

+	public Adapter createcharsetAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Media <em>Media</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression <em>import Expression</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Media

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression

 	 * @generated

 	 */

-	public Adapter createMediaAdapter()

+	public Adapter createimportExpressionAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Page <em>Page</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page <em>page</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Page

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page

 	 * @generated

 	 */

-	public Adapter createPageAdapter()

+	public Adapter createpageAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage <em>Pseudo Page</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media <em>media</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media

 	 * @generated

 	 */

-	public Adapter createPseudoPageAdapter()

+	public Adapter createmediaAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Ruleset <em>Ruleset</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face <em>font face</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Ruleset

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face

 	 * @generated

 	 */

-	public Adapter createRulesetAdapter()

+	public Adapter createfont_faceAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Selector <em>Selector</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes <em>keyframes</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Selector

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes

 	 * @generated

 	 */

-	public Adapter createSelectorAdapter()

+	public Adapter createkeyframesAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector <em>Composite Selector</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector <em>keyframe selector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector

 	 * @generated

 	 */

-	public Adapter createCompositeSelectorAdapter()

+	public Adapter createkeyframe_selectorAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector <em>Simple Selector</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset <em>ruleset</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset

 	 * @generated

 	 */

-	public Adapter createSimpleSelectorAdapter()

+	public Adapter createrulesetAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition <em>Selector Condition</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector <em>selector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector

 	 * @generated

 	 */

-	public Adapter createSelectorConditionAdapter()

+	public Adapter createselectorAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Combinator <em>Combinator</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation <em>Simple Selector For Negation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Combinator

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation

 	 * @generated

 	 */

-	public Adapter createCombinatorAdapter()

+	public Adapter createSimpleSelectorForNegationAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Declaration <em>Declaration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector <em>Css Selector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Declaration

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector

 	 * @generated

 	 */

-	public Adapter createDeclarationAdapter()

+	public Adapter createCssSelectorAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Expression <em>Expression</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector <em>simple selector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Expression

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector

 	 * @generated

 	 */

-	public Adapter createExpressionAdapter()

+	public Adapter createsimple_selectorAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Subterm <em>Subterm</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector <em>Class Selector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Subterm

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector

 	 * @generated

 	 */

-	public Adapter createSubtermAdapter()

+	public Adapter createClassSelectorAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Term <em>Term</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector <em>Element Selector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Term

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector

 	 * @generated

 	 */

-	public Adapter createTermAdapter()

+	public Adapter createElementSelectorAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Function <em>Function</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector <em>Universal Selector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Function

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector

 	 * @generated

 	 */

-	public Adapter createFunctionAdapter()

+	public Adapter createUniversalSelectorAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Name <em>Name</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector <em>Id Selector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Name

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector

 	 * @generated

 	 */

-	public Adapter createNameAdapter()

+	public Adapter createIdSelectorAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Number <em>Number</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration <em>css declaration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Number

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration

 	 * @generated

 	 */

-	public Adapter createNumberAdapter()

+	public Adapter createcss_declarationAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Percentage <em>Percentage</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property <em>css property</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Percentage

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property

 	 * @generated

 	 */

-	public Adapter createPercentageAdapter()

+	public Adapter createcss_propertyAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Length <em>Length</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassOrFunc <em>Pseudo Class Or Func</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Length

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassOrFunc

 	 * @generated

 	 */

-	public Adapter createLengthAdapter()

+	public Adapter createPseudoClassOrFuncAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Ems <em>Ems</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClass <em>Pseudo Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Ems

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClass

 	 * @generated

 	 */

-	public Adapter createEmsAdapter()

+	public Adapter createPseudoClassAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Exs <em>Exs</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName <em>Pseudo Class Name</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Exs

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName

 	 * @generated

 	 */

-	public Adapter createExsAdapter()

+	public Adapter createPseudoClassNameAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Angle <em>Angle</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction <em>Pseudo Class Function</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Angle

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction

 	 * @generated

 	 */

-	public Adapter createAngleAdapter()

+	public Adapter createPseudoClassFunctionAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Time <em>Time</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok <em>Css Tok</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Time

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok

 	 * @generated

 	 */

-	public Adapter createTimeAdapter()

+	public Adapter createCssTokAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Frequency <em>Frequency</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType <em>URL Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Frequency

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType

 	 * @generated

 	 */

-	public Adapter createFrequencyAdapter()

+	public Adapter createURLTypeAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Uri <em>Uri</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector <em>Attribute Selector</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Uri

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector

 	 * @generated

 	 */

-	public Adapter createUriAdapter()

+	public Adapter createAttributeSelectorAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.StringValue <em>String Value</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok <em>Symbol Tok</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.StringValue

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok

 	 * @generated

 	 */

-	public Adapter createStringValueAdapter()

+	public Adapter createSymbolTokAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.HexColor <em>Hex Color</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.WSTok <em>WS Tok</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.HexColor

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.WSTok

 	 * @generated

 	 */

-	public Adapter createHexColorAdapter()

+	public Adapter createWSTokAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Class <em>Class</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok <em>String Tok</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Class

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok

 	 * @generated

 	 */

-	public Adapter createClassAdapter()

+	public Adapter createStringTokAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Attribute <em>Attribute</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok <em>Number Tok</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Attribute

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok

 	 * @generated

 	 */

-	public Adapter createAttributeAdapter()

+	public Adapter createNumberTokAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue <em>Attribute Value</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok <em>Url Tok</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok

 	 * @generated

 	 */

-	public Adapter createAttributeValueAdapter()

+	public Adapter createUrlTokAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.Pseudo <em>Pseudo</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok <em>Color Tok</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.Pseudo

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok

 	 * @generated

 	 */

-	public Adapter createPseudoAdapter()

+	public Adapter createColorTokAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.CSSId <em>CSS Id</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok <em>Identifier Tok</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CSSId

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok

 	 * @generated

 	 */

-	public Adapter createCSSIdAdapter()

+	public Adapter createIdentifierTokAdapter()

 	{

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator <em>Unary Operator</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok <em>Func Tok</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 *

 	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator

+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok

 	 * @generated

 	 */

-	public Adapter createUnaryOperatorAdapter()

+	public Adapter createFuncTokAdapter()

 	{

 		return null;

 	}

@@ -926,4 +865,4 @@ public class CssAdapterFactory extends AdapterFactoryImpl
 		return null;

 	}

 

-} // CssAdapterFactory

+} // CSSAdapterFactory

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssSwitch.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/util/CSSSwitch.java
index 9fe5bfd80f5..e9fccae10ca 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssSwitch.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/util/CSSSwitch.java
@@ -1,53 +1,13 @@
-/*****************************************************************************

- * Copyright (c) 2012-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.css.util;

+/**

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.util;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

+

 import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.gmfdiag.css.Angle;

-import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

-import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.CSSId;

-import org.eclipse.papyrus.infra.gmfdiag.css.Combinator;

-import org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.Content;

-import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ems;

-import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

-import org.eclipse.papyrus.infra.gmfdiag.css.Exs;

-import org.eclipse.papyrus.infra.gmfdiag.css.Frequency;

-import org.eclipse.papyrus.infra.gmfdiag.css.Function;

-import org.eclipse.papyrus.infra.gmfdiag.css.HexColor;

-import org.eclipse.papyrus.infra.gmfdiag.css.Import;

-import org.eclipse.papyrus.infra.gmfdiag.css.Length;

-import org.eclipse.papyrus.infra.gmfdiag.css.Media;

-import org.eclipse.papyrus.infra.gmfdiag.css.Name;

-import org.eclipse.papyrus.infra.gmfdiag.css.Page;

-import org.eclipse.papyrus.infra.gmfdiag.css.Percentage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Pseudo;

-import org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage;

-import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css.Selector;

-import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;

-import org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.StringValue;

-import org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;

-import org.eclipse.papyrus.infra.gmfdiag.css.Term;

-import org.eclipse.papyrus.infra.gmfdiag.css.Time;

-import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

-import org.eclipse.papyrus.infra.gmfdiag.css.Uri;

+

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.*;

 

 /**

  * <!-- begin-user-doc -->

@@ -59,10 +19,10 @@ import org.eclipse.papyrus.infra.gmfdiag.css.Uri;
  * which is the result of the switch.

  * <!-- end-user-doc -->

  *

- * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage

+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage

  * @generated

  */

-public class CssSwitch<T> extends Switch<T>

+public class CSSSwitch<T> extends Switch<T>

 {

 	/**

 	 * The cached model package

@@ -71,7 +31,7 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @generated

 	 */

-	protected static CssPackage modelPackage;

+	protected static CSSPackage modelPackage;

 

 	/**

 	 * Creates an instance of the switch.

@@ -80,11 +40,11 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @generated

 	 */

-	public CssSwitch()

+	public CSSSwitch()

 	{

 		if (modelPackage == null)

 		{

-			modelPackage = CssPackage.eINSTANCE;

+			modelPackage = CSSPackage.eINSTANCE;

 		}

 	}

 

@@ -93,7 +53,8 @@ public class CssSwitch<T> extends Switch<T>
 	 * <!-- 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

 	 */

@@ -116,347 +77,336 @@ public class CssSwitch<T> extends Switch<T>
 	{

 		switch (classifierID)

 		{

-		case CssPackage.STYLESHEET: {

-			Stylesheet stylesheet = (Stylesheet) theEObject;

-			T result = caseStylesheet(stylesheet);

+		case CSSPackage.STYLESHEET: {

+			stylesheet stylesheet = (stylesheet) theEObject;

+			T result = casestylesheet(stylesheet);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.CONTENT: {

-			Content content = (Content) theEObject;

-			T result = caseContent(content);

+		case CSSPackage.CHARSET: {

+			charset charset = (charset) theEObject;

+			T result = casecharset(charset);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.IMPORT: {

-			Import import_ = (Import) theEObject;

-			T result = caseImport(import_);

+		case CSSPackage.IMPORT_EXPRESSION: {

+			importExpression importExpression = (importExpression) theEObject;

+			T result = caseimportExpression(importExpression);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.MEDIA: {

-			Media media = (Media) theEObject;

-			T result = caseMedia(media);

+		case CSSPackage.PAGE: {

+			page page = (page) theEObject;

+			T result = casepage(page);

 			if (result == null) {

-				result = caseContent(media);

+				result = defaultCase(theEObject);

 			}

+			return result;

+		}

+		case CSSPackage.MEDIA: {

+			media media = (media) theEObject;

+			T result = casemedia(media);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.PAGE: {

-			Page page = (Page) theEObject;

-			T result = casePage(page);

+		case CSSPackage.FONT_FACE: {

+			font_face font_face = (font_face) theEObject;

+			T result = casefont_face(font_face);

 			if (result == null) {

-				result = caseContent(page);

+				result = casekeyframes(font_face);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.PSEUDO_PAGE: {

-			PseudoPage pseudoPage = (PseudoPage) theEObject;

-			T result = casePseudoPage(pseudoPage);

+		case CSSPackage.KEYFRAMES: {

+			keyframes keyframes = (keyframes) theEObject;

+			T result = casekeyframes(keyframes);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.RULESET: {

-			Ruleset ruleset = (Ruleset) theEObject;

-			T result = caseRuleset(ruleset);

-			if (result == null) {

-				result = caseContent(ruleset);

-			}

+		case CSSPackage.KEYFRAME_SELECTOR: {

+			keyframe_selector keyframe_selector = (keyframe_selector) theEObject;

+			T result = casekeyframe_selector(keyframe_selector);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.SELECTOR: {

-			Selector selector = (Selector) theEObject;

-			T result = caseSelector(selector);

+		case CSSPackage.RULESET: {

+			ruleset ruleset = (ruleset) theEObject;

+			T result = caseruleset(ruleset);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.COMPOSITE_SELECTOR: {

-			CompositeSelector compositeSelector = (CompositeSelector) theEObject;

-			T result = caseCompositeSelector(compositeSelector);

-			if (result == null) {

-				result = caseSelector(compositeSelector);

-			}

+		case CSSPackage.SELECTOR: {

+			selector selector = (selector) theEObject;

+			T result = caseselector(selector);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.SIMPLE_SELECTOR: {

-			SimpleSelector simpleSelector = (SimpleSelector) theEObject;

-			T result = caseSimpleSelector(simpleSelector);

-			if (result == null) {

-				result = caseSelector(simpleSelector);

-			}

+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION: {

+			SimpleSelectorForNegation simpleSelectorForNegation = (SimpleSelectorForNegation) theEObject;

+			T result = caseSimpleSelectorForNegation(simpleSelectorForNegation);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.SELECTOR_CONDITION: {

-			SelectorCondition selectorCondition = (SelectorCondition) theEObject;

-			T result = caseSelectorCondition(selectorCondition);

+		case CSSPackage.CSS_SELECTOR: {

+			CssSelector cssSelector = (CssSelector) theEObject;

+			T result = caseCssSelector(cssSelector);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.COMBINATOR: {

-			Combinator combinator = (Combinator) theEObject;

-			T result = caseCombinator(combinator);

+		case CSSPackage.SIMPLE_SELECTOR: {

+			simple_selector simple_selector = (simple_selector) theEObject;

+			T result = casesimple_selector(simple_selector);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.DECLARATION: {

-			Declaration declaration = (Declaration) theEObject;

-			T result = caseDeclaration(declaration);

+		case CSSPackage.CLASS_SELECTOR: {

+			ClassSelector classSelector = (ClassSelector) theEObject;

+			T result = caseClassSelector(classSelector);

 			if (result == null) {

-				result = defaultCase(theEObject);

+				result = caseCssSelector(classSelector);

 			}

-			return result;

-		}

-		case CssPackage.EXPRESSION: {

-			Expression expression = (Expression) theEObject;

-			T result = caseExpression(expression);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.SUBTERM: {

-			Subterm subterm = (Subterm) theEObject;

-			T result = caseSubterm(subterm);

+		case CSSPackage.ELEMENT_SELECTOR: {

+			ElementSelector elementSelector = (ElementSelector) theEObject;

+			T result = caseElementSelector(elementSelector);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.TERM: {

-			Term term = (Term) theEObject;

-			T result = caseTerm(term);

+		case CSSPackage.UNIVERSAL_SELECTOR: {

+			UniversalSelector universalSelector = (UniversalSelector) theEObject;

+			T result = caseUniversalSelector(universalSelector);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.FUNCTION: {

-			Function function = (Function) theEObject;

-			T result = caseFunction(function);

+		case CSSPackage.ID_SELECTOR: {

+			IdSelector idSelector = (IdSelector) theEObject;

+			T result = caseIdSelector(idSelector);

 			if (result == null) {

-				result = caseTerm(function);

+				result = caseCssSelector(idSelector);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.NAME: {

-			Name name = (Name) theEObject;

-			T result = caseName(name);

-			if (result == null) {

-				result = caseTerm(name);

-			}

+		case CSSPackage.CSS_DECLARATION: {

+			css_declaration css_declaration = (css_declaration) theEObject;

+			T result = casecss_declaration(css_declaration);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.NUMBER: {

-			org.eclipse.papyrus.infra.gmfdiag.css.Number number = (org.eclipse.papyrus.infra.gmfdiag.css.Number) theEObject;

-			T result = caseNumber(number);

-			if (result == null) {

-				result = caseTerm(number);

-			}

+		case CSSPackage.CSS_PROPERTY: {

+			css_property css_property = (css_property) theEObject;

+			T result = casecss_property(css_property);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.PERCENTAGE: {

-			Percentage percentage = (Percentage) theEObject;

-			T result = casePercentage(percentage);

+		case CSSPackage.PSEUDO_CLASS_OR_FUNC: {

+			PseudoClassOrFunc pseudoClassOrFunc = (PseudoClassOrFunc) theEObject;

+			T result = casePseudoClassOrFunc(pseudoClassOrFunc);

 			if (result == null) {

-				result = caseTerm(percentage);

+				result = caseCssSelector(pseudoClassOrFunc);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.LENGTH: {

-			Length length = (Length) theEObject;

-			T result = caseLength(length);

+		case CSSPackage.PSEUDO_CLASS: {

+			PseudoClass pseudoClass = (PseudoClass) theEObject;

+			T result = casePseudoClass(pseudoClass);

 			if (result == null) {

-				result = caseTerm(length);

+				result = casePseudoClassOrFunc(pseudoClass);

+			}

+			if (result == null) {

+				result = caseCssSelector(pseudoClass);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.EMS: {

-			Ems ems = (Ems) theEObject;

-			T result = caseEms(ems);

+		case CSSPackage.PSEUDO_CLASS_NAME: {

+			PseudoClassName pseudoClassName = (PseudoClassName) theEObject;

+			T result = casePseudoClassName(pseudoClassName);

 			if (result == null) {

-				result = caseTerm(ems);

+				result = casePseudoClass(pseudoClassName);

 			}

 			if (result == null) {

-				result = defaultCase(theEObject);

+				result = casePseudoClassOrFunc(pseudoClassName);

 			}

-			return result;

-		}

-		case CssPackage.EXS: {

-			Exs exs = (Exs) theEObject;

-			T result = caseExs(exs);

 			if (result == null) {

-				result = caseTerm(exs);

+				result = caseCssSelector(pseudoClassName);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.ANGLE: {

-			Angle angle = (Angle) theEObject;

-			T result = caseAngle(angle);

+		case CSSPackage.PSEUDO_CLASS_FUNCTION: {

+			PseudoClassFunction pseudoClassFunction = (PseudoClassFunction) theEObject;

+			T result = casePseudoClassFunction(pseudoClassFunction);

+			if (result == null) {

+				result = casePseudoClassOrFunc(pseudoClassFunction);

+			}

 			if (result == null) {

-				result = caseTerm(angle);

+				result = caseCssSelector(pseudoClassFunction);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.TIME: {

-			Time time = (Time) theEObject;

-			T result = caseTime(time);

-			if (result == null) {

-				result = caseTerm(time);

-			}

+		case CSSPackage.CSS_TOK: {

+			CssTok cssTok = (CssTok) theEObject;

+			T result = caseCssTok(cssTok);

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.FREQUENCY: {

-			Frequency frequency = (Frequency) theEObject;

-			T result = caseFrequency(frequency);

+		case CSSPackage.URL_TYPE: {

+			URLType urlType = (URLType) theEObject;

+			T result = caseURLType(urlType);

 			if (result == null) {

-				result = caseTerm(frequency);

+				result = caseimportExpression(urlType);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.URI: {

-			Uri uri = (Uri) theEObject;

-			T result = caseUri(uri);

+		case CSSPackage.ATTRIBUTE_SELECTOR: {

+			AttributeSelector attributeSelector = (AttributeSelector) theEObject;

+			T result = caseAttributeSelector(attributeSelector);

 			if (result == null) {

-				result = caseTerm(uri);

+				result = caseCssSelector(attributeSelector);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.STRING_VALUE: {

-			StringValue stringValue = (StringValue) theEObject;

-			T result = caseStringValue(stringValue);

+		case CSSPackage.SYMBOL_TOK: {

+			SymbolTok symbolTok = (SymbolTok) theEObject;

+			T result = caseSymbolTok(symbolTok);

 			if (result == null) {

-				result = caseTerm(stringValue);

+				result = caseCssTok(symbolTok);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.HEX_COLOR: {

-			HexColor hexColor = (HexColor) theEObject;

-			T result = caseHexColor(hexColor);

+		case CSSPackage.WS_TOK: {

+			WSTok wsTok = (WSTok) theEObject;

+			T result = caseWSTok(wsTok);

 			if (result == null) {

-				result = caseTerm(hexColor);

+				result = caseCssTok(wsTok);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.CLASS: {

-			org.eclipse.papyrus.infra.gmfdiag.css.Class class_ = (org.eclipse.papyrus.infra.gmfdiag.css.Class) theEObject;

-			T result = caseClass(class_);

+		case CSSPackage.STRING_TOK: {

+			StringTok stringTok = (StringTok) theEObject;

+			T result = caseStringTok(stringTok);

 			if (result == null) {

-				result = caseSelectorCondition(class_);

+				result = caseCssTok(stringTok);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.ATTRIBUTE: {

-			Attribute attribute = (Attribute) theEObject;

-			T result = caseAttribute(attribute);

+		case CSSPackage.NUMBER_TOK: {

+			NumberTok numberTok = (NumberTok) theEObject;

+			T result = caseNumberTok(numberTok);

 			if (result == null) {

-				result = caseSelectorCondition(attribute);

+				result = caseCssTok(numberTok);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.ATTRIBUTE_VALUE: {

-			AttributeValue attributeValue = (AttributeValue) theEObject;

-			T result = caseAttributeValue(attributeValue);

+		case CSSPackage.URL_TOK: {

+			UrlTok urlTok = (UrlTok) theEObject;

+			T result = caseUrlTok(urlTok);

+			if (result == null) {

+				result = caseCssTok(urlTok);

+			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.PSEUDO: {

-			Pseudo pseudo = (Pseudo) theEObject;

-			T result = casePseudo(pseudo);

+		case CSSPackage.COLOR_TOK: {

+			ColorTok colorTok = (ColorTok) theEObject;

+			T result = caseColorTok(colorTok);

 			if (result == null) {

-				result = caseSelectorCondition(pseudo);

+				result = caseCssTok(colorTok);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.CSS_ID: {

-			CSSId cssId = (CSSId) theEObject;

-			T result = caseCSSId(cssId);

+		case CSSPackage.IDENTIFIER_TOK: {

+			IdentifierTok identifierTok = (IdentifierTok) theEObject;

+			T result = caseIdentifierTok(identifierTok);

 			if (result == null) {

-				result = caseSelectorCondition(cssId);

+				result = caseCssTok(identifierTok);

 			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

 			return result;

 		}

-		case CssPackage.UNARY_OPERATOR: {

-			UnaryOperator unaryOperator = (UnaryOperator) theEObject;

-			T result = caseUnaryOperator(unaryOperator);

+		case CSSPackage.FUNC_TOK: {

+			FuncTok funcTok = (FuncTok) theEObject;

+			T result = caseFuncTok(funcTok);

+			if (result == null) {

+				result = caseCssTok(funcTok);

+			}

 			if (result == null) {

 				result = defaultCase(theEObject);

 			}

@@ -468,25 +418,7 @@ public class CssSwitch<T> extends Switch<T>
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Stylesheet</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Stylesheet</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStylesheet(Stylesheet object)

-	{

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Content</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>stylesheet</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -494,17 +426,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Content</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>stylesheet</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseContent(Content object)

+	public T casestylesheet(stylesheet object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Import</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>charset</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -512,17 +444,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Import</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>charset</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseImport(Import object)

+	public T casecharset(charset object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Media</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>import Expression</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -530,17 +462,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Media</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>import Expression</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseMedia(Media object)

+	public T caseimportExpression(importExpression object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Page</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>page</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -548,17 +480,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Page</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>page</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T casePage(Page object)

+	public T casepage(page object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Pseudo Page</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>media</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -566,17 +498,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Pseudo Page</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>media</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T casePseudoPage(PseudoPage object)

+	public T casemedia(media object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Ruleset</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>font face</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -584,17 +516,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Ruleset</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>font face</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseRuleset(Ruleset object)

+	public T casefont_face(font_face object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Selector</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>keyframes</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -602,17 +534,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Selector</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>keyframes</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseSelector(Selector object)

+	public T casekeyframes(keyframes object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Composite Selector</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>keyframe selector</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -620,17 +552,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Composite Selector</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>keyframe selector</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseCompositeSelector(CompositeSelector object)

+	public T casekeyframe_selector(keyframe_selector object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Simple Selector</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>ruleset</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -638,17 +570,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Simple Selector</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>ruleset</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseSimpleSelector(SimpleSelector object)

+	public T caseruleset(ruleset object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Selector Condition</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>selector</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -656,17 +588,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Selector Condition</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>selector</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseSelectorCondition(SelectorCondition object)

+	public T caseselector(selector object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Combinator</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Simple Selector For Negation</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -674,17 +606,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Combinator</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Simple Selector For Negation</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseCombinator(Combinator object)

+	public T caseSimpleSelectorForNegation(SimpleSelectorForNegation object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Declaration</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Css Selector</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -692,17 +624,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Declaration</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Css Selector</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseDeclaration(Declaration object)

+	public T caseCssSelector(CssSelector object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Expression</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>simple selector</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -710,17 +642,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Expression</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>simple selector</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseExpression(Expression object)

+	public T casesimple_selector(simple_selector object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Subterm</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Class Selector</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -728,17 +660,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Subterm</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Class Selector</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseSubterm(Subterm object)

+	public T caseClassSelector(ClassSelector object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Term</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Element Selector</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -746,17 +678,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Term</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Element Selector</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseTerm(Term object)

+	public T caseElementSelector(ElementSelector object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Function</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Universal Selector</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -764,17 +696,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Function</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Universal Selector</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseFunction(Function object)

+	public T caseUniversalSelector(UniversalSelector object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Name</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Id Selector</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -782,17 +714,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Name</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Id Selector</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseName(Name object)

+	public T caseIdSelector(IdSelector object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Number</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>css declaration</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -800,17 +732,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Number</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>css declaration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseNumber(org.eclipse.papyrus.infra.gmfdiag.css.Number object)

+	public T casecss_declaration(css_declaration object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Percentage</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>css property</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -818,17 +750,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Percentage</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>css property</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T casePercentage(Percentage object)

+	public T casecss_property(css_property object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Length</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Pseudo Class Or Func</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -836,17 +768,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Length</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Pseudo Class Or Func</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseLength(Length object)

+	public T casePseudoClassOrFunc(PseudoClassOrFunc object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Ems</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Pseudo Class</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -854,17 +786,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Ems</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Pseudo Class</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseEms(Ems object)

+	public T casePseudoClass(PseudoClass object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Exs</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Pseudo Class Name</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -872,17 +804,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Exs</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Pseudo Class Name</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseExs(Exs object)

+	public T casePseudoClassName(PseudoClassName object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Angle</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Pseudo Class Function</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -890,17 +822,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Angle</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Pseudo Class Function</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseAngle(Angle object)

+	public T casePseudoClassFunction(PseudoClassFunction object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Time</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Css Tok</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -908,17 +840,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Time</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Css Tok</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseTime(Time object)

+	public T caseCssTok(CssTok object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Frequency</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>URL Type</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -926,17 +858,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Frequency</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>URL Type</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseFrequency(Frequency object)

+	public T caseURLType(URLType object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Uri</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Selector</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -944,17 +876,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Uri</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Attribute Selector</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseUri(Uri object)

+	public T caseAttributeSelector(AttributeSelector object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>String Value</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Symbol Tok</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -962,17 +894,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>String Value</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Symbol Tok</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseStringValue(StringValue object)

+	public T caseSymbolTok(SymbolTok object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Hex Color</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>WS Tok</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -980,17 +912,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Hex Color</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>WS Tok</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseHexColor(HexColor object)

+	public T caseWSTok(WSTok object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Class</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>String Tok</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -998,17 +930,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Class</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>String Tok</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseClass(org.eclipse.papyrus.infra.gmfdiag.css.Class object)

+	public T caseStringTok(StringTok object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Attribute</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Number Tok</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -1016,17 +948,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Attribute</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Number Tok</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseAttribute(Attribute object)

+	public T caseNumberTok(NumberTok object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Attribute Value</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Url Tok</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -1034,17 +966,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Attribute Value</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Url Tok</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseAttributeValue(AttributeValue object)

+	public T caseUrlTok(UrlTok object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Pseudo</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Color Tok</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -1052,17 +984,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Pseudo</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Color Tok</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T casePseudo(Pseudo object)

+	public T caseColorTok(ColorTok object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>CSS Id</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Identifier Tok</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -1070,17 +1002,17 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>CSS Id</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Identifier Tok</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseCSSId(CSSId object)

+	public T caseIdentifierTok(IdentifierTok object)

 	{

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Unary Operator</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Func Tok</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

@@ -1088,11 +1020,11 @@ public class CssSwitch<T> extends Switch<T>
 	 *

 	 * @param object

 	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Unary Operator</em>'.

+	 * @return the result of interpreting the object as an instance of '<em>Func Tok</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

-	public T caseUnaryOperator(UnaryOperator object)

+	public T caseFuncTok(FuncTok object)

 	{

 		return null;

 	}

@@ -1116,4 +1048,4 @@ public class CssSwitch<T> extends Switch<T>
 		return null;

 	}

 

-} // CssSwitch

+} // CSSSwitch

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSAntlrTokenFileProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSAntlrTokenFileProvider.java
new file mode 100644
index 00000000000..50c9e82d8ed
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSAntlrTokenFileProvider.java
@@ -0,0 +1,16 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr;

+

+import java.io.InputStream;

+import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;

+

+public class CSSAntlrTokenFileProvider implements IAntlrTokenFileProvider {

+

+	@Override

+	public InputStream getAntlrTokenFile() {

+		ClassLoader classLoader = getClass().getClassLoader();

+		return classLoader.getResourceAsStream("org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.tokens");

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSParser.java
new file mode 100644
index 00000000000..e975c0bca3f
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSParser.java
@@ -0,0 +1,39 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr;

+

+import com.google.inject.Inject;

+

+import org.eclipse.xtext.parser.antlr.XtextTokenStream;

+import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;

+

+public class CSSParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {

+

+	@Inject

+	private CSSGrammarAccess grammarAccess;

+

+	@Override

+	protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {

+		tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT");

+	}

+

+	@Override

+	protected org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSParser createParser(XtextTokenStream stream) {

+		return new org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSParser(stream, getGrammarAccess());

+	}

+

+	@Override

+	protected String getDefaultRuleName() {

+		return "stylesheet";

+	}

+

+	public CSSGrammarAccess getGrammarAccess() {

+		return this.grammarAccess;

+	}

+

+	public void setGrammarAccess(CSSGrammarAccess grammarAccess) {

+		this.grammarAccess = grammarAccess;

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g
new file mode 100644
index 00000000000..f9a41c48c4b
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g
@@ -0,0 +1,3624 @@
+/*

+ * generated by Xtext

+ */

+grammar InternalCSS;

+

+options {

+	superClass=AbstractInternalAntlrParser;

+	

+}

+

+@lexer::header {

+package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal;

+

+// Hack: Use our own Lexer superclass by means of import. 

+// Currently there is no other way to specify the superclass for the lexer.

+import org.eclipse.xtext.parser.antlr.Lexer;

+}

+

+@parser::header {

+package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal; 

+

+import org.eclipse.xtext.*;

+import org.eclipse.xtext.parser.*;

+import org.eclipse.xtext.parser.impl.*;

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

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

+import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;

+import org.eclipse.xtext.parser.antlr.XtextTokenStream;

+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;

+import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;

+import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;

+

+}

+

+@parser::members {

+

+ 	private CSSGrammarAccess grammarAccess;

+ 	

+    public InternalCSSParser(TokenStream input, CSSGrammarAccess grammarAccess) {

+        this(input);

+        this.grammarAccess = grammarAccess;

+        registerRules(grammarAccess.getGrammar());

+    }

+    

+    @Override

+    protected String getFirstRuleName() {

+    	return "stylesheet";	

+   	}

+   	

+   	@Override

+   	protected CSSGrammarAccess getGrammarAccess() {

+   		return grammarAccess;

+   	}

+}

+

+@rulecatch { 

+    catch (RecognitionException re) { 

+        recover(input,re); 

+        appendSkippedTokens();

+    } 

+}

+

+

+

+

+// Entry rule entryRulestylesheet

+entryRulestylesheet returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getStylesheetRule()); }

+	 iv_rulestylesheet=rulestylesheet 

+	 { $current=$iv_rulestylesheet.current; } 

+	 EOF 

+;

+

+// Rule stylesheet

+rulestylesheet returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+(

+		{ 

+	        newCompositeNode(grammarAccess.getStylesheetAccess().getCharsetCharsetParserRuleCall_0_0()); 

+	    }

+		lv_charset_0_0=rulecharset		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getStylesheetRule());

+	        }

+       		set(

+       			$current, 

+       			"charset",

+        		lv_charset_0_0, 

+        		"charset");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)?(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getStylesheetAccess().getImportsImportExpressionParserRuleCall_1_0()); 

+	    }

+		lv_imports_1_0=ruleimportExpression		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getStylesheetRule());

+	        }

+       		add(

+       			$current, 

+       			"imports",

+        		lv_imports_1_0, 

+        		"importExpression");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)*((

+(

+		{ 

+	        newCompositeNode(grammarAccess.getStylesheetAccess().getRulesetRulesetParserRuleCall_2_0_0()); 

+	    }

+		lv_ruleset_2_0=ruleruleset		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getStylesheetRule());

+	        }

+       		add(

+       			$current, 

+       			"ruleset",

+        		lv_ruleset_2_0, 

+        		"ruleset");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)

+    |(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getStylesheetAccess().getMediaMediaParserRuleCall_2_1_0()); 

+	    }

+		lv_media_3_0=rulemedia		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getStylesheetRule());

+	        }

+       		add(

+       			$current, 

+       			"media",

+        		lv_media_3_0, 

+        		"media");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)

+    |(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getStylesheetAccess().getPagePageParserRuleCall_2_2_0()); 

+	    }

+		lv_page_4_0=rulepage		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getStylesheetRule());

+	        }

+       		add(

+       			$current, 

+       			"page",

+        		lv_page_4_0, 

+        		"page");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)

+    |(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getStylesheetAccess().getFont_faceFont_faceParserRuleCall_2_3_0()); 

+	    }

+		lv_font_face_5_0=rulefont_face		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getStylesheetRule());

+	        }

+       		add(

+       			$current, 

+       			"font_face",

+        		lv_font_face_5_0, 

+        		"font_face");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)

+    |(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getStylesheetAccess().getKeyframesKeyframesParserRuleCall_2_4_0()); 

+	    }

+		lv_keyframes_6_0=rulekeyframes		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getStylesheetRule());

+	        }

+       		add(

+       			$current, 

+       			"keyframes",

+        		lv_keyframes_6_0, 

+        		"keyframes");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+))*)

+;

+

+

+

+

+

+// Entry rule entryRulecharset

+entryRulecharset returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getCharsetRule()); }

+	 iv_rulecharset=rulecharset 

+	 { $current=$iv_rulecharset.current; } 

+	 EOF 

+;

+

+// Rule charset

+rulecharset returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((	otherlv_0='@charset' 

+    {

+    	newLeafNode(otherlv_0, grammarAccess.getCharsetAccess().getCharsetKeyword_0_0());

+    }

+

+    |	otherlv_1='@CHARSET' 

+    {

+    	newLeafNode(otherlv_1, grammarAccess.getCharsetAccess().getCHARSETKeyword_0_1());

+    }

+)(

+(

+		lv_charset_2_0=RULE_CSSSTRING

+		{

+			newLeafNode(lv_charset_2_0, grammarAccess.getCharsetAccess().getCharsetCSSSTRINGTerminalRuleCall_1_0()); 

+		}

+		{

+	        if ($current==null) {

+	            $current = createModelElement(grammarAccess.getCharsetRule());

+	        }

+       		setWithLastConsumed(

+       			$current, 

+       			"charset",

+        		lv_charset_2_0, 

+        		"CSSSTRING");

+	    }

+

+)

+)	otherlv_3=';' 

+    {

+    	newLeafNode(otherlv_3, grammarAccess.getCharsetAccess().getSemicolonKeyword_2());

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRuleimportExpression

+entryRuleimportExpression returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getImportExpressionRule()); }

+	 iv_ruleimportExpression=ruleimportExpression 

+	 { $current=$iv_ruleimportExpression.current; } 

+	 EOF 

+;

+

+// Rule importExpression

+ruleimportExpression returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((	otherlv_0='@import' 

+    {

+    	newLeafNode(otherlv_0, grammarAccess.getImportExpressionAccess().getImportKeyword_0_0());

+    }

+

+    |	otherlv_1='@IMPORT' 

+    {

+    	newLeafNode(otherlv_1, grammarAccess.getImportExpressionAccess().getIMPORTKeyword_0_1());

+    }

+)((

+(

+		lv_value_2_0=RULE_CSSSTRING

+		{

+			newLeafNode(lv_value_2_0, grammarAccess.getImportExpressionAccess().getValueCSSSTRINGTerminalRuleCall_1_0_0()); 

+		}

+		{

+	        if ($current==null) {

+	            $current = createModelElement(grammarAccess.getImportExpressionRule());

+	        }

+       		setWithLastConsumed(

+       			$current, 

+       			"value",

+        		lv_value_2_0, 

+        		"CSSSTRING");

+	    }

+

+)

+)

+    |(

+    { 

+        newCompositeNode(grammarAccess.getImportExpressionAccess().getURLTypeParserRuleCall_1_1_0()); 

+    }

+    this_URLType_3=ruleURLType

+    { 

+        $current = $this_URLType_3.current; 

+        afterParserOrEnumRuleCall();

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getImportExpressionAccess().getMediaListMedia_listParserRuleCall_1_1_1_0()); 

+	    }

+		lv_mediaList_4_0=rulemedia_list		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getImportExpressionRule());

+	        }

+       		set(

+       			$current, 

+       			"mediaList",

+        		lv_mediaList_4_0, 

+        		"media_list");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)?))	otherlv_5=';' 

+    {

+    	newLeafNode(otherlv_5, grammarAccess.getImportExpressionAccess().getSemicolonKeyword_2());

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRulepage

+entryRulepage returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getPageRule()); }

+	 iv_rulepage=rulepage 

+	 { $current=$iv_rulepage.current; } 

+	 EOF 

+;

+

+// Rule page

+rulepage returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getPageAccess().getPageAction_0(),

+            $current);

+    }

+)(	otherlv_1='@page' 

+    {

+    	newLeafNode(otherlv_1, grammarAccess.getPageAccess().getPageKeyword_1_0());

+    }

+

+    |	otherlv_2='@PAGE' 

+    {

+    	newLeafNode(otherlv_2, grammarAccess.getPageAccess().getPAGEKeyword_1_1());

+    }

+)(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getPageAccess().getPseudoPagePseudo_pageParserRuleCall_2_0()); 

+	    }

+		lv_pseudoPage_3_0=rulepseudo_page		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getPageRule());

+	        }

+       		set(

+       			$current, 

+       			"pseudoPage",

+        		lv_pseudoPage_3_0, 

+        		"pseudo_page");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)?	otherlv_4='{' 

+    {

+    	newLeafNode(otherlv_4, grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_3());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_4_0()); 

+	    }

+		lv_declarations_5_0=rulecss_declaration		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getPageRule());

+	        }

+       		add(

+       			$current, 

+       			"declarations",

+        		lv_declarations_5_0, 

+        		"css_declaration");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)?(	otherlv_6=';' 

+    {

+    	newLeafNode(otherlv_6, grammarAccess.getPageAccess().getSemicolonKeyword_5_0());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_5_1_0()); 

+	    }

+		lv_declarations_7_0=rulecss_declaration		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getPageRule());

+	        }

+       		add(

+       			$current, 

+       			"declarations",

+        		lv_declarations_7_0, 

+        		"css_declaration");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)?)*	otherlv_8='}' 

+    {

+    	newLeafNode(otherlv_8, grammarAccess.getPageAccess().getRightCurlyBracketKeyword_6());

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRulepseudo_page

+entryRulepseudo_page returns [String current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getPseudo_pageRule()); } 

+	 iv_rulepseudo_page=rulepseudo_page 

+	 { $current=$iv_rulepseudo_page.current.getText(); }  

+	 EOF 

+;

+

+// Rule pseudo_page

+rulepseudo_page returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+(    this_COLON_0=RULE_COLON    {

+		$current.merge(this_COLON_0);

+    }

+

+    { 

+    newLeafNode(this_COLON_0, grammarAccess.getPseudo_pageAccess().getCOLONTerminalRuleCall_0()); 

+    }

+

+    { 

+        newCompositeNode(grammarAccess.getPseudo_pageAccess().getIdentifierParserRuleCall_1()); 

+    }

+    this_Identifier_1=ruleIdentifier    {

+		$current.merge(this_Identifier_1);

+    }

+

+    { 

+        afterParserOrEnumRuleCall();

+    }

+)

+    ;

+

+

+

+

+

+// Entry rule entryRulemedia

+entryRulemedia returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getMediaRule()); }

+	 iv_rulemedia=rulemedia 

+	 { $current=$iv_rulemedia.current; } 

+	 EOF 

+;

+

+// Rule media

+rulemedia returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((	otherlv_0='@media' 

+    {

+    	newLeafNode(otherlv_0, grammarAccess.getMediaAccess().getMediaKeyword_0_0());

+    }

+

+    |	otherlv_1='@MEDIA' 

+    {

+    	newLeafNode(otherlv_1, grammarAccess.getMediaAccess().getMEDIAKeyword_0_1());

+    }

+)(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getMediaAccess().getMedialistMedia_listParserRuleCall_1_0()); 

+	    }

+		lv_medialist_2_0=rulemedia_list		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getMediaRule());

+	        }

+       		set(

+       			$current, 

+       			"medialist",

+        		lv_medialist_2_0, 

+        		"media_list");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)	otherlv_3='{' 

+    {

+    	newLeafNode(otherlv_3, grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_2());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getMediaAccess().getRulesetsRulesetParserRuleCall_3_0()); 

+	    }

+		lv_rulesets_4_0=ruleruleset		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getMediaRule());

+	        }

+       		add(

+       			$current, 

+       			"rulesets",

+        		lv_rulesets_4_0, 

+        		"ruleset");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)*	otherlv_5='}' 

+    {

+    	newLeafNode(otherlv_5, grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_4());

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRulemedia_list

+entryRulemedia_list returns [String current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getMedia_listRule()); } 

+	 iv_rulemedia_list=rulemedia_list 

+	 { $current=$iv_rulemedia_list.current.getText(); }  

+	 EOF 

+;

+

+// Rule media_list

+rulemedia_list returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+(

+    { 

+        newCompositeNode(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_0()); 

+    }

+    this_medium_0=rulemedium    {

+		$current.merge(this_medium_0);

+    }

+

+    { 

+        afterParserOrEnumRuleCall();

+    }

+(    this_COMMA_1=RULE_COMMA    {

+		$current.merge(this_COMMA_1);

+    }

+

+    { 

+    newLeafNode(this_COMMA_1, grammarAccess.getMedia_listAccess().getCOMMATerminalRuleCall_1_0()); 

+    }

+

+    { 

+        newCompositeNode(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_1_1()); 

+    }

+    this_medium_2=rulemedium    {

+		$current.merge(this_medium_2);

+    }

+

+    { 

+        afterParserOrEnumRuleCall();

+    }

+)*)

+    ;

+

+

+

+

+

+// Entry rule entryRulemedium

+entryRulemedium returns [String current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getMediumRule()); } 

+	 iv_rulemedium=rulemedium 

+	 { $current=$iv_rulemedium.current.getText(); }  

+	 EOF 

+;

+

+// Rule medium

+rulemedium returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+

+    { 

+        newCompositeNode(grammarAccess.getMediumAccess().getIdentifierParserRuleCall()); 

+    }

+    this_Identifier_0=ruleIdentifier    {

+		$current.merge(this_Identifier_0);

+    }

+

+    { 

+        afterParserOrEnumRuleCall();

+    }

+

+    ;

+

+

+

+

+

+// Entry rule entryRulefont_face

+entryRulefont_face returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getFont_faceRule()); }

+	 iv_rulefont_face=rulefont_face 

+	 { $current=$iv_rulefont_face.current; } 

+	 EOF 

+;

+

+// Rule font_face

+rulefont_face returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getFont_faceAccess().getFont_faceAction_0(),

+            $current);

+    }

+)(	otherlv_1='@font-face' 

+    {

+    	newLeafNode(otherlv_1, grammarAccess.getFont_faceAccess().getFontFaceKeyword_1_0());

+    }

+

+    |	otherlv_2='@FONT-FACE' 

+    {

+    	newLeafNode(otherlv_2, grammarAccess.getFont_faceAccess().getFONTFACEKeyword_1_1());

+    }

+)	otherlv_3='{' 

+    {

+    	newLeafNode(otherlv_3, grammarAccess.getFont_faceAccess().getLeftCurlyBracketKeyword_2());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_3_0()); 

+	    }

+		lv_declarations_4_0=rulecss_declaration		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getFont_faceRule());

+	        }

+       		add(

+       			$current, 

+       			"declarations",

+        		lv_declarations_4_0, 

+        		"css_declaration");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)?(	otherlv_5=';' 

+    {

+    	newLeafNode(otherlv_5, grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_4_1_0()); 

+	    }

+		lv_declarations_6_0=rulecss_declaration		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getFont_faceRule());

+	        }

+       		add(

+       			$current, 

+       			"declarations",

+        		lv_declarations_6_0, 

+        		"css_declaration");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)?)*	otherlv_7='}' 

+    {

+    	newLeafNode(otherlv_7, grammarAccess.getFont_faceAccess().getRightCurlyBracketKeyword_5());

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRulekeyframes

+entryRulekeyframes returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getKeyframesRule()); }

+	 iv_rulekeyframes=rulekeyframes 

+	 { $current=$iv_rulekeyframes.current; } 

+	 EOF 

+;

+

+// Rule keyframes

+rulekeyframes returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getKeyframesAccess().getFont_faceAction_0(),

+            $current);

+    }

+)(	otherlv_1='@keyframes' 

+    {

+    	newLeafNode(otherlv_1, grammarAccess.getKeyframesAccess().getKeyframesKeyword_1_0());

+    }

+

+    |	otherlv_2='@KEYFRAMES' 

+    {

+    	newLeafNode(otherlv_2, grammarAccess.getKeyframesAccess().getKEYFRAMESKeyword_1_1());

+    }

+)(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getKeyframesAccess().getNameIdentifierParserRuleCall_2_0()); 

+	    }

+		lv_name_3_0=ruleIdentifier		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getKeyframesRule());

+	        }

+       		set(

+       			$current, 

+       			"name",

+        		lv_name_3_0, 

+        		"Identifier");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)	otherlv_4='{' 

+    {

+    	newLeafNode(otherlv_4, grammarAccess.getKeyframesAccess().getLeftCurlyBracketKeyword_3());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_4_0()); 

+	    }

+		lv_keyframeselectors_5_0=rulekeyframe_selector		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getKeyframesRule());

+	        }

+       		add(

+       			$current, 

+       			"keyframeselectors",

+        		lv_keyframeselectors_5_0, 

+        		"keyframe_selector");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)?(	otherlv_6=';' 

+    {

+    	newLeafNode(otherlv_6, grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_5_1_0()); 

+	    }

+		lv_keyframeselectors_7_0=rulekeyframe_selector		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getKeyframesRule());

+	        }

+       		add(

+       			$current, 

+       			"keyframeselectors",

+        		lv_keyframeselectors_7_0, 

+        		"keyframe_selector");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)?)*	otherlv_8='}' 

+    {

+    	newLeafNode(otherlv_8, grammarAccess.getKeyframesAccess().getRightCurlyBracketKeyword_6());

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRulekeyframe_selector

+entryRulekeyframe_selector returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getKeyframe_selectorRule()); }

+	 iv_rulekeyframe_selector=rulekeyframe_selector 

+	 { $current=$iv_rulekeyframe_selector.current; } 

+	 EOF 

+;

+

+// Rule keyframe_selector

+rulekeyframe_selector returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+(((

+(

+		{ 

+	        newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getTypeIdentifierParserRuleCall_0_0_0()); 

+	    }

+		lv_type_0_0=ruleIdentifier		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());

+	        }

+       		set(

+       			$current, 

+       			"type",

+        		lv_type_0_0, 

+        		"Identifier");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)

+    |((

+(

+		{ 

+	        newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getPercentageNumParserRuleCall_0_1_0_0()); 

+	    }

+		lv_percentage_1_0=ruleNum		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());

+	        }

+       		set(

+       			$current, 

+       			"percentage",

+        		lv_percentage_1_0, 

+        		"Num");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)this_PERCENT_2=RULE_PERCENT

+    { 

+    newLeafNode(this_PERCENT_2, grammarAccess.getKeyframe_selectorAccess().getPERCENTTerminalRuleCall_0_1_1()); 

+    }

+))	otherlv_3='{' 

+    {

+    	newLeafNode(otherlv_3, grammarAccess.getKeyframe_selectorAccess().getLeftCurlyBracketKeyword_1());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_2_0()); 

+	    }

+		lv_declarations_4_0=rulecss_declaration		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());

+	        }

+       		add(

+       			$current, 

+       			"declarations",

+        		lv_declarations_4_0, 

+        		"css_declaration");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)?(	otherlv_5=';' 

+    {

+    	newLeafNode(otherlv_5, grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_3_1_0()); 

+	    }

+		lv_declarations_6_0=rulecss_declaration		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());

+	        }

+       		add(

+       			$current, 

+       			"declarations",

+        		lv_declarations_6_0, 

+        		"css_declaration");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)?)*	otherlv_7='}' 

+    {

+    	newLeafNode(otherlv_7, grammarAccess.getKeyframe_selectorAccess().getRightCurlyBracketKeyword_4());

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRuleruleset

+entryRuleruleset returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getRulesetRule()); }

+	 iv_ruleruleset=ruleruleset 

+	 { $current=$iv_ruleruleset.current; } 

+	 EOF 

+;

+

+// Rule ruleset

+ruleruleset returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+(

+		{ 

+	        newCompositeNode(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0()); 

+	    }

+		lv_selectors_0_0=ruleselector		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getRulesetRule());

+	        }

+       		add(

+       			$current, 

+       			"selectors",

+        		lv_selectors_0_0, 

+        		"selector");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)((this_WS_1=RULE_WS

+    { 

+    newLeafNode(this_WS_1, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_0()); 

+    }

+)*this_COMMA_2=RULE_COMMA

+    { 

+    newLeafNode(this_COMMA_2, grammarAccess.getRulesetAccess().getCOMMATerminalRuleCall_1_1()); 

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0()); 

+	    }

+		lv_selectors_3_0=ruleselector		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getRulesetRule());

+	        }

+       		add(

+       			$current, 

+       			"selectors",

+        		lv_selectors_3_0, 

+        		"selector");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+))*(this_WS_4=RULE_WS

+    { 

+    newLeafNode(this_WS_4, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_2()); 

+    }

+)*	otherlv_5='{' 

+    {

+    	newLeafNode(otherlv_5, grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_3());

+    }

+((

+(

+		{ 

+	        newCompositeNode(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_0_0()); 

+	    }

+		lv_declarations_6_0=rulecss_declaration		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getRulesetRule());

+	        }

+       		add(

+       			$current, 

+       			"declarations",

+        		lv_declarations_6_0, 

+        		"css_declaration");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)(	otherlv_7=';' 

+    {

+    	newLeafNode(otherlv_7, grammarAccess.getRulesetAccess().getSemicolonKeyword_4_1_0());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_1_1_0()); 

+	    }

+		lv_declarations_8_0=rulecss_declaration		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getRulesetRule());

+	        }

+       		add(

+       			$current, 

+       			"declarations",

+        		lv_declarations_8_0, 

+        		"css_declaration");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+))*(	otherlv_9=';' 

+    {

+    	newLeafNode(otherlv_9, grammarAccess.getRulesetAccess().getSemicolonKeyword_4_2());

+    }

+)?)?	otherlv_10='}' 

+    {

+    	newLeafNode(otherlv_10, grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_5());

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRuleselector

+entryRuleselector returns [EObject current=null] 

+	@init { 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+	}

+	:

+	{ newCompositeNode(grammarAccess.getSelectorRule()); }

+	 iv_ruleselector=ruleselector 

+	 { $current=$iv_ruleselector.current; } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule selector

+ruleselector returns [EObject current=null] 

+    @init { enterRule(); 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+    }

+    @after { leaveRule(); }:

+((

+(

+		{ 

+	        newCompositeNode(grammarAccess.getSelectorAccess().getSimpleselectorsSimple_selectorParserRuleCall_0_0()); 

+	    }

+		lv_simpleselectors_0_0=rulesimple_selector		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getSelectorRule());

+	        }

+       		add(

+       			$current, 

+       			"simpleselectors",

+        		lv_simpleselectors_0_0, 

+        		"simple_selector");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)(((

+(

+		{ 

+	        newCompositeNode(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_0_0_0()); 

+	    }

+		lv_combinator_1_0=rulecombinator		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getSelectorRule());

+	        }

+       		set(

+       			$current, 

+       			"combinator",

+        		lv_combinator_1_0, 

+        		"combinator");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)(this_WS_2=RULE_WS

+    { 

+    newLeafNode(this_WS_2, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_0_1()); 

+    }

+)*(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_0_2_0()); 

+	    }

+		lv_selector_3_0=ruleselector		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getSelectorRule());

+	        }

+       		set(

+       			$current, 

+       			"selector",

+        		lv_selector_3_0, 

+        		"selector");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+))

+    |((this_WS_4=RULE_WS

+    { 

+    newLeafNode(this_WS_4, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0()); 

+    }

+)+((

+(

+		{ 

+	        newCompositeNode(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0_0()); 

+	    }

+		lv_combinator_5_0=rulecombinator		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getSelectorRule());

+	        }

+       		set(

+       			$current, 

+       			"combinator",

+        		lv_combinator_5_0, 

+        		"combinator");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)(this_WS_6=RULE_WS

+    { 

+    newLeafNode(this_WS_6, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_1_1()); 

+    }

+)*)?(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_1_2_0()); 

+	    }

+		lv_selector_7_0=ruleselector		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getSelectorRule());

+	        }

+       		set(

+       			$current, 

+       			"selector",

+        		lv_selector_7_0, 

+        		"selector");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)))?)

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+

+

+

+

+// Entry rule entryRuleSimpleSelectorForNegation

+entryRuleSimpleSelectorForNegation returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getSimpleSelectorForNegationRule()); }

+	 iv_ruleSimpleSelectorForNegation=ruleSimpleSelectorForNegation 

+	 { $current=$iv_ruleSimpleSelectorForNegation.current; } 

+	 EOF 

+;

+

+// Rule SimpleSelectorForNegation

+ruleSimpleSelectorForNegation returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((((

+(

+		{ 

+	        newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getElementElementSelectorParserRuleCall_0_0_0_0()); 

+	    }

+		lv_element_0_0=ruleElementSelector		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());

+	        }

+       		set(

+       			$current, 

+       			"element",

+        		lv_element_0_0, 

+        		"ElementSelector");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)

+    |(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0()); 

+	    }

+		lv_universal_1_0=ruleUniversalSelector		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());

+	        }

+       		set(

+       			$current, 

+       			"universal",

+        		lv_universal_1_0, 

+        		"UniversalSelector");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+))(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_0_1_0()); 

+	    }

+		lv_subSelectors_2_0=ruleSubSelectorForNegation		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());

+	        }

+       		add(

+       			$current, 

+       			"subSelectors",

+        		lv_subSelectors_2_0, 

+        		"SubSelectorForNegation");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)*)

+    |((

+(

+ruleSubSelectorForNegation

+)

+)=>

+(

+		{ 

+	        newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_1_0()); 

+	    }

+		lv_subSelectors_3_0=ruleSubSelectorForNegation		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());

+	        }

+       		add(

+       			$current, 

+       			"subSelectors",

+        		lv_subSelectors_3_0, 

+        		"SubSelectorForNegation");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)+)

+;

+

+

+

+

+

+// Entry rule entryRuleSubSelectorForNegation

+entryRuleSubSelectorForNegation returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getSubSelectorForNegationRule()); }

+	 iv_ruleSubSelectorForNegation=ruleSubSelectorForNegation 

+	 { $current=$iv_ruleSubSelectorForNegation.current; } 

+	 EOF 

+;

+

+// Rule SubSelectorForNegation

+ruleSubSelectorForNegation returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+(

+    { 

+        newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getIdSelectorParserRuleCall_0()); 

+    }

+    this_IdSelector_0=ruleIdSelector

+    { 

+        $current = $this_IdSelector_0.current; 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getClassSelectorParserRuleCall_1()); 

+    }

+    this_ClassSelector_1=ruleClassSelector

+    { 

+        $current = $this_ClassSelector_1.current; 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getAttributeSelectorParserRuleCall_2()); 

+    }

+    this_AttributeSelector_2=ruleAttributeSelector

+    { 

+        $current = $this_AttributeSelector_2.current; 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getPseudoClassParserRuleCall_3()); 

+    }

+    this_PseudoClass_3=rulePseudoClass

+    { 

+        $current = $this_PseudoClass_3.current; 

+        afterParserOrEnumRuleCall();

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRulesimple_selector

+entryRulesimple_selector returns [EObject current=null] 

+	@init { 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+	}

+	:

+	{ newCompositeNode(grammarAccess.getSimple_selectorRule()); }

+	 iv_rulesimple_selector=rulesimple_selector 

+	 { $current=$iv_rulesimple_selector.current; } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule simple_selector

+rulesimple_selector returns [EObject current=null] 

+    @init { enterRule(); 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+    }

+    @after { leaveRule(); }:

+((((

+(

+		{ 

+	        newCompositeNode(grammarAccess.getSimple_selectorAccess().getElementElementSelectorParserRuleCall_0_0_0_0()); 

+	    }

+		lv_element_0_0=ruleElementSelector		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getSimple_selectorRule());

+	        }

+       		set(

+       			$current, 

+       			"element",

+        		lv_element_0_0, 

+        		"ElementSelector");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)

+    |(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getSimple_selectorAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0()); 

+	    }

+		lv_universal_1_0=ruleUniversalSelector		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getSimple_selectorRule());

+	        }

+       		set(

+       			$current, 

+       			"universal",

+        		lv_universal_1_0, 

+        		"UniversalSelector");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+))(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_0_1_0()); 

+	    }

+		lv_subSelectors_2_0=ruleSubSelector		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getSimple_selectorRule());

+	        }

+       		add(

+       			$current, 

+       			"subSelectors",

+        		lv_subSelectors_2_0, 

+        		"SubSelector");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)*)

+    |(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_1_0()); 

+	    }

+		lv_subSelectors_3_0=ruleSubSelector		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getSimple_selectorRule());

+	        }

+       		add(

+       			$current, 

+       			"subSelectors",

+        		lv_subSelectors_3_0, 

+        		"SubSelector");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)+)

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+

+

+

+

+// Entry rule entryRuleSubSelector

+entryRuleSubSelector returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getSubSelectorRule()); }

+	 iv_ruleSubSelector=ruleSubSelector 

+	 { $current=$iv_ruleSubSelector.current; } 

+	 EOF 

+;

+

+// Rule SubSelector

+ruleSubSelector returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+(

+    { 

+        newCompositeNode(grammarAccess.getSubSelectorAccess().getIdSelectorParserRuleCall_0()); 

+    }

+    this_IdSelector_0=ruleIdSelector

+    { 

+        $current = $this_IdSelector_0.current; 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getSubSelectorAccess().getClassSelectorParserRuleCall_1()); 

+    }

+    this_ClassSelector_1=ruleClassSelector

+    { 

+        $current = $this_ClassSelector_1.current; 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getSubSelectorAccess().getAttributeSelectorParserRuleCall_2()); 

+    }

+    this_AttributeSelector_2=ruleAttributeSelector

+    { 

+        $current = $this_AttributeSelector_2.current; 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getSubSelectorAccess().getPseudoClassOrFuncParserRuleCall_3()); 

+    }

+    this_PseudoClassOrFunc_3=rulePseudoClassOrFunc

+    { 

+        $current = $this_PseudoClassOrFunc_3.current; 

+        afterParserOrEnumRuleCall();

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRuleAttributeSelector

+entryRuleAttributeSelector returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getAttributeSelectorRule()); }

+	 iv_ruleAttributeSelector=ruleAttributeSelector 

+	 { $current=$iv_ruleAttributeSelector.current; } 

+	 EOF 

+;

+

+// Rule AttributeSelector

+ruleAttributeSelector returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getAttributeSelectorAccess().getAttributeSelectorAction_0(),

+            $current);

+    }

+)	otherlv_1='[' 

+    {

+    	newLeafNode(otherlv_1, grammarAccess.getAttributeSelectorAccess().getLeftSquareBracketKeyword_1());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getAttributeSelectorAccess().getNameIdentifierParserRuleCall_2_0()); 

+	    }

+		lv_name_2_0=ruleIdentifier		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getAttributeSelectorRule());

+	        }

+       		set(

+       			$current, 

+       			"name",

+        		lv_name_2_0, 

+        		"Identifier");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)((

+(

+(

+		lv_op_3_1=	'^=' 

+    {

+        newLeafNode(lv_op_3_1, grammarAccess.getAttributeSelectorAccess().getOpCircumflexAccentEqualsSignKeyword_3_0_0_0());

+    }

+ 

+	    {

+	        if ($current==null) {

+	            $current = createModelElement(grammarAccess.getAttributeSelectorRule());

+	        }

+       		setWithLastConsumed($current, "op", lv_op_3_1, null);

+	    }

+

+    |		lv_op_3_2=	'$=' 

+    {

+        newLeafNode(lv_op_3_2, grammarAccess.getAttributeSelectorAccess().getOpDollarSignEqualsSignKeyword_3_0_0_1());

+    }

+ 

+	    {

+	        if ($current==null) {

+	            $current = createModelElement(grammarAccess.getAttributeSelectorRule());

+	        }

+       		setWithLastConsumed($current, "op", lv_op_3_2, null);

+	    }

+

+    |		lv_op_3_3=	'*=' 

+    {

+        newLeafNode(lv_op_3_3, grammarAccess.getAttributeSelectorAccess().getOpAsteriskEqualsSignKeyword_3_0_0_2());

+    }

+ 

+	    {

+	        if ($current==null) {

+	            $current = createModelElement(grammarAccess.getAttributeSelectorRule());

+	        }

+       		setWithLastConsumed($current, "op", lv_op_3_3, null);

+	    }

+

+    |		lv_op_3_4=	'=' 

+    {

+        newLeafNode(lv_op_3_4, grammarAccess.getAttributeSelectorAccess().getOpEqualsSignKeyword_3_0_0_3());

+    }

+ 

+	    {

+	        if ($current==null) {

+	            $current = createModelElement(grammarAccess.getAttributeSelectorRule());

+	        }

+       		setWithLastConsumed($current, "op", lv_op_3_4, null);

+	    }

+

+    |		lv_op_3_5=RULE_INCLUDES

+		{

+			newLeafNode(lv_op_3_5, grammarAccess.getAttributeSelectorAccess().getOpINCLUDESTerminalRuleCall_3_0_0_4()); 

+		}

+		{

+	        if ($current==null) {

+	            $current = createModelElement(grammarAccess.getAttributeSelectorRule());

+	        }

+       		setWithLastConsumed(

+       			$current, 

+       			"op",

+        		lv_op_3_5, 

+        		"INCLUDES");

+	    }

+

+    |		lv_op_3_6=RULE_DASHMATCH

+		{

+			newLeafNode(lv_op_3_6, grammarAccess.getAttributeSelectorAccess().getOpDASHMATCHTerminalRuleCall_3_0_0_5()); 

+		}

+		{

+	        if ($current==null) {

+	            $current = createModelElement(grammarAccess.getAttributeSelectorRule());

+	        }

+       		setWithLastConsumed(

+       			$current, 

+       			"op",

+        		lv_op_3_6, 

+        		"DASHMATCH");

+	    }

+

+)

+

+)

+)(

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getAttributeSelectorAccess().getValueIdentifierParserRuleCall_3_1_0_0()); 

+	    }

+		lv_value_4_1=ruleIdentifier		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getAttributeSelectorRule());

+	        }

+       		set(

+       			$current, 

+       			"value",

+        		lv_value_4_1, 

+        		"Identifier");

+	        afterParserOrEnumRuleCall();

+	    }

+

+    |		lv_value_4_2=RULE_CSSSTRING

+		{

+			newLeafNode(lv_value_4_2, grammarAccess.getAttributeSelectorAccess().getValueCSSSTRINGTerminalRuleCall_3_1_0_1()); 

+		}

+		{

+	        if ($current==null) {

+	            $current = createModelElement(grammarAccess.getAttributeSelectorRule());

+	        }

+       		setWithLastConsumed(

+       			$current, 

+       			"value",

+        		lv_value_4_2, 

+        		"CSSSTRING");

+	    }

+

+)

+

+)

+))?	otherlv_5=']' 

+    {

+    	newLeafNode(otherlv_5, grammarAccess.getAttributeSelectorAccess().getRightSquareBracketKeyword_4());

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRuleClassSelector

+entryRuleClassSelector returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getClassSelectorRule()); }

+	 iv_ruleClassSelector=ruleClassSelector 

+	 { $current=$iv_ruleClassSelector.current; } 

+	 EOF 

+;

+

+// Rule ClassSelector

+ruleClassSelector returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getClassSelectorAccess().getClassSelectorAction_0(),

+            $current);

+    }

+)	otherlv_1='.' 

+    {

+    	newLeafNode(otherlv_1, grammarAccess.getClassSelectorAccess().getFullStopKeyword_1());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getClassSelectorAccess().getNameIdentifierParserRuleCall_2_0()); 

+	    }

+		lv_name_2_0=ruleIdentifier		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getClassSelectorRule());

+	        }

+       		set(

+       			$current, 

+       			"name",

+        		lv_name_2_0, 

+        		"Identifier");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+))

+;

+

+

+

+

+

+// Entry rule entryRuleElementSelector

+entryRuleElementSelector returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getElementSelectorRule()); }

+	 iv_ruleElementSelector=ruleElementSelector 

+	 { $current=$iv_ruleElementSelector.current; } 

+	 EOF 

+;

+

+// Rule ElementSelector

+ruleElementSelector returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getElementSelectorAccess().getElementSelectorAction_0(),

+            $current);

+    }

+)(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getElementSelectorAccess().getNameIdentifierParserRuleCall_1_0()); 

+	    }

+		lv_name_1_0=ruleIdentifier		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getElementSelectorRule());

+	        }

+       		set(

+       			$current, 

+       			"name",

+        		lv_name_1_0, 

+        		"Identifier");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+))

+;

+

+

+

+

+

+// Entry rule entryRuleUniversalSelector

+entryRuleUniversalSelector returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getUniversalSelectorRule()); }

+	 iv_ruleUniversalSelector=ruleUniversalSelector 

+	 { $current=$iv_ruleUniversalSelector.current; } 

+	 EOF 

+;

+

+// Rule UniversalSelector

+ruleUniversalSelector returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getUniversalSelectorAccess().getUniversalSelectorAction_0(),

+            $current);

+    }

+)(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getUniversalSelectorAccess().getNamespaceCss_namespace_prefixParserRuleCall_1_0()); 

+	    }

+		lv_namespace_1_0=rulecss_namespace_prefix		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getUniversalSelectorRule());

+	        }

+       		set(

+       			$current, 

+       			"namespace",

+        		lv_namespace_1_0, 

+        		"css_namespace_prefix");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)?	otherlv_2='*' 

+    {

+    	newLeafNode(otherlv_2, grammarAccess.getUniversalSelectorAccess().getAsteriskKeyword_2());

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRuleIdSelector

+entryRuleIdSelector returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getIdSelectorRule()); }

+	 iv_ruleIdSelector=ruleIdSelector 

+	 { $current=$iv_ruleIdSelector.current; } 

+	 EOF 

+;

+

+// Rule IdSelector

+ruleIdSelector returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getIdSelectorAccess().getIdSelectorAction_0(),

+            $current);

+    }

+)this_HASHMARK_1=RULE_HASHMARK

+    { 

+    newLeafNode(this_HASHMARK_1, grammarAccess.getIdSelectorAccess().getHASHMARKTerminalRuleCall_1()); 

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getIdSelectorAccess().getNameIdentifierParserRuleCall_2_0()); 

+	    }

+		lv_name_2_0=ruleIdentifier		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getIdSelectorRule());

+	        }

+       		set(

+       			$current, 

+       			"name",

+        		lv_name_2_0, 

+        		"Identifier");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+))

+;

+

+

+

+

+

+// Entry rule entryRulecss_namespace_prefix

+entryRulecss_namespace_prefix returns [String current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getCss_namespace_prefixRule()); } 

+	 iv_rulecss_namespace_prefix=rulecss_namespace_prefix 

+	 { $current=$iv_rulecss_namespace_prefix.current.getText(); }  

+	 EOF 

+;

+

+// Rule css_namespace_prefix

+rulecss_namespace_prefix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    { 

+        newCompositeNode(grammarAccess.getCss_namespace_prefixAccess().getIdentifierParserRuleCall_0_0()); 

+    }

+    this_Identifier_0=ruleIdentifier    {

+		$current.merge(this_Identifier_0);

+    }

+

+    { 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+	kw='*' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getCss_namespace_prefixAccess().getAsteriskKeyword_0_1()); 

+    }

+)?

+	kw='|' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getCss_namespace_prefixAccess().getVerticalLineKeyword_1()); 

+    }

+)

+    ;

+

+

+

+

+

+// Entry rule entryRulecss_declaration

+entryRulecss_declaration returns [EObject current=null] 

+	@init { 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+	}

+	:

+	{ newCompositeNode(grammarAccess.getCss_declarationRule()); }

+	 iv_rulecss_declaration=rulecss_declaration 

+	 { $current=$iv_rulecss_declaration.current; } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule css_declaration

+rulecss_declaration returns [EObject current=null] 

+    @init { enterRule(); 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+    }

+    @after { leaveRule(); }:

+((this_WS_0=RULE_WS

+    { 

+    newLeafNode(this_WS_0, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_0()); 

+    }

+)*(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getCss_declarationAccess().getPropertyCss_propertyParserRuleCall_1_0()); 

+	    }

+		lv_property_1_0=rulecss_property		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getCss_declarationRule());

+	        }

+       		set(

+       			$current, 

+       			"property",

+        		lv_property_1_0, 

+        		"css_property");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)(this_WS_2=RULE_WS

+    { 

+    newLeafNode(this_WS_2, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_2()); 

+    }

+)*this_COLON_3=RULE_COLON

+    { 

+    newLeafNode(this_COLON_3, grammarAccess.getCss_declarationAccess().getCOLONTerminalRuleCall_3()); 

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getCss_declarationAccess().getValueTokensCssTokParserRuleCall_4_0()); 

+	    }

+		lv_valueTokens_4_0=ruleCssTok		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getCss_declarationRule());

+	        }

+       		add(

+       			$current, 

+       			"valueTokens",

+        		lv_valueTokens_4_0, 

+        		"CssTok");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)+(

+(

+		lv_important_5_0=RULE_IMPORTANT_SYM

+		{

+			newLeafNode(lv_important_5_0, grammarAccess.getCss_declarationAccess().getImportantIMPORTANT_SYMTerminalRuleCall_5_0()); 

+		}

+		{

+	        if ($current==null) {

+	            $current = createModelElement(grammarAccess.getCss_declarationRule());

+	        }

+       		setWithLastConsumed(

+       			$current, 

+       			"important",

+        		true, 

+        		"IMPORTANT_SYM");

+	    }

+

+)

+)?)

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+

+

+

+

+// Entry rule entryRulecss_property

+entryRulecss_property returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getCss_propertyRule()); }

+	 iv_rulecss_property=rulecss_property 

+	 { $current=$iv_rulecss_property.current; } 

+	 EOF 

+;

+

+// Rule css_property

+rulecss_property returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getCss_propertyAccess().getCss_propertyAction_0(),

+            $current);

+    }

+)(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getCss_propertyAccess().getNameValidPropertyIdentParserRuleCall_1_0()); 

+	    }

+		lv_name_1_0=ruleValidPropertyIdent		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getCss_propertyRule());

+	        }

+       		set(

+       			$current, 

+       			"name",

+        		lv_name_1_0, 

+        		"ValidPropertyIdent");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+))

+;

+

+

+

+

+

+// Entry rule entryRuleValidPropertyIdent

+entryRuleValidPropertyIdent returns [String current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getValidPropertyIdentRule()); } 

+	 iv_ruleValidPropertyIdent=ruleValidPropertyIdent 

+	 { $current=$iv_ruleValidPropertyIdent.current.getText(); }  

+	 EOF 

+;

+

+// Rule ValidPropertyIdent

+ruleValidPropertyIdent returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+

+    { 

+        newCompositeNode(grammarAccess.getValidPropertyIdentAccess().getIdentifierParserRuleCall()); 

+    }

+    this_Identifier_0=ruleIdentifier    {

+		$current.merge(this_Identifier_0);

+    }

+

+    { 

+        afterParserOrEnumRuleCall();

+    }

+

+    ;

+

+

+

+

+

+// Entry rule entryRulePseudoClassOrFunc

+entryRulePseudoClassOrFunc returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getPseudoClassOrFuncRule()); }

+	 iv_rulePseudoClassOrFunc=rulePseudoClassOrFunc 

+	 { $current=$iv_rulePseudoClassOrFunc.current; } 

+	 EOF 

+;

+

+// Rule PseudoClassOrFunc

+rulePseudoClassOrFunc returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+(

+    { 

+        newCompositeNode(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassParserRuleCall_0()); 

+    }

+    this_PseudoClass_0=rulePseudoClass

+    { 

+        $current = $this_PseudoClass_0.current; 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassFunctionParserRuleCall_1()); 

+    }

+    this_PseudoClassFunction_1=rulePseudoClassFunction

+    { 

+        $current = $this_PseudoClassFunction_1.current; 

+        afterParserOrEnumRuleCall();

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRulePseudoClass

+entryRulePseudoClass returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getPseudoClassRule()); }

+	 iv_rulePseudoClass=rulePseudoClass 

+	 { $current=$iv_rulePseudoClass.current; } 

+	 EOF 

+;

+

+// Rule PseudoClass

+rulePseudoClass returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+(this_COLON_0=RULE_COLON

+    { 

+    newLeafNode(this_COLON_0, grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_0()); 

+    }

+(this_COLON_1=RULE_COLON

+    { 

+    newLeafNode(this_COLON_1, grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_1()); 

+    }

+)?

+    { 

+        newCompositeNode(grammarAccess.getPseudoClassAccess().getPseudoClassNameParserRuleCall_2()); 

+    }

+    this_PseudoClassName_2=rulePseudoClassName

+    { 

+        $current = $this_PseudoClassName_2.current; 

+        afterParserOrEnumRuleCall();

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRulePseudoClassName

+entryRulePseudoClassName returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getPseudoClassNameRule()); }

+	 iv_rulePseudoClassName=rulePseudoClassName 

+	 { $current=$iv_rulePseudoClassName.current; } 

+	 EOF 

+;

+

+// Rule PseudoClassName

+rulePseudoClassName returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getPseudoClassNameAccess().getNameIdentifierParserRuleCall_0()); 

+	    }

+		lv_name_0_0=ruleIdentifier		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getPseudoClassNameRule());

+	        }

+       		set(

+       			$current, 

+       			"name",

+        		lv_name_0_0, 

+        		"Identifier");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)

+;

+

+

+

+

+

+// Entry rule entryRulePseudoClassFunction

+entryRulePseudoClassFunction returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getPseudoClassFunctionRule()); }

+	 iv_rulePseudoClassFunction=rulePseudoClassFunction 

+	 { $current=$iv_rulePseudoClassFunction.current; } 

+	 EOF 

+;

+

+// Rule PseudoClassFunction

+rulePseudoClassFunction returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+(((

+(

+		{ 

+	        newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getNotNotFunctionCallParserRuleCall_0_0_0()); 

+	    }

+		lv_not_0_0=ruleNotFunctionCall		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());

+	        }

+       		set(

+       			$current, 

+       			"not",

+        		true, 

+        		"NotFunctionCall");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getParamSelectorSimpleSelectorForNegationParserRuleCall_0_1_0()); 

+	    }

+		lv_paramSelector_1_0=ruleSimpleSelectorForNegation		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());

+	        }

+       		set(

+       			$current, 

+       			"paramSelector",

+        		lv_paramSelector_1_0, 

+        		"SimpleSelectorForNegation");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)	otherlv_2=')' 

+    {

+    	newLeafNode(otherlv_2, grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_0_2());

+    }

+)

+    |(this_COLON_3=RULE_COLON

+    { 

+    newLeafNode(this_COLON_3, grammarAccess.getPseudoClassFunctionAccess().getCOLONTerminalRuleCall_1_0()); 

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getNameIdentifierParserRuleCall_1_1_0()); 

+	    }

+		lv_name_4_0=ruleIdentifier		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());

+	        }

+       		set(

+       			$current, 

+       			"name",

+        		lv_name_4_0, 

+        		"Identifier");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)	otherlv_5='(' 

+    {

+    	newLeafNode(otherlv_5, grammarAccess.getPseudoClassFunctionAccess().getLeftParenthesisKeyword_1_2());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getParamsCssTokParserRuleCall_1_3_0()); 

+	    }

+		lv_params_6_0=ruleCssTok		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());

+	        }

+       		add(

+       			$current, 

+       			"params",

+        		lv_params_6_0, 

+        		"CssTok");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)*	otherlv_7=')' 

+    {

+    	newLeafNode(otherlv_7, grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_1_4());

+    }

+))

+;

+

+

+

+

+

+// Entry rule entryRuleNotFunctionCall

+entryRuleNotFunctionCall returns [String current=null] 

+	@init { 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+	}

+	:

+	{ newCompositeNode(grammarAccess.getNotFunctionCallRule()); } 

+	 iv_ruleNotFunctionCall=ruleNotFunctionCall 

+	 { $current=$iv_ruleNotFunctionCall.current.getText(); }  

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule NotFunctionCall

+ruleNotFunctionCall returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 

+    @init { enterRule(); 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+    }

+    @after { leaveRule(); }:

+(    this_COLON_0=RULE_COLON    {

+		$current.merge(this_COLON_0);

+    }

+

+    { 

+    newLeafNode(this_COLON_0, grammarAccess.getNotFunctionCallAccess().getCOLONTerminalRuleCall_0()); 

+    }

+

+	kw='not(' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getNotFunctionCallAccess().getNotKeyword_1()); 

+    }

+)

+    ;

+finally {

+	myHiddenTokenState.restore();

+}

+

+

+

+

+

+// Entry rule entryRulecombinator

+entryRulecombinator returns [String current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getCombinatorRule()); } 

+	 iv_rulecombinator=rulecombinator 

+	 { $current=$iv_rulecombinator.current.getText(); }  

+	 EOF 

+;

+

+// Rule combinator

+rulecombinator returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+(    this_PLUS_0=RULE_PLUS    {

+		$current.merge(this_PLUS_0);

+    }

+

+    { 

+    newLeafNode(this_PLUS_0, grammarAccess.getCombinatorAccess().getPLUSTerminalRuleCall_0()); 

+    }

+

+    |

+	kw='>' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getCombinatorAccess().getGreaterThanSignKeyword_1()); 

+    }

+

+    |

+	kw='~' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getCombinatorAccess().getTildeKeyword_2()); 

+    }

+)

+    ;

+

+

+

+

+

+

+

+

+

+// Entry rule entryRuleSymbolTok

+entryRuleSymbolTok returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getSymbolTokRule()); }

+	 iv_ruleSymbolTok=ruleSymbolTok 

+	 { $current=$iv_ruleSymbolTok.current; } 

+	 EOF 

+;

+

+// Rule SymbolTok

+ruleSymbolTok returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getSymbolTokAccess().getSymbolTokAction_0(),

+            $current);

+    }

+)(

+(

+(

+		lv_symbol_1_1=RULE_COMMA

+		{

+			newLeafNode(lv_symbol_1_1, grammarAccess.getSymbolTokAccess().getSymbolCOMMATerminalRuleCall_1_0_0()); 

+		}

+		{

+	        if ($current==null) {

+	            $current = createModelElement(grammarAccess.getSymbolTokRule());

+	        }

+       		setWithLastConsumed(

+       			$current, 

+       			"symbol",

+        		lv_symbol_1_1, 

+        		"COMMA");

+	    }

+

+    |		lv_symbol_1_2=RULE_PERCENT

+		{

+			newLeafNode(lv_symbol_1_2, grammarAccess.getSymbolTokAccess().getSymbolPERCENTTerminalRuleCall_1_0_1()); 

+		}

+		{

+	        if ($current==null) {

+	            $current = createModelElement(grammarAccess.getSymbolTokRule());

+	        }

+       		setWithLastConsumed(

+       			$current, 

+       			"symbol",

+        		lv_symbol_1_2, 

+        		"PERCENT");

+	    }

+

+)

+

+)

+))

+;

+

+

+

+

+

+// Entry rule entryRuleWSTok

+entryRuleWSTok returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getWSTokRule()); }

+	 iv_ruleWSTok=ruleWSTok 

+	 { $current=$iv_ruleWSTok.current; } 

+	 EOF 

+;

+

+// Rule WSTok

+ruleWSTok returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getWSTokAccess().getWSTokAction_0(),

+            $current);

+    }

+)this_WS_1=RULE_WS

+    { 

+    newLeafNode(this_WS_1, grammarAccess.getWSTokAccess().getWSTerminalRuleCall_1()); 

+    }

+)

+;

+

+

+

+

+

+// Entry rule entryRuleStringTok

+entryRuleStringTok returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getStringTokRule()); }

+	 iv_ruleStringTok=ruleStringTok 

+	 { $current=$iv_ruleStringTok.current; } 

+	 EOF 

+;

+

+// Rule StringTok

+ruleStringTok returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getStringTokAccess().getStringTokAction_0(),

+            $current);

+    }

+)(

+(

+		lv_value_1_0=RULE_CSSSTRING

+		{

+			newLeafNode(lv_value_1_0, grammarAccess.getStringTokAccess().getValueCSSSTRINGTerminalRuleCall_1_0()); 

+		}

+		{

+	        if ($current==null) {

+	            $current = createModelElement(grammarAccess.getStringTokRule());

+	        }

+       		setWithLastConsumed(

+       			$current, 

+       			"value",

+        		lv_value_1_0, 

+        		"CSSSTRING");

+	    }

+

+)

+))

+;

+

+

+

+

+

+// Entry rule entryRuleNumberTok

+entryRuleNumberTok returns [EObject current=null] 

+	@init { 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+	}

+	:

+	{ newCompositeNode(grammarAccess.getNumberTokRule()); }

+	 iv_ruleNumberTok=ruleNumberTok 

+	 { $current=$iv_ruleNumberTok.current; } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule NumberTok

+ruleNumberTok returns [EObject current=null] 

+    @init { enterRule(); 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getNumberTokAccess().getNumberTokAction_0(),

+            $current);

+    }

+)(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getNumberTokAccess().getValNumParserRuleCall_1_0()); 

+	    }

+		lv_val_1_0=ruleNum		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getNumberTokRule());

+	        }

+       		set(

+       			$current, 

+       			"val",

+        		lv_val_1_0, 

+        		"Num");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+))

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+

+

+

+

+// Entry rule entryRuleUrlTok

+entryRuleUrlTok returns [EObject current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getUrlTokRule()); }

+	 iv_ruleUrlTok=ruleUrlTok 

+	 { $current=$iv_ruleUrlTok.current; } 

+	 EOF 

+;

+

+// Rule UrlTok

+ruleUrlTok returns [EObject current=null] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getUrlTokAccess().getUrlTokAction_0(),

+            $current);

+    }

+)(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getUrlTokAccess().getUrlURLTypeParserRuleCall_1_0()); 

+	    }

+		lv_url_1_0=ruleURLType		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getUrlTokRule());

+	        }

+       		set(

+       			$current, 

+       			"url",

+        		lv_url_1_0, 

+        		"URLType");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+))

+;

+

+

+

+

+

+// Entry rule entryRuleColorTok

+entryRuleColorTok returns [EObject current=null] 

+	@init { 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+	}

+	:

+	{ newCompositeNode(grammarAccess.getColorTokRule()); }

+	 iv_ruleColorTok=ruleColorTok 

+	 { $current=$iv_ruleColorTok.current; } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule ColorTok

+ruleColorTok returns [EObject current=null] 

+    @init { enterRule(); 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getColorTokAccess().getColorTokAction_0(),

+            $current);

+    }

+)(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getColorTokAccess().getValueHexParserRuleCall_1_0()); 

+	    }

+		lv_value_1_0=ruleHex		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getColorTokRule());

+	        }

+       		set(

+       			$current, 

+       			"value",

+        		lv_value_1_0, 

+        		"Hex");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+))

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+

+

+

+

+// Entry rule entryRuleIdentifierOrFuncTok

+entryRuleIdentifierOrFuncTok returns [EObject current=null] 

+	@init { 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+	}

+	:

+	{ newCompositeNode(grammarAccess.getIdentifierOrFuncTokRule()); }

+	 iv_ruleIdentifierOrFuncTok=ruleIdentifierOrFuncTok 

+	 { $current=$iv_ruleIdentifierOrFuncTok.current; } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule IdentifierOrFuncTok

+ruleIdentifierOrFuncTok returns [EObject current=null] 

+    @init { enterRule(); 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+    }

+    @after { leaveRule(); }:

+((

+    {

+        $current = forceCreateModelElement(

+            grammarAccess.getIdentifierOrFuncTokAccess().getIdentifierTokAction_0(),

+            $current);

+    }

+)(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getIdentifierOrFuncTokAccess().getNameIdentifierParserRuleCall_1_0()); 

+	    }

+		lv_name_1_0=ruleIdentifier		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getIdentifierOrFuncTokRule());

+	        }

+       		set(

+       			$current, 

+       			"name",

+        		lv_name_1_0, 

+        		"Identifier");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)((

+    {

+        $current = forceCreateModelElementAndSet(

+            grammarAccess.getIdentifierOrFuncTokAccess().getFuncTokNameAction_2_0(),

+            $current);

+    }

+)	otherlv_3='(' 

+    {

+    	newLeafNode(otherlv_3, grammarAccess.getIdentifierOrFuncTokAccess().getLeftParenthesisKeyword_2_1());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getIdentifierOrFuncTokAccess().getParamsCssTokParserRuleCall_2_2_0()); 

+	    }

+		lv_params_4_0=ruleCssTok		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getIdentifierOrFuncTokRule());

+	        }

+       		add(

+       			$current, 

+       			"params",

+        		lv_params_4_0, 

+        		"CssTok");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)+	otherlv_5=')' 

+    {

+    	newLeafNode(otherlv_5, grammarAccess.getIdentifierOrFuncTokAccess().getRightParenthesisKeyword_2_3());

+    }

+)?)

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+

+

+

+

+// Entry rule entryRuleCssTok

+entryRuleCssTok returns [EObject current=null] 

+	@init { 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+	}

+	:

+	{ newCompositeNode(grammarAccess.getCssTokRule()); }

+	 iv_ruleCssTok=ruleCssTok 

+	 { $current=$iv_ruleCssTok.current; } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule CssTok

+ruleCssTok returns [EObject current=null] 

+    @init { enterRule(); 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_ML_COMMENT");

+    }

+    @after { leaveRule(); }:

+(

+    { 

+        newCompositeNode(grammarAccess.getCssTokAccess().getIdentifierOrFuncTokParserRuleCall_0()); 

+    }

+    this_IdentifierOrFuncTok_0=ruleIdentifierOrFuncTok

+    { 

+        $current = $this_IdentifierOrFuncTok_0.current; 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getCssTokAccess().getSymbolTokParserRuleCall_1()); 

+    }

+    this_SymbolTok_1=ruleSymbolTok

+    { 

+        $current = $this_SymbolTok_1.current; 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getCssTokAccess().getWSTokParserRuleCall_2()); 

+    }

+    this_WSTok_2=ruleWSTok

+    { 

+        $current = $this_WSTok_2.current; 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getCssTokAccess().getStringTokParserRuleCall_3()); 

+    }

+    this_StringTok_3=ruleStringTok

+    { 

+        $current = $this_StringTok_3.current; 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getCssTokAccess().getNumberTokParserRuleCall_4()); 

+    }

+    this_NumberTok_4=ruleNumberTok

+    { 

+        $current = $this_NumberTok_4.current; 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getCssTokAccess().getUrlTokParserRuleCall_5()); 

+    }

+    this_UrlTok_5=ruleUrlTok

+    { 

+        $current = $this_UrlTok_5.current; 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getCssTokAccess().getColorTokParserRuleCall_6()); 

+    }

+    this_ColorTok_6=ruleColorTok

+    { 

+        $current = $this_ColorTok_6.current; 

+        afterParserOrEnumRuleCall();

+    }

+)

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+

+

+

+

+// Entry rule entryRuleURLType

+entryRuleURLType returns [EObject current=null] 

+	@init { 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+	}

+	:

+	{ newCompositeNode(grammarAccess.getURLTypeRule()); }

+	 iv_ruleURLType=ruleURLType 

+	 { $current=$iv_ruleURLType.current; } 

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule URLType

+ruleURLType returns [EObject current=null] 

+    @init { enterRule(); 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+    }

+    @after { leaveRule(); }:

+(	otherlv_0='url(' 

+    {

+    	newLeafNode(otherlv_0, grammarAccess.getURLTypeAccess().getUrlKeyword_0());

+    }

+(

+(

+		{ 

+	        newCompositeNode(grammarAccess.getURLTypeAccess().getUrlValidURLParserRuleCall_1_0()); 

+	    }

+		lv_url_1_0=ruleValidURL		{

+	        if ($current==null) {

+	            $current = createModelElementForParent(grammarAccess.getURLTypeRule());

+	        }

+       		set(

+       			$current, 

+       			"url",

+        		lv_url_1_0, 

+        		"ValidURL");

+	        afterParserOrEnumRuleCall();

+	    }

+

+)

+)	otherlv_2=')' 

+    {

+    	newLeafNode(otherlv_2, grammarAccess.getURLTypeAccess().getRightParenthesisKeyword_2());

+    }

+)

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+

+

+

+

+// Entry rule entryRuleValidURLSymbol

+entryRuleValidURLSymbol returns [String current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getValidURLSymbolRule()); } 

+	 iv_ruleValidURLSymbol=ruleValidURLSymbol 

+	 { $current=$iv_ruleValidURLSymbol.current.getText(); }  

+	 EOF 

+;

+

+// Rule ValidURLSymbol

+ruleValidURLSymbol returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+(    this_DASH_0=RULE_DASH    {

+		$current.merge(this_DASH_0);

+    }

+

+    { 

+    newLeafNode(this_DASH_0, grammarAccess.getValidURLSymbolAccess().getDASHTerminalRuleCall_0()); 

+    }

+

+    |

+	kw='.' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getFullStopKeyword_1()); 

+    }

+

+    |    this_UNDERSCORE_2=RULE_UNDERSCORE    {

+		$current.merge(this_UNDERSCORE_2);

+    }

+

+    { 

+    newLeafNode(this_UNDERSCORE_2, grammarAccess.getValidURLSymbolAccess().getUNDERSCORETerminalRuleCall_2()); 

+    }

+

+    |

+	kw='~' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getTildeKeyword_3()); 

+    }

+

+    |    this_COLON_4=RULE_COLON    {

+		$current.merge(this_COLON_4);

+    }

+

+    { 

+    newLeafNode(this_COLON_4, grammarAccess.getValidURLSymbolAccess().getCOLONTerminalRuleCall_4()); 

+    }

+

+    |

+	kw='/' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getSolidusKeyword_5()); 

+    }

+

+    |

+	kw='?' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getQuestionMarkKeyword_6()); 

+    }

+

+    |    this_HASHMARK_7=RULE_HASHMARK    {

+		$current.merge(this_HASHMARK_7);

+    }

+

+    { 

+    newLeafNode(this_HASHMARK_7, grammarAccess.getValidURLSymbolAccess().getHASHMARKTerminalRuleCall_7()); 

+    }

+

+    |

+	kw='[' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getLeftSquareBracketKeyword_8()); 

+    }

+

+    |

+	kw=']' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getRightSquareBracketKeyword_9()); 

+    }

+

+    |

+	kw='@' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getCommercialAtKeyword_10()); 

+    }

+

+    |

+	kw='!' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getExclamationMarkKeyword_11()); 

+    }

+

+    |

+	kw='$' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getDollarSignKeyword_12()); 

+    }

+

+    |

+	kw='&' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getAmpersandKeyword_13()); 

+    }

+

+    |

+	kw='*' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getAsteriskKeyword_14()); 

+    }

+

+    |    this_PLUS_15=RULE_PLUS    {

+		$current.merge(this_PLUS_15);

+    }

+

+    { 

+    newLeafNode(this_PLUS_15, grammarAccess.getValidURLSymbolAccess().getPLUSTerminalRuleCall_15()); 

+    }

+

+    |    this_COMMA_16=RULE_COMMA    {

+		$current.merge(this_COMMA_16);

+    }

+

+    { 

+    newLeafNode(this_COMMA_16, grammarAccess.getValidURLSymbolAccess().getCOMMATerminalRuleCall_16()); 

+    }

+

+    |

+	kw=';' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getSemicolonKeyword_17()); 

+    }

+

+    |(

+	kw='=' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getEqualsSignKeyword_18_0()); 

+    }

+

+    { 

+        newCompositeNode(grammarAccess.getValidURLSymbolAccess().getKeywordHackParserRuleCall_18_1()); 

+    }

+    this_KeywordHack_19=ruleKeywordHack    {

+		$current.merge(this_KeywordHack_19);

+    }

+

+    { 

+        afterParserOrEnumRuleCall();

+    }

+))

+    ;

+

+

+

+

+

+// Entry rule entryRuleKeywordHack

+entryRuleKeywordHack returns [String current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getKeywordHackRule()); } 

+	 iv_ruleKeywordHack=ruleKeywordHack 

+	 { $current=$iv_ruleKeywordHack.current.getText(); }  

+	 EOF 

+;

+

+// Rule KeywordHack

+ruleKeywordHack returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+(

+	kw='not' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getKeywordHackAccess().getNotKeyword_0()); 

+    }

+

+    |

+	kw='no' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getKeywordHackAccess().getNoKeyword_1()); 

+    }

+

+    |

+	kw='url' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getKeywordHackAccess().getUrlKeyword_2()); 

+    }

+

+    |

+	kw='ur' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getKeywordHackAccess().getUrKeyword_3()); 

+    }

+)

+    ;

+

+

+

+

+

+// Entry rule entryRuleValidURL

+entryRuleValidURL returns [String current=null] 

+	@init { 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+	}

+	:

+	{ newCompositeNode(grammarAccess.getValidURLRule()); } 

+	 iv_ruleValidURL=ruleValidURL 

+	 { $current=$iv_ruleValidURL.current.getText(); }  

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule ValidURL

+ruleValidURL returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 

+    @init { enterRule(); 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+    }

+    @after { leaveRule(); }:

+(    this_CSSSTRING_0=RULE_CSSSTRING    {

+		$current.merge(this_CSSSTRING_0);

+    }

+

+    { 

+    newLeafNode(this_CSSSTRING_0, grammarAccess.getValidURLAccess().getCSSSTRINGTerminalRuleCall_0()); 

+    }

+

+    |(

+    { 

+        newCompositeNode(grammarAccess.getValidURLAccess().getValidURLSymbolParserRuleCall_1_0()); 

+    }

+    this_ValidURLSymbol_1=ruleValidURLSymbol    {

+		$current.merge(this_ValidURLSymbol_1);

+    }

+

+    { 

+        afterParserOrEnumRuleCall();

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getValidURLAccess().getKeywordHackParserRuleCall_1_1()); 

+    }

+    this_KeywordHack_2=ruleKeywordHack    {

+		$current.merge(this_KeywordHack_2);

+    }

+

+    { 

+        afterParserOrEnumRuleCall();

+    }

+

+    |    this_ONE_HEX_LETTER_3=RULE_ONE_HEX_LETTER    {

+		$current.merge(this_ONE_HEX_LETTER_3);

+    }

+

+    { 

+    newLeafNode(this_ONE_HEX_LETTER_3, grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_2()); 

+    }

+

+    |    this_ONE_NON_HEX_LETTER_4=RULE_ONE_NON_HEX_LETTER    {

+		$current.merge(this_ONE_NON_HEX_LETTER_4);

+    }

+

+    { 

+    newLeafNode(this_ONE_NON_HEX_LETTER_4, grammarAccess.getValidURLAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_3()); 

+    }

+

+    |    this_ONE_INT_5=RULE_ONE_INT    {

+		$current.merge(this_ONE_INT_5);

+    }

+

+    { 

+    newLeafNode(this_ONE_INT_5, grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_4()); 

+    }

+

+    |

+	kw='\\ ' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusSpaceKeyword_1_5()); 

+    }

+

+    |

+	kw='\\(' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusLeftParenthesisKeyword_1_6()); 

+    }

+

+    |

+	kw='\\)' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusRightParenthesisKeyword_1_7()); 

+    }

+

+    |

+	kw='\\\'' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusApostropheKeyword_1_8()); 

+    }

+

+    |

+	kw='\\"' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusQuotationMarkKeyword_1_9()); 

+    }

+

+    |(    this_PERCENT_11=RULE_PERCENT    {

+		$current.merge(this_PERCENT_11);

+    }

+

+    { 

+    newLeafNode(this_PERCENT_11, grammarAccess.getValidURLAccess().getPERCENTTerminalRuleCall_1_10_0()); 

+    }

+(    this_ONE_INT_12=RULE_ONE_INT    {

+		$current.merge(this_ONE_INT_12);

+    }

+

+    { 

+    newLeafNode(this_ONE_INT_12, grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_1_0()); 

+    }

+

+    |    this_ONE_HEX_LETTER_13=RULE_ONE_HEX_LETTER    {

+		$current.merge(this_ONE_HEX_LETTER_13);

+    }

+

+    { 

+    newLeafNode(this_ONE_HEX_LETTER_13, grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_1_1()); 

+    }

+)(    this_ONE_INT_14=RULE_ONE_INT    {

+		$current.merge(this_ONE_INT_14);

+    }

+

+    { 

+    newLeafNode(this_ONE_INT_14, grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_2_0()); 

+    }

+

+    |    this_ONE_HEX_LETTER_15=RULE_ONE_HEX_LETTER    {

+		$current.merge(this_ONE_HEX_LETTER_15);

+    }

+

+    { 

+    newLeafNode(this_ONE_HEX_LETTER_15, grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_2_1()); 

+    }

+)))+)

+    ;

+finally {

+	myHiddenTokenState.restore();

+}

+

+

+

+

+

+// Entry rule entryRuleIdentifier

+entryRuleIdentifier returns [String current=null] 

+	@init { 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+	}

+	:

+	{ newCompositeNode(grammarAccess.getIdentifierRule()); } 

+	 iv_ruleIdentifier=ruleIdentifier 

+	 { $current=$iv_ruleIdentifier.current.getText(); }  

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule Identifier

+ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 

+    @init { enterRule(); 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+    }

+    @after { leaveRule(); }:

+((    this_DASH_0=RULE_DASH    {

+		$current.merge(this_DASH_0);

+    }

+

+    { 

+    newLeafNode(this_DASH_0, grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_0()); 

+    }

+)?(    this_UNDERSCORE_1=RULE_UNDERSCORE    {

+		$current.merge(this_UNDERSCORE_1);

+    }

+

+    { 

+    newLeafNode(this_UNDERSCORE_1, grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_1_0()); 

+    }

+

+    |    this_ONE_HEX_LETTER_2=RULE_ONE_HEX_LETTER    {

+		$current.merge(this_ONE_HEX_LETTER_2);

+    }

+

+    { 

+    newLeafNode(this_ONE_HEX_LETTER_2, grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_1_1()); 

+    }

+

+    |    this_ONE_NON_HEX_LETTER_3=RULE_ONE_NON_HEX_LETTER    {

+		$current.merge(this_ONE_NON_HEX_LETTER_3);

+    }

+

+    { 

+    newLeafNode(this_ONE_NON_HEX_LETTER_3, grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_2()); 

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_1_3()); 

+    }

+    this_KeywordHack_4=ruleKeywordHack    {

+		$current.merge(this_KeywordHack_4);

+    }

+

+    { 

+        afterParserOrEnumRuleCall();

+    }

+)((( RULE_UNDERSCORE

+    | RULE_DASH

+    | RULE_ONE_HEX_LETTER

+    | RULE_ONE_NON_HEX_LETTER

+    | RULE_ONE_INT

+    | ruleKeywordHack))=>(    this_UNDERSCORE_5=RULE_UNDERSCORE    {

+		$current.merge(this_UNDERSCORE_5);

+    }

+

+    { 

+    newLeafNode(this_UNDERSCORE_5, grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_2_0_0()); 

+    }

+

+    |    this_DASH_6=RULE_DASH    {

+		$current.merge(this_DASH_6);

+    }

+

+    { 

+    newLeafNode(this_DASH_6, grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_2_0_1()); 

+    }

+

+    |    this_ONE_HEX_LETTER_7=RULE_ONE_HEX_LETTER    {

+		$current.merge(this_ONE_HEX_LETTER_7);

+    }

+

+    { 

+    newLeafNode(this_ONE_HEX_LETTER_7, grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_2_0_2()); 

+    }

+

+    |    this_ONE_NON_HEX_LETTER_8=RULE_ONE_NON_HEX_LETTER    {

+		$current.merge(this_ONE_NON_HEX_LETTER_8);

+    }

+

+    { 

+    newLeafNode(this_ONE_NON_HEX_LETTER_8, grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_2_0_3()); 

+    }

+

+    |    this_ONE_INT_9=RULE_ONE_INT    {

+		$current.merge(this_ONE_INT_9);

+    }

+

+    { 

+    newLeafNode(this_ONE_INT_9, grammarAccess.getIdentifierAccess().getONE_INTTerminalRuleCall_2_0_4()); 

+    }

+

+    |

+    { 

+        newCompositeNode(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_2_0_5()); 

+    }

+    this_KeywordHack_10=ruleKeywordHack    {

+		$current.merge(this_KeywordHack_10);

+    }

+

+    { 

+        afterParserOrEnumRuleCall();

+    }

+))*)

+    ;

+finally {

+	myHiddenTokenState.restore();

+}

+

+

+

+

+

+// Entry rule entryRuleNum

+entryRuleNum returns [String current=null] 

+	@init { 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+	}

+	:

+	{ newCompositeNode(grammarAccess.getNumRule()); } 

+	 iv_ruleNum=ruleNum 

+	 { $current=$iv_ruleNum.current.getText(); }  

+	 EOF 

+;

+finally {

+	myHiddenTokenState.restore();

+}

+

+// Rule Num

+ruleNum returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 

+    @init { enterRule(); 

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();

+    }

+    @after { leaveRule(); }:

+((    this_PLUS_0=RULE_PLUS    {

+		$current.merge(this_PLUS_0);

+    }

+

+    { 

+    newLeafNode(this_PLUS_0, grammarAccess.getNumAccess().getPLUSTerminalRuleCall_0_0()); 

+    }

+

+    |    this_DASH_1=RULE_DASH    {

+		$current.merge(this_DASH_1);

+    }

+

+    { 

+    newLeafNode(this_DASH_1, grammarAccess.getNumAccess().getDASHTerminalRuleCall_0_1()); 

+    }

+)?((

+	kw='.' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getNumAccess().getFullStopKeyword_1_0_0()); 

+    }

+(( RULE_ONE_INT)=>    this_ONE_INT_3=RULE_ONE_INT    {

+		$current.merge(this_ONE_INT_3);

+    }

+

+    { 

+    newLeafNode(this_ONE_INT_3, grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_0_1()); 

+    }

+)+)

+    |((( RULE_ONE_INT)=>    this_ONE_INT_4=RULE_ONE_INT    {

+		$current.merge(this_ONE_INT_4);

+    }

+

+    { 

+    newLeafNode(this_ONE_INT_4, grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_0()); 

+    }

+)+(((

+	'.' 

+)=>

+	kw='.' 

+    {

+        $current.merge(kw);

+        newLeafNode(kw, grammarAccess.getNumAccess().getFullStopKeyword_1_1_1_0()); 

+    }

+)(( RULE_ONE_INT)=>    this_ONE_INT_6=RULE_ONE_INT    {

+		$current.merge(this_ONE_INT_6);

+    }

+

+    { 

+    newLeafNode(this_ONE_INT_6, grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_1_1()); 

+    }

+)+)?)))

+    ;

+finally {

+	myHiddenTokenState.restore();

+}

+

+

+

+

+

+// Entry rule entryRuleHex

+entryRuleHex returns [String current=null] 

+	:

+	{ newCompositeNode(grammarAccess.getHexRule()); } 

+	 iv_ruleHex=ruleHex 

+	 { $current=$iv_ruleHex.current.getText(); }  

+	 EOF 

+;

+

+// Rule Hex

+ruleHex returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] 

+    @init { enterRule(); 

+    }

+    @after { leaveRule(); }:

+(    this_HASHMARK_0=RULE_HASHMARK    {

+		$current.merge(this_HASHMARK_0);

+    }

+

+    { 

+    newLeafNode(this_HASHMARK_0, grammarAccess.getHexAccess().getHASHMARKTerminalRuleCall_0()); 

+    }

+((( RULE_ONE_INT

+    | RULE_ONE_HEX_LETTER))=>(    this_ONE_INT_1=RULE_ONE_INT    {

+		$current.merge(this_ONE_INT_1);

+    }

+

+    { 

+    newLeafNode(this_ONE_INT_1, grammarAccess.getHexAccess().getONE_INTTerminalRuleCall_1_0_0()); 

+    }

+

+    |    this_ONE_HEX_LETTER_2=RULE_ONE_HEX_LETTER    {

+		$current.merge(this_ONE_HEX_LETTER_2);

+    }

+

+    { 

+    newLeafNode(this_ONE_HEX_LETTER_2, grammarAccess.getHexAccess().getONE_HEX_LETTERTerminalRuleCall_1_0_1()); 

+    }

+))+)

+    ;

+

+

+

+

+

+RULE_IMPORTANT_SYM : '!important';

+

+RULE_ONE_INT : '0'..'9';

+

+RULE_ONE_HEX_LETTER : ('a'..'f'|'A'..'F');

+

+RULE_ONE_NON_HEX_LETTER : ('g'..'z'|'G'..'Z');

+

+RULE_UNDERSCORE : '_';

+

+RULE_DASH : '-';

+

+RULE_PLUS : '+';

+

+RULE_HASHMARK : '#';

+

+RULE_COMMA : ',';

+

+RULE_PERCENT : '%';

+

+RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';

+

+RULE_WS : (' '|'\t'|'\r'|'\n')+;

+

+RULE_CSSSTRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'0'..'9'|'a'..'f'|'A'..'F'|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'0'..'9'|'a'..'f'|'A'..'F'|'\\')|~(('\\'|'\'')))* '\'');

+

+RULE_INCLUDES : '~=';

+

+RULE_DASHMATCH : '|=';

+

+RULE_COLON : ':';

+

+

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.tokens b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.tokens
new file mode 100644
index 00000000000..6d2d80df948
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.tokens
@@ -0,0 +1,106 @@
+'!'=53

+'$'=54

+'$='=37

+'&'=55

+'('=45

+')'=44

+'*'=42

+'*='=38

+'.'=41

+'/'=50

+';'=22

+'='=39

+'>'=47

+'?'=51

+'@'=52

+'@CHARSET'=21

+'@FONT-FACE'=32

+'@IMPORT'=24

+'@KEYFRAMES'=34

+'@MEDIA'=30

+'@PAGE'=26

+'@charset'=20

+'@font-face'=31

+'@import'=23

+'@keyframes'=33

+'@media'=29

+'@page'=25

+'['=35

+'\\ '=60

+'\\"'=64

+'\\('=61

+'\\)'=62

+'\\\''=63

+']'=40

+'^='=36

+'no'=57

+'not'=56

+'not('=46

+'ur'=59

+'url'=58

+'url('=49

+'{'=27

+'|'=43

+'}'=28

+'~'=48

+RULE_COLON=5

+RULE_COMMA=6

+RULE_CSSSTRING=4

+RULE_DASH=14

+RULE_DASHMATCH=10

+RULE_HASHMARK=11

+RULE_IMPORTANT_SYM=12

+RULE_INCLUDES=9

+RULE_ML_COMMENT=19

+RULE_ONE_HEX_LETTER=16

+RULE_ONE_INT=18

+RULE_ONE_NON_HEX_LETTER=17

+RULE_PERCENT=7

+RULE_PLUS=13

+RULE_UNDERSCORE=15

+RULE_WS=8

+T__20=20

+T__21=21

+T__22=22

+T__23=23

+T__24=24

+T__25=25

+T__26=26

+T__27=27

+T__28=28

+T__29=29

+T__30=30

+T__31=31

+T__32=32

+T__33=33

+T__34=34

+T__35=35

+T__36=36

+T__37=37

+T__38=38

+T__39=39

+T__40=40

+T__41=41

+T__42=42

+T__43=43

+T__44=44

+T__45=45

+T__46=46

+T__47=47

+T__48=48

+T__49=49

+T__50=50

+T__51=51

+T__52=52

+T__53=53

+T__54=54

+T__55=55

+T__56=56

+T__57=57

+T__58=58

+T__59=59

+T__60=60

+T__61=61

+T__62=62

+T__63=63

+T__64=64

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSLexer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSLexer.java
new file mode 100644
index 00000000000..1efe65c1271
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSLexer.java
@@ -0,0 +1,2180 @@
+package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal;

+

+// Hack: Use our own Lexer superclass by means of import.

+// Currently there is no other way to specify the superclass for the lexer.

+import org.eclipse.xtext.parser.antlr.Lexer;

+

+import org.antlr.runtime.*;

+

+@SuppressWarnings("all")

+public class InternalCSSLexer extends Lexer {

+	public static final int T__64 = 64;

+	public static final int T__29 = 29;

+	public static final int T__28 = 28;

+	public static final int T__27 = 27;

+	public static final int T__62 = 62;

+	public static final int T__26 = 26;

+	public static final int T__63 = 63;

+	public static final int T__25 = 25;

+	public static final int T__24 = 24;

+	public static final int T__23 = 23;

+	public static final int RULE_INCLUDES = 9;

+	public static final int T__22 = 22;

+	public static final int T__21 = 21;

+	public static final int T__20 = 20;

+	public static final int RULE_ONE_INT = 18;

+	public static final int RULE_PERCENT = 7;

+	public static final int T__61 = 61;

+	public static final int EOF = -1;

+	public static final int T__60 = 60;

+	public static final int T__55 = 55;

+	public static final int T__56 = 56;

+	public static final int T__57 = 57;

+	public static final int T__58 = 58;

+	public static final int T__51 = 51;

+	public static final int T__52 = 52;

+	public static final int T__53 = 53;

+	public static final int T__54 = 54;

+	public static final int RULE_ONE_NON_HEX_LETTER = 17;

+	public static final int T__59 = 59;

+	public static final int T__50 = 50;

+	public static final int T__42 = 42;

+	public static final int T__43 = 43;

+	public static final int T__40 = 40;

+	public static final int T__41 = 41;

+	public static final int T__46 = 46;

+	public static final int T__47 = 47;

+	public static final int T__44 = 44;

+	public static final int T__45 = 45;

+	public static final int T__48 = 48;

+	public static final int T__49 = 49;

+	public static final int RULE_UNDERSCORE = 15;

+	public static final int RULE_PLUS = 13;

+	public static final int RULE_ONE_HEX_LETTER = 16;

+	public static final int RULE_COMMA = 6;

+	public static final int RULE_HASHMARK = 11;

+	public static final int RULE_ML_COMMENT = 19;

+	public static final int RULE_DASHMATCH = 10;

+	public static final int T__30 = 30;

+	public static final int T__31 = 31;

+	public static final int RULE_COLON = 5;

+	public static final int T__32 = 32;

+	public static final int T__33 = 33;

+	public static final int T__34 = 34;

+	public static final int T__35 = 35;

+	public static final int T__36 = 36;

+	public static final int T__37 = 37;

+	public static final int T__38 = 38;

+	public static final int T__39 = 39;

+	public static final int RULE_CSSSTRING = 4;

+	public static final int RULE_IMPORTANT_SYM = 12;

+	public static final int RULE_WS = 8;

+	public static final int RULE_DASH = 14;

+

+	// delegates

+	// delegators

+

+	public InternalCSSLexer() {

+		;

+	}

+

+	public InternalCSSLexer(CharStream input) {

+		this(input, new RecognizerSharedState());

+	}

+

+	public InternalCSSLexer(CharStream input, RecognizerSharedState state) {

+		super(input, state);

+

+	}

+

+	@Override

+	public String getGrammarFileName() {

+		return "../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g";

+	}

+

+	// $ANTLR start "T__20"

+	public final void mT__20() throws RecognitionException {

+		try {

+			int _type = T__20;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:11:7: ( '@charset' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:11:9: '@charset'

+			{

+				match("@charset");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__20"

+

+	// $ANTLR start "T__21"

+	public final void mT__21() throws RecognitionException {

+		try {

+			int _type = T__21;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:12:7: ( '@CHARSET' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:12:9: '@CHARSET'

+			{

+				match("@CHARSET");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__21"

+

+	// $ANTLR start "T__22"

+	public final void mT__22() throws RecognitionException {

+		try {

+			int _type = T__22;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:13:7: ( ';' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:13:9: ';'

+			{

+				match(';');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__22"

+

+	// $ANTLR start "T__23"

+	public final void mT__23() throws RecognitionException {

+		try {

+			int _type = T__23;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:14:7: ( '@import' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:14:9: '@import'

+			{

+				match("@import");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__23"

+

+	// $ANTLR start "T__24"

+	public final void mT__24() throws RecognitionException {

+		try {

+			int _type = T__24;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:15:7: ( '@IMPORT' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:15:9: '@IMPORT'

+			{

+				match("@IMPORT");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__24"

+

+	// $ANTLR start "T__25"

+	public final void mT__25() throws RecognitionException {

+		try {

+			int _type = T__25;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:16:7: ( '@page' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:16:9: '@page'

+			{

+				match("@page");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__25"

+

+	// $ANTLR start "T__26"

+	public final void mT__26() throws RecognitionException {

+		try {

+			int _type = T__26;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:17:7: ( '@PAGE' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:17:9: '@PAGE'

+			{

+				match("@PAGE");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__26"

+

+	// $ANTLR start "T__27"

+	public final void mT__27() throws RecognitionException {

+		try {

+			int _type = T__27;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:18:7: ( '{' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:18:9: '{'

+			{

+				match('{');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__27"

+

+	// $ANTLR start "T__28"

+	public final void mT__28() throws RecognitionException {

+		try {

+			int _type = T__28;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:19:7: ( '}' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:19:9: '}'

+			{

+				match('}');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__28"

+

+	// $ANTLR start "T__29"

+	public final void mT__29() throws RecognitionException {

+		try {

+			int _type = T__29;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:20:7: ( '@media' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:20:9: '@media'

+			{

+				match("@media");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__29"

+

+	// $ANTLR start "T__30"

+	public final void mT__30() throws RecognitionException {

+		try {

+			int _type = T__30;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:21:7: ( '@MEDIA' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:21:9: '@MEDIA'

+			{

+				match("@MEDIA");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__30"

+

+	// $ANTLR start "T__31"

+	public final void mT__31() throws RecognitionException {

+		try {

+			int _type = T__31;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:22:7: ( '@font-face' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:22:9: '@font-face'

+			{

+				match("@font-face");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__31"

+

+	// $ANTLR start "T__32"

+	public final void mT__32() throws RecognitionException {

+		try {

+			int _type = T__32;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:23:7: ( '@FONT-FACE' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:23:9: '@FONT-FACE'

+			{

+				match("@FONT-FACE");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__32"

+

+	// $ANTLR start "T__33"

+	public final void mT__33() throws RecognitionException {

+		try {

+			int _type = T__33;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:24:7: ( '@keyframes' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:24:9: '@keyframes'

+			{

+				match("@keyframes");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__33"

+

+	// $ANTLR start "T__34"

+	public final void mT__34() throws RecognitionException {

+		try {

+			int _type = T__34;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:25:7: ( '@KEYFRAMES' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:25:9: '@KEYFRAMES'

+			{

+				match("@KEYFRAMES");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__34"

+

+	// $ANTLR start "T__35"

+	public final void mT__35() throws RecognitionException {

+		try {

+			int _type = T__35;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:26:7: ( '[' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:26:9: '['

+			{

+				match('[');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__35"

+

+	// $ANTLR start "T__36"

+	public final void mT__36() throws RecognitionException {

+		try {

+			int _type = T__36;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:27:7: ( '^=' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:27:9: '^='

+			{

+				match("^=");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__36"

+

+	// $ANTLR start "T__37"

+	public final void mT__37() throws RecognitionException {

+		try {

+			int _type = T__37;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:28:7: ( '$=' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:28:9: '$='

+			{

+				match("$=");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__37"

+

+	// $ANTLR start "T__38"

+	public final void mT__38() throws RecognitionException {

+		try {

+			int _type = T__38;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:29:7: ( '*=' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:29:9: '*='

+			{

+				match("*=");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__38"

+

+	// $ANTLR start "T__39"

+	public final void mT__39() throws RecognitionException {

+		try {

+			int _type = T__39;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:30:7: ( '=' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:30:9: '='

+			{

+				match('=');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__39"

+

+	// $ANTLR start "T__40"

+	public final void mT__40() throws RecognitionException {

+		try {

+			int _type = T__40;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:31:7: ( ']' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:31:9: ']'

+			{

+				match(']');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__40"

+

+	// $ANTLR start "T__41"

+	public final void mT__41() throws RecognitionException {

+		try {

+			int _type = T__41;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:32:7: ( '.' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:32:9: '.'

+			{

+				match('.');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__41"

+

+	// $ANTLR start "T__42"

+	public final void mT__42() throws RecognitionException {

+		try {

+			int _type = T__42;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:33:7: ( '*' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:33:9: '*'

+			{

+				match('*');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__42"

+

+	// $ANTLR start "T__43"

+	public final void mT__43() throws RecognitionException {

+		try {

+			int _type = T__43;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:34:7: ( '|' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:34:9: '|'

+			{

+				match('|');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__43"

+

+	// $ANTLR start "T__44"

+	public final void mT__44() throws RecognitionException {

+		try {

+			int _type = T__44;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:35:7: ( ')' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:35:9: ')'

+			{

+				match(')');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__44"

+

+	// $ANTLR start "T__45"

+	public final void mT__45() throws RecognitionException {

+		try {

+			int _type = T__45;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:36:7: ( '(' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:36:9: '('

+			{

+				match('(');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__45"

+

+	// $ANTLR start "T__46"

+	public final void mT__46() throws RecognitionException {

+		try {

+			int _type = T__46;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:37:7: ( 'not(' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:37:9: 'not('

+			{

+				match("not(");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__46"

+

+	// $ANTLR start "T__47"

+	public final void mT__47() throws RecognitionException {

+		try {

+			int _type = T__47;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:38:7: ( '>' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:38:9: '>'

+			{

+				match('>');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__47"

+

+	// $ANTLR start "T__48"

+	public final void mT__48() throws RecognitionException {

+		try {

+			int _type = T__48;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:39:7: ( '~' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:39:9: '~'

+			{

+				match('~');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__48"

+

+	// $ANTLR start "T__49"

+	public final void mT__49() throws RecognitionException {

+		try {

+			int _type = T__49;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:40:7: ( 'url(' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:40:9: 'url('

+			{

+				match("url(");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__49"

+

+	// $ANTLR start "T__50"

+	public final void mT__50() throws RecognitionException {

+		try {

+			int _type = T__50;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:41:7: ( '/' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:41:9: '/'

+			{

+				match('/');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__50"

+

+	// $ANTLR start "T__51"

+	public final void mT__51() throws RecognitionException {

+		try {

+			int _type = T__51;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:42:7: ( '?' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:42:9: '?'

+			{

+				match('?');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__51"

+

+	// $ANTLR start "T__52"

+	public final void mT__52() throws RecognitionException {

+		try {

+			int _type = T__52;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:43:7: ( '@' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:43:9: '@'

+			{

+				match('@');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__52"

+

+	// $ANTLR start "T__53"

+	public final void mT__53() throws RecognitionException {

+		try {

+			int _type = T__53;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:44:7: ( '!' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:44:9: '!'

+			{

+				match('!');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__53"

+

+	// $ANTLR start "T__54"

+	public final void mT__54() throws RecognitionException {

+		try {

+			int _type = T__54;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:45:7: ( '$' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:45:9: '$'

+			{

+				match('$');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__54"

+

+	// $ANTLR start "T__55"

+	public final void mT__55() throws RecognitionException {

+		try {

+			int _type = T__55;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:46:7: ( '&' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:46:9: '&'

+			{

+				match('&');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__55"

+

+	// $ANTLR start "T__56"

+	public final void mT__56() throws RecognitionException {

+		try {

+			int _type = T__56;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:47:7: ( 'not' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:47:9: 'not'

+			{

+				match("not");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__56"

+

+	// $ANTLR start "T__57"

+	public final void mT__57() throws RecognitionException {

+		try {

+			int _type = T__57;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:48:7: ( 'no' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:48:9: 'no'

+			{

+				match("no");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__57"

+

+	// $ANTLR start "T__58"

+	public final void mT__58() throws RecognitionException {

+		try {

+			int _type = T__58;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:49:7: ( 'url' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:49:9: 'url'

+			{

+				match("url");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__58"

+

+	// $ANTLR start "T__59"

+	public final void mT__59() throws RecognitionException {

+		try {

+			int _type = T__59;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:50:7: ( 'ur' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:50:9: 'ur'

+			{

+				match("ur");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__59"

+

+	// $ANTLR start "T__60"

+	public final void mT__60() throws RecognitionException {

+		try {

+			int _type = T__60;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:51:7: ( '\\\\ ' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:51:9: '\\\\ '

+			{

+				match("\\ ");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__60"

+

+	// $ANTLR start "T__61"

+	public final void mT__61() throws RecognitionException {

+		try {

+			int _type = T__61;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:52:7: ( '\\\\(' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:52:9: '\\\\('

+			{

+				match("\\(");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__61"

+

+	// $ANTLR start "T__62"

+	public final void mT__62() throws RecognitionException {

+		try {

+			int _type = T__62;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:53:7: ( '\\\\)' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:53:9: '\\\\)'

+			{

+				match("\\)");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__62"

+

+	// $ANTLR start "T__63"

+	public final void mT__63() throws RecognitionException {

+		try {

+			int _type = T__63;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:54:7: ( '\\\\\\'' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:54:9: '\\\\\\''

+			{

+				match("\\'");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__63"

+

+	// $ANTLR start "T__64"

+	public final void mT__64() throws RecognitionException {

+		try {

+			int _type = T__64;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:55:7: ( '\\\\\"' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:55:9: '\\\\\"'

+			{

+				match("\\\"");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "T__64"

+

+	// $ANTLR start "RULE_IMPORTANT_SYM"

+	public final void mRULE_IMPORTANT_SYM() throws RecognitionException {

+		try {

+			int _type = RULE_IMPORTANT_SYM;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3592:20: ( '!important' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3592:22: '!important'

+			{

+				match("!important");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_IMPORTANT_SYM"

+

+	// $ANTLR start "RULE_ONE_INT"

+	public final void mRULE_ONE_INT() throws RecognitionException {

+		try {

+			int _type = RULE_ONE_INT;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3594:14: ( '0' .. '9' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3594:16: '0' .. '9'

+			{

+				matchRange('0', '9');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_ONE_INT"

+

+	// $ANTLR start "RULE_ONE_HEX_LETTER"

+	public final void mRULE_ONE_HEX_LETTER() throws RecognitionException {

+		try {

+			int _type = RULE_ONE_HEX_LETTER;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3596:21: ( ( 'a' .. 'f' | 'A' .. 'F' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3596:23: ( 'a' .. 'f' | 'A' .. 'F' )

+			{

+				if ((input.LA(1) >= 'A' && input.LA(1) <= 'F') || (input.LA(1) >= 'a' && input.LA(1) <= 'f')) {

+					input.consume();

+

+				}

+				else {

+					MismatchedSetException mse = new MismatchedSetException(null, input);

+					recover(mse);

+					throw mse;

+				}

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_ONE_HEX_LETTER"

+

+	// $ANTLR start "RULE_ONE_NON_HEX_LETTER"

+	public final void mRULE_ONE_NON_HEX_LETTER() throws RecognitionException {

+		try {

+			int _type = RULE_ONE_NON_HEX_LETTER;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3598:25: ( ( 'g' .. 'z' | 'G' .. 'Z' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3598:27: ( 'g' .. 'z' | 'G' .. 'Z' )

+			{

+				if ((input.LA(1) >= 'G' && input.LA(1) <= 'Z') || (input.LA(1) >= 'g' && input.LA(1) <= 'z')) {

+					input.consume();

+

+				}

+				else {

+					MismatchedSetException mse = new MismatchedSetException(null, input);

+					recover(mse);

+					throw mse;

+				}

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_ONE_NON_HEX_LETTER"

+

+	// $ANTLR start "RULE_UNDERSCORE"

+	public final void mRULE_UNDERSCORE() throws RecognitionException {

+		try {

+			int _type = RULE_UNDERSCORE;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3600:17: ( '_' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3600:19: '_'

+			{

+				match('_');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_UNDERSCORE"

+

+	// $ANTLR start "RULE_DASH"

+	public final void mRULE_DASH() throws RecognitionException {

+		try {

+			int _type = RULE_DASH;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3602:11: ( '-' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3602:13: '-'

+			{

+				match('-');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_DASH"

+

+	// $ANTLR start "RULE_PLUS"

+	public final void mRULE_PLUS() throws RecognitionException {

+		try {

+			int _type = RULE_PLUS;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3604:11: ( '+' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3604:13: '+'

+			{

+				match('+');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_PLUS"

+

+	// $ANTLR start "RULE_HASHMARK"

+	public final void mRULE_HASHMARK() throws RecognitionException {

+		try {

+			int _type = RULE_HASHMARK;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3606:15: ( '#' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3606:17: '#'

+			{

+				match('#');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_HASHMARK"

+

+	// $ANTLR start "RULE_COMMA"

+	public final void mRULE_COMMA() throws RecognitionException {

+		try {

+			int _type = RULE_COMMA;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3608:12: ( ',' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3608:14: ','

+			{

+				match(',');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_COMMA"

+

+	// $ANTLR start "RULE_PERCENT"

+	public final void mRULE_PERCENT() throws RecognitionException {

+		try {

+			int _type = RULE_PERCENT;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3610:14: ( '%' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3610:16: '%'

+			{

+				match('%');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_PERCENT"

+

+	// $ANTLR start "RULE_ML_COMMENT"

+	public final void mRULE_ML_COMMENT() throws RecognitionException {

+		try {

+			int _type = RULE_ML_COMMENT;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3612:17: ( '/*' ( options {greedy=false; } : . )* '*/' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3612:19: '/*' ( options {greedy=false; } : . )* '*/'

+			{

+				match("/*");

+

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3612:24: ( options {greedy=false; } : . )*

+				loop1: do {

+					int alt1 = 2;

+					int LA1_0 = input.LA(1);

+

+					if ((LA1_0 == '*')) {

+						int LA1_1 = input.LA(2);

+

+						if ((LA1_1 == '/')) {

+							alt1 = 2;

+						}

+						else if (((LA1_1 >= '\u0000' && LA1_1 <= '.') || (LA1_1 >= '0' && LA1_1 <= '\uFFFF'))) {

+							alt1 = 1;

+						}

+

+

+					}

+					else if (((LA1_0 >= '\u0000' && LA1_0 <= ')') || (LA1_0 >= '+' && LA1_0 <= '\uFFFF'))) {

+						alt1 = 1;

+					}

+

+

+					switch (alt1) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3612:52: .

+					{

+						matchAny();

+

+					}

+						break;

+

+					default:

+						break loop1;

+					}

+				} while (true);

+

+				match("*/");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_ML_COMMENT"

+

+	// $ANTLR start "RULE_WS"

+	public final void mRULE_WS() throws RecognitionException {

+		try {

+			int _type = RULE_WS;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3614:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3614:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3614:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

+				int cnt2 = 0;

+				loop2: do {

+					int alt2 = 2;

+					int LA2_0 = input.LA(1);

+

+					if (((LA2_0 >= '\t' && LA2_0 <= '\n') || LA2_0 == '\r' || LA2_0 == ' ')) {

+						alt2 = 1;

+					}

+

+

+					switch (alt2) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:

+					{

+						if ((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') {

+							input.consume();

+

+						}

+						else {

+							MismatchedSetException mse = new MismatchedSetException(null, input);

+							recover(mse);

+							throw mse;

+						}

+

+

+					}

+						break;

+

+					default:

+						if (cnt2 >= 1) {

+							break loop2;

+						}

+						EarlyExitException eee =

+								new EarlyExitException(2, input);

+						throw eee;

+					}

+					cnt2++;

+				} while (true);

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_WS"

+

+	// $ANTLR start "RULE_CSSSTRING"

+	public final void mRULE_CSSSTRING() throws RecognitionException {

+		try {

+			int _type = RULE_CSSSTRING;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3616:16: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' ..

+			// 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3616:18: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F'

+			// | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3616:18: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' ..

+				// 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

+				int alt5 = 2;

+				int LA5_0 = input.LA(1);

+

+				if ((LA5_0 == '\"')) {

+					alt5 = 1;

+				}

+				else if ((LA5_0 == '\'')) {

+					alt5 = 2;

+				}

+				else {

+					NoViableAltException nvae =

+							new NoViableAltException("", 5, 0, input);

+

+					throw nvae;

+				}

+				switch (alt5) {

+				case 1:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3616:19: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' ..

+				// 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'

+				{

+					match('\"');

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3616:23: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' ..

+					// 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*

+					loop3: do {

+						int alt3 = 3;

+						int LA3_0 = input.LA(1);

+

+						if ((LA3_0 == '\\')) {

+							alt3 = 1;

+						}

+						else if (((LA3_0 >= '\u0000' && LA3_0 <= '!') || (LA3_0 >= '#' && LA3_0 <= '[') || (LA3_0 >= ']' && LA3_0 <= '\uFFFF'))) {

+							alt3 = 2;

+						}

+

+

+						switch (alt3) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3616:24: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' ..

+						// 'F' | '\\\\' )

+						{

+							match('\\');

+							if (input.LA(1) == '\"' || input.LA(1) == '\'' || (input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'F') || input.LA(1) == '\\' || (input.LA(1) >= 'a' && input.LA(1) <= 'f') || input.LA(1) == 'n'

+									|| input.LA(1) == 'r' || (input.LA(1) >= 't' && input.LA(1) <= 'u')) {

+								input.consume();

+

+							}

+							else {

+								MismatchedSetException mse = new MismatchedSetException(null, input);

+								recover(mse);

+								throw mse;

+							}

+

+

+						}

+							break;

+						case 2:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3616:96: ~ ( ( '\\\\' | '\"' ) )

+						{

+							if ((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) {

+								input.consume();

+

+							}

+							else {

+								MismatchedSetException mse = new MismatchedSetException(null, input);

+								recover(mse);

+								throw mse;

+							}

+

+

+						}

+							break;

+

+						default:

+							break loop3;

+						}

+					} while (true);

+

+					match('\"');

+

+				}

+					break;

+				case 2:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3616:116: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' ..

+				// 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''

+				{

+					match('\'');

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3616:121: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' ..

+					// 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*

+					loop4: do {

+						int alt4 = 3;

+						int LA4_0 = input.LA(1);

+

+						if ((LA4_0 == '\\')) {

+							alt4 = 1;

+						}

+						else if (((LA4_0 >= '\u0000' && LA4_0 <= '&') || (LA4_0 >= '(' && LA4_0 <= '[') || (LA4_0 >= ']' && LA4_0 <= '\uFFFF'))) {

+							alt4 = 2;

+						}

+

+

+						switch (alt4) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3616:122: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' ..

+						// 'F' | '\\\\' )

+						{

+							match('\\');

+							if (input.LA(1) == '\"' || input.LA(1) == '\'' || (input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'F') || input.LA(1) == '\\' || (input.LA(1) >= 'a' && input.LA(1) <= 'f') || input.LA(1) == 'n'

+									|| input.LA(1) == 'r' || (input.LA(1) >= 't' && input.LA(1) <= 'u')) {

+								input.consume();

+

+							}

+							else {

+								MismatchedSetException mse = new MismatchedSetException(null, input);

+								recover(mse);

+								throw mse;

+							}

+

+

+						}

+							break;

+						case 2:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3616:194: ~ ( ( '\\\\' | '\\'' ) )

+						{

+							if ((input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) {

+								input.consume();

+

+							}

+							else {

+								MismatchedSetException mse = new MismatchedSetException(null, input);

+								recover(mse);

+								throw mse;

+							}

+

+

+						}

+							break;

+

+						default:

+							break loop4;

+						}

+					} while (true);

+

+					match('\'');

+

+				}

+					break;

+

+				}

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_CSSSTRING"

+

+	// $ANTLR start "RULE_INCLUDES"

+	public final void mRULE_INCLUDES() throws RecognitionException {

+		try {

+			int _type = RULE_INCLUDES;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3618:15: ( '~=' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3618:17: '~='

+			{

+				match("~=");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_INCLUDES"

+

+	// $ANTLR start "RULE_DASHMATCH"

+	public final void mRULE_DASHMATCH() throws RecognitionException {

+		try {

+			int _type = RULE_DASHMATCH;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3620:16: ( '|=' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3620:18: '|='

+			{

+				match("|=");

+

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_DASHMATCH"

+

+	// $ANTLR start "RULE_COLON"

+	public final void mRULE_COLON() throws RecognitionException {

+		try {

+			int _type = RULE_COLON;

+			int _channel = DEFAULT_TOKEN_CHANNEL;

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3622:12: ( ':' )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3622:14: ':'

+			{

+				match(':');

+

+			}

+

+			state.type = _type;

+			state.channel = _channel;

+		} finally {

+		}

+	}

+

+	// $ANTLR end "RULE_COLON"

+

+	@Override

+	public void mTokens() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:8: ( T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 |

+		// T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 |

+		// RULE_IMPORTANT_SYM | RULE_ONE_INT | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_UNDERSCORE | RULE_DASH | RULE_PLUS | RULE_HASHMARK | RULE_COMMA | RULE_PERCENT | RULE_ML_COMMENT | RULE_WS | RULE_CSSSTRING | RULE_INCLUDES | RULE_DASHMATCH |

+		// RULE_COLON )

+		int alt6 = 61;

+		alt6 = dfa6.predict(input);

+		switch (alt6) {

+		case 1:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:10: T__20

+		{

+			mT__20();

+

+		}

+			break;

+		case 2:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:16: T__21

+		{

+			mT__21();

+

+		}

+			break;

+		case 3:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:22: T__22

+		{

+			mT__22();

+

+		}

+			break;

+		case 4:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:28: T__23

+		{

+			mT__23();

+

+		}

+			break;

+		case 5:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:34: T__24

+		{

+			mT__24();

+

+		}

+			break;

+		case 6:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:40: T__25

+		{

+			mT__25();

+

+		}

+			break;

+		case 7:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:46: T__26

+		{

+			mT__26();

+

+		}

+			break;

+		case 8:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:52: T__27

+		{

+			mT__27();

+

+		}

+			break;

+		case 9:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:58: T__28

+		{

+			mT__28();

+

+		}

+			break;

+		case 10:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:64: T__29

+		{

+			mT__29();

+

+		}

+			break;

+		case 11:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:70: T__30

+		{

+			mT__30();

+

+		}

+			break;

+		case 12:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:76: T__31

+		{

+			mT__31();

+

+		}

+			break;

+		case 13:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:82: T__32

+		{

+			mT__32();

+

+		}

+			break;

+		case 14:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:88: T__33

+		{

+			mT__33();

+

+		}

+			break;

+		case 15:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:94: T__34

+		{

+			mT__34();

+

+		}

+			break;

+		case 16:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:100: T__35

+		{

+			mT__35();

+

+		}

+			break;

+		case 17:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:106: T__36

+		{

+			mT__36();

+

+		}

+			break;

+		case 18:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:112: T__37

+		{

+			mT__37();

+

+		}

+			break;

+		case 19:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:118: T__38

+		{

+			mT__38();

+

+		}

+			break;

+		case 20:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:124: T__39

+		{

+			mT__39();

+

+		}

+			break;

+		case 21:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:130: T__40

+		{

+			mT__40();

+

+		}

+			break;

+		case 22:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:136: T__41

+		{

+			mT__41();

+

+		}

+			break;

+		case 23:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:142: T__42

+		{

+			mT__42();

+

+		}

+			break;

+		case 24:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:148: T__43

+		{

+			mT__43();

+

+		}

+			break;

+		case 25:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:154: T__44

+		{

+			mT__44();

+

+		}

+			break;

+		case 26:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:160: T__45

+		{

+			mT__45();

+

+		}

+			break;

+		case 27:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:166: T__46

+		{

+			mT__46();

+

+		}

+			break;

+		case 28:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:172: T__47

+		{

+			mT__47();

+

+		}

+			break;

+		case 29:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:178: T__48

+		{

+			mT__48();

+

+		}

+			break;

+		case 30:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:184: T__49

+		{

+			mT__49();

+

+		}

+			break;

+		case 31:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:190: T__50

+		{

+			mT__50();

+

+		}

+			break;

+		case 32:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:196: T__51

+		{

+			mT__51();

+

+		}

+			break;

+		case 33:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:202: T__52

+		{

+			mT__52();

+

+		}

+			break;

+		case 34:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:208: T__53

+		{

+			mT__53();

+

+		}

+			break;

+		case 35:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:214: T__54

+		{

+			mT__54();

+

+		}

+			break;

+		case 36:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:220: T__55

+		{

+			mT__55();

+

+		}

+			break;

+		case 37:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:226: T__56

+		{

+			mT__56();

+

+		}

+			break;

+		case 38:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:232: T__57

+		{

+			mT__57();

+

+		}

+			break;

+		case 39:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:238: T__58

+		{

+			mT__58();

+

+		}

+			break;

+		case 40:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:244: T__59

+		{

+			mT__59();

+

+		}

+			break;

+		case 41:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:250: T__60

+		{

+			mT__60();

+

+		}

+			break;

+		case 42:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:256: T__61

+		{

+			mT__61();

+

+		}

+			break;

+		case 43:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:262: T__62

+		{

+			mT__62();

+

+		}

+			break;

+		case 44:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:268: T__63

+		{

+			mT__63();

+

+		}

+			break;

+		case 45:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:274: T__64

+		{

+			mT__64();

+

+		}

+			break;

+		case 46:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:280: RULE_IMPORTANT_SYM

+		{

+			mRULE_IMPORTANT_SYM();

+

+		}

+			break;

+		case 47:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:299: RULE_ONE_INT

+		{

+			mRULE_ONE_INT();

+

+		}

+			break;

+		case 48:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:312: RULE_ONE_HEX_LETTER

+		{

+			mRULE_ONE_HEX_LETTER();

+

+		}

+			break;

+		case 49:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:332: RULE_ONE_NON_HEX_LETTER

+		{

+			mRULE_ONE_NON_HEX_LETTER();

+

+		}

+			break;

+		case 50:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:356: RULE_UNDERSCORE

+		{

+			mRULE_UNDERSCORE();

+

+		}

+			break;

+		case 51:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:372: RULE_DASH

+		{

+			mRULE_DASH();

+

+		}

+			break;

+		case 52:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:382: RULE_PLUS

+		{

+			mRULE_PLUS();

+

+		}

+			break;

+		case 53:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:392: RULE_HASHMARK

+		{

+			mRULE_HASHMARK();

+

+		}

+			break;

+		case 54:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:406: RULE_COMMA

+		{

+			mRULE_COMMA();

+

+		}

+			break;

+		case 55:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:417: RULE_PERCENT

+		{

+			mRULE_PERCENT();

+

+		}

+			break;

+		case 56:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:430: RULE_ML_COMMENT

+		{

+			mRULE_ML_COMMENT();

+

+		}

+			break;

+		case 57:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:446: RULE_WS

+		{

+			mRULE_WS();

+

+		}

+			break;

+		case 58:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:454: RULE_CSSSTRING

+		{

+			mRULE_CSSSTRING();

+

+		}

+			break;

+		case 59:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:469: RULE_INCLUDES

+		{

+			mRULE_INCLUDES();

+

+		}

+			break;

+		case 60:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:483: RULE_DASHMATCH

+		{

+			mRULE_DASHMATCH();

+

+		}

+			break;

+		case 61:

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1:498: RULE_COLON

+		{

+			mRULE_COLON();

+

+		}

+			break;

+

+		}

+

+	}

+

+

+	protected DFA6 dfa6 = new DFA6(this);

+	static final String DFA6_eotS =

+			"\1\uffff\1\60\5\uffff\1\62\1\64\3\uffff\1\66\2\uffff\1\32\1\uffff" +

+					"\1\71\1\32\1\74\1\uffff\1\76\41\uffff\1\105\2\uffff\1\107\11\uffff" +

+					"\1\111\1\uffff\1\113\5\uffff";

+	static final String DFA6_eofS =

+			"\114\uffff";

+	static final String DFA6_minS =

+			"\1\11\1\103\5\uffff\2\75\3\uffff\1\75\2\uffff\1\157\1\uffff\1\75" +

+					"\1\162\1\52\1\uffff\1\151\1\uffff\1\40\37\uffff\1\164\2\uffff\1" +

+					"\154\11\uffff\1\50\1\uffff\1\50\5\uffff";

+	static final String DFA6_maxS =

+			"\1\176\1\160\5\uffff\2\75\3\uffff\1\75\2\uffff\1\157\1\uffff\1" +

+					"\75\1\162\1\52\1\uffff\1\151\1\uffff\1\51\37\uffff\1\164\2\uffff" +

+					"\1\154\11\uffff\1\50\1\uffff\1\50\5\uffff";

+	static final String DFA6_acceptS =

+			"\2\uffff\1\3\1\10\1\11\1\20\1\21\2\uffff\1\24\1\25\1\26\1\uffff" +

+					"\1\31\1\32\1\uffff\1\34\3\uffff\1\40\1\uffff\1\44\1\uffff\1\57\1" +

+					"\60\1\61\1\62\1\63\1\64\1\65\1\66\1\67\1\71\1\72\1\75\1\1\1\2\1" +

+					"\4\1\5\1\6\1\7\1\12\1\13\1\14\1\15\1\16\1\17\1\41\1\22\1\43\1\23" +

+					"\1\27\1\74\1\30\1\uffff\1\73\1\35\1\uffff\1\70\1\37\1\56\1\42\1" +

+					"\51\1\52\1\53\1\54\1\55\1\uffff\1\46\1\uffff\1\50\1\33\1\45\1\36" +

+					"\1\47";

+	static final String DFA6_specialS =

+			"\114\uffff}>";

+	static final String[] DFA6_transitionS = {

+			"\2\41\2\uffff\1\41\22\uffff\1\41\1\25\1\42\1\36\1\7\1\40\1" +

+					"\26\1\42\1\16\1\15\1\10\1\35\1\37\1\34\1\13\1\23\12\30\1\43" +

+					"\1\2\1\uffff\1\11\1\20\1\24\1\1\6\31\24\32\1\5\1\27\1\12\1\6" +

+					"\1\33\1\uffff\6\31\7\32\1\17\6\32\1\22\5\32\1\3\1\14\1\4\1\21",

+			"\1\45\2\uffff\1\55\2\uffff\1\47\1\uffff\1\57\1\uffff\1\53" +

+					"\2\uffff\1\51\22\uffff\1\44\2\uffff\1\54\2\uffff\1\46\1\uffff" +

+					"\1\56\1\uffff\1\52\2\uffff\1\50",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"\1\61",

+			"\1\63",

+			"",

+			"",

+			"",

+			"\1\65",

+			"",

+			"",

+			"\1\67",

+			"",

+			"\1\70",

+			"\1\72",

+			"\1\73",

+			"",

+			"\1\75",

+			"",

+			"\1\77\1\uffff\1\103\4\uffff\1\102\1\100\1\101",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"\1\104",

+			"",

+			"",

+			"\1\106",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"",

+			"\1\110",

+			"",

+			"\1\112",

+			"",

+			"",

+			"",

+			"",

+			""

+	};

+

+	static final short[] DFA6_eot = DFA.unpackEncodedString(DFA6_eotS);

+	static final short[] DFA6_eof = DFA.unpackEncodedString(DFA6_eofS);

+	static final char[] DFA6_min = DFA.unpackEncodedStringToUnsignedChars(DFA6_minS);

+	static final char[] DFA6_max = DFA.unpackEncodedStringToUnsignedChars(DFA6_maxS);

+	static final short[] DFA6_accept = DFA.unpackEncodedString(DFA6_acceptS);

+	static final short[] DFA6_special = DFA.unpackEncodedString(DFA6_specialS);

+	static final short[][] DFA6_transition;

+

+	static {

+		int numStates = DFA6_transitionS.length;

+		DFA6_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA6_transition[i] = DFA.unpackEncodedString(DFA6_transitionS[i]);

+		}

+	}

+

+	class DFA6 extends DFA {

+

+		public DFA6(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 6;

+			this.eot = DFA6_eot;

+			this.eof = DFA6_eof;

+			this.min = DFA6_min;

+			this.max = DFA6_max;

+			this.accept = DFA6_accept;

+			this.special = DFA6_special;

+			this.transition = DFA6_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "1:1: Tokens : ( T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | RULE_IMPORTANT_SYM | RULE_ONE_INT | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_UNDERSCORE | RULE_DASH | RULE_PLUS | RULE_HASHMARK | RULE_COMMA | RULE_PERCENT | RULE_ML_COMMENT | RULE_WS | RULE_CSSSTRING | RULE_INCLUDES | RULE_DASHMATCH | RULE_COLON );";

+		}

+	}

+

+

+}
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSParser.java
new file mode 100644
index 00000000000..99753b58476
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSParser.java
@@ -0,0 +1,13432 @@
+package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal;

+

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

+import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;

+import org.eclipse.xtext.parser.antlr.XtextTokenStream;

+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;

+import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;

+import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;

+

+import org.antlr.runtime.*;

+

+@SuppressWarnings("all")

+public class InternalCSSParser extends AbstractInternalAntlrParser {

+	public static final String[] tokenNames = new String[] {

+			"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_CSSSTRING", "RULE_COLON", "RULE_COMMA", "RULE_PERCENT", "RULE_WS", "RULE_INCLUDES", "RULE_DASHMATCH", "RULE_HASHMARK", "RULE_IMPORTANT_SYM", "RULE_PLUS", "RULE_DASH", "RULE_UNDERSCORE",

+			"RULE_ONE_HEX_LETTER", "RULE_ONE_NON_HEX_LETTER", "RULE_ONE_INT", "RULE_ML_COMMENT", "'@charset'", "'@CHARSET'", "';'", "'@import'", "'@IMPORT'", "'@page'", "'@PAGE'", "'{'", "'}'", "'@media'", "'@MEDIA'", "'@font-face'", "'@FONT-FACE'",

+			"'@keyframes'", "'@KEYFRAMES'", "'['", "'^='", "'$='", "'*='", "'='", "']'", "'.'", "'*'", "'|'", "')'", "'('", "'not('", "'>'", "'~'", "'url('", "'/'", "'?'", "'@'", "'!'", "'$'", "'&'", "'not'", "'no'", "'url'", "'ur'", "'\\\\ '", "'\\\\('",

+			"'\\\\)'", "'\\\\\\''", "'\\\\\"'"

+	};

+	public static final int T__64 = 64;

+	public static final int T__29 = 29;

+	public static final int T__28 = 28;

+	public static final int T__62 = 62;

+	public static final int T__27 = 27;

+	public static final int T__63 = 63;

+	public static final int T__26 = 26;

+	public static final int T__25 = 25;

+	public static final int T__24 = 24;

+	public static final int RULE_INCLUDES = 9;

+	public static final int T__23 = 23;

+	public static final int T__22 = 22;

+	public static final int T__21 = 21;

+	public static final int T__20 = 20;

+	public static final int RULE_ONE_INT = 18;

+	public static final int RULE_PERCENT = 7;

+	public static final int T__61 = 61;

+	public static final int T__60 = 60;

+	public static final int EOF = -1;

+	public static final int T__55 = 55;

+	public static final int T__56 = 56;

+	public static final int T__57 = 57;

+	public static final int T__58 = 58;

+	public static final int T__51 = 51;

+	public static final int T__52 = 52;

+	public static final int T__53 = 53;

+	public static final int T__54 = 54;

+	public static final int RULE_ONE_NON_HEX_LETTER = 17;

+	public static final int T__59 = 59;

+	public static final int T__50 = 50;

+	public static final int T__42 = 42;

+	public static final int T__43 = 43;

+	public static final int T__40 = 40;

+	public static final int T__41 = 41;

+	public static final int T__46 = 46;

+	public static final int T__47 = 47;

+	public static final int T__44 = 44;

+	public static final int T__45 = 45;

+	public static final int T__48 = 48;

+	public static final int T__49 = 49;

+	public static final int RULE_UNDERSCORE = 15;

+	public static final int RULE_PLUS = 13;

+	public static final int RULE_ONE_HEX_LETTER = 16;

+	public static final int RULE_COMMA = 6;

+	public static final int RULE_HASHMARK = 11;

+	public static final int RULE_ML_COMMENT = 19;

+	public static final int RULE_DASHMATCH = 10;

+	public static final int T__30 = 30;

+	public static final int RULE_COLON = 5;

+	public static final int T__31 = 31;

+	public static final int T__32 = 32;

+	public static final int T__33 = 33;

+	public static final int T__34 = 34;

+	public static final int T__35 = 35;

+	public static final int T__36 = 36;

+	public static final int T__37 = 37;

+	public static final int T__38 = 38;

+	public static final int T__39 = 39;

+	public static final int RULE_CSSSTRING = 4;

+	public static final int RULE_IMPORTANT_SYM = 12;

+	public static final int RULE_WS = 8;

+	public static final int RULE_DASH = 14;

+

+	// delegates

+	// delegators

+

+

+	public InternalCSSParser(TokenStream input) {

+		this(input, new RecognizerSharedState());

+	}

+

+	public InternalCSSParser(TokenStream input, RecognizerSharedState state) {

+		super(input, state);

+

+	}

+

+

+	@Override

+	public String[] getTokenNames() {

+		return InternalCSSParser.tokenNames;

+	}

+

+	@Override

+	public String getGrammarFileName() {

+		return "../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g";

+	}

+

+

+

+	private CSSGrammarAccess grammarAccess;

+

+	public InternalCSSParser(TokenStream input, CSSGrammarAccess grammarAccess) {

+		this(input);

+		this.grammarAccess = grammarAccess;

+		registerRules(grammarAccess.getGrammar());

+	}

+

+	@Override

+	protected String getFirstRuleName() {

+		return "stylesheet";

+	}

+

+	@Override

+	protected CSSGrammarAccess getGrammarAccess() {

+		return grammarAccess;

+	}

+

+

+

+	// $ANTLR start "entryRulestylesheet"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:67:1: entryRulestylesheet returns [EObject current=null] : iv_rulestylesheet= rulestylesheet EOF ;

+	public final EObject entryRulestylesheet() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulestylesheet = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:68:2: (iv_rulestylesheet= rulestylesheet EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:69:2: iv_rulestylesheet= rulestylesheet EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getStylesheetRule());

+				}

+				pushFollow(FOLLOW_rulestylesheet_in_entryRulestylesheet75);

+				iv_rulestylesheet = rulestylesheet();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulestylesheet;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulestylesheet85);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulestylesheet"

+

+

+	// $ANTLR start "rulestylesheet"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:76:1: rulestylesheet returns [EObject current=null] : ( ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0=

+	// ruleimportExpression ) )* ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face ) ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )* ) ;

+	public final EObject rulestylesheet() throws RecognitionException {

+		EObject current = null;

+

+		EObject lv_charset_0_0 = null;

+

+		EObject lv_imports_1_0 = null;

+

+		EObject lv_ruleset_2_0 = null;

+

+		EObject lv_media_3_0 = null;

+

+		EObject lv_page_4_0 = null;

+

+		EObject lv_font_face_5_0 = null;

+

+		EObject lv_keyframes_6_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:79:28: ( ( ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0=

+			// ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face ) ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:80:1: ( ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0=

+			// ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face ) ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:80:1: ( ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0=

+				// ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face ) ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:80:2: ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0=

+				// ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face ) ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )*

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:80:2: ( (lv_charset_0_0= rulecharset ) )?

+					int alt1 = 2;

+					int LA1_0 = input.LA(1);

+

+					if (((LA1_0 >= 20 && LA1_0 <= 21))) {

+						alt1 = 1;

+					}

+					switch (alt1) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:81:1: (lv_charset_0_0= rulecharset )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:81:1: (lv_charset_0_0= rulecharset )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:82:3: lv_charset_0_0= rulecharset

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getStylesheetAccess().getCharsetCharsetParserRuleCall_0_0());

+

+							}

+							pushFollow(FOLLOW_rulecharset_in_rulestylesheet131);

+							lv_charset_0_0 = rulecharset();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getStylesheetRule());

+								}

+								set(

+										current,

+										"charset",

+										lv_charset_0_0,

+										"charset");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+						break;

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:98:3: ( (lv_imports_1_0= ruleimportExpression ) )*

+					loop2: do {

+						int alt2 = 2;

+						int LA2_0 = input.LA(1);

+

+						if (((LA2_0 >= 23 && LA2_0 <= 24))) {

+							alt2 = 1;

+						}

+

+

+						switch (alt2) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:99:1: (lv_imports_1_0= ruleimportExpression )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:99:1: (lv_imports_1_0= ruleimportExpression )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:100:3: lv_imports_1_0= ruleimportExpression

+							{

+								if (state.backtracking == 0) {

+

+									newCompositeNode(grammarAccess.getStylesheetAccess().getImportsImportExpressionParserRuleCall_1_0());

+

+								}

+								pushFollow(FOLLOW_ruleimportExpression_in_rulestylesheet153);

+								lv_imports_1_0 = ruleimportExpression();

+

+								state._fsp--;

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									if (current == null) {

+										current = createModelElementForParent(grammarAccess.getStylesheetRule());

+									}

+									add(

+											current,

+											"imports",

+											lv_imports_1_0,

+											"importExpression");

+									afterParserOrEnumRuleCall();

+

+								}

+

+							}

+

+

+						}

+							break;

+

+						default:

+							break loop2;

+						}

+					} while (true);

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:116:3: ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage )

+					// ) | ( (lv_font_face_5_0= rulefont_face ) ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )*

+					loop3: do {

+						int alt3 = 6;

+						switch (input.LA(1)) {

+						case RULE_COLON:

+						case RULE_HASHMARK:

+						case RULE_DASH:

+						case RULE_UNDERSCORE:

+						case RULE_ONE_HEX_LETTER:

+						case RULE_ONE_NON_HEX_LETTER:

+						case 35:

+						case 41:

+						case 42:

+						case 43:

+						case 56:

+						case 57:

+						case 58:

+						case 59: {

+							alt3 = 1;

+						}

+							break;

+						case 29:

+						case 30: {

+							alt3 = 2;

+						}

+							break;

+						case 25:

+						case 26: {

+							alt3 = 3;

+						}

+							break;

+						case 31:

+						case 32: {

+							alt3 = 4;

+						}

+							break;

+						case 33:

+						case 34: {

+							alt3 = 5;

+						}

+							break;

+

+						}

+

+						switch (alt3) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:116:4: ( (lv_ruleset_2_0= ruleruleset ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:116:4: ( (lv_ruleset_2_0= ruleruleset ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:117:1: (lv_ruleset_2_0= ruleruleset )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:117:1: (lv_ruleset_2_0= ruleruleset )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:118:3: lv_ruleset_2_0= ruleruleset

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getStylesheetAccess().getRulesetRulesetParserRuleCall_2_0_0());

+

+									}

+									pushFollow(FOLLOW_ruleruleset_in_rulestylesheet176);

+									lv_ruleset_2_0 = ruleruleset();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getStylesheetRule());

+										}

+										add(

+												current,

+												"ruleset",

+												lv_ruleset_2_0,

+												"ruleset");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+

+						}

+							break;

+						case 2:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:135:6: ( (lv_media_3_0= rulemedia ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:135:6: ( (lv_media_3_0= rulemedia ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:136:1: (lv_media_3_0= rulemedia )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:136:1: (lv_media_3_0= rulemedia )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:137:3: lv_media_3_0= rulemedia

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getStylesheetAccess().getMediaMediaParserRuleCall_2_1_0());

+

+									}

+									pushFollow(FOLLOW_rulemedia_in_rulestylesheet203);

+									lv_media_3_0 = rulemedia();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getStylesheetRule());

+										}

+										add(

+												current,

+												"media",

+												lv_media_3_0,

+												"media");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+

+						}

+							break;

+						case 3:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:154:6: ( (lv_page_4_0= rulepage ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:154:6: ( (lv_page_4_0= rulepage ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:155:1: (lv_page_4_0= rulepage )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:155:1: (lv_page_4_0= rulepage )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:156:3: lv_page_4_0= rulepage

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getStylesheetAccess().getPagePageParserRuleCall_2_2_0());

+

+									}

+									pushFollow(FOLLOW_rulepage_in_rulestylesheet230);

+									lv_page_4_0 = rulepage();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getStylesheetRule());

+										}

+										add(

+												current,

+												"page",

+												lv_page_4_0,

+												"page");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+

+						}

+							break;

+						case 4:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:173:6: ( (lv_font_face_5_0= rulefont_face ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:173:6: ( (lv_font_face_5_0= rulefont_face ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:174:1: (lv_font_face_5_0= rulefont_face )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:174:1: (lv_font_face_5_0= rulefont_face )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:175:3: lv_font_face_5_0= rulefont_face

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getStylesheetAccess().getFont_faceFont_faceParserRuleCall_2_3_0());

+

+									}

+									pushFollow(FOLLOW_rulefont_face_in_rulestylesheet257);

+									lv_font_face_5_0 = rulefont_face();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getStylesheetRule());

+										}

+										add(

+												current,

+												"font_face",

+												lv_font_face_5_0,

+												"font_face");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+

+						}

+							break;

+						case 5:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:192:6: ( (lv_keyframes_6_0= rulekeyframes ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:192:6: ( (lv_keyframes_6_0= rulekeyframes ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:193:1: (lv_keyframes_6_0= rulekeyframes )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:193:1: (lv_keyframes_6_0= rulekeyframes )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:194:3: lv_keyframes_6_0= rulekeyframes

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getStylesheetAccess().getKeyframesKeyframesParserRuleCall_2_4_0());

+

+									}

+									pushFollow(FOLLOW_rulekeyframes_in_rulestylesheet284);

+									lv_keyframes_6_0 = rulekeyframes();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getStylesheetRule());

+										}

+										add(

+												current,

+												"keyframes",

+												lv_keyframes_6_0,

+												"keyframes");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+

+						}

+							break;

+

+						default:

+							break loop3;

+						}

+					} while (true);

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulestylesheet"

+

+

+	// $ANTLR start "entryRulecharset"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:218:1: entryRulecharset returns [EObject current=null] : iv_rulecharset= rulecharset EOF ;

+	public final EObject entryRulecharset() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulecharset = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:219:2: (iv_rulecharset= rulecharset EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:220:2: iv_rulecharset= rulecharset EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getCharsetRule());

+				}

+				pushFollow(FOLLOW_rulecharset_in_entryRulecharset322);

+				iv_rulecharset = rulecharset();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulecharset;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulecharset332);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulecharset"

+

+

+	// $ANTLR start "rulecharset"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:227:1: rulecharset returns [EObject current=null] : ( (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0=

+	// RULE_CSSSTRING ) ) otherlv_3= ';' ) ;

+	public final EObject rulecharset() throws RecognitionException {

+		EObject current = null;

+

+		Token otherlv_0 = null;

+		Token otherlv_1 = null;

+		Token lv_charset_2_0 = null;

+		Token otherlv_3 = null;

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:230:28: ( ( (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';'

+			// ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:231:1: ( (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:231:1: ( (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';'

+				// )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:231:2: (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';'

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:231:2: (otherlv_0= '@charset' | otherlv_1= '@CHARSET' )

+					int alt4 = 2;

+					int LA4_0 = input.LA(1);

+

+					if ((LA4_0 == 20)) {

+						alt4 = 1;

+					}

+					else if ((LA4_0 == 21)) {

+						alt4 = 2;

+					}

+					else {

+						if (state.backtracking > 0) {

+							state.failed = true;

+							return current;

+						}

+						NoViableAltException nvae =

+								new NoViableAltException("", 4, 0, input);

+

+						throw nvae;

+					}

+					switch (alt4) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:231:4: otherlv_0= '@charset'

+					{

+						otherlv_0 = (Token) match(input, 20, FOLLOW_20_in_rulecharset370);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_0, grammarAccess.getCharsetAccess().getCharsetKeyword_0_0());

+

+						}

+

+					}

+						break;

+					case 2:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:236:7: otherlv_1= '@CHARSET'

+					{

+						otherlv_1 = (Token) match(input, 21, FOLLOW_21_in_rulecharset388);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_1, grammarAccess.getCharsetAccess().getCHARSETKeyword_0_1());

+

+						}

+

+					}

+						break;

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:240:2: ( (lv_charset_2_0= RULE_CSSSTRING ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:241:1: (lv_charset_2_0= RULE_CSSSTRING )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:241:1: (lv_charset_2_0= RULE_CSSSTRING )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:242:3: lv_charset_2_0= RULE_CSSSTRING

+						{

+							lv_charset_2_0 = (Token) match(input, RULE_CSSSTRING, FOLLOW_RULE_CSSSTRING_in_rulecharset406);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(lv_charset_2_0, grammarAccess.getCharsetAccess().getCharsetCSSSTRINGTerminalRuleCall_1_0());

+

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElement(grammarAccess.getCharsetRule());

+								}

+								setWithLastConsumed(

+										current,

+										"charset",

+										lv_charset_2_0,

+										"CSSSTRING");

+

+							}

+

+						}

+

+

+					}

+

+					otherlv_3 = (Token) match(input, 22, FOLLOW_22_in_rulecharset423);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_3, grammarAccess.getCharsetAccess().getSemicolonKeyword_2());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulecharset"

+

+

+	// $ANTLR start "entryRuleimportExpression"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:270:1: entryRuleimportExpression returns [EObject current=null] : iv_ruleimportExpression= ruleimportExpression EOF ;

+	public final EObject entryRuleimportExpression() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleimportExpression = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:271:2: (iv_ruleimportExpression= ruleimportExpression EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:272:2: iv_ruleimportExpression= ruleimportExpression EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getImportExpressionRule());

+				}

+				pushFollow(FOLLOW_ruleimportExpression_in_entryRuleimportExpression459);

+				iv_ruleimportExpression = ruleimportExpression();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleimportExpression;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleimportExpression469);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleimportExpression"

+

+

+	// $ANTLR start "ruleimportExpression"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:279:1: ruleimportExpression returns [EObject current=null] : ( (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( (

+	// (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';' ) ;

+	public final EObject ruleimportExpression() throws RecognitionException {

+		EObject current = null;

+

+		Token otherlv_0 = null;

+		Token otherlv_1 = null;

+		Token lv_value_2_0 = null;

+		Token otherlv_5 = null;

+		EObject this_URLType_3 = null;

+

+		AntlrDatatypeRuleToken lv_mediaList_4_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:282:28: ( ( (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) |

+			// (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:283:1: ( (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3=

+			// ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:283:1: ( (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) |

+				// (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:283:2: (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3=

+				// ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';'

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:283:2: (otherlv_0= '@import' | otherlv_1= '@IMPORT' )

+					int alt5 = 2;

+					int LA5_0 = input.LA(1);

+

+					if ((LA5_0 == 23)) {

+						alt5 = 1;

+					}

+					else if ((LA5_0 == 24)) {

+						alt5 = 2;

+					}

+					else {

+						if (state.backtracking > 0) {

+							state.failed = true;

+							return current;

+						}

+						NoViableAltException nvae =

+								new NoViableAltException("", 5, 0, input);

+

+						throw nvae;

+					}

+					switch (alt5) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:283:4: otherlv_0= '@import'

+					{

+						otherlv_0 = (Token) match(input, 23, FOLLOW_23_in_ruleimportExpression507);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_0, grammarAccess.getImportExpressionAccess().getImportKeyword_0_0());

+

+						}

+

+					}

+						break;

+					case 2:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:288:7: otherlv_1= '@IMPORT'

+					{

+						otherlv_1 = (Token) match(input, 24, FOLLOW_24_in_ruleimportExpression525);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_1, grammarAccess.getImportExpressionAccess().getIMPORTKeyword_0_1());

+

+						}

+

+					}

+						break;

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:292:2: ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0=

+					// rulemedia_list ) )? ) )

+					int alt7 = 2;

+					int LA7_0 = input.LA(1);

+

+					if ((LA7_0 == RULE_CSSSTRING)) {

+						alt7 = 1;

+					}

+					else if ((LA7_0 == 49)) {

+						alt7 = 2;

+					}

+					else {

+						if (state.backtracking > 0) {

+							state.failed = true;

+							return current;

+						}

+						NoViableAltException nvae =

+								new NoViableAltException("", 7, 0, input);

+

+						throw nvae;

+					}

+					switch (alt7) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:292:3: ( (lv_value_2_0= RULE_CSSSTRING ) )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:292:3: ( (lv_value_2_0= RULE_CSSSTRING ) )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:293:1: (lv_value_2_0= RULE_CSSSTRING )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:293:1: (lv_value_2_0= RULE_CSSSTRING )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:294:3: lv_value_2_0= RULE_CSSSTRING

+							{

+								lv_value_2_0 = (Token) match(input, RULE_CSSSTRING, FOLLOW_RULE_CSSSTRING_in_ruleimportExpression544);

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									newLeafNode(lv_value_2_0, grammarAccess.getImportExpressionAccess().getValueCSSSTRINGTerminalRuleCall_1_0_0());

+

+								}

+								if (state.backtracking == 0) {

+

+									if (current == null) {

+										current = createModelElement(grammarAccess.getImportExpressionRule());

+									}

+									setWithLastConsumed(

+											current,

+											"value",

+											lv_value_2_0,

+											"CSSSTRING");

+

+								}

+

+							}

+

+

+						}

+

+

+					}

+						break;

+					case 2:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:311:6: (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:311:6: (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:312:5: this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )?

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getImportExpressionAccess().getURLTypeParserRuleCall_1_1_0());

+

+							}

+							pushFollow(FOLLOW_ruleURLType_in_ruleimportExpression578);

+							this_URLType_3 = ruleURLType();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current = this_URLType_3;

+								afterParserOrEnumRuleCall();

+

+							}

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:320:1: ( (lv_mediaList_4_0= rulemedia_list ) )?

+							int alt6 = 2;

+							int LA6_0 = input.LA(1);

+

+							if (((LA6_0 >= RULE_DASH && LA6_0 <= RULE_ONE_NON_HEX_LETTER) || (LA6_0 >= 56 && LA6_0 <= 59))) {

+								alt6 = 1;

+							}

+							switch (alt6) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:321:1: (lv_mediaList_4_0= rulemedia_list )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:321:1: (lv_mediaList_4_0= rulemedia_list )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:322:3: lv_mediaList_4_0= rulemedia_list

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getImportExpressionAccess().getMediaListMedia_listParserRuleCall_1_1_1_0());

+

+									}

+									pushFollow(FOLLOW_rulemedia_list_in_ruleimportExpression598);

+									lv_mediaList_4_0 = rulemedia_list();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getImportExpressionRule());

+										}

+										set(

+												current,

+												"mediaList",

+												lv_mediaList_4_0,

+												"media_list");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+								break;

+

+							}

+

+

+						}

+

+

+					}

+						break;

+

+					}

+

+					otherlv_5 = (Token) match(input, 22, FOLLOW_22_in_ruleimportExpression613);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_5, grammarAccess.getImportExpressionAccess().getSemicolonKeyword_2());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleimportExpression"

+

+

+	// $ANTLR start "entryRulepage"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:350:1: entryRulepage returns [EObject current=null] : iv_rulepage= rulepage EOF ;

+	public final EObject entryRulepage() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulepage = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:351:2: (iv_rulepage= rulepage EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:352:2: iv_rulepage= rulepage EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getPageRule());

+				}

+				pushFollow(FOLLOW_rulepage_in_entryRulepage649);

+				iv_rulepage = rulepage();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulepage;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulepage659);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulepage"

+

+

+	// $ANTLR start "rulepage"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:359:1: rulepage returns [EObject current=null] : ( () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0=

+	// rulepseudo_page ) )? otherlv_4= '{' ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )? )* otherlv_8= '}' ) ;

+	public final EObject rulepage() throws RecognitionException {

+		EObject current = null;

+

+		Token otherlv_1 = null;

+		Token otherlv_2 = null;

+		Token otherlv_4 = null;

+		Token otherlv_6 = null;

+		Token otherlv_8 = null;

+		AntlrDatatypeRuleToken lv_pseudoPage_3_0 = null;

+

+		EObject lv_declarations_5_0 = null;

+

+		EObject lv_declarations_7_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:362:28: ( ( () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4=

+			// '{' ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )? )* otherlv_8= '}' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:363:1: ( () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4= '{' (

+			// (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )? )* otherlv_8= '}' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:363:1: ( () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4=

+				// '{' ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )? )* otherlv_8= '}' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:363:2: () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4= '{'

+				// ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )? )* otherlv_8= '}'

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:363:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:364:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getPageAccess().getPageAction_0(),

+									current);

+

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:369:2: (otherlv_1= '@page' | otherlv_2= '@PAGE' )

+					int alt8 = 2;

+					int LA8_0 = input.LA(1);

+

+					if ((LA8_0 == 25)) {

+						alt8 = 1;

+					}

+					else if ((LA8_0 == 26)) {

+						alt8 = 2;

+					}

+					else {

+						if (state.backtracking > 0) {

+							state.failed = true;

+							return current;

+						}

+						NoViableAltException nvae =

+								new NoViableAltException("", 8, 0, input);

+

+						throw nvae;

+					}

+					switch (alt8) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:369:4: otherlv_1= '@page'

+					{

+						otherlv_1 = (Token) match(input, 25, FOLLOW_25_in_rulepage706);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_1, grammarAccess.getPageAccess().getPageKeyword_1_0());

+

+						}

+

+					}

+						break;

+					case 2:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:374:7: otherlv_2= '@PAGE'

+					{

+						otherlv_2 = (Token) match(input, 26, FOLLOW_26_in_rulepage724);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_2, grammarAccess.getPageAccess().getPAGEKeyword_1_1());

+

+						}

+

+					}

+						break;

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:378:2: ( (lv_pseudoPage_3_0= rulepseudo_page ) )?

+					int alt9 = 2;

+					int LA9_0 = input.LA(1);

+

+					if ((LA9_0 == RULE_COLON)) {

+						alt9 = 1;

+					}

+					switch (alt9) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:379:1: (lv_pseudoPage_3_0= rulepseudo_page )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:379:1: (lv_pseudoPage_3_0= rulepseudo_page )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:380:3: lv_pseudoPage_3_0= rulepseudo_page

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getPageAccess().getPseudoPagePseudo_pageParserRuleCall_2_0());

+

+							}

+							pushFollow(FOLLOW_rulepseudo_page_in_rulepage746);

+							lv_pseudoPage_3_0 = rulepseudo_page();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getPageRule());

+								}

+								set(

+										current,

+										"pseudoPage",

+										lv_pseudoPage_3_0,

+										"pseudo_page");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+						break;

+

+					}

+

+					otherlv_4 = (Token) match(input, 27, FOLLOW_27_in_rulepage759);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_4, grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_3());

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:400:1: ( (lv_declarations_5_0= rulecss_declaration ) )?

+					int alt10 = 2;

+					int LA10_0 = input.LA(1);

+

+					if ((LA10_0 == RULE_WS || (LA10_0 >= RULE_DASH && LA10_0 <= RULE_ONE_NON_HEX_LETTER) || (LA10_0 >= 56 && LA10_0 <= 59))) {

+						alt10 = 1;

+					}

+					switch (alt10) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:401:1: (lv_declarations_5_0= rulecss_declaration )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:401:1: (lv_declarations_5_0= rulecss_declaration )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:402:3: lv_declarations_5_0= rulecss_declaration

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_4_0());

+

+							}

+							pushFollow(FOLLOW_rulecss_declaration_in_rulepage780);

+							lv_declarations_5_0 = rulecss_declaration();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getPageRule());

+								}

+								add(

+										current,

+										"declarations",

+										lv_declarations_5_0,

+										"css_declaration");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+						break;

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:418:3: (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )? )*

+					loop12: do {

+						int alt12 = 2;

+						int LA12_0 = input.LA(1);

+

+						if ((LA12_0 == 22)) {

+							alt12 = 1;

+						}

+

+

+						switch (alt12) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:418:5: otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )?

+						{

+							otherlv_6 = (Token) match(input, 22, FOLLOW_22_in_rulepage794);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(otherlv_6, grammarAccess.getPageAccess().getSemicolonKeyword_5_0());

+

+							}

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:422:1: ( (lv_declarations_7_0= rulecss_declaration ) )?

+							int alt11 = 2;

+							int LA11_0 = input.LA(1);

+

+							if ((LA11_0 == RULE_WS || (LA11_0 >= RULE_DASH && LA11_0 <= RULE_ONE_NON_HEX_LETTER) || (LA11_0 >= 56 && LA11_0 <= 59))) {

+								alt11 = 1;

+							}

+							switch (alt11) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:423:1: (lv_declarations_7_0= rulecss_declaration )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:423:1: (lv_declarations_7_0= rulecss_declaration )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:424:3: lv_declarations_7_0= rulecss_declaration

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_5_1_0());

+

+									}

+									pushFollow(FOLLOW_rulecss_declaration_in_rulepage815);

+									lv_declarations_7_0 = rulecss_declaration();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getPageRule());

+										}

+										add(

+												current,

+												"declarations",

+												lv_declarations_7_0,

+												"css_declaration");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+								break;

+

+							}

+

+

+						}

+							break;

+

+						default:

+							break loop12;

+						}

+					} while (true);

+

+					otherlv_8 = (Token) match(input, 28, FOLLOW_28_in_rulepage830);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_8, grammarAccess.getPageAccess().getRightCurlyBracketKeyword_6());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulepage"

+

+

+	// $ANTLR start "entryRulepseudo_page"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:452:1: entryRulepseudo_page returns [String current=null] : iv_rulepseudo_page= rulepseudo_page EOF ;

+	public final String entryRulepseudo_page() throws RecognitionException {

+		String current = null;

+

+		AntlrDatatypeRuleToken iv_rulepseudo_page = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:453:2: (iv_rulepseudo_page= rulepseudo_page EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:454:2: iv_rulepseudo_page= rulepseudo_page EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getPseudo_pageRule());

+				}

+				pushFollow(FOLLOW_rulepseudo_page_in_entryRulepseudo_page867);

+				iv_rulepseudo_page = rulepseudo_page();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulepseudo_page.getText();

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulepseudo_page878);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulepseudo_page"

+

+

+	// $ANTLR start "rulepseudo_page"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:461:1: rulepseudo_page returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_COLON_0= RULE_COLON

+	// this_Identifier_1= ruleIdentifier ) ;

+	public final AntlrDatatypeRuleToken rulepseudo_page() throws RecognitionException {

+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

+

+		Token this_COLON_0 = null;

+		AntlrDatatypeRuleToken this_Identifier_1 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:464:28: ( (this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:465:1: (this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:465:1: (this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:465:6: this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier

+				{

+					this_COLON_0 = (Token) match(input, RULE_COLON, FOLLOW_RULE_COLON_in_rulepseudo_page918);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(this_COLON_0);

+

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_COLON_0, grammarAccess.getPseudo_pageAccess().getCOLONTerminalRuleCall_0());

+

+					}

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getPseudo_pageAccess().getIdentifierParserRuleCall_1());

+

+					}

+					pushFollow(FOLLOW_ruleIdentifier_in_rulepseudo_page945);

+					this_Identifier_1 = ruleIdentifier();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(this_Identifier_1);

+

+					}

+					if (state.backtracking == 0) {

+

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulepseudo_page"

+

+

+	// $ANTLR start "entryRulemedia"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:491:1: entryRulemedia returns [EObject current=null] : iv_rulemedia= rulemedia EOF ;

+	public final EObject entryRulemedia() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulemedia = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:492:2: (iv_rulemedia= rulemedia EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:493:2: iv_rulemedia= rulemedia EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getMediaRule());

+				}

+				pushFollow(FOLLOW_rulemedia_in_entryRulemedia990);

+				iv_rulemedia = rulemedia();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulemedia;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulemedia1000);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulemedia"

+

+

+	// $ANTLR start "rulemedia"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:500:1: rulemedia returns [EObject current=null] : ( (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0=

+	// rulemedia_list ) ) otherlv_3= '{' ( (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}' ) ;

+	public final EObject rulemedia() throws RecognitionException {

+		EObject current = null;

+

+		Token otherlv_0 = null;

+		Token otherlv_1 = null;

+		Token otherlv_3 = null;

+		Token otherlv_5 = null;

+		AntlrDatatypeRuleToken lv_medialist_2_0 = null;

+

+		EObject lv_rulesets_4_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:503:28: ( ( (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' (

+			// (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:504:1: ( (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' (

+			// (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:504:1: ( (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' (

+				// (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:504:2: (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' (

+				// (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}'

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:504:2: (otherlv_0= '@media' | otherlv_1= '@MEDIA' )

+					int alt13 = 2;

+					int LA13_0 = input.LA(1);

+

+					if ((LA13_0 == 29)) {

+						alt13 = 1;

+					}

+					else if ((LA13_0 == 30)) {

+						alt13 = 2;

+					}

+					else {

+						if (state.backtracking > 0) {

+							state.failed = true;

+							return current;

+						}

+						NoViableAltException nvae =

+								new NoViableAltException("", 13, 0, input);

+

+						throw nvae;

+					}

+					switch (alt13) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:504:4: otherlv_0= '@media'

+					{

+						otherlv_0 = (Token) match(input, 29, FOLLOW_29_in_rulemedia1038);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_0, grammarAccess.getMediaAccess().getMediaKeyword_0_0());

+

+						}

+

+					}

+						break;

+					case 2:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:509:7: otherlv_1= '@MEDIA'

+					{

+						otherlv_1 = (Token) match(input, 30, FOLLOW_30_in_rulemedia1056);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_1, grammarAccess.getMediaAccess().getMEDIAKeyword_0_1());

+

+						}

+

+					}

+						break;

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:513:2: ( (lv_medialist_2_0= rulemedia_list ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:514:1: (lv_medialist_2_0= rulemedia_list )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:514:1: (lv_medialist_2_0= rulemedia_list )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:515:3: lv_medialist_2_0= rulemedia_list

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getMediaAccess().getMedialistMedia_listParserRuleCall_1_0());

+

+							}

+							pushFollow(FOLLOW_rulemedia_list_in_rulemedia1078);

+							lv_medialist_2_0 = rulemedia_list();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getMediaRule());

+								}

+								set(

+										current,

+										"medialist",

+										lv_medialist_2_0,

+										"media_list");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+					otherlv_3 = (Token) match(input, 27, FOLLOW_27_in_rulemedia1090);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_3, grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_2());

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:535:1: ( (lv_rulesets_4_0= ruleruleset ) )*

+					loop14: do {

+						int alt14 = 2;

+						int LA14_0 = input.LA(1);

+

+						if ((LA14_0 == RULE_COLON || LA14_0 == RULE_HASHMARK || (LA14_0 >= RULE_DASH && LA14_0 <= RULE_ONE_NON_HEX_LETTER) || LA14_0 == 35 || (LA14_0 >= 41 && LA14_0 <= 43) || (LA14_0 >= 56 && LA14_0 <= 59))) {

+							alt14 = 1;

+						}

+

+

+						switch (alt14) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:536:1: (lv_rulesets_4_0= ruleruleset )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:536:1: (lv_rulesets_4_0= ruleruleset )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:537:3: lv_rulesets_4_0= ruleruleset

+							{

+								if (state.backtracking == 0) {

+

+									newCompositeNode(grammarAccess.getMediaAccess().getRulesetsRulesetParserRuleCall_3_0());

+

+								}

+								pushFollow(FOLLOW_ruleruleset_in_rulemedia1111);

+								lv_rulesets_4_0 = ruleruleset();

+

+								state._fsp--;

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									if (current == null) {

+										current = createModelElementForParent(grammarAccess.getMediaRule());

+									}

+									add(

+											current,

+											"rulesets",

+											lv_rulesets_4_0,

+											"ruleset");

+									afterParserOrEnumRuleCall();

+

+								}

+

+							}

+

+

+						}

+							break;

+

+						default:

+							break loop14;

+						}

+					} while (true);

+

+					otherlv_5 = (Token) match(input, 28, FOLLOW_28_in_rulemedia1124);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_5, grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_4());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulemedia"

+

+

+	// $ANTLR start "entryRulemedia_list"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:565:1: entryRulemedia_list returns [String current=null] : iv_rulemedia_list= rulemedia_list EOF ;

+	public final String entryRulemedia_list() throws RecognitionException {

+		String current = null;

+

+		AntlrDatatypeRuleToken iv_rulemedia_list = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:566:2: (iv_rulemedia_list= rulemedia_list EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:567:2: iv_rulemedia_list= rulemedia_list EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getMedia_listRule());

+				}

+				pushFollow(FOLLOW_rulemedia_list_in_entryRulemedia_list1161);

+				iv_rulemedia_list = rulemedia_list();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulemedia_list.getText();

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulemedia_list1172);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulemedia_list"

+

+

+	// $ANTLR start "rulemedia_list"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:574:1: rulemedia_list returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_medium_0= rulemedium

+	// (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )* ) ;

+	public final AntlrDatatypeRuleToken rulemedia_list() throws RecognitionException {

+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

+

+		Token this_COMMA_1 = null;

+		AntlrDatatypeRuleToken this_medium_0 = null;

+

+		AntlrDatatypeRuleToken this_medium_2 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:577:28: ( (this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:578:1: (this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:578:1: (this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:579:5: this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )*

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_0());

+

+					}

+					pushFollow(FOLLOW_rulemedium_in_rulemedia_list1219);

+					this_medium_0 = rulemedium();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(this_medium_0);

+

+					}

+					if (state.backtracking == 0) {

+

+						afterParserOrEnumRuleCall();

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:589:1: (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )*

+					loop15: do {

+						int alt15 = 2;

+						int LA15_0 = input.LA(1);

+

+						if ((LA15_0 == RULE_COMMA)) {

+							alt15 = 1;

+						}

+

+

+						switch (alt15) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:589:6: this_COMMA_1= RULE_COMMA this_medium_2= rulemedium

+						{

+							this_COMMA_1 = (Token) match(input, RULE_COMMA, FOLLOW_RULE_COMMA_in_rulemedia_list1240);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current.merge(this_COMMA_1);

+

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(this_COMMA_1, grammarAccess.getMedia_listAccess().getCOMMATerminalRuleCall_1_0());

+

+							}

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_1_1());

+

+							}

+							pushFollow(FOLLOW_rulemedium_in_rulemedia_list1267);

+							this_medium_2 = rulemedium();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current.merge(this_medium_2);

+

+							}

+							if (state.backtracking == 0) {

+

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+							break;

+

+						default:

+							break loop15;

+						}

+					} while (true);

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulemedia_list"

+

+

+	// $ANTLR start "entryRulemedium"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:615:1: entryRulemedium returns [String current=null] : iv_rulemedium= rulemedium EOF ;

+	public final String entryRulemedium() throws RecognitionException {

+		String current = null;

+

+		AntlrDatatypeRuleToken iv_rulemedium = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:616:2: (iv_rulemedium= rulemedium EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:617:2: iv_rulemedium= rulemedium EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getMediumRule());

+				}

+				pushFollow(FOLLOW_rulemedium_in_entryRulemedium1315);

+				iv_rulemedium = rulemedium();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulemedium.getText();

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulemedium1326);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulemedium"

+

+

+	// $ANTLR start "rulemedium"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:624:1: rulemedium returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_Identifier_0=

+	// ruleIdentifier ;

+	public final AntlrDatatypeRuleToken rulemedium() throws RecognitionException {

+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

+

+		AntlrDatatypeRuleToken this_Identifier_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:627:28: (this_Identifier_0= ruleIdentifier )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:629:5: this_Identifier_0= ruleIdentifier

+			{

+				if (state.backtracking == 0) {

+

+					newCompositeNode(grammarAccess.getMediumAccess().getIdentifierParserRuleCall());

+

+				}

+				pushFollow(FOLLOW_ruleIdentifier_in_rulemedium1372);

+				this_Identifier_0 = ruleIdentifier();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+

+					current.merge(this_Identifier_0);

+

+				}

+				if (state.backtracking == 0) {

+

+					afterParserOrEnumRuleCall();

+

+				}

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulemedium"

+

+

+	// $ANTLR start "entryRulefont_face"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:647:1: entryRulefont_face returns [EObject current=null] : iv_rulefont_face= rulefont_face EOF ;

+	public final EObject entryRulefont_face() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulefont_face = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:648:2: (iv_rulefont_face= rulefont_face EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:649:2: iv_rulefont_face= rulefont_face EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getFont_faceRule());

+				}

+				pushFollow(FOLLOW_rulefont_face_in_entryRulefont_face1416);

+				iv_rulefont_face = rulefont_face();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulefont_face;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulefont_face1426);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulefont_face"

+

+

+	// $ANTLR start "rulefont_face"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:656:1: rulefont_face returns [EObject current=null] : ( () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3=

+	// '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' ) ;

+	public final EObject rulefont_face() throws RecognitionException {

+		EObject current = null;

+

+		Token otherlv_1 = null;

+		Token otherlv_2 = null;

+		Token otherlv_3 = null;

+		Token otherlv_5 = null;

+		Token otherlv_7 = null;

+		EObject lv_declarations_4_0 = null;

+

+		EObject lv_declarations_6_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:659:28: ( ( () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0=

+			// rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:660:1: ( () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0=

+			// rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:660:1: ( () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0=

+				// rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:660:2: () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0=

+				// rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}'

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:660:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:661:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getFont_faceAccess().getFont_faceAction_0(),

+									current);

+

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:666:2: (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' )

+					int alt16 = 2;

+					int LA16_0 = input.LA(1);

+

+					if ((LA16_0 == 31)) {

+						alt16 = 1;

+					}

+					else if ((LA16_0 == 32)) {

+						alt16 = 2;

+					}

+					else {

+						if (state.backtracking > 0) {

+							state.failed = true;

+							return current;

+						}

+						NoViableAltException nvae =

+								new NoViableAltException("", 16, 0, input);

+

+						throw nvae;

+					}

+					switch (alt16) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:666:4: otherlv_1= '@font-face'

+					{

+						otherlv_1 = (Token) match(input, 31, FOLLOW_31_in_rulefont_face1473);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_1, grammarAccess.getFont_faceAccess().getFontFaceKeyword_1_0());

+

+						}

+

+					}

+						break;

+					case 2:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:671:7: otherlv_2= '@FONT-FACE'

+					{

+						otherlv_2 = (Token) match(input, 32, FOLLOW_32_in_rulefont_face1491);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_2, grammarAccess.getFont_faceAccess().getFONTFACEKeyword_1_1());

+

+						}

+

+					}

+						break;

+

+					}

+

+					otherlv_3 = (Token) match(input, 27, FOLLOW_27_in_rulefont_face1504);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_3, grammarAccess.getFont_faceAccess().getLeftCurlyBracketKeyword_2());

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:679:1: ( (lv_declarations_4_0= rulecss_declaration ) )?

+					int alt17 = 2;

+					int LA17_0 = input.LA(1);

+

+					if ((LA17_0 == RULE_WS || (LA17_0 >= RULE_DASH && LA17_0 <= RULE_ONE_NON_HEX_LETTER) || (LA17_0 >= 56 && LA17_0 <= 59))) {

+						alt17 = 1;

+					}

+					switch (alt17) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:680:1: (lv_declarations_4_0= rulecss_declaration )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:680:1: (lv_declarations_4_0= rulecss_declaration )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:681:3: lv_declarations_4_0= rulecss_declaration

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_3_0());

+

+							}

+							pushFollow(FOLLOW_rulecss_declaration_in_rulefont_face1525);

+							lv_declarations_4_0 = rulecss_declaration();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getFont_faceRule());

+								}

+								add(

+										current,

+										"declarations",

+										lv_declarations_4_0,

+										"css_declaration");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+						break;

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:697:3: (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )*

+					loop19: do {

+						int alt19 = 2;

+						int LA19_0 = input.LA(1);

+

+						if ((LA19_0 == 22)) {

+							alt19 = 1;

+						}

+

+

+						switch (alt19) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:697:5: otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )?

+						{

+							otherlv_5 = (Token) match(input, 22, FOLLOW_22_in_rulefont_face1539);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(otherlv_5, grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0());

+

+							}

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:701:1: ( (lv_declarations_6_0= rulecss_declaration ) )?

+							int alt18 = 2;

+							int LA18_0 = input.LA(1);

+

+							if ((LA18_0 == RULE_WS || (LA18_0 >= RULE_DASH && LA18_0 <= RULE_ONE_NON_HEX_LETTER) || (LA18_0 >= 56 && LA18_0 <= 59))) {

+								alt18 = 1;

+							}

+							switch (alt18) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:702:1: (lv_declarations_6_0= rulecss_declaration )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:702:1: (lv_declarations_6_0= rulecss_declaration )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:703:3: lv_declarations_6_0= rulecss_declaration

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_4_1_0());

+

+									}

+									pushFollow(FOLLOW_rulecss_declaration_in_rulefont_face1560);

+									lv_declarations_6_0 = rulecss_declaration();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getFont_faceRule());

+										}

+										add(

+												current,

+												"declarations",

+												lv_declarations_6_0,

+												"css_declaration");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+								break;

+

+							}

+

+

+						}

+							break;

+

+						default:

+							break loop19;

+						}

+					} while (true);

+

+					otherlv_7 = (Token) match(input, 28, FOLLOW_28_in_rulefont_face1575);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_7, grammarAccess.getFont_faceAccess().getRightCurlyBracketKeyword_5());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulefont_face"

+

+

+	// $ANTLR start "entryRulekeyframes"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:731:1: entryRulekeyframes returns [EObject current=null] : iv_rulekeyframes= rulekeyframes EOF ;

+	public final EObject entryRulekeyframes() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulekeyframes = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:732:2: (iv_rulekeyframes= rulekeyframes EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:733:2: iv_rulekeyframes= rulekeyframes EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getKeyframesRule());

+				}

+				pushFollow(FOLLOW_rulekeyframes_in_entryRulekeyframes1611);

+				iv_rulekeyframes = rulekeyframes();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulekeyframes;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulekeyframes1621);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulekeyframes"

+

+

+	// $ANTLR start "rulekeyframes"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:740:1: rulekeyframes returns [EObject current=null] : ( () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) (

+	// (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )? )* otherlv_8= '}' ) ;

+	public final EObject rulekeyframes() throws RecognitionException {

+		EObject current = null;

+

+		Token otherlv_1 = null;

+		Token otherlv_2 = null;

+		Token otherlv_4 = null;

+		Token otherlv_6 = null;

+		Token otherlv_8 = null;

+		AntlrDatatypeRuleToken lv_name_3_0 = null;

+

+		EObject lv_keyframeselectors_5_0 = null;

+

+		EObject lv_keyframeselectors_7_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:743:28: ( ( () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4=

+			// '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )? )* otherlv_8= '}' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:744:1: ( () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '{'

+			// ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )? )* otherlv_8= '}' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:744:1: ( () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4=

+				// '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )? )* otherlv_8= '}' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:744:2: () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4=

+				// '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )? )* otherlv_8= '}'

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:744:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:745:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getKeyframesAccess().getFont_faceAction_0(),

+									current);

+

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:750:2: (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' )

+					int alt20 = 2;

+					int LA20_0 = input.LA(1);

+

+					if ((LA20_0 == 33)) {

+						alt20 = 1;

+					}

+					else if ((LA20_0 == 34)) {

+						alt20 = 2;

+					}

+					else {

+						if (state.backtracking > 0) {

+							state.failed = true;

+							return current;

+						}

+						NoViableAltException nvae =

+								new NoViableAltException("", 20, 0, input);

+

+						throw nvae;

+					}

+					switch (alt20) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:750:4: otherlv_1= '@keyframes'

+					{

+						otherlv_1 = (Token) match(input, 33, FOLLOW_33_in_rulekeyframes1668);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_1, grammarAccess.getKeyframesAccess().getKeyframesKeyword_1_0());

+

+						}

+

+					}

+						break;

+					case 2:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:755:7: otherlv_2= '@KEYFRAMES'

+					{

+						otherlv_2 = (Token) match(input, 34, FOLLOW_34_in_rulekeyframes1686);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_2, grammarAccess.getKeyframesAccess().getKEYFRAMESKeyword_1_1());

+

+						}

+

+					}

+						break;

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:759:2: ( (lv_name_3_0= ruleIdentifier ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:760:1: (lv_name_3_0= ruleIdentifier )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:760:1: (lv_name_3_0= ruleIdentifier )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:761:3: lv_name_3_0= ruleIdentifier

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getKeyframesAccess().getNameIdentifierParserRuleCall_2_0());

+

+							}

+							pushFollow(FOLLOW_ruleIdentifier_in_rulekeyframes1708);

+							lv_name_3_0 = ruleIdentifier();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getKeyframesRule());

+								}

+								set(

+										current,

+										"name",

+										lv_name_3_0,

+										"Identifier");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+					otherlv_4 = (Token) match(input, 27, FOLLOW_27_in_rulekeyframes1720);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_4, grammarAccess.getKeyframesAccess().getLeftCurlyBracketKeyword_3());

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:781:1: ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )?

+					int alt21 = 2;

+					int LA21_0 = input.LA(1);

+

+					if (((LA21_0 >= RULE_PLUS && LA21_0 <= RULE_ONE_INT) || LA21_0 == 41 || (LA21_0 >= 56 && LA21_0 <= 59))) {

+						alt21 = 1;

+					}

+					switch (alt21) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:782:1: (lv_keyframeselectors_5_0= rulekeyframe_selector )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:782:1: (lv_keyframeselectors_5_0= rulekeyframe_selector )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:783:3: lv_keyframeselectors_5_0= rulekeyframe_selector

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_4_0());

+

+							}

+							pushFollow(FOLLOW_rulekeyframe_selector_in_rulekeyframes1741);

+							lv_keyframeselectors_5_0 = rulekeyframe_selector();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getKeyframesRule());

+								}

+								add(

+										current,

+										"keyframeselectors",

+										lv_keyframeselectors_5_0,

+										"keyframe_selector");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+						break;

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:799:3: (otherlv_6= ';' ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )? )*

+					loop23: do {

+						int alt23 = 2;

+						int LA23_0 = input.LA(1);

+

+						if ((LA23_0 == 22)) {

+							alt23 = 1;

+						}

+

+

+						switch (alt23) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:799:5: otherlv_6= ';' ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )?

+						{

+							otherlv_6 = (Token) match(input, 22, FOLLOW_22_in_rulekeyframes1755);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(otherlv_6, grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0());

+

+							}

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:803:1: ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )?

+							int alt22 = 2;

+							int LA22_0 = input.LA(1);

+

+							if (((LA22_0 >= RULE_PLUS && LA22_0 <= RULE_ONE_INT) || LA22_0 == 41 || (LA22_0 >= 56 && LA22_0 <= 59))) {

+								alt22 = 1;

+							}

+							switch (alt22) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:804:1: (lv_keyframeselectors_7_0= rulekeyframe_selector )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:804:1: (lv_keyframeselectors_7_0= rulekeyframe_selector )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:805:3: lv_keyframeselectors_7_0= rulekeyframe_selector

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_5_1_0());

+

+									}

+									pushFollow(FOLLOW_rulekeyframe_selector_in_rulekeyframes1776);

+									lv_keyframeselectors_7_0 = rulekeyframe_selector();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getKeyframesRule());

+										}

+										add(

+												current,

+												"keyframeselectors",

+												lv_keyframeselectors_7_0,

+												"keyframe_selector");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+								break;

+

+							}

+

+

+						}

+							break;

+

+						default:

+							break loop23;

+						}

+					} while (true);

+

+					otherlv_8 = (Token) match(input, 28, FOLLOW_28_in_rulekeyframes1791);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_8, grammarAccess.getKeyframesAccess().getRightCurlyBracketKeyword_6());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulekeyframes"

+

+

+	// $ANTLR start "entryRulekeyframe_selector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:833:1: entryRulekeyframe_selector returns [EObject current=null] : iv_rulekeyframe_selector= rulekeyframe_selector EOF ;

+	public final EObject entryRulekeyframe_selector() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulekeyframe_selector = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:834:2: (iv_rulekeyframe_selector= rulekeyframe_selector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:835:2: iv_rulekeyframe_selector= rulekeyframe_selector EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getKeyframe_selectorRule());

+				}

+				pushFollow(FOLLOW_rulekeyframe_selector_in_entryRulekeyframe_selector1827);

+				iv_rulekeyframe_selector = rulekeyframe_selector();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulekeyframe_selector;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulekeyframe_selector1837);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulekeyframe_selector"

+

+

+	// $ANTLR start "rulekeyframe_selector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:842:1: rulekeyframe_selector returns [EObject current=null] : ( ( ( (lv_type_0_0= ruleIdentifier ) ) | ( (

+	// (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' ) ;

+	public final EObject rulekeyframe_selector() throws RecognitionException {

+		EObject current = null;

+

+		Token this_PERCENT_2 = null;

+		Token otherlv_3 = null;

+		Token otherlv_5 = null;

+		Token otherlv_7 = null;

+		AntlrDatatypeRuleToken lv_type_0_0 = null;

+

+		AntlrDatatypeRuleToken lv_percentage_1_0 = null;

+

+		EObject lv_declarations_4_0 = null;

+

+		EObject lv_declarations_6_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:845:28: ( ( ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2=

+			// RULE_PERCENT ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:846:1: ( ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT )

+			// ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:846:1: ( ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2=

+				// RULE_PERCENT ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:846:2: ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT

+				// ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}'

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:846:2: ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2=

+					// RULE_PERCENT ) )

+					int alt24 = 2;

+					switch (input.LA(1)) {

+					case RULE_DASH: {

+						int LA24_1 = input.LA(2);

+

+						if (((LA24_1 >= RULE_UNDERSCORE && LA24_1 <= RULE_ONE_NON_HEX_LETTER) || (LA24_1 >= 56 && LA24_1 <= 59))) {

+							alt24 = 1;

+						}

+						else if ((LA24_1 == RULE_ONE_INT || LA24_1 == 41)) {

+							alt24 = 2;

+						}

+						else {

+							if (state.backtracking > 0) {

+								state.failed = true;

+								return current;

+							}

+							NoViableAltException nvae =

+									new NoViableAltException("", 24, 1, input);

+

+							throw nvae;

+						}

+					}

+						break;

+					case RULE_UNDERSCORE:

+					case RULE_ONE_HEX_LETTER:

+					case RULE_ONE_NON_HEX_LETTER:

+					case 56:

+					case 57:

+					case 58:

+					case 59: {

+						alt24 = 1;

+					}

+						break;

+					case RULE_PLUS:

+					case RULE_ONE_INT:

+					case 41: {

+						alt24 = 2;

+					}

+						break;

+					default:

+						if (state.backtracking > 0) {

+							state.failed = true;

+							return current;

+						}

+						NoViableAltException nvae =

+								new NoViableAltException("", 24, 0, input);

+

+						throw nvae;

+					}

+

+					switch (alt24) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:846:3: ( (lv_type_0_0= ruleIdentifier ) )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:846:3: ( (lv_type_0_0= ruleIdentifier ) )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:847:1: (lv_type_0_0= ruleIdentifier )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:847:1: (lv_type_0_0= ruleIdentifier )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:848:3: lv_type_0_0= ruleIdentifier

+							{

+								if (state.backtracking == 0) {

+

+									newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getTypeIdentifierParserRuleCall_0_0_0());

+

+								}

+								pushFollow(FOLLOW_ruleIdentifier_in_rulekeyframe_selector1884);

+								lv_type_0_0 = ruleIdentifier();

+

+								state._fsp--;

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									if (current == null) {

+										current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());

+									}

+									set(

+											current,

+											"type",

+											lv_type_0_0,

+											"Identifier");

+									afterParserOrEnumRuleCall();

+

+								}

+

+							}

+

+

+						}

+

+

+					}

+						break;

+					case 2:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:865:6: ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:865:6: ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:865:7: ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:865:7: ( (lv_percentage_1_0= ruleNum ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:866:1: (lv_percentage_1_0= ruleNum )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:866:1: (lv_percentage_1_0= ruleNum )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:867:3: lv_percentage_1_0= ruleNum

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getPercentageNumParserRuleCall_0_1_0_0());

+

+									}

+									pushFollow(FOLLOW_ruleNum_in_rulekeyframe_selector1912);

+									lv_percentage_1_0 = ruleNum();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());

+										}

+										set(

+												current,

+												"percentage",

+												lv_percentage_1_0,

+												"Num");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+							this_PERCENT_2 = (Token) match(input, RULE_PERCENT, FOLLOW_RULE_PERCENT_in_rulekeyframe_selector1923);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(this_PERCENT_2, grammarAccess.getKeyframe_selectorAccess().getPERCENTTerminalRuleCall_0_1_1());

+

+							}

+

+						}

+

+

+					}

+						break;

+

+					}

+

+					otherlv_3 = (Token) match(input, 27, FOLLOW_27_in_rulekeyframe_selector1936);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_3, grammarAccess.getKeyframe_selectorAccess().getLeftCurlyBracketKeyword_1());

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:891:1: ( (lv_declarations_4_0= rulecss_declaration ) )?

+					int alt25 = 2;

+					int LA25_0 = input.LA(1);

+

+					if ((LA25_0 == RULE_WS || (LA25_0 >= RULE_DASH && LA25_0 <= RULE_ONE_NON_HEX_LETTER) || (LA25_0 >= 56 && LA25_0 <= 59))) {

+						alt25 = 1;

+					}

+					switch (alt25) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:892:1: (lv_declarations_4_0= rulecss_declaration )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:892:1: (lv_declarations_4_0= rulecss_declaration )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:893:3: lv_declarations_4_0= rulecss_declaration

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_2_0());

+

+							}

+							pushFollow(FOLLOW_rulecss_declaration_in_rulekeyframe_selector1957);

+							lv_declarations_4_0 = rulecss_declaration();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());

+								}

+								add(

+										current,

+										"declarations",

+										lv_declarations_4_0,

+										"css_declaration");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+						break;

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:909:3: (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )*

+					loop27: do {

+						int alt27 = 2;

+						int LA27_0 = input.LA(1);

+

+						if ((LA27_0 == 22)) {

+							alt27 = 1;

+						}

+

+

+						switch (alt27) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:909:5: otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )?

+						{

+							otherlv_5 = (Token) match(input, 22, FOLLOW_22_in_rulekeyframe_selector1971);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(otherlv_5, grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0());

+

+							}

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:913:1: ( (lv_declarations_6_0= rulecss_declaration ) )?

+							int alt26 = 2;

+							int LA26_0 = input.LA(1);

+

+							if ((LA26_0 == RULE_WS || (LA26_0 >= RULE_DASH && LA26_0 <= RULE_ONE_NON_HEX_LETTER) || (LA26_0 >= 56 && LA26_0 <= 59))) {

+								alt26 = 1;

+							}

+							switch (alt26) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:914:1: (lv_declarations_6_0= rulecss_declaration )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:914:1: (lv_declarations_6_0= rulecss_declaration )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:915:3: lv_declarations_6_0= rulecss_declaration

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_3_1_0());

+

+									}

+									pushFollow(FOLLOW_rulecss_declaration_in_rulekeyframe_selector1992);

+									lv_declarations_6_0 = rulecss_declaration();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());

+										}

+										add(

+												current,

+												"declarations",

+												lv_declarations_6_0,

+												"css_declaration");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+								break;

+

+							}

+

+

+						}

+							break;

+

+						default:

+							break loop27;

+						}

+					} while (true);

+

+					otherlv_7 = (Token) match(input, 28, FOLLOW_28_in_rulekeyframe_selector2007);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_7, grammarAccess.getKeyframe_selectorAccess().getRightCurlyBracketKeyword_4());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulekeyframe_selector"

+

+

+	// $ANTLR start "entryRuleruleset"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:943:1: entryRuleruleset returns [EObject current=null] : iv_ruleruleset= ruleruleset EOF ;

+	public final EObject entryRuleruleset() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleruleset = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:944:2: (iv_ruleruleset= ruleruleset EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:945:2: iv_ruleruleset= ruleruleset EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getRulesetRule());

+				}

+				pushFollow(FOLLOW_ruleruleset_in_entryRuleruleset2043);

+				iv_ruleruleset = ruleruleset();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleruleset;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleruleset2053);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleruleset"

+

+

+	// $ANTLR start "ruleruleset"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:952:1: ruleruleset returns [EObject current=null] : ( ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )*

+	// this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( ( (lv_declarations_6_0= rulecss_declaration ) ) (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )?

+	// otherlv_10= '}' ) ;

+	public final EObject ruleruleset() throws RecognitionException {

+		EObject current = null;

+

+		Token this_WS_1 = null;

+		Token this_COMMA_2 = null;

+		Token this_WS_4 = null;

+		Token otherlv_5 = null;

+		Token otherlv_7 = null;

+		Token otherlv_9 = null;

+		Token otherlv_10 = null;

+		EObject lv_selectors_0_0 = null;

+

+		EObject lv_selectors_3_0 = null;

+

+		EObject lv_declarations_6_0 = null;

+

+		EObject lv_declarations_8_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:955:28: ( ( ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA (

+			// (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( ( (lv_declarations_6_0= rulecss_declaration ) ) (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:956:1: ( ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA (

+			// (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( ( (lv_declarations_6_0= rulecss_declaration ) ) (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:956:1: ( ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA (

+				// (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( ( (lv_declarations_6_0= rulecss_declaration ) ) (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:956:2: ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA (

+				// (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( ( (lv_declarations_6_0= rulecss_declaration ) ) (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}'

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:956:2: ( (lv_selectors_0_0= ruleselector ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:957:1: (lv_selectors_0_0= ruleselector )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:957:1: (lv_selectors_0_0= ruleselector )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:958:3: lv_selectors_0_0= ruleselector

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0());

+

+							}

+							pushFollow(FOLLOW_ruleselector_in_ruleruleset2099);

+							lv_selectors_0_0 = ruleselector();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getRulesetRule());

+								}

+								add(

+										current,

+										"selectors",

+										lv_selectors_0_0,

+										"selector");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:974:2: ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )*

+					loop29: do {

+						int alt29 = 2;

+						alt29 = dfa29.predict(input);

+						switch (alt29) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:974:3: (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:974:3: (this_WS_1= RULE_WS )*

+							loop28: do {

+								int alt28 = 2;

+								int LA28_0 = input.LA(1);

+

+								if ((LA28_0 == RULE_WS)) {

+									alt28 = 1;

+								}

+

+

+								switch (alt28) {

+								case 1:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:974:4: this_WS_1= RULE_WS

+								{

+									this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleruleset2112);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(this_WS_1, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_0());

+

+									}

+

+								}

+									break;

+

+								default:

+									break loop28;

+								}

+							} while (true);

+

+							this_COMMA_2 = (Token) match(input, RULE_COMMA, FOLLOW_RULE_COMMA_in_ruleruleset2124);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(this_COMMA_2, grammarAccess.getRulesetAccess().getCOMMATerminalRuleCall_1_1());

+

+							}

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:982:1: ( (lv_selectors_3_0= ruleselector ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:983:1: (lv_selectors_3_0= ruleselector )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:983:1: (lv_selectors_3_0= ruleselector )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:984:3: lv_selectors_3_0= ruleselector

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0());

+

+									}

+									pushFollow(FOLLOW_ruleselector_in_ruleruleset2144);

+									lv_selectors_3_0 = ruleselector();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getRulesetRule());

+										}

+										add(

+												current,

+												"selectors",

+												lv_selectors_3_0,

+												"selector");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+

+						}

+							break;

+

+						default:

+							break loop29;

+						}

+					} while (true);

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1000:4: (this_WS_4= RULE_WS )*

+					loop30: do {

+						int alt30 = 2;

+						int LA30_0 = input.LA(1);

+

+						if ((LA30_0 == RULE_WS)) {

+							alt30 = 1;

+						}

+

+

+						switch (alt30) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1000:5: this_WS_4= RULE_WS

+						{

+							this_WS_4 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleruleset2158);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(this_WS_4, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_2());

+

+							}

+

+						}

+							break;

+

+						default:

+							break loop30;

+						}

+					} while (true);

+

+					otherlv_5 = (Token) match(input, 27, FOLLOW_27_in_ruleruleset2171);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_5, grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_3());

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1008:1: ( ( (lv_declarations_6_0= rulecss_declaration ) ) (otherlv_7= ';' ( (lv_declarations_8_0=

+					// rulecss_declaration ) ) )* (otherlv_9= ';' )? )?

+					int alt33 = 2;

+					int LA33_0 = input.LA(1);

+

+					if ((LA33_0 == RULE_WS || (LA33_0 >= RULE_DASH && LA33_0 <= RULE_ONE_NON_HEX_LETTER) || (LA33_0 >= 56 && LA33_0 <= 59))) {

+						alt33 = 1;

+					}

+					switch (alt33) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1008:2: ( (lv_declarations_6_0= rulecss_declaration ) ) (otherlv_7= ';' ( (lv_declarations_8_0=

+					// rulecss_declaration ) ) )* (otherlv_9= ';' )?

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1008:2: ( (lv_declarations_6_0= rulecss_declaration ) )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1009:1: (lv_declarations_6_0= rulecss_declaration )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1009:1: (lv_declarations_6_0= rulecss_declaration )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1010:3: lv_declarations_6_0= rulecss_declaration

+							{

+								if (state.backtracking == 0) {

+

+									newCompositeNode(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_0_0());

+

+								}

+								pushFollow(FOLLOW_rulecss_declaration_in_ruleruleset2193);

+								lv_declarations_6_0 = rulecss_declaration();

+

+								state._fsp--;

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									if (current == null) {

+										current = createModelElementForParent(grammarAccess.getRulesetRule());

+									}

+									add(

+											current,

+											"declarations",

+											lv_declarations_6_0,

+											"css_declaration");

+									afterParserOrEnumRuleCall();

+

+								}

+

+							}

+

+

+						}

+

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1026:2: (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )*

+						loop31: do {

+							int alt31 = 2;

+							int LA31_0 = input.LA(1);

+

+							if ((LA31_0 == 22)) {

+								int LA31_1 = input.LA(2);

+

+								if ((LA31_1 == RULE_WS || (LA31_1 >= RULE_DASH && LA31_1 <= RULE_ONE_NON_HEX_LETTER) || (LA31_1 >= 56 && LA31_1 <= 59))) {

+									alt31 = 1;

+								}

+

+

+							}

+

+

+							switch (alt31) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1026:4: otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) )

+							{

+								otherlv_7 = (Token) match(input, 22, FOLLOW_22_in_ruleruleset2206);

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									newLeafNode(otherlv_7, grammarAccess.getRulesetAccess().getSemicolonKeyword_4_1_0());

+

+								}

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1030:1: ( (lv_declarations_8_0= rulecss_declaration ) )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1031:1: (lv_declarations_8_0= rulecss_declaration )

+								{

+									// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1031:1: (lv_declarations_8_0= rulecss_declaration )

+									// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1032:3: lv_declarations_8_0= rulecss_declaration

+									{

+										if (state.backtracking == 0) {

+

+											newCompositeNode(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_1_1_0());

+

+										}

+										pushFollow(FOLLOW_rulecss_declaration_in_ruleruleset2227);

+										lv_declarations_8_0 = rulecss_declaration();

+

+										state._fsp--;

+										if (state.failed) {

+											return current;

+										}

+										if (state.backtracking == 0) {

+

+											if (current == null) {

+												current = createModelElementForParent(grammarAccess.getRulesetRule());

+											}

+											add(

+													current,

+													"declarations",

+													lv_declarations_8_0,

+													"css_declaration");

+											afterParserOrEnumRuleCall();

+

+										}

+

+									}

+

+

+								}

+

+

+							}

+								break;

+

+							default:

+								break loop31;

+							}

+						} while (true);

+

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1048:4: (otherlv_9= ';' )?

+						int alt32 = 2;

+						int LA32_0 = input.LA(1);

+

+						if ((LA32_0 == 22)) {

+							alt32 = 1;

+						}

+						switch (alt32) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1048:6: otherlv_9= ';'

+						{

+							otherlv_9 = (Token) match(input, 22, FOLLOW_22_in_ruleruleset2242);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(otherlv_9, grammarAccess.getRulesetAccess().getSemicolonKeyword_4_2());

+

+							}

+

+						}

+							break;

+

+						}

+

+

+					}

+						break;

+

+					}

+

+					otherlv_10 = (Token) match(input, 28, FOLLOW_28_in_ruleruleset2258);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_10, grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_5());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleruleset"

+

+

+	// $ANTLR start "entryRuleselector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1064:1: entryRuleselector returns [EObject current=null] : iv_ruleselector= ruleselector EOF ;

+	public final EObject entryRuleselector() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleselector = null;

+

+

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1068:2: (iv_ruleselector= ruleselector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1069:2: iv_ruleselector= ruleselector EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleselector_in_entryRuleselector2300);

+				iv_ruleselector = ruleselector();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleselector;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleselector2310);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleselector"

+

+

+	// $ANTLR start "ruleselector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1079:1: ruleselector returns [EObject current=null] : ( ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( (

+	// (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )? ) ;

+	public final EObject ruleselector() throws RecognitionException {

+		EObject current = null;

+

+		Token this_WS_2 = null;

+		Token this_WS_4 = null;

+		Token this_WS_6 = null;

+		EObject lv_simpleselectors_0_0 = null;

+

+		AntlrDatatypeRuleToken lv_combinator_1_0 = null;

+

+		EObject lv_selector_3_0 = null;

+

+		AntlrDatatypeRuleToken lv_combinator_5_0 = null;

+

+		EObject lv_selector_7_0 = null;

+

+

+		enterRule();

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1083:28: ( ( ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) )

+			// (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1084:1: ( ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) )

+			// (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1084:1: ( ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) )

+				// (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1084:2: ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) )

+				// (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )?

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1084:2: ( (lv_simpleselectors_0_0= rulesimple_selector ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1085:1: (lv_simpleselectors_0_0= rulesimple_selector )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1085:1: (lv_simpleselectors_0_0= rulesimple_selector )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1086:3: lv_simpleselectors_0_0= rulesimple_selector

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getSelectorAccess().getSimpleselectorsSimple_selectorParserRuleCall_0_0());

+

+							}

+							pushFollow(FOLLOW_rulesimple_selector_in_ruleselector2360);

+							lv_simpleselectors_0_0 = rulesimple_selector();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getSelectorRule());

+								}

+								add(

+										current,

+										"simpleselectors",

+										lv_simpleselectors_0_0,

+										"simple_selector");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1102:2: ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0=

+					// ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )?

+					int alt38 = 3;

+					alt38 = dfa38.predict(input);

+					switch (alt38) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1102:3: ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector

+					// ) ) )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1102:3: ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0=

+						// ruleselector ) ) )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1102:4: ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0=

+						// ruleselector ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1102:4: ( (lv_combinator_1_0= rulecombinator ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1103:1: (lv_combinator_1_0= rulecombinator )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1103:1: (lv_combinator_1_0= rulecombinator )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1104:3: lv_combinator_1_0= rulecombinator

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_0_0_0());

+

+									}

+									pushFollow(FOLLOW_rulecombinator_in_ruleselector2383);

+									lv_combinator_1_0 = rulecombinator();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getSelectorRule());

+										}

+										set(

+												current,

+												"combinator",

+												lv_combinator_1_0,

+												"combinator");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1120:2: (this_WS_2= RULE_WS )*

+							loop34: do {

+								int alt34 = 2;

+								int LA34_0 = input.LA(1);

+

+								if ((LA34_0 == RULE_WS)) {

+									alt34 = 1;

+								}

+

+

+								switch (alt34) {

+								case 1:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1120:3: this_WS_2= RULE_WS

+								{

+									this_WS_2 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleselector2395);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(this_WS_2, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_0_1());

+

+									}

+

+								}

+									break;

+

+								default:

+									break loop34;

+								}

+							} while (true);

+

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1124:3: ( (lv_selector_3_0= ruleselector ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1125:1: (lv_selector_3_0= ruleselector )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1125:1: (lv_selector_3_0= ruleselector )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1126:3: lv_selector_3_0= ruleselector

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_0_2_0());

+

+									}

+									pushFollow(FOLLOW_ruleselector_in_ruleselector2417);

+									lv_selector_3_0 = ruleselector();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getSelectorRule());

+										}

+										set(

+												current,

+												"selector",

+												lv_selector_3_0,

+												"selector");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+

+						}

+

+

+					}

+						break;

+					case 2:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1143:6: ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? (

+					// (lv_selector_7_0= ruleselector ) ) )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1143:6: ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )?

+						// ( (lv_selector_7_0= ruleselector ) ) )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1143:7: (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? (

+						// (lv_selector_7_0= ruleselector ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1143:7: (this_WS_4= RULE_WS )+

+							int cnt35 = 0;

+							loop35: do {

+								int alt35 = 2;

+								int LA35_0 = input.LA(1);

+

+								if ((LA35_0 == RULE_WS)) {

+									alt35 = 1;

+								}

+

+

+								switch (alt35) {

+								case 1:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1143:8: this_WS_4= RULE_WS

+								{

+									this_WS_4 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleselector2437);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(this_WS_4, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0());

+

+									}

+

+								}

+									break;

+

+								default:

+									if (cnt35 >= 1) {

+										break loop35;

+									}

+									if (state.backtracking > 0) {

+										state.failed = true;

+										return current;

+									}

+									EarlyExitException eee =

+											new EarlyExitException(35, input);

+									throw eee;

+								}

+								cnt35++;

+							} while (true);

+

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1147:3: ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )?

+							int alt37 = 2;

+							int LA37_0 = input.LA(1);

+

+							if ((LA37_0 == RULE_PLUS || (LA37_0 >= 47 && LA37_0 <= 48))) {

+								alt37 = 1;

+							}

+							switch (alt37) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1147:4: ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )*

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1147:4: ( (lv_combinator_5_0= rulecombinator ) )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1148:1: (lv_combinator_5_0= rulecombinator )

+								{

+									// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1148:1: (lv_combinator_5_0= rulecombinator )

+									// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1149:3: lv_combinator_5_0= rulecombinator

+									{

+										if (state.backtracking == 0) {

+

+											newCompositeNode(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0_0());

+

+										}

+										pushFollow(FOLLOW_rulecombinator_in_ruleselector2460);

+										lv_combinator_5_0 = rulecombinator();

+

+										state._fsp--;

+										if (state.failed) {

+											return current;

+										}

+										if (state.backtracking == 0) {

+

+											if (current == null) {

+												current = createModelElementForParent(grammarAccess.getSelectorRule());

+											}

+											set(

+													current,

+													"combinator",

+													lv_combinator_5_0,

+													"combinator");

+											afterParserOrEnumRuleCall();

+

+										}

+

+									}

+

+

+								}

+

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1165:2: (this_WS_6= RULE_WS )*

+								loop36: do {

+									int alt36 = 2;

+									int LA36_0 = input.LA(1);

+

+									if ((LA36_0 == RULE_WS)) {

+										alt36 = 1;

+									}

+

+

+									switch (alt36) {

+									case 1:

+									// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1165:3: this_WS_6= RULE_WS

+									{

+										this_WS_6 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleselector2472);

+										if (state.failed) {

+											return current;

+										}

+										if (state.backtracking == 0) {

+

+											newLeafNode(this_WS_6, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_1_1());

+

+										}

+

+									}

+										break;

+

+									default:

+										break loop36;

+									}

+								} while (true);

+

+

+							}

+								break;

+

+							}

+

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1169:5: ( (lv_selector_7_0= ruleselector ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1170:1: (lv_selector_7_0= ruleselector )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1170:1: (lv_selector_7_0= ruleselector )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1171:3: lv_selector_7_0= ruleselector

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_1_2_0());

+

+									}

+									pushFollow(FOLLOW_ruleselector_in_ruleselector2496);

+									lv_selector_7_0 = ruleselector();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getSelectorRule());

+										}

+										set(

+												current,

+												"selector",

+												lv_selector_7_0,

+												"selector");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+

+						}

+

+

+					}

+						break;

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleselector"

+

+

+	// $ANTLR start "entryRuleSimpleSelectorForNegation"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1198:1: entryRuleSimpleSelectorForNegation returns [EObject current=null] : iv_ruleSimpleSelectorForNegation=

+	// ruleSimpleSelectorForNegation EOF ;

+	public final EObject entryRuleSimpleSelectorForNegation() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleSimpleSelectorForNegation = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1199:2: (iv_ruleSimpleSelectorForNegation= ruleSimpleSelectorForNegation EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1200:2: iv_ruleSimpleSelectorForNegation= ruleSimpleSelectorForNegation EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getSimpleSelectorForNegationRule());

+				}

+				pushFollow(FOLLOW_ruleSimpleSelectorForNegation_in_entryRuleSimpleSelectorForNegation2539);

+				iv_ruleSimpleSelectorForNegation = ruleSimpleSelectorForNegation();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleSimpleSelectorForNegation;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleSimpleSelectorForNegation2549);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleSimpleSelectorForNegation"

+

+

+	// $ANTLR start "ruleSimpleSelectorForNegation"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1207:1: ruleSimpleSelectorForNegation returns [EObject current=null] : ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) |

+	// ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* ) | ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+ ) ;

+	public final EObject ruleSimpleSelectorForNegation() throws RecognitionException {

+		EObject current = null;

+

+		EObject lv_element_0_0 = null;

+

+		EObject lv_universal_1_0 = null;

+

+		EObject lv_subSelectors_2_0 = null;

+

+		EObject lv_subSelectors_3_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1210:28: ( ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) (

+			// (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* ) | ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+ ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1211:1: ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) (

+			// (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* ) | ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+ )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1211:1: ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) (

+				// (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* ) | ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+ )

+				int alt42 = 2;

+				int LA42_0 = input.LA(1);

+

+				if (((LA42_0 >= RULE_DASH && LA42_0 <= RULE_ONE_NON_HEX_LETTER) || (LA42_0 >= 42 && LA42_0 <= 43) || (LA42_0 >= 56 && LA42_0 <= 59))) {

+					alt42 = 1;

+				}

+				else if ((LA42_0 == RULE_COLON || LA42_0 == RULE_HASHMARK || LA42_0 == 35 || LA42_0 == 41)) {

+					alt42 = 2;

+				}

+				else {

+					if (state.backtracking > 0) {

+						state.failed = true;

+						return current;

+					}

+					NoViableAltException nvae =

+							new NoViableAltException("", 42, 0, input);

+

+					throw nvae;

+				}

+				switch (alt42) {

+				case 1:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1211:2: ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) (

+				// (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1211:2: ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) )

+					// ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1211:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) (

+					// (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )*

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1211:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) )

+						// )

+						int alt39 = 2;

+						alt39 = dfa39.predict(input);

+						switch (alt39) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1211:4: ( (lv_element_0_0= ruleElementSelector ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1211:4: ( (lv_element_0_0= ruleElementSelector ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1212:1: (lv_element_0_0= ruleElementSelector )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1212:1: (lv_element_0_0= ruleElementSelector )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1213:3: lv_element_0_0= ruleElementSelector

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getElementElementSelectorParserRuleCall_0_0_0_0());

+

+									}

+									pushFollow(FOLLOW_ruleElementSelector_in_ruleSimpleSelectorForNegation2597);

+									lv_element_0_0 = ruleElementSelector();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());

+										}

+										set(

+												current,

+												"element",

+												lv_element_0_0,

+												"ElementSelector");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+

+						}

+							break;

+						case 2:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1230:6: ( (lv_universal_1_0= ruleUniversalSelector ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1230:6: ( (lv_universal_1_0= ruleUniversalSelector ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1231:1: (lv_universal_1_0= ruleUniversalSelector )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1231:1: (lv_universal_1_0= ruleUniversalSelector )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1232:3: lv_universal_1_0= ruleUniversalSelector

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0());

+

+									}

+									pushFollow(FOLLOW_ruleUniversalSelector_in_ruleSimpleSelectorForNegation2624);

+									lv_universal_1_0 = ruleUniversalSelector();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());

+										}

+										set(

+												current,

+												"universal",

+												lv_universal_1_0,

+												"UniversalSelector");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+

+						}

+							break;

+

+						}

+

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1248:3: ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )*

+						loop40: do {

+							int alt40 = 2;

+							int LA40_0 = input.LA(1);

+

+							if ((LA40_0 == RULE_COLON || LA40_0 == RULE_HASHMARK || LA40_0 == 35 || LA40_0 == 41)) {

+								alt40 = 1;

+							}

+

+

+							switch (alt40) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1249:1: (lv_subSelectors_2_0= ruleSubSelectorForNegation )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1249:1: (lv_subSelectors_2_0= ruleSubSelectorForNegation )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1250:3: lv_subSelectors_2_0= ruleSubSelectorForNegation

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_0_1_0());

+

+									}

+									pushFollow(FOLLOW_ruleSubSelectorForNegation_in_ruleSimpleSelectorForNegation2646);

+									lv_subSelectors_2_0 = ruleSubSelectorForNegation();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());

+										}

+										add(

+												current,

+												"subSelectors",

+												lv_subSelectors_2_0,

+												"SubSelectorForNegation");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+								break;

+

+							default:

+								break loop40;

+							}

+						} while (true);

+

+

+					}

+

+

+				}

+					break;

+				case 2:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1267:6: ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1267:6: ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+

+					int cnt41 = 0;

+					loop41: do {

+						int alt41 = 2;

+						int LA41_0 = input.LA(1);

+

+						if ((LA41_0 == RULE_HASHMARK) && (synpred1_InternalCSS())) {

+							alt41 = 1;

+						}

+						else if ((LA41_0 == 41) && (synpred1_InternalCSS())) {

+							alt41 = 1;

+						}

+						else if ((LA41_0 == 35) && (synpred1_InternalCSS())) {

+							alt41 = 1;

+						}

+						else if ((LA41_0 == RULE_COLON) && (synpred1_InternalCSS())) {

+							alt41 = 1;

+						}

+

+

+						switch (alt41) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1267:7: ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1272:1: (lv_subSelectors_3_0= ruleSubSelectorForNegation )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1273:3: lv_subSelectors_3_0= ruleSubSelectorForNegation

+							{

+								if (state.backtracking == 0) {

+

+									newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_1_0());

+

+								}

+								pushFollow(FOLLOW_ruleSubSelectorForNegation_in_ruleSimpleSelectorForNegation2685);

+								lv_subSelectors_3_0 = ruleSubSelectorForNegation();

+

+								state._fsp--;

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									if (current == null) {

+										current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());

+									}

+									add(

+											current,

+											"subSelectors",

+											lv_subSelectors_3_0,

+											"SubSelectorForNegation");

+									afterParserOrEnumRuleCall();

+

+								}

+

+							}

+

+

+						}

+							break;

+

+						default:

+							if (cnt41 >= 1) {

+								break loop41;

+							}

+							if (state.backtracking > 0) {

+								state.failed = true;

+								return current;

+							}

+							EarlyExitException eee =

+									new EarlyExitException(41, input);

+							throw eee;

+						}

+						cnt41++;

+					} while (true);

+

+

+				}

+					break;

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleSimpleSelectorForNegation"

+

+

+	// $ANTLR start "entryRuleSubSelectorForNegation"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1297:1: entryRuleSubSelectorForNegation returns [EObject current=null] : iv_ruleSubSelectorForNegation=

+	// ruleSubSelectorForNegation EOF ;

+	public final EObject entryRuleSubSelectorForNegation() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleSubSelectorForNegation = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1298:2: (iv_ruleSubSelectorForNegation= ruleSubSelectorForNegation EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1299:2: iv_ruleSubSelectorForNegation= ruleSubSelectorForNegation EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getSubSelectorForNegationRule());

+				}

+				pushFollow(FOLLOW_ruleSubSelectorForNegation_in_entryRuleSubSelectorForNegation2722);

+				iv_ruleSubSelectorForNegation = ruleSubSelectorForNegation();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleSubSelectorForNegation;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleSubSelectorForNegation2732);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleSubSelectorForNegation"

+

+

+	// $ANTLR start "ruleSubSelectorForNegation"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1306:1: ruleSubSelectorForNegation returns [EObject current=null] : (this_IdSelector_0= ruleIdSelector |

+	// this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClass_3= rulePseudoClass ) ;

+	public final EObject ruleSubSelectorForNegation() throws RecognitionException {

+		EObject current = null;

+

+		EObject this_IdSelector_0 = null;

+

+		EObject this_ClassSelector_1 = null;

+

+		EObject this_AttributeSelector_2 = null;

+

+		EObject this_PseudoClass_3 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1309:28: ( (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector |

+			// this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClass_3= rulePseudoClass ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1310:1: (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2=

+			// ruleAttributeSelector | this_PseudoClass_3= rulePseudoClass )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1310:1: (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector |

+				// this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClass_3= rulePseudoClass )

+				int alt43 = 4;

+				switch (input.LA(1)) {

+				case RULE_HASHMARK: {

+					alt43 = 1;

+				}

+					break;

+				case 41: {

+					alt43 = 2;

+				}

+					break;

+				case 35: {

+					alt43 = 3;

+				}

+					break;

+				case RULE_COLON: {

+					alt43 = 4;

+				}

+					break;

+				default:

+					if (state.backtracking > 0) {

+						state.failed = true;

+						return current;

+					}

+					NoViableAltException nvae =

+							new NoViableAltException("", 43, 0, input);

+

+					throw nvae;

+				}

+

+				switch (alt43) {

+				case 1:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1311:5: this_IdSelector_0= ruleIdSelector

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getIdSelectorParserRuleCall_0());

+

+					}

+					pushFollow(FOLLOW_ruleIdSelector_in_ruleSubSelectorForNegation2779);

+					this_IdSelector_0 = ruleIdSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_IdSelector_0;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+				case 2:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1321:5: this_ClassSelector_1= ruleClassSelector

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getClassSelectorParserRuleCall_1());

+

+					}

+					pushFollow(FOLLOW_ruleClassSelector_in_ruleSubSelectorForNegation2806);

+					this_ClassSelector_1 = ruleClassSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_ClassSelector_1;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+				case 3:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1331:5: this_AttributeSelector_2= ruleAttributeSelector

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getAttributeSelectorParserRuleCall_2());

+

+					}

+					pushFollow(FOLLOW_ruleAttributeSelector_in_ruleSubSelectorForNegation2833);

+					this_AttributeSelector_2 = ruleAttributeSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_AttributeSelector_2;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+				case 4:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1341:5: this_PseudoClass_3= rulePseudoClass

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getPseudoClassParserRuleCall_3());

+

+					}

+					pushFollow(FOLLOW_rulePseudoClass_in_ruleSubSelectorForNegation2860);

+					this_PseudoClass_3 = rulePseudoClass();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_PseudoClass_3;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleSubSelectorForNegation"

+

+

+	// $ANTLR start "entryRulesimple_selector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1357:1: entryRulesimple_selector returns [EObject current=null] : iv_rulesimple_selector= rulesimple_selector EOF ;

+	public final EObject entryRulesimple_selector() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulesimple_selector = null;

+

+

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1361:2: (iv_rulesimple_selector= rulesimple_selector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1362:2: iv_rulesimple_selector= rulesimple_selector EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getSimple_selectorRule());

+				}

+				pushFollow(FOLLOW_rulesimple_selector_in_entryRulesimple_selector2901);

+				iv_rulesimple_selector = rulesimple_selector();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulesimple_selector;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulesimple_selector2911);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulesimple_selector"

+

+

+	// $ANTLR start "rulesimple_selector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1372:1: rulesimple_selector returns [EObject current=null] : ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | (

+	// (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )* ) | ( (lv_subSelectors_3_0= ruleSubSelector ) )+ ) ;

+	public final EObject rulesimple_selector() throws RecognitionException {

+		EObject current = null;

+

+		EObject lv_element_0_0 = null;

+

+		EObject lv_universal_1_0 = null;

+

+		EObject lv_subSelectors_2_0 = null;

+

+		EObject lv_subSelectors_3_0 = null;

+

+

+		enterRule();

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1376:28: ( ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) (

+			// (lv_subSelectors_2_0= ruleSubSelector ) )* ) | ( (lv_subSelectors_3_0= ruleSubSelector ) )+ ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1377:1: ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) (

+			// (lv_subSelectors_2_0= ruleSubSelector ) )* ) | ( (lv_subSelectors_3_0= ruleSubSelector ) )+ )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1377:1: ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) (

+				// (lv_subSelectors_2_0= ruleSubSelector ) )* ) | ( (lv_subSelectors_3_0= ruleSubSelector ) )+ )

+				int alt47 = 2;

+				int LA47_0 = input.LA(1);

+

+				if (((LA47_0 >= RULE_DASH && LA47_0 <= RULE_ONE_NON_HEX_LETTER) || (LA47_0 >= 42 && LA47_0 <= 43) || (LA47_0 >= 56 && LA47_0 <= 59))) {

+					alt47 = 1;

+				}

+				else if ((LA47_0 == RULE_COLON || LA47_0 == RULE_HASHMARK || LA47_0 == 35 || LA47_0 == 41)) {

+					alt47 = 2;

+				}

+				else {

+					if (state.backtracking > 0) {

+						state.failed = true;

+						return current;

+					}

+					NoViableAltException nvae =

+							new NoViableAltException("", 47, 0, input);

+

+					throw nvae;

+				}

+				switch (alt47) {

+				case 1:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1377:2: ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) (

+				// (lv_subSelectors_2_0= ruleSubSelector ) )* )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1377:2: ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) )

+					// ( (lv_subSelectors_2_0= ruleSubSelector ) )* )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1377:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) (

+					// (lv_subSelectors_2_0= ruleSubSelector ) )*

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1377:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) )

+						// )

+						int alt44 = 2;

+						alt44 = dfa44.predict(input);

+						switch (alt44) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1377:4: ( (lv_element_0_0= ruleElementSelector ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1377:4: ( (lv_element_0_0= ruleElementSelector ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1378:1: (lv_element_0_0= ruleElementSelector )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1378:1: (lv_element_0_0= ruleElementSelector )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1379:3: lv_element_0_0= ruleElementSelector

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getSimple_selectorAccess().getElementElementSelectorParserRuleCall_0_0_0_0());

+

+									}

+									pushFollow(FOLLOW_ruleElementSelector_in_rulesimple_selector2963);

+									lv_element_0_0 = ruleElementSelector();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getSimple_selectorRule());

+										}

+										set(

+												current,

+												"element",

+												lv_element_0_0,

+												"ElementSelector");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+

+						}

+							break;

+						case 2:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1396:6: ( (lv_universal_1_0= ruleUniversalSelector ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1396:6: ( (lv_universal_1_0= ruleUniversalSelector ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1397:1: (lv_universal_1_0= ruleUniversalSelector )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1397:1: (lv_universal_1_0= ruleUniversalSelector )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1398:3: lv_universal_1_0= ruleUniversalSelector

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getSimple_selectorAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0());

+

+									}

+									pushFollow(FOLLOW_ruleUniversalSelector_in_rulesimple_selector2990);

+									lv_universal_1_0 = ruleUniversalSelector();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getSimple_selectorRule());

+										}

+										set(

+												current,

+												"universal",

+												lv_universal_1_0,

+												"UniversalSelector");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+

+

+						}

+							break;

+

+						}

+

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1414:3: ( (lv_subSelectors_2_0= ruleSubSelector ) )*

+						loop45: do {

+							int alt45 = 2;

+							int LA45_0 = input.LA(1);

+

+							if ((LA45_0 == RULE_COLON || LA45_0 == RULE_HASHMARK || LA45_0 == 35 || LA45_0 == 41)) {

+								alt45 = 1;

+							}

+

+

+							switch (alt45) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1415:1: (lv_subSelectors_2_0= ruleSubSelector )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1415:1: (lv_subSelectors_2_0= ruleSubSelector )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1416:3: lv_subSelectors_2_0= ruleSubSelector

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_0_1_0());

+

+									}

+									pushFollow(FOLLOW_ruleSubSelector_in_rulesimple_selector3012);

+									lv_subSelectors_2_0 = ruleSubSelector();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getSimple_selectorRule());

+										}

+										add(

+												current,

+												"subSelectors",

+												lv_subSelectors_2_0,

+												"SubSelector");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+								break;

+

+							default:

+								break loop45;

+							}

+						} while (true);

+

+

+					}

+

+

+				}

+					break;

+				case 2:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1433:6: ( (lv_subSelectors_3_0= ruleSubSelector ) )+

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1433:6: ( (lv_subSelectors_3_0= ruleSubSelector ) )+

+					int cnt46 = 0;

+					loop46: do {

+						int alt46 = 2;

+						int LA46_0 = input.LA(1);

+

+						if ((LA46_0 == RULE_COLON || LA46_0 == RULE_HASHMARK || LA46_0 == 35 || LA46_0 == 41)) {

+							alt46 = 1;

+						}

+

+

+						switch (alt46) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1434:1: (lv_subSelectors_3_0= ruleSubSelector )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1434:1: (lv_subSelectors_3_0= ruleSubSelector )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1435:3: lv_subSelectors_3_0= ruleSubSelector

+							{

+								if (state.backtracking == 0) {

+

+									newCompositeNode(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_1_0());

+

+								}

+								pushFollow(FOLLOW_ruleSubSelector_in_rulesimple_selector3041);

+								lv_subSelectors_3_0 = ruleSubSelector();

+

+								state._fsp--;

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									if (current == null) {

+										current = createModelElementForParent(grammarAccess.getSimple_selectorRule());

+									}

+									add(

+											current,

+											"subSelectors",

+											lv_subSelectors_3_0,

+											"SubSelector");

+									afterParserOrEnumRuleCall();

+

+								}

+

+							}

+

+

+						}

+							break;

+

+						default:

+							if (cnt46 >= 1) {

+								break loop46;

+							}

+							if (state.backtracking > 0) {

+								state.failed = true;

+								return current;

+							}

+							EarlyExitException eee =

+									new EarlyExitException(46, input);

+							throw eee;

+						}

+						cnt46++;

+					} while (true);

+

+

+				}

+					break;

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulesimple_selector"

+

+

+	// $ANTLR start "entryRuleSubSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1462:1: entryRuleSubSelector returns [EObject current=null] : iv_ruleSubSelector= ruleSubSelector EOF ;

+	public final EObject entryRuleSubSelector() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleSubSelector = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1463:2: (iv_ruleSubSelector= ruleSubSelector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1464:2: iv_ruleSubSelector= ruleSubSelector EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getSubSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleSubSelector_in_entryRuleSubSelector3082);

+				iv_ruleSubSelector = ruleSubSelector();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleSubSelector;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleSubSelector3092);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleSubSelector"

+

+

+	// $ANTLR start "ruleSubSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1471:1: ruleSubSelector returns [EObject current=null] : (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1=

+	// ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClassOrFunc_3= rulePseudoClassOrFunc ) ;

+	public final EObject ruleSubSelector() throws RecognitionException {

+		EObject current = null;

+

+		EObject this_IdSelector_0 = null;

+

+		EObject this_ClassSelector_1 = null;

+

+		EObject this_AttributeSelector_2 = null;

+

+		EObject this_PseudoClassOrFunc_3 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1474:28: ( (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector |

+			// this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClassOrFunc_3= rulePseudoClassOrFunc ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1475:1: (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2=

+			// ruleAttributeSelector | this_PseudoClassOrFunc_3= rulePseudoClassOrFunc )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1475:1: (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector |

+				// this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClassOrFunc_3= rulePseudoClassOrFunc )

+				int alt48 = 4;

+				switch (input.LA(1)) {

+				case RULE_HASHMARK: {

+					alt48 = 1;

+				}

+					break;

+				case 41: {

+					alt48 = 2;

+				}

+					break;

+				case 35: {

+					alt48 = 3;

+				}

+					break;

+				case RULE_COLON: {

+					alt48 = 4;

+				}

+					break;

+				default:

+					if (state.backtracking > 0) {

+						state.failed = true;

+						return current;

+					}

+					NoViableAltException nvae =

+							new NoViableAltException("", 48, 0, input);

+

+					throw nvae;

+				}

+

+				switch (alt48) {

+				case 1:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1476:5: this_IdSelector_0= ruleIdSelector

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getSubSelectorAccess().getIdSelectorParserRuleCall_0());

+

+					}

+					pushFollow(FOLLOW_ruleIdSelector_in_ruleSubSelector3139);

+					this_IdSelector_0 = ruleIdSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_IdSelector_0;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+				case 2:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1486:5: this_ClassSelector_1= ruleClassSelector

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getSubSelectorAccess().getClassSelectorParserRuleCall_1());

+

+					}

+					pushFollow(FOLLOW_ruleClassSelector_in_ruleSubSelector3166);

+					this_ClassSelector_1 = ruleClassSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_ClassSelector_1;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+				case 3:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1496:5: this_AttributeSelector_2= ruleAttributeSelector

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getSubSelectorAccess().getAttributeSelectorParserRuleCall_2());

+

+					}

+					pushFollow(FOLLOW_ruleAttributeSelector_in_ruleSubSelector3193);

+					this_AttributeSelector_2 = ruleAttributeSelector();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_AttributeSelector_2;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+				case 4:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1506:5: this_PseudoClassOrFunc_3= rulePseudoClassOrFunc

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getSubSelectorAccess().getPseudoClassOrFuncParserRuleCall_3());

+

+					}

+					pushFollow(FOLLOW_rulePseudoClassOrFunc_in_ruleSubSelector3220);

+					this_PseudoClassOrFunc_3 = rulePseudoClassOrFunc();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_PseudoClassOrFunc_3;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleSubSelector"

+

+

+	// $ANTLR start "entryRuleAttributeSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1522:1: entryRuleAttributeSelector returns [EObject current=null] : iv_ruleAttributeSelector= ruleAttributeSelector EOF ;

+	public final EObject entryRuleAttributeSelector() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleAttributeSelector = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1523:2: (iv_ruleAttributeSelector= ruleAttributeSelector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1524:2: iv_ruleAttributeSelector= ruleAttributeSelector EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getAttributeSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleAttributeSelector_in_entryRuleAttributeSelector3255);

+				iv_ruleAttributeSelector = ruleAttributeSelector();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleAttributeSelector;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleAttributeSelector3265);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleAttributeSelector"

+

+

+	// $ANTLR start "ruleAttributeSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1531:1: ruleAttributeSelector returns [EObject current=null] : ( () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( (

+	// ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']' ) ;

+	public final EObject ruleAttributeSelector() throws RecognitionException {

+		EObject current = null;

+

+		Token otherlv_1 = null;

+		Token lv_op_3_1 = null;

+		Token lv_op_3_2 = null;

+		Token lv_op_3_3 = null;

+		Token lv_op_3_4 = null;

+		Token lv_op_3_5 = null;

+		Token lv_op_3_6 = null;

+		Token lv_value_4_2 = null;

+		Token otherlv_5 = null;

+		AntlrDatatypeRuleToken lv_name_2_0 = null;

+

+		AntlrDatatypeRuleToken lv_value_4_1 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1534:28: ( ( () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' |

+			// lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1535:1: ( () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' |

+			// lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1535:1: ( () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' |

+				// lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1535:2: () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' |

+				// lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']'

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1535:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1536:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getAttributeSelectorAccess().getAttributeSelectorAction_0(),

+									current);

+

+						}

+

+					}

+

+					otherlv_1 = (Token) match(input, 35, FOLLOW_35_in_ruleAttributeSelector3311);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_1, grammarAccess.getAttributeSelectorAccess().getLeftSquareBracketKeyword_1());

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1545:1: ( (lv_name_2_0= ruleIdentifier ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1546:1: (lv_name_2_0= ruleIdentifier )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1546:1: (lv_name_2_0= ruleIdentifier )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1547:3: lv_name_2_0= ruleIdentifier

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getAttributeSelectorAccess().getNameIdentifierParserRuleCall_2_0());

+

+							}

+							pushFollow(FOLLOW_ruleIdentifier_in_ruleAttributeSelector3332);

+							lv_name_2_0 = ruleIdentifier();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getAttributeSelectorRule());

+								}

+								set(

+										current,

+										"name",

+										lv_name_2_0,

+										"Identifier");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1563:2: ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5=

+					// RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )?

+					int alt51 = 2;

+					int LA51_0 = input.LA(1);

+

+					if (((LA51_0 >= RULE_INCLUDES && LA51_0 <= RULE_DASHMATCH) || (LA51_0 >= 36 && LA51_0 <= 39))) {

+						alt51 = 1;

+					}

+					switch (alt51) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1563:3: ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5=

+					// RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1563:3: ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5=

+						// RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1564:1: ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5=

+						// RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1564:1: ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5=

+							// RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1565:1: (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5=

+							// RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1565:1: (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5=

+								// RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH )

+								int alt49 = 6;

+								switch (input.LA(1)) {

+								case 36: {

+									alt49 = 1;

+								}

+									break;

+								case 37: {

+									alt49 = 2;

+								}

+									break;

+								case 38: {

+									alt49 = 3;

+								}

+									break;

+								case 39: {

+									alt49 = 4;

+								}

+									break;

+								case RULE_INCLUDES: {

+									alt49 = 5;

+								}

+									break;

+								case RULE_DASHMATCH: {

+									alt49 = 6;

+								}

+									break;

+								default:

+									if (state.backtracking > 0) {

+										state.failed = true;

+										return current;

+									}

+									NoViableAltException nvae =

+											new NoViableAltException("", 49, 0, input);

+

+									throw nvae;

+								}

+

+								switch (alt49) {

+								case 1:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1566:3: lv_op_3_1= '^='

+								{

+									lv_op_3_1 = (Token) match(input, 36, FOLLOW_36_in_ruleAttributeSelector3353);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(lv_op_3_1, grammarAccess.getAttributeSelectorAccess().getOpCircumflexAccentEqualsSignKeyword_3_0_0_0());

+

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElement(grammarAccess.getAttributeSelectorRule());

+										}

+										setWithLastConsumed(current, "op", lv_op_3_1, null);

+

+									}

+

+								}

+									break;

+								case 2:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1578:8: lv_op_3_2= '$='

+								{

+									lv_op_3_2 = (Token) match(input, 37, FOLLOW_37_in_ruleAttributeSelector3382);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(lv_op_3_2, grammarAccess.getAttributeSelectorAccess().getOpDollarSignEqualsSignKeyword_3_0_0_1());

+

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElement(grammarAccess.getAttributeSelectorRule());

+										}

+										setWithLastConsumed(current, "op", lv_op_3_2, null);

+

+									}

+

+								}

+									break;

+								case 3:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1590:8: lv_op_3_3= '*='

+								{

+									lv_op_3_3 = (Token) match(input, 38, FOLLOW_38_in_ruleAttributeSelector3411);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(lv_op_3_3, grammarAccess.getAttributeSelectorAccess().getOpAsteriskEqualsSignKeyword_3_0_0_2());

+

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElement(grammarAccess.getAttributeSelectorRule());

+										}

+										setWithLastConsumed(current, "op", lv_op_3_3, null);

+

+									}

+

+								}

+									break;

+								case 4:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1602:8: lv_op_3_4= '='

+								{

+									lv_op_3_4 = (Token) match(input, 39, FOLLOW_39_in_ruleAttributeSelector3440);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(lv_op_3_4, grammarAccess.getAttributeSelectorAccess().getOpEqualsSignKeyword_3_0_0_3());

+

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElement(grammarAccess.getAttributeSelectorRule());

+										}

+										setWithLastConsumed(current, "op", lv_op_3_4, null);

+

+									}

+

+								}

+									break;

+								case 5:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1614:8: lv_op_3_5= RULE_INCLUDES

+								{

+									lv_op_3_5 = (Token) match(input, RULE_INCLUDES, FOLLOW_RULE_INCLUDES_in_ruleAttributeSelector3468);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(lv_op_3_5, grammarAccess.getAttributeSelectorAccess().getOpINCLUDESTerminalRuleCall_3_0_0_4());

+

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElement(grammarAccess.getAttributeSelectorRule());

+										}

+										setWithLastConsumed(

+												current,

+												"op",

+												lv_op_3_5,

+												"INCLUDES");

+

+									}

+

+								}

+									break;

+								case 6:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1629:8: lv_op_3_6= RULE_DASHMATCH

+								{

+									lv_op_3_6 = (Token) match(input, RULE_DASHMATCH, FOLLOW_RULE_DASHMATCH_in_ruleAttributeSelector3488);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(lv_op_3_6, grammarAccess.getAttributeSelectorAccess().getOpDASHMATCHTerminalRuleCall_3_0_0_5());

+

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElement(grammarAccess.getAttributeSelectorRule());

+										}

+										setWithLastConsumed(

+												current,

+												"op",

+												lv_op_3_6,

+												"DASHMATCH");

+

+									}

+

+								}

+									break;

+

+								}

+

+

+							}

+

+

+						}

+

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1647:2: ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1648:1: ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1648:1: ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1649:1: (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1649:1: (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING )

+								int alt50 = 2;

+								int LA50_0 = input.LA(1);

+

+								if (((LA50_0 >= RULE_DASH && LA50_0 <= RULE_ONE_NON_HEX_LETTER) || (LA50_0 >= 56 && LA50_0 <= 59))) {

+									alt50 = 1;

+								}

+								else if ((LA50_0 == RULE_CSSSTRING)) {

+									alt50 = 2;

+								}

+								else {

+									if (state.backtracking > 0) {

+										state.failed = true;

+										return current;

+									}

+									NoViableAltException nvae =

+											new NoViableAltException("", 50, 0, input);

+

+									throw nvae;

+								}

+								switch (alt50) {

+								case 1:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1650:3: lv_value_4_1= ruleIdentifier

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getAttributeSelectorAccess().getValueIdentifierParserRuleCall_3_1_0_0());

+

+									}

+									pushFollow(FOLLOW_ruleIdentifier_in_ruleAttributeSelector3519);

+									lv_value_4_1 = ruleIdentifier();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getAttributeSelectorRule());

+										}

+										set(

+												current,

+												"value",

+												lv_value_4_1,

+												"Identifier");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+									break;

+								case 2:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1665:8: lv_value_4_2= RULE_CSSSTRING

+								{

+									lv_value_4_2 = (Token) match(input, RULE_CSSSTRING, FOLLOW_RULE_CSSSTRING_in_ruleAttributeSelector3534);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(lv_value_4_2, grammarAccess.getAttributeSelectorAccess().getValueCSSSTRINGTerminalRuleCall_3_1_0_1());

+

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElement(grammarAccess.getAttributeSelectorRule());

+										}

+										setWithLastConsumed(

+												current,

+												"value",

+												lv_value_4_2,

+												"CSSSTRING");

+

+									}

+

+								}

+									break;

+

+								}

+

+

+							}

+

+

+						}

+

+

+					}

+						break;

+

+					}

+

+					otherlv_5 = (Token) match(input, 40, FOLLOW_40_in_ruleAttributeSelector3556);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_5, grammarAccess.getAttributeSelectorAccess().getRightSquareBracketKeyword_4());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleAttributeSelector"

+

+

+	// $ANTLR start "entryRuleClassSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1695:1: entryRuleClassSelector returns [EObject current=null] : iv_ruleClassSelector= ruleClassSelector EOF ;

+	public final EObject entryRuleClassSelector() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleClassSelector = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1696:2: (iv_ruleClassSelector= ruleClassSelector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1697:2: iv_ruleClassSelector= ruleClassSelector EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getClassSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleClassSelector_in_entryRuleClassSelector3592);

+				iv_ruleClassSelector = ruleClassSelector();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleClassSelector;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleClassSelector3602);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleClassSelector"

+

+

+	// $ANTLR start "ruleClassSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1704:1: ruleClassSelector returns [EObject current=null] : ( () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) ) ) ;

+	public final EObject ruleClassSelector() throws RecognitionException {

+		EObject current = null;

+

+		Token otherlv_1 = null;

+		AntlrDatatypeRuleToken lv_name_2_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1707:28: ( ( () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1708:1: ( () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1708:1: ( () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1708:2: () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1708:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1709:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getClassSelectorAccess().getClassSelectorAction_0(),

+									current);

+

+						}

+

+					}

+

+					otherlv_1 = (Token) match(input, 41, FOLLOW_41_in_ruleClassSelector3648);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_1, grammarAccess.getClassSelectorAccess().getFullStopKeyword_1());

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1718:1: ( (lv_name_2_0= ruleIdentifier ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1719:1: (lv_name_2_0= ruleIdentifier )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1719:1: (lv_name_2_0= ruleIdentifier )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1720:3: lv_name_2_0= ruleIdentifier

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getClassSelectorAccess().getNameIdentifierParserRuleCall_2_0());

+

+							}

+							pushFollow(FOLLOW_ruleIdentifier_in_ruleClassSelector3669);

+							lv_name_2_0 = ruleIdentifier();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getClassSelectorRule());

+								}

+								set(

+										current,

+										"name",

+										lv_name_2_0,

+										"Identifier");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleClassSelector"

+

+

+	// $ANTLR start "entryRuleElementSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1744:1: entryRuleElementSelector returns [EObject current=null] : iv_ruleElementSelector= ruleElementSelector EOF ;

+	public final EObject entryRuleElementSelector() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleElementSelector = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1745:2: (iv_ruleElementSelector= ruleElementSelector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1746:2: iv_ruleElementSelector= ruleElementSelector EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getElementSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleElementSelector_in_entryRuleElementSelector3705);

+				iv_ruleElementSelector = ruleElementSelector();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleElementSelector;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleElementSelector3715);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleElementSelector"

+

+

+	// $ANTLR start "ruleElementSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1753:1: ruleElementSelector returns [EObject current=null] : ( () ( (lv_name_1_0= ruleIdentifier ) ) ) ;

+	public final EObject ruleElementSelector() throws RecognitionException {

+		EObject current = null;

+

+		AntlrDatatypeRuleToken lv_name_1_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1756:28: ( ( () ( (lv_name_1_0= ruleIdentifier ) ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1757:1: ( () ( (lv_name_1_0= ruleIdentifier ) ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1757:1: ( () ( (lv_name_1_0= ruleIdentifier ) ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1757:2: () ( (lv_name_1_0= ruleIdentifier ) )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1757:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1758:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getElementSelectorAccess().getElementSelectorAction_0(),

+									current);

+

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1763:2: ( (lv_name_1_0= ruleIdentifier ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1764:1: (lv_name_1_0= ruleIdentifier )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1764:1: (lv_name_1_0= ruleIdentifier )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1765:3: lv_name_1_0= ruleIdentifier

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getElementSelectorAccess().getNameIdentifierParserRuleCall_1_0());

+

+							}

+							pushFollow(FOLLOW_ruleIdentifier_in_ruleElementSelector3770);

+							lv_name_1_0 = ruleIdentifier();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getElementSelectorRule());

+								}

+								set(

+										current,

+										"name",

+										lv_name_1_0,

+										"Identifier");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleElementSelector"

+

+

+	// $ANTLR start "entryRuleUniversalSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1789:1: entryRuleUniversalSelector returns [EObject current=null] : iv_ruleUniversalSelector= ruleUniversalSelector EOF ;

+	public final EObject entryRuleUniversalSelector() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleUniversalSelector = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1790:2: (iv_ruleUniversalSelector= ruleUniversalSelector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1791:2: iv_ruleUniversalSelector= ruleUniversalSelector EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getUniversalSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleUniversalSelector_in_entryRuleUniversalSelector3806);

+				iv_ruleUniversalSelector = ruleUniversalSelector();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleUniversalSelector;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleUniversalSelector3816);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleUniversalSelector"

+

+

+	// $ANTLR start "ruleUniversalSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1798:1: ruleUniversalSelector returns [EObject current=null] : ( () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )?

+	// otherlv_2= '*' ) ;

+	public final EObject ruleUniversalSelector() throws RecognitionException {

+		EObject current = null;

+

+		Token otherlv_2 = null;

+		AntlrDatatypeRuleToken lv_namespace_1_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1801:28: ( ( () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1802:1: ( () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1802:1: ( () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1802:2: () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*'

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1802:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1803:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getUniversalSelectorAccess().getUniversalSelectorAction_0(),

+									current);

+

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1808:2: ( (lv_namespace_1_0= rulecss_namespace_prefix ) )?

+					int alt52 = 2;

+					int LA52_0 = input.LA(1);

+

+					if (((LA52_0 >= RULE_DASH && LA52_0 <= RULE_ONE_NON_HEX_LETTER) || LA52_0 == 43 || (LA52_0 >= 56 && LA52_0 <= 59))) {

+						alt52 = 1;

+					}

+					else if ((LA52_0 == 42)) {

+						int LA52_2 = input.LA(2);

+

+						if ((LA52_2 == 43)) {

+							alt52 = 1;

+						}

+					}

+					switch (alt52) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1809:1: (lv_namespace_1_0= rulecss_namespace_prefix )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1809:1: (lv_namespace_1_0= rulecss_namespace_prefix )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1810:3: lv_namespace_1_0= rulecss_namespace_prefix

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getUniversalSelectorAccess().getNamespaceCss_namespace_prefixParserRuleCall_1_0());

+

+							}

+							pushFollow(FOLLOW_rulecss_namespace_prefix_in_ruleUniversalSelector3871);

+							lv_namespace_1_0 = rulecss_namespace_prefix();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getUniversalSelectorRule());

+								}

+								set(

+										current,

+										"namespace",

+										lv_namespace_1_0,

+										"css_namespace_prefix");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+						break;

+

+					}

+

+					otherlv_2 = (Token) match(input, 42, FOLLOW_42_in_ruleUniversalSelector3884);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_2, grammarAccess.getUniversalSelectorAccess().getAsteriskKeyword_2());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleUniversalSelector"

+

+

+	// $ANTLR start "entryRuleIdSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1838:1: entryRuleIdSelector returns [EObject current=null] : iv_ruleIdSelector= ruleIdSelector EOF ;

+	public final EObject entryRuleIdSelector() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleIdSelector = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1839:2: (iv_ruleIdSelector= ruleIdSelector EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1840:2: iv_ruleIdSelector= ruleIdSelector EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getIdSelectorRule());

+				}

+				pushFollow(FOLLOW_ruleIdSelector_in_entryRuleIdSelector3920);

+				iv_ruleIdSelector = ruleIdSelector();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleIdSelector;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleIdSelector3930);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleIdSelector"

+

+

+	// $ANTLR start "ruleIdSelector"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1847:1: ruleIdSelector returns [EObject current=null] : ( () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier

+	// ) ) ) ;

+	public final EObject ruleIdSelector() throws RecognitionException {

+		EObject current = null;

+

+		Token this_HASHMARK_1 = null;

+		AntlrDatatypeRuleToken lv_name_2_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1850:28: ( ( () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1851:1: ( () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1851:1: ( () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1851:2: () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1851:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1852:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getIdSelectorAccess().getIdSelectorAction_0(),

+									current);

+

+						}

+

+					}

+

+					this_HASHMARK_1 = (Token) match(input, RULE_HASHMARK, FOLLOW_RULE_HASHMARK_in_ruleIdSelector3975);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_HASHMARK_1, grammarAccess.getIdSelectorAccess().getHASHMARKTerminalRuleCall_1());

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1861:1: ( (lv_name_2_0= ruleIdentifier ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1862:1: (lv_name_2_0= ruleIdentifier )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1862:1: (lv_name_2_0= ruleIdentifier )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1863:3: lv_name_2_0= ruleIdentifier

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getIdSelectorAccess().getNameIdentifierParserRuleCall_2_0());

+

+							}

+							pushFollow(FOLLOW_ruleIdentifier_in_ruleIdSelector3995);

+							lv_name_2_0 = ruleIdentifier();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getIdSelectorRule());

+								}

+								set(

+										current,

+										"name",

+										lv_name_2_0,

+										"Identifier");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleIdSelector"

+

+

+	// $ANTLR start "entryRulecss_namespace_prefix"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1887:1: entryRulecss_namespace_prefix returns [String current=null] : iv_rulecss_namespace_prefix=

+	// rulecss_namespace_prefix EOF ;

+	public final String entryRulecss_namespace_prefix() throws RecognitionException {

+		String current = null;

+

+		AntlrDatatypeRuleToken iv_rulecss_namespace_prefix = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1888:2: (iv_rulecss_namespace_prefix= rulecss_namespace_prefix EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1889:2: iv_rulecss_namespace_prefix= rulecss_namespace_prefix EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getCss_namespace_prefixRule());

+				}

+				pushFollow(FOLLOW_rulecss_namespace_prefix_in_entryRulecss_namespace_prefix4032);

+				iv_rulecss_namespace_prefix = rulecss_namespace_prefix();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulecss_namespace_prefix.getText();

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulecss_namespace_prefix4043);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulecss_namespace_prefix"

+

+

+	// $ANTLR start "rulecss_namespace_prefix"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1896:1: rulecss_namespace_prefix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (

+	// (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|' ) ;

+	public final AntlrDatatypeRuleToken rulecss_namespace_prefix() throws RecognitionException {

+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

+

+		Token kw = null;

+		AntlrDatatypeRuleToken this_Identifier_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1899:28: ( ( (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1900:1: ( (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1900:1: ( (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1900:2: (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|'

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1900:2: (this_Identifier_0= ruleIdentifier | kw= '*' )?

+					int alt53 = 3;

+					int LA53_0 = input.LA(1);

+

+					if (((LA53_0 >= RULE_DASH && LA53_0 <= RULE_ONE_NON_HEX_LETTER) || (LA53_0 >= 56 && LA53_0 <= 59))) {

+						alt53 = 1;

+					}

+					else if ((LA53_0 == 42)) {

+						alt53 = 2;

+					}

+					switch (alt53) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1901:5: this_Identifier_0= ruleIdentifier

+					{

+						if (state.backtracking == 0) {

+

+							newCompositeNode(grammarAccess.getCss_namespace_prefixAccess().getIdentifierParserRuleCall_0_0());

+

+						}

+						pushFollow(FOLLOW_ruleIdentifier_in_rulecss_namespace_prefix4091);

+						this_Identifier_0 = ruleIdentifier();

+

+						state._fsp--;

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							current.merge(this_Identifier_0);

+

+						}

+						if (state.backtracking == 0) {

+

+							afterParserOrEnumRuleCall();

+

+						}

+

+					}

+						break;

+					case 2:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1913:2: kw= '*'

+					{

+						kw = (Token) match(input, 42, FOLLOW_42_in_rulecss_namespace_prefix4115);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							current.merge(kw);

+							newLeafNode(kw, grammarAccess.getCss_namespace_prefixAccess().getAsteriskKeyword_0_1());

+

+						}

+

+					}

+						break;

+

+					}

+

+					kw = (Token) match(input, 43, FOLLOW_43_in_rulecss_namespace_prefix4130);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getCss_namespace_prefixAccess().getVerticalLineKeyword_1());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulecss_namespace_prefix"

+

+

+	// $ANTLR start "entryRulecss_declaration"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1932:1: entryRulecss_declaration returns [EObject current=null] : iv_rulecss_declaration= rulecss_declaration EOF ;

+	public final EObject entryRulecss_declaration() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulecss_declaration = null;

+

+

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1936:2: (iv_rulecss_declaration= rulecss_declaration EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1937:2: iv_rulecss_declaration= rulecss_declaration EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getCss_declarationRule());

+				}

+				pushFollow(FOLLOW_rulecss_declaration_in_entryRulecss_declaration4176);

+				iv_rulecss_declaration = rulecss_declaration();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulecss_declaration;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulecss_declaration4186);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulecss_declaration"

+

+

+	// $ANTLR start "rulecss_declaration"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1947:1: rulecss_declaration returns [EObject current=null] : ( (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property

+	// ) ) (this_WS_2= RULE_WS )* this_COLON_3= RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )? ) ;

+	public final EObject rulecss_declaration() throws RecognitionException {

+		EObject current = null;

+

+		Token this_WS_0 = null;

+		Token this_WS_2 = null;

+		Token this_COLON_3 = null;

+		Token lv_important_5_0 = null;

+		EObject lv_property_1_0 = null;

+

+		EObject lv_valueTokens_4_0 = null;

+

+

+		enterRule();

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1951:28: ( ( (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3=

+			// RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1952:1: ( (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3=

+			// RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1952:1: ( (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3=

+				// RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1952:2: (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3=

+				// RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )?

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1952:2: (this_WS_0= RULE_WS )*

+					loop54: do {

+						int alt54 = 2;

+						int LA54_0 = input.LA(1);

+

+						if ((LA54_0 == RULE_WS)) {

+							alt54 = 1;

+						}

+

+

+						switch (alt54) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1952:3: this_WS_0= RULE_WS

+						{

+							this_WS_0 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_rulecss_declaration4227);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(this_WS_0, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_0());

+

+							}

+

+						}

+							break;

+

+						default:

+							break loop54;

+						}

+					} while (true);

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1956:3: ( (lv_property_1_0= rulecss_property ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1957:1: (lv_property_1_0= rulecss_property )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1957:1: (lv_property_1_0= rulecss_property )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1958:3: lv_property_1_0= rulecss_property

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getCss_declarationAccess().getPropertyCss_propertyParserRuleCall_1_0());

+

+							}

+							pushFollow(FOLLOW_rulecss_property_in_rulecss_declaration4249);

+							lv_property_1_0 = rulecss_property();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getCss_declarationRule());

+								}

+								set(

+										current,

+										"property",

+										lv_property_1_0,

+										"css_property");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1974:2: (this_WS_2= RULE_WS )*

+					loop55: do {

+						int alt55 = 2;

+						int LA55_0 = input.LA(1);

+

+						if ((LA55_0 == RULE_WS)) {

+							alt55 = 1;

+						}

+

+

+						switch (alt55) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1974:3: this_WS_2= RULE_WS

+						{

+							this_WS_2 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_rulecss_declaration4261);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(this_WS_2, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_2());

+

+							}

+

+						}

+							break;

+

+						default:

+							break loop55;

+						}

+					} while (true);

+

+					this_COLON_3 = (Token) match(input, RULE_COLON, FOLLOW_RULE_COLON_in_rulecss_declaration4273);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_COLON_3, grammarAccess.getCss_declarationAccess().getCOLONTerminalRuleCall_3());

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1982:1: ( (lv_valueTokens_4_0= ruleCssTok ) )+

+					int cnt56 = 0;

+					loop56: do {

+						int alt56 = 2;

+						int LA56_0 = input.LA(1);

+

+						if ((LA56_0 == RULE_CSSSTRING || (LA56_0 >= RULE_COMMA && LA56_0 <= RULE_WS) || LA56_0 == RULE_HASHMARK || (LA56_0 >= RULE_PLUS && LA56_0 <= RULE_ONE_INT) || LA56_0 == 41 || LA56_0 == 49 || (LA56_0 >= 56 && LA56_0 <= 59))) {

+							alt56 = 1;

+						}

+

+

+						switch (alt56) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1983:1: (lv_valueTokens_4_0= ruleCssTok )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1983:1: (lv_valueTokens_4_0= ruleCssTok )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1984:3: lv_valueTokens_4_0= ruleCssTok

+							{

+								if (state.backtracking == 0) {

+

+									newCompositeNode(grammarAccess.getCss_declarationAccess().getValueTokensCssTokParserRuleCall_4_0());

+

+								}

+								pushFollow(FOLLOW_ruleCssTok_in_rulecss_declaration4293);

+								lv_valueTokens_4_0 = ruleCssTok();

+

+								state._fsp--;

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									if (current == null) {

+										current = createModelElementForParent(grammarAccess.getCss_declarationRule());

+									}

+									add(

+											current,

+											"valueTokens",

+											lv_valueTokens_4_0,

+											"CssTok");

+									afterParserOrEnumRuleCall();

+

+								}

+

+							}

+

+

+						}

+							break;

+

+						default:

+							if (cnt56 >= 1) {

+								break loop56;

+							}

+							if (state.backtracking > 0) {

+								state.failed = true;

+								return current;

+							}

+							EarlyExitException eee =

+									new EarlyExitException(56, input);

+							throw eee;

+						}

+						cnt56++;

+					} while (true);

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2000:3: ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )?

+					int alt57 = 2;

+					int LA57_0 = input.LA(1);

+

+					if ((LA57_0 == RULE_IMPORTANT_SYM)) {

+						alt57 = 1;

+					}

+					switch (alt57) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2001:1: (lv_important_5_0= RULE_IMPORTANT_SYM )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2001:1: (lv_important_5_0= RULE_IMPORTANT_SYM )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2002:3: lv_important_5_0= RULE_IMPORTANT_SYM

+						{

+							lv_important_5_0 = (Token) match(input, RULE_IMPORTANT_SYM, FOLLOW_RULE_IMPORTANT_SYM_in_rulecss_declaration4311);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(lv_important_5_0, grammarAccess.getCss_declarationAccess().getImportantIMPORTANT_SYMTerminalRuleCall_5_0());

+

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElement(grammarAccess.getCss_declarationRule());

+								}

+								setWithLastConsumed(

+										current,

+										"important",

+										true,

+										"IMPORTANT_SYM");

+

+							}

+

+						}

+

+

+					}

+						break;

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulecss_declaration"

+

+

+	// $ANTLR start "entryRulecss_property"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2029:1: entryRulecss_property returns [EObject current=null] : iv_rulecss_property= rulecss_property EOF ;

+	public final EObject entryRulecss_property() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulecss_property = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2030:2: (iv_rulecss_property= rulecss_property EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2031:2: iv_rulecss_property= rulecss_property EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getCss_propertyRule());

+				}

+				pushFollow(FOLLOW_rulecss_property_in_entryRulecss_property4357);

+				iv_rulecss_property = rulecss_property();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulecss_property;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulecss_property4367);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulecss_property"

+

+

+	// $ANTLR start "rulecss_property"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2038:1: rulecss_property returns [EObject current=null] : ( () ( (lv_name_1_0= ruleValidPropertyIdent ) ) ) ;

+	public final EObject rulecss_property() throws RecognitionException {

+		EObject current = null;

+

+		AntlrDatatypeRuleToken lv_name_1_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2041:28: ( ( () ( (lv_name_1_0= ruleValidPropertyIdent ) ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2042:1: ( () ( (lv_name_1_0= ruleValidPropertyIdent ) ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2042:1: ( () ( (lv_name_1_0= ruleValidPropertyIdent ) ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2042:2: () ( (lv_name_1_0= ruleValidPropertyIdent ) )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2042:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2043:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getCss_propertyAccess().getCss_propertyAction_0(),

+									current);

+

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2048:2: ( (lv_name_1_0= ruleValidPropertyIdent ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2049:1: (lv_name_1_0= ruleValidPropertyIdent )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2049:1: (lv_name_1_0= ruleValidPropertyIdent )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2050:3: lv_name_1_0= ruleValidPropertyIdent

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getCss_propertyAccess().getNameValidPropertyIdentParserRuleCall_1_0());

+

+							}

+							pushFollow(FOLLOW_ruleValidPropertyIdent_in_rulecss_property4422);

+							lv_name_1_0 = ruleValidPropertyIdent();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getCss_propertyRule());

+								}

+								set(

+										current,

+										"name",

+										lv_name_1_0,

+										"ValidPropertyIdent");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulecss_property"

+

+

+	// $ANTLR start "entryRuleValidPropertyIdent"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2074:1: entryRuleValidPropertyIdent returns [String current=null] : iv_ruleValidPropertyIdent= ruleValidPropertyIdent EOF

+	// ;

+	public final String entryRuleValidPropertyIdent() throws RecognitionException {

+		String current = null;

+

+		AntlrDatatypeRuleToken iv_ruleValidPropertyIdent = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2075:2: (iv_ruleValidPropertyIdent= ruleValidPropertyIdent EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2076:2: iv_ruleValidPropertyIdent= ruleValidPropertyIdent EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getValidPropertyIdentRule());

+				}

+				pushFollow(FOLLOW_ruleValidPropertyIdent_in_entryRuleValidPropertyIdent4459);

+				iv_ruleValidPropertyIdent = ruleValidPropertyIdent();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleValidPropertyIdent.getText();

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleValidPropertyIdent4470);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleValidPropertyIdent"

+

+

+	// $ANTLR start "ruleValidPropertyIdent"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2083:1: ruleValidPropertyIdent returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_Identifier_0=

+	// ruleIdentifier ;

+	public final AntlrDatatypeRuleToken ruleValidPropertyIdent() throws RecognitionException {

+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

+

+		AntlrDatatypeRuleToken this_Identifier_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2086:28: (this_Identifier_0= ruleIdentifier )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2088:5: this_Identifier_0= ruleIdentifier

+			{

+				if (state.backtracking == 0) {

+

+					newCompositeNode(grammarAccess.getValidPropertyIdentAccess().getIdentifierParserRuleCall());

+

+				}

+				pushFollow(FOLLOW_ruleIdentifier_in_ruleValidPropertyIdent4516);

+				this_Identifier_0 = ruleIdentifier();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+

+					current.merge(this_Identifier_0);

+

+				}

+				if (state.backtracking == 0) {

+

+					afterParserOrEnumRuleCall();

+

+				}

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleValidPropertyIdent"

+

+

+	// $ANTLR start "entryRulePseudoClassOrFunc"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2106:1: entryRulePseudoClassOrFunc returns [EObject current=null] : iv_rulePseudoClassOrFunc= rulePseudoClassOrFunc EOF ;

+	public final EObject entryRulePseudoClassOrFunc() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulePseudoClassOrFunc = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2107:2: (iv_rulePseudoClassOrFunc= rulePseudoClassOrFunc EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2108:2: iv_rulePseudoClassOrFunc= rulePseudoClassOrFunc EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getPseudoClassOrFuncRule());

+				}

+				pushFollow(FOLLOW_rulePseudoClassOrFunc_in_entryRulePseudoClassOrFunc4560);

+				iv_rulePseudoClassOrFunc = rulePseudoClassOrFunc();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulePseudoClassOrFunc;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulePseudoClassOrFunc4570);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulePseudoClassOrFunc"

+

+

+	// $ANTLR start "rulePseudoClassOrFunc"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2115:1: rulePseudoClassOrFunc returns [EObject current=null] : (this_PseudoClass_0= rulePseudoClass |

+	// this_PseudoClassFunction_1= rulePseudoClassFunction ) ;

+	public final EObject rulePseudoClassOrFunc() throws RecognitionException {

+		EObject current = null;

+

+		EObject this_PseudoClass_0 = null;

+

+		EObject this_PseudoClassFunction_1 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2118:28: ( (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2119:1: (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2119:1: (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction )

+				int alt58 = 2;

+				alt58 = dfa58.predict(input);

+				switch (alt58) {

+				case 1:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2120:5: this_PseudoClass_0= rulePseudoClass

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassParserRuleCall_0());

+

+					}

+					pushFollow(FOLLOW_rulePseudoClass_in_rulePseudoClassOrFunc4617);

+					this_PseudoClass_0 = rulePseudoClass();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_PseudoClass_0;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+				case 2:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2130:5: this_PseudoClassFunction_1= rulePseudoClassFunction

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassFunctionParserRuleCall_1());

+

+					}

+					pushFollow(FOLLOW_rulePseudoClassFunction_in_rulePseudoClassOrFunc4644);

+					this_PseudoClassFunction_1 = rulePseudoClassFunction();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_PseudoClassFunction_1;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulePseudoClassOrFunc"

+

+

+	// $ANTLR start "entryRulePseudoClass"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2146:1: entryRulePseudoClass returns [EObject current=null] : iv_rulePseudoClass= rulePseudoClass EOF ;

+	public final EObject entryRulePseudoClass() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulePseudoClass = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2147:2: (iv_rulePseudoClass= rulePseudoClass EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2148:2: iv_rulePseudoClass= rulePseudoClass EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getPseudoClassRule());

+				}

+				pushFollow(FOLLOW_rulePseudoClass_in_entryRulePseudoClass4679);

+				iv_rulePseudoClass = rulePseudoClass();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulePseudoClass;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulePseudoClass4689);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulePseudoClass"

+

+

+	// $ANTLR start "rulePseudoClass"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2155:1: rulePseudoClass returns [EObject current=null] : (this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )?

+	// this_PseudoClassName_2= rulePseudoClassName ) ;

+	public final EObject rulePseudoClass() throws RecognitionException {

+		EObject current = null;

+

+		Token this_COLON_0 = null;

+		Token this_COLON_1 = null;

+		EObject this_PseudoClassName_2 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2158:28: ( (this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2159:1: (this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2159:1: (this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2159:2: this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName

+				{

+					this_COLON_0 = (Token) match(input, RULE_COLON, FOLLOW_RULE_COLON_in_rulePseudoClass4725);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_COLON_0, grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_0());

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2163:1: (this_COLON_1= RULE_COLON )?

+					int alt59 = 2;

+					int LA59_0 = input.LA(1);

+

+					if ((LA59_0 == RULE_COLON)) {

+						alt59 = 1;

+					}

+					switch (alt59) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2163:2: this_COLON_1= RULE_COLON

+					{

+						this_COLON_1 = (Token) match(input, RULE_COLON, FOLLOW_RULE_COLON_in_rulePseudoClass4736);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(this_COLON_1, grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_1());

+

+						}

+

+					}

+						break;

+

+					}

+

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getPseudoClassAccess().getPseudoClassNameParserRuleCall_2());

+

+					}

+					pushFollow(FOLLOW_rulePseudoClassName_in_rulePseudoClass4759);

+					this_PseudoClassName_2 = rulePseudoClassName();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_PseudoClassName_2;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulePseudoClass"

+

+

+	// $ANTLR start "entryRulePseudoClassName"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2184:1: entryRulePseudoClassName returns [EObject current=null] : iv_rulePseudoClassName= rulePseudoClassName EOF ;

+	public final EObject entryRulePseudoClassName() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulePseudoClassName = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2185:2: (iv_rulePseudoClassName= rulePseudoClassName EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2186:2: iv_rulePseudoClassName= rulePseudoClassName EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getPseudoClassNameRule());

+				}

+				pushFollow(FOLLOW_rulePseudoClassName_in_entryRulePseudoClassName4794);

+				iv_rulePseudoClassName = rulePseudoClassName();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulePseudoClassName;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulePseudoClassName4804);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulePseudoClassName"

+

+

+	// $ANTLR start "rulePseudoClassName"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2193:1: rulePseudoClassName returns [EObject current=null] : ( (lv_name_0_0= ruleIdentifier ) ) ;

+	public final EObject rulePseudoClassName() throws RecognitionException {

+		EObject current = null;

+

+		AntlrDatatypeRuleToken lv_name_0_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2196:28: ( ( (lv_name_0_0= ruleIdentifier ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2197:1: ( (lv_name_0_0= ruleIdentifier ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2197:1: ( (lv_name_0_0= ruleIdentifier ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2198:1: (lv_name_0_0= ruleIdentifier )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2198:1: (lv_name_0_0= ruleIdentifier )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2199:3: lv_name_0_0= ruleIdentifier

+					{

+						if (state.backtracking == 0) {

+

+							newCompositeNode(grammarAccess.getPseudoClassNameAccess().getNameIdentifierParserRuleCall_0());

+

+						}

+						pushFollow(FOLLOW_ruleIdentifier_in_rulePseudoClassName4849);

+						lv_name_0_0 = ruleIdentifier();

+

+						state._fsp--;

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							if (current == null) {

+								current = createModelElementForParent(grammarAccess.getPseudoClassNameRule());

+							}

+							set(

+									current,

+									"name",

+									lv_name_0_0,

+									"Identifier");

+							afterParserOrEnumRuleCall();

+

+						}

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulePseudoClassName"

+

+

+	// $ANTLR start "entryRulePseudoClassFunction"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2223:1: entryRulePseudoClassFunction returns [EObject current=null] : iv_rulePseudoClassFunction= rulePseudoClassFunction

+	// EOF ;

+	public final EObject entryRulePseudoClassFunction() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_rulePseudoClassFunction = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2224:2: (iv_rulePseudoClassFunction= rulePseudoClassFunction EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2225:2: iv_rulePseudoClassFunction= rulePseudoClassFunction EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getPseudoClassFunctionRule());

+				}

+				pushFollow(FOLLOW_rulePseudoClassFunction_in_entryRulePseudoClassFunction4884);

+				iv_rulePseudoClassFunction = rulePseudoClassFunction();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulePseudoClassFunction;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulePseudoClassFunction4894);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulePseudoClassFunction"

+

+

+	// $ANTLR start "rulePseudoClassFunction"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2232:1: rulePseudoClassFunction returns [EObject current=null] : ( ( ( (lv_not_0_0= ruleNotFunctionCall ) ) (

+	// (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')' ) | (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0= ruleCssTok ) )* otherlv_7= ')' ) ) ;

+	public final EObject rulePseudoClassFunction() throws RecognitionException {

+		EObject current = null;

+

+		Token otherlv_2 = null;

+		Token this_COLON_3 = null;

+		Token otherlv_5 = null;

+		Token otherlv_7 = null;

+		AntlrDatatypeRuleToken lv_not_0_0 = null;

+

+		EObject lv_paramSelector_1_0 = null;

+

+		AntlrDatatypeRuleToken lv_name_4_0 = null;

+

+		EObject lv_params_6_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2235:28: ( ( ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) )

+			// otherlv_2= ')' ) | (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0= ruleCssTok ) )* otherlv_7= ')' ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2236:1: ( ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) )

+			// otherlv_2= ')' ) | (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0= ruleCssTok ) )* otherlv_7= ')' ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2236:1: ( ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) )

+				// otherlv_2= ')' ) | (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0= ruleCssTok ) )* otherlv_7= ')' ) )

+				int alt61 = 2;

+				int LA61_0 = input.LA(1);

+

+				if ((LA61_0 == RULE_COLON)) {

+					int LA61_1 = input.LA(2);

+

+					if (((LA61_1 >= RULE_DASH && LA61_1 <= RULE_ONE_NON_HEX_LETTER) || (LA61_1 >= 56 && LA61_1 <= 59))) {

+						alt61 = 2;

+					}

+					else if ((LA61_1 == 46)) {

+						alt61 = 1;

+					}

+					else {

+						if (state.backtracking > 0) {

+							state.failed = true;

+							return current;

+						}

+						NoViableAltException nvae =

+								new NoViableAltException("", 61, 1, input);

+

+						throw nvae;

+					}

+				}

+				else {

+					if (state.backtracking > 0) {

+						state.failed = true;

+						return current;

+					}

+					NoViableAltException nvae =

+							new NoViableAltException("", 61, 0, input);

+

+					throw nvae;

+				}

+				switch (alt61) {

+				case 1:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2236:2: ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) )

+				// otherlv_2= ')' )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2236:2: ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation )

+					// ) otherlv_2= ')' )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2236:3: ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) )

+					// otherlv_2= ')'

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2236:3: ( (lv_not_0_0= ruleNotFunctionCall ) )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2237:1: (lv_not_0_0= ruleNotFunctionCall )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2237:1: (lv_not_0_0= ruleNotFunctionCall )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2238:3: lv_not_0_0= ruleNotFunctionCall

+							{

+								if (state.backtracking == 0) {

+

+									newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getNotNotFunctionCallParserRuleCall_0_0_0());

+

+								}

+								pushFollow(FOLLOW_ruleNotFunctionCall_in_rulePseudoClassFunction4941);

+								lv_not_0_0 = ruleNotFunctionCall();

+

+								state._fsp--;

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									if (current == null) {

+										current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());

+									}

+									set(

+											current,

+											"not",

+											true,

+											"NotFunctionCall");

+									afterParserOrEnumRuleCall();

+

+								}

+

+							}

+

+

+						}

+

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2254:2: ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2255:1: (lv_paramSelector_1_0= ruleSimpleSelectorForNegation )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2255:1: (lv_paramSelector_1_0= ruleSimpleSelectorForNegation )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2256:3: lv_paramSelector_1_0= ruleSimpleSelectorForNegation

+							{

+								if (state.backtracking == 0) {

+

+									newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getParamSelectorSimpleSelectorForNegationParserRuleCall_0_1_0());

+

+								}

+								pushFollow(FOLLOW_ruleSimpleSelectorForNegation_in_rulePseudoClassFunction4962);

+								lv_paramSelector_1_0 = ruleSimpleSelectorForNegation();

+

+								state._fsp--;

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									if (current == null) {

+										current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());

+									}

+									set(

+											current,

+											"paramSelector",

+											lv_paramSelector_1_0,

+											"SimpleSelectorForNegation");

+									afterParserOrEnumRuleCall();

+

+								}

+

+							}

+

+

+						}

+

+						otherlv_2 = (Token) match(input, 44, FOLLOW_44_in_rulePseudoClassFunction4974);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_2, grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_0_2());

+

+						}

+

+					}

+

+

+				}

+					break;

+				case 2:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2277:6: (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0=

+				// ruleCssTok ) )* otherlv_7= ')' )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2277:6: (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0=

+					// ruleCssTok ) )* otherlv_7= ')' )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2277:7: this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0=

+					// ruleCssTok ) )* otherlv_7= ')'

+					{

+						this_COLON_3 = (Token) match(input, RULE_COLON, FOLLOW_RULE_COLON_in_rulePseudoClassFunction4993);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(this_COLON_3, grammarAccess.getPseudoClassFunctionAccess().getCOLONTerminalRuleCall_1_0());

+

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2281:1: ( (lv_name_4_0= ruleIdentifier ) )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2282:1: (lv_name_4_0= ruleIdentifier )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2282:1: (lv_name_4_0= ruleIdentifier )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2283:3: lv_name_4_0= ruleIdentifier

+							{

+								if (state.backtracking == 0) {

+

+									newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getNameIdentifierParserRuleCall_1_1_0());

+

+								}

+								pushFollow(FOLLOW_ruleIdentifier_in_rulePseudoClassFunction5013);

+								lv_name_4_0 = ruleIdentifier();

+

+								state._fsp--;

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									if (current == null) {

+										current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());

+									}

+									set(

+											current,

+											"name",

+											lv_name_4_0,

+											"Identifier");

+									afterParserOrEnumRuleCall();

+

+								}

+

+							}

+

+

+						}

+

+						otherlv_5 = (Token) match(input, 45, FOLLOW_45_in_rulePseudoClassFunction5025);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_5, grammarAccess.getPseudoClassFunctionAccess().getLeftParenthesisKeyword_1_2());

+

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2303:1: ( (lv_params_6_0= ruleCssTok ) )*

+						loop60: do {

+							int alt60 = 2;

+							int LA60_0 = input.LA(1);

+

+							if ((LA60_0 == RULE_CSSSTRING || (LA60_0 >= RULE_COMMA && LA60_0 <= RULE_WS) || LA60_0 == RULE_HASHMARK || (LA60_0 >= RULE_PLUS && LA60_0 <= RULE_ONE_INT) || LA60_0 == 41 || LA60_0 == 49 || (LA60_0 >= 56 && LA60_0 <= 59))) {

+								alt60 = 1;

+							}

+

+

+							switch (alt60) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2304:1: (lv_params_6_0= ruleCssTok )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2304:1: (lv_params_6_0= ruleCssTok )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2305:3: lv_params_6_0= ruleCssTok

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getParamsCssTokParserRuleCall_1_3_0());

+

+									}

+									pushFollow(FOLLOW_ruleCssTok_in_rulePseudoClassFunction5046);

+									lv_params_6_0 = ruleCssTok();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());

+										}

+										add(

+												current,

+												"params",

+												lv_params_6_0,

+												"CssTok");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+								break;

+

+							default:

+								break loop60;

+							}

+						} while (true);

+

+						otherlv_7 = (Token) match(input, 44, FOLLOW_44_in_rulePseudoClassFunction5059);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_7, grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_1_4());

+

+						}

+

+					}

+

+

+				}

+					break;

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulePseudoClassFunction"

+

+

+	// $ANTLR start "entryRuleNotFunctionCall"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2333:1: entryRuleNotFunctionCall returns [String current=null] : iv_ruleNotFunctionCall= ruleNotFunctionCall EOF ;

+	public final String entryRuleNotFunctionCall() throws RecognitionException {

+		String current = null;

+

+		AntlrDatatypeRuleToken iv_ruleNotFunctionCall = null;

+

+

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2337:2: (iv_ruleNotFunctionCall= ruleNotFunctionCall EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2338:2: iv_ruleNotFunctionCall= ruleNotFunctionCall EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getNotFunctionCallRule());

+				}

+				pushFollow(FOLLOW_ruleNotFunctionCall_in_entryRuleNotFunctionCall5103);

+				iv_ruleNotFunctionCall = ruleNotFunctionCall();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleNotFunctionCall.getText();

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleNotFunctionCall5114);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleNotFunctionCall"

+

+

+	// $ANTLR start "ruleNotFunctionCall"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2348:1: ruleNotFunctionCall returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_COLON_0=

+	// RULE_COLON kw= 'not(' ) ;

+	public final AntlrDatatypeRuleToken ruleNotFunctionCall() throws RecognitionException {

+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

+

+		Token this_COLON_0 = null;

+		Token kw = null;

+

+		enterRule();

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2352:28: ( (this_COLON_0= RULE_COLON kw= 'not(' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2353:1: (this_COLON_0= RULE_COLON kw= 'not(' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2353:1: (this_COLON_0= RULE_COLON kw= 'not(' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2353:6: this_COLON_0= RULE_COLON kw= 'not('

+				{

+					this_COLON_0 = (Token) match(input, RULE_COLON, FOLLOW_RULE_COLON_in_ruleNotFunctionCall5158);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(this_COLON_0);

+

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_COLON_0, grammarAccess.getNotFunctionCallAccess().getCOLONTerminalRuleCall_0());

+

+					}

+					kw = (Token) match(input, 46, FOLLOW_46_in_ruleNotFunctionCall5176);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getNotFunctionCallAccess().getNotKeyword_1());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleNotFunctionCall"

+

+

+	// $ANTLR start "entryRulecombinator"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2377:1: entryRulecombinator returns [String current=null] : iv_rulecombinator= rulecombinator EOF ;

+	public final String entryRulecombinator() throws RecognitionException {

+		String current = null;

+

+		AntlrDatatypeRuleToken iv_rulecombinator = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2378:2: (iv_rulecombinator= rulecombinator EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2379:2: iv_rulecombinator= rulecombinator EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getCombinatorRule());

+				}

+				pushFollow(FOLLOW_rulecombinator_in_entryRulecombinator5221);

+				iv_rulecombinator = rulecombinator();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_rulecombinator.getText();

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRulecombinator5232);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRulecombinator"

+

+

+	// $ANTLR start "rulecombinator"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2386:1: rulecombinator returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_PLUS_0= RULE_PLUS |

+	// kw= '>' | kw= '~' ) ;

+	public final AntlrDatatypeRuleToken rulecombinator() throws RecognitionException {

+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

+

+		Token this_PLUS_0 = null;

+		Token kw = null;

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2389:28: ( (this_PLUS_0= RULE_PLUS | kw= '>' | kw= '~' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2390:1: (this_PLUS_0= RULE_PLUS | kw= '>' | kw= '~' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2390:1: (this_PLUS_0= RULE_PLUS | kw= '>' | kw= '~' )

+				int alt62 = 3;

+				switch (input.LA(1)) {

+				case RULE_PLUS: {

+					alt62 = 1;

+				}

+					break;

+				case 47: {

+					alt62 = 2;

+				}

+					break;

+				case 48: {

+					alt62 = 3;

+				}

+					break;

+				default:

+					if (state.backtracking > 0) {

+						state.failed = true;

+						return current;

+					}

+					NoViableAltException nvae =

+							new NoViableAltException("", 62, 0, input);

+

+					throw nvae;

+				}

+

+				switch (alt62) {

+				case 1:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2390:6: this_PLUS_0= RULE_PLUS

+				{

+					this_PLUS_0 = (Token) match(input, RULE_PLUS, FOLLOW_RULE_PLUS_in_rulecombinator5272);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(this_PLUS_0);

+

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_PLUS_0, grammarAccess.getCombinatorAccess().getPLUSTerminalRuleCall_0());

+

+					}

+

+				}

+					break;

+				case 2:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2399:2: kw= '>'

+				{

+					kw = (Token) match(input, 47, FOLLOW_47_in_rulecombinator5296);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getCombinatorAccess().getGreaterThanSignKeyword_1());

+

+					}

+

+				}

+					break;

+				case 3:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2406:2: kw= '~'

+				{

+					kw = (Token) match(input, 48, FOLLOW_48_in_rulecombinator5315);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getCombinatorAccess().getTildeKeyword_2());

+

+					}

+

+				}

+					break;

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "rulecombinator"

+

+

+	// $ANTLR start "entryRuleSymbolTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2423:1: entryRuleSymbolTok returns [EObject current=null] : iv_ruleSymbolTok= ruleSymbolTok EOF ;

+	public final EObject entryRuleSymbolTok() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleSymbolTok = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2424:2: (iv_ruleSymbolTok= ruleSymbolTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2425:2: iv_ruleSymbolTok= ruleSymbolTok EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getSymbolTokRule());

+				}

+				pushFollow(FOLLOW_ruleSymbolTok_in_entryRuleSymbolTok5359);

+				iv_ruleSymbolTok = ruleSymbolTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleSymbolTok;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleSymbolTok5369);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleSymbolTok"

+

+

+	// $ANTLR start "ruleSymbolTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2432:1: ruleSymbolTok returns [EObject current=null] : ( () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT )

+	// ) ) ) ;

+	public final EObject ruleSymbolTok() throws RecognitionException {

+		EObject current = null;

+

+		Token lv_symbol_1_1 = null;

+		Token lv_symbol_1_2 = null;

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2435:28: ( ( () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2436:1: ( () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2436:1: ( () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2436:2: () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2436:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2437:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getSymbolTokAccess().getSymbolTokAction_0(),

+									current);

+

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2442:2: ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2443:1: ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2443:1: ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2444:1: (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2444:1: (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT )

+							int alt63 = 2;

+							int LA63_0 = input.LA(1);

+

+							if ((LA63_0 == RULE_COMMA)) {

+								alt63 = 1;

+							}

+							else if ((LA63_0 == RULE_PERCENT)) {

+								alt63 = 2;

+							}

+							else {

+								if (state.backtracking > 0) {

+									state.failed = true;

+									return current;

+								}

+								NoViableAltException nvae =

+										new NoViableAltException("", 63, 0, input);

+

+								throw nvae;

+							}

+							switch (alt63) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2445:3: lv_symbol_1_1= RULE_COMMA

+							{

+								lv_symbol_1_1 = (Token) match(input, RULE_COMMA, FOLLOW_RULE_COMMA_in_ruleSymbolTok5422);

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									newLeafNode(lv_symbol_1_1, grammarAccess.getSymbolTokAccess().getSymbolCOMMATerminalRuleCall_1_0_0());

+

+								}

+								if (state.backtracking == 0) {

+

+									if (current == null) {

+										current = createModelElement(grammarAccess.getSymbolTokRule());

+									}

+									setWithLastConsumed(

+											current,

+											"symbol",

+											lv_symbol_1_1,

+											"COMMA");

+

+								}

+

+							}

+								break;

+							case 2:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2460:8: lv_symbol_1_2= RULE_PERCENT

+							{

+								lv_symbol_1_2 = (Token) match(input, RULE_PERCENT, FOLLOW_RULE_PERCENT_in_ruleSymbolTok5442);

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									newLeafNode(lv_symbol_1_2, grammarAccess.getSymbolTokAccess().getSymbolPERCENTTerminalRuleCall_1_0_1());

+

+								}

+								if (state.backtracking == 0) {

+

+									if (current == null) {

+										current = createModelElement(grammarAccess.getSymbolTokRule());

+									}

+									setWithLastConsumed(

+											current,

+											"symbol",

+											lv_symbol_1_2,

+											"PERCENT");

+

+								}

+

+							}

+								break;

+

+							}

+

+

+						}

+

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleSymbolTok"

+

+

+	// $ANTLR start "entryRuleWSTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2486:1: entryRuleWSTok returns [EObject current=null] : iv_ruleWSTok= ruleWSTok EOF ;

+	public final EObject entryRuleWSTok() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleWSTok = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2487:2: (iv_ruleWSTok= ruleWSTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2488:2: iv_ruleWSTok= ruleWSTok EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getWSTokRule());

+				}

+				pushFollow(FOLLOW_ruleWSTok_in_entryRuleWSTok5486);

+				iv_ruleWSTok = ruleWSTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleWSTok;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleWSTok5496);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleWSTok"

+

+

+	// $ANTLR start "ruleWSTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2495:1: ruleWSTok returns [EObject current=null] : ( () this_WS_1= RULE_WS ) ;

+	public final EObject ruleWSTok() throws RecognitionException {

+		EObject current = null;

+

+		Token this_WS_1 = null;

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2498:28: ( ( () this_WS_1= RULE_WS ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2499:1: ( () this_WS_1= RULE_WS )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2499:1: ( () this_WS_1= RULE_WS )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2499:2: () this_WS_1= RULE_WS

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2499:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2500:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getWSTokAccess().getWSTokAction_0(),

+									current);

+

+						}

+

+					}

+

+					this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_RULE_WS_in_ruleWSTok5541);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_WS_1, grammarAccess.getWSTokAccess().getWSTerminalRuleCall_1());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleWSTok"

+

+

+	// $ANTLR start "entryRuleStringTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2517:1: entryRuleStringTok returns [EObject current=null] : iv_ruleStringTok= ruleStringTok EOF ;

+	public final EObject entryRuleStringTok() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleStringTok = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2518:2: (iv_ruleStringTok= ruleStringTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2519:2: iv_ruleStringTok= ruleStringTok EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getStringTokRule());

+				}

+				pushFollow(FOLLOW_ruleStringTok_in_entryRuleStringTok5576);

+				iv_ruleStringTok = ruleStringTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleStringTok;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleStringTok5586);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleStringTok"

+

+

+	// $ANTLR start "ruleStringTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2526:1: ruleStringTok returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_CSSSTRING ) ) ) ;

+	public final EObject ruleStringTok() throws RecognitionException {

+		EObject current = null;

+

+		Token lv_value_1_0 = null;

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2529:28: ( ( () ( (lv_value_1_0= RULE_CSSSTRING ) ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2530:1: ( () ( (lv_value_1_0= RULE_CSSSTRING ) ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2530:1: ( () ( (lv_value_1_0= RULE_CSSSTRING ) ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2530:2: () ( (lv_value_1_0= RULE_CSSSTRING ) )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2530:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2531:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getStringTokAccess().getStringTokAction_0(),

+									current);

+

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2536:2: ( (lv_value_1_0= RULE_CSSSTRING ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2537:1: (lv_value_1_0= RULE_CSSSTRING )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2537:1: (lv_value_1_0= RULE_CSSSTRING )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2538:3: lv_value_1_0= RULE_CSSSTRING

+						{

+							lv_value_1_0 = (Token) match(input, RULE_CSSSTRING, FOLLOW_RULE_CSSSTRING_in_ruleStringTok5637);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(lv_value_1_0, grammarAccess.getStringTokAccess().getValueCSSSTRINGTerminalRuleCall_1_0());

+

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElement(grammarAccess.getStringTokRule());

+								}

+								setWithLastConsumed(

+										current,

+										"value",

+										lv_value_1_0,

+										"CSSSTRING");

+

+							}

+

+						}

+

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleStringTok"

+

+

+	// $ANTLR start "entryRuleNumberTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2562:1: entryRuleNumberTok returns [EObject current=null] : iv_ruleNumberTok= ruleNumberTok EOF ;

+	public final EObject entryRuleNumberTok() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleNumberTok = null;

+

+

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2566:2: (iv_ruleNumberTok= ruleNumberTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2567:2: iv_ruleNumberTok= ruleNumberTok EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getNumberTokRule());

+				}

+				pushFollow(FOLLOW_ruleNumberTok_in_entryRuleNumberTok5684);

+				iv_ruleNumberTok = ruleNumberTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleNumberTok;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleNumberTok5694);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleNumberTok"

+

+

+	// $ANTLR start "ruleNumberTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2577:1: ruleNumberTok returns [EObject current=null] : ( () ( (lv_val_1_0= ruleNum ) ) ) ;

+	public final EObject ruleNumberTok() throws RecognitionException {

+		EObject current = null;

+

+		AntlrDatatypeRuleToken lv_val_1_0 = null;

+

+

+		enterRule();

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2581:28: ( ( () ( (lv_val_1_0= ruleNum ) ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2582:1: ( () ( (lv_val_1_0= ruleNum ) ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2582:1: ( () ( (lv_val_1_0= ruleNum ) ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2582:2: () ( (lv_val_1_0= ruleNum ) )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2582:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2583:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getNumberTokAccess().getNumberTokAction_0(),

+									current);

+

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2588:2: ( (lv_val_1_0= ruleNum ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2589:1: (lv_val_1_0= ruleNum )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2589:1: (lv_val_1_0= ruleNum )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2590:3: lv_val_1_0= ruleNum

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getNumberTokAccess().getValNumParserRuleCall_1_0());

+

+							}

+							pushFollow(FOLLOW_ruleNum_in_ruleNumberTok5753);

+							lv_val_1_0 = ruleNum();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getNumberTokRule());

+								}

+								set(

+										current,

+										"val",

+										lv_val_1_0,

+										"Num");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleNumberTok"

+

+

+	// $ANTLR start "entryRuleUrlTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2617:1: entryRuleUrlTok returns [EObject current=null] : iv_ruleUrlTok= ruleUrlTok EOF ;

+	public final EObject entryRuleUrlTok() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleUrlTok = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2618:2: (iv_ruleUrlTok= ruleUrlTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2619:2: iv_ruleUrlTok= ruleUrlTok EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getUrlTokRule());

+				}

+				pushFollow(FOLLOW_ruleUrlTok_in_entryRuleUrlTok5793);

+				iv_ruleUrlTok = ruleUrlTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleUrlTok;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleUrlTok5803);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleUrlTok"

+

+

+	// $ANTLR start "ruleUrlTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2626:1: ruleUrlTok returns [EObject current=null] : ( () ( (lv_url_1_0= ruleURLType ) ) ) ;

+	public final EObject ruleUrlTok() throws RecognitionException {

+		EObject current = null;

+

+		EObject lv_url_1_0 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2629:28: ( ( () ( (lv_url_1_0= ruleURLType ) ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2630:1: ( () ( (lv_url_1_0= ruleURLType ) ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2630:1: ( () ( (lv_url_1_0= ruleURLType ) ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2630:2: () ( (lv_url_1_0= ruleURLType ) )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2630:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2631:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getUrlTokAccess().getUrlTokAction_0(),

+									current);

+

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2636:2: ( (lv_url_1_0= ruleURLType ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2637:1: (lv_url_1_0= ruleURLType )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2637:1: (lv_url_1_0= ruleURLType )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2638:3: lv_url_1_0= ruleURLType

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getUrlTokAccess().getUrlURLTypeParserRuleCall_1_0());

+

+							}

+							pushFollow(FOLLOW_ruleURLType_in_ruleUrlTok5858);

+							lv_url_1_0 = ruleURLType();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getUrlTokRule());

+								}

+								set(

+										current,

+										"url",

+										lv_url_1_0,

+										"URLType");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleUrlTok"

+

+

+	// $ANTLR start "entryRuleColorTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2662:1: entryRuleColorTok returns [EObject current=null] : iv_ruleColorTok= ruleColorTok EOF ;

+	public final EObject entryRuleColorTok() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleColorTok = null;

+

+

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2666:2: (iv_ruleColorTok= ruleColorTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2667:2: iv_ruleColorTok= ruleColorTok EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getColorTokRule());

+				}

+				pushFollow(FOLLOW_ruleColorTok_in_entryRuleColorTok5900);

+				iv_ruleColorTok = ruleColorTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleColorTok;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleColorTok5910);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleColorTok"

+

+

+	// $ANTLR start "ruleColorTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2677:1: ruleColorTok returns [EObject current=null] : ( () ( (lv_value_1_0= ruleHex ) ) ) ;

+	public final EObject ruleColorTok() throws RecognitionException {

+		EObject current = null;

+

+		AntlrDatatypeRuleToken lv_value_1_0 = null;

+

+

+		enterRule();

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2681:28: ( ( () ( (lv_value_1_0= ruleHex ) ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2682:1: ( () ( (lv_value_1_0= ruleHex ) ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2682:1: ( () ( (lv_value_1_0= ruleHex ) ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2682:2: () ( (lv_value_1_0= ruleHex ) )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2682:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2683:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getColorTokAccess().getColorTokAction_0(),

+									current);

+

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2688:2: ( (lv_value_1_0= ruleHex ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2689:1: (lv_value_1_0= ruleHex )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2689:1: (lv_value_1_0= ruleHex )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2690:3: lv_value_1_0= ruleHex

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getColorTokAccess().getValueHexParserRuleCall_1_0());

+

+							}

+							pushFollow(FOLLOW_ruleHex_in_ruleColorTok5969);

+							lv_value_1_0 = ruleHex();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getColorTokRule());

+								}

+								set(

+										current,

+										"value",

+										lv_value_1_0,

+										"Hex");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleColorTok"

+

+

+	// $ANTLR start "entryRuleIdentifierOrFuncTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2717:1: entryRuleIdentifierOrFuncTok returns [EObject current=null] : iv_ruleIdentifierOrFuncTok= ruleIdentifierOrFuncTok

+	// EOF ;

+	public final EObject entryRuleIdentifierOrFuncTok() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleIdentifierOrFuncTok = null;

+

+

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2721:2: (iv_ruleIdentifierOrFuncTok= ruleIdentifierOrFuncTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2722:2: iv_ruleIdentifierOrFuncTok= ruleIdentifierOrFuncTok EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getIdentifierOrFuncTokRule());

+				}

+				pushFollow(FOLLOW_ruleIdentifierOrFuncTok_in_entryRuleIdentifierOrFuncTok6015);

+				iv_ruleIdentifierOrFuncTok = ruleIdentifierOrFuncTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleIdentifierOrFuncTok;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleIdentifierOrFuncTok6025);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleIdentifierOrFuncTok"

+

+

+	// $ANTLR start "ruleIdentifierOrFuncTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2732:1: ruleIdentifierOrFuncTok returns [EObject current=null] : ( () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3=

+	// '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )? ) ;

+	public final EObject ruleIdentifierOrFuncTok() throws RecognitionException {

+		EObject current = null;

+

+		Token otherlv_3 = null;

+		Token otherlv_5 = null;

+		AntlrDatatypeRuleToken lv_name_1_0 = null;

+

+		EObject lv_params_4_0 = null;

+

+

+		enterRule();

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2736:28: ( ( () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+

+			// otherlv_5= ')' )? ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2737:1: ( () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5=

+			// ')' )? )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2737:1: ( () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+

+				// otherlv_5= ')' )? )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2737:2: () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5=

+				// ')' )?

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2737:2: ()

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2738:5:

+					{

+						if (state.backtracking == 0) {

+

+							current = forceCreateModelElement(

+									grammarAccess.getIdentifierOrFuncTokAccess().getIdentifierTokAction_0(),

+									current);

+

+						}

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2743:2: ( (lv_name_1_0= ruleIdentifier ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2744:1: (lv_name_1_0= ruleIdentifier )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2744:1: (lv_name_1_0= ruleIdentifier )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2745:3: lv_name_1_0= ruleIdentifier

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getIdentifierOrFuncTokAccess().getNameIdentifierParserRuleCall_1_0());

+

+							}

+							pushFollow(FOLLOW_ruleIdentifier_in_ruleIdentifierOrFuncTok6084);

+							lv_name_1_0 = ruleIdentifier();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getIdentifierOrFuncTokRule());

+								}

+								set(

+										current,

+										"name",

+										lv_name_1_0,

+										"Identifier");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2761:2: ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )?

+					int alt65 = 2;

+					int LA65_0 = input.LA(1);

+

+					if ((LA65_0 == 45)) {

+						alt65 = 1;

+					}

+					switch (alt65) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2761:3: () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')'

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2761:3: ()

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2762:5:

+						{

+							if (state.backtracking == 0) {

+

+								current = forceCreateModelElementAndSet(

+										grammarAccess.getIdentifierOrFuncTokAccess().getFuncTokNameAction_2_0(),

+										current);

+

+							}

+

+						}

+

+						otherlv_3 = (Token) match(input, 45, FOLLOW_45_in_ruleIdentifierOrFuncTok6106);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_3, grammarAccess.getIdentifierOrFuncTokAccess().getLeftParenthesisKeyword_2_1());

+

+						}

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2771:1: ( (lv_params_4_0= ruleCssTok ) )+

+						int cnt64 = 0;

+						loop64: do {

+							int alt64 = 2;

+							int LA64_0 = input.LA(1);

+

+							if ((LA64_0 == RULE_CSSSTRING || (LA64_0 >= RULE_COMMA && LA64_0 <= RULE_WS) || LA64_0 == RULE_HASHMARK || (LA64_0 >= RULE_PLUS && LA64_0 <= RULE_ONE_INT) || LA64_0 == 41 || LA64_0 == 49 || (LA64_0 >= 56 && LA64_0 <= 59))) {

+								alt64 = 1;

+							}

+

+

+							switch (alt64) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2772:1: (lv_params_4_0= ruleCssTok )

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2772:1: (lv_params_4_0= ruleCssTok )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2773:3: lv_params_4_0= ruleCssTok

+								{

+									if (state.backtracking == 0) {

+

+										newCompositeNode(grammarAccess.getIdentifierOrFuncTokAccess().getParamsCssTokParserRuleCall_2_2_0());

+

+									}

+									pushFollow(FOLLOW_ruleCssTok_in_ruleIdentifierOrFuncTok6127);

+									lv_params_4_0 = ruleCssTok();

+

+									state._fsp--;

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										if (current == null) {

+											current = createModelElementForParent(grammarAccess.getIdentifierOrFuncTokRule());

+										}

+										add(

+												current,

+												"params",

+												lv_params_4_0,

+												"CssTok");

+										afterParserOrEnumRuleCall();

+

+									}

+

+								}

+

+

+							}

+								break;

+

+							default:

+								if (cnt64 >= 1) {

+									break loop64;

+								}

+								if (state.backtracking > 0) {

+									state.failed = true;

+									return current;

+								}

+								EarlyExitException eee =

+										new EarlyExitException(64, input);

+								throw eee;

+							}

+							cnt64++;

+						} while (true);

+

+						otherlv_5 = (Token) match(input, 44, FOLLOW_44_in_ruleIdentifierOrFuncTok6140);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(otherlv_5, grammarAccess.getIdentifierOrFuncTokAccess().getRightParenthesisKeyword_2_3());

+

+						}

+

+					}

+						break;

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleIdentifierOrFuncTok"

+

+

+	// $ANTLR start "entryRuleCssTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2804:1: entryRuleCssTok returns [EObject current=null] : iv_ruleCssTok= ruleCssTok EOF ;

+	public final EObject entryRuleCssTok() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleCssTok = null;

+

+

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2808:2: (iv_ruleCssTok= ruleCssTok EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2809:2: iv_ruleCssTok= ruleCssTok EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getCssTokRule());

+				}

+				pushFollow(FOLLOW_ruleCssTok_in_entryRuleCssTok6188);

+				iv_ruleCssTok = ruleCssTok();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleCssTok;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleCssTok6198);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleCssTok"

+

+

+	// $ANTLR start "ruleCssTok"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2819:1: ruleCssTok returns [EObject current=null] : (this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok |

+	// this_SymbolTok_1= ruleSymbolTok | this_WSTok_2= ruleWSTok | this_StringTok_3= ruleStringTok | this_NumberTok_4= ruleNumberTok | this_UrlTok_5= ruleUrlTok | this_ColorTok_6= ruleColorTok ) ;

+	public final EObject ruleCssTok() throws RecognitionException {

+		EObject current = null;

+

+		EObject this_IdentifierOrFuncTok_0 = null;

+

+		EObject this_SymbolTok_1 = null;

+

+		EObject this_WSTok_2 = null;

+

+		EObject this_StringTok_3 = null;

+

+		EObject this_NumberTok_4 = null;

+

+		EObject this_UrlTok_5 = null;

+

+		EObject this_ColorTok_6 = null;

+

+

+		enterRule();

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2823:28: ( (this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok | this_SymbolTok_1= ruleSymbolTok | this_WSTok_2=

+			// ruleWSTok | this_StringTok_3= ruleStringTok | this_NumberTok_4= ruleNumberTok | this_UrlTok_5= ruleUrlTok | this_ColorTok_6= ruleColorTok ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2824:1: (this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok | this_SymbolTok_1= ruleSymbolTok | this_WSTok_2=

+			// ruleWSTok | this_StringTok_3= ruleStringTok | this_NumberTok_4= ruleNumberTok | this_UrlTok_5= ruleUrlTok | this_ColorTok_6= ruleColorTok )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2824:1: (this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok | this_SymbolTok_1= ruleSymbolTok | this_WSTok_2=

+				// ruleWSTok | this_StringTok_3= ruleStringTok | this_NumberTok_4= ruleNumberTok | this_UrlTok_5= ruleUrlTok | this_ColorTok_6= ruleColorTok )

+				int alt66 = 7;

+				switch (input.LA(1)) {

+				case RULE_DASH: {

+					int LA66_1 = input.LA(2);

+

+					if ((LA66_1 == RULE_ONE_INT || LA66_1 == 41)) {

+						alt66 = 5;

+					}

+					else if (((LA66_1 >= RULE_UNDERSCORE && LA66_1 <= RULE_ONE_NON_HEX_LETTER) || (LA66_1 >= 56 && LA66_1 <= 59))) {

+						alt66 = 1;

+					}

+					else {

+						if (state.backtracking > 0) {

+							state.failed = true;

+							return current;

+						}

+						NoViableAltException nvae =

+								new NoViableAltException("", 66, 1, input);

+

+						throw nvae;

+					}

+				}

+					break;

+				case RULE_UNDERSCORE:

+				case RULE_ONE_HEX_LETTER:

+				case RULE_ONE_NON_HEX_LETTER:

+				case 56:

+				case 57:

+				case 58:

+				case 59: {

+					alt66 = 1;

+				}

+					break;

+				case RULE_COMMA:

+				case RULE_PERCENT: {

+					alt66 = 2;

+				}

+					break;

+				case RULE_WS: {

+					alt66 = 3;

+				}

+					break;

+				case RULE_CSSSTRING: {

+					alt66 = 4;

+				}

+					break;

+				case RULE_PLUS:

+				case RULE_ONE_INT:

+				case 41: {

+					alt66 = 5;

+				}

+					break;

+				case 49: {

+					alt66 = 6;

+				}

+					break;

+				case RULE_HASHMARK: {

+					alt66 = 7;

+				}

+					break;

+				default:

+					if (state.backtracking > 0) {

+						state.failed = true;

+						return current;

+					}

+					NoViableAltException nvae =

+							new NoViableAltException("", 66, 0, input);

+

+					throw nvae;

+				}

+

+				switch (alt66) {

+				case 1:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2825:5: this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getCssTokAccess().getIdentifierOrFuncTokParserRuleCall_0());

+

+					}

+					pushFollow(FOLLOW_ruleIdentifierOrFuncTok_in_ruleCssTok6249);

+					this_IdentifierOrFuncTok_0 = ruleIdentifierOrFuncTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_IdentifierOrFuncTok_0;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+				case 2:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2835:5: this_SymbolTok_1= ruleSymbolTok

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getCssTokAccess().getSymbolTokParserRuleCall_1());

+

+					}

+					pushFollow(FOLLOW_ruleSymbolTok_in_ruleCssTok6276);

+					this_SymbolTok_1 = ruleSymbolTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_SymbolTok_1;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+				case 3:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2845:5: this_WSTok_2= ruleWSTok

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getCssTokAccess().getWSTokParserRuleCall_2());

+

+					}

+					pushFollow(FOLLOW_ruleWSTok_in_ruleCssTok6303);

+					this_WSTok_2 = ruleWSTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_WSTok_2;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+				case 4:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2855:5: this_StringTok_3= ruleStringTok

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getCssTokAccess().getStringTokParserRuleCall_3());

+

+					}

+					pushFollow(FOLLOW_ruleStringTok_in_ruleCssTok6330);

+					this_StringTok_3 = ruleStringTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_StringTok_3;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+				case 5:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2865:5: this_NumberTok_4= ruleNumberTok

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getCssTokAccess().getNumberTokParserRuleCall_4());

+

+					}

+					pushFollow(FOLLOW_ruleNumberTok_in_ruleCssTok6357);

+					this_NumberTok_4 = ruleNumberTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_NumberTok_4;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+				case 6:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2875:5: this_UrlTok_5= ruleUrlTok

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getCssTokAccess().getUrlTokParserRuleCall_5());

+

+					}

+					pushFollow(FOLLOW_ruleUrlTok_in_ruleCssTok6384);

+					this_UrlTok_5 = ruleUrlTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_UrlTok_5;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+				case 7:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2885:5: this_ColorTok_6= ruleColorTok

+				{

+					if (state.backtracking == 0) {

+

+						newCompositeNode(grammarAccess.getCssTokAccess().getColorTokParserRuleCall_6());

+

+					}

+					pushFollow(FOLLOW_ruleColorTok_in_ruleCssTok6411);

+					this_ColorTok_6 = ruleColorTok();

+

+					state._fsp--;

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current = this_ColorTok_6;

+						afterParserOrEnumRuleCall();

+

+					}

+

+				}

+					break;

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleCssTok"

+

+

+	// $ANTLR start "entryRuleURLType"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2904:1: entryRuleURLType returns [EObject current=null] : iv_ruleURLType= ruleURLType EOF ;

+	public final EObject entryRuleURLType() throws RecognitionException {

+		EObject current = null;

+

+		EObject iv_ruleURLType = null;

+

+

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2908:2: (iv_ruleURLType= ruleURLType EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2909:2: iv_ruleURLType= ruleURLType EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getURLTypeRule());

+				}

+				pushFollow(FOLLOW_ruleURLType_in_entryRuleURLType6456);

+				iv_ruleURLType = ruleURLType();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleURLType;

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleURLType6466);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleURLType"

+

+

+	// $ANTLR start "ruleURLType"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2919:1: ruleURLType returns [EObject current=null] : (otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')' ) ;

+	public final EObject ruleURLType() throws RecognitionException {

+		EObject current = null;

+

+		Token otherlv_0 = null;

+		Token otherlv_2 = null;

+		AntlrDatatypeRuleToken lv_url_1_0 = null;

+

+

+		enterRule();

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2923:28: ( (otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2924:1: (otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2924:1: (otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')' )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2924:3: otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')'

+				{

+					otherlv_0 = (Token) match(input, 49, FOLLOW_49_in_ruleURLType6507);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_0, grammarAccess.getURLTypeAccess().getUrlKeyword_0());

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2928:1: ( (lv_url_1_0= ruleValidURL ) )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2929:1: (lv_url_1_0= ruleValidURL )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2929:1: (lv_url_1_0= ruleValidURL )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2930:3: lv_url_1_0= ruleValidURL

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getURLTypeAccess().getUrlValidURLParserRuleCall_1_0());

+

+							}

+							pushFollow(FOLLOW_ruleValidURL_in_ruleURLType6528);

+							lv_url_1_0 = ruleValidURL();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								if (current == null) {

+									current = createModelElementForParent(grammarAccess.getURLTypeRule());

+								}

+								set(

+										current,

+										"url",

+										lv_url_1_0,

+										"ValidURL");

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+

+

+					}

+

+					otherlv_2 = (Token) match(input, 44, FOLLOW_44_in_ruleURLType6540);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(otherlv_2, grammarAccess.getURLTypeAccess().getRightParenthesisKeyword_2());

+

+					}

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleURLType"

+

+

+	// $ANTLR start "entryRuleValidURLSymbol"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2961:1: entryRuleValidURLSymbol returns [String current=null] : iv_ruleValidURLSymbol= ruleValidURLSymbol EOF ;

+	public final String entryRuleValidURLSymbol() throws RecognitionException {

+		String current = null;

+

+		AntlrDatatypeRuleToken iv_ruleValidURLSymbol = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2962:2: (iv_ruleValidURLSymbol= ruleValidURLSymbol EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2963:2: iv_ruleValidURLSymbol= ruleValidURLSymbol EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getValidURLSymbolRule());

+				}

+				pushFollow(FOLLOW_ruleValidURLSymbol_in_entryRuleValidURLSymbol6581);

+				iv_ruleValidURLSymbol = ruleValidURLSymbol();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleValidURLSymbol.getText();

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleValidURLSymbol6592);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleValidURLSymbol"

+

+

+	// $ANTLR start "ruleValidURLSymbol"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2970:1: ruleValidURLSymbol returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_DASH_0= RULE_DASH

+	// | kw= '.' | this_UNDERSCORE_2= RULE_UNDERSCORE | kw= '~' | this_COLON_4= RULE_COLON | kw= '/' | kw= '?' | this_HASHMARK_7= RULE_HASHMARK | kw= '[' | kw= ']' | kw= '@' | kw= '!' | kw= '$' | kw= '&' | kw= '*' | this_PLUS_15= RULE_PLUS | this_COMMA_16=

+	// RULE_COMMA | kw= ';' | (kw= '=' this_KeywordHack_19= ruleKeywordHack ) ) ;

+	public final AntlrDatatypeRuleToken ruleValidURLSymbol() throws RecognitionException {

+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

+

+		Token this_DASH_0 = null;

+		Token kw = null;

+		Token this_UNDERSCORE_2 = null;

+		Token this_COLON_4 = null;

+		Token this_HASHMARK_7 = null;

+		Token this_PLUS_15 = null;

+		Token this_COMMA_16 = null;

+		AntlrDatatypeRuleToken this_KeywordHack_19 = null;

+

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2973:28: ( (this_DASH_0= RULE_DASH | kw= '.' | this_UNDERSCORE_2= RULE_UNDERSCORE | kw= '~' | this_COLON_4=

+			// RULE_COLON | kw= '/' | kw= '?' | this_HASHMARK_7= RULE_HASHMARK | kw= '[' | kw= ']' | kw= '@' | kw= '!' | kw= '$' | kw= '&' | kw= '*' | this_PLUS_15= RULE_PLUS | this_COMMA_16= RULE_COMMA | kw= ';' | (kw= '=' this_KeywordHack_19= ruleKeywordHack

+			// ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2974:1: (this_DASH_0= RULE_DASH | kw= '.' | this_UNDERSCORE_2= RULE_UNDERSCORE | kw= '~' | this_COLON_4=

+			// RULE_COLON | kw= '/' | kw= '?' | this_HASHMARK_7= RULE_HASHMARK | kw= '[' | kw= ']' | kw= '@' | kw= '!' | kw= '$' | kw= '&' | kw= '*' | this_PLUS_15= RULE_PLUS | this_COMMA_16= RULE_COMMA | kw= ';' | (kw= '=' this_KeywordHack_19= ruleKeywordHack

+			// ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2974:1: (this_DASH_0= RULE_DASH | kw= '.' | this_UNDERSCORE_2= RULE_UNDERSCORE | kw= '~' | this_COLON_4=

+				// RULE_COLON | kw= '/' | kw= '?' | this_HASHMARK_7= RULE_HASHMARK | kw= '[' | kw= ']' | kw= '@' | kw= '!' | kw= '$' | kw= '&' | kw= '*' | this_PLUS_15= RULE_PLUS | this_COMMA_16= RULE_COMMA | kw= ';' | (kw= '=' this_KeywordHack_19=

+				// ruleKeywordHack ) )

+				int alt67 = 19;

+				switch (input.LA(1)) {

+				case RULE_DASH: {

+					alt67 = 1;

+				}

+					break;

+				case 41: {

+					alt67 = 2;

+				}

+					break;

+				case RULE_UNDERSCORE: {

+					alt67 = 3;

+				}

+					break;

+				case 48: {

+					alt67 = 4;

+				}

+					break;

+				case RULE_COLON: {

+					alt67 = 5;

+				}

+					break;

+				case 50: {

+					alt67 = 6;

+				}

+					break;

+				case 51: {

+					alt67 = 7;

+				}

+					break;

+				case RULE_HASHMARK: {

+					alt67 = 8;

+				}

+					break;

+				case 35: {

+					alt67 = 9;

+				}

+					break;

+				case 40: {

+					alt67 = 10;

+				}

+					break;

+				case 52: {

+					alt67 = 11;

+				}

+					break;

+				case 53: {

+					alt67 = 12;

+				}

+					break;

+				case 54: {

+					alt67 = 13;

+				}

+					break;

+				case 55: {

+					alt67 = 14;

+				}

+					break;

+				case 42: {

+					alt67 = 15;

+				}

+					break;

+				case RULE_PLUS: {

+					alt67 = 16;

+				}

+					break;

+				case RULE_COMMA: {

+					alt67 = 17;

+				}

+					break;

+				case 22: {

+					alt67 = 18;

+				}

+					break;

+				case 39: {

+					alt67 = 19;

+				}

+					break;

+				default:

+					if (state.backtracking > 0) {

+						state.failed = true;

+						return current;

+					}

+					NoViableAltException nvae =

+							new NoViableAltException("", 67, 0, input);

+

+					throw nvae;

+				}

+

+				switch (alt67) {

+				case 1:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2974:6: this_DASH_0= RULE_DASH

+				{

+					this_DASH_0 = (Token) match(input, RULE_DASH, FOLLOW_RULE_DASH_in_ruleValidURLSymbol6632);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(this_DASH_0);

+

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_DASH_0, grammarAccess.getValidURLSymbolAccess().getDASHTerminalRuleCall_0());

+

+					}

+

+				}

+					break;

+				case 2:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2983:2: kw= '.'

+				{

+					kw = (Token) match(input, 41, FOLLOW_41_in_ruleValidURLSymbol6656);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getFullStopKeyword_1());

+

+					}

+

+				}

+					break;

+				case 3:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2989:10: this_UNDERSCORE_2= RULE_UNDERSCORE

+				{

+					this_UNDERSCORE_2 = (Token) match(input, RULE_UNDERSCORE, FOLLOW_RULE_UNDERSCORE_in_ruleValidURLSymbol6677);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(this_UNDERSCORE_2);

+

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_UNDERSCORE_2, grammarAccess.getValidURLSymbolAccess().getUNDERSCORETerminalRuleCall_2());

+

+					}

+

+				}

+					break;

+				case 4:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:2998:2: kw= '~'

+				{

+					kw = (Token) match(input, 48, FOLLOW_48_in_ruleValidURLSymbol6701);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getTildeKeyword_3());

+

+					}

+

+				}

+					break;

+				case 5:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3004:10: this_COLON_4= RULE_COLON

+				{

+					this_COLON_4 = (Token) match(input, RULE_COLON, FOLLOW_RULE_COLON_in_ruleValidURLSymbol6722);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(this_COLON_4);

+

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_COLON_4, grammarAccess.getValidURLSymbolAccess().getCOLONTerminalRuleCall_4());

+

+					}

+

+				}

+					break;

+				case 6:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3013:2: kw= '/'

+				{

+					kw = (Token) match(input, 50, FOLLOW_50_in_ruleValidURLSymbol6746);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getSolidusKeyword_5());

+

+					}

+

+				}

+					break;

+				case 7:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3020:2: kw= '?'

+				{

+					kw = (Token) match(input, 51, FOLLOW_51_in_ruleValidURLSymbol6765);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getQuestionMarkKeyword_6());

+

+					}

+

+				}

+					break;

+				case 8:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3026:10: this_HASHMARK_7= RULE_HASHMARK

+				{

+					this_HASHMARK_7 = (Token) match(input, RULE_HASHMARK, FOLLOW_RULE_HASHMARK_in_ruleValidURLSymbol6786);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(this_HASHMARK_7);

+

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_HASHMARK_7, grammarAccess.getValidURLSymbolAccess().getHASHMARKTerminalRuleCall_7());

+

+					}

+

+				}

+					break;

+				case 9:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3035:2: kw= '['

+				{

+					kw = (Token) match(input, 35, FOLLOW_35_in_ruleValidURLSymbol6810);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getLeftSquareBracketKeyword_8());

+

+					}

+

+				}

+					break;

+				case 10:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3042:2: kw= ']'

+				{

+					kw = (Token) match(input, 40, FOLLOW_40_in_ruleValidURLSymbol6829);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getRightSquareBracketKeyword_9());

+

+					}

+

+				}

+					break;

+				case 11:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3049:2: kw= '@'

+				{

+					kw = (Token) match(input, 52, FOLLOW_52_in_ruleValidURLSymbol6848);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getCommercialAtKeyword_10());

+

+					}

+

+				}

+					break;

+				case 12:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3056:2: kw= '!'

+				{

+					kw = (Token) match(input, 53, FOLLOW_53_in_ruleValidURLSymbol6867);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getExclamationMarkKeyword_11());

+

+					}

+

+				}

+					break;

+				case 13:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3063:2: kw= '$'

+				{

+					kw = (Token) match(input, 54, FOLLOW_54_in_ruleValidURLSymbol6886);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getDollarSignKeyword_12());

+

+					}

+

+				}

+					break;

+				case 14:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3070:2: kw= '&'

+				{

+					kw = (Token) match(input, 55, FOLLOW_55_in_ruleValidURLSymbol6905);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getAmpersandKeyword_13());

+

+					}

+

+				}

+					break;

+				case 15:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3077:2: kw= '*'

+				{

+					kw = (Token) match(input, 42, FOLLOW_42_in_ruleValidURLSymbol6924);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getAsteriskKeyword_14());

+

+					}

+

+				}

+					break;

+				case 16:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3083:10: this_PLUS_15= RULE_PLUS

+				{

+					this_PLUS_15 = (Token) match(input, RULE_PLUS, FOLLOW_RULE_PLUS_in_ruleValidURLSymbol6945);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(this_PLUS_15);

+

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_PLUS_15, grammarAccess.getValidURLSymbolAccess().getPLUSTerminalRuleCall_15());

+

+					}

+

+				}

+					break;

+				case 17:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3091:10: this_COMMA_16= RULE_COMMA

+				{

+					this_COMMA_16 = (Token) match(input, RULE_COMMA, FOLLOW_RULE_COMMA_in_ruleValidURLSymbol6971);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(this_COMMA_16);

+

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_COMMA_16, grammarAccess.getValidURLSymbolAccess().getCOMMATerminalRuleCall_16());

+

+					}

+

+				}

+					break;

+				case 18:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3100:2: kw= ';'

+				{

+					kw = (Token) match(input, 22, FOLLOW_22_in_ruleValidURLSymbol6995);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getSemicolonKeyword_17());

+

+					}

+

+				}

+					break;

+				case 19:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3106:6: (kw= '=' this_KeywordHack_19= ruleKeywordHack )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3106:6: (kw= '=' this_KeywordHack_19= ruleKeywordHack )

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3107:2: kw= '=' this_KeywordHack_19= ruleKeywordHack

+					{

+						kw = (Token) match(input, 39, FOLLOW_39_in_ruleValidURLSymbol7015);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							current.merge(kw);

+							newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getEqualsSignKeyword_18_0());

+

+						}

+						if (state.backtracking == 0) {

+

+							newCompositeNode(grammarAccess.getValidURLSymbolAccess().getKeywordHackParserRuleCall_18_1());

+

+						}

+						pushFollow(FOLLOW_ruleKeywordHack_in_ruleValidURLSymbol7037);

+						this_KeywordHack_19 = ruleKeywordHack();

+

+						state._fsp--;

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							current.merge(this_KeywordHack_19);

+

+						}

+						if (state.backtracking == 0) {

+

+							afterParserOrEnumRuleCall();

+

+						}

+

+					}

+

+

+				}

+					break;

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleValidURLSymbol"

+

+

+	// $ANTLR start "entryRuleKeywordHack"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3131:1: entryRuleKeywordHack returns [String current=null] : iv_ruleKeywordHack= ruleKeywordHack EOF ;

+	public final String entryRuleKeywordHack() throws RecognitionException {

+		String current = null;

+

+		AntlrDatatypeRuleToken iv_ruleKeywordHack = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3132:2: (iv_ruleKeywordHack= ruleKeywordHack EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3133:2: iv_ruleKeywordHack= ruleKeywordHack EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getKeywordHackRule());

+				}

+				pushFollow(FOLLOW_ruleKeywordHack_in_entryRuleKeywordHack7084);

+				iv_ruleKeywordHack = ruleKeywordHack();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleKeywordHack.getText();

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleKeywordHack7095);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleKeywordHack"

+

+

+	// $ANTLR start "ruleKeywordHack"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3140:1: ruleKeywordHack returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= 'not' | kw= 'no' |

+	// kw= 'url' | kw= 'ur' ) ;

+	public final AntlrDatatypeRuleToken ruleKeywordHack() throws RecognitionException {

+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

+

+		Token kw = null;

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3143:28: ( (kw= 'not' | kw= 'no' | kw= 'url' | kw= 'ur' ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3144:1: (kw= 'not' | kw= 'no' | kw= 'url' | kw= 'ur' )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3144:1: (kw= 'not' | kw= 'no' | kw= 'url' | kw= 'ur' )

+				int alt68 = 4;

+				switch (input.LA(1)) {

+				case 56: {

+					alt68 = 1;

+				}

+					break;

+				case 57: {

+					alt68 = 2;

+				}

+					break;

+				case 58: {

+					alt68 = 3;

+				}

+					break;

+				case 59: {

+					alt68 = 4;

+				}

+					break;

+				default:

+					if (state.backtracking > 0) {

+						state.failed = true;

+						return current;

+					}

+					NoViableAltException nvae =

+							new NoViableAltException("", 68, 0, input);

+

+					throw nvae;

+				}

+

+				switch (alt68) {

+				case 1:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3145:2: kw= 'not'

+				{

+					kw = (Token) match(input, 56, FOLLOW_56_in_ruleKeywordHack7133);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getKeywordHackAccess().getNotKeyword_0());

+

+					}

+

+				}

+					break;

+				case 2:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3152:2: kw= 'no'

+				{

+					kw = (Token) match(input, 57, FOLLOW_57_in_ruleKeywordHack7152);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getKeywordHackAccess().getNoKeyword_1());

+

+					}

+

+				}

+					break;

+				case 3:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3159:2: kw= 'url'

+				{

+					kw = (Token) match(input, 58, FOLLOW_58_in_ruleKeywordHack7171);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getKeywordHackAccess().getUrlKeyword_2());

+

+					}

+

+				}

+					break;

+				case 4:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3166:2: kw= 'ur'

+				{

+					kw = (Token) match(input, 59, FOLLOW_59_in_ruleKeywordHack7190);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(kw);

+						newLeafNode(kw, grammarAccess.getKeywordHackAccess().getUrKeyword_3());

+

+					}

+

+				}

+					break;

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleKeywordHack"

+

+

+	// $ANTLR start "entryRuleValidURL"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3179:1: entryRuleValidURL returns [String current=null] : iv_ruleValidURL= ruleValidURL EOF ;

+	public final String entryRuleValidURL() throws RecognitionException {

+		String current = null;

+

+		AntlrDatatypeRuleToken iv_ruleValidURL = null;

+

+

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3183:2: (iv_ruleValidURL= ruleValidURL EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3184:2: iv_ruleValidURL= ruleValidURL EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getValidURLRule());

+				}

+				pushFollow(FOLLOW_ruleValidURL_in_entryRuleValidURL7237);

+				iv_ruleValidURL = ruleValidURL();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleValidURL.getText();

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleValidURL7248);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleValidURL"

+

+

+	// $ANTLR start "ruleValidURL"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3194:1: ruleValidURL returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_CSSSTRING_0=

+	// RULE_CSSSTRING | (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw=

+	// '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+ ) ;

+	public final AntlrDatatypeRuleToken ruleValidURL() throws RecognitionException {

+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

+

+		Token this_CSSSTRING_0 = null;

+		Token this_ONE_HEX_LETTER_3 = null;

+		Token this_ONE_NON_HEX_LETTER_4 = null;

+		Token this_ONE_INT_5 = null;

+		Token kw = null;

+		Token this_PERCENT_11 = null;

+		Token this_ONE_INT_12 = null;

+		Token this_ONE_HEX_LETTER_13 = null;

+		Token this_ONE_INT_14 = null;

+		Token this_ONE_HEX_LETTER_15 = null;

+		AntlrDatatypeRuleToken this_ValidURLSymbol_1 = null;

+

+		AntlrDatatypeRuleToken this_KeywordHack_2 = null;

+

+

+		enterRule();

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3198:28: ( (this_CSSSTRING_0= RULE_CSSSTRING | (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2=

+			// ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11=

+			// RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+ ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3199:1: (this_CSSSTRING_0= RULE_CSSSTRING | (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2=

+			// ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11=

+			// RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+ )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3199:1: (this_CSSSTRING_0= RULE_CSSSTRING | (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2=

+				// ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11=

+				// RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+ )

+				int alt72 = 2;

+				int LA72_0 = input.LA(1);

+

+				if ((LA72_0 == RULE_CSSSTRING)) {

+					alt72 = 1;

+				}

+				else if (((LA72_0 >= RULE_COLON && LA72_0 <= RULE_PERCENT) || LA72_0 == RULE_HASHMARK || (LA72_0 >= RULE_PLUS && LA72_0 <= RULE_ONE_INT) || LA72_0 == 22 || LA72_0 == 35 || (LA72_0 >= 39 && LA72_0 <= 42) || LA72_0 == 48 || (LA72_0 >= 50 && LA72_0 <= 64))) {

+					alt72 = 2;

+				}

+				else {

+					if (state.backtracking > 0) {

+						state.failed = true;

+						return current;

+					}

+					NoViableAltException nvae =

+							new NoViableAltException("", 72, 0, input);

+

+					throw nvae;

+				}

+				switch (alt72) {

+				case 1:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3199:6: this_CSSSTRING_0= RULE_CSSSTRING

+				{

+					this_CSSSTRING_0 = (Token) match(input, RULE_CSSSTRING, FOLLOW_RULE_CSSSTRING_in_ruleValidURL7292);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(this_CSSSTRING_0);

+

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_CSSSTRING_0, grammarAccess.getValidURLAccess().getCSSSTRINGTerminalRuleCall_0());

+

+					}

+

+				}

+					break;

+				case 2:

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3207:6: (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack |

+				// this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT

+				// (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3207:6: (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack |

+					// this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT

+					// (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+

+					int cnt71 = 0;

+					loop71: do {

+						int alt71 = 12;

+						switch (input.LA(1)) {

+						case RULE_COLON:

+						case RULE_COMMA:

+						case RULE_HASHMARK:

+						case RULE_PLUS:

+						case RULE_DASH:

+						case RULE_UNDERSCORE:

+						case 22:

+						case 35:

+						case 39:

+						case 40:

+						case 41:

+						case 42:

+						case 48:

+						case 50:

+						case 51:

+						case 52:

+						case 53:

+						case 54:

+						case 55: {

+							alt71 = 1;

+						}

+							break;

+						case 56:

+						case 57:

+						case 58:

+						case 59: {

+							alt71 = 2;

+						}

+							break;

+						case RULE_ONE_HEX_LETTER: {

+							alt71 = 3;

+						}

+							break;

+						case RULE_ONE_NON_HEX_LETTER: {

+							alt71 = 4;

+						}

+							break;

+						case RULE_ONE_INT: {

+							alt71 = 5;

+						}

+							break;

+						case 60: {

+							alt71 = 6;

+						}

+							break;

+						case 61: {

+							alt71 = 7;

+						}

+							break;

+						case 62: {

+							alt71 = 8;

+						}

+							break;

+						case 63: {

+							alt71 = 9;

+						}

+							break;

+						case 64: {

+							alt71 = 10;

+						}

+							break;

+						case RULE_PERCENT: {

+							alt71 = 11;

+						}

+							break;

+

+						}

+

+						switch (alt71) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3208:5: this_ValidURLSymbol_1= ruleValidURLSymbol

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getValidURLAccess().getValidURLSymbolParserRuleCall_1_0());

+

+							}

+							pushFollow(FOLLOW_ruleValidURLSymbol_in_ruleValidURL7326);

+							this_ValidURLSymbol_1 = ruleValidURLSymbol();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current.merge(this_ValidURLSymbol_1);

+

+							}

+							if (state.backtracking == 0) {

+

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+							break;

+						case 2:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3220:5: this_KeywordHack_2= ruleKeywordHack

+						{

+							if (state.backtracking == 0) {

+

+								newCompositeNode(grammarAccess.getValidURLAccess().getKeywordHackParserRuleCall_1_1());

+

+							}

+							pushFollow(FOLLOW_ruleKeywordHack_in_ruleValidURL7359);

+							this_KeywordHack_2 = ruleKeywordHack();

+

+							state._fsp--;

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current.merge(this_KeywordHack_2);

+

+							}

+							if (state.backtracking == 0) {

+

+								afterParserOrEnumRuleCall();

+

+							}

+

+						}

+							break;

+						case 3:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3231:10: this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER

+						{

+							this_ONE_HEX_LETTER_3 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_RULE_ONE_HEX_LETTER_in_ruleValidURL7385);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current.merge(this_ONE_HEX_LETTER_3);

+

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(this_ONE_HEX_LETTER_3, grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_2());

+

+							}

+

+						}

+							break;

+						case 4:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3239:10: this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER

+						{

+							this_ONE_NON_HEX_LETTER_4 = (Token) match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_RULE_ONE_NON_HEX_LETTER_in_ruleValidURL7411);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current.merge(this_ONE_NON_HEX_LETTER_4);

+

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(this_ONE_NON_HEX_LETTER_4, grammarAccess.getValidURLAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_3());

+

+							}

+

+						}

+							break;

+						case 5:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3247:10: this_ONE_INT_5= RULE_ONE_INT

+						{

+							this_ONE_INT_5 = (Token) match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_ruleValidURL7437);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current.merge(this_ONE_INT_5);

+

+							}

+							if (state.backtracking == 0) {

+

+								newLeafNode(this_ONE_INT_5, grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_4());

+

+							}

+

+						}

+							break;

+						case 6:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3256:2: kw= '\\\\ '

+						{

+							kw = (Token) match(input, 60, FOLLOW_60_in_ruleValidURL7461);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current.merge(kw);

+								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusSpaceKeyword_1_5());

+

+							}

+

+						}

+							break;

+						case 7:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3263:2: kw= '\\\\('

+						{

+							kw = (Token) match(input, 61, FOLLOW_61_in_ruleValidURL7480);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current.merge(kw);

+								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusLeftParenthesisKeyword_1_6());

+

+							}

+

+						}

+							break;

+						case 8:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3270:2: kw= '\\\\)'

+						{

+							kw = (Token) match(input, 62, FOLLOW_62_in_ruleValidURL7499);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current.merge(kw);

+								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusRightParenthesisKeyword_1_7());

+

+							}

+

+						}

+							break;

+						case 9:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3277:2: kw= '\\\\\\''

+						{

+							kw = (Token) match(input, 63, FOLLOW_63_in_ruleValidURL7518);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current.merge(kw);

+								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusApostropheKeyword_1_8());

+

+							}

+

+						}

+							break;

+						case 10:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3284:2: kw= '\\\\\"'

+						{

+							kw = (Token) match(input, 64, FOLLOW_64_in_ruleValidURL7537);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current.merge(kw);

+								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusQuotationMarkKeyword_1_9());

+

+							}

+

+						}

+							break;

+						case 11:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3290:6: (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13=

+						// RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3290:6: (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13=

+							// RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) )

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3290:11: this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13=

+							// RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER )

+							{

+								this_PERCENT_11 = (Token) match(input, RULE_PERCENT, FOLLOW_RULE_PERCENT_in_ruleValidURL7559);

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									current.merge(this_PERCENT_11);

+

+								}

+								if (state.backtracking == 0) {

+

+									newLeafNode(this_PERCENT_11, grammarAccess.getValidURLAccess().getPERCENTTerminalRuleCall_1_10_0());

+

+								}

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3297:1: (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER )

+								int alt69 = 2;

+								int LA69_0 = input.LA(1);

+

+								if ((LA69_0 == RULE_ONE_INT)) {

+									alt69 = 1;

+								}

+								else if ((LA69_0 == RULE_ONE_HEX_LETTER)) {

+									alt69 = 2;

+								}

+								else {

+									if (state.backtracking > 0) {

+										state.failed = true;

+										return current;

+									}

+									NoViableAltException nvae =

+											new NoViableAltException("", 69, 0, input);

+

+									throw nvae;

+								}

+								switch (alt69) {

+								case 1:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3297:6: this_ONE_INT_12= RULE_ONE_INT

+								{

+									this_ONE_INT_12 = (Token) match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_ruleValidURL7580);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										current.merge(this_ONE_INT_12);

+

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(this_ONE_INT_12, grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_1_0());

+

+									}

+

+								}

+									break;

+								case 2:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3305:10: this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER

+								{

+									this_ONE_HEX_LETTER_13 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_RULE_ONE_HEX_LETTER_in_ruleValidURL7606);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										current.merge(this_ONE_HEX_LETTER_13);

+

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(this_ONE_HEX_LETTER_13, grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_1_1());

+

+									}

+

+								}

+									break;

+

+								}

+

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3312:2: (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER )

+								int alt70 = 2;

+								int LA70_0 = input.LA(1);

+

+								if ((LA70_0 == RULE_ONE_INT)) {

+									alt70 = 1;

+								}

+								else if ((LA70_0 == RULE_ONE_HEX_LETTER)) {

+									alt70 = 2;

+								}

+								else {

+									if (state.backtracking > 0) {

+										state.failed = true;

+										return current;

+									}

+									NoViableAltException nvae =

+											new NoViableAltException("", 70, 0, input);

+

+									throw nvae;

+								}

+								switch (alt70) {

+								case 1:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3312:7: this_ONE_INT_14= RULE_ONE_INT

+								{

+									this_ONE_INT_14 = (Token) match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_ruleValidURL7628);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										current.merge(this_ONE_INT_14);

+

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(this_ONE_INT_14, grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_2_0());

+

+									}

+

+								}

+									break;

+								case 2:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3320:10: this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER

+								{

+									this_ONE_HEX_LETTER_15 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_RULE_ONE_HEX_LETTER_in_ruleValidURL7654);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										current.merge(this_ONE_HEX_LETTER_15);

+

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(this_ONE_HEX_LETTER_15, grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_2_1());

+

+									}

+

+								}

+									break;

+

+								}

+

+

+							}

+

+

+						}

+							break;

+

+						default:

+							if (cnt71 >= 1) {

+								break loop71;

+							}

+							if (state.backtracking > 0) {

+								state.failed = true;

+								return current;

+							}

+							EarlyExitException eee =

+									new EarlyExitException(71, input);

+							throw eee;

+						}

+						cnt71++;

+					} while (true);

+

+

+				}

+					break;

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleValidURL"

+

+

+	// $ANTLR start "entryRuleIdentifier"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3338:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;

+	public final String entryRuleIdentifier() throws RecognitionException {

+		String current = null;

+

+		AntlrDatatypeRuleToken iv_ruleIdentifier = null;

+

+

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3342:2: (iv_ruleIdentifier= ruleIdentifier EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3343:2: iv_ruleIdentifier= ruleIdentifier EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getIdentifierRule());

+				}

+				pushFollow(FOLLOW_ruleIdentifier_in_entryRuleIdentifier7714);

+				iv_ruleIdentifier = ruleIdentifier();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleIdentifier.getText();

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleIdentifier7725);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleIdentifier"

+

+

+	// $ANTLR start "ruleIdentifier"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3353:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_DASH_0= RULE_DASH

+	// )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER |

+	// RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT

+	// | this_KeywordHack_10= ruleKeywordHack ) )* ) ;

+	public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException {

+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

+

+		Token this_DASH_0 = null;

+		Token this_UNDERSCORE_1 = null;

+		Token this_ONE_HEX_LETTER_2 = null;

+		Token this_ONE_NON_HEX_LETTER_3 = null;

+		Token this_UNDERSCORE_5 = null;

+		Token this_DASH_6 = null;

+		Token this_ONE_HEX_LETTER_7 = null;

+		Token this_ONE_NON_HEX_LETTER_8 = null;

+		Token this_ONE_INT_9 = null;

+		AntlrDatatypeRuleToken this_KeywordHack_4 = null;

+

+		AntlrDatatypeRuleToken this_KeywordHack_10 = null;

+

+

+		enterRule();

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3357:28: ( ( (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2=

+			// RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=>

+			// (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )* ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3358:1: ( (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2=

+			// RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=>

+			// (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )* )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3358:1: ( (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2=

+				// RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=>

+				// (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )* )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3358:2: (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2=

+				// RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=>

+				// (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )*

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3358:2: (this_DASH_0= RULE_DASH )?

+					int alt73 = 2;

+					int LA73_0 = input.LA(1);

+

+					if ((LA73_0 == RULE_DASH)) {

+						alt73 = 1;

+					}

+					switch (alt73) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3358:7: this_DASH_0= RULE_DASH

+					{

+						this_DASH_0 = (Token) match(input, RULE_DASH, FOLLOW_RULE_DASH_in_ruleIdentifier7770);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							current.merge(this_DASH_0);

+

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(this_DASH_0, grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_0());

+

+						}

+

+					}

+						break;

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3365:3: (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER |

+					// this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack )

+					int alt74 = 4;

+					switch (input.LA(1)) {

+					case RULE_UNDERSCORE: {

+						alt74 = 1;

+					}

+						break;

+					case RULE_ONE_HEX_LETTER: {

+						alt74 = 2;

+					}

+						break;

+					case RULE_ONE_NON_HEX_LETTER: {

+						alt74 = 3;

+					}

+						break;

+					case 56:

+					case 57:

+					case 58:

+					case 59: {

+						alt74 = 4;

+					}

+						break;

+					default:

+						if (state.backtracking > 0) {

+							state.failed = true;

+							return current;

+						}

+						NoViableAltException nvae =

+								new NoViableAltException("", 74, 0, input);

+

+						throw nvae;

+					}

+

+					switch (alt74) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3365:8: this_UNDERSCORE_1= RULE_UNDERSCORE

+					{

+						this_UNDERSCORE_1 = (Token) match(input, RULE_UNDERSCORE, FOLLOW_RULE_UNDERSCORE_in_ruleIdentifier7793);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							current.merge(this_UNDERSCORE_1);

+

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(this_UNDERSCORE_1, grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_1_0());

+

+						}

+

+					}

+						break;

+					case 2:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3373:10: this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER

+					{

+						this_ONE_HEX_LETTER_2 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_RULE_ONE_HEX_LETTER_in_ruleIdentifier7819);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							current.merge(this_ONE_HEX_LETTER_2);

+

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(this_ONE_HEX_LETTER_2, grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_1_1());

+

+						}

+

+					}

+						break;

+					case 3:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3381:10: this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER

+					{

+						this_ONE_NON_HEX_LETTER_3 = (Token) match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_RULE_ONE_NON_HEX_LETTER_in_ruleIdentifier7845);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							current.merge(this_ONE_NON_HEX_LETTER_3);

+

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(this_ONE_NON_HEX_LETTER_3, grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_2());

+

+						}

+

+					}

+						break;

+					case 4:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3390:5: this_KeywordHack_4= ruleKeywordHack

+					{

+						if (state.backtracking == 0) {

+

+							newCompositeNode(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_1_3());

+

+						}

+						pushFollow(FOLLOW_ruleKeywordHack_in_ruleIdentifier7878);

+						this_KeywordHack_4 = ruleKeywordHack();

+

+						state._fsp--;

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							current.merge(this_KeywordHack_4);

+

+						}

+						if (state.backtracking == 0) {

+

+							afterParserOrEnumRuleCall();

+

+						}

+

+					}

+						break;

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3400:2: ( ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT |

+					// ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10=

+					// ruleKeywordHack ) )*

+					loop76: do {

+						int alt76 = 2;

+						alt76 = dfa76.predict(input);

+						switch (alt76) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3400:3: ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT

+						// | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT |

+						// this_KeywordHack_10= ruleKeywordHack )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3405:26: (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7=

+							// RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack )

+							int alt75 = 6;

+							switch (input.LA(1)) {

+							case RULE_UNDERSCORE: {

+								alt75 = 1;

+							}

+								break;

+							case RULE_DASH: {

+								alt75 = 2;

+							}

+								break;

+							case RULE_ONE_HEX_LETTER: {

+								alt75 = 3;

+							}

+								break;

+							case RULE_ONE_NON_HEX_LETTER: {

+								alt75 = 4;

+							}

+								break;

+							case RULE_ONE_INT: {

+								alt75 = 5;

+							}

+								break;

+							case 56:

+							case 57:

+							case 58:

+							case 59: {

+								alt75 = 6;

+							}

+								break;

+							default:

+								if (state.backtracking > 0) {

+									state.failed = true;

+									return current;

+								}

+								NoViableAltException nvae =

+										new NoViableAltException("", 75, 0, input);

+

+								throw nvae;

+							}

+

+							switch (alt75) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3405:31: this_UNDERSCORE_5= RULE_UNDERSCORE

+							{

+								this_UNDERSCORE_5 = (Token) match(input, RULE_UNDERSCORE, FOLLOW_RULE_UNDERSCORE_in_ruleIdentifier7948);

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									current.merge(this_UNDERSCORE_5);

+

+								}

+								if (state.backtracking == 0) {

+

+									newLeafNode(this_UNDERSCORE_5, grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_2_0_0());

+

+								}

+

+							}

+								break;

+							case 2:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3413:10: this_DASH_6= RULE_DASH

+							{

+								this_DASH_6 = (Token) match(input, RULE_DASH, FOLLOW_RULE_DASH_in_ruleIdentifier7974);

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									current.merge(this_DASH_6);

+

+								}

+								if (state.backtracking == 0) {

+

+									newLeafNode(this_DASH_6, grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_2_0_1());

+

+								}

+

+							}

+								break;

+							case 3:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3421:10: this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER

+							{

+								this_ONE_HEX_LETTER_7 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_RULE_ONE_HEX_LETTER_in_ruleIdentifier8000);

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									current.merge(this_ONE_HEX_LETTER_7);

+

+								}

+								if (state.backtracking == 0) {

+

+									newLeafNode(this_ONE_HEX_LETTER_7, grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_2_0_2());

+

+								}

+

+							}

+								break;

+							case 4:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3429:10: this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER

+							{

+								this_ONE_NON_HEX_LETTER_8 = (Token) match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_RULE_ONE_NON_HEX_LETTER_in_ruleIdentifier8026);

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									current.merge(this_ONE_NON_HEX_LETTER_8);

+

+								}

+								if (state.backtracking == 0) {

+

+									newLeafNode(this_ONE_NON_HEX_LETTER_8, grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_2_0_3());

+

+								}

+

+							}

+								break;

+							case 5:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3437:10: this_ONE_INT_9= RULE_ONE_INT

+							{

+								this_ONE_INT_9 = (Token) match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_ruleIdentifier8052);

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									current.merge(this_ONE_INT_9);

+

+								}

+								if (state.backtracking == 0) {

+

+									newLeafNode(this_ONE_INT_9, grammarAccess.getIdentifierAccess().getONE_INTTerminalRuleCall_2_0_4());

+

+								}

+

+							}

+								break;

+							case 6:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3446:5: this_KeywordHack_10= ruleKeywordHack

+							{

+								if (state.backtracking == 0) {

+

+									newCompositeNode(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_2_0_5());

+

+								}

+								pushFollow(FOLLOW_ruleKeywordHack_in_ruleIdentifier8085);

+								this_KeywordHack_10 = ruleKeywordHack();

+

+								state._fsp--;

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									current.merge(this_KeywordHack_10);

+

+								}

+								if (state.backtracking == 0) {

+

+									afterParserOrEnumRuleCall();

+

+								}

+

+							}

+								break;

+

+							}

+

+

+						}

+							break;

+

+						default:

+							break loop76;

+						}

+					} while (true);

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleIdentifier"

+

+

+	// $ANTLR start "entryRuleNum"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3467:1: entryRuleNum returns [String current=null] : iv_ruleNum= ruleNum EOF ;

+	public final String entryRuleNum() throws RecognitionException {

+		String current = null;

+

+		AntlrDatatypeRuleToken iv_ruleNum = null;

+

+

+

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3471:2: (iv_ruleNum= ruleNum EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3472:2: iv_ruleNum= ruleNum EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getNumRule());

+				}

+				pushFollow(FOLLOW_ruleNum_in_entryRuleNum8144);

+				iv_ruleNum = ruleNum();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleNum.getText();

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleNum8155);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleNum"

+

+

+	// $ANTLR start "ruleNum"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3482:1: ruleNum returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_PLUS_0= RULE_PLUS |

+	// this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) ) ) ;

+	public final AntlrDatatypeRuleToken ruleNum() throws RecognitionException {

+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

+

+		Token this_PLUS_0 = null;

+		Token this_DASH_1 = null;

+		Token kw = null;

+		Token this_ONE_INT_3 = null;

+		Token this_ONE_INT_4 = null;

+		Token this_ONE_INT_6 = null;

+

+		enterRule();

+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3486:28: ( ( (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3=

+			// RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) ) ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3487:1: ( (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3=

+			// RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) ) )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3487:1: ( (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3=

+				// RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) ) )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3487:2: (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3=

+				// RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) )

+				{

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3487:2: (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )?

+					int alt77 = 3;

+					int LA77_0 = input.LA(1);

+

+					if ((LA77_0 == RULE_PLUS)) {

+						alt77 = 1;

+					}

+					else if ((LA77_0 == RULE_DASH)) {

+						alt77 = 2;

+					}

+					switch (alt77) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3487:7: this_PLUS_0= RULE_PLUS

+					{

+						this_PLUS_0 = (Token) match(input, RULE_PLUS, FOLLOW_RULE_PLUS_in_ruleNum8200);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							current.merge(this_PLUS_0);

+

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(this_PLUS_0, grammarAccess.getNumAccess().getPLUSTerminalRuleCall_0_0());

+

+						}

+

+					}

+						break;

+					case 2:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3495:10: this_DASH_1= RULE_DASH

+					{

+						this_DASH_1 = (Token) match(input, RULE_DASH, FOLLOW_RULE_DASH_in_ruleNum8226);

+						if (state.failed) {

+							return current;

+						}

+						if (state.backtracking == 0) {

+

+							current.merge(this_DASH_1);

+

+						}

+						if (state.backtracking == 0) {

+

+							newLeafNode(this_DASH_1, grammarAccess.getNumAccess().getDASHTerminalRuleCall_0_1());

+

+						}

+

+					}

+						break;

+

+					}

+

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3502:3: ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT

+					// )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) )

+					int alt82 = 2;

+					int LA82_0 = input.LA(1);

+

+					if ((LA82_0 == 41)) {

+						alt82 = 1;

+					}

+					else if ((LA82_0 == RULE_ONE_INT)) {

+						alt82 = 2;

+					}

+					else {

+						if (state.backtracking > 0) {

+							state.failed = true;

+							return current;

+						}

+						NoViableAltException nvae =

+								new NoViableAltException("", 82, 0, input);

+

+						throw nvae;

+					}

+					switch (alt82) {

+					case 1:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3502:4: (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3502:4: (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3503:2: kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+

+						{

+							kw = (Token) match(input, 41, FOLLOW_41_in_ruleNum8248);

+							if (state.failed) {

+								return current;

+							}

+							if (state.backtracking == 0) {

+

+								current.merge(kw);

+								newLeafNode(kw, grammarAccess.getNumAccess().getFullStopKeyword_1_0_0());

+

+							}

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3508:1: ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+

+							int cnt78 = 0;

+							loop78: do {

+								int alt78 = 2;

+								int LA78_0 = input.LA(1);

+

+								if ((LA78_0 == RULE_ONE_INT)) {

+									int LA78_2 = input.LA(2);

+

+									if ((synpred3_InternalCSS())) {

+										alt78 = 1;

+									}

+

+

+								}

+

+

+								switch (alt78) {

+								case 1:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3508:2: ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT

+								{

+									this_ONE_INT_3 = (Token) match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_ruleNum8269);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										current.merge(this_ONE_INT_3);

+

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(this_ONE_INT_3, grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_0_1());

+

+									}

+

+								}

+									break;

+

+								default:

+									if (cnt78 >= 1) {

+										break loop78;

+									}

+									if (state.backtracking > 0) {

+										state.failed = true;

+										return current;

+									}

+									EarlyExitException eee =

+											new EarlyExitException(78, input);

+									throw eee;

+								}

+								cnt78++;

+							} while (true);

+

+

+						}

+

+

+					}

+						break;

+					case 2:

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3516:6: ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT

+					// )=>this_ONE_INT_6= RULE_ONE_INT )+ )? )

+					{

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3516:6: ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT

+						// )=>this_ONE_INT_6= RULE_ONE_INT )+ )? )

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3516:7: ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT

+						// )=>this_ONE_INT_6= RULE_ONE_INT )+ )?

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3516:7: ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+

+							int cnt79 = 0;

+							loop79: do {

+								int alt79 = 2;

+								int LA79_0 = input.LA(1);

+

+								if ((LA79_0 == RULE_ONE_INT)) {

+									int LA79_2 = input.LA(2);

+

+									if ((synpred4_InternalCSS())) {

+										alt79 = 1;

+									}

+

+

+								}

+

+

+								switch (alt79) {

+								case 1:

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3516:8: ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT

+								{

+									this_ONE_INT_4 = (Token) match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_ruleNum8305);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										current.merge(this_ONE_INT_4);

+

+									}

+									if (state.backtracking == 0) {

+

+										newLeafNode(this_ONE_INT_4, grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_0());

+

+									}

+

+								}

+									break;

+

+								default:

+									if (cnt79 >= 1) {

+										break loop79;

+									}

+									if (state.backtracking > 0) {

+										state.failed = true;

+										return current;

+									}

+									EarlyExitException eee =

+											new EarlyExitException(79, input);

+									throw eee;

+								}

+								cnt79++;

+							} while (true);

+

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3523:3: ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )?

+							int alt81 = 2;

+							int LA81_0 = input.LA(1);

+

+							if ((LA81_0 == 41)) {

+								int LA81_1 = input.LA(2);

+

+								if ((LA81_1 == RULE_ONE_INT)) {

+									int LA81_3 = input.LA(3);

+

+									if ((synpred5_InternalCSS())) {

+										alt81 = 1;

+									}

+								}

+							}

+							switch (alt81) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3523:4: ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+

+							{

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3523:4: ( ( '.' )=>kw= '.' )

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3523:5: ( '.' )=>kw= '.'

+								{

+									kw = (Token) match(input, 41, FOLLOW_41_in_ruleNum8335);

+									if (state.failed) {

+										return current;

+									}

+									if (state.backtracking == 0) {

+

+										current.merge(kw);

+										newLeafNode(kw, grammarAccess.getNumAccess().getFullStopKeyword_1_1_1_0());

+

+									}

+

+								}

+

+								// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3531:2: ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+

+								int cnt80 = 0;

+								loop80: do {

+									int alt80 = 2;

+									int LA80_0 = input.LA(1);

+

+									if ((LA80_0 == RULE_ONE_INT)) {

+										int LA80_2 = input.LA(2);

+

+										if ((synpred6_InternalCSS())) {

+											alt80 = 1;

+										}

+

+

+									}

+

+

+									switch (alt80) {

+									case 1:

+									// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3531:3: ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT

+									{

+										this_ONE_INT_6 = (Token) match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_ruleNum8357);

+										if (state.failed) {

+											return current;

+										}

+										if (state.backtracking == 0) {

+

+											current.merge(this_ONE_INT_6);

+

+										}

+										if (state.backtracking == 0) {

+

+											newLeafNode(this_ONE_INT_6, grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_1_1());

+

+										}

+

+									}

+										break;

+

+									default:

+										if (cnt80 >= 1) {

+											break loop80;

+										}

+										if (state.backtracking > 0) {

+											state.failed = true;

+											return current;

+										}

+										EarlyExitException eee =

+												new EarlyExitException(80, input);

+										throw eee;

+									}

+									cnt80++;

+								} while (true);

+

+

+							}

+								break;

+

+							}

+

+

+						}

+

+

+					}

+						break;

+

+					}

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+

+			myHiddenTokenState.restore();

+

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleNum"

+

+

+	// $ANTLR start "entryRuleHex"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3549:1: entryRuleHex returns [String current=null] : iv_ruleHex= ruleHex EOF ;

+	public final String entryRuleHex() throws RecognitionException {

+		String current = null;

+

+		AntlrDatatypeRuleToken iv_ruleHex = null;

+

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3550:2: (iv_ruleHex= ruleHex EOF )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3551:2: iv_ruleHex= ruleHex EOF

+			{

+				if (state.backtracking == 0) {

+					newCompositeNode(grammarAccess.getHexRule());

+				}

+				pushFollow(FOLLOW_ruleHex_in_entryRuleHex8413);

+				iv_ruleHex = ruleHex();

+

+				state._fsp--;

+				if (state.failed) {

+					return current;

+				}

+				if (state.backtracking == 0) {

+					current = iv_ruleHex.getText();

+				}

+				match(input, EOF, FOLLOW_EOF_in_entryRuleHex8424);

+				if (state.failed) {

+					return current;

+				}

+

+			}

+

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "entryRuleHex"

+

+

+	// $ANTLR start "ruleHex"

+	// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3558:1: ruleHex returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_HASHMARK_0= RULE_HASHMARK (

+	// ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+ ) ;

+	public final AntlrDatatypeRuleToken ruleHex() throws RecognitionException {

+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

+

+		Token this_HASHMARK_0 = null;

+		Token this_ONE_INT_1 = null;

+		Token this_ONE_HEX_LETTER_2 = null;

+

+		enterRule();

+

+		try {

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3561:28: ( (this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1=

+			// RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+ ) )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3562:1: (this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1=

+			// RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+ )

+			{

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3562:1: (this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1=

+				// RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+ )

+				// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3562:6: this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1=

+				// RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+

+				{

+					this_HASHMARK_0 = (Token) match(input, RULE_HASHMARK, FOLLOW_RULE_HASHMARK_in_ruleHex8464);

+					if (state.failed) {

+						return current;

+					}

+					if (state.backtracking == 0) {

+

+						current.merge(this_HASHMARK_0);

+

+					}

+					if (state.backtracking == 0) {

+

+						newLeafNode(this_HASHMARK_0, grammarAccess.getHexAccess().getHASHMARKTerminalRuleCall_0());

+

+					}

+					// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3569:1: ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT |

+					// this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+

+					int cnt84 = 0;

+					loop84: do {

+						int alt84 = 2;

+						int LA84_0 = input.LA(1);

+

+						if ((LA84_0 == RULE_ONE_HEX_LETTER)) {

+							int LA84_2 = input.LA(2);

+

+							if ((synpred7_InternalCSS())) {

+								alt84 = 1;

+							}

+

+

+						}

+						else if ((LA84_0 == RULE_ONE_INT)) {

+							int LA84_3 = input.LA(2);

+

+							if ((synpred7_InternalCSS())) {

+								alt84 = 1;

+							}

+

+

+						}

+

+

+						switch (alt84) {

+						case 1:

+						// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3569:2: ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT |

+						// this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER )

+						{

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3570:30: (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER )

+							int alt83 = 2;

+							int LA83_0 = input.LA(1);

+

+							if ((LA83_0 == RULE_ONE_INT)) {

+								alt83 = 1;

+							}

+							else if ((LA83_0 == RULE_ONE_HEX_LETTER)) {

+								alt83 = 2;

+							}

+							else {

+								if (state.backtracking > 0) {

+									state.failed = true;

+									return current;

+								}

+								NoViableAltException nvae =

+										new NoViableAltException("", 83, 0, input);

+

+								throw nvae;

+							}

+							switch (alt83) {

+							case 1:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3570:35: this_ONE_INT_1= RULE_ONE_INT

+							{

+								this_ONE_INT_1 = (Token) match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_ruleHex8501);

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									current.merge(this_ONE_INT_1);

+

+								}

+								if (state.backtracking == 0) {

+

+									newLeafNode(this_ONE_INT_1, grammarAccess.getHexAccess().getONE_INTTerminalRuleCall_1_0_0());

+

+								}

+

+							}

+								break;

+							case 2:

+							// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3578:10: this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER

+							{

+								this_ONE_HEX_LETTER_2 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_RULE_ONE_HEX_LETTER_in_ruleHex8527);

+								if (state.failed) {

+									return current;

+								}

+								if (state.backtracking == 0) {

+

+									current.merge(this_ONE_HEX_LETTER_2);

+

+								}

+								if (state.backtracking == 0) {

+

+									newLeafNode(this_ONE_HEX_LETTER_2, grammarAccess.getHexAccess().getONE_HEX_LETTERTerminalRuleCall_1_0_1());

+

+								}

+

+							}

+								break;

+

+							}

+

+

+						}

+							break;

+

+						default:

+							if (cnt84 >= 1) {

+								break loop84;

+							}

+							if (state.backtracking > 0) {

+								state.failed = true;

+								return current;

+							}

+							EarlyExitException eee =

+									new EarlyExitException(84, input);

+							throw eee;

+						}

+						cnt84++;

+					} while (true);

+

+

+				}

+

+

+			}

+

+			if (state.backtracking == 0) {

+				leaveRule();

+			}

+		}

+

+		catch (RecognitionException re) {

+			recover(input, re);

+			appendSkippedTokens();

+		} finally {

+		}

+		return current;

+	}

+

+	// $ANTLR end "ruleHex"

+

+	// $ANTLR start synpred1_InternalCSS

+	public final void synpred1_InternalCSS_fragment() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1267:7: ( ( ruleSubSelectorForNegation ) )

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1268:1: ( ruleSubSelectorForNegation )

+		{

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1268:1: ( ruleSubSelectorForNegation )

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:1269:1: ruleSubSelectorForNegation

+			{

+				pushFollow(FOLLOW_ruleSubSelectorForNegation_in_synpred1_InternalCSS2668);

+				ruleSubSelectorForNegation();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+

+

+		}

+	}

+

+	// $ANTLR end synpred1_InternalCSS

+

+	// $ANTLR start synpred2_InternalCSS

+	public final void synpred2_InternalCSS_fragment() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3400:3: ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT |

+		// ruleKeywordHack ) )

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3400:4: ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack

+		// )

+		{

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3400:4: ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT |

+			// ruleKeywordHack )

+			int alt85 = 6;

+			switch (input.LA(1)) {

+			case RULE_UNDERSCORE: {

+				alt85 = 1;

+			}

+				break;

+			case RULE_DASH: {

+				alt85 = 2;

+			}

+				break;

+			case RULE_ONE_HEX_LETTER: {

+				alt85 = 3;

+			}

+				break;

+			case RULE_ONE_NON_HEX_LETTER: {

+				alt85 = 4;

+			}

+				break;

+			case RULE_ONE_INT: {

+				alt85 = 5;

+			}

+				break;

+			case 56:

+			case 57:

+			case 58:

+			case 59: {

+				alt85 = 6;

+			}

+				break;

+			default:

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				NoViableAltException nvae =

+						new NoViableAltException("", 85, 0, input);

+

+				throw nvae;

+			}

+

+			switch (alt85) {

+			case 1:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3400:6: RULE_UNDERSCORE

+			{

+				match(input, RULE_UNDERSCORE, FOLLOW_RULE_UNDERSCORE_in_synpred2_InternalCSS7897);

+				if (state.failed) {

+					return;

+				}

+

+			}

+				break;

+			case 2:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3401:7: RULE_DASH

+			{

+				match(input, RULE_DASH, FOLLOW_RULE_DASH_in_synpred2_InternalCSS7905);

+				if (state.failed) {

+					return;

+				}

+

+			}

+				break;

+			case 3:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3402:7: RULE_ONE_HEX_LETTER

+			{

+				match(input, RULE_ONE_HEX_LETTER, FOLLOW_RULE_ONE_HEX_LETTER_in_synpred2_InternalCSS7913);

+				if (state.failed) {

+					return;

+				}

+

+			}

+				break;

+			case 4:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3403:7: RULE_ONE_NON_HEX_LETTER

+			{

+				match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_RULE_ONE_NON_HEX_LETTER_in_synpred2_InternalCSS7921);

+				if (state.failed) {

+					return;

+				}

+

+			}

+				break;

+			case 5:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3404:7: RULE_ONE_INT

+			{

+				match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_synpred2_InternalCSS7929);

+				if (state.failed) {

+					return;

+				}

+

+			}

+				break;

+			case 6:

+			// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3405:7: ruleKeywordHack

+			{

+				pushFollow(FOLLOW_ruleKeywordHack_in_synpred2_InternalCSS7937);

+				ruleKeywordHack();

+

+				state._fsp--;

+				if (state.failed) {

+					return;

+				}

+

+			}

+				break;

+

+			}

+

+

+		}

+	}

+

+	// $ANTLR end synpred2_InternalCSS

+

+	// $ANTLR start synpred3_InternalCSS

+	public final void synpred3_InternalCSS_fragment() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3508:2: ( RULE_ONE_INT )

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3508:4: RULE_ONE_INT

+		{

+			match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_synpred3_InternalCSS8260);

+			if (state.failed) {

+				return;

+			}

+

+		}

+	}

+

+	// $ANTLR end synpred3_InternalCSS

+

+	// $ANTLR start synpred4_InternalCSS

+	public final void synpred4_InternalCSS_fragment() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3516:8: ( RULE_ONE_INT )

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3516:10: RULE_ONE_INT

+		{

+			match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_synpred4_InternalCSS8296);

+			if (state.failed) {

+				return;

+			}

+

+		}

+	}

+

+	// $ANTLR end synpred4_InternalCSS

+

+	// $ANTLR start synpred5_InternalCSS

+	public final void synpred5_InternalCSS_fragment() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3523:5: ( '.' )

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3524:2: '.'

+		{

+			match(input, 41, FOLLOW_41_in_synpred5_InternalCSS8326);

+			if (state.failed) {

+				return;

+			}

+

+		}

+	}

+

+	// $ANTLR end synpred5_InternalCSS

+

+	// $ANTLR start synpred6_InternalCSS

+	public final void synpred6_InternalCSS_fragment() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3531:3: ( RULE_ONE_INT )

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3531:5: RULE_ONE_INT

+		{

+			match(input, RULE_ONE_INT, FOLLOW_RULE_ONE_INT_in_synpred6_InternalCSS8348);

+			if (state.failed) {

+				return;

+			}

+

+		}

+	}

+

+	// $ANTLR end synpred6_InternalCSS

+

+	// $ANTLR start synpred7_InternalCSS

+	public final void synpred7_InternalCSS_fragment() throws RecognitionException {

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3569:2: ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )

+		// ../org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.g:3569:3: ( RULE_ONE_INT | RULE_ONE_HEX_LETTER )

+		{

+			if (input.LA(1) == RULE_ONE_HEX_LETTER || input.LA(1) == RULE_ONE_INT) {

+				input.consume();

+				state.errorRecovery = false;

+				state.failed = false;

+			}

+			else {

+				if (state.backtracking > 0) {

+					state.failed = true;

+					return;

+				}

+				MismatchedSetException mse = new MismatchedSetException(null, input);

+				throw mse;

+			}

+

+

+		}

+	}

+

+	// $ANTLR end synpred7_InternalCSS

+

+	// Delegated rules

+

+	public final boolean synpred5_InternalCSS() {

+		state.backtracking++;

+		int start = input.mark();

+		try {

+			synpred5_InternalCSS_fragment(); // can never throw exception

+		} catch (RecognitionException re) {

+			System.err.println("impossible: " + re);

+		}

+		boolean success = !state.failed;

+		input.rewind(start);

+		state.backtracking--;

+		state.failed = false;

+		return success;

+	}

+

+	public final boolean synpred3_InternalCSS() {

+		state.backtracking++;

+		int start = input.mark();

+		try {

+			synpred3_InternalCSS_fragment(); // can never throw exception

+		} catch (RecognitionException re) {

+			System.err.println("impossible: " + re);

+		}

+		boolean success = !state.failed;

+		input.rewind(start);

+		state.backtracking--;

+		state.failed = false;

+		return success;

+	}

+

+	public final boolean synpred7_InternalCSS() {

+		state.backtracking++;

+		int start = input.mark();

+		try {

+			synpred7_InternalCSS_fragment(); // can never throw exception

+		} catch (RecognitionException re) {

+			System.err.println("impossible: " + re);

+		}

+		boolean success = !state.failed;

+		input.rewind(start);

+		state.backtracking--;

+		state.failed = false;

+		return success;

+	}

+

+	public final boolean synpred6_InternalCSS() {

+		state.backtracking++;

+		int start = input.mark();

+		try {

+			synpred6_InternalCSS_fragment(); // can never throw exception

+		} catch (RecognitionException re) {

+			System.err.println("impossible: " + re);

+		}

+		boolean success = !state.failed;

+		input.rewind(start);

+		state.backtracking--;

+		state.failed = false;

+		return success;

+	}

+

+	public final boolean synpred4_InternalCSS() {

+		state.backtracking++;

+		int start = input.mark();

+		try {

+			synpred4_InternalCSS_fragment(); // can never throw exception

+		} catch (RecognitionException re) {

+			System.err.println("impossible: " + re);

+		}

+		boolean success = !state.failed;

+		input.rewind(start);

+		state.backtracking--;

+		state.failed = false;

+		return success;

+	}

+

+	public final boolean synpred2_InternalCSS() {

+		state.backtracking++;

+		int start = input.mark();

+		try {

+			synpred2_InternalCSS_fragment(); // can never throw exception

+		} catch (RecognitionException re) {

+			System.err.println("impossible: " + re);

+		}

+		boolean success = !state.failed;

+		input.rewind(start);

+		state.backtracking--;

+		state.failed = false;

+		return success;

+	}

+

+	public final boolean synpred1_InternalCSS() {

+		state.backtracking++;

+		int start = input.mark();

+		try {

+			synpred1_InternalCSS_fragment(); // can never throw exception

+		} catch (RecognitionException re) {

+			System.err.println("impossible: " + re);

+		}

+		boolean success = !state.failed;

+		input.rewind(start);

+		state.backtracking--;

+		state.failed = false;

+		return success;

+	}

+

+

+	protected DFA29 dfa29 = new DFA29(this);

+	protected DFA38 dfa38 = new DFA38(this);

+	protected DFA39 dfa39 = new DFA39(this);

+	protected DFA44 dfa44 = new DFA44(this);

+	protected DFA58 dfa58 = new DFA58(this);

+	protected DFA76 dfa76 = new DFA76(this);

+	static final String DFA29_eotS =

+			"\4\uffff";

+	static final String DFA29_eofS =

+			"\4\uffff";

+	static final String DFA29_minS =

+			"\2\6\2\uffff";

+	static final String DFA29_maxS =

+			"\2\33\2\uffff";

+	static final String DFA29_acceptS =

+			"\2\uffff\1\2\1\1";

+	static final String DFA29_specialS =

+			"\4\uffff}>";

+	static final String[] DFA29_transitionS = {

+			"\1\3\1\uffff\1\1\22\uffff\1\2",

+			"\1\3\1\uffff\1\1\22\uffff\1\2",

+			"",

+			""

+	};

+

+	static final short[] DFA29_eot = DFA.unpackEncodedString(DFA29_eotS);

+	static final short[] DFA29_eof = DFA.unpackEncodedString(DFA29_eofS);

+	static final char[] DFA29_min = DFA.unpackEncodedStringToUnsignedChars(DFA29_minS);

+	static final char[] DFA29_max = DFA.unpackEncodedStringToUnsignedChars(DFA29_maxS);

+	static final short[] DFA29_accept = DFA.unpackEncodedString(DFA29_acceptS);

+	static final short[] DFA29_special = DFA.unpackEncodedString(DFA29_specialS);

+	static final short[][] DFA29_transition;

+

+	static {

+		int numStates = DFA29_transitionS.length;

+		DFA29_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA29_transition[i] = DFA.unpackEncodedString(DFA29_transitionS[i]);

+		}

+	}

+

+	class DFA29 extends DFA {

+

+		public DFA29(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 29;

+			this.eot = DFA29_eot;

+			this.eof = DFA29_eof;

+			this.min = DFA29_min;

+			this.max = DFA29_max;

+			this.accept = DFA29_accept;

+			this.special = DFA29_special;

+			this.transition = DFA29_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "()* loopback of 974:2: ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )*";

+		}

+	}

+

+	static final String DFA38_eotS =

+			"\5\uffff";

+	static final String DFA38_eofS =

+			"\1\3\4\uffff";

+	static final String DFA38_minS =

+			"\1\6\1\uffff\1\5\2\uffff";

+	static final String DFA38_maxS =

+			"\1\60\1\uffff\1\73\2\uffff";

+	static final String DFA38_acceptS =

+			"\1\uffff\1\1\1\uffff\1\3\1\2";

+	static final String DFA38_specialS =

+			"\5\uffff}>";

+	static final String[] DFA38_transitionS = {

+			"\1\3\1\uffff\1\2\4\uffff\1\1\15\uffff\1\3\23\uffff\2\1",

+			"",

+			"\1\4\1\3\1\uffff\1\2\2\uffff\1\4\1\uffff\5\4\11\uffff\1\3" +

+					"\7\uffff\1\4\5\uffff\3\4\3\uffff\2\4\7\uffff\4\4",

+			"",

+			""

+	};

+

+	static final short[] DFA38_eot = DFA.unpackEncodedString(DFA38_eotS);

+	static final short[] DFA38_eof = DFA.unpackEncodedString(DFA38_eofS);

+	static final char[] DFA38_min = DFA.unpackEncodedStringToUnsignedChars(DFA38_minS);

+	static final char[] DFA38_max = DFA.unpackEncodedStringToUnsignedChars(DFA38_maxS);

+	static final short[] DFA38_accept = DFA.unpackEncodedString(DFA38_acceptS);

+	static final short[] DFA38_special = DFA.unpackEncodedString(DFA38_specialS);

+	static final short[][] DFA38_transition;

+

+	static {

+		int numStates = DFA38_transitionS.length;

+		DFA38_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA38_transition[i] = DFA.unpackEncodedString(DFA38_transitionS[i]);

+		}

+	}

+

+	class DFA38 extends DFA {

+

+		public DFA38(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 38;

+			this.eot = DFA38_eot;

+			this.eof = DFA38_eof;

+			this.min = DFA38_min;

+			this.max = DFA38_max;

+			this.accept = DFA38_accept;

+			this.special = DFA38_special;

+			this.transition = DFA38_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "1102:2: ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )?";

+		}

+	}

+

+	static final String DFA39_eotS =

+			"\24\uffff";

+	static final String DFA39_eofS =

+			"\2\uffff\7\23\1\uffff\11\23\1\uffff";

+	static final String DFA39_minS =

+			"\1\16\1\17\7\5\1\uffff\11\5\1\uffff";

+	static final String DFA39_maxS =

+			"\11\73\1\uffff\11\73\1\uffff";

+	static final String DFA39_acceptS =

+			"\11\uffff\1\2\11\uffff\1\1";

+	static final String DFA39_specialS =

+			"\24\uffff}>";

+	static final String[] DFA39_transitionS = {

+			"\1\1\1\2\1\3\1\4\30\uffff\2\11\14\uffff\1\5\1\6\1\7\1\10",

+			"\1\2\1\3\1\4\46\uffff\1\5\1\6\1\7\1\10",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff" +

+					"\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21" +

+					"\1\22",

+			""

+	};

+

+	static final short[] DFA39_eot = DFA.unpackEncodedString(DFA39_eotS);

+	static final short[] DFA39_eof = DFA.unpackEncodedString(DFA39_eofS);

+	static final char[] DFA39_min = DFA.unpackEncodedStringToUnsignedChars(DFA39_minS);

+	static final char[] DFA39_max = DFA.unpackEncodedStringToUnsignedChars(DFA39_maxS);

+	static final short[] DFA39_accept = DFA.unpackEncodedString(DFA39_acceptS);

+	static final short[] DFA39_special = DFA.unpackEncodedString(DFA39_specialS);

+	static final short[][] DFA39_transition;

+

+	static {

+		int numStates = DFA39_transitionS.length;

+		DFA39_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA39_transition[i] = DFA.unpackEncodedString(DFA39_transitionS[i]);

+		}

+	}

+

+	class DFA39 extends DFA {

+

+		public DFA39(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 39;

+			this.eot = DFA39_eot;

+			this.eof = DFA39_eof;

+			this.min = DFA39_min;

+			this.max = DFA39_max;

+			this.accept = DFA39_accept;

+			this.special = DFA39_special;

+			this.transition = DFA39_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "1211:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) )";

+		}

+	}

+

+	static final String DFA44_eotS =

+			"\24\uffff";

+	static final String DFA44_eofS =

+			"\2\uffff\7\23\1\uffff\11\23\1\uffff";

+	static final String DFA44_minS =

+			"\1\16\1\17\7\5\1\uffff\11\5\1\uffff";

+	static final String DFA44_maxS =

+			"\11\73\1\uffff\11\73\1\uffff";

+	static final String DFA44_acceptS =

+			"\11\uffff\1\2\11\uffff\1\1";

+	static final String DFA44_specialS =

+			"\24\uffff}>";

+	static final String[] DFA44_transitionS = {

+			"\1\1\1\2\1\3\1\4\30\uffff\2\11\14\uffff\1\5\1\6\1\7\1\10",

+			"\1\2\1\3\1\4\46\uffff\1\5\1\6\1\7\1\10",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14" +

+					"\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1" +

+					"\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

+			""

+	};

+

+	static final short[] DFA44_eot = DFA.unpackEncodedString(DFA44_eotS);

+	static final short[] DFA44_eof = DFA.unpackEncodedString(DFA44_eofS);

+	static final char[] DFA44_min = DFA.unpackEncodedStringToUnsignedChars(DFA44_minS);

+	static final char[] DFA44_max = DFA.unpackEncodedStringToUnsignedChars(DFA44_maxS);

+	static final short[] DFA44_accept = DFA.unpackEncodedString(DFA44_acceptS);

+	static final short[] DFA44_special = DFA.unpackEncodedString(DFA44_specialS);

+	static final short[][] DFA44_transition;

+

+	static {

+		int numStates = DFA44_transitionS.length;

+		DFA44_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA44_transition[i] = DFA.unpackEncodedString(DFA44_transitionS[i]);

+		}

+	}

+

+	class DFA44 extends DFA {

+

+		public DFA44(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 44;

+			this.eot = DFA44_eot;

+			this.eof = DFA44_eof;

+			this.min = DFA44_min;

+			this.max = DFA44_max;

+			this.accept = DFA44_accept;

+			this.special = DFA44_special;

+			this.transition = DFA44_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "1377:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) )";

+		}

+	}

+

+	static final String DFA58_eotS =

+			"\25\uffff";

+	static final String DFA58_eofS =

+			"\4\uffff\7\2\1\uffff\11\2";

+	static final String DFA58_minS =

+			"\2\5\1\uffff\1\17\7\5\1\uffff\11\5";

+	static final String DFA58_maxS =

+			"\1\5\1\73\1\uffff\10\73\1\uffff\11\73";

+	static final String DFA58_acceptS =

+			"\2\uffff\1\1\10\uffff\1\2\11\uffff";

+	static final String DFA58_specialS =

+			"\25\uffff}>";

+	static final String[] DFA58_transitionS = {

+			"\1\1",

+			"\1\2\10\uffff\1\3\1\4\1\5\1\6\34\uffff\1\13\11\uffff\1\7\1" +

+					"\10\1\11\1\12",

+			"",

+			"\1\4\1\5\1\6\46\uffff\1\7\1\10\1\11\1\12",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24",

+			"\2\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\15\1\14\1\16\1" +

+					"\17\1\20\10\uffff\1\2\7\uffff\1\2\5\uffff\1\2\3\uffff\1\13\1" +

+					"\uffff\2\2\7\uffff\1\21\1\22\1\23\1\24"

+	};

+

+	static final short[] DFA58_eot = DFA.unpackEncodedString(DFA58_eotS);

+	static final short[] DFA58_eof = DFA.unpackEncodedString(DFA58_eofS);

+	static final char[] DFA58_min = DFA.unpackEncodedStringToUnsignedChars(DFA58_minS);

+	static final char[] DFA58_max = DFA.unpackEncodedStringToUnsignedChars(DFA58_maxS);

+	static final short[] DFA58_accept = DFA.unpackEncodedString(DFA58_acceptS);

+	static final short[] DFA58_special = DFA.unpackEncodedString(DFA58_specialS);

+	static final short[][] DFA58_transition;

+

+	static {

+		int numStates = DFA58_transitionS.length;

+		DFA58_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA58_transition[i] = DFA.unpackEncodedString(DFA58_transitionS[i]);

+		}

+	}

+

+	class DFA58 extends DFA {

+

+		public DFA58(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 58;

+			this.eot = DFA58_eot;

+			this.eof = DFA58_eof;

+			this.min = DFA58_min;

+			this.max = DFA58_max;

+			this.accept = DFA58_accept;

+			this.special = DFA58_special;

+			this.transition = DFA58_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "2119:1: (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction )";

+		}

+	}

+

+	static final String DFA76_eotS =

+			"\14\uffff";

+	static final String DFA76_eofS =

+			"\1\1\13\uffff";

+	static final String DFA76_minS =

+			"\1\4\1\uffff\11\0\1\uffff";

+	static final String DFA76_maxS =

+			"\1\73\1\uffff\11\0\1\uffff";

+	static final String DFA76_acceptS =

+			"\1\uffff\1\2\11\uffff\1\1";

+	static final String DFA76_specialS =

+			"\2\uffff\1\4\1\3\1\6\1\1\1\7\1\5\1\2\1\0\1\10\1\uffff}>";

+	static final String[] DFA76_transitionS = {

+			"\12\1\1\2\1\3\1\4\1\5\1\12\3\uffff\1\1\4\uffff\2\1\6\uffff" +

+					"\7\1\1\uffff\3\1\1\uffff\3\1\6\uffff\1\6\1\7\1\10\1\11",

+			"",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			"\1\uffff",

+			""

+	};

+

+	static final short[] DFA76_eot = DFA.unpackEncodedString(DFA76_eotS);

+	static final short[] DFA76_eof = DFA.unpackEncodedString(DFA76_eofS);

+	static final char[] DFA76_min = DFA.unpackEncodedStringToUnsignedChars(DFA76_minS);

+	static final char[] DFA76_max = DFA.unpackEncodedStringToUnsignedChars(DFA76_maxS);

+	static final short[] DFA76_accept = DFA.unpackEncodedString(DFA76_acceptS);

+	static final short[] DFA76_special = DFA.unpackEncodedString(DFA76_specialS);

+	static final short[][] DFA76_transition;

+

+	static {

+		int numStates = DFA76_transitionS.length;

+		DFA76_transition = new short[numStates][];

+		for (int i = 0; i < numStates; i++) {

+			DFA76_transition[i] = DFA.unpackEncodedString(DFA76_transitionS[i]);

+		}

+	}

+

+	class DFA76 extends DFA {

+

+		public DFA76(BaseRecognizer recognizer) {

+			this.recognizer = recognizer;

+			this.decisionNumber = 76;

+			this.eot = DFA76_eot;

+			this.eof = DFA76_eof;

+			this.min = DFA76_min;

+			this.max = DFA76_max;

+			this.accept = DFA76_accept;

+			this.special = DFA76_special;

+			this.transition = DFA76_transition;

+		}

+

+		@Override

+		public String getDescription() {

+			return "()* loopback of 3400:2: ( ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )*";

+		}

+

+		@Override

+		public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {

+			TokenStream input = (TokenStream) _input;

+			int _s = s;

+			switch (s) {

+			case 0:

+				int LA76_9 = input.LA(1);

+

+

+				int index76_9 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred2_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index76_9);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 1:

+				int LA76_5 = input.LA(1);

+

+

+				int index76_5 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred2_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index76_5);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 2:

+				int LA76_8 = input.LA(1);

+

+

+				int index76_8 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred2_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index76_8);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 3:

+				int LA76_3 = input.LA(1);

+

+

+				int index76_3 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred2_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index76_3);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 4:

+				int LA76_2 = input.LA(1);

+

+

+				int index76_2 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred2_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index76_2);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 5:

+				int LA76_7 = input.LA(1);

+

+

+				int index76_7 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred2_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index76_7);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 6:

+				int LA76_4 = input.LA(1);

+

+

+				int index76_4 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred2_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index76_4);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 7:

+				int LA76_6 = input.LA(1);

+

+

+				int index76_6 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred2_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index76_6);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			case 8:

+				int LA76_10 = input.LA(1);

+

+

+				int index76_10 = input.index();

+				input.rewind();

+				s = -1;

+				if ((synpred2_InternalCSS())) {

+					s = 11;

+				}

+

+				else if ((true)) {

+					s = 1;

+				}

+

+

+				input.seek(index76_10);

+				if (s >= 0) {

+					return s;

+				}

+				break;

+			}

+			if (state.backtracking > 0) {

+				state.failed = true;

+				return -1;

+			}

+			NoViableAltException nvae =

+					new NoViableAltException(getDescription(), 76, _s, input);

+			error(nvae);

+			throw nvae;

+		}

+	}

+

+

+	public static final BitSet FOLLOW_rulestylesheet_in_entryRulestylesheet75 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulestylesheet85 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecharset_in_rulestylesheet131 = new BitSet(new long[] { 0x0F000E0FE783C822L });

+	public static final BitSet FOLLOW_ruleimportExpression_in_rulestylesheet153 = new BitSet(new long[] { 0x0F000E0FE783C822L });

+	public static final BitSet FOLLOW_ruleruleset_in_rulestylesheet176 = new BitSet(new long[] { 0x0F000E0FE603C822L });

+	public static final BitSet FOLLOW_rulemedia_in_rulestylesheet203 = new BitSet(new long[] { 0x0F000E0FE603C822L });

+	public static final BitSet FOLLOW_rulepage_in_rulestylesheet230 = new BitSet(new long[] { 0x0F000E0FE603C822L });

+	public static final BitSet FOLLOW_rulefont_face_in_rulestylesheet257 = new BitSet(new long[] { 0x0F000E0FE603C822L });

+	public static final BitSet FOLLOW_rulekeyframes_in_rulestylesheet284 = new BitSet(new long[] { 0x0F000E0FE603C822L });

+	public static final BitSet FOLLOW_rulecharset_in_entryRulecharset322 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulecharset332 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_20_in_rulecharset370 = new BitSet(new long[] { 0x0000000000000010L });

+	public static final BitSet FOLLOW_21_in_rulecharset388 = new BitSet(new long[] { 0x0000000000000010L });

+	public static final BitSet FOLLOW_RULE_CSSSTRING_in_rulecharset406 = new BitSet(new long[] { 0x0000000000400000L });

+	public static final BitSet FOLLOW_22_in_rulecharset423 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleimportExpression_in_entryRuleimportExpression459 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleimportExpression469 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_23_in_ruleimportExpression507 = new BitSet(new long[] { 0x0002000000000010L });

+	public static final BitSet FOLLOW_24_in_ruleimportExpression525 = new BitSet(new long[] { 0x0002000000000010L });

+	public static final BitSet FOLLOW_RULE_CSSSTRING_in_ruleimportExpression544 = new BitSet(new long[] { 0x0000000000400000L });

+	public static final BitSet FOLLOW_ruleURLType_in_ruleimportExpression578 = new BitSet(new long[] { 0x0F0000000043C000L });

+	public static final BitSet FOLLOW_rulemedia_list_in_ruleimportExpression598 = new BitSet(new long[] { 0x0000000000400000L });

+	public static final BitSet FOLLOW_22_in_ruleimportExpression613 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulepage_in_entryRulepage649 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulepage659 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_25_in_rulepage706 = new BitSet(new long[] { 0x0000000008000020L });

+	public static final BitSet FOLLOW_26_in_rulepage724 = new BitSet(new long[] { 0x0000000008000020L });

+	public static final BitSet FOLLOW_rulepseudo_page_in_rulepage746 = new BitSet(new long[] { 0x0000000008000000L });

+	public static final BitSet FOLLOW_27_in_rulepage759 = new BitSet(new long[] { 0x0F0000001043C100L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rulepage780 = new BitSet(new long[] { 0x0000000010400000L });

+	public static final BitSet FOLLOW_22_in_rulepage794 = new BitSet(new long[] { 0x0F0000001043C100L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rulepage815 = new BitSet(new long[] { 0x0000000010400000L });

+	public static final BitSet FOLLOW_28_in_rulepage830 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulepseudo_page_in_entryRulepseudo_page867 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulepseudo_page878 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COLON_in_rulepseudo_page918 = new BitSet(new long[] { 0x0F0000000003C000L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rulepseudo_page945 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulemedia_in_entryRulemedia990 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulemedia1000 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_29_in_rulemedia1038 = new BitSet(new long[] { 0x0F0000000003C000L });

+	public static final BitSet FOLLOW_30_in_rulemedia1056 = new BitSet(new long[] { 0x0F0000000003C000L });

+	public static final BitSet FOLLOW_rulemedia_list_in_rulemedia1078 = new BitSet(new long[] { 0x0000000008000000L });

+	public static final BitSet FOLLOW_27_in_rulemedia1090 = new BitSet(new long[] { 0x0F000E081003C820L });

+	public static final BitSet FOLLOW_ruleruleset_in_rulemedia1111 = new BitSet(new long[] { 0x0F000E081003C820L });

+	public static final BitSet FOLLOW_28_in_rulemedia1124 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulemedia_list_in_entryRulemedia_list1161 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulemedia_list1172 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulemedium_in_rulemedia_list1219 = new BitSet(new long[] { 0x0000000000000042L });

+	public static final BitSet FOLLOW_RULE_COMMA_in_rulemedia_list1240 = new BitSet(new long[] { 0x0F0000000003C000L });

+	public static final BitSet FOLLOW_rulemedium_in_rulemedia_list1267 = new BitSet(new long[] { 0x0000000000000042L });

+	public static final BitSet FOLLOW_rulemedium_in_entryRulemedium1315 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulemedium1326 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rulemedium1372 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulefont_face_in_entryRulefont_face1416 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulefont_face1426 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_31_in_rulefont_face1473 = new BitSet(new long[] { 0x0000000008000000L });

+	public static final BitSet FOLLOW_32_in_rulefont_face1491 = new BitSet(new long[] { 0x0000000008000000L });

+	public static final BitSet FOLLOW_27_in_rulefont_face1504 = new BitSet(new long[] { 0x0F0000001043C100L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rulefont_face1525 = new BitSet(new long[] { 0x0000000010400000L });

+	public static final BitSet FOLLOW_22_in_rulefont_face1539 = new BitSet(new long[] { 0x0F0000001043C100L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rulefont_face1560 = new BitSet(new long[] { 0x0000000010400000L });

+	public static final BitSet FOLLOW_28_in_rulefont_face1575 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulekeyframes_in_entryRulekeyframes1611 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulekeyframes1621 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_33_in_rulekeyframes1668 = new BitSet(new long[] { 0x0F0000000003C000L });

+	public static final BitSet FOLLOW_34_in_rulekeyframes1686 = new BitSet(new long[] { 0x0F0000000003C000L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rulekeyframes1708 = new BitSet(new long[] { 0x0000000008000000L });

+	public static final BitSet FOLLOW_27_in_rulekeyframes1720 = new BitSet(new long[] { 0x0F0002001047E000L });

+	public static final BitSet FOLLOW_rulekeyframe_selector_in_rulekeyframes1741 = new BitSet(new long[] { 0x0000000010400000L });

+	public static final BitSet FOLLOW_22_in_rulekeyframes1755 = new BitSet(new long[] { 0x0F0002001047E000L });

+	public static final BitSet FOLLOW_rulekeyframe_selector_in_rulekeyframes1776 = new BitSet(new long[] { 0x0000000010400000L });

+	public static final BitSet FOLLOW_28_in_rulekeyframes1791 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulekeyframe_selector_in_entryRulekeyframe_selector1827 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulekeyframe_selector1837 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rulekeyframe_selector1884 = new BitSet(new long[] { 0x0000000008000000L });

+	public static final BitSet FOLLOW_ruleNum_in_rulekeyframe_selector1912 = new BitSet(new long[] { 0x0000000000000080L });

+	public static final BitSet FOLLOW_RULE_PERCENT_in_rulekeyframe_selector1923 = new BitSet(new long[] { 0x0000000008000000L });

+	public static final BitSet FOLLOW_27_in_rulekeyframe_selector1936 = new BitSet(new long[] { 0x0F0000001043C100L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rulekeyframe_selector1957 = new BitSet(new long[] { 0x0000000010400000L });

+	public static final BitSet FOLLOW_22_in_rulekeyframe_selector1971 = new BitSet(new long[] { 0x0F0000001043C100L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_rulekeyframe_selector1992 = new BitSet(new long[] { 0x0000000010400000L });

+	public static final BitSet FOLLOW_28_in_rulekeyframe_selector2007 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleruleset_in_entryRuleruleset2043 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleruleset2053 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleselector_in_ruleruleset2099 = new BitSet(new long[] { 0x0000000008000140L });

+	public static final BitSet FOLLOW_RULE_WS_in_ruleruleset2112 = new BitSet(new long[] { 0x0000000000000140L });

+	public static final BitSet FOLLOW_RULE_COMMA_in_ruleruleset2124 = new BitSet(new long[] { 0x0F000E080003C820L });

+	public static final BitSet FOLLOW_ruleselector_in_ruleruleset2144 = new BitSet(new long[] { 0x0000000008000140L });

+	public static final BitSet FOLLOW_RULE_WS_in_ruleruleset2158 = new BitSet(new long[] { 0x0000000008000100L });

+	public static final BitSet FOLLOW_27_in_ruleruleset2171 = new BitSet(new long[] { 0x0F0000001003C100L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_ruleruleset2193 = new BitSet(new long[] { 0x0000000010400000L });

+	public static final BitSet FOLLOW_22_in_ruleruleset2206 = new BitSet(new long[] { 0x0F0000000003C100L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_ruleruleset2227 = new BitSet(new long[] { 0x0000000010400000L });

+	public static final BitSet FOLLOW_22_in_ruleruleset2242 = new BitSet(new long[] { 0x0000000010000000L });

+	public static final BitSet FOLLOW_28_in_ruleruleset2258 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleselector_in_entryRuleselector2300 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleselector2310 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulesimple_selector_in_ruleselector2360 = new BitSet(new long[] { 0x0001800000002102L });

+	public static final BitSet FOLLOW_rulecombinator_in_ruleselector2383 = new BitSet(new long[] { 0x0F000E080003C920L });

+	public static final BitSet FOLLOW_RULE_WS_in_ruleselector2395 = new BitSet(new long[] { 0x0F000E080003C920L });

+	public static final BitSet FOLLOW_ruleselector_in_ruleselector2417 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_WS_in_ruleselector2437 = new BitSet(new long[] { 0x0F018E080003E920L });

+	public static final BitSet FOLLOW_rulecombinator_in_ruleselector2460 = new BitSet(new long[] { 0x0F000E080003C920L });

+	public static final BitSet FOLLOW_RULE_WS_in_ruleselector2472 = new BitSet(new long[] { 0x0F000E080003C920L });

+	public static final BitSet FOLLOW_ruleselector_in_ruleselector2496 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleSimpleSelectorForNegation_in_entryRuleSimpleSelectorForNegation2539 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleSimpleSelectorForNegation2549 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleElementSelector_in_ruleSimpleSelectorForNegation2597 = new BitSet(new long[] { 0x0000020800000822L });

+	public static final BitSet FOLLOW_ruleUniversalSelector_in_ruleSimpleSelectorForNegation2624 = new BitSet(new long[] { 0x0000020800000822L });

+	public static final BitSet FOLLOW_ruleSubSelectorForNegation_in_ruleSimpleSelectorForNegation2646 = new BitSet(new long[] { 0x0000020800000822L });

+	public static final BitSet FOLLOW_ruleSubSelectorForNegation_in_ruleSimpleSelectorForNegation2685 = new BitSet(new long[] { 0x0000020800000822L });

+	public static final BitSet FOLLOW_ruleSubSelectorForNegation_in_entryRuleSubSelectorForNegation2722 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleSubSelectorForNegation2732 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdSelector_in_ruleSubSelectorForNegation2779 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleClassSelector_in_ruleSubSelectorForNegation2806 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleAttributeSelector_in_ruleSubSelectorForNegation2833 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClass_in_ruleSubSelectorForNegation2860 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulesimple_selector_in_entryRulesimple_selector2901 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulesimple_selector2911 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleElementSelector_in_rulesimple_selector2963 = new BitSet(new long[] { 0x0F000E080003C822L });

+	public static final BitSet FOLLOW_ruleUniversalSelector_in_rulesimple_selector2990 = new BitSet(new long[] { 0x0F000E080003C822L });

+	public static final BitSet FOLLOW_ruleSubSelector_in_rulesimple_selector3012 = new BitSet(new long[] { 0x0F000E080003C822L });

+	public static final BitSet FOLLOW_ruleSubSelector_in_rulesimple_selector3041 = new BitSet(new long[] { 0x0F000E080003C822L });

+	public static final BitSet FOLLOW_ruleSubSelector_in_entryRuleSubSelector3082 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleSubSelector3092 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdSelector_in_ruleSubSelector3139 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleClassSelector_in_ruleSubSelector3166 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleAttributeSelector_in_ruleSubSelector3193 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClassOrFunc_in_ruleSubSelector3220 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleAttributeSelector_in_entryRuleAttributeSelector3255 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleAttributeSelector3265 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_35_in_ruleAttributeSelector3311 = new BitSet(new long[] { 0x0F0000000003C000L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_ruleAttributeSelector3332 = new BitSet(new long[] { 0x000001F000000600L });

+	public static final BitSet FOLLOW_36_in_ruleAttributeSelector3353 = new BitSet(new long[] { 0x0F0000000003C010L });

+	public static final BitSet FOLLOW_37_in_ruleAttributeSelector3382 = new BitSet(new long[] { 0x0F0000000003C010L });

+	public static final BitSet FOLLOW_38_in_ruleAttributeSelector3411 = new BitSet(new long[] { 0x0F0000000003C010L });

+	public static final BitSet FOLLOW_39_in_ruleAttributeSelector3440 = new BitSet(new long[] { 0x0F0000000003C010L });

+	public static final BitSet FOLLOW_RULE_INCLUDES_in_ruleAttributeSelector3468 = new BitSet(new long[] { 0x0F0000000003C010L });

+	public static final BitSet FOLLOW_RULE_DASHMATCH_in_ruleAttributeSelector3488 = new BitSet(new long[] { 0x0F0000000003C010L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_ruleAttributeSelector3519 = new BitSet(new long[] { 0x0000010000000000L });

+	public static final BitSet FOLLOW_RULE_CSSSTRING_in_ruleAttributeSelector3534 = new BitSet(new long[] { 0x0000010000000000L });

+	public static final BitSet FOLLOW_40_in_ruleAttributeSelector3556 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleClassSelector_in_entryRuleClassSelector3592 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleClassSelector3602 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_41_in_ruleClassSelector3648 = new BitSet(new long[] { 0x0F0000000003C000L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_ruleClassSelector3669 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleElementSelector_in_entryRuleElementSelector3705 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleElementSelector3715 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_ruleElementSelector3770 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleUniversalSelector_in_entryRuleUniversalSelector3806 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleUniversalSelector3816 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_namespace_prefix_in_ruleUniversalSelector3871 = new BitSet(new long[] { 0x0000040000000000L });

+	public static final BitSet FOLLOW_42_in_ruleUniversalSelector3884 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdSelector_in_entryRuleIdSelector3920 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleIdSelector3930 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_HASHMARK_in_ruleIdSelector3975 = new BitSet(new long[] { 0x0F0000000003C000L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_ruleIdSelector3995 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_namespace_prefix_in_entryRulecss_namespace_prefix4032 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulecss_namespace_prefix4043 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rulecss_namespace_prefix4091 = new BitSet(new long[] { 0x0000080000000000L });

+	public static final BitSet FOLLOW_42_in_rulecss_namespace_prefix4115 = new BitSet(new long[] { 0x0000080000000000L });

+	public static final BitSet FOLLOW_43_in_rulecss_namespace_prefix4130 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_declaration_in_entryRulecss_declaration4176 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulecss_declaration4186 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_WS_in_rulecss_declaration4227 = new BitSet(new long[] { 0x0F0000000003C100L });

+	public static final BitSet FOLLOW_rulecss_property_in_rulecss_declaration4249 = new BitSet(new long[] { 0x0000000000000120L });

+	public static final BitSet FOLLOW_RULE_WS_in_rulecss_declaration4261 = new BitSet(new long[] { 0x0000000000000120L });

+	public static final BitSet FOLLOW_RULE_COLON_in_rulecss_declaration4273 = new BitSet(new long[] { 0x0F0202000007E9D0L });

+	public static final BitSet FOLLOW_ruleCssTok_in_rulecss_declaration4293 = new BitSet(new long[] { 0x0F0202000007F9D2L });

+	public static final BitSet FOLLOW_RULE_IMPORTANT_SYM_in_rulecss_declaration4311 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecss_property_in_entryRulecss_property4357 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulecss_property4367 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleValidPropertyIdent_in_rulecss_property4422 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleValidPropertyIdent_in_entryRuleValidPropertyIdent4459 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleValidPropertyIdent4470 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_ruleValidPropertyIdent4516 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClassOrFunc_in_entryRulePseudoClassOrFunc4560 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulePseudoClassOrFunc4570 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClass_in_rulePseudoClassOrFunc4617 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClassFunction_in_rulePseudoClassOrFunc4644 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClass_in_entryRulePseudoClass4679 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulePseudoClass4689 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COLON_in_rulePseudoClass4725 = new BitSet(new long[] { 0x0F0000000003C020L });

+	public static final BitSet FOLLOW_RULE_COLON_in_rulePseudoClass4736 = new BitSet(new long[] { 0x0F0000000003C020L });

+	public static final BitSet FOLLOW_rulePseudoClassName_in_rulePseudoClass4759 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClassName_in_entryRulePseudoClassName4794 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulePseudoClassName4804 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rulePseudoClassName4849 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulePseudoClassFunction_in_entryRulePseudoClassFunction4884 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulePseudoClassFunction4894 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleNotFunctionCall_in_rulePseudoClassFunction4941 = new BitSet(new long[] { 0x0F000E080003C820L });

+	public static final BitSet FOLLOW_ruleSimpleSelectorForNegation_in_rulePseudoClassFunction4962 = new BitSet(new long[] { 0x0000100000000000L });

+	public static final BitSet FOLLOW_44_in_rulePseudoClassFunction4974 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COLON_in_rulePseudoClassFunction4993 = new BitSet(new long[] { 0x0F0000000003C000L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_rulePseudoClassFunction5013 = new BitSet(new long[] { 0x0000200000000000L });

+	public static final BitSet FOLLOW_45_in_rulePseudoClassFunction5025 = new BitSet(new long[] { 0x0F0212000007E9D0L });

+	public static final BitSet FOLLOW_ruleCssTok_in_rulePseudoClassFunction5046 = new BitSet(new long[] { 0x0F0212000007E9D0L });

+	public static final BitSet FOLLOW_44_in_rulePseudoClassFunction5059 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleNotFunctionCall_in_entryRuleNotFunctionCall5103 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleNotFunctionCall5114 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COLON_in_ruleNotFunctionCall5158 = new BitSet(new long[] { 0x0000400000000000L });

+	public static final BitSet FOLLOW_46_in_ruleNotFunctionCall5176 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_rulecombinator_in_entryRulecombinator5221 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRulecombinator5232 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_PLUS_in_rulecombinator5272 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_47_in_rulecombinator5296 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_48_in_rulecombinator5315 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleSymbolTok_in_entryRuleSymbolTok5359 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleSymbolTok5369 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COMMA_in_ruleSymbolTok5422 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_PERCENT_in_ruleSymbolTok5442 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleWSTok_in_entryRuleWSTok5486 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleWSTok5496 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_WS_in_ruleWSTok5541 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleStringTok_in_entryRuleStringTok5576 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleStringTok5586 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_CSSSTRING_in_ruleStringTok5637 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleNumberTok_in_entryRuleNumberTok5684 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleNumberTok5694 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleNum_in_ruleNumberTok5753 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleUrlTok_in_entryRuleUrlTok5793 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleUrlTok5803 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleURLType_in_ruleUrlTok5858 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleColorTok_in_entryRuleColorTok5900 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleColorTok5910 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleHex_in_ruleColorTok5969 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifierOrFuncTok_in_entryRuleIdentifierOrFuncTok6015 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleIdentifierOrFuncTok6025 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_ruleIdentifierOrFuncTok6084 = new BitSet(new long[] { 0x0000200000000002L });

+	public static final BitSet FOLLOW_45_in_ruleIdentifierOrFuncTok6106 = new BitSet(new long[] { 0x0F0202000007E9D0L });

+	public static final BitSet FOLLOW_ruleCssTok_in_ruleIdentifierOrFuncTok6127 = new BitSet(new long[] { 0x0F0212000007E9D0L });

+	public static final BitSet FOLLOW_44_in_ruleIdentifierOrFuncTok6140 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleCssTok_in_entryRuleCssTok6188 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleCssTok6198 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleIdentifierOrFuncTok_in_ruleCssTok6249 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleSymbolTok_in_ruleCssTok6276 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleWSTok_in_ruleCssTok6303 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleStringTok_in_ruleCssTok6330 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleNumberTok_in_ruleCssTok6357 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleUrlTok_in_ruleCssTok6384 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleColorTok_in_ruleCssTok6411 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleURLType_in_entryRuleURLType6456 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleURLType6466 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_49_in_ruleURLType6507 = new BitSet(new long[] { 0xFFFD07880047E8F0L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_ruleValidURL_in_ruleURLType6528 = new BitSet(new long[] { 0x0000100000000000L });

+	public static final BitSet FOLLOW_44_in_ruleURLType6540 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleValidURLSymbol_in_entryRuleValidURLSymbol6581 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleValidURLSymbol6592 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_DASH_in_ruleValidURLSymbol6632 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_41_in_ruleValidURLSymbol6656 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_UNDERSCORE_in_ruleValidURLSymbol6677 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_48_in_ruleValidURLSymbol6701 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COLON_in_ruleValidURLSymbol6722 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_50_in_ruleValidURLSymbol6746 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_51_in_ruleValidURLSymbol6765 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_HASHMARK_in_ruleValidURLSymbol6786 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_35_in_ruleValidURLSymbol6810 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_40_in_ruleValidURLSymbol6829 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_52_in_ruleValidURLSymbol6848 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_53_in_ruleValidURLSymbol6867 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_54_in_ruleValidURLSymbol6886 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_55_in_ruleValidURLSymbol6905 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_42_in_ruleValidURLSymbol6924 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_PLUS_in_ruleValidURLSymbol6945 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_COMMA_in_ruleValidURLSymbol6971 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_22_in_ruleValidURLSymbol6995 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_39_in_ruleValidURLSymbol7015 = new BitSet(new long[] { 0x0F0000000003C000L });

+	public static final BitSet FOLLOW_ruleKeywordHack_in_ruleValidURLSymbol7037 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleKeywordHack_in_entryRuleKeywordHack7084 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleKeywordHack7095 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_56_in_ruleKeywordHack7133 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_57_in_ruleKeywordHack7152 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_58_in_ruleKeywordHack7171 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_59_in_ruleKeywordHack7190 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleValidURL_in_entryRuleValidURL7237 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleValidURL7248 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_CSSSTRING_in_ruleValidURL7292 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleValidURLSymbol_in_ruleValidURL7326 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_ruleKeywordHack_in_ruleValidURL7359 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_RULE_ONE_HEX_LETTER_in_ruleValidURL7385 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_RULE_ONE_NON_HEX_LETTER_in_ruleValidURL7411 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_ruleValidURL7437 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_60_in_ruleValidURL7461 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_61_in_ruleValidURL7480 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_62_in_ruleValidURL7499 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_63_in_ruleValidURL7518 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_64_in_ruleValidURL7537 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_RULE_PERCENT_in_ruleValidURL7559 = new BitSet(new long[] { 0x0000000000050000L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_ruleValidURL7580 = new BitSet(new long[] { 0x0000000000050000L });

+	public static final BitSet FOLLOW_RULE_ONE_HEX_LETTER_in_ruleValidURL7606 = new BitSet(new long[] { 0x0000000000050000L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_ruleValidURL7628 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_RULE_ONE_HEX_LETTER_in_ruleValidURL7654 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });

+	public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier7714 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier7725 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_DASH_in_ruleIdentifier7770 = new BitSet(new long[] { 0x0F0000000003C000L });

+	public static final BitSet FOLLOW_RULE_UNDERSCORE_in_ruleIdentifier7793 = new BitSet(new long[] { 0x0F0000000007C002L });

+	public static final BitSet FOLLOW_RULE_ONE_HEX_LETTER_in_ruleIdentifier7819 = new BitSet(new long[] { 0x0F0000000007C002L });

+	public static final BitSet FOLLOW_RULE_ONE_NON_HEX_LETTER_in_ruleIdentifier7845 = new BitSet(new long[] { 0x0F0000000007C002L });

+	public static final BitSet FOLLOW_ruleKeywordHack_in_ruleIdentifier7878 = new BitSet(new long[] { 0x0F0000000007C002L });

+	public static final BitSet FOLLOW_RULE_UNDERSCORE_in_ruleIdentifier7948 = new BitSet(new long[] { 0x0F0000000007C002L });

+	public static final BitSet FOLLOW_RULE_DASH_in_ruleIdentifier7974 = new BitSet(new long[] { 0x0F0000000007C002L });

+	public static final BitSet FOLLOW_RULE_ONE_HEX_LETTER_in_ruleIdentifier8000 = new BitSet(new long[] { 0x0F0000000007C002L });

+	public static final BitSet FOLLOW_RULE_ONE_NON_HEX_LETTER_in_ruleIdentifier8026 = new BitSet(new long[] { 0x0F0000000007C002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_ruleIdentifier8052 = new BitSet(new long[] { 0x0F0000000007C002L });

+	public static final BitSet FOLLOW_ruleKeywordHack_in_ruleIdentifier8085 = new BitSet(new long[] { 0x0F0000000007C002L });

+	public static final BitSet FOLLOW_ruleNum_in_entryRuleNum8144 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleNum8155 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_PLUS_in_ruleNum8200 = new BitSet(new long[] { 0x0000020000040000L });

+	public static final BitSet FOLLOW_RULE_DASH_in_ruleNum8226 = new BitSet(new long[] { 0x0000020000040000L });

+	public static final BitSet FOLLOW_41_in_ruleNum8248 = new BitSet(new long[] { 0x0000000000040000L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_ruleNum8269 = new BitSet(new long[] { 0x0000000000040002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_ruleNum8305 = new BitSet(new long[] { 0x0000020000040002L });

+	public static final BitSet FOLLOW_41_in_ruleNum8335 = new BitSet(new long[] { 0x0000000000040000L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_ruleNum8357 = new BitSet(new long[] { 0x0000000000040002L });

+	public static final BitSet FOLLOW_ruleHex_in_entryRuleHex8413 = new BitSet(new long[] { 0x0000000000000000L });

+	public static final BitSet FOLLOW_EOF_in_entryRuleHex8424 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_HASHMARK_in_ruleHex8464 = new BitSet(new long[] { 0x0000000000050000L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_ruleHex8501 = new BitSet(new long[] { 0x0000000000050002L });

+	public static final BitSet FOLLOW_RULE_ONE_HEX_LETTER_in_ruleHex8527 = new BitSet(new long[] { 0x0000000000050002L });

+	public static final BitSet FOLLOW_ruleSubSelectorForNegation_in_synpred1_InternalCSS2668 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_UNDERSCORE_in_synpred2_InternalCSS7897 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_DASH_in_synpred2_InternalCSS7905 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_HEX_LETTER_in_synpred2_InternalCSS7913 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_NON_HEX_LETTER_in_synpred2_InternalCSS7921 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_synpred2_InternalCSS7929 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_ruleKeywordHack_in_synpred2_InternalCSS7937 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_synpred3_InternalCSS8260 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_synpred4_InternalCSS8296 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_41_in_synpred5_InternalCSS8326 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_RULE_ONE_INT_in_synpred6_InternalCSS8348 = new BitSet(new long[] { 0x0000000000000002L });

+	public static final BitSet FOLLOW_set_in_synpred7_InternalCSS8480 = new BitSet(new long[] { 0x0000000000000002L });

+

+}
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/serializer/CSSSemanticSequencer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/serializer/CSSSemanticSequencer.java
new file mode 100644
index 00000000000..cabbde8b7c4
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/serializer/CSSSemanticSequencer.java
@@ -0,0 +1,550 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.serializer;

+

+import com.google.inject.Inject;

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

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.WSTok;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;

+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;

+import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;

+import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;

+import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;

+import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;

+import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;

+

+@SuppressWarnings("all")

+public class CSSSemanticSequencer extends AbstractDelegatingSemanticSequencer {

+

+	@Inject

+	private CSSGrammarAccess grammarAccess;

+

+	@Override

+	public void createSequence(EObject context, EObject semanticObject) {

+		if (semanticObject.eClass().getEPackage() == CSSPackage.eINSTANCE) {

+			switch (semanticObject.eClass().getClassifierID()) {

+			case CSSPackage.ATTRIBUTE_SELECTOR:

+				sequence_AttributeSelector(context, (AttributeSelector) semanticObject);

+				return;

+			case CSSPackage.CLASS_SELECTOR:

+				sequence_ClassSelector(context, (ClassSelector) semanticObject);

+				return;

+			case CSSPackage.COLOR_TOK:

+				sequence_ColorTok(context, (ColorTok) semanticObject);

+				return;

+			case CSSPackage.ELEMENT_SELECTOR:

+				sequence_ElementSelector(context, (ElementSelector) semanticObject);

+				return;

+			case CSSPackage.FUNC_TOK:

+				sequence_IdentifierOrFuncTok(context, (FuncTok) semanticObject);

+				return;

+			case CSSPackage.ID_SELECTOR:

+				sequence_IdSelector(context, (IdSelector) semanticObject);

+				return;

+			case CSSPackage.IDENTIFIER_TOK:

+				sequence_IdentifierOrFuncTok(context, (IdentifierTok) semanticObject);

+				return;

+			case CSSPackage.NUMBER_TOK:

+				sequence_NumberTok(context, (NumberTok) semanticObject);

+				return;

+			case CSSPackage.PSEUDO_CLASS_FUNCTION:

+				sequence_PseudoClassFunction(context, (PseudoClassFunction) semanticObject);

+				return;

+			case CSSPackage.PSEUDO_CLASS_NAME:

+				sequence_PseudoClassName(context, (PseudoClassName) semanticObject);

+				return;

+			case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION:

+				sequence_SimpleSelectorForNegation(context, (SimpleSelectorForNegation) semanticObject);

+				return;

+			case CSSPackage.STRING_TOK:

+				sequence_StringTok(context, (StringTok) semanticObject);

+				return;

+			case CSSPackage.SYMBOL_TOK:

+				sequence_SymbolTok(context, (SymbolTok) semanticObject);

+				return;

+			case CSSPackage.URL_TYPE:

+				if (context == grammarAccess.getURLTypeRule()) {

+					sequence_URLType(context, (URLType) semanticObject);

+					return;

+				}

+				else if (context == grammarAccess.getImportExpressionRule()) {

+					sequence_URLType_importExpression(context, (URLType) semanticObject);

+					return;

+				} else {

+					break;

+				}

+			case CSSPackage.UNIVERSAL_SELECTOR:

+				sequence_UniversalSelector(context, (UniversalSelector) semanticObject);

+				return;

+			case CSSPackage.URL_TOK:

+				sequence_UrlTok(context, (UrlTok) semanticObject);

+				return;

+			case CSSPackage.WS_TOK:

+				sequence_WSTok(context, (WSTok) semanticObject);

+				return;

+			case CSSPackage.CHARSET:

+				sequence_charset(context, (charset) semanticObject);

+				return;

+			case CSSPackage.CSS_DECLARATION:

+				sequence_css_declaration(context, (css_declaration) semanticObject);

+				return;

+			case CSSPackage.CSS_PROPERTY:

+				sequence_css_property(context, (css_property) semanticObject);

+				return;

+			case CSSPackage.FONT_FACE:

+				if (context == grammarAccess.getFont_faceRule()) {

+					sequence_font_face(context, (font_face) semanticObject);

+					return;

+				}

+				else if (context == grammarAccess.getKeyframesRule()) {

+					sequence_keyframes(context, (font_face) semanticObject);

+					return;

+				} else {

+					break;

+				}

+			case CSSPackage.IMPORT_EXPRESSION:

+				sequence_importExpression(context, (importExpression) semanticObject);

+				return;

+			case CSSPackage.KEYFRAME_SELECTOR:

+				sequence_keyframe_selector(context, (keyframe_selector) semanticObject);

+				return;

+			case CSSPackage.MEDIA:

+				sequence_media(context, (media) semanticObject);

+				return;

+			case CSSPackage.PAGE:

+				sequence_page(context, (page) semanticObject);

+				return;

+			case CSSPackage.RULESET:

+				sequence_ruleset(context, (ruleset) semanticObject);

+				return;

+			case CSSPackage.SELECTOR:

+				sequence_selector(context, (selector) semanticObject);

+				return;

+			case CSSPackage.SIMPLE_SELECTOR:

+				sequence_simple_selector(context, (simple_selector) semanticObject);

+				return;

+			case CSSPackage.STYLESHEET:

+				sequence_stylesheet(context, (stylesheet) semanticObject);

+				return;

+			}

+		}

+		if (errorAcceptor != null) {

+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));

+		}

+	}

+

+	/**

+	 * Constraint:

+	 * (

+	 * name=Identifier

+	 * (

+	 * (

+	 * op='^=' |

+	 * op='$=' |

+	 * op='*=' |

+	 * op='=' |

+	 * op=INCLUDES |

+	 * op=DASHMATCH

+	 * )

+	 * (value=Identifier | value=CSSSTRING)

+	 * )?

+	 * )

+	 */

+	protected void sequence_AttributeSelector(EObject context, AttributeSelector semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * name=Identifier

+	 */

+	protected void sequence_ClassSelector(EObject context, ClassSelector semanticObject) {

+		if (errorAcceptor != null) {

+			if (transientValues.isValueTransient(semanticObject, CSSPackage.Literals.CLASS_SELECTOR__NAME) == ValueTransient.YES) {

+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CSSPackage.Literals.CLASS_SELECTOR__NAME));

+			}

+		}

+		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);

+		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);

+		feeder.accept(grammarAccess.getClassSelectorAccess().getNameIdentifierParserRuleCall_2_0(), semanticObject.getName());

+		feeder.finish();

+	}

+

+

+	/**

+	 * Constraint:

+	 * value=Hex

+	 */

+	protected void sequence_ColorTok(EObject context, ColorTok semanticObject) {

+		if (errorAcceptor != null) {

+			if (transientValues.isValueTransient(semanticObject, CSSPackage.Literals.COLOR_TOK__VALUE) == ValueTransient.YES) {

+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CSSPackage.Literals.COLOR_TOK__VALUE));

+			}

+		}

+		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);

+		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);

+		feeder.accept(grammarAccess.getColorTokAccess().getValueHexParserRuleCall_1_0(), semanticObject.getValue());

+		feeder.finish();

+	}

+

+

+	/**

+	 * Constraint:

+	 * name=Identifier

+	 */

+	protected void sequence_ElementSelector(EObject context, ElementSelector semanticObject) {

+		if (errorAcceptor != null) {

+			if (transientValues.isValueTransient(semanticObject, CSSPackage.Literals.ELEMENT_SELECTOR__NAME) == ValueTransient.YES) {

+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CSSPackage.Literals.ELEMENT_SELECTOR__NAME));

+			}

+		}

+		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);

+		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);

+		feeder.accept(grammarAccess.getElementSelectorAccess().getNameIdentifierParserRuleCall_1_0(), semanticObject.getName());

+		feeder.finish();

+	}

+

+

+	/**

+	 * Constraint:

+	 * name=Identifier

+	 */

+	protected void sequence_IdSelector(EObject context, IdSelector semanticObject) {

+		if (errorAcceptor != null) {

+			if (transientValues.isValueTransient(semanticObject, CSSPackage.Literals.ID_SELECTOR__NAME) == ValueTransient.YES) {

+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CSSPackage.Literals.ID_SELECTOR__NAME));

+			}

+		}

+		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);

+		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);

+		feeder.accept(grammarAccess.getIdSelectorAccess().getNameIdentifierParserRuleCall_2_0(), semanticObject.getName());

+		feeder.finish();

+	}

+

+

+	/**

+	 * Constraint:

+	 * (name=IdentifierOrFuncTok_FuncTok_2_0 params+=CssTok+)

+	 */

+	protected void sequence_IdentifierOrFuncTok(EObject context, FuncTok semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * name=Identifier

+	 */

+	protected void sequence_IdentifierOrFuncTok(EObject context, IdentifierTok semanticObject) {

+		if (errorAcceptor != null) {

+			if (transientValues.isValueTransient(semanticObject, CSSPackage.Literals.IDENTIFIER_TOK__NAME) == ValueTransient.YES) {

+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CSSPackage.Literals.IDENTIFIER_TOK__NAME));

+			}

+		}

+		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);

+		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);

+		feeder.accept(grammarAccess.getIdentifierOrFuncTokAccess().getNameIdentifierParserRuleCall_1_0(), semanticObject.getName());

+		feeder.finish();

+	}

+

+

+	/**

+	 * Constraint:

+	 * val=Num

+	 */

+	protected void sequence_NumberTok(EObject context, NumberTok semanticObject) {

+		if (errorAcceptor != null) {

+			if (transientValues.isValueTransient(semanticObject, CSSPackage.Literals.NUMBER_TOK__VAL) == ValueTransient.YES) {

+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CSSPackage.Literals.NUMBER_TOK__VAL));

+			}

+		}

+		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);

+		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);

+		feeder.accept(grammarAccess.getNumberTokAccess().getValNumParserRuleCall_1_0(), semanticObject.getVal());

+		feeder.finish();

+	}

+

+

+	/**

+	 * Constraint:

+	 * ((not?=NotFunctionCall paramSelector=SimpleSelectorForNegation) | (name=Identifier params+=CssTok*))

+	 */

+	protected void sequence_PseudoClassFunction(EObject context, PseudoClassFunction semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * name=Identifier

+	 */

+	protected void sequence_PseudoClassName(EObject context, PseudoClassName semanticObject) {

+		if (errorAcceptor != null) {

+			if (transientValues.isValueTransient(semanticObject, CSSPackage.Literals.PSEUDO_CLASS_NAME__NAME) == ValueTransient.YES) {

+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CSSPackage.Literals.PSEUDO_CLASS_NAME__NAME));

+			}

+		}

+		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);

+		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);

+		feeder.accept(grammarAccess.getPseudoClassNameAccess().getNameIdentifierParserRuleCall_0(), semanticObject.getName());

+		feeder.finish();

+	}

+

+

+	/**

+	 * Constraint:

+	 * (((element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelectorForNegation*) | subSelectors+=SubSelectorForNegation+)

+	 */

+	protected void sequence_SimpleSelectorForNegation(EObject context, SimpleSelectorForNegation semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * value=CSSSTRING

+	 */

+	protected void sequence_StringTok(EObject context, StringTok semanticObject) {

+		if (errorAcceptor != null) {

+			if (transientValues.isValueTransient(semanticObject, CSSPackage.Literals.STRING_TOK__VALUE) == ValueTransient.YES) {

+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CSSPackage.Literals.STRING_TOK__VALUE));

+			}

+		}

+		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);

+		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);

+		feeder.accept(grammarAccess.getStringTokAccess().getValueCSSSTRINGTerminalRuleCall_1_0(), semanticObject.getValue());

+		feeder.finish();

+	}

+

+

+	/**

+	 * Constraint:

+	 * (symbol=COMMA | symbol=PERCENT)

+	 */

+	protected void sequence_SymbolTok(EObject context, SymbolTok semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * url=ValidURL

+	 */

+	protected void sequence_URLType(EObject context, URLType semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * (url=ValidURL mediaList=media_list?)

+	 */

+	protected void sequence_URLType_importExpression(EObject context, URLType semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * (namespace=css_namespace_prefix?)

+	 */

+	protected void sequence_UniversalSelector(EObject context, UniversalSelector semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * url=URLType

+	 */

+	protected void sequence_UrlTok(EObject context, UrlTok semanticObject) {

+		if (errorAcceptor != null) {

+			if (transientValues.isValueTransient(semanticObject, CSSPackage.Literals.URL_TOK__URL) == ValueTransient.YES) {

+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CSSPackage.Literals.URL_TOK__URL));

+			}

+		}

+		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);

+		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);

+		feeder.accept(grammarAccess.getUrlTokAccess().getUrlURLTypeParserRuleCall_1_0(), semanticObject.getUrl());

+		feeder.finish();

+	}

+

+

+	/**

+	 * Constraint:

+	 * {WSTok}

+	 */

+	protected void sequence_WSTok(EObject context, WSTok semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * charset=CSSSTRING

+	 */

+	protected void sequence_charset(EObject context, charset semanticObject) {

+		if (errorAcceptor != null) {

+			if (transientValues.isValueTransient(semanticObject, CSSPackage.Literals.CHARSET__CHARSET) == ValueTransient.YES) {

+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CSSPackage.Literals.CHARSET__CHARSET));

+			}

+		}

+		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);

+		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);

+		feeder.accept(grammarAccess.getCharsetAccess().getCharsetCSSSTRINGTerminalRuleCall_1_0(), semanticObject.getCharset());

+		feeder.finish();

+	}

+

+

+	/**

+	 * Constraint:

+	 * (property=css_property valueTokens+=CssTok+ important?=IMPORTANT_SYM?)

+	 */

+	protected void sequence_css_declaration(EObject context, css_declaration semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * name=ValidPropertyIdent

+	 */

+	protected void sequence_css_property(EObject context, css_property semanticObject) {

+		if (errorAcceptor != null) {

+			if (transientValues.isValueTransient(semanticObject, CSSPackage.Literals.CSS_PROPERTY__NAME) == ValueTransient.YES) {

+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CSSPackage.Literals.CSS_PROPERTY__NAME));

+			}

+		}

+		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);

+		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);

+		feeder.accept(grammarAccess.getCss_propertyAccess().getNameValidPropertyIdentParserRuleCall_1_0(), semanticObject.getName());

+		feeder.finish();

+	}

+

+

+	/**

+	 * Constraint:

+	 * (declarations+=css_declaration? declarations+=css_declaration*)

+	 */

+	protected void sequence_font_face(EObject context, font_face semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * value=CSSSTRING

+	 */

+	protected void sequence_importExpression(EObject context, importExpression semanticObject) {

+		if (errorAcceptor != null) {

+			if (transientValues.isValueTransient(semanticObject, CSSPackage.Literals.IMPORT_EXPRESSION__VALUE) == ValueTransient.YES) {

+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CSSPackage.Literals.IMPORT_EXPRESSION__VALUE));

+			}

+		}

+		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);

+		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);

+		feeder.accept(grammarAccess.getImportExpressionAccess().getValueCSSSTRINGTerminalRuleCall_1_0_0(), semanticObject.getValue());

+		feeder.finish();

+	}

+

+

+	/**

+	 * Constraint:

+	 * ((type=Identifier | percentage=Num) declarations+=css_declaration? declarations+=css_declaration*)

+	 */

+	protected void sequence_keyframe_selector(EObject context, keyframe_selector semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * (name=Identifier keyframeselectors+=keyframe_selector? keyframeselectors+=keyframe_selector*)

+	 */

+	protected void sequence_keyframes(EObject context, font_face semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * (medialist=media_list rulesets+=ruleset*)

+	 */

+	protected void sequence_media(EObject context, media semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * (pseudoPage=pseudo_page? declarations+=css_declaration? declarations+=css_declaration*)

+	 */

+	protected void sequence_page(EObject context, page semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * (selectors+=selector selectors+=selector* (declarations+=css_declaration declarations+=css_declaration*)?)

+	 */

+	protected void sequence_ruleset(EObject context, ruleset semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * (simpleselectors+=simple_selector ((combinator=combinator selector=selector) | (combinator=combinator? selector=selector))?)

+	 */

+	protected void sequence_selector(EObject context, selector semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * (((element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelector*) | subSelectors+=SubSelector+)

+	 */

+	protected void sequence_simple_selector(EObject context, simple_selector semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+

+

+	/**

+	 * Constraint:

+	 * (charset=charset? imports+=importExpression* (ruleset+=ruleset | media+=media | page+=page | font_face+=font_face | keyframes+=keyframes)*)

+	 */

+	protected void sequence_stylesheet(EObject context, stylesheet semanticObject) {

+		genericSequencer.createSequence(context, semanticObject);

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/serializer/CSSSyntacticSequencer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/serializer/CSSSyntacticSequencer.java
new file mode 100644
index 00000000000..835a863664f
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/serializer/CSSSyntacticSequencer.java
@@ -0,0 +1,508 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.serializer;

+

+import com.google.inject.Inject;

+import java.util.List;

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

+import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;

+import org.eclipse.xtext.IGrammarAccess;

+import org.eclipse.xtext.RuleCall;

+import org.eclipse.xtext.nodemodel.INode;

+import org.eclipse.xtext.serializer.analysis.GrammarAlias.AbstractElementAlias;

+import org.eclipse.xtext.serializer.analysis.GrammarAlias.AlternativeAlias;

+import org.eclipse.xtext.serializer.analysis.GrammarAlias.TokenAlias;

+import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynNavigable;

+import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition;

+import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;

+

+@SuppressWarnings("all")

+public class CSSSyntacticSequencer extends AbstractSyntacticSequencer {

+

+	protected CSSGrammarAccess grammarAccess;

+	protected AbstractElementAlias match_PseudoClass_COLONTerminalRuleCall_1_q;

+	protected AbstractElementAlias match_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0;

+	protected AbstractElementAlias match_css_declaration_WSTerminalRuleCall_0_a;

+	protected AbstractElementAlias match_css_declaration_WSTerminalRuleCall_2_a;

+	protected AbstractElementAlias match_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0;

+	protected AbstractElementAlias match_font_face_SemicolonKeyword_4_0_a;

+	protected AbstractElementAlias match_font_face_SemicolonKeyword_4_0_p;

+	protected AbstractElementAlias match_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0;

+	protected AbstractElementAlias match_keyframe_selector_SemicolonKeyword_3_0_a;

+	protected AbstractElementAlias match_keyframe_selector_SemicolonKeyword_3_0_p;

+	protected AbstractElementAlias match_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0;

+	protected AbstractElementAlias match_keyframes_SemicolonKeyword_5_0_a;

+	protected AbstractElementAlias match_keyframes_SemicolonKeyword_5_0_p;

+	protected AbstractElementAlias match_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0;

+	protected AbstractElementAlias match_page_PAGEKeyword_1_1_or_PageKeyword_1_0;

+	protected AbstractElementAlias match_page_SemicolonKeyword_5_0_a;

+	protected AbstractElementAlias match_page_SemicolonKeyword_5_0_p;

+	protected AbstractElementAlias match_ruleset_SemicolonKeyword_4_2_q;

+	protected AbstractElementAlias match_ruleset_WSTerminalRuleCall_1_0_a;

+	protected AbstractElementAlias match_ruleset_WSTerminalRuleCall_2_a;

+	protected AbstractElementAlias match_selector_WSTerminalRuleCall_1_0_1_a;

+	protected AbstractElementAlias match_selector_WSTerminalRuleCall_1_1_0_p;

+	protected AbstractElementAlias match_selector_WSTerminalRuleCall_1_1_1_1_a;

+

+	@Inject

+	protected void init(IGrammarAccess access) {

+		grammarAccess = (CSSGrammarAccess) access;

+		match_PseudoClass_COLONTerminalRuleCall_1_q = new TokenAlias(false, true, grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_1());

+		match_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getCharsetAccess().getCHARSETKeyword_0_1()), new TokenAlias(false, false, grammarAccess.getCharsetAccess()

+				.getCharsetKeyword_0_0()));

+		match_css_declaration_WSTerminalRuleCall_0_a = new TokenAlias(true, true, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_0());

+		match_css_declaration_WSTerminalRuleCall_2_a = new TokenAlias(true, true, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_2());

+		match_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getFont_faceAccess().getFONTFACEKeyword_1_1()), new TokenAlias(false, false, grammarAccess.getFont_faceAccess()

+				.getFontFaceKeyword_1_0()));

+		match_font_face_SemicolonKeyword_4_0_a = new TokenAlias(true, true, grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0());

+		match_font_face_SemicolonKeyword_4_0_p = new TokenAlias(true, false, grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0());

+		match_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getImportExpressionAccess().getIMPORTKeyword_0_1()), new TokenAlias(false, false, grammarAccess

+				.getImportExpressionAccess().getImportKeyword_0_0()));

+		match_keyframe_selector_SemicolonKeyword_3_0_a = new TokenAlias(true, true, grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0());

+		match_keyframe_selector_SemicolonKeyword_3_0_p = new TokenAlias(true, false, grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0());

+		match_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getKeyframesAccess().getKEYFRAMESKeyword_1_1()), new TokenAlias(false, false, grammarAccess

+				.getKeyframesAccess().getKeyframesKeyword_1_0()));

+		match_keyframes_SemicolonKeyword_5_0_a = new TokenAlias(true, true, grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0());

+		match_keyframes_SemicolonKeyword_5_0_p = new TokenAlias(true, false, grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0());

+		match_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getMediaAccess().getMEDIAKeyword_0_1()),

+				new TokenAlias(false, false, grammarAccess.getMediaAccess().getMediaKeyword_0_0()));

+		match_page_PAGEKeyword_1_1_or_PageKeyword_1_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getPageAccess().getPAGEKeyword_1_1()), new TokenAlias(false, false, grammarAccess.getPageAccess().getPageKeyword_1_0()));

+		match_page_SemicolonKeyword_5_0_a = new TokenAlias(true, true, grammarAccess.getPageAccess().getSemicolonKeyword_5_0());

+		match_page_SemicolonKeyword_5_0_p = new TokenAlias(true, false, grammarAccess.getPageAccess().getSemicolonKeyword_5_0());

+		match_ruleset_SemicolonKeyword_4_2_q = new TokenAlias(false, true, grammarAccess.getRulesetAccess().getSemicolonKeyword_4_2());

+		match_ruleset_WSTerminalRuleCall_1_0_a = new TokenAlias(true, true, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_0());

+		match_ruleset_WSTerminalRuleCall_2_a = new TokenAlias(true, true, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_2());

+		match_selector_WSTerminalRuleCall_1_0_1_a = new TokenAlias(true, true, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_0_1());

+		match_selector_WSTerminalRuleCall_1_1_0_p = new TokenAlias(true, false, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0());

+		match_selector_WSTerminalRuleCall_1_1_1_1_a = new TokenAlias(true, true, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_1_1());

+	}

+

+	@Override

+	protected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {

+		if (ruleCall.getRule() == grammarAccess.getCOLONRule()) {

+			return getCOLONToken(semanticObject, ruleCall, node);

+		} else if (ruleCall.getRule() == grammarAccess.getCOMMARule()) {

+			return getCOMMAToken(semanticObject, ruleCall, node);

+		} else if (ruleCall.getRule() == grammarAccess.getHASHMARKRule()) {

+			return getHASHMARKToken(semanticObject, ruleCall, node);

+		} else if (ruleCall.getRule() == grammarAccess.getIMPORTANT_SYMRule()) {

+			return getIMPORTANT_SYMToken(semanticObject, ruleCall, node);

+		} else if (ruleCall.getRule() == grammarAccess.getNotFunctionCallRule()) {

+			return getNotFunctionCallToken(semanticObject, ruleCall, node);

+		} else if (ruleCall.getRule() == grammarAccess.getPERCENTRule()) {

+			return getPERCENTToken(semanticObject, ruleCall, node);

+		} else if (ruleCall.getRule() == grammarAccess.getWSRule()) {

+			return getWSToken(semanticObject, ruleCall, node);

+		}

+		return "";

+	}

+

+	/**

+	 * terminal COLON: ':';

+	 */

+	protected String getCOLONToken(EObject semanticObject, RuleCall ruleCall, INode node) {

+		if (node != null) {

+			return getTokenText(node);

+		}

+		return ":";

+	}

+

+	/**

+	 * terminal COMMA: ',';

+	 */

+	protected String getCOMMAToken(EObject semanticObject, RuleCall ruleCall, INode node) {

+		if (node != null) {

+			return getTokenText(node);

+		}

+		return ",";

+	}

+

+	/**

+	 * terminal HASHMARK: '#';

+	 */

+	protected String getHASHMARKToken(EObject semanticObject, RuleCall ruleCall, INode node) {

+		if (node != null) {

+			return getTokenText(node);

+		}

+		return "#";

+	}

+

+	/**

+	 * terminal IMPORTANT_SYM:

+	 * '!important'

+	 * ;

+	 */

+	protected String getIMPORTANT_SYMToken(EObject semanticObject, RuleCall ruleCall, INode node) {

+		if (node != null) {

+			return getTokenText(node);

+		}

+		return "!important";

+	}

+

+	/**

+	 * NotFunctionCall hidden():

+	 * COLON 'not('

+	 * ;

+	 */

+	protected String getNotFunctionCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {

+		if (node != null) {

+			return getTokenText(node);

+		}

+		return ":not(";

+	}

+

+	/**

+	 * terminal PERCENT: '%';

+	 */

+	protected String getPERCENTToken(EObject semanticObject, RuleCall ruleCall, INode node) {

+		if (node != null) {

+			return getTokenText(node);

+		}

+		return "%";

+	}

+

+	/**

+	 * terminal WS : (' '|'\t'|'\r'|'\n')+;

+	 */

+	protected String getWSToken(EObject semanticObject, RuleCall ruleCall, INode node) {

+		if (node != null) {

+			return getTokenText(node);

+		}

+		return " ";

+	}

+

+	@Override

+	protected void emitUnassignedTokens(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {

+		if (transition.getAmbiguousSyntaxes().isEmpty()) {

+			return;

+		}

+		List<INode> transitionNodes = collectNodes(fromNode, toNode);

+		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {

+			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);

+			if (match_PseudoClass_COLONTerminalRuleCall_1_q.equals(syntax)) {

+				emit_PseudoClass_COLONTerminalRuleCall_1_q(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0.equals(syntax)) {

+				emit_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_css_declaration_WSTerminalRuleCall_0_a.equals(syntax)) {

+				emit_css_declaration_WSTerminalRuleCall_0_a(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_css_declaration_WSTerminalRuleCall_2_a.equals(syntax)) {

+				emit_css_declaration_WSTerminalRuleCall_2_a(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0.equals(syntax)) {

+				emit_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_font_face_SemicolonKeyword_4_0_a.equals(syntax)) {

+				emit_font_face_SemicolonKeyword_4_0_a(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_font_face_SemicolonKeyword_4_0_p.equals(syntax)) {

+				emit_font_face_SemicolonKeyword_4_0_p(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0.equals(syntax)) {

+				emit_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_keyframe_selector_SemicolonKeyword_3_0_a.equals(syntax)) {

+				emit_keyframe_selector_SemicolonKeyword_3_0_a(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_keyframe_selector_SemicolonKeyword_3_0_p.equals(syntax)) {

+				emit_keyframe_selector_SemicolonKeyword_3_0_p(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0.equals(syntax)) {

+				emit_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_keyframes_SemicolonKeyword_5_0_a.equals(syntax)) {

+				emit_keyframes_SemicolonKeyword_5_0_a(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_keyframes_SemicolonKeyword_5_0_p.equals(syntax)) {

+				emit_keyframes_SemicolonKeyword_5_0_p(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0.equals(syntax)) {

+				emit_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_page_PAGEKeyword_1_1_or_PageKeyword_1_0.equals(syntax)) {

+				emit_page_PAGEKeyword_1_1_or_PageKeyword_1_0(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_page_SemicolonKeyword_5_0_a.equals(syntax)) {

+				emit_page_SemicolonKeyword_5_0_a(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_page_SemicolonKeyword_5_0_p.equals(syntax)) {

+				emit_page_SemicolonKeyword_5_0_p(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_ruleset_SemicolonKeyword_4_2_q.equals(syntax)) {

+				emit_ruleset_SemicolonKeyword_4_2_q(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_ruleset_WSTerminalRuleCall_1_0_a.equals(syntax)) {

+				emit_ruleset_WSTerminalRuleCall_1_0_a(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_ruleset_WSTerminalRuleCall_2_a.equals(syntax)) {

+				emit_ruleset_WSTerminalRuleCall_2_a(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_selector_WSTerminalRuleCall_1_0_1_a.equals(syntax)) {

+				emit_selector_WSTerminalRuleCall_1_0_1_a(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_selector_WSTerminalRuleCall_1_1_0_p.equals(syntax)) {

+				emit_selector_WSTerminalRuleCall_1_1_0_p(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else if (match_selector_WSTerminalRuleCall_1_1_1_1_a.equals(syntax)) {

+				emit_selector_WSTerminalRuleCall_1_1_1_1_a(semanticObject, getLastNavigableState(), syntaxNodes);

+			} else {

+				acceptNodes(getLastNavigableState(), syntaxNodes);

+			}

+		}

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * COLON?

+	 *

+	 * This ambiguous syntax occurs at:

+	 * (rule start) COLON (ambiguity) name=Identifier

+	 */

+	protected void emit_PseudoClass_COLONTerminalRuleCall_1_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * '@charset' | '@CHARSET'

+	 *

+	 * This ambiguous syntax occurs at:

+	 * (rule start) (ambiguity) charset=CSSSTRING

+	 */

+	protected void emit_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * WS*

+	 *

+	 * This ambiguous syntax occurs at:

+	 * (rule start) (ambiguity) property=css_property

+	 */

+	protected void emit_css_declaration_WSTerminalRuleCall_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * WS*

+	 *

+	 * This ambiguous syntax occurs at:

+	 * property=css_property (ambiguity) COLON valueTokens+=CssTok

+	 */

+	protected void emit_css_declaration_WSTerminalRuleCall_2_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * '@font-face' | '@FONT-FACE'

+	 *

+	 * This ambiguous syntax occurs at:

+	 * (rule start) (ambiguity) '{' ';'* '}' (rule start)

+	 * (rule start) (ambiguity) '{' ';'+ declarations+=css_declaration

+	 * (rule start) (ambiguity) '{' declarations+=css_declaration

+	 */

+	protected void emit_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * ';'*

+	 *

+	 * This ambiguous syntax occurs at:

+	 * (rule start) ('@font-face' | '@FONT-FACE') '{' (ambiguity) '}' (rule start)

+	 * declarations+=css_declaration (ambiguity) '}' (rule end)

+	 */

+	protected void emit_font_face_SemicolonKeyword_4_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * ';'+

+	 *

+	 * This ambiguous syntax occurs at:

+	 * (rule start) ('@font-face' | '@FONT-FACE') '{' (ambiguity) declarations+=css_declaration

+	 * declarations+=css_declaration (ambiguity) declarations+=css_declaration

+	 */

+	protected void emit_font_face_SemicolonKeyword_4_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * '@import' | '@IMPORT'

+	 *

+	 * This ambiguous syntax occurs at:

+	 * (rule start) (ambiguity) 'url(' url=ValidURL

+	 * (rule start) (ambiguity) value=CSSSTRING

+	 */

+	protected void emit_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * ';'*

+	 *

+	 * This ambiguous syntax occurs at:

+	 * declarations+=css_declaration (ambiguity) '}' (rule end)

+	 * percentage=Num PERCENT '{' (ambiguity) '}' (rule end)

+	 * type=Identifier '{' (ambiguity) '}' (rule end)

+	 */

+	protected void emit_keyframe_selector_SemicolonKeyword_3_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * ';'+

+	 *

+	 * This ambiguous syntax occurs at:

+	 * declarations+=css_declaration (ambiguity) declarations+=css_declaration

+	 * percentage=Num PERCENT '{' (ambiguity) declarations+=css_declaration

+	 * type=Identifier '{' (ambiguity) declarations+=css_declaration

+	 */

+	protected void emit_keyframe_selector_SemicolonKeyword_3_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * '@keyframes' | '@KEYFRAMES'

+	 *

+	 * This ambiguous syntax occurs at:

+	 * (rule start) (ambiguity) name=Identifier

+	 */

+	protected void emit_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * ';'*

+	 *

+	 * This ambiguous syntax occurs at:

+	 * keyframeselectors+=keyframe_selector (ambiguity) '}' (rule end)

+	 * name=Identifier '{' (ambiguity) '}' (rule end)

+	 */

+	protected void emit_keyframes_SemicolonKeyword_5_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * ';'+

+	 *

+	 * This ambiguous syntax occurs at:

+	 * keyframeselectors+=keyframe_selector (ambiguity) keyframeselectors+=keyframe_selector

+	 * name=Identifier '{' (ambiguity) keyframeselectors+=keyframe_selector

+	 */

+	protected void emit_keyframes_SemicolonKeyword_5_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * '@media' | '@MEDIA'

+	 *

+	 * This ambiguous syntax occurs at:

+	 * (rule start) (ambiguity) medialist=media_list

+	 */

+	protected void emit_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * '@page' | '@PAGE'

+	 *

+	 * This ambiguous syntax occurs at:

+	 * (rule start) (ambiguity) '{' ';'* '}' (rule start)

+	 * (rule start) (ambiguity) '{' ';'+ declarations+=css_declaration

+	 * (rule start) (ambiguity) '{' declarations+=css_declaration

+	 * (rule start) (ambiguity) pseudoPage=pseudo_page

+	 */

+	protected void emit_page_PAGEKeyword_1_1_or_PageKeyword_1_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * ';'*

+	 *

+	 * This ambiguous syntax occurs at:

+	 * (rule start) ('@page' | '@PAGE') '{' (ambiguity) '}' (rule start)

+	 * declarations+=css_declaration (ambiguity) '}' (rule end)

+	 * pseudoPage=pseudo_page '{' (ambiguity) '}' (rule end)

+	 */

+	protected void emit_page_SemicolonKeyword_5_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * ';'+

+	 *

+	 * This ambiguous syntax occurs at:

+	 * (rule start) ('@page' | '@PAGE') '{' (ambiguity) declarations+=css_declaration

+	 * declarations+=css_declaration (ambiguity) declarations+=css_declaration

+	 * pseudoPage=pseudo_page '{' (ambiguity) declarations+=css_declaration

+	 */

+	protected void emit_page_SemicolonKeyword_5_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * ';'?

+	 *

+	 * This ambiguous syntax occurs at:

+	 * declarations+=css_declaration (ambiguity) '}' (rule end)

+	 */

+	protected void emit_ruleset_SemicolonKeyword_4_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * WS*

+	 *

+	 * This ambiguous syntax occurs at:

+	 * selectors+=selector (ambiguity) COMMA selectors+=selector

+	 */

+	protected void emit_ruleset_WSTerminalRuleCall_1_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * WS*

+	 *

+	 * This ambiguous syntax occurs at:

+	 * selectors+=selector (ambiguity) '{' '}' (rule end)

+	 * selectors+=selector (ambiguity) '{' declarations+=css_declaration

+	 */

+	protected void emit_ruleset_WSTerminalRuleCall_2_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * WS*

+	 *

+	 * This ambiguous syntax occurs at:

+	 * combinator=combinator (ambiguity) selector=selector

+	 */

+	protected void emit_selector_WSTerminalRuleCall_1_0_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * WS+

+	 *

+	 * This ambiguous syntax occurs at:

+	 * simpleselectors+=simple_selector (ambiguity) combinator=combinator

+	 * simpleselectors+=simple_selector (ambiguity) selector=selector

+	 */

+	protected void emit_selector_WSTerminalRuleCall_1_1_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+	/**

+	 * Ambiguous syntax:

+	 * WS*

+	 *

+	 * This ambiguous syntax occurs at:

+	 * combinator=combinator (ambiguity) selector=selector

+	 */

+	protected void emit_selector_WSTerminalRuleCall_1_1_1_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

+		acceptNodes(transition, nodes);

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/services/CSSGrammarAccess.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/services/CSSGrammarAccess.java
new file mode 100644
index 00000000000..d69043428cf
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/services/CSSGrammarAccess.java
@@ -0,0 +1,3819 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.services;

+

+import com.google.inject.Singleton;

+import com.google.inject.Inject;

+

+import java.util.List;

+

+import org.eclipse.xtext.*;

+import org.eclipse.xtext.service.GrammarProvider;

+import org.eclipse.xtext.service.AbstractElementFinder.*;

+

+

+@Singleton

+public class CSSGrammarAccess extends AbstractGrammarElementFinder {

+

+

+	public class StylesheetElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "stylesheet");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Assignment cCharsetAssignment_0 = (Assignment) cGroup.eContents().get(0);

+		private final RuleCall cCharsetCharsetParserRuleCall_0_0 = (RuleCall) cCharsetAssignment_0.eContents().get(0);

+		private final Assignment cImportsAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final RuleCall cImportsImportExpressionParserRuleCall_1_0 = (RuleCall) cImportsAssignment_1.eContents().get(0);

+		private final Alternatives cAlternatives_2 = (Alternatives) cGroup.eContents().get(2);

+		private final Assignment cRulesetAssignment_2_0 = (Assignment) cAlternatives_2.eContents().get(0);

+		private final RuleCall cRulesetRulesetParserRuleCall_2_0_0 = (RuleCall) cRulesetAssignment_2_0.eContents().get(0);

+		private final Assignment cMediaAssignment_2_1 = (Assignment) cAlternatives_2.eContents().get(1);

+		private final RuleCall cMediaMediaParserRuleCall_2_1_0 = (RuleCall) cMediaAssignment_2_1.eContents().get(0);

+		private final Assignment cPageAssignment_2_2 = (Assignment) cAlternatives_2.eContents().get(2);

+		private final RuleCall cPagePageParserRuleCall_2_2_0 = (RuleCall) cPageAssignment_2_2.eContents().get(0);

+		private final Assignment cFont_faceAssignment_2_3 = (Assignment) cAlternatives_2.eContents().get(3);

+		private final RuleCall cFont_faceFont_faceParserRuleCall_2_3_0 = (RuleCall) cFont_faceAssignment_2_3.eContents().get(0);

+		private final Assignment cKeyframesAssignment_2_4 = (Assignment) cAlternatives_2.eContents().get(4);

+		private final RuleCall cKeyframesKeyframesParserRuleCall_2_4_0 = (RuleCall) cKeyframesAssignment_2_4.eContents().get(0);

+

+		// / *

+		// * TODOS:

+		// * - add more CSS grammar like import

+		// * / stylesheet:

+		// charset=charset? imports+=importExpression* (ruleset+=ruleset | media+=media | page+=page | font_face+=font_face |

+		// keyframes+=keyframes)*;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// charset=charset? imports+=importExpression* (ruleset+=ruleset | media+=media | page+=page | font_face+=font_face |

+		// keyframes+=keyframes)*

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// charset=charset?

+		public Assignment getCharsetAssignment_0() {

+			return cCharsetAssignment_0;

+		}

+

+		// charset

+		public RuleCall getCharsetCharsetParserRuleCall_0_0() {

+			return cCharsetCharsetParserRuleCall_0_0;

+		}

+

+		// imports+=importExpression*

+		public Assignment getImportsAssignment_1() {

+			return cImportsAssignment_1;

+		}

+

+		// importExpression

+		public RuleCall getImportsImportExpressionParserRuleCall_1_0() {

+			return cImportsImportExpressionParserRuleCall_1_0;

+		}

+

+		// (ruleset+=ruleset | media+=media | page+=page | font_face+=font_face | keyframes+=keyframes)*

+		public Alternatives getAlternatives_2() {

+			return cAlternatives_2;

+		}

+

+		// ruleset+=ruleset

+		public Assignment getRulesetAssignment_2_0() {

+			return cRulesetAssignment_2_0;

+		}

+

+		// ruleset

+		public RuleCall getRulesetRulesetParserRuleCall_2_0_0() {

+			return cRulesetRulesetParserRuleCall_2_0_0;

+		}

+

+		// media+=media

+		public Assignment getMediaAssignment_2_1() {

+			return cMediaAssignment_2_1;

+		}

+

+		// media

+		public RuleCall getMediaMediaParserRuleCall_2_1_0() {

+			return cMediaMediaParserRuleCall_2_1_0;

+		}

+

+		// page+=page

+		public Assignment getPageAssignment_2_2() {

+			return cPageAssignment_2_2;

+		}

+

+		// page

+		public RuleCall getPagePageParserRuleCall_2_2_0() {

+			return cPagePageParserRuleCall_2_2_0;

+		}

+

+		// font_face+=font_face

+		public Assignment getFont_faceAssignment_2_3() {

+			return cFont_faceAssignment_2_3;

+		}

+

+		// font_face

+		public RuleCall getFont_faceFont_faceParserRuleCall_2_3_0() {

+			return cFont_faceFont_faceParserRuleCall_2_3_0;

+		}

+

+		// keyframes+=keyframes

+		public Assignment getKeyframesAssignment_2_4() {

+			return cKeyframesAssignment_2_4;

+		}

+

+		// keyframes

+		public RuleCall getKeyframesKeyframesParserRuleCall_2_4_0() {

+			return cKeyframesKeyframesParserRuleCall_2_4_0;

+		}

+	}

+

+	public class CharsetElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "charset");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Alternatives cAlternatives_0 = (Alternatives) cGroup.eContents().get(0);

+		private final Keyword cCharsetKeyword_0_0 = (Keyword) cAlternatives_0.eContents().get(0);

+		private final Keyword cCHARSETKeyword_0_1 = (Keyword) cAlternatives_0.eContents().get(1);

+		private final Assignment cCharsetAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final RuleCall cCharsetCSSSTRINGTerminalRuleCall_1_0 = (RuleCall) cCharsetAssignment_1.eContents().get(0);

+		private final Keyword cSemicolonKeyword_2 = (Keyword) cGroup.eContents().get(2);

+

+		// charset:

+		// ("@charset" | "@CHARSET") charset=CSSSTRING ";";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// ("@charset" | "@CHARSET") charset=CSSSTRING ";"

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// "@charset" | "@CHARSET"

+		public Alternatives getAlternatives_0() {

+			return cAlternatives_0;

+		}

+

+		// "@charset"

+		public Keyword getCharsetKeyword_0_0() {

+			return cCharsetKeyword_0_0;

+		}

+

+		// "@CHARSET"

+		public Keyword getCHARSETKeyword_0_1() {

+			return cCHARSETKeyword_0_1;

+		}

+

+		// charset=CSSSTRING

+		public Assignment getCharsetAssignment_1() {

+			return cCharsetAssignment_1;

+		}

+

+		// CSSSTRING

+		public RuleCall getCharsetCSSSTRINGTerminalRuleCall_1_0() {

+			return cCharsetCSSSTRINGTerminalRuleCall_1_0;

+		}

+

+		// ";"

+		public Keyword getSemicolonKeyword_2() {

+			return cSemicolonKeyword_2;

+		}

+	}

+

+	public class ImportExpressionElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "importExpression");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Alternatives cAlternatives_0 = (Alternatives) cGroup.eContents().get(0);

+		private final Keyword cImportKeyword_0_0 = (Keyword) cAlternatives_0.eContents().get(0);

+		private final Keyword cIMPORTKeyword_0_1 = (Keyword) cAlternatives_0.eContents().get(1);

+		private final Alternatives cAlternatives_1 = (Alternatives) cGroup.eContents().get(1);

+		private final Assignment cValueAssignment_1_0 = (Assignment) cAlternatives_1.eContents().get(0);

+		private final RuleCall cValueCSSSTRINGTerminalRuleCall_1_0_0 = (RuleCall) cValueAssignment_1_0.eContents().get(0);

+		private final Group cGroup_1_1 = (Group) cAlternatives_1.eContents().get(1);

+		private final RuleCall cURLTypeParserRuleCall_1_1_0 = (RuleCall) cGroup_1_1.eContents().get(0);

+		private final Assignment cMediaListAssignment_1_1_1 = (Assignment) cGroup_1_1.eContents().get(1);

+		private final RuleCall cMediaListMedia_listParserRuleCall_1_1_1_0 = (RuleCall) cMediaListAssignment_1_1_1.eContents().get(0);

+		private final Keyword cSemicolonKeyword_2 = (Keyword) cGroup.eContents().get(2);

+

+		// importExpression:

+		// ("@import" | "@IMPORT") (value=CSSSTRING | URLType mediaList=media_list?) ";";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// ("@import" | "@IMPORT") (value=CSSSTRING | URLType mediaList=media_list?) ";"

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// "@import" | "@IMPORT"

+		public Alternatives getAlternatives_0() {

+			return cAlternatives_0;

+		}

+

+		// "@import"

+		public Keyword getImportKeyword_0_0() {

+			return cImportKeyword_0_0;

+		}

+

+		// "@IMPORT"

+		public Keyword getIMPORTKeyword_0_1() {

+			return cIMPORTKeyword_0_1;

+		}

+

+		// value=CSSSTRING | URLType mediaList=media_list?

+		public Alternatives getAlternatives_1() {

+			return cAlternatives_1;

+		}

+

+		// value=CSSSTRING

+		public Assignment getValueAssignment_1_0() {

+			return cValueAssignment_1_0;

+		}

+

+		// CSSSTRING

+		public RuleCall getValueCSSSTRINGTerminalRuleCall_1_0_0() {

+			return cValueCSSSTRINGTerminalRuleCall_1_0_0;

+		}

+

+		// URLType mediaList=media_list?

+		public Group getGroup_1_1() {

+			return cGroup_1_1;

+		}

+

+		// URLType

+		public RuleCall getURLTypeParserRuleCall_1_1_0() {

+			return cURLTypeParserRuleCall_1_1_0;

+		}

+

+		// mediaList=media_list?

+		public Assignment getMediaListAssignment_1_1_1() {

+			return cMediaListAssignment_1_1_1;

+		}

+

+		// media_list

+		public RuleCall getMediaListMedia_listParserRuleCall_1_1_1_0() {

+			return cMediaListMedia_listParserRuleCall_1_1_1_0;

+		}

+

+		// ";"

+		public Keyword getSemicolonKeyword_2() {

+			return cSemicolonKeyword_2;

+		}

+	}

+

+	public class PageElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "page");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cPageAction_0 = (Action) cGroup.eContents().get(0);

+		private final Alternatives cAlternatives_1 = (Alternatives) cGroup.eContents().get(1);

+		private final Keyword cPageKeyword_1_0 = (Keyword) cAlternatives_1.eContents().get(0);

+		private final Keyword cPAGEKeyword_1_1 = (Keyword) cAlternatives_1.eContents().get(1);

+		private final Assignment cPseudoPageAssignment_2 = (Assignment) cGroup.eContents().get(2);

+		private final RuleCall cPseudoPagePseudo_pageParserRuleCall_2_0 = (RuleCall) cPseudoPageAssignment_2.eContents().get(0);

+		private final Keyword cLeftCurlyBracketKeyword_3 = (Keyword) cGroup.eContents().get(3);

+		private final Assignment cDeclarationsAssignment_4 = (Assignment) cGroup.eContents().get(4);

+		private final RuleCall cDeclarationsCss_declarationParserRuleCall_4_0 = (RuleCall) cDeclarationsAssignment_4.eContents().get(0);

+		private final Group cGroup_5 = (Group) cGroup.eContents().get(5);

+		private final Keyword cSemicolonKeyword_5_0 = (Keyword) cGroup_5.eContents().get(0);

+		private final Assignment cDeclarationsAssignment_5_1 = (Assignment) cGroup_5.eContents().get(1);

+		private final RuleCall cDeclarationsCss_declarationParserRuleCall_5_1_0 = (RuleCall) cDeclarationsAssignment_5_1.eContents().get(0);

+		private final Keyword cRightCurlyBracketKeyword_6 = (Keyword) cGroup.eContents().get(6);

+

+		// page:

+		// {page} ("@page" | "@PAGE") pseudoPage=pseudo_page? "{" declarations+=css_declaration? (";"

+		// declarations+=css_declaration?)* "}";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {page} ("@page" | "@PAGE") pseudoPage=pseudo_page? "{" declarations+=css_declaration? (";"

+		// declarations+=css_declaration?)* "}"

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {page}

+		public Action getPageAction_0() {

+			return cPageAction_0;

+		}

+

+		// "@page" | "@PAGE"

+		public Alternatives getAlternatives_1() {

+			return cAlternatives_1;

+		}

+

+		// "@page"

+		public Keyword getPageKeyword_1_0() {

+			return cPageKeyword_1_0;

+		}

+

+		// "@PAGE"

+		public Keyword getPAGEKeyword_1_1() {

+			return cPAGEKeyword_1_1;

+		}

+

+		// pseudoPage=pseudo_page?

+		public Assignment getPseudoPageAssignment_2() {

+			return cPseudoPageAssignment_2;

+		}

+

+		// pseudo_page

+		public RuleCall getPseudoPagePseudo_pageParserRuleCall_2_0() {

+			return cPseudoPagePseudo_pageParserRuleCall_2_0;

+		}

+

+		// "{"

+		public Keyword getLeftCurlyBracketKeyword_3() {

+			return cLeftCurlyBracketKeyword_3;

+		}

+

+		// declarations+=css_declaration?

+		public Assignment getDeclarationsAssignment_4() {

+			return cDeclarationsAssignment_4;

+		}

+

+		// css_declaration

+		public RuleCall getDeclarationsCss_declarationParserRuleCall_4_0() {

+			return cDeclarationsCss_declarationParserRuleCall_4_0;

+		}

+

+		// (";" declarations+=css_declaration?)*

+		public Group getGroup_5() {

+			return cGroup_5;

+		}

+

+		// ";"

+		public Keyword getSemicolonKeyword_5_0() {

+			return cSemicolonKeyword_5_0;

+		}

+

+		// declarations+=css_declaration?

+		public Assignment getDeclarationsAssignment_5_1() {

+			return cDeclarationsAssignment_5_1;

+		}

+

+		// css_declaration

+		public RuleCall getDeclarationsCss_declarationParserRuleCall_5_1_0() {

+			return cDeclarationsCss_declarationParserRuleCall_5_1_0;

+		}

+

+		// "}"

+		public Keyword getRightCurlyBracketKeyword_6() {

+			return cRightCurlyBracketKeyword_6;

+		}

+	}

+

+	public class Pseudo_pageElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "pseudo_page");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final RuleCall cCOLONTerminalRuleCall_0 = (RuleCall) cGroup.eContents().get(0);

+		private final RuleCall cIdentifierParserRuleCall_1 = (RuleCall) cGroup.eContents().get(1);

+

+		// pseudo_page:

+		// COLON Identifier;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// COLON Identifier

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// COLON

+		public RuleCall getCOLONTerminalRuleCall_0() {

+			return cCOLONTerminalRuleCall_0;

+		}

+

+		// Identifier

+		public RuleCall getIdentifierParserRuleCall_1() {

+			return cIdentifierParserRuleCall_1;

+		}

+	}

+

+	public class MediaElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "media");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Alternatives cAlternatives_0 = (Alternatives) cGroup.eContents().get(0);

+		private final Keyword cMediaKeyword_0_0 = (Keyword) cAlternatives_0.eContents().get(0);

+		private final Keyword cMEDIAKeyword_0_1 = (Keyword) cAlternatives_0.eContents().get(1);

+		private final Assignment cMedialistAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final RuleCall cMedialistMedia_listParserRuleCall_1_0 = (RuleCall) cMedialistAssignment_1.eContents().get(0);

+		private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword) cGroup.eContents().get(2);

+		private final Assignment cRulesetsAssignment_3 = (Assignment) cGroup.eContents().get(3);

+		private final RuleCall cRulesetsRulesetParserRuleCall_3_0 = (RuleCall) cRulesetsAssignment_3.eContents().get(0);

+		private final Keyword cRightCurlyBracketKeyword_4 = (Keyword) cGroup.eContents().get(4);

+

+		// media:

+		// ("@media" | "@MEDIA") medialist=media_list "{" rulesets+=ruleset* "}";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// ("@media" | "@MEDIA") medialist=media_list "{" rulesets+=ruleset* "}"

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// "@media" | "@MEDIA"

+		public Alternatives getAlternatives_0() {

+			return cAlternatives_0;

+		}

+

+		// "@media"

+		public Keyword getMediaKeyword_0_0() {

+			return cMediaKeyword_0_0;

+		}

+

+		// "@MEDIA"

+		public Keyword getMEDIAKeyword_0_1() {

+			return cMEDIAKeyword_0_1;

+		}

+

+		// medialist=media_list

+		public Assignment getMedialistAssignment_1() {

+			return cMedialistAssignment_1;

+		}

+

+		// media_list

+		public RuleCall getMedialistMedia_listParserRuleCall_1_0() {

+			return cMedialistMedia_listParserRuleCall_1_0;

+		}

+

+		// "{"

+		public Keyword getLeftCurlyBracketKeyword_2() {

+			return cLeftCurlyBracketKeyword_2;

+		}

+

+		// rulesets+=ruleset*

+		public Assignment getRulesetsAssignment_3() {

+			return cRulesetsAssignment_3;

+		}

+

+		// ruleset

+		public RuleCall getRulesetsRulesetParserRuleCall_3_0() {

+			return cRulesetsRulesetParserRuleCall_3_0;

+		}

+

+		// "}"

+		public Keyword getRightCurlyBracketKeyword_4() {

+			return cRightCurlyBracketKeyword_4;

+		}

+	}

+

+	public class Media_listElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "media_list");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final RuleCall cMediumParserRuleCall_0 = (RuleCall) cGroup.eContents().get(0);

+		private final Group cGroup_1 = (Group) cGroup.eContents().get(1);

+		private final RuleCall cCOMMATerminalRuleCall_1_0 = (RuleCall) cGroup_1.eContents().get(0);

+		private final RuleCall cMediumParserRuleCall_1_1 = (RuleCall) cGroup_1.eContents().get(1);

+

+		// media_list:

+		// medium (COMMA medium)*;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// medium (COMMA medium)*

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// medium

+		public RuleCall getMediumParserRuleCall_0() {

+			return cMediumParserRuleCall_0;

+		}

+

+		// (COMMA medium)*

+		public Group getGroup_1() {

+			return cGroup_1;

+		}

+

+		// COMMA

+		public RuleCall getCOMMATerminalRuleCall_1_0() {

+			return cCOMMATerminalRuleCall_1_0;

+		}

+

+		// medium

+		public RuleCall getMediumParserRuleCall_1_1() {

+			return cMediumParserRuleCall_1_1;

+		}

+	}

+

+	public class MediumElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "medium");

+		private final RuleCall cIdentifierParserRuleCall = (RuleCall) rule.eContents().get(1);

+

+		// medium:

+		// Identifier;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// Identifier

+		public RuleCall getIdentifierParserRuleCall() {

+			return cIdentifierParserRuleCall;

+		}

+	}

+

+	public class Font_faceElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "font_face");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cFont_faceAction_0 = (Action) cGroup.eContents().get(0);

+		private final Alternatives cAlternatives_1 = (Alternatives) cGroup.eContents().get(1);

+		private final Keyword cFontFaceKeyword_1_0 = (Keyword) cAlternatives_1.eContents().get(0);

+		private final Keyword cFONTFACEKeyword_1_1 = (Keyword) cAlternatives_1.eContents().get(1);

+		private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword) cGroup.eContents().get(2);

+		private final Assignment cDeclarationsAssignment_3 = (Assignment) cGroup.eContents().get(3);

+		private final RuleCall cDeclarationsCss_declarationParserRuleCall_3_0 = (RuleCall) cDeclarationsAssignment_3.eContents().get(0);

+		private final Group cGroup_4 = (Group) cGroup.eContents().get(4);

+		private final Keyword cSemicolonKeyword_4_0 = (Keyword) cGroup_4.eContents().get(0);

+		private final Assignment cDeclarationsAssignment_4_1 = (Assignment) cGroup_4.eContents().get(1);

+		private final RuleCall cDeclarationsCss_declarationParserRuleCall_4_1_0 = (RuleCall) cDeclarationsAssignment_4_1.eContents().get(0);

+		private final Keyword cRightCurlyBracketKeyword_5 = (Keyword) cGroup.eContents().get(5);

+

+		// font_face:

+		// {font_face} ("@font-face" | "@FONT-FACE") "{" declarations+=css_declaration? (";" declarations+=css_declaration?)*

+		// "}";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {font_face} ("@font-face" | "@FONT-FACE") "{" declarations+=css_declaration? (";" declarations+=css_declaration?)* "}"

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {font_face}

+		public Action getFont_faceAction_0() {

+			return cFont_faceAction_0;

+		}

+

+		// "@font-face" | "@FONT-FACE"

+		public Alternatives getAlternatives_1() {

+			return cAlternatives_1;

+		}

+

+		// "@font-face"

+		public Keyword getFontFaceKeyword_1_0() {

+			return cFontFaceKeyword_1_0;

+		}

+

+		// "@FONT-FACE"

+		public Keyword getFONTFACEKeyword_1_1() {

+			return cFONTFACEKeyword_1_1;

+		}

+

+		// "{"

+		public Keyword getLeftCurlyBracketKeyword_2() {

+			return cLeftCurlyBracketKeyword_2;

+		}

+

+		// declarations+=css_declaration?

+		public Assignment getDeclarationsAssignment_3() {

+			return cDeclarationsAssignment_3;

+		}

+

+		// css_declaration

+		public RuleCall getDeclarationsCss_declarationParserRuleCall_3_0() {

+			return cDeclarationsCss_declarationParserRuleCall_3_0;

+		}

+

+		// (";" declarations+=css_declaration?)*

+		public Group getGroup_4() {

+			return cGroup_4;

+		}

+

+		// ";"

+		public Keyword getSemicolonKeyword_4_0() {

+			return cSemicolonKeyword_4_0;

+		}

+

+		// declarations+=css_declaration?

+		public Assignment getDeclarationsAssignment_4_1() {

+			return cDeclarationsAssignment_4_1;

+		}

+

+		// css_declaration

+		public RuleCall getDeclarationsCss_declarationParserRuleCall_4_1_0() {

+			return cDeclarationsCss_declarationParserRuleCall_4_1_0;

+		}

+

+		// "}"

+		public Keyword getRightCurlyBracketKeyword_5() {

+			return cRightCurlyBracketKeyword_5;

+		}

+	}

+

+	public class KeyframesElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "keyframes");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cFont_faceAction_0 = (Action) cGroup.eContents().get(0);

+		private final Alternatives cAlternatives_1 = (Alternatives) cGroup.eContents().get(1);

+		private final Keyword cKeyframesKeyword_1_0 = (Keyword) cAlternatives_1.eContents().get(0);

+		private final Keyword cKEYFRAMESKeyword_1_1 = (Keyword) cAlternatives_1.eContents().get(1);

+		private final Assignment cNameAssignment_2 = (Assignment) cGroup.eContents().get(2);

+		private final RuleCall cNameIdentifierParserRuleCall_2_0 = (RuleCall) cNameAssignment_2.eContents().get(0);

+		private final Keyword cLeftCurlyBracketKeyword_3 = (Keyword) cGroup.eContents().get(3);

+		private final Assignment cKeyframeselectorsAssignment_4 = (Assignment) cGroup.eContents().get(4);

+		private final RuleCall cKeyframeselectorsKeyframe_selectorParserRuleCall_4_0 = (RuleCall) cKeyframeselectorsAssignment_4.eContents().get(0);

+		private final Group cGroup_5 = (Group) cGroup.eContents().get(5);

+		private final Keyword cSemicolonKeyword_5_0 = (Keyword) cGroup_5.eContents().get(0);

+		private final Assignment cKeyframeselectorsAssignment_5_1 = (Assignment) cGroup_5.eContents().get(1);

+		private final RuleCall cKeyframeselectorsKeyframe_selectorParserRuleCall_5_1_0 = (RuleCall) cKeyframeselectorsAssignment_5_1.eContents().get(0);

+		private final Keyword cRightCurlyBracketKeyword_6 = (Keyword) cGroup.eContents().get(6);

+

+		// keyframes:

+		// {font_face} ("@keyframes" | "@KEYFRAMES") name=Identifier "{" keyframeselectors+=keyframe_selector? (";"

+		// keyframeselectors+=keyframe_selector?)* "}";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {font_face} ("@keyframes" | "@KEYFRAMES") name=Identifier "{" keyframeselectors+=keyframe_selector? (";"

+		// keyframeselectors+=keyframe_selector?)* "}"

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {font_face}

+		public Action getFont_faceAction_0() {

+			return cFont_faceAction_0;

+		}

+

+		// "@keyframes" | "@KEYFRAMES"

+		public Alternatives getAlternatives_1() {

+			return cAlternatives_1;

+		}

+

+		// "@keyframes"

+		public Keyword getKeyframesKeyword_1_0() {

+			return cKeyframesKeyword_1_0;

+		}

+

+		// "@KEYFRAMES"

+		public Keyword getKEYFRAMESKeyword_1_1() {

+			return cKEYFRAMESKeyword_1_1;

+		}

+

+		// name=Identifier

+		public Assignment getNameAssignment_2() {

+			return cNameAssignment_2;

+		}

+

+		// Identifier

+		public RuleCall getNameIdentifierParserRuleCall_2_0() {

+			return cNameIdentifierParserRuleCall_2_0;

+		}

+

+		// "{"

+		public Keyword getLeftCurlyBracketKeyword_3() {

+			return cLeftCurlyBracketKeyword_3;

+		}

+

+		// keyframeselectors+=keyframe_selector?

+		public Assignment getKeyframeselectorsAssignment_4() {

+			return cKeyframeselectorsAssignment_4;

+		}

+

+		// keyframe_selector

+		public RuleCall getKeyframeselectorsKeyframe_selectorParserRuleCall_4_0() {

+			return cKeyframeselectorsKeyframe_selectorParserRuleCall_4_0;

+		}

+

+		// (";" keyframeselectors+=keyframe_selector?)*

+		public Group getGroup_5() {

+			return cGroup_5;

+		}

+

+		// ";"

+		public Keyword getSemicolonKeyword_5_0() {

+			return cSemicolonKeyword_5_0;

+		}

+

+		// keyframeselectors+=keyframe_selector?

+		public Assignment getKeyframeselectorsAssignment_5_1() {

+			return cKeyframeselectorsAssignment_5_1;

+		}

+

+		// keyframe_selector

+		public RuleCall getKeyframeselectorsKeyframe_selectorParserRuleCall_5_1_0() {

+			return cKeyframeselectorsKeyframe_selectorParserRuleCall_5_1_0;

+		}

+

+		// "}"

+		public Keyword getRightCurlyBracketKeyword_6() {

+			return cRightCurlyBracketKeyword_6;

+		}

+	}

+

+	public class Keyframe_selectorElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "keyframe_selector");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Alternatives cAlternatives_0 = (Alternatives) cGroup.eContents().get(0);

+		private final Assignment cTypeAssignment_0_0 = (Assignment) cAlternatives_0.eContents().get(0);

+		private final RuleCall cTypeIdentifierParserRuleCall_0_0_0 = (RuleCall) cTypeAssignment_0_0.eContents().get(0);

+		private final Group cGroup_0_1 = (Group) cAlternatives_0.eContents().get(1);

+		private final Assignment cPercentageAssignment_0_1_0 = (Assignment) cGroup_0_1.eContents().get(0);

+		private final RuleCall cPercentageNumParserRuleCall_0_1_0_0 = (RuleCall) cPercentageAssignment_0_1_0.eContents().get(0);

+		private final RuleCall cPERCENTTerminalRuleCall_0_1_1 = (RuleCall) cGroup_0_1.eContents().get(1);

+		private final Keyword cLeftCurlyBracketKeyword_1 = (Keyword) cGroup.eContents().get(1);

+		private final Assignment cDeclarationsAssignment_2 = (Assignment) cGroup.eContents().get(2);

+		private final RuleCall cDeclarationsCss_declarationParserRuleCall_2_0 = (RuleCall) cDeclarationsAssignment_2.eContents().get(0);

+		private final Group cGroup_3 = (Group) cGroup.eContents().get(3);

+		private final Keyword cSemicolonKeyword_3_0 = (Keyword) cGroup_3.eContents().get(0);

+		private final Assignment cDeclarationsAssignment_3_1 = (Assignment) cGroup_3.eContents().get(1);

+		private final RuleCall cDeclarationsCss_declarationParserRuleCall_3_1_0 = (RuleCall) cDeclarationsAssignment_3_1.eContents().get(0);

+		private final Keyword cRightCurlyBracketKeyword_4 = (Keyword) cGroup.eContents().get(4);

+

+		// keyframe_selector:

+		// (type=Identifier | percentage=Num PERCENT) "{" declarations+=css_declaration? (";" declarations+=css_declaration?)*

+		// "}";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// (type=Identifier | percentage=Num PERCENT) "{" declarations+=css_declaration? (";" declarations+=css_declaration?)* "}"

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// type=Identifier | percentage=Num PERCENT

+		public Alternatives getAlternatives_0() {

+			return cAlternatives_0;

+		}

+

+		// type=Identifier

+		public Assignment getTypeAssignment_0_0() {

+			return cTypeAssignment_0_0;

+		}

+

+		// Identifier

+		public RuleCall getTypeIdentifierParserRuleCall_0_0_0() {

+			return cTypeIdentifierParserRuleCall_0_0_0;

+		}

+

+		// percentage=Num PERCENT

+		public Group getGroup_0_1() {

+			return cGroup_0_1;

+		}

+

+		// percentage=Num

+		public Assignment getPercentageAssignment_0_1_0() {

+			return cPercentageAssignment_0_1_0;

+		}

+

+		// Num

+		public RuleCall getPercentageNumParserRuleCall_0_1_0_0() {

+			return cPercentageNumParserRuleCall_0_1_0_0;

+		}

+

+		// PERCENT

+		public RuleCall getPERCENTTerminalRuleCall_0_1_1() {

+			return cPERCENTTerminalRuleCall_0_1_1;

+		}

+

+		// "{"

+		public Keyword getLeftCurlyBracketKeyword_1() {

+			return cLeftCurlyBracketKeyword_1;

+		}

+

+		// declarations+=css_declaration?

+		public Assignment getDeclarationsAssignment_2() {

+			return cDeclarationsAssignment_2;

+		}

+

+		// css_declaration

+		public RuleCall getDeclarationsCss_declarationParserRuleCall_2_0() {

+			return cDeclarationsCss_declarationParserRuleCall_2_0;

+		}

+

+		// (";" declarations+=css_declaration?)*

+		public Group getGroup_3() {

+			return cGroup_3;

+		}

+

+		// ";"

+		public Keyword getSemicolonKeyword_3_0() {

+			return cSemicolonKeyword_3_0;

+		}

+

+		// declarations+=css_declaration?

+		public Assignment getDeclarationsAssignment_3_1() {

+			return cDeclarationsAssignment_3_1;

+		}

+

+		// css_declaration

+		public RuleCall getDeclarationsCss_declarationParserRuleCall_3_1_0() {

+			return cDeclarationsCss_declarationParserRuleCall_3_1_0;

+		}

+

+		// "}"

+		public Keyword getRightCurlyBracketKeyword_4() {

+			return cRightCurlyBracketKeyword_4;

+		}

+	}

+

+	public class RulesetElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ruleset");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Assignment cSelectorsAssignment_0 = (Assignment) cGroup.eContents().get(0);

+		private final RuleCall cSelectorsSelectorParserRuleCall_0_0 = (RuleCall) cSelectorsAssignment_0.eContents().get(0);

+		private final Group cGroup_1 = (Group) cGroup.eContents().get(1);

+		private final RuleCall cWSTerminalRuleCall_1_0 = (RuleCall) cGroup_1.eContents().get(0);

+		private final RuleCall cCOMMATerminalRuleCall_1_1 = (RuleCall) cGroup_1.eContents().get(1);

+		private final Assignment cSelectorsAssignment_1_2 = (Assignment) cGroup_1.eContents().get(2);

+		private final RuleCall cSelectorsSelectorParserRuleCall_1_2_0 = (RuleCall) cSelectorsAssignment_1_2.eContents().get(0);

+		private final RuleCall cWSTerminalRuleCall_2 = (RuleCall) cGroup.eContents().get(2);

+		private final Keyword cLeftCurlyBracketKeyword_3 = (Keyword) cGroup.eContents().get(3);

+		private final Group cGroup_4 = (Group) cGroup.eContents().get(4);

+		private final Assignment cDeclarationsAssignment_4_0 = (Assignment) cGroup_4.eContents().get(0);

+		private final RuleCall cDeclarationsCss_declarationParserRuleCall_4_0_0 = (RuleCall) cDeclarationsAssignment_4_0.eContents().get(0);

+		private final Group cGroup_4_1 = (Group) cGroup_4.eContents().get(1);

+		private final Keyword cSemicolonKeyword_4_1_0 = (Keyword) cGroup_4_1.eContents().get(0);

+		private final Assignment cDeclarationsAssignment_4_1_1 = (Assignment) cGroup_4_1.eContents().get(1);

+		private final RuleCall cDeclarationsCss_declarationParserRuleCall_4_1_1_0 = (RuleCall) cDeclarationsAssignment_4_1_1.eContents().get(0);

+		private final Keyword cSemicolonKeyword_4_2 = (Keyword) cGroup_4.eContents().get(2);

+		private final Keyword cRightCurlyBracketKeyword_5 = (Keyword) cGroup.eContents().get(5);

+

+		// ruleset:

+		// selectors+=selector (WS* COMMA selectors+=selector)* WS* "{" (declarations+=css_declaration (";"

+		// declarations+=css_declaration)* ";"?)? "}";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// selectors+=selector (WS* COMMA selectors+=selector)* WS* "{" (declarations+=css_declaration (";"

+		// declarations+=css_declaration)* ";"?)? "}"

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// selectors+=selector

+		public Assignment getSelectorsAssignment_0() {

+			return cSelectorsAssignment_0;

+		}

+

+		// selector

+		public RuleCall getSelectorsSelectorParserRuleCall_0_0() {

+			return cSelectorsSelectorParserRuleCall_0_0;

+		}

+

+		// (WS* COMMA selectors+=selector)*

+		public Group getGroup_1() {

+			return cGroup_1;

+		}

+

+		// WS*

+		public RuleCall getWSTerminalRuleCall_1_0() {

+			return cWSTerminalRuleCall_1_0;

+		}

+

+		// COMMA

+		public RuleCall getCOMMATerminalRuleCall_1_1() {

+			return cCOMMATerminalRuleCall_1_1;

+		}

+

+		// selectors+=selector

+		public Assignment getSelectorsAssignment_1_2() {

+			return cSelectorsAssignment_1_2;

+		}

+

+		// selector

+		public RuleCall getSelectorsSelectorParserRuleCall_1_2_0() {

+			return cSelectorsSelectorParserRuleCall_1_2_0;

+		}

+

+		// WS*

+		public RuleCall getWSTerminalRuleCall_2() {

+			return cWSTerminalRuleCall_2;

+		}

+

+		// "{"

+		public Keyword getLeftCurlyBracketKeyword_3() {

+			return cLeftCurlyBracketKeyword_3;

+		}

+

+		// (declarations+=css_declaration (";" declarations+=css_declaration)* ";"?)?

+		public Group getGroup_4() {

+			return cGroup_4;

+		}

+

+		// declarations+=css_declaration

+		public Assignment getDeclarationsAssignment_4_0() {

+			return cDeclarationsAssignment_4_0;

+		}

+

+		// css_declaration

+		public RuleCall getDeclarationsCss_declarationParserRuleCall_4_0_0() {

+			return cDeclarationsCss_declarationParserRuleCall_4_0_0;

+		}

+

+		// (";" declarations+=css_declaration)*

+		public Group getGroup_4_1() {

+			return cGroup_4_1;

+		}

+

+		// ";"

+		public Keyword getSemicolonKeyword_4_1_0() {

+			return cSemicolonKeyword_4_1_0;

+		}

+

+		// declarations+=css_declaration

+		public Assignment getDeclarationsAssignment_4_1_1() {

+			return cDeclarationsAssignment_4_1_1;

+		}

+

+		// css_declaration

+		public RuleCall getDeclarationsCss_declarationParserRuleCall_4_1_1_0() {

+			return cDeclarationsCss_declarationParserRuleCall_4_1_1_0;

+		}

+

+		// ";"?

+		public Keyword getSemicolonKeyword_4_2() {

+			return cSemicolonKeyword_4_2;

+		}

+

+		// "}"

+		public Keyword getRightCurlyBracketKeyword_5() {

+			return cRightCurlyBracketKeyword_5;

+		}

+	}

+

+	public class SelectorElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "selector");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Assignment cSimpleselectorsAssignment_0 = (Assignment) cGroup.eContents().get(0);

+		private final RuleCall cSimpleselectorsSimple_selectorParserRuleCall_0_0 = (RuleCall) cSimpleselectorsAssignment_0.eContents().get(0);

+		private final Alternatives cAlternatives_1 = (Alternatives) cGroup.eContents().get(1);

+		private final Group cGroup_1_0 = (Group) cAlternatives_1.eContents().get(0);

+		private final Assignment cCombinatorAssignment_1_0_0 = (Assignment) cGroup_1_0.eContents().get(0);

+		private final RuleCall cCombinatorCombinatorParserRuleCall_1_0_0_0 = (RuleCall) cCombinatorAssignment_1_0_0.eContents().get(0);

+		private final RuleCall cWSTerminalRuleCall_1_0_1 = (RuleCall) cGroup_1_0.eContents().get(1);

+		private final Assignment cSelectorAssignment_1_0_2 = (Assignment) cGroup_1_0.eContents().get(2);

+		private final RuleCall cSelectorSelectorParserRuleCall_1_0_2_0 = (RuleCall) cSelectorAssignment_1_0_2.eContents().get(0);

+		private final Group cGroup_1_1 = (Group) cAlternatives_1.eContents().get(1);

+		private final RuleCall cWSTerminalRuleCall_1_1_0 = (RuleCall) cGroup_1_1.eContents().get(0);

+		private final Group cGroup_1_1_1 = (Group) cGroup_1_1.eContents().get(1);

+		private final Assignment cCombinatorAssignment_1_1_1_0 = (Assignment) cGroup_1_1_1.eContents().get(0);

+		private final RuleCall cCombinatorCombinatorParserRuleCall_1_1_1_0_0 = (RuleCall) cCombinatorAssignment_1_1_1_0.eContents().get(0);

+		private final RuleCall cWSTerminalRuleCall_1_1_1_1 = (RuleCall) cGroup_1_1_1.eContents().get(1);

+		private final Assignment cSelectorAssignment_1_1_2 = (Assignment) cGroup_1_1.eContents().get(2);

+		private final RuleCall cSelectorSelectorParserRuleCall_1_1_2_0 = (RuleCall) cSelectorAssignment_1_1_2.eContents().get(0);

+

+		// // check simple_selctor cardinality

+		// selector hidden(ML_COMMENT):

+		// simpleselectors+=simple_selector (combinator=combinator WS* selector=selector | WS+ (combinator=combinator WS*)?

+		// selector=selector)?;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// simpleselectors+=simple_selector (combinator=combinator WS* selector=selector | WS+ (combinator=combinator WS*)?

+		// selector=selector)?

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// simpleselectors+=simple_selector

+		public Assignment getSimpleselectorsAssignment_0() {

+			return cSimpleselectorsAssignment_0;

+		}

+

+		// simple_selector

+		public RuleCall getSimpleselectorsSimple_selectorParserRuleCall_0_0() {

+			return cSimpleselectorsSimple_selectorParserRuleCall_0_0;

+		}

+

+		// (combinator=combinator WS* selector=selector | WS+ (combinator=combinator WS*)? selector=selector)?

+		public Alternatives getAlternatives_1() {

+			return cAlternatives_1;

+		}

+

+		// combinator=combinator WS* selector=selector

+		public Group getGroup_1_0() {

+			return cGroup_1_0;

+		}

+

+		// combinator=combinator

+		public Assignment getCombinatorAssignment_1_0_0() {

+			return cCombinatorAssignment_1_0_0;

+		}

+

+		// combinator

+		public RuleCall getCombinatorCombinatorParserRuleCall_1_0_0_0() {

+			return cCombinatorCombinatorParserRuleCall_1_0_0_0;

+		}

+

+		// WS*

+		public RuleCall getWSTerminalRuleCall_1_0_1() {

+			return cWSTerminalRuleCall_1_0_1;

+		}

+

+		// selector=selector

+		public Assignment getSelectorAssignment_1_0_2() {

+			return cSelectorAssignment_1_0_2;

+		}

+

+		// selector

+		public RuleCall getSelectorSelectorParserRuleCall_1_0_2_0() {

+			return cSelectorSelectorParserRuleCall_1_0_2_0;

+		}

+

+		// WS+ (combinator=combinator WS*)? selector=selector

+		public Group getGroup_1_1() {

+			return cGroup_1_1;

+		}

+

+		// WS+

+		public RuleCall getWSTerminalRuleCall_1_1_0() {

+			return cWSTerminalRuleCall_1_1_0;

+		}

+

+		// (combinator=combinator WS*)?

+		public Group getGroup_1_1_1() {

+			return cGroup_1_1_1;

+		}

+

+		// combinator=combinator

+		public Assignment getCombinatorAssignment_1_1_1_0() {

+			return cCombinatorAssignment_1_1_1_0;

+		}

+

+		// combinator

+		public RuleCall getCombinatorCombinatorParserRuleCall_1_1_1_0_0() {

+			return cCombinatorCombinatorParserRuleCall_1_1_1_0_0;

+		}

+

+		// WS*

+		public RuleCall getWSTerminalRuleCall_1_1_1_1() {

+			return cWSTerminalRuleCall_1_1_1_1;

+		}

+

+		// selector=selector

+		public Assignment getSelectorAssignment_1_1_2() {

+			return cSelectorAssignment_1_1_2;

+		}

+

+		// selector

+		public RuleCall getSelectorSelectorParserRuleCall_1_1_2_0() {

+			return cSelectorSelectorParserRuleCall_1_1_2_0;

+		}

+	}

+

+	public class SimpleSelectorForNegationElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SimpleSelectorForNegation");

+		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);

+		private final Group cGroup_0 = (Group) cAlternatives.eContents().get(0);

+		private final Alternatives cAlternatives_0_0 = (Alternatives) cGroup_0.eContents().get(0);

+		private final Assignment cElementAssignment_0_0_0 = (Assignment) cAlternatives_0_0.eContents().get(0);

+		private final RuleCall cElementElementSelectorParserRuleCall_0_0_0_0 = (RuleCall) cElementAssignment_0_0_0.eContents().get(0);

+		private final Assignment cUniversalAssignment_0_0_1 = (Assignment) cAlternatives_0_0.eContents().get(1);

+		private final RuleCall cUniversalUniversalSelectorParserRuleCall_0_0_1_0 = (RuleCall) cUniversalAssignment_0_0_1.eContents().get(0);

+		private final Assignment cSubSelectorsAssignment_0_1 = (Assignment) cGroup_0.eContents().get(1);

+		private final RuleCall cSubSelectorsSubSelectorForNegationParserRuleCall_0_1_0 = (RuleCall) cSubSelectorsAssignment_0_1.eContents().get(0);

+		private final Assignment cSubSelectorsAssignment_1 = (Assignment) cAlternatives.eContents().get(1);

+		private final RuleCall cSubSelectorsSubSelectorForNegationParserRuleCall_1_0 = (RuleCall) cSubSelectorsAssignment_1.eContents().get(0);

+

+		// SimpleSelectorForNegation:

+		// (element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelectorForNegation* | =>

+		// subSelectors+=SubSelectorForNegation+;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// (element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelectorForNegation* | =>

+		// subSelectors+=SubSelectorForNegation+

+		public Alternatives getAlternatives() {

+			return cAlternatives;

+		}

+

+		// (element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelectorForNegation*

+		public Group getGroup_0() {

+			return cGroup_0;

+		}

+

+		// element=ElementSelector | universal=UniversalSelector

+		public Alternatives getAlternatives_0_0() {

+			return cAlternatives_0_0;

+		}

+

+		// element=ElementSelector

+		public Assignment getElementAssignment_0_0_0() {

+			return cElementAssignment_0_0_0;

+		}

+

+		// ElementSelector

+		public RuleCall getElementElementSelectorParserRuleCall_0_0_0_0() {

+			return cElementElementSelectorParserRuleCall_0_0_0_0;

+		}

+

+		// universal=UniversalSelector

+		public Assignment getUniversalAssignment_0_0_1() {

+			return cUniversalAssignment_0_0_1;

+		}

+

+		// UniversalSelector

+		public RuleCall getUniversalUniversalSelectorParserRuleCall_0_0_1_0() {

+			return cUniversalUniversalSelectorParserRuleCall_0_0_1_0;

+		}

+

+		// subSelectors+=SubSelectorForNegation*

+		public Assignment getSubSelectorsAssignment_0_1() {

+			return cSubSelectorsAssignment_0_1;

+		}

+

+		// SubSelectorForNegation

+		public RuleCall getSubSelectorsSubSelectorForNegationParserRuleCall_0_1_0() {

+			return cSubSelectorsSubSelectorForNegationParserRuleCall_0_1_0;

+		}

+

+		// => subSelectors+=SubSelectorForNegation+

+		public Assignment getSubSelectorsAssignment_1() {

+			return cSubSelectorsAssignment_1;

+		}

+

+		// SubSelectorForNegation

+		public RuleCall getSubSelectorsSubSelectorForNegationParserRuleCall_1_0() {

+			return cSubSelectorsSubSelectorForNegationParserRuleCall_1_0;

+		}

+	}

+

+	public class SubSelectorForNegationElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SubSelectorForNegation");

+		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);

+		private final RuleCall cIdSelectorParserRuleCall_0 = (RuleCall) cAlternatives.eContents().get(0);

+		private final RuleCall cClassSelectorParserRuleCall_1 = (RuleCall) cAlternatives.eContents().get(1);

+		private final RuleCall cAttributeSelectorParserRuleCall_2 = (RuleCall) cAlternatives.eContents().get(2);

+		private final RuleCall cPseudoClassParserRuleCall_3 = (RuleCall) cAlternatives.eContents().get(3);

+

+		// SubSelectorForNegation returns CssSelector:

+		// IdSelector | ClassSelector | AttributeSelector | PseudoClass;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// IdSelector | ClassSelector | AttributeSelector | PseudoClass

+		public Alternatives getAlternatives() {

+			return cAlternatives;

+		}

+

+		// IdSelector

+		public RuleCall getIdSelectorParserRuleCall_0() {

+			return cIdSelectorParserRuleCall_0;

+		}

+

+		// ClassSelector

+		public RuleCall getClassSelectorParserRuleCall_1() {

+			return cClassSelectorParserRuleCall_1;

+		}

+

+		// AttributeSelector

+		public RuleCall getAttributeSelectorParserRuleCall_2() {

+			return cAttributeSelectorParserRuleCall_2;

+		}

+

+		// PseudoClass

+		public RuleCall getPseudoClassParserRuleCall_3() {

+			return cPseudoClassParserRuleCall_3;

+		}

+	}

+

+	public class Simple_selectorElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "simple_selector");

+		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);

+		private final Group cGroup_0 = (Group) cAlternatives.eContents().get(0);

+		private final Alternatives cAlternatives_0_0 = (Alternatives) cGroup_0.eContents().get(0);

+		private final Assignment cElementAssignment_0_0_0 = (Assignment) cAlternatives_0_0.eContents().get(0);

+		private final RuleCall cElementElementSelectorParserRuleCall_0_0_0_0 = (RuleCall) cElementAssignment_0_0_0.eContents().get(0);

+		private final Assignment cUniversalAssignment_0_0_1 = (Assignment) cAlternatives_0_0.eContents().get(1);

+		private final RuleCall cUniversalUniversalSelectorParserRuleCall_0_0_1_0 = (RuleCall) cUniversalAssignment_0_0_1.eContents().get(0);

+		private final Assignment cSubSelectorsAssignment_0_1 = (Assignment) cGroup_0.eContents().get(1);

+		private final RuleCall cSubSelectorsSubSelectorParserRuleCall_0_1_0 = (RuleCall) cSubSelectorsAssignment_0_1.eContents().get(0);

+		private final Assignment cSubSelectorsAssignment_1 = (Assignment) cAlternatives.eContents().get(1);

+		private final RuleCall cSubSelectorsSubSelectorParserRuleCall_1_0 = (RuleCall) cSubSelectorsAssignment_1.eContents().get(0);

+

+		// simple_selector hidden(ML_COMMENT):

+		// (element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelector* | subSelectors+=SubSelector+;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// (element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelector* | subSelectors+=SubSelector+

+		public Alternatives getAlternatives() {

+			return cAlternatives;

+		}

+

+		// (element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelector*

+		public Group getGroup_0() {

+			return cGroup_0;

+		}

+

+		// element=ElementSelector | universal=UniversalSelector

+		public Alternatives getAlternatives_0_0() {

+			return cAlternatives_0_0;

+		}

+

+		// element=ElementSelector

+		public Assignment getElementAssignment_0_0_0() {

+			return cElementAssignment_0_0_0;

+		}

+

+		// ElementSelector

+		public RuleCall getElementElementSelectorParserRuleCall_0_0_0_0() {

+			return cElementElementSelectorParserRuleCall_0_0_0_0;

+		}

+

+		// universal=UniversalSelector

+		public Assignment getUniversalAssignment_0_0_1() {

+			return cUniversalAssignment_0_0_1;

+		}

+

+		// UniversalSelector

+		public RuleCall getUniversalUniversalSelectorParserRuleCall_0_0_1_0() {

+			return cUniversalUniversalSelectorParserRuleCall_0_0_1_0;

+		}

+

+		// subSelectors+=SubSelector*

+		public Assignment getSubSelectorsAssignment_0_1() {

+			return cSubSelectorsAssignment_0_1;

+		}

+

+		// SubSelector

+		public RuleCall getSubSelectorsSubSelectorParserRuleCall_0_1_0() {

+			return cSubSelectorsSubSelectorParserRuleCall_0_1_0;

+		}

+

+		// subSelectors+=SubSelector+

+		public Assignment getSubSelectorsAssignment_1() {

+			return cSubSelectorsAssignment_1;

+		}

+

+		// SubSelector

+		public RuleCall getSubSelectorsSubSelectorParserRuleCall_1_0() {

+			return cSubSelectorsSubSelectorParserRuleCall_1_0;

+		}

+	}

+

+	public class SubSelectorElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SubSelector");

+		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);

+		private final RuleCall cIdSelectorParserRuleCall_0 = (RuleCall) cAlternatives.eContents().get(0);

+		private final RuleCall cClassSelectorParserRuleCall_1 = (RuleCall) cAlternatives.eContents().get(1);

+		private final RuleCall cAttributeSelectorParserRuleCall_2 = (RuleCall) cAlternatives.eContents().get(2);

+		private final RuleCall cPseudoClassOrFuncParserRuleCall_3 = (RuleCall) cAlternatives.eContents().get(3);

+

+		// SubSelector returns CssSelector:

+		// IdSelector | ClassSelector | AttributeSelector | PseudoClassOrFunc;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// IdSelector | ClassSelector | AttributeSelector | PseudoClassOrFunc

+		public Alternatives getAlternatives() {

+			return cAlternatives;

+		}

+

+		// IdSelector

+		public RuleCall getIdSelectorParserRuleCall_0() {

+			return cIdSelectorParserRuleCall_0;

+		}

+

+		// ClassSelector

+		public RuleCall getClassSelectorParserRuleCall_1() {

+			return cClassSelectorParserRuleCall_1;

+		}

+

+		// AttributeSelector

+		public RuleCall getAttributeSelectorParserRuleCall_2() {

+			return cAttributeSelectorParserRuleCall_2;

+		}

+

+		// PseudoClassOrFunc

+		public RuleCall getPseudoClassOrFuncParserRuleCall_3() {

+			return cPseudoClassOrFuncParserRuleCall_3;

+		}

+	}

+

+	public class AttributeSelectorElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AttributeSelector");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cAttributeSelectorAction_0 = (Action) cGroup.eContents().get(0);

+		private final Keyword cLeftSquareBracketKeyword_1 = (Keyword) cGroup.eContents().get(1);

+		private final Assignment cNameAssignment_2 = (Assignment) cGroup.eContents().get(2);

+		private final RuleCall cNameIdentifierParserRuleCall_2_0 = (RuleCall) cNameAssignment_2.eContents().get(0);

+		private final Group cGroup_3 = (Group) cGroup.eContents().get(3);

+		private final Assignment cOpAssignment_3_0 = (Assignment) cGroup_3.eContents().get(0);

+		private final Alternatives cOpAlternatives_3_0_0 = (Alternatives) cOpAssignment_3_0.eContents().get(0);

+		private final Keyword cOpCircumflexAccentEqualsSignKeyword_3_0_0_0 = (Keyword) cOpAlternatives_3_0_0.eContents().get(0);

+		private final Keyword cOpDollarSignEqualsSignKeyword_3_0_0_1 = (Keyword) cOpAlternatives_3_0_0.eContents().get(1);

+		private final Keyword cOpAsteriskEqualsSignKeyword_3_0_0_2 = (Keyword) cOpAlternatives_3_0_0.eContents().get(2);

+		private final Keyword cOpEqualsSignKeyword_3_0_0_3 = (Keyword) cOpAlternatives_3_0_0.eContents().get(3);

+		private final RuleCall cOpINCLUDESTerminalRuleCall_3_0_0_4 = (RuleCall) cOpAlternatives_3_0_0.eContents().get(4);

+		private final RuleCall cOpDASHMATCHTerminalRuleCall_3_0_0_5 = (RuleCall) cOpAlternatives_3_0_0.eContents().get(5);

+		private final Assignment cValueAssignment_3_1 = (Assignment) cGroup_3.eContents().get(1);

+		private final Alternatives cValueAlternatives_3_1_0 = (Alternatives) cValueAssignment_3_1.eContents().get(0);

+		private final RuleCall cValueIdentifierParserRuleCall_3_1_0_0 = (RuleCall) cValueAlternatives_3_1_0.eContents().get(0);

+		private final RuleCall cValueCSSSTRINGTerminalRuleCall_3_1_0_1 = (RuleCall) cValueAlternatives_3_1_0.eContents().get(1);

+		private final Keyword cRightSquareBracketKeyword_4 = (Keyword) cGroup.eContents().get(4);

+

+		// AttributeSelector returns CssSelector:

+		// {AttributeSelector} "[" name=Identifier (op=("^=" | "$=" | "*=" | "=" | INCLUDES | DASHMATCH) value=(Identifier |

+		// CSSSTRING))? "]";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {AttributeSelector} "[" name=Identifier (op=("^=" | "$=" | "*=" | "=" | INCLUDES | DASHMATCH) value=(Identifier |

+		// CSSSTRING))? "]"

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {AttributeSelector}

+		public Action getAttributeSelectorAction_0() {

+			return cAttributeSelectorAction_0;

+		}

+

+		// "["

+		public Keyword getLeftSquareBracketKeyword_1() {

+			return cLeftSquareBracketKeyword_1;

+		}

+

+		// name=Identifier

+		public Assignment getNameAssignment_2() {

+			return cNameAssignment_2;

+		}

+

+		// Identifier

+		public RuleCall getNameIdentifierParserRuleCall_2_0() {

+			return cNameIdentifierParserRuleCall_2_0;

+		}

+

+		// (op=("^=" | "$=" | "*=" | "=" | INCLUDES | DASHMATCH) value=(Identifier | CSSSTRING))?

+		public Group getGroup_3() {

+			return cGroup_3;

+		}

+

+		// op=("^=" | "$=" | "*=" | "=" | INCLUDES | DASHMATCH)

+		public Assignment getOpAssignment_3_0() {

+			return cOpAssignment_3_0;

+		}

+

+		// "^=" | "$=" | "*=" | "=" | INCLUDES | DASHMATCH

+		public Alternatives getOpAlternatives_3_0_0() {

+			return cOpAlternatives_3_0_0;

+		}

+

+		// "^="

+		public Keyword getOpCircumflexAccentEqualsSignKeyword_3_0_0_0() {

+			return cOpCircumflexAccentEqualsSignKeyword_3_0_0_0;

+		}

+

+		// "$="

+		public Keyword getOpDollarSignEqualsSignKeyword_3_0_0_1() {

+			return cOpDollarSignEqualsSignKeyword_3_0_0_1;

+		}

+

+		// "*="

+		public Keyword getOpAsteriskEqualsSignKeyword_3_0_0_2() {

+			return cOpAsteriskEqualsSignKeyword_3_0_0_2;

+		}

+

+		// "="

+		public Keyword getOpEqualsSignKeyword_3_0_0_3() {

+			return cOpEqualsSignKeyword_3_0_0_3;

+		}

+

+		// INCLUDES

+		public RuleCall getOpINCLUDESTerminalRuleCall_3_0_0_4() {

+			return cOpINCLUDESTerminalRuleCall_3_0_0_4;

+		}

+

+		// DASHMATCH

+		public RuleCall getOpDASHMATCHTerminalRuleCall_3_0_0_5() {

+			return cOpDASHMATCHTerminalRuleCall_3_0_0_5;

+		}

+

+		// value=(Identifier | CSSSTRING)

+		public Assignment getValueAssignment_3_1() {

+			return cValueAssignment_3_1;

+		}

+

+		// Identifier | CSSSTRING

+		public Alternatives getValueAlternatives_3_1_0() {

+			return cValueAlternatives_3_1_0;

+		}

+

+		// Identifier

+		public RuleCall getValueIdentifierParserRuleCall_3_1_0_0() {

+			return cValueIdentifierParserRuleCall_3_1_0_0;

+		}

+

+		// CSSSTRING

+		public RuleCall getValueCSSSTRINGTerminalRuleCall_3_1_0_1() {

+			return cValueCSSSTRINGTerminalRuleCall_3_1_0_1;

+		}

+

+		// "]"

+		public Keyword getRightSquareBracketKeyword_4() {

+			return cRightSquareBracketKeyword_4;

+		}

+	}

+

+	public class ClassSelectorElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ClassSelector");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cClassSelectorAction_0 = (Action) cGroup.eContents().get(0);

+		private final Keyword cFullStopKeyword_1 = (Keyword) cGroup.eContents().get(1);

+		private final Assignment cNameAssignment_2 = (Assignment) cGroup.eContents().get(2);

+		private final RuleCall cNameIdentifierParserRuleCall_2_0 = (RuleCall) cNameAssignment_2.eContents().get(0);

+

+		// ClassSelector:

+		// {ClassSelector} "." name=Identifier;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {ClassSelector} "." name=Identifier

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {ClassSelector}

+		public Action getClassSelectorAction_0() {

+			return cClassSelectorAction_0;

+		}

+

+		// "."

+		public Keyword getFullStopKeyword_1() {

+			return cFullStopKeyword_1;

+		}

+

+		// name=Identifier

+		public Assignment getNameAssignment_2() {

+			return cNameAssignment_2;

+		}

+

+		// Identifier

+		public RuleCall getNameIdentifierParserRuleCall_2_0() {

+			return cNameIdentifierParserRuleCall_2_0;

+		}

+	}

+

+	public class ElementSelectorElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ElementSelector");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cElementSelectorAction_0 = (Action) cGroup.eContents().get(0);

+		private final Assignment cNameAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final RuleCall cNameIdentifierParserRuleCall_1_0 = (RuleCall) cNameAssignment_1.eContents().get(0);

+

+		// ElementSelector:

+		// {ElementSelector} name=Identifier;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {ElementSelector} name=Identifier

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {ElementSelector}

+		public Action getElementSelectorAction_0() {

+			return cElementSelectorAction_0;

+		}

+

+		// name=Identifier

+		public Assignment getNameAssignment_1() {

+			return cNameAssignment_1;

+		}

+

+		// Identifier

+		public RuleCall getNameIdentifierParserRuleCall_1_0() {

+			return cNameIdentifierParserRuleCall_1_0;

+		}

+	}

+

+	public class UniversalSelectorElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UniversalSelector");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cUniversalSelectorAction_0 = (Action) cGroup.eContents().get(0);

+		private final Assignment cNamespaceAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final RuleCall cNamespaceCss_namespace_prefixParserRuleCall_1_0 = (RuleCall) cNamespaceAssignment_1.eContents().get(0);

+		private final Keyword cAsteriskKeyword_2 = (Keyword) cGroup.eContents().get(2);

+

+		// UniversalSelector:

+		// {UniversalSelector} namespace=css_namespace_prefix? "*";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {UniversalSelector} namespace=css_namespace_prefix? "*"

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {UniversalSelector}

+		public Action getUniversalSelectorAction_0() {

+			return cUniversalSelectorAction_0;

+		}

+

+		// namespace=css_namespace_prefix?

+		public Assignment getNamespaceAssignment_1() {

+			return cNamespaceAssignment_1;

+		}

+

+		// css_namespace_prefix

+		public RuleCall getNamespaceCss_namespace_prefixParserRuleCall_1_0() {

+			return cNamespaceCss_namespace_prefixParserRuleCall_1_0;

+		}

+

+		// "*"

+		public Keyword getAsteriskKeyword_2() {

+			return cAsteriskKeyword_2;

+		}

+	}

+

+	public class IdSelectorElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "IdSelector");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cIdSelectorAction_0 = (Action) cGroup.eContents().get(0);

+		private final RuleCall cHASHMARKTerminalRuleCall_1 = (RuleCall) cGroup.eContents().get(1);

+		private final Assignment cNameAssignment_2 = (Assignment) cGroup.eContents().get(2);

+		private final RuleCall cNameIdentifierParserRuleCall_2_0 = (RuleCall) cNameAssignment_2.eContents().get(0);

+

+		// IdSelector:

+		// {IdSelector} HASHMARK name=Identifier;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {IdSelector} HASHMARK name=Identifier

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {IdSelector}

+		public Action getIdSelectorAction_0() {

+			return cIdSelectorAction_0;

+		}

+

+		// HASHMARK

+		public RuleCall getHASHMARKTerminalRuleCall_1() {

+			return cHASHMARKTerminalRuleCall_1;

+		}

+

+		// name=Identifier

+		public Assignment getNameAssignment_2() {

+			return cNameAssignment_2;

+		}

+

+		// Identifier

+		public RuleCall getNameIdentifierParserRuleCall_2_0() {

+			return cNameIdentifierParserRuleCall_2_0;

+		}

+	}

+

+	public class Css_namespace_prefixElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "css_namespace_prefix");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Alternatives cAlternatives_0 = (Alternatives) cGroup.eContents().get(0);

+		private final RuleCall cIdentifierParserRuleCall_0_0 = (RuleCall) cAlternatives_0.eContents().get(0);

+		private final Keyword cAsteriskKeyword_0_1 = (Keyword) cAlternatives_0.eContents().get(1);

+		private final Keyword cVerticalLineKeyword_1 = (Keyword) cGroup.eContents().get(1);

+

+		// css_namespace_prefix:

+		// (Identifier | "*")? "|";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// (Identifier | "*")? "|"

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// (Identifier | "*")?

+		public Alternatives getAlternatives_0() {

+			return cAlternatives_0;

+		}

+

+		// Identifier

+		public RuleCall getIdentifierParserRuleCall_0_0() {

+			return cIdentifierParserRuleCall_0_0;

+		}

+

+		// "*"

+		public Keyword getAsteriskKeyword_0_1() {

+			return cAsteriskKeyword_0_1;

+		}

+

+		// "|"

+		public Keyword getVerticalLineKeyword_1() {

+			return cVerticalLineKeyword_1;

+		}

+	}

+

+	public class Css_declarationElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "css_declaration");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final RuleCall cWSTerminalRuleCall_0 = (RuleCall) cGroup.eContents().get(0);

+		private final Assignment cPropertyAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final RuleCall cPropertyCss_propertyParserRuleCall_1_0 = (RuleCall) cPropertyAssignment_1.eContents().get(0);

+		private final RuleCall cWSTerminalRuleCall_2 = (RuleCall) cGroup.eContents().get(2);

+		private final RuleCall cCOLONTerminalRuleCall_3 = (RuleCall) cGroup.eContents().get(3);

+		private final Assignment cValueTokensAssignment_4 = (Assignment) cGroup.eContents().get(4);

+		private final RuleCall cValueTokensCssTokParserRuleCall_4_0 = (RuleCall) cValueTokensAssignment_4.eContents().get(0);

+		private final Assignment cImportantAssignment_5 = (Assignment) cGroup.eContents().get(5);

+		private final RuleCall cImportantIMPORTANT_SYMTerminalRuleCall_5_0 = (RuleCall) cImportantAssignment_5.eContents().get(0);

+

+		// css_declaration hidden(ML_COMMENT):

+		// WS* property=css_property WS* COLON valueTokens+=CssTok+ important?=IMPORTANT_SYM?;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// WS* property=css_property WS* COLON valueTokens+=CssTok+ important?=IMPORTANT_SYM?

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// WS*

+		public RuleCall getWSTerminalRuleCall_0() {

+			return cWSTerminalRuleCall_0;

+		}

+

+		// property=css_property

+		public Assignment getPropertyAssignment_1() {

+			return cPropertyAssignment_1;

+		}

+

+		// css_property

+		public RuleCall getPropertyCss_propertyParserRuleCall_1_0() {

+			return cPropertyCss_propertyParserRuleCall_1_0;

+		}

+

+		// WS*

+		public RuleCall getWSTerminalRuleCall_2() {

+			return cWSTerminalRuleCall_2;

+		}

+

+		// COLON

+		public RuleCall getCOLONTerminalRuleCall_3() {

+			return cCOLONTerminalRuleCall_3;

+		}

+

+		// valueTokens+=CssTok+

+		public Assignment getValueTokensAssignment_4() {

+			return cValueTokensAssignment_4;

+		}

+

+		// CssTok

+		public RuleCall getValueTokensCssTokParserRuleCall_4_0() {

+			return cValueTokensCssTokParserRuleCall_4_0;

+		}

+

+		// important?=IMPORTANT_SYM?

+		public Assignment getImportantAssignment_5() {

+			return cImportantAssignment_5;

+		}

+

+		// IMPORTANT_SYM

+		public RuleCall getImportantIMPORTANT_SYMTerminalRuleCall_5_0() {

+			return cImportantIMPORTANT_SYMTerminalRuleCall_5_0;

+		}

+	}

+

+	public class Css_propertyElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "css_property");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cCss_propertyAction_0 = (Action) cGroup.eContents().get(0);

+		private final Assignment cNameAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final RuleCall cNameValidPropertyIdentParserRuleCall_1_0 = (RuleCall) cNameAssignment_1.eContents().get(0);

+

+		// css_property:

+		// {css_property} name=ValidPropertyIdent;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {css_property} name=ValidPropertyIdent

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {css_property}

+		public Action getCss_propertyAction_0() {

+			return cCss_propertyAction_0;

+		}

+

+		// name=ValidPropertyIdent

+		public Assignment getNameAssignment_1() {

+			return cNameAssignment_1;

+		}

+

+		// ValidPropertyIdent

+		public RuleCall getNameValidPropertyIdentParserRuleCall_1_0() {

+			return cNameValidPropertyIdentParserRuleCall_1_0;

+		}

+	}

+

+	public class ValidPropertyIdentElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ValidPropertyIdent");

+		private final RuleCall cIdentifierParserRuleCall = (RuleCall) rule.eContents().get(1);

+

+		// ValidPropertyIdent:

+		// Identifier;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// Identifier

+		public RuleCall getIdentifierParserRuleCall() {

+			return cIdentifierParserRuleCall;

+		}

+	}

+

+	public class PseudoClassOrFuncElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PseudoClassOrFunc");

+		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);

+		private final RuleCall cPseudoClassParserRuleCall_0 = (RuleCall) cAlternatives.eContents().get(0);

+		private final RuleCall cPseudoClassFunctionParserRuleCall_1 = (RuleCall) cAlternatives.eContents().get(1);

+

+		// PseudoClassOrFunc:

+		// PseudoClass | PseudoClassFunction;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// PseudoClass | PseudoClassFunction

+		public Alternatives getAlternatives() {

+			return cAlternatives;

+		}

+

+		// PseudoClass

+		public RuleCall getPseudoClassParserRuleCall_0() {

+			return cPseudoClassParserRuleCall_0;

+		}

+

+		// PseudoClassFunction

+		public RuleCall getPseudoClassFunctionParserRuleCall_1() {

+			return cPseudoClassFunctionParserRuleCall_1;

+		}

+	}

+

+	public class PseudoClassElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PseudoClass");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final RuleCall cCOLONTerminalRuleCall_0 = (RuleCall) cGroup.eContents().get(0);

+		private final RuleCall cCOLONTerminalRuleCall_1 = (RuleCall) cGroup.eContents().get(1);

+		private final RuleCall cPseudoClassNameParserRuleCall_2 = (RuleCall) cGroup.eContents().get(2);

+

+		// PseudoClass:

+		// COLON COLON? PseudoClassName;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// COLON COLON? PseudoClassName

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// COLON

+		public RuleCall getCOLONTerminalRuleCall_0() {

+			return cCOLONTerminalRuleCall_0;

+		}

+

+		// COLON?

+		public RuleCall getCOLONTerminalRuleCall_1() {

+			return cCOLONTerminalRuleCall_1;

+		}

+

+		// PseudoClassName

+		public RuleCall getPseudoClassNameParserRuleCall_2() {

+			return cPseudoClassNameParserRuleCall_2;

+		}

+	}

+

+	public class PseudoClassNameElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PseudoClassName");

+		private final Assignment cNameAssignment = (Assignment) rule.eContents().get(1);

+		private final RuleCall cNameIdentifierParserRuleCall_0 = (RuleCall) cNameAssignment.eContents().get(0);

+

+		// PseudoClassName:

+		// name=Identifier;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// name=Identifier

+		public Assignment getNameAssignment() {

+			return cNameAssignment;

+		}

+

+		// Identifier

+		public RuleCall getNameIdentifierParserRuleCall_0() {

+			return cNameIdentifierParserRuleCall_0;

+		}

+	}

+

+	public class PseudoClassFunctionElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PseudoClassFunction");

+		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);

+		private final Group cGroup_0 = (Group) cAlternatives.eContents().get(0);

+		private final Assignment cNotAssignment_0_0 = (Assignment) cGroup_0.eContents().get(0);

+		private final RuleCall cNotNotFunctionCallParserRuleCall_0_0_0 = (RuleCall) cNotAssignment_0_0.eContents().get(0);

+		private final Assignment cParamSelectorAssignment_0_1 = (Assignment) cGroup_0.eContents().get(1);

+		private final RuleCall cParamSelectorSimpleSelectorForNegationParserRuleCall_0_1_0 = (RuleCall) cParamSelectorAssignment_0_1.eContents().get(0);

+		private final Keyword cRightParenthesisKeyword_0_2 = (Keyword) cGroup_0.eContents().get(2);

+		private final Group cGroup_1 = (Group) cAlternatives.eContents().get(1);

+		private final RuleCall cCOLONTerminalRuleCall_1_0 = (RuleCall) cGroup_1.eContents().get(0);

+		private final Assignment cNameAssignment_1_1 = (Assignment) cGroup_1.eContents().get(1);

+		private final RuleCall cNameIdentifierParserRuleCall_1_1_0 = (RuleCall) cNameAssignment_1_1.eContents().get(0);

+		private final Keyword cLeftParenthesisKeyword_1_2 = (Keyword) cGroup_1.eContents().get(2);

+		private final Assignment cParamsAssignment_1_3 = (Assignment) cGroup_1.eContents().get(3);

+		private final RuleCall cParamsCssTokParserRuleCall_1_3_0 = (RuleCall) cParamsAssignment_1_3.eContents().get(0);

+		private final Keyword cRightParenthesisKeyword_1_4 = (Keyword) cGroup_1.eContents().get(4);

+

+		// PseudoClassFunction:

+		// not?=NotFunctionCall paramSelector=SimpleSelectorForNegation ")" | COLON name=Identifier "(" params+=CssTok* ")";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// not?=NotFunctionCall paramSelector=SimpleSelectorForNegation ")" | COLON name=Identifier "(" params+=CssTok* ")"

+		public Alternatives getAlternatives() {

+			return cAlternatives;

+		}

+

+		// not?=NotFunctionCall paramSelector=SimpleSelectorForNegation ")"

+		public Group getGroup_0() {

+			return cGroup_0;

+		}

+

+		// not?=NotFunctionCall

+		public Assignment getNotAssignment_0_0() {

+			return cNotAssignment_0_0;

+		}

+

+		// NotFunctionCall

+		public RuleCall getNotNotFunctionCallParserRuleCall_0_0_0() {

+			return cNotNotFunctionCallParserRuleCall_0_0_0;

+		}

+

+		// paramSelector=SimpleSelectorForNegation

+		public Assignment getParamSelectorAssignment_0_1() {

+			return cParamSelectorAssignment_0_1;

+		}

+

+		// SimpleSelectorForNegation

+		public RuleCall getParamSelectorSimpleSelectorForNegationParserRuleCall_0_1_0() {

+			return cParamSelectorSimpleSelectorForNegationParserRuleCall_0_1_0;

+		}

+

+		// ")"

+		public Keyword getRightParenthesisKeyword_0_2() {

+			return cRightParenthesisKeyword_0_2;

+		}

+

+		// COLON name=Identifier "(" params+=CssTok* ")"

+		public Group getGroup_1() {

+			return cGroup_1;

+		}

+

+		// COLON

+		public RuleCall getCOLONTerminalRuleCall_1_0() {

+			return cCOLONTerminalRuleCall_1_0;

+		}

+

+		// name=Identifier

+		public Assignment getNameAssignment_1_1() {

+			return cNameAssignment_1_1;

+		}

+

+		// Identifier

+		public RuleCall getNameIdentifierParserRuleCall_1_1_0() {

+			return cNameIdentifierParserRuleCall_1_1_0;

+		}

+

+		// "("

+		public Keyword getLeftParenthesisKeyword_1_2() {

+			return cLeftParenthesisKeyword_1_2;

+		}

+

+		// params+=CssTok*

+		public Assignment getParamsAssignment_1_3() {

+			return cParamsAssignment_1_3;

+		}

+

+		// CssTok

+		public RuleCall getParamsCssTokParserRuleCall_1_3_0() {

+			return cParamsCssTokParserRuleCall_1_3_0;

+		}

+

+		// ")"

+		public Keyword getRightParenthesisKeyword_1_4() {

+			return cRightParenthesisKeyword_1_4;

+		}

+	}

+

+	public class NotFunctionCallElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NotFunctionCall");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final RuleCall cCOLONTerminalRuleCall_0 = (RuleCall) cGroup.eContents().get(0);

+		private final Keyword cNotKeyword_1 = (Keyword) cGroup.eContents().get(1);

+

+		// NotFunctionCall hidden():

+		// COLON "not(";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// COLON "not("

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// COLON

+		public RuleCall getCOLONTerminalRuleCall_0() {

+			return cCOLONTerminalRuleCall_0;

+		}

+

+		// "not("

+		public Keyword getNotKeyword_1() {

+			return cNotKeyword_1;

+		}

+	}

+

+	public class CombinatorElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "combinator");

+		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);

+		private final RuleCall cPLUSTerminalRuleCall_0 = (RuleCall) cAlternatives.eContents().get(0);

+		private final Keyword cGreaterThanSignKeyword_1 = (Keyword) cAlternatives.eContents().get(1);

+		private final Keyword cTildeKeyword_2 = (Keyword) cAlternatives.eContents().get(2);

+

+		// combinator:

+		// PLUS | ">" | "~";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// PLUS | ">" | "~"

+		public Alternatives getAlternatives() {

+			return cAlternatives;

+		}

+

+		// PLUS

+		public RuleCall getPLUSTerminalRuleCall_0() {

+			return cPLUSTerminalRuleCall_0;

+		}

+

+		// ">"

+		public Keyword getGreaterThanSignKeyword_1() {

+			return cGreaterThanSignKeyword_1;

+		}

+

+		// "~"

+		public Keyword getTildeKeyword_2() {

+			return cTildeKeyword_2;

+		}

+	}

+

+	public class OperatorElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "operator");

+		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);

+		private final Keyword cSolidusKeyword_0 = (Keyword) cAlternatives.eContents().get(0);

+		private final RuleCall cCOMMATerminalRuleCall_1 = (RuleCall) cAlternatives.eContents().get(1);

+

+		// operator:

+		// "/" | COMMA;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// "/" | COMMA

+		public Alternatives getAlternatives() {

+			return cAlternatives;

+		}

+

+		// "/"

+		public Keyword getSolidusKeyword_0() {

+			return cSolidusKeyword_0;

+		}

+

+		// COMMA

+		public RuleCall getCOMMATerminalRuleCall_1() {

+			return cCOMMATerminalRuleCall_1;

+		}

+	}

+

+	public class Unary_operatorElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "unary_operator");

+		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);

+		private final RuleCall cDASHTerminalRuleCall_0 = (RuleCall) cAlternatives.eContents().get(0);

+		private final RuleCall cPLUSTerminalRuleCall_1 = (RuleCall) cAlternatives.eContents().get(1);

+

+		// unary_operator:

+		// DASH | PLUS;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// DASH | PLUS

+		public Alternatives getAlternatives() {

+			return cAlternatives;

+		}

+

+		// DASH

+		public RuleCall getDASHTerminalRuleCall_0() {

+			return cDASHTerminalRuleCall_0;

+		}

+

+		// PLUS

+		public RuleCall getPLUSTerminalRuleCall_1() {

+			return cPLUSTerminalRuleCall_1;

+		}

+	}

+

+	public class SymbolTokElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SymbolTok");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cSymbolTokAction_0 = (Action) cGroup.eContents().get(0);

+		private final Assignment cSymbolAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final Alternatives cSymbolAlternatives_1_0 = (Alternatives) cSymbolAssignment_1.eContents().get(0);

+		private final RuleCall cSymbolCOMMATerminalRuleCall_1_0_0 = (RuleCall) cSymbolAlternatives_1_0.eContents().get(0);

+		private final RuleCall cSymbolPERCENTTerminalRuleCall_1_0_1 = (RuleCall) cSymbolAlternatives_1_0.eContents().get(1);

+

+		// SymbolTok returns CssTok:

+		// {SymbolTok} symbol=(COMMA | PERCENT);

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {SymbolTok} symbol=(COMMA | PERCENT)

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {SymbolTok}

+		public Action getSymbolTokAction_0() {

+			return cSymbolTokAction_0;

+		}

+

+		// symbol=(COMMA | PERCENT)

+		public Assignment getSymbolAssignment_1() {

+			return cSymbolAssignment_1;

+		}

+

+		// COMMA | PERCENT

+		public Alternatives getSymbolAlternatives_1_0() {

+			return cSymbolAlternatives_1_0;

+		}

+

+		// COMMA

+		public RuleCall getSymbolCOMMATerminalRuleCall_1_0_0() {

+			return cSymbolCOMMATerminalRuleCall_1_0_0;

+		}

+

+		// PERCENT

+		public RuleCall getSymbolPERCENTTerminalRuleCall_1_0_1() {

+			return cSymbolPERCENTTerminalRuleCall_1_0_1;

+		}

+	}

+

+	public class WSTokElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "WSTok");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cWSTokAction_0 = (Action) cGroup.eContents().get(0);

+		private final RuleCall cWSTerminalRuleCall_1 = (RuleCall) cGroup.eContents().get(1);

+

+		// WSTok returns CssTok:

+		// {WSTok} WS;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {WSTok} WS

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {WSTok}

+		public Action getWSTokAction_0() {

+			return cWSTokAction_0;

+		}

+

+		// WS

+		public RuleCall getWSTerminalRuleCall_1() {

+			return cWSTerminalRuleCall_1;

+		}

+	}

+

+	public class StringTokElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StringTok");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cStringTokAction_0 = (Action) cGroup.eContents().get(0);

+		private final Assignment cValueAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final RuleCall cValueCSSSTRINGTerminalRuleCall_1_0 = (RuleCall) cValueAssignment_1.eContents().get(0);

+

+		// StringTok returns CssTok:

+		// {StringTok} value=CSSSTRING;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {StringTok} value=CSSSTRING

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {StringTok}

+		public Action getStringTokAction_0() {

+			return cStringTokAction_0;

+		}

+

+		// value=CSSSTRING

+		public Assignment getValueAssignment_1() {

+			return cValueAssignment_1;

+		}

+

+		// CSSSTRING

+		public RuleCall getValueCSSSTRINGTerminalRuleCall_1_0() {

+			return cValueCSSSTRINGTerminalRuleCall_1_0;

+		}

+	}

+

+	public class NumberTokElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NumberTok");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cNumberTokAction_0 = (Action) cGroup.eContents().get(0);

+		private final Assignment cValAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final RuleCall cValNumParserRuleCall_1_0 = (RuleCall) cValAssignment_1.eContents().get(0);

+

+		// // {NumberTok} DASH? ( ONE_INT+ | ONE_INT* '.' => ONE_INT+)

+		// // {NumberTok} val=Integer | Real

+		// //sign=DASH? ( ival=Integer | dval=Real)

+		// NumberTok returns CssTok hidden():

+		// {NumberTok} val=Num;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {NumberTok} val=Num

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {NumberTok}

+		public Action getNumberTokAction_0() {

+			return cNumberTokAction_0;

+		}

+

+		// val=Num

+		public Assignment getValAssignment_1() {

+			return cValAssignment_1;

+		}

+

+		// Num

+		public RuleCall getValNumParserRuleCall_1_0() {

+			return cValNumParserRuleCall_1_0;

+		}

+	}

+

+	public class UrlTokElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UrlTok");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cUrlTokAction_0 = (Action) cGroup.eContents().get(0);

+		private final Assignment cUrlAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final RuleCall cUrlURLTypeParserRuleCall_1_0 = (RuleCall) cUrlAssignment_1.eContents().get(0);

+

+		// UrlTok returns CssTok:

+		// {UrlTok} url=URLType;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {UrlTok} url=URLType

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {UrlTok}

+		public Action getUrlTokAction_0() {

+			return cUrlTokAction_0;

+		}

+

+		// url=URLType

+		public Assignment getUrlAssignment_1() {

+			return cUrlAssignment_1;

+		}

+

+		// URLType

+		public RuleCall getUrlURLTypeParserRuleCall_1_0() {

+			return cUrlURLTypeParserRuleCall_1_0;

+		}

+	}

+

+	public class ColorTokElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ColorTok");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cColorTokAction_0 = (Action) cGroup.eContents().get(0);

+		private final Assignment cValueAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final RuleCall cValueHexParserRuleCall_1_0 = (RuleCall) cValueAssignment_1.eContents().get(0);

+

+		// ColorTok returns CssTok hidden():

+		// {ColorTok} value=Hex;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {ColorTok} value=Hex

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {ColorTok}

+		public Action getColorTokAction_0() {

+			return cColorTokAction_0;

+		}

+

+		// value=Hex

+		public Assignment getValueAssignment_1() {

+			return cValueAssignment_1;

+		}

+

+		// Hex

+		public RuleCall getValueHexParserRuleCall_1_0() {

+			return cValueHexParserRuleCall_1_0;

+		}

+	}

+

+	public class IdentifierOrFuncTokElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "IdentifierOrFuncTok");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Action cIdentifierTokAction_0 = (Action) cGroup.eContents().get(0);

+		private final Assignment cNameAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final RuleCall cNameIdentifierParserRuleCall_1_0 = (RuleCall) cNameAssignment_1.eContents().get(0);

+		private final Group cGroup_2 = (Group) cGroup.eContents().get(2);

+		private final Action cFuncTokNameAction_2_0 = (Action) cGroup_2.eContents().get(0);

+		private final Keyword cLeftParenthesisKeyword_2_1 = (Keyword) cGroup_2.eContents().get(1);

+		private final Assignment cParamsAssignment_2_2 = (Assignment) cGroup_2.eContents().get(2);

+		private final RuleCall cParamsCssTokParserRuleCall_2_2_0 = (RuleCall) cParamsAssignment_2_2.eContents().get(0);

+		private final Keyword cRightParenthesisKeyword_2_3 = (Keyword) cGroup_2.eContents().get(3);

+

+		// IdentifierOrFuncTok returns CssTok hidden(ML_COMMENT):

+		// {IdentifierTok} name=Identifier ({FuncTok.name=current} "(" params+=CssTok+ ")")?;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// {IdentifierTok} name=Identifier ({FuncTok.name=current} "(" params+=CssTok+ ")")?

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// {IdentifierTok}

+		public Action getIdentifierTokAction_0() {

+			return cIdentifierTokAction_0;

+		}

+

+		// name=Identifier

+		public Assignment getNameAssignment_1() {

+			return cNameAssignment_1;

+		}

+

+		// Identifier

+		public RuleCall getNameIdentifierParserRuleCall_1_0() {

+			return cNameIdentifierParserRuleCall_1_0;

+		}

+

+		// ({FuncTok.name=current} "(" params+=CssTok+ ")")?

+		public Group getGroup_2() {

+			return cGroup_2;

+		}

+

+		// {FuncTok.name=current}

+		public Action getFuncTokNameAction_2_0() {

+			return cFuncTokNameAction_2_0;

+		}

+

+		// "("

+		public Keyword getLeftParenthesisKeyword_2_1() {

+			return cLeftParenthesisKeyword_2_1;

+		}

+

+		// params+=CssTok+

+		public Assignment getParamsAssignment_2_2() {

+			return cParamsAssignment_2_2;

+		}

+

+		// CssTok

+		public RuleCall getParamsCssTokParserRuleCall_2_2_0() {

+			return cParamsCssTokParserRuleCall_2_2_0;

+		}

+

+		// ")"

+		public Keyword getRightParenthesisKeyword_2_3() {

+			return cRightParenthesisKeyword_2_3;

+		}

+	}

+

+	public class CssTokElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "CssTok");

+		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);

+		private final RuleCall cIdentifierOrFuncTokParserRuleCall_0 = (RuleCall) cAlternatives.eContents().get(0);

+		private final RuleCall cSymbolTokParserRuleCall_1 = (RuleCall) cAlternatives.eContents().get(1);

+		private final RuleCall cWSTokParserRuleCall_2 = (RuleCall) cAlternatives.eContents().get(2);

+		private final RuleCall cStringTokParserRuleCall_3 = (RuleCall) cAlternatives.eContents().get(3);

+		private final RuleCall cNumberTokParserRuleCall_4 = (RuleCall) cAlternatives.eContents().get(4);

+		private final RuleCall cUrlTokParserRuleCall_5 = (RuleCall) cAlternatives.eContents().get(5);

+		private final RuleCall cColorTokParserRuleCall_6 = (RuleCall) cAlternatives.eContents().get(6);

+

+		// CssTok hidden(ML_COMMENT):

+		// IdentifierOrFuncTok | SymbolTok | WSTok | StringTok | NumberTok | UrlTok | ColorTok;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// IdentifierOrFuncTok | SymbolTok | WSTok | StringTok | NumberTok | UrlTok | ColorTok

+		public Alternatives getAlternatives() {

+			return cAlternatives;

+		}

+

+		// IdentifierOrFuncTok

+		public RuleCall getIdentifierOrFuncTokParserRuleCall_0() {

+			return cIdentifierOrFuncTokParserRuleCall_0;

+		}

+

+		// SymbolTok

+		public RuleCall getSymbolTokParserRuleCall_1() {

+			return cSymbolTokParserRuleCall_1;

+		}

+

+		// WSTok

+		public RuleCall getWSTokParserRuleCall_2() {

+			return cWSTokParserRuleCall_2;

+		}

+

+		// StringTok

+		public RuleCall getStringTokParserRuleCall_3() {

+			return cStringTokParserRuleCall_3;

+		}

+

+		// NumberTok

+		public RuleCall getNumberTokParserRuleCall_4() {

+			return cNumberTokParserRuleCall_4;

+		}

+

+		// UrlTok

+		public RuleCall getUrlTokParserRuleCall_5() {

+			return cUrlTokParserRuleCall_5;

+		}

+

+		// ColorTok

+		public RuleCall getColorTokParserRuleCall_6() {

+			return cColorTokParserRuleCall_6;

+		}

+	}

+

+	public class URLTypeElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "URLType");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Keyword cUrlKeyword_0 = (Keyword) cGroup.eContents().get(0);

+		private final Assignment cUrlAssignment_1 = (Assignment) cGroup.eContents().get(1);

+		private final RuleCall cUrlValidURLParserRuleCall_1_0 = (RuleCall) cUrlAssignment_1.eContents().get(0);

+		private final Keyword cRightParenthesisKeyword_2 = (Keyword) cGroup.eContents().get(2);

+

+		// URLType hidden(): // FULLURL

+		// "url(" url=ValidURL ")";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// // FULLURL

+		// "url(" url=ValidURL ")"

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// // FULLURL

+		// "url("

+		public Keyword getUrlKeyword_0() {

+			return cUrlKeyword_0;

+		}

+

+		// url=ValidURL

+		public Assignment getUrlAssignment_1() {

+			return cUrlAssignment_1;

+		}

+

+		// ValidURL

+		public RuleCall getUrlValidURLParserRuleCall_1_0() {

+			return cUrlValidURLParserRuleCall_1_0;

+		}

+

+		// ")"

+		public Keyword getRightParenthesisKeyword_2() {

+			return cRightParenthesisKeyword_2;

+		}

+	}

+

+	public class ValidURLSymbolElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ValidURLSymbol");

+		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);

+		private final RuleCall cDASHTerminalRuleCall_0 = (RuleCall) cAlternatives.eContents().get(0);

+		private final Keyword cFullStopKeyword_1 = (Keyword) cAlternatives.eContents().get(1);

+		private final RuleCall cUNDERSCORETerminalRuleCall_2 = (RuleCall) cAlternatives.eContents().get(2);

+		private final Keyword cTildeKeyword_3 = (Keyword) cAlternatives.eContents().get(3);

+		private final RuleCall cCOLONTerminalRuleCall_4 = (RuleCall) cAlternatives.eContents().get(4);

+		private final Keyword cSolidusKeyword_5 = (Keyword) cAlternatives.eContents().get(5);

+		private final Keyword cQuestionMarkKeyword_6 = (Keyword) cAlternatives.eContents().get(6);

+		private final RuleCall cHASHMARKTerminalRuleCall_7 = (RuleCall) cAlternatives.eContents().get(7);

+		private final Keyword cLeftSquareBracketKeyword_8 = (Keyword) cAlternatives.eContents().get(8);

+		private final Keyword cRightSquareBracketKeyword_9 = (Keyword) cAlternatives.eContents().get(9);

+		private final Keyword cCommercialAtKeyword_10 = (Keyword) cAlternatives.eContents().get(10);

+		private final Keyword cExclamationMarkKeyword_11 = (Keyword) cAlternatives.eContents().get(11);

+		private final Keyword cDollarSignKeyword_12 = (Keyword) cAlternatives.eContents().get(12);

+		private final Keyword cAmpersandKeyword_13 = (Keyword) cAlternatives.eContents().get(13);

+		private final Keyword cAsteriskKeyword_14 = (Keyword) cAlternatives.eContents().get(14);

+		private final RuleCall cPLUSTerminalRuleCall_15 = (RuleCall) cAlternatives.eContents().get(15);

+		private final RuleCall cCOMMATerminalRuleCall_16 = (RuleCall) cAlternatives.eContents().get(16);

+		private final Keyword cSemicolonKeyword_17 = (Keyword) cAlternatives.eContents().get(17);

+		private final Group cGroup_18 = (Group) cAlternatives.eContents().get(18);

+		private final Keyword cEqualsSignKeyword_18_0 = (Keyword) cGroup_18.eContents().get(0);

+		private final RuleCall cKeywordHackParserRuleCall_18_1 = (RuleCall) cGroup_18.eContents().get(1);

+

+		// ValidURLSymbol:

+		// DASH / * "'" | '(' | ')' | need to be escaped* / | "." | UNDERSCORE | "~" | COLON | "/" | "?" | HASHMARK | "[" | "]" |

+		// "@" | "!" | "$" | "&" | "*" | PLUS | COMMA | ";" | "=" KeywordHack;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// DASH / * "'" | '(' | ')' | need to be escaped* / | "." | UNDERSCORE | "~" | COLON | "/" | "?" | HASHMARK | "[" | "]" | "@"

+		// | "!" | "$" | "&" | "*" | PLUS | COMMA | ";" | "=" KeywordHack

+		public Alternatives getAlternatives() {

+			return cAlternatives;

+		}

+

+		// DASH

+		public RuleCall getDASHTerminalRuleCall_0() {

+			return cDASHTerminalRuleCall_0;

+		}

+

+		// "."

+		public Keyword getFullStopKeyword_1() {

+			return cFullStopKeyword_1;

+		}

+

+		// UNDERSCORE

+		public RuleCall getUNDERSCORETerminalRuleCall_2() {

+			return cUNDERSCORETerminalRuleCall_2;

+		}

+

+		// "~"

+		public Keyword getTildeKeyword_3() {

+			return cTildeKeyword_3;

+		}

+

+		// COLON

+		public RuleCall getCOLONTerminalRuleCall_4() {

+			return cCOLONTerminalRuleCall_4;

+		}

+

+		// "/"

+		public Keyword getSolidusKeyword_5() {

+			return cSolidusKeyword_5;

+		}

+

+		// "?"

+		public Keyword getQuestionMarkKeyword_6() {

+			return cQuestionMarkKeyword_6;

+		}

+

+		// HASHMARK

+		public RuleCall getHASHMARKTerminalRuleCall_7() {

+			return cHASHMARKTerminalRuleCall_7;

+		}

+

+		// "["

+		public Keyword getLeftSquareBracketKeyword_8() {

+			return cLeftSquareBracketKeyword_8;

+		}

+

+		// "]"

+		public Keyword getRightSquareBracketKeyword_9() {

+			return cRightSquareBracketKeyword_9;

+		}

+

+		// "@"

+		public Keyword getCommercialAtKeyword_10() {

+			return cCommercialAtKeyword_10;

+		}

+

+		// "!"

+		public Keyword getExclamationMarkKeyword_11() {

+			return cExclamationMarkKeyword_11;

+		}

+

+		// "$"

+		public Keyword getDollarSignKeyword_12() {

+			return cDollarSignKeyword_12;

+		}

+

+		// "&"

+		public Keyword getAmpersandKeyword_13() {

+			return cAmpersandKeyword_13;

+		}

+

+		// "*"

+		public Keyword getAsteriskKeyword_14() {

+			return cAsteriskKeyword_14;

+		}

+

+		// PLUS

+		public RuleCall getPLUSTerminalRuleCall_15() {

+			return cPLUSTerminalRuleCall_15;

+		}

+

+		// COMMA

+		public RuleCall getCOMMATerminalRuleCall_16() {

+			return cCOMMATerminalRuleCall_16;

+		}

+

+		// ";"

+		public Keyword getSemicolonKeyword_17() {

+			return cSemicolonKeyword_17;

+		}

+

+		// "=" KeywordHack

+		public Group getGroup_18() {

+			return cGroup_18;

+		}

+

+		// "="

+		public Keyword getEqualsSignKeyword_18_0() {

+			return cEqualsSignKeyword_18_0;

+		}

+

+		// KeywordHack

+		public RuleCall getKeywordHackParserRuleCall_18_1() {

+			return cKeywordHackParserRuleCall_18_1;

+		}

+	}

+

+	public class KeywordHackElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "KeywordHack");

+		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);

+		private final Keyword cNotKeyword_0 = (Keyword) cAlternatives.eContents().get(0);

+		private final Keyword cNoKeyword_1 = (Keyword) cAlternatives.eContents().get(1);

+		private final Keyword cUrlKeyword_2 = (Keyword) cAlternatives.eContents().get(2);

+		private final Keyword cUrKeyword_3 = (Keyword) cAlternatives.eContents().get(3);

+

+		// KeywordHack:

+		// "not" | "no" | "url" | "ur";

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// "not" | "no" | "url" | "ur"

+		public Alternatives getAlternatives() {

+			return cAlternatives;

+		}

+

+		// "not"

+		public Keyword getNotKeyword_0() {

+			return cNotKeyword_0;

+		}

+

+		// "no"

+		public Keyword getNoKeyword_1() {

+			return cNoKeyword_1;

+		}

+

+		// "url"

+		public Keyword getUrlKeyword_2() {

+			return cUrlKeyword_2;

+		}

+

+		// "ur"

+		public Keyword getUrKeyword_3() {

+			return cUrKeyword_3;

+		}

+	}

+

+	public class ValidURLElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ValidURL");

+		private final Alternatives cAlternatives = (Alternatives) rule.eContents().get(1);

+		private final RuleCall cCSSSTRINGTerminalRuleCall_0 = (RuleCall) cAlternatives.eContents().get(0);

+		private final Alternatives cAlternatives_1 = (Alternatives) cAlternatives.eContents().get(1);

+		private final RuleCall cValidURLSymbolParserRuleCall_1_0 = (RuleCall) cAlternatives_1.eContents().get(0);

+		private final RuleCall cKeywordHackParserRuleCall_1_1 = (RuleCall) cAlternatives_1.eContents().get(1);

+		private final RuleCall cONE_HEX_LETTERTerminalRuleCall_1_2 = (RuleCall) cAlternatives_1.eContents().get(2);

+		private final RuleCall cONE_NON_HEX_LETTERTerminalRuleCall_1_3 = (RuleCall) cAlternatives_1.eContents().get(3);

+		private final RuleCall cONE_INTTerminalRuleCall_1_4 = (RuleCall) cAlternatives_1.eContents().get(4);

+		private final Keyword cReverseSolidusSpaceKeyword_1_5 = (Keyword) cAlternatives_1.eContents().get(5);

+		private final Keyword cReverseSolidusLeftParenthesisKeyword_1_6 = (Keyword) cAlternatives_1.eContents().get(6);

+		private final Keyword cReverseSolidusRightParenthesisKeyword_1_7 = (Keyword) cAlternatives_1.eContents().get(7);

+		private final Keyword cReverseSolidusApostropheKeyword_1_8 = (Keyword) cAlternatives_1.eContents().get(8);

+		private final Keyword cReverseSolidusQuotationMarkKeyword_1_9 = (Keyword) cAlternatives_1.eContents().get(9);

+		private final Group cGroup_1_10 = (Group) cAlternatives_1.eContents().get(10);

+		private final RuleCall cPERCENTTerminalRuleCall_1_10_0 = (RuleCall) cGroup_1_10.eContents().get(0);

+		private final Alternatives cAlternatives_1_10_1 = (Alternatives) cGroup_1_10.eContents().get(1);

+		private final RuleCall cONE_INTTerminalRuleCall_1_10_1_0 = (RuleCall) cAlternatives_1_10_1.eContents().get(0);

+		private final RuleCall cONE_HEX_LETTERTerminalRuleCall_1_10_1_1 = (RuleCall) cAlternatives_1_10_1.eContents().get(1);

+		private final Alternatives cAlternatives_1_10_2 = (Alternatives) cGroup_1_10.eContents().get(2);

+		private final RuleCall cONE_INTTerminalRuleCall_1_10_2_0 = (RuleCall) cAlternatives_1_10_2.eContents().get(0);

+		private final RuleCall cONE_HEX_LETTERTerminalRuleCall_1_10_2_1 = (RuleCall) cAlternatives_1_10_2.eContents().get(1);

+

+		// ValidURL returns ecore::EString hidden():

+		// CSSSTRING | (ValidURLSymbol | KeywordHack | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | ONE_INT | "\\ " | "\\(" | "\\)" |

+		// "\\\'" | "\\\"" | PERCENT (ONE_INT | ONE_HEX_LETTER) (ONE_INT | ONE_HEX_LETTER))+;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// CSSSTRING | (ValidURLSymbol | KeywordHack | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | ONE_INT | "\\ " | "\\(" | "\\)" |

+		// "\\\'" | "\\\"" | PERCENT (ONE_INT | ONE_HEX_LETTER) (ONE_INT | ONE_HEX_LETTER))+

+		public Alternatives getAlternatives() {

+			return cAlternatives;

+		}

+

+		// CSSSTRING

+		public RuleCall getCSSSTRINGTerminalRuleCall_0() {

+			return cCSSSTRINGTerminalRuleCall_0;

+		}

+

+		// (ValidURLSymbol | KeywordHack | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | ONE_INT | "\\ " | "\\(" | "\\)" | "\\\'" | "\\\""

+		// | PERCENT (ONE_INT | ONE_HEX_LETTER) (ONE_INT | ONE_HEX_LETTER))+

+		public Alternatives getAlternatives_1() {

+			return cAlternatives_1;

+		}

+

+		// ValidURLSymbol

+		public RuleCall getValidURLSymbolParserRuleCall_1_0() {

+			return cValidURLSymbolParserRuleCall_1_0;

+		}

+

+		// KeywordHack

+		public RuleCall getKeywordHackParserRuleCall_1_1() {

+			return cKeywordHackParserRuleCall_1_1;

+		}

+

+		// ONE_HEX_LETTER

+		public RuleCall getONE_HEX_LETTERTerminalRuleCall_1_2() {

+			return cONE_HEX_LETTERTerminalRuleCall_1_2;

+		}

+

+		// ONE_NON_HEX_LETTER

+		public RuleCall getONE_NON_HEX_LETTERTerminalRuleCall_1_3() {

+			return cONE_NON_HEX_LETTERTerminalRuleCall_1_3;

+		}

+

+		// ONE_INT

+		public RuleCall getONE_INTTerminalRuleCall_1_4() {

+			return cONE_INTTerminalRuleCall_1_4;

+		}

+

+		// "\\ "

+		public Keyword getReverseSolidusSpaceKeyword_1_5() {

+			return cReverseSolidusSpaceKeyword_1_5;

+		}

+

+		// "\\("

+		public Keyword getReverseSolidusLeftParenthesisKeyword_1_6() {

+			return cReverseSolidusLeftParenthesisKeyword_1_6;

+		}

+

+		// "\\)"

+		public Keyword getReverseSolidusRightParenthesisKeyword_1_7() {

+			return cReverseSolidusRightParenthesisKeyword_1_7;

+		}

+

+		// "\\\'"

+		public Keyword getReverseSolidusApostropheKeyword_1_8() {

+			return cReverseSolidusApostropheKeyword_1_8;

+		}

+

+		// "\\\""

+		public Keyword getReverseSolidusQuotationMarkKeyword_1_9() {

+			return cReverseSolidusQuotationMarkKeyword_1_9;

+		}

+

+		// PERCENT (ONE_INT | ONE_HEX_LETTER) (ONE_INT | ONE_HEX_LETTER)

+		public Group getGroup_1_10() {

+			return cGroup_1_10;

+		}

+

+		// PERCENT

+		public RuleCall getPERCENTTerminalRuleCall_1_10_0() {

+			return cPERCENTTerminalRuleCall_1_10_0;

+		}

+

+		// ONE_INT | ONE_HEX_LETTER

+		public Alternatives getAlternatives_1_10_1() {

+			return cAlternatives_1_10_1;

+		}

+

+		// ONE_INT

+		public RuleCall getONE_INTTerminalRuleCall_1_10_1_0() {

+			return cONE_INTTerminalRuleCall_1_10_1_0;

+		}

+

+		// ONE_HEX_LETTER

+		public RuleCall getONE_HEX_LETTERTerminalRuleCall_1_10_1_1() {

+			return cONE_HEX_LETTERTerminalRuleCall_1_10_1_1;

+		}

+

+		// ONE_INT | ONE_HEX_LETTER

+		public Alternatives getAlternatives_1_10_2() {

+			return cAlternatives_1_10_2;

+		}

+

+		// ONE_INT

+		public RuleCall getONE_INTTerminalRuleCall_1_10_2_0() {

+			return cONE_INTTerminalRuleCall_1_10_2_0;

+		}

+

+		// ONE_HEX_LETTER

+		public RuleCall getONE_HEX_LETTERTerminalRuleCall_1_10_2_1() {

+			return cONE_HEX_LETTERTerminalRuleCall_1_10_2_1;

+		}

+	}

+

+	public class IdentifierElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Identifier");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final RuleCall cDASHTerminalRuleCall_0 = (RuleCall) cGroup.eContents().get(0);

+		private final Alternatives cAlternatives_1 = (Alternatives) cGroup.eContents().get(1);

+		private final RuleCall cUNDERSCORETerminalRuleCall_1_0 = (RuleCall) cAlternatives_1.eContents().get(0);

+		private final RuleCall cONE_HEX_LETTERTerminalRuleCall_1_1 = (RuleCall) cAlternatives_1.eContents().get(1);

+		private final RuleCall cONE_NON_HEX_LETTERTerminalRuleCall_1_2 = (RuleCall) cAlternatives_1.eContents().get(2);

+		private final RuleCall cKeywordHackParserRuleCall_1_3 = (RuleCall) cAlternatives_1.eContents().get(3);

+		private final Group cGroup_2 = (Group) cGroup.eContents().get(2);

+		private final Alternatives cAlternatives_2_0 = (Alternatives) cGroup_2.eContents().get(0);

+		private final RuleCall cUNDERSCORETerminalRuleCall_2_0_0 = (RuleCall) cAlternatives_2_0.eContents().get(0);

+		private final RuleCall cDASHTerminalRuleCall_2_0_1 = (RuleCall) cAlternatives_2_0.eContents().get(1);

+		private final RuleCall cONE_HEX_LETTERTerminalRuleCall_2_0_2 = (RuleCall) cAlternatives_2_0.eContents().get(2);

+		private final RuleCall cONE_NON_HEX_LETTERTerminalRuleCall_2_0_3 = (RuleCall) cAlternatives_2_0.eContents().get(3);

+		private final RuleCall cONE_INTTerminalRuleCall_2_0_4 = (RuleCall) cAlternatives_2_0.eContents().get(4);

+		private final RuleCall cKeywordHackParserRuleCall_2_0_5 = (RuleCall) cAlternatives_2_0.eContents().get(5);

+

+		// Identifier returns ecore::EString hidden():

+		// DASH? (UNDERSCORE | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | KeywordHack) => (UNDERSCORE | DASH | ONE_HEX_LETTER |

+		// ONE_NON_HEX_LETTER | ONE_INT | KeywordHack)*;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// DASH? (UNDERSCORE | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | KeywordHack) => (UNDERSCORE | DASH | ONE_HEX_LETTER |

+		// ONE_NON_HEX_LETTER | ONE_INT | KeywordHack)*

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// DASH?

+		public RuleCall getDASHTerminalRuleCall_0() {

+			return cDASHTerminalRuleCall_0;

+		}

+

+		// UNDERSCORE | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | KeywordHack

+		public Alternatives getAlternatives_1() {

+			return cAlternatives_1;

+		}

+

+		// UNDERSCORE

+		public RuleCall getUNDERSCORETerminalRuleCall_1_0() {

+			return cUNDERSCORETerminalRuleCall_1_0;

+		}

+

+		// ONE_HEX_LETTER

+		public RuleCall getONE_HEX_LETTERTerminalRuleCall_1_1() {

+			return cONE_HEX_LETTERTerminalRuleCall_1_1;

+		}

+

+		// ONE_NON_HEX_LETTER

+		public RuleCall getONE_NON_HEX_LETTERTerminalRuleCall_1_2() {

+			return cONE_NON_HEX_LETTERTerminalRuleCall_1_2;

+		}

+

+		// KeywordHack

+		public RuleCall getKeywordHackParserRuleCall_1_3() {

+			return cKeywordHackParserRuleCall_1_3;

+		}

+

+		// => (UNDERSCORE | DASH | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | ONE_INT | KeywordHack)*

+		public Group getGroup_2() {

+			return cGroup_2;

+		}

+

+		// UNDERSCORE | DASH | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | ONE_INT | KeywordHack

+		public Alternatives getAlternatives_2_0() {

+			return cAlternatives_2_0;

+		}

+

+		// UNDERSCORE

+		public RuleCall getUNDERSCORETerminalRuleCall_2_0_0() {

+			return cUNDERSCORETerminalRuleCall_2_0_0;

+		}

+

+		// DASH

+		public RuleCall getDASHTerminalRuleCall_2_0_1() {

+			return cDASHTerminalRuleCall_2_0_1;

+		}

+

+		// ONE_HEX_LETTER

+		public RuleCall getONE_HEX_LETTERTerminalRuleCall_2_0_2() {

+			return cONE_HEX_LETTERTerminalRuleCall_2_0_2;

+		}

+

+		// ONE_NON_HEX_LETTER

+		public RuleCall getONE_NON_HEX_LETTERTerminalRuleCall_2_0_3() {

+			return cONE_NON_HEX_LETTERTerminalRuleCall_2_0_3;

+		}

+

+		// ONE_INT

+		public RuleCall getONE_INTTerminalRuleCall_2_0_4() {

+			return cONE_INTTerminalRuleCall_2_0_4;

+		}

+

+		// KeywordHack

+		public RuleCall getKeywordHackParserRuleCall_2_0_5() {

+			return cKeywordHackParserRuleCall_2_0_5;

+		}

+	}

+

+	public class NumElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Num");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final Alternatives cAlternatives_0 = (Alternatives) cGroup.eContents().get(0);

+		private final RuleCall cPLUSTerminalRuleCall_0_0 = (RuleCall) cAlternatives_0.eContents().get(0);

+		private final RuleCall cDASHTerminalRuleCall_0_1 = (RuleCall) cAlternatives_0.eContents().get(1);

+		private final Alternatives cAlternatives_1 = (Alternatives) cGroup.eContents().get(1);

+		private final Group cGroup_1_0 = (Group) cAlternatives_1.eContents().get(0);

+		private final Keyword cFullStopKeyword_1_0_0 = (Keyword) cGroup_1_0.eContents().get(0);

+		private final RuleCall cONE_INTTerminalRuleCall_1_0_1 = (RuleCall) cGroup_1_0.eContents().get(1);

+		private final Group cGroup_1_1 = (Group) cAlternatives_1.eContents().get(1);

+		private final RuleCall cONE_INTTerminalRuleCall_1_1_0 = (RuleCall) cGroup_1_1.eContents().get(0);

+		private final Group cGroup_1_1_1 = (Group) cGroup_1_1.eContents().get(1);

+		private final Keyword cFullStopKeyword_1_1_1_0 = (Keyword) cGroup_1_1_1.eContents().get(0);

+		private final RuleCall cONE_INTTerminalRuleCall_1_1_1_1 = (RuleCall) cGroup_1_1_1.eContents().get(1);

+

+		// Num returns ecore::EDouble hidden():

+		// (PLUS | DASH)? ("." => ONE_INT+ | ONE_INT+ ("." => ONE_INT+)?);

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// (PLUS | DASH)? ("." => ONE_INT+ | ONE_INT+ ("." => ONE_INT+)?)

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// (PLUS | DASH)?

+		public Alternatives getAlternatives_0() {

+			return cAlternatives_0;

+		}

+

+		// PLUS

+		public RuleCall getPLUSTerminalRuleCall_0_0() {

+			return cPLUSTerminalRuleCall_0_0;

+		}

+

+		// DASH

+		public RuleCall getDASHTerminalRuleCall_0_1() {

+			return cDASHTerminalRuleCall_0_1;

+		}

+

+		// "." => ONE_INT+ | ONE_INT+ ("." => ONE_INT+)?

+		public Alternatives getAlternatives_1() {

+			return cAlternatives_1;

+		}

+

+		// "." => ONE_INT+

+		public Group getGroup_1_0() {

+			return cGroup_1_0;

+		}

+

+		// "."

+		public Keyword getFullStopKeyword_1_0_0() {

+			return cFullStopKeyword_1_0_0;

+		}

+

+		// => ONE_INT+

+		public RuleCall getONE_INTTerminalRuleCall_1_0_1() {

+			return cONE_INTTerminalRuleCall_1_0_1;

+		}

+

+		// => ONE_INT+ ("." => ONE_INT+)?

+		public Group getGroup_1_1() {

+			return cGroup_1_1;

+		}

+

+		// => ONE_INT+

+		public RuleCall getONE_INTTerminalRuleCall_1_1_0() {

+			return cONE_INTTerminalRuleCall_1_1_0;

+		}

+

+		// (=> "." => ONE_INT+)?

+		public Group getGroup_1_1_1() {

+			return cGroup_1_1_1;

+		}

+

+		// => "."

+		public Keyword getFullStopKeyword_1_1_1_0() {

+			return cFullStopKeyword_1_1_1_0;

+		}

+

+		// => ONE_INT+

+		public RuleCall getONE_INTTerminalRuleCall_1_1_1_1() {

+			return cONE_INTTerminalRuleCall_1_1_1_1;

+		}

+	}

+

+	public class HexElements extends AbstractParserRuleElementFinder {

+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Hex");

+		private final Group cGroup = (Group) rule.eContents().get(1);

+		private final RuleCall cHASHMARKTerminalRuleCall_0 = (RuleCall) cGroup.eContents().get(0);

+		private final Group cGroup_1 = (Group) cGroup.eContents().get(1);

+		private final Alternatives cAlternatives_1_0 = (Alternatives) cGroup_1.eContents().get(0);

+		private final RuleCall cONE_INTTerminalRuleCall_1_0_0 = (RuleCall) cAlternatives_1_0.eContents().get(0);

+		private final RuleCall cONE_HEX_LETTERTerminalRuleCall_1_0_1 = (RuleCall) cAlternatives_1_0.eContents().get(1);

+

+		// Hex returns ecore::EString:

+		// HASHMARK => (ONE_INT | ONE_HEX_LETTER)+;

+		@Override

+		public ParserRule getRule() {

+			return rule;

+		}

+

+		// HASHMARK => (ONE_INT | ONE_HEX_LETTER)+

+		public Group getGroup() {

+			return cGroup;

+		}

+

+		// HASHMARK

+		public RuleCall getHASHMARKTerminalRuleCall_0() {

+			return cHASHMARKTerminalRuleCall_0;

+		}

+

+		// => (ONE_INT | ONE_HEX_LETTER)+

+		public Group getGroup_1() {

+			return cGroup_1;

+		}

+

+		// ONE_INT | ONE_HEX_LETTER

+		public Alternatives getAlternatives_1_0() {

+			return cAlternatives_1_0;

+		}

+

+		// ONE_INT

+		public RuleCall getONE_INTTerminalRuleCall_1_0_0() {

+			return cONE_INTTerminalRuleCall_1_0_0;

+		}

+

+		// ONE_HEX_LETTER

+		public RuleCall getONE_HEX_LETTERTerminalRuleCall_1_0_1() {

+			return cONE_HEX_LETTERTerminalRuleCall_1_0_1;

+		}

+	}

+

+

+	private final StylesheetElements pStylesheet;

+	private final CharsetElements pCharset;

+	private final ImportExpressionElements pImportExpression;

+	private final PageElements pPage;

+	private final Pseudo_pageElements pPseudo_page;

+	private final MediaElements pMedia;

+	private final Media_listElements pMedia_list;

+	private final MediumElements pMedium;

+	private final Font_faceElements pFont_face;

+	private final KeyframesElements pKeyframes;

+	private final Keyframe_selectorElements pKeyframe_selector;

+	private final RulesetElements pRuleset;

+	private final SelectorElements pSelector;

+	private final SimpleSelectorForNegationElements pSimpleSelectorForNegation;

+	private final SubSelectorForNegationElements pSubSelectorForNegation;

+	private final Simple_selectorElements pSimple_selector;

+	private final SubSelectorElements pSubSelector;

+	private final AttributeSelectorElements pAttributeSelector;

+	private final ClassSelectorElements pClassSelector;

+	private final ElementSelectorElements pElementSelector;

+	private final UniversalSelectorElements pUniversalSelector;

+	private final IdSelectorElements pIdSelector;

+	private final Css_namespace_prefixElements pCss_namespace_prefix;

+	private final Css_declarationElements pCss_declaration;

+	private final Css_propertyElements pCss_property;

+	private final ValidPropertyIdentElements pValidPropertyIdent;

+	private final PseudoClassOrFuncElements pPseudoClassOrFunc;

+	private final PseudoClassElements pPseudoClass;

+	private final PseudoClassNameElements pPseudoClassName;

+	private final PseudoClassFunctionElements pPseudoClassFunction;

+	private final NotFunctionCallElements pNotFunctionCall;

+	private final CombinatorElements pCombinator;

+	private final OperatorElements pOperator;

+	private final Unary_operatorElements pUnary_operator;

+	private final SymbolTokElements pSymbolTok;

+	private final WSTokElements pWSTok;

+	private final StringTokElements pStringTok;

+	private final NumberTokElements pNumberTok;

+	private final UrlTokElements pUrlTok;

+	private final ColorTokElements pColorTok;

+	private final IdentifierOrFuncTokElements pIdentifierOrFuncTok;

+	private final CssTokElements pCssTok;

+	private final URLTypeElements pURLType;

+	private final ValidURLSymbolElements pValidURLSymbol;

+	private final KeywordHackElements pKeywordHack;

+	private final ValidURLElements pValidURL;

+	private final TerminalRule tIMPORTANT_SYM;

+	private final IdentifierElements pIdentifier;

+	private final NumElements pNum;

+	private final HexElements pHex;

+	private final TerminalRule tONE_INT;

+	private final TerminalRule tONE_HEX_LETTER;

+	private final TerminalRule tONE_NON_HEX_LETTER;

+	private final TerminalRule tUNDERSCORE;

+	private final TerminalRule tDASH;

+	private final TerminalRule tPLUS;

+	private final TerminalRule tHASHMARK;

+	private final TerminalRule tCOMMA;

+	private final TerminalRule tPERCENT;

+	private final TerminalRule tML_COMMENT;

+	private final TerminalRule tWS;

+	private final TerminalRule tCSSSTRING;

+	private final TerminalRule tINCLUDES;

+	private final TerminalRule tDASHMATCH;

+	private final TerminalRule tCOLON;

+

+	private final Grammar grammar;

+

+	@Inject

+	public CSSGrammarAccess(GrammarProvider grammarProvider) {

+		this.grammar = internalFindGrammar(grammarProvider);

+		this.pStylesheet = new StylesheetElements();

+		this.pCharset = new CharsetElements();

+		this.pImportExpression = new ImportExpressionElements();

+		this.pPage = new PageElements();

+		this.pPseudo_page = new Pseudo_pageElements();

+		this.pMedia = new MediaElements();

+		this.pMedia_list = new Media_listElements();

+		this.pMedium = new MediumElements();

+		this.pFont_face = new Font_faceElements();

+		this.pKeyframes = new KeyframesElements();

+		this.pKeyframe_selector = new Keyframe_selectorElements();

+		this.pRuleset = new RulesetElements();

+		this.pSelector = new SelectorElements();

+		this.pSimpleSelectorForNegation = new SimpleSelectorForNegationElements();

+		this.pSubSelectorForNegation = new SubSelectorForNegationElements();

+		this.pSimple_selector = new Simple_selectorElements();

+		this.pSubSelector = new SubSelectorElements();

+		this.pAttributeSelector = new AttributeSelectorElements();

+		this.pClassSelector = new ClassSelectorElements();

+		this.pElementSelector = new ElementSelectorElements();

+		this.pUniversalSelector = new UniversalSelectorElements();

+		this.pIdSelector = new IdSelectorElements();

+		this.pCss_namespace_prefix = new Css_namespace_prefixElements();

+		this.pCss_declaration = new Css_declarationElements();

+		this.pCss_property = new Css_propertyElements();

+		this.pValidPropertyIdent = new ValidPropertyIdentElements();

+		this.pPseudoClassOrFunc = new PseudoClassOrFuncElements();

+		this.pPseudoClass = new PseudoClassElements();

+		this.pPseudoClassName = new PseudoClassNameElements();

+		this.pPseudoClassFunction = new PseudoClassFunctionElements();

+		this.pNotFunctionCall = new NotFunctionCallElements();

+		this.pCombinator = new CombinatorElements();

+		this.pOperator = new OperatorElements();

+		this.pUnary_operator = new Unary_operatorElements();

+		this.pSymbolTok = new SymbolTokElements();

+		this.pWSTok = new WSTokElements();

+		this.pStringTok = new StringTokElements();

+		this.pNumberTok = new NumberTokElements();

+		this.pUrlTok = new UrlTokElements();

+		this.pColorTok = new ColorTokElements();

+		this.pIdentifierOrFuncTok = new IdentifierOrFuncTokElements();

+		this.pCssTok = new CssTokElements();

+		this.pURLType = new URLTypeElements();

+		this.pValidURLSymbol = new ValidURLSymbolElements();

+		this.pKeywordHack = new KeywordHackElements();

+		this.pValidURL = new ValidURLElements();

+		this.tIMPORTANT_SYM = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "IMPORTANT_SYM");

+		this.pIdentifier = new IdentifierElements();

+		this.pNum = new NumElements();

+		this.pHex = new HexElements();

+		this.tONE_INT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ONE_INT");

+		this.tONE_HEX_LETTER = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ONE_HEX_LETTER");

+		this.tONE_NON_HEX_LETTER = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ONE_NON_HEX_LETTER");

+		this.tUNDERSCORE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "UNDERSCORE");

+		this.tDASH = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "DASH");

+		this.tPLUS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "PLUS");

+		this.tHASHMARK = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "HASHMARK");

+		this.tCOMMA = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "COMMA");

+		this.tPERCENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "PERCENT");

+		this.tML_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ML_COMMENT");

+		this.tWS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "WS");

+		this.tCSSSTRING = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "CSSSTRING");

+		this.tINCLUDES = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "INCLUDES");

+		this.tDASHMATCH = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "DASHMATCH");

+		this.tCOLON = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "COLON");

+	}

+

+	protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {

+		Grammar grammar = grammarProvider.getGrammar(this);

+		while (grammar != null) {

+			if ("org.eclipse.papyrus.infra.gmfdiag.css3.CSS".equals(grammar.getName())) {

+				return grammar;

+			}

+			List<Grammar> grammars = grammar.getUsedGrammars();

+			if (!grammars.isEmpty()) {

+				grammar = grammars.iterator().next();

+			} else {

+				return null;

+			}

+		}

+		return grammar;

+	}

+

+	@Override

+	public Grammar getGrammar() {

+		return grammar;

+	}

+

+

+

+	// / *

+	// * TODOS:

+	// * - add more CSS grammar like import

+	// * / stylesheet:

+	// charset=charset? imports+=importExpression* (ruleset+=ruleset | media+=media | page+=page | font_face+=font_face |

+	// keyframes+=keyframes)*;

+	public StylesheetElements getStylesheetAccess() {

+		return pStylesheet;

+	}

+

+	public ParserRule getStylesheetRule() {

+		return getStylesheetAccess().getRule();

+	}

+

+	// charset:

+	// ("@charset" | "@CHARSET") charset=CSSSTRING ";";

+	public CharsetElements getCharsetAccess() {

+		return pCharset;

+	}

+

+	public ParserRule getCharsetRule() {

+		return getCharsetAccess().getRule();

+	}

+

+	// importExpression:

+	// ("@import" | "@IMPORT") (value=CSSSTRING | URLType mediaList=media_list?) ";";

+	public ImportExpressionElements getImportExpressionAccess() {

+		return pImportExpression;

+	}

+

+	public ParserRule getImportExpressionRule() {

+		return getImportExpressionAccess().getRule();

+	}

+

+	// page:

+	// {page} ("@page" | "@PAGE") pseudoPage=pseudo_page? "{" declarations+=css_declaration? (";"

+	// declarations+=css_declaration?)* "}";

+	public PageElements getPageAccess() {

+		return pPage;

+	}

+

+	public ParserRule getPageRule() {

+		return getPageAccess().getRule();

+	}

+

+	// pseudo_page:

+	// COLON Identifier;

+	public Pseudo_pageElements getPseudo_pageAccess() {

+		return pPseudo_page;

+	}

+

+	public ParserRule getPseudo_pageRule() {

+		return getPseudo_pageAccess().getRule();

+	}

+

+	// media:

+	// ("@media" | "@MEDIA") medialist=media_list "{" rulesets+=ruleset* "}";

+	public MediaElements getMediaAccess() {

+		return pMedia;

+	}

+

+	public ParserRule getMediaRule() {

+		return getMediaAccess().getRule();

+	}

+

+	// media_list:

+	// medium (COMMA medium)*;

+	public Media_listElements getMedia_listAccess() {

+		return pMedia_list;

+	}

+

+	public ParserRule getMedia_listRule() {

+		return getMedia_listAccess().getRule();

+	}

+

+	// medium:

+	// Identifier;

+	public MediumElements getMediumAccess() {

+		return pMedium;

+	}

+

+	public ParserRule getMediumRule() {

+		return getMediumAccess().getRule();

+	}

+

+	// font_face:

+	// {font_face} ("@font-face" | "@FONT-FACE") "{" declarations+=css_declaration? (";" declarations+=css_declaration?)*

+	// "}";

+	public Font_faceElements getFont_faceAccess() {

+		return pFont_face;

+	}

+

+	public ParserRule getFont_faceRule() {

+		return getFont_faceAccess().getRule();

+	}

+

+	// keyframes:

+	// {font_face} ("@keyframes" | "@KEYFRAMES") name=Identifier "{" keyframeselectors+=keyframe_selector? (";"

+	// keyframeselectors+=keyframe_selector?)* "}";

+	public KeyframesElements getKeyframesAccess() {

+		return pKeyframes;

+	}

+

+	public ParserRule getKeyframesRule() {

+		return getKeyframesAccess().getRule();

+	}

+

+	// keyframe_selector:

+	// (type=Identifier | percentage=Num PERCENT) "{" declarations+=css_declaration? (";" declarations+=css_declaration?)*

+	// "}";

+	public Keyframe_selectorElements getKeyframe_selectorAccess() {

+		return pKeyframe_selector;

+	}

+

+	public ParserRule getKeyframe_selectorRule() {

+		return getKeyframe_selectorAccess().getRule();

+	}

+

+	// ruleset:

+	// selectors+=selector (WS* COMMA selectors+=selector)* WS* "{" (declarations+=css_declaration (";"

+	// declarations+=css_declaration)* ";"?)? "}";

+	public RulesetElements getRulesetAccess() {

+		return pRuleset;

+	}

+

+	public ParserRule getRulesetRule() {

+		return getRulesetAccess().getRule();

+	}

+

+	// // check simple_selctor cardinality

+	// selector hidden(ML_COMMENT):

+	// simpleselectors+=simple_selector (combinator=combinator WS* selector=selector | WS+ (combinator=combinator WS*)?

+	// selector=selector)?;

+	public SelectorElements getSelectorAccess() {

+		return pSelector;

+	}

+

+	public ParserRule getSelectorRule() {

+		return getSelectorAccess().getRule();

+	}

+

+	// SimpleSelectorForNegation:

+	// (element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelectorForNegation* | =>

+	// subSelectors+=SubSelectorForNegation+;

+	public SimpleSelectorForNegationElements getSimpleSelectorForNegationAccess() {

+		return pSimpleSelectorForNegation;

+	}

+

+	public ParserRule getSimpleSelectorForNegationRule() {

+		return getSimpleSelectorForNegationAccess().getRule();

+	}

+

+	// SubSelectorForNegation returns CssSelector:

+	// IdSelector | ClassSelector | AttributeSelector | PseudoClass;

+	public SubSelectorForNegationElements getSubSelectorForNegationAccess() {

+		return pSubSelectorForNegation;

+	}

+

+	public ParserRule getSubSelectorForNegationRule() {

+		return getSubSelectorForNegationAccess().getRule();

+	}

+

+	// simple_selector hidden(ML_COMMENT):

+	// (element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelector* | subSelectors+=SubSelector+;

+	public Simple_selectorElements getSimple_selectorAccess() {

+		return pSimple_selector;

+	}

+

+	public ParserRule getSimple_selectorRule() {

+		return getSimple_selectorAccess().getRule();

+	}

+

+	// SubSelector returns CssSelector:

+	// IdSelector | ClassSelector | AttributeSelector | PseudoClassOrFunc;

+	public SubSelectorElements getSubSelectorAccess() {

+		return pSubSelector;

+	}

+

+	public ParserRule getSubSelectorRule() {

+		return getSubSelectorAccess().getRule();

+	}

+

+	// AttributeSelector returns CssSelector:

+	// {AttributeSelector} "[" name=Identifier (op=("^=" | "$=" | "*=" | "=" | INCLUDES | DASHMATCH) value=(Identifier |

+	// CSSSTRING))? "]";

+	public AttributeSelectorElements getAttributeSelectorAccess() {

+		return pAttributeSelector;

+	}

+

+	public ParserRule getAttributeSelectorRule() {

+		return getAttributeSelectorAccess().getRule();

+	}

+

+	// ClassSelector:

+	// {ClassSelector} "." name=Identifier;

+	public ClassSelectorElements getClassSelectorAccess() {

+		return pClassSelector;

+	}

+

+	public ParserRule getClassSelectorRule() {

+		return getClassSelectorAccess().getRule();

+	}

+

+	// ElementSelector:

+	// {ElementSelector} name=Identifier;

+	public ElementSelectorElements getElementSelectorAccess() {

+		return pElementSelector;

+	}

+

+	public ParserRule getElementSelectorRule() {

+		return getElementSelectorAccess().getRule();

+	}

+

+	// UniversalSelector:

+	// {UniversalSelector} namespace=css_namespace_prefix? "*";

+	public UniversalSelectorElements getUniversalSelectorAccess() {

+		return pUniversalSelector;

+	}

+

+	public ParserRule getUniversalSelectorRule() {

+		return getUniversalSelectorAccess().getRule();

+	}

+

+	// IdSelector:

+	// {IdSelector} HASHMARK name=Identifier;

+	public IdSelectorElements getIdSelectorAccess() {

+		return pIdSelector;

+	}

+

+	public ParserRule getIdSelectorRule() {

+		return getIdSelectorAccess().getRule();

+	}

+

+	// css_namespace_prefix:

+	// (Identifier | "*")? "|";

+	public Css_namespace_prefixElements getCss_namespace_prefixAccess() {

+		return pCss_namespace_prefix;

+	}

+

+	public ParserRule getCss_namespace_prefixRule() {

+		return getCss_namespace_prefixAccess().getRule();

+	}

+

+	// css_declaration hidden(ML_COMMENT):

+	// WS* property=css_property WS* COLON valueTokens+=CssTok+ important?=IMPORTANT_SYM?;

+	public Css_declarationElements getCss_declarationAccess() {

+		return pCss_declaration;

+	}

+

+	public ParserRule getCss_declarationRule() {

+		return getCss_declarationAccess().getRule();

+	}

+

+	// css_property:

+	// {css_property} name=ValidPropertyIdent;

+	public Css_propertyElements getCss_propertyAccess() {

+		return pCss_property;

+	}

+

+	public ParserRule getCss_propertyRule() {

+		return getCss_propertyAccess().getRule();

+	}

+

+	// ValidPropertyIdent:

+	// Identifier;

+	public ValidPropertyIdentElements getValidPropertyIdentAccess() {

+		return pValidPropertyIdent;

+	}

+

+	public ParserRule getValidPropertyIdentRule() {

+		return getValidPropertyIdentAccess().getRule();

+	}

+

+	// PseudoClassOrFunc:

+	// PseudoClass | PseudoClassFunction;

+	public PseudoClassOrFuncElements getPseudoClassOrFuncAccess() {

+		return pPseudoClassOrFunc;

+	}

+

+	public ParserRule getPseudoClassOrFuncRule() {

+		return getPseudoClassOrFuncAccess().getRule();

+	}

+

+	// PseudoClass:

+	// COLON COLON? PseudoClassName;

+	public PseudoClassElements getPseudoClassAccess() {

+		return pPseudoClass;

+	}

+

+	public ParserRule getPseudoClassRule() {

+		return getPseudoClassAccess().getRule();

+	}

+

+	// PseudoClassName:

+	// name=Identifier;

+	public PseudoClassNameElements getPseudoClassNameAccess() {

+		return pPseudoClassName;

+	}

+

+	public ParserRule getPseudoClassNameRule() {

+		return getPseudoClassNameAccess().getRule();

+	}

+

+	// PseudoClassFunction:

+	// not?=NotFunctionCall paramSelector=SimpleSelectorForNegation ")" | COLON name=Identifier "(" params+=CssTok* ")";

+	public PseudoClassFunctionElements getPseudoClassFunctionAccess() {

+		return pPseudoClassFunction;

+	}

+

+	public ParserRule getPseudoClassFunctionRule() {

+		return getPseudoClassFunctionAccess().getRule();

+	}

+

+	// NotFunctionCall hidden():

+	// COLON "not(";

+	public NotFunctionCallElements getNotFunctionCallAccess() {

+		return pNotFunctionCall;

+	}

+

+	public ParserRule getNotFunctionCallRule() {

+		return getNotFunctionCallAccess().getRule();

+	}

+

+	// combinator:

+	// PLUS | ">" | "~";

+	public CombinatorElements getCombinatorAccess() {

+		return pCombinator;

+	}

+

+	public ParserRule getCombinatorRule() {

+		return getCombinatorAccess().getRule();

+	}

+

+	// operator:

+	// "/" | COMMA;

+	public OperatorElements getOperatorAccess() {

+		return pOperator;

+	}

+

+	public ParserRule getOperatorRule() {

+		return getOperatorAccess().getRule();

+	}

+

+	// unary_operator:

+	// DASH | PLUS;

+	public Unary_operatorElements getUnary_operatorAccess() {

+		return pUnary_operator;

+	}

+

+	public ParserRule getUnary_operatorRule() {

+		return getUnary_operatorAccess().getRule();

+	}

+

+	// SymbolTok returns CssTok:

+	// {SymbolTok} symbol=(COMMA | PERCENT);

+	public SymbolTokElements getSymbolTokAccess() {

+		return pSymbolTok;

+	}

+

+	public ParserRule getSymbolTokRule() {

+		return getSymbolTokAccess().getRule();

+	}

+

+	// WSTok returns CssTok:

+	// {WSTok} WS;

+	public WSTokElements getWSTokAccess() {

+		return pWSTok;

+	}

+

+	public ParserRule getWSTokRule() {

+		return getWSTokAccess().getRule();

+	}

+

+	// StringTok returns CssTok:

+	// {StringTok} value=CSSSTRING;

+	public StringTokElements getStringTokAccess() {

+		return pStringTok;

+	}

+

+	public ParserRule getStringTokRule() {

+		return getStringTokAccess().getRule();

+	}

+

+	// // {NumberTok} DASH? ( ONE_INT+ | ONE_INT* '.' => ONE_INT+)

+	// // {NumberTok} val=Integer | Real

+	// //sign=DASH? ( ival=Integer | dval=Real)

+	// NumberTok returns CssTok hidden():

+	// {NumberTok} val=Num;

+	public NumberTokElements getNumberTokAccess() {

+		return pNumberTok;

+	}

+

+	public ParserRule getNumberTokRule() {

+		return getNumberTokAccess().getRule();

+	}

+

+	// UrlTok returns CssTok:

+	// {UrlTok} url=URLType;

+	public UrlTokElements getUrlTokAccess() {

+		return pUrlTok;

+	}

+

+	public ParserRule getUrlTokRule() {

+		return getUrlTokAccess().getRule();

+	}

+

+	// ColorTok returns CssTok hidden():

+	// {ColorTok} value=Hex;

+	public ColorTokElements getColorTokAccess() {

+		return pColorTok;

+	}

+

+	public ParserRule getColorTokRule() {

+		return getColorTokAccess().getRule();

+	}

+

+	// IdentifierOrFuncTok returns CssTok hidden(ML_COMMENT):

+	// {IdentifierTok} name=Identifier ({FuncTok.name=current} "(" params+=CssTok+ ")")?;

+	public IdentifierOrFuncTokElements getIdentifierOrFuncTokAccess() {

+		return pIdentifierOrFuncTok;

+	}

+

+	public ParserRule getIdentifierOrFuncTokRule() {

+		return getIdentifierOrFuncTokAccess().getRule();

+	}

+

+	// CssTok hidden(ML_COMMENT):

+	// IdentifierOrFuncTok | SymbolTok | WSTok | StringTok | NumberTok | UrlTok | ColorTok;

+	public CssTokElements getCssTokAccess() {

+		return pCssTok;

+	}

+

+	public ParserRule getCssTokRule() {

+		return getCssTokAccess().getRule();

+	}

+

+	// URLType hidden(): // FULLURL

+	// "url(" url=ValidURL ")";

+	public URLTypeElements getURLTypeAccess() {

+		return pURLType;

+	}

+

+	public ParserRule getURLTypeRule() {

+		return getURLTypeAccess().getRule();

+	}

+

+	// ValidURLSymbol:

+	// DASH / * "'" | '(' | ')' | need to be escaped* / | "." | UNDERSCORE | "~" | COLON | "/" | "?" | HASHMARK | "[" | "]" |

+	// "@" | "!" | "$" | "&" | "*" | PLUS | COMMA | ";" | "=" KeywordHack;

+	public ValidURLSymbolElements getValidURLSymbolAccess() {

+		return pValidURLSymbol;

+	}

+

+	public ParserRule getValidURLSymbolRule() {

+		return getValidURLSymbolAccess().getRule();

+	}

+

+	// KeywordHack:

+	// "not" | "no" | "url" | "ur";

+	public KeywordHackElements getKeywordHackAccess() {

+		return pKeywordHack;

+	}

+

+	public ParserRule getKeywordHackRule() {

+		return getKeywordHackAccess().getRule();

+	}

+

+	// ValidURL returns ecore::EString hidden():

+	// CSSSTRING | (ValidURLSymbol | KeywordHack | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | ONE_INT | "\\ " | "\\(" | "\\)" |

+	// "\\\'" | "\\\"" | PERCENT (ONE_INT | ONE_HEX_LETTER) (ONE_INT | ONE_HEX_LETTER))+;

+	public ValidURLElements getValidURLAccess() {

+		return pValidURL;

+	}

+

+	public ParserRule getValidURLRule() {

+		return getValidURLAccess().getRule();

+	}

+

+	// terminal IMPORTANT_SYM:

+	// "!important";

+	public TerminalRule getIMPORTANT_SYMRule() {

+		return tIMPORTANT_SYM;

+	}

+

+	// Identifier returns ecore::EString hidden():

+	// DASH? (UNDERSCORE | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | KeywordHack) => (UNDERSCORE | DASH | ONE_HEX_LETTER |

+	// ONE_NON_HEX_LETTER | ONE_INT | KeywordHack)*;

+	public IdentifierElements getIdentifierAccess() {

+		return pIdentifier;

+	}

+

+	public ParserRule getIdentifierRule() {

+		return getIdentifierAccess().getRule();

+	}

+

+	// Num returns ecore::EDouble hidden():

+	// (PLUS | DASH)? ("." => ONE_INT+ | ONE_INT+ ("." => ONE_INT+)?);

+	public NumElements getNumAccess() {

+		return pNum;

+	}

+

+	public ParserRule getNumRule() {

+		return getNumAccess().getRule();

+	}

+

+	// Hex returns ecore::EString:

+	// HASHMARK => (ONE_INT | ONE_HEX_LETTER)+;

+	public HexElements getHexAccess() {

+		return pHex;

+	}

+

+	public ParserRule getHexRule() {

+		return getHexAccess().getRule();

+	}

+

+	// //terminal fragment URL_ESCAPES:

+	// // '\\' (' '|'('|')'|"'"|'"')

+	// //;

+	// //

+	// //terminal FULLURL:

+	// // 'url('

+	// // '"' ( URL_ESCAPES | !('\\'|'"'|')') )* '"' |

+	// // "'" ( URL_ESCAPES | !('\\'|"'"|')') )* "'" |

+	// // ( URL_ESCAPES | !('\\'|')') )*

+	// // ')'

+	// //;

+	// terminal ONE_INT:

+	// "0".."9";

+	public TerminalRule getONE_INTRule() {

+		return tONE_INT;

+	}

+

+	// terminal ONE_HEX_LETTER:

+	// "a".."f" | "A".."F";

+	public TerminalRule getONE_HEX_LETTERRule() {

+		return tONE_HEX_LETTER;

+	}

+

+	// terminal ONE_NON_HEX_LETTER:

+	// "g".."z" | "G".."Z";

+	public TerminalRule getONE_NON_HEX_LETTERRule() {

+		return tONE_NON_HEX_LETTER;

+	}

+

+	// terminal UNDERSCORE:

+	// "_";

+	public TerminalRule getUNDERSCORERule() {

+		return tUNDERSCORE;

+	}

+

+	// terminal DASH:

+	// "-";

+	public TerminalRule getDASHRule() {

+		return tDASH;

+	}

+

+	// terminal PLUS:

+	// "+";

+	public TerminalRule getPLUSRule() {

+		return tPLUS;

+	}

+

+	// //terminal INTEGER returns ecore::EInt: ('0'..'9')+;

+	// //terminal INTEGER:('0'..'9')+;

+	// //terminal REAL: (('0'..'9')*"."('0'..'9')+);

+	// //terminal HASH: '#' ('_' | '-' | 'a'..'z' | 'A'..'Z' | '0'..'9' )+;

+	// terminal HASHMARK:

+	// "#";

+	public TerminalRule getHASHMARKRule() {

+		return tHASHMARK;

+	}

+

+	// //terminal COLORHASH: '#' ('a'..'z' | 'A'..'Z' | '0'..'9' )+;

+	// //terminal IDENT: ('_' | 'a'..'z' | 'A'..'Z' ) ('_' | '-' | 'a'..'z' | 'A'..'Z' | '0'..'9' )*;

+	// //terminal HEX: '###' ('a'..'z' | 'A'..'Z' | '0'..'9' )+;

+	// terminal COMMA:

+	// ",";

+	public TerminalRule getCOMMARule() {

+		return tCOMMA;

+	}

+

+	// terminal PERCENT:

+	// "%";

+	public TerminalRule getPERCENTRule() {

+		return tPERCENT;

+	}

+

+	// terminal ML_COMMENT:

+	// "/ *"->"* /";

+	public TerminalRule getML_COMMENTRule() {

+		return tML_COMMENT;

+	}

+

+	// terminal WS:

+	// (" " | "\t" | "\r" | "\n")+;

+	public TerminalRule getWSRule() {

+		return tWS;

+	}

+

+	// terminal CSSSTRING:

+	// "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "0".."9" | "a".."f" | "A".."F" | "\\") | !("\\" |

+	// "\""))* "\"" | "\'" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "0".."9" | "a".."f" | "A".."F" | "\\") |

+	// !("\\" | "\'"))* "\'";

+	public TerminalRule getCSSSTRINGRule() {

+		return tCSSSTRING;

+	}

+

+	// terminal INCLUDES:

+	// "~=";

+	public TerminalRule getINCLUDESRule() {

+		return tINCLUDES;

+	}

+

+	// terminal DASHMATCH:

+	// "|=";

+	public TerminalRule getDASHMATCHRule() {

+		return tDASHMATCH;

+	}

+

+	// terminal COLON:

+	// ":";

+	public TerminalRule getCOLONRule() {

+		return tCOLON;

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/validation/AbstractCSSValidator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/validation/AbstractCSSValidator.java
new file mode 100644
index 00000000000..21b86305be7
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/validation/AbstractCSSValidator.java
@@ -0,0 +1,18 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.validation;

+

+import java.util.ArrayList;

+import java.util.List;

+import org.eclipse.emf.ecore.EPackage;

+

+public class AbstractCSSValidator extends org.eclipse.xtext.validation.AbstractDeclarativeValidator {

+

+	@Override

+	protected List<EPackage> getEPackages() {

+		List<EPackage> result = new ArrayList<EPackage>();

+		result.add(org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage.eINSTANCE);

+		return result;

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSS.xtext b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSS.xtext
new file mode 100644
index 00000000000..61a501b25e2
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSS.xtext
@@ -0,0 +1,339 @@
+/*

+ * Copied from org.eclipse.fx.ide.css

+ */

+grammar org.eclipse.papyrus.infra.gmfdiag.css3.CSS hidden(WS, ML_COMMENT)

+

+import "http://www.eclipse.org/emf/2002/Ecore" as ecore

+

+generate cSS "http://www.eclipse.org/papyrus/infra/gmfdiag/css3/CSS"

+

+

+/*

+ * TODOS:

+ * - add more CSS grammar like import

+ */

+

+

+stylesheet:

+	charset=charset?

+	imports+=importExpression*

+	(

+		ruleset+=ruleset |

+		media+=media |

+		page+=page |

+		font_face+=font_face |

+		keyframes+=keyframes

+	)*

+;

+

+charset:

+	('@charset'|'@CHARSET') charset=CSSSTRING ';'

+;

+

+importExpression:

+	('@import'|'@IMPORT') (value=CSSSTRING | URLType mediaList=media_list?) ';'

+;

+

+page:

+	{page} ('@page'|'@PAGE') pseudoPage=pseudo_page?

+    '{' declarations+=css_declaration? ( ';' declarations+=css_declaration? )* '}'

+;

+

+pseudo_page:

+	COLON Identifier

+;

+

+media:

+	('@media'|'@MEDIA') medialist=media_list '{' rulesets+=ruleset* '}'

+;

+

+media_list:

+	medium ( COMMA medium)*

+;

+

+medium:

+	Identifier

+;

+

+font_face:

+	{font_face} ('@font-face'|'@FONT-FACE')

+	'{' declarations+=css_declaration? ( ';' declarations+=css_declaration? )* '}'

+;

+

+keyframes:

+	{font_face} ('@keyframes'|'@KEYFRAMES') name=Identifier

+	'{' keyframeselectors+=keyframe_selector? ( ';' keyframeselectors+=keyframe_selector? )* '}'

+;

+

+keyframe_selector:

+	(type=Identifier | (percentage=Num PERCENT)) '{'

+		declarations+=css_declaration? ( ';' declarations+=css_declaration? )*

+	'}'

+;

+

+

+ruleset:

+	selectors+=selector ( WS* COMMA selectors+=selector )* WS* '{'

+		(declarations+=css_declaration (';' declarations+=css_declaration)* ';'?)?

+	'}'

+;

+

+// check simple_selctor cardinality

+selector hidden(ML_COMMENT):

+	simpleselectors+=simple_selector ( combinator=combinator WS* selector=selector | WS+ (combinator=combinator WS*)? selector=selector )?

+;

+

+SimpleSelectorForNegation:

+	((element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelectorForNegation*) |

+	=> subSelectors+=SubSelectorForNegation+

+;

+

+SubSelectorForNegation returns CssSelector:

+	IdSelector |

+	ClassSelector |

+	AttributeSelector |

+	PseudoClass

+;

+

+simple_selector hidden(ML_COMMENT):

+	((element=ElementSelector | universal=UniversalSelector) subSelectors+=SubSelector*) |

+	subSelectors+=SubSelector+

+;

+

+SubSelector returns CssSelector:

+	IdSelector |

+	ClassSelector |

+	AttributeSelector |

+	PseudoClassOrFunc

+;

+

+AttributeSelector returns CssSelector:

+	{AttributeSelector} '[' name=Identifier ( op=( '^=' | '$=' | '*=' | '=' | INCLUDES | DASHMATCH ) value=( Identifier | CSSSTRING ) )? ']'

+;

+

+ClassSelector:

+	{ClassSelector} '.' name=Identifier

+;

+

+ElementSelector:

+	{ElementSelector} name=Identifier

+;

+

+UniversalSelector:

+	{UniversalSelector} ( namespace=css_namespace_prefix )? '*'

+;

+

+IdSelector:

+	{IdSelector} HASHMARK name=Identifier

+;

+

+css_namespace_prefix

+  : ( Identifier | '*' )? '|'

+  ;

+

+css_declaration hidden(ML_COMMENT):

+	WS* property=css_property WS* COLON valueTokens+=CssTok+ important?=IMPORTANT_SYM?

+;

+

+css_property:

+	{css_property} name=ValidPropertyIdent

+;

+

+ValidPropertyIdent:

+	Identifier

+;

+

+PseudoClassOrFunc:

+	PseudoClass | PseudoClassFunction

+;

+

+PseudoClass:

+	COLON COLON? PseudoClassName

+;

+

+PseudoClassName:

+	name=Identifier

+;

+

+PseudoClassFunction:

+	not?=NotFunctionCall paramSelector=SimpleSelectorForNegation ')' |

+	COLON name=Identifier '(' params+=CssTok* ')'

+;

+

+NotFunctionCall hidden():

+	COLON 'not('

+;

+

+combinator

+  :

+  (

+  	  PLUS

+  	| '>'

+  	| '~'

+  )

+;

+

+operator

+  : '/' | COMMA

+  ;

+

+unary_operator

+  : DASH | PLUS

+  ;

+

+SymbolTok returns CssTok:

+	{SymbolTok} symbol=(COMMA|PERCENT)

+;

+

+WSTok returns CssTok:

+	{WSTok} WS

+;

+

+StringTok returns CssTok:

+	{StringTok} value=CSSSTRING

+;

+

+

+

+NumberTok returns CssTok hidden():

+	{NumberTok} val=Num

+

+//	{NumberTok} DASH? ( ONE_INT+ | ONE_INT* '.' => ONE_INT+)

+

+//	{NumberTok} val=Integer | Real

+	//sign=DASH? ( ival=Integer | dval=Real)

+;

+

+

+UrlTok returns CssTok:

+	{UrlTok} url=URLType

+;

+

+ColorTok returns CssTok hidden():

+	{ColorTok} value=Hex

+;

+

+IdentifierOrFuncTok returns CssTok hidden(ML_COMMENT):

+	{IdentifierTok} name=Identifier ( {FuncTok.name=current} '(' params+=CssTok+ ')')?

+;

+

+CssTok hidden(ML_COMMENT):

+	IdentifierOrFuncTok |

+	SymbolTok |

+	WSTok |

+	StringTok |

+	NumberTok |

+	UrlTok |

+	ColorTok

+;

+

+

+URLType hidden():

+//	FULLURL

+	 'url(' url=ValidURL ')'

+;

+

+ValidURLSymbol:

+	DASH | '.' | UNDERSCORE | '~' | COLON |

+	'/' |'?' | HASHMARK | '[' | ']' | '@' |

+	'!' | '$' | '&' | /* "'" | '(' | ')' | need to be escaped*/

+	'*' | PLUS | COMMA | ';' | '='

+	KeywordHack

+;

+

+KeywordHack:

+	'not' |

+	'no' |

+	'url' |

+	'ur'

+;

+

+ValidURL returns ecore::EString hidden():

+	CSSSTRING |

+	( ValidURLSymbol |

+	  KeywordHack |

+	  ONE_HEX_LETTER |

+	  ONE_NON_HEX_LETTER |

+	  ONE_INT |

+	  '\\ ' |

+	  '\\(' |

+	  '\\)' |

+	  '\\\'' |

+	  '\\"' |

+	  PERCENT (ONE_INT|ONE_HEX_LETTER) (ONE_INT|ONE_HEX_LETTER)

+	)+

+;

+

+terminal IMPORTANT_SYM:

+	'!important'

+;

+

+Identifier returns ecore::EString hidden():

+	DASH? (UNDERSCORE | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | KeywordHack) => (UNDERSCORE | DASH | ONE_HEX_LETTER | ONE_NON_HEX_LETTER | ONE_INT | KeywordHack)*

+;

+

+Num returns ecore::EDouble hidden():

+	(PLUS|DASH)? (

+		'.' => ONE_INT+ |

+		=> ONE_INT+ (=> '.' => ONE_INT+)?

+	)

+;

+

+Hex returns ecore::EString:

+	HASHMARK => (ONE_INT|ONE_HEX_LETTER)+

+;

+

+

+//terminal fragment URL_ESCAPES:

+//	'\\' (' '|'('|')'|"'"|'"')

+//;

+//

+//terminal FULLURL:

+//	'url('

+//		'"' ( URL_ESCAPES | !('\\'|'"'|')') )* '"' |

+//		"'" ( URL_ESCAPES | !('\\'|"'"|')') )* "'" |

+//		( URL_ESCAPES | !('\\'|')') )*

+//	')'

+//;

+

+

+terminal ONE_INT: '0'..'9';

+terminal ONE_HEX_LETTER: ('a'..'f'|'A'..'F');

+terminal ONE_NON_HEX_LETTER: ('g'..'z'|'G'..'Z');

+

+

+terminal UNDERSCORE: '_';

+terminal DASH: '-';

+terminal PLUS: '+';

+

+//terminal INTEGER returns ecore::EInt: ('0'..'9')+;

+//terminal INTEGER:('0'..'9')+;

+

+//terminal REAL: (('0'..'9')*"."('0'..'9')+);

+//terminal HASH: '#' ('_' | '-' | 'a'..'z' | 'A'..'Z' | '0'..'9' )+;

+

+terminal HASHMARK: '#';

+

+//terminal COLORHASH: '#' ('a'..'z' | 'A'..'Z' | '0'..'9' )+;

+

+//terminal IDENT: ('_' | 'a'..'z' | 'A'..'Z' ) ('_' | '-' | 'a'..'z' | 'A'..'Z' | '0'..'9' )*;

+

+//terminal HEX: '###' ('a'..'z' | 'A'..'Z' | '0'..'9' )+;

+

+terminal COMMA: ',';

+terminal PERCENT: '%';

+

+terminal ML_COMMENT	: '/*' -> '*/';

+terminal WS			: (' '|'\t'|'\r'|'\n')+;

+

+

+

+terminal CSSSTRING	:

+			'"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'0'..'9'|'a'..'f'|'A'..'F'|'\\') | !('\\'|'"') )* '"' |

+			"'" ( '\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'0'..'9'|'a'..'f'|'A'..'F'|'\\') | !('\\'|"'") )* "'";

+

+

+terminal INCLUDES: "~=";

+terminal DASHMATCH: "|=";

+

+terminal COLON: ':';
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSSRuntimeModule.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSSRuntimeModule.java
new file mode 100644
index 00000000000..00e48686b1a
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSSRuntimeModule.java
@@ -0,0 +1,19 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3;

+

+import org.eclipse.xtext.formatting.IFormatter;

+import org.eclipse.xtext.formatting.impl.NullFormatter;

+

+/**

+ * Use this class to register components to be used at runtime / without the Equinox extension registry.

+ */

+public class CSSRuntimeModule extends org.eclipse.papyrus.infra.gmfdiag.css3.AbstractCSSRuntimeModule {

+

+	// Formatter is not properly implemented yet. Disable all formatting to avoid errors

+	@Override

+	public Class<? extends IFormatter> bindIFormatter() {

+		return NullFormatter.class;

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSSStandaloneSetup.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSSStandaloneSetup.java
index a9b3e35e973..28234d44b9e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSSStandaloneSetup.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSSStandaloneSetup.java
@@ -1,12 +1,15 @@
-package org.eclipse.papyrus.infra.gmfdiag;
-
-/**
- * Initialization support for running Xtext languages
- * without equinox extension registry
- */
-public class CSSStandaloneSetup extends CSSStandaloneSetupGenerated {
-
-	public static void doSetup() {
-		new CSSStandaloneSetup().createInjectorAndDoEMFRegistration();
-	}
-}
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3;

+

+/**

+ * Initialization support for running Xtext languages

+ * without equinox extension registry

+ */

+public class CSSStandaloneSetup extends CSSStandaloneSetupGenerated {

+

+	public static void doSetup() {

+		new CSSStandaloneSetup().createInjectorAndDoEMFRegistration();

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/GenerateCSS.mwe2 b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/GenerateCSS.mwe2
new file mode 100644
index 00000000000..13b03455c58
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/GenerateCSS.mwe2
@@ -0,0 +1,133 @@
+module org.eclipse.papyrus.infra.gmfdiag.css3.GenerateCSS

+

+import org.eclipse.emf.mwe.utils.*

+import org.eclipse.xtext.generator.*

+import org.eclipse.xtext.ui.generator.*

+

+var grammarURI = "classpath:/org/eclipse/papyrus/infra/gmfdiag/css3/CSS.xtext"

+var fileExtensions = "css"

+var projectName = "org.eclipse.papyrus.infra.gmfdiag.css3.xtext"

+var runtimeProject = "../${projectName}"

+var generateXtendStub = true

+var encoding = "UTF-8"

+

+Workflow {

+    bean = StandaloneSetup {

+    	scanClassPath = true

+    	platformUri = "${runtimeProject}/.."

+    	// The following two lines can be removed, if Xbase is not used.

+    	registerGeneratedEPackage = "org.eclipse.xtext.xbase.XbasePackage"

+    	registerGenModelFile = "platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel"

+    }

+    

+    component = DirectoryCleaner {

+    	directory = "${runtimeProject}/src-gen"

+    }

+    

+    component = DirectoryCleaner {

+    	directory = "${runtimeProject}/model/generated"

+    }

+    

+    component = DirectoryCleaner {

+    	directory = "${runtimeProject}.ui/src-gen"

+    }

+    

+    component = DirectoryCleaner {

+    	directory = "${runtimeProject}.tests/src-gen"

+    }

+    

+    component = Generator {

+    	pathRtProject = runtimeProject

+    	pathUiProject = "${runtimeProject}.ui"

+    	pathTestProject = "${runtimeProject}.tests"

+    	projectNameRt = projectName

+    	projectNameUi = "${projectName}.ui"

+    	encoding = encoding

+    	language = auto-inject {

+    		uri = grammarURI

+    

+    		// Java API to access grammar elements (required by several other fragments)

+    		fragment = grammarAccess.GrammarAccessFragment auto-inject {}

+    

+    		// generates Java API for the generated EPackages

+    		fragment = ecore.EMFGeneratorFragment auto-inject {}

+    

+    		// the old serialization component

+    		// fragment = parseTreeConstructor.ParseTreeConstructorFragment auto-inject {}    

+    

+    		// serializer 2.0

+    		fragment = serializer.SerializerFragment auto-inject {

+    			generateStub = false

+    		}

+    

+    		// a custom ResourceFactory for use with EMF

+    		fragment = resourceFactory.ResourceFactoryFragment auto-inject {}

+    

+    		// The antlr parser generator fragment.

+    		fragment = parser.antlr.XtextAntlrGeneratorFragment auto-inject {

+    		//  options = {

+    		//      backtrack = true

+    		//  }

+    		}

+    

+    		// Xtend-based API for validation

+    		fragment = validation.ValidatorFragment auto-inject {

+    		//    composedCheck = "org.eclipse.xtext.validation.ImportUriValidator"

+    		//    composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"

+    		}

+    

+    		// old scoping and exporting API

+    		// fragment = scoping.ImportURIScopingFragment auto-inject {}

+    		// fragment = exporting.SimpleNamesFragment auto-inject {}

+    

+    		// scoping and exporting API

+    		fragment = scoping.ImportNamespacesScopingFragment auto-inject {}

+    		fragment = exporting.QualifiedNamesFragment auto-inject {}

+    		fragment = builder.BuilderIntegrationFragment auto-inject {}

+    

+    		// generator API

+    		fragment = generator.GeneratorFragment auto-inject {}

+    

+    		// formatter API

+    		fragment = formatting.FormatterFragment auto-inject {}

+    

+    		// labeling API

+    		fragment = labeling.LabelProviderFragment auto-inject {}

+    

+    		// outline API

+    		fragment = outline.OutlineTreeProviderFragment auto-inject {}

+    		fragment = outline.QuickOutlineFragment auto-inject {}

+    

+    		// quickfix API

+    		fragment = quickfix.QuickfixProviderFragment auto-inject {}

+    

+    		// content assist API

+    		fragment = contentAssist.ContentAssistFragment auto-inject {}

+    

+    		// generates a more lightweight Antlr parser and lexer tailored for content assist

+    		fragment = parser.antlr.XtextAntlrUiGeneratorFragment auto-inject {}

+    

+    		// generates junit test support classes into Generator#pathTestProject

+    		fragment = junit.Junit4Fragment auto-inject {}

+    

+    		// rename refactoring

+    		fragment = refactoring.RefactorElementNameFragment auto-inject {}

+    

+    		// provides the necessary bindings for java types integration

+    		fragment = types.TypesGeneratorFragment auto-inject {}

+    

+    		// generates the required bindings only if the grammar inherits from Xbase

+    		fragment = xbase.XbaseGeneratorFragment auto-inject {}

+    		

+    		// generates the required bindings only if the grammar inherits from Xtype

+    		fragment = xbase.XtypeGeneratorFragment auto-inject {}

+    

+    		// provides a preference page for template proposals

+    		fragment = templates.CodetemplatesGeneratorFragment auto-inject {}

+    

+    		// provides a compare view

+    		fragment = compare.CompareFragment auto-inject {}

+    	}

+    }

+}

+

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/formatting/CSSFormatter.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/formatting/CSSFormatter.xtend
new file mode 100644
index 00000000000..f812d4e1b21
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/formatting/CSSFormatter.xtend
@@ -0,0 +1,30 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.formatting

+

+import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter

+import org.eclipse.xtext.formatting.impl.FormattingConfig

+// import com.google.inject.Inject;

+// import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess

+

+/**

+ * This class contains custom formatting declarations.

+ * 

+ * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#formatting

+ * on how and when to use it.

+ * 

+ * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example

+ */

+class CSSFormatter extends AbstractDeclarativeFormatter {

+

+//	@Inject extension CSSGrammarAccess

+	

+	override protected void configureFormatting(FormattingConfig c) {

+// It's usually a good idea to activate the following three statements.

+// They will add and preserve newlines around comments

+//		c.setLinewrap(0, 1, 2).before(SL_COMMENTRule)

+//		c.setLinewrap(0, 1, 2).before(ML_COMMENTRule)

+//		c.setLinewrap(0, 1, 1).after(ML_COMMENTRule)

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/generator/CSSGenerator.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/generator/CSSGenerator.xtend
new file mode 100644
index 00000000000..e4fabb1ed8c
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/generator/CSSGenerator.xtend
@@ -0,0 +1,24 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.generator

+

+import org.eclipse.emf.ecore.resource.Resource

+import org.eclipse.xtext.generator.IGenerator

+import org.eclipse.xtext.generator.IFileSystemAccess

+

+/**

+ * Generates code from your model files on save.

+ * 

+ * see http://www.eclipse.org/Xtext/documentation.html#TutorialCodeGeneration

+ */

+class CSSGenerator implements IGenerator {

+	

+	override void doGenerate(Resource resource, IFileSystemAccess fsa) {

+//		fsa.generateFile('greetings.txt', 'People to greet: ' + 

+//			resource.allContents

+//				.filter(typeof(Greeting))

+//				.map[name]

+//				.join(', '))

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/scoping/CSSScopeProvider.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/scoping/CSSScopeProvider.xtend
new file mode 100644
index 00000000000..391b47a97fb
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/scoping/CSSScopeProvider.xtend
@@ -0,0 +1,15 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.scoping

+

+/**

+ * This class contains custom scoping description.

+ * 

+ * see : http://www.eclipse.org/Xtext/documentation.html#scoping

+ * on how and when to use it 

+ *

+ */

+class CSSScopeProvider extends org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider {

+

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/validation/CSSValidator.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/validation/CSSValidator.xtend
new file mode 100644
index 00000000000..e8ad9f9ae81
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/validation/CSSValidator.xtend
@@ -0,0 +1,25 @@
+/*

+ * generated by Xtext

+ */

+package org.eclipse.papyrus.infra.gmfdiag.css3.validation

+

+//import org.eclipse.xtext.validation.Check

+

+/**

+ * Custom validation rules. 

+ *

+ * see http://www.eclipse.org/Xtext/documentation.html#validation

+ */

+class CSSValidator extends AbstractCSSValidator {

+

+//  public static val INVALID_NAME = 'invalidName'

+//

+//	@Check

+//	def checkGreetingStartsWithCapital(Greeting greeting) {

+//		if (!Character.isUpperCase(greeting.name.charAt(0))) {

+//			warning('Name should start with a capital', 

+//					MyDslPackage.Literals.GREETING__NAME,

+//					INVALID_NAME)

+//		}

+//	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/xtend-gen/.gitignore b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/xtend-gen/.gitignore
new file mode 100644
index 00000000000..c96a04f008e
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/xtend-gen/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/DefaultSemanticEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/DefaultSemanticEditPolicy.java
index a1adb1a0884..e4ed419efb0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/DefaultSemanticEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/DefaultSemanticEditPolicy.java
@@ -122,7 +122,11 @@ public class DefaultSemanticEditPolicy extends SemanticEditPolicy {
 

 

 	protected Command getCreateCommand(CreateElementRequest req) {

-		return getDefaultSemanticCommand(req);

+		if (req.getElementType().getEClass() == null) {

+			return getDefaultSemanticCommand(req, req.getElementType());

+		} else {

+			return getDefaultSemanticCommand(req);

+		}

 	}

 

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java
index 7b78ab6377b..86ddc758eb6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java
@@ -13,6 +13,14 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

 

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+

+import org.eclipse.gef.EditPart;

 import org.eclipse.gef.GraphicalEditPart;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.requests.ChangeBoundsRequest;

@@ -28,6 +36,56 @@ import org.eclipse.papyrus.infra.gmfdiag.common.snap.ResizeTrackerWithPreference
 public class PapyrusResizableShapeEditPolicy extends ResizableShapeEditPolicy {

 

 	/**

+	 * The same {@link ChangeBoundsRequest} is sent to all moved edit parts,

+	 * so we can cache the info about them in request potentially improving o(N^2) performance.

+	 */

+	private static final String PARAM_CACHED_EDIT_PARTS_SET = PapyrusResizableShapeEditPolicy.class.getName() + ":CachedMovedEPs";

+

+	/**

+	 * Tries to find the cached instance of {@link CachedEditPartsSet} in the request extended data map.

+	 * If not found, initializes the new instance and caches it in request for other edit-policy instances.

+	 * 

+	 * @param req

+	 * @return never returns <code>null</code>

+	 */

+	@SuppressWarnings({ "rawtypes", "unchecked" })

+	protected static CachedEditPartsSet getMovedEditPartsSet(ChangeBoundsRequest req) {

+		Map extData = req.getExtendedData();

+		CachedEditPartsSet set = (CachedEditPartsSet) extData.get(PARAM_CACHED_EDIT_PARTS_SET);

+		if (set == null) {

+			set = new CachedEditPartsSet(req.getEditParts());

+			extData.put(PARAM_CACHED_EDIT_PARTS_SET, set);

+		}

+		return set;

+	}

+

+	/**

+	 * This implementation overrides {@link org.eclipse.gef.editpolicies.NonResizableEditPolicy#getMoveCommand} and keeps all parent's logic.

+	 * Multi-selection request identified by the presence of {@link PapyrusResizableShapeEditPolicy#PARAM_CACHED_EDIT_PARTS_SET} key

+	 * for request extended data

+	 * see {@link org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.XYLayoutWithConstrainedResizedEditPolicy#getConnectionsToElementsNotBeingMoved}

+	 * 

+	 * @param request

+	 *            the change bounds request

+	 * @return the command contribution to the request

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	protected Command getMoveCommand(ChangeBoundsRequest request) {

+		ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_MOVE_CHILDREN);

+		req.setEditParts(getHost());

+		req.setMoveDelta(request.getMoveDelta());

+		req.setSizeDelta(request.getSizeDelta());

+		req.setLocation(request.getLocation());

+		Map<Object, Object> extendedData = new HashMap<Object, Object>();

+		extendedData.putAll(request.getExtendedData());

+		CachedEditPartsSet set = new CachedEditPartsSet(request.getEditParts());

+		extendedData.put(PARAM_CACHED_EDIT_PARTS_SET, set);

+		req.setExtendedData(extendedData);

+		return getHost().getParent().getCommand(req);

+	}

+

+	/**

 	 * See Bug 424943 ResizableEditPolicy#getResizeCommand duplicates request ignoring some request values

 	 * TODO : remove this override when the bug will be fixed

 	 *

@@ -75,4 +133,81 @@ public class PapyrusResizableShapeEditPolicy extends ResizableShapeEditPolicy {
 		return new ResizeTrackerWithPreferences((GraphicalEditPart) getHost(), direction);

 	}

 

+	protected static enum MovedNodeKind {

+		DIRECTLY, INDIRECTLY, NO

+	}

+

+	protected static class CachedEditPartsSet {

+

+		private final Set<EditPart> myDirectlyMoved;

+

+		private final Set<EditPart> myKnownIndirectlyYes;

+

+		private final Set<EditPart> myKnownIndirectlyNo;

+

+		public CachedEditPartsSet(List<EditPart> directlyMoved) {

+			myDirectlyMoved = new HashSet<EditPart>(directlyMoved);

+			myKnownIndirectlyNo = new HashSet<EditPart>(directlyMoved.size() * 5 + 1);

+			myKnownIndirectlyYes = new HashSet<EditPart>(directlyMoved.size() * 5 + 1);

+		}

+		

+		public boolean isMovedEditPart(EditPart ep) {

+			return isMoved(ep) != MovedNodeKind.NO;

+		}

+

+		public MovedNodeKind isMoved(EditPart ep) {

+			List<EditPart> chainUp = new LinkedList<EditPart>();

+			EditPart cur = ep;

+			MovedNodeKind kind = null;

+			while (cur != null) {

+				kind = getKnownKind(cur);

+				if (kind != null) {

+					break;

+				}

+				chainUp.add(cur);

+				cur = cur.getParent();

+			}

+			if (cur == null || kind == null) {

+				kind = MovedNodeKind.NO;

+			} else if (kind == MovedNodeKind.DIRECTLY && cur != ep) {

+				kind = MovedNodeKind.INDIRECTLY;

+			}

+

+			Set<EditPart> forKind;

+			switch (kind) {

+			case DIRECTLY:

+				forKind = myDirectlyMoved;

+				break;

+			case INDIRECTLY:

+				forKind = myKnownIndirectlyYes;

+				break;

+			case NO:

+				forKind = myKnownIndirectlyNo;

+				break;

+			default:

+				throw new IllegalArgumentException("Wow: " + kind);

+			}

+

+			if (kind != MovedNodeKind.DIRECTLY) {

+				forKind.addAll(chainUp);

+			}

+

+			return kind;

+		}

+

+		private MovedNodeKind getKnownKind(EditPart ep) {

+			if (myDirectlyMoved.contains(ep)) {

+				return MovedNodeKind.DIRECTLY;

+			}

+			if (myKnownIndirectlyYes.contains(ep)) {

+				return MovedNodeKind.INDIRECTLY;

+			}

+			if (myKnownIndirectlyNo.contains(ep)) {

+				return MovedNodeKind.NO;

+			}

+			return null;

+		}

+

+	}

+

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java
index dd9c392c172..ea0dcb65f4d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java
@@ -13,6 +13,7 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

 

+import java.util.Collections;

 import java.util.HashSet;

 import java.util.Iterator;

 import java.util.List;

@@ -31,6 +32,7 @@ import org.eclipse.gef.NodeEditPart;
 import org.eclipse.gef.SnapToHelper;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.CompoundCommand;

+import org.eclipse.gef.editparts.AbstractConnectionEditPart;

 import org.eclipse.gef.requests.ChangeBoundsRequest;

 import org.eclipse.gef.requests.CreateRequest;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

@@ -207,22 +209,50 @@ public class XYLayoutWithConstrainedResizedEditPolicy extends XYLayoutEditPolicy
 	protected Command createChangeConstraintCommand(ChangeBoundsRequest request, EditPart child, Object constraint) {

 		final Command cmd = super.createChangeConstraintCommand(request, child, constraint);

 		if (org.eclipse.gef.RequestConstants.REQ_MOVE_CHILDREN.equals(request.getType()) && child instanceof INodeEditPart) {

-			List<?> sources = ((INodeEditPart) child).getSourceConnections();

-			List<?> targets = ((INodeEditPart) child).getTargetConnections();

-			Set<Object> connections = new HashSet<Object>();

-			connections.addAll(sources);

-			connections.addAll(targets);

-			if (!connections.isEmpty()) {

+			Set<Object> notBeingMovedConnections = getConnectionsToElementsNotBeingMoved(request, child);

+			if (!notBeingMovedConnections.isEmpty()) {

 				final CompoundCommand cc = new CompoundCommand();

 				cc.add(cmd);

 				// see bug 430702: [Diagram] Moving source of a link moves the target too.

-				cc.add(new ICommandProxy(new FixEdgeAnchorsDeferredCommand(getEditingDomain(), (IGraphicalEditPart) getHost(), connections)));

+				cc.add(new ICommandProxy(new FixEdgeAnchorsDeferredCommand(getEditingDomain(), (IGraphicalEditPart) getHost(), notBeingMovedConnections)));

 				return cc;

 			}

 		}

 		return cmd;

 	}

 

+	/*

+	 * {@link FixEdgeAnchorsDeferredCommand} should not be applied to the multiple selection move request

+	 * see Bug 459839 - [All Diagrams] unexpected behavior moving multiple linked elements

+	 */

+	private Set<Object> getConnectionsToElementsNotBeingMoved(ChangeBoundsRequest request, EditPart child) {

+		List<?> sources = ((INodeEditPart) child).getSourceConnections();

+		List<?> targets = ((INodeEditPart) child).getTargetConnections();

+		Set<Object> connections = new HashSet<Object>();

+		connections.addAll(sources);

+		connections.addAll(targets);

+		if (connections.isEmpty()) {

+			return Collections.emptySet();

+		}

+		PapyrusResizableShapeEditPolicy.CachedEditPartsSet movedEditPartsSet = PapyrusResizableShapeEditPolicy.getMovedEditPartsSet(request);

+		final Set<Object> result = new HashSet<Object>();

+		final Iterator<?> connectionsIter = connections.iterator();

+		while (connectionsIter.hasNext()) {

+			final Object nextConnection = connectionsIter.next();

+			if (false == nextConnection instanceof AbstractConnectionEditPart) {

+				continue;

+			}

+			AbstractConnectionEditPart nextTypedConnection = (AbstractConnectionEditPart) nextConnection;

+			EditPart sourceEnd = nextTypedConnection.getSource();

+			EditPart targetEnd = nextTypedConnection.getTarget();

+			if (movedEditPartsSet.isMovedEditPart(sourceEnd) && movedEditPartsSet.isMovedEditPart(targetEnd)) {

+				continue;

+			}

+			result.add(nextConnection);

+		}

+		return result;

+	}

+

 	protected final TransactionalEditingDomain getEditingDomain() {

 

 		TransactionalEditingDomain domain = null;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/handlers/AbstractGraphicalCommandHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/handlers/AbstractGraphicalCommandHandler.java
index f525267ffb0..e302579468d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/handlers/AbstractGraphicalCommandHandler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/handlers/AbstractGraphicalCommandHandler.java
@@ -47,6 +47,10 @@ import org.eclipse.ui.handlers.HandlerUtil;
 public abstract class AbstractGraphicalCommandHandler extends AbstractHandler {
 
 	protected abstract Command getCommand();
+	
+	protected Command getCommand(ExecutionEvent event){
+	    return getCommand(); //Implement an overridable, default behavior. Extend it only when you actually need the ExecutionEvent (i.e. for your own contribution)
+	}
 
 	/**
 	 * Iterate over current selection and build a list of the {@link IGraphicalEditPart} contained in the selection.
@@ -77,7 +81,7 @@ public abstract class AbstractGraphicalCommandHandler extends AbstractHandler {
 			ISelection selection = HandlerUtil.getCurrentSelection(event);
 			this.selection = (selection instanceof IStructuredSelection) ? ((IStructuredSelection) selection).toList() : Collections.EMPTY_LIST;
 
-			getEditingDomain(event).getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(getCommand()));
+			getEditingDomain(event).getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(getCommand(event)));
 		} finally {
 			// clear the selection
 			this.selection = Collections.EMPTY_LIST;
@@ -132,7 +136,7 @@ public abstract class AbstractGraphicalCommandHandler extends AbstractHandler {
 
 		TransactionalEditingDomain domain = getEditingDomain();
 		if ((domain != null) && !TransactionHelper.isDisposed(domain)) {
-			Command command = getCommand();
+			Command command = getCommand(null);
 			if (command != null) {
 				result = command.canExecute();
 				command.dispose();
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml
index ba84e3b43a4..0683a75d140 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml
@@ -7,6 +7,22 @@
             class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig"

             order="1000">

       </configuration>

+      <cellAxisConfiguration

+            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleBooleanCellEditorConfiguration"

+            order="1000">

+      </cellAxisConfiguration>

+      <cellAxisConfiguration

+            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleEEnumTypeCellEditorConfiguration"

+            order="1001">

+      </cellAxisConfiguration>

+      <cellAxisConfiguration

+            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleIntegerCellEditorConfiguration"

+            order="1002">

+      </cellAxisConfiguration>

+      <cellAxisConfiguration

+            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleStringCellEditorConfiguration"

+            order="1003">

+      </cellAxisConfiguration>

    </extension>

  <extension

          point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
index ce76abd070d..b376a3843ca 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
@@ -45,8 +45,10 @@ import org.eclipse.papyrus.infra.nattable.painter.CustomCheckBoxPainter;
  * The configuration to edit EMF properties

  *

  * @author Vincent Lorenzo

- *

+ * @deprecated Used just until Papyrus Luna. Replaced by classes that are specific to each type of cell editor in the package org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration

+ * 

  */

+@Deprecated

 public class EStructuralFeatureEditorConfig extends AbstractCellEditorConfiguration {

 

 	/**

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleBooleanCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleBooleanCellEditorConfiguration.java
new file mode 100644
index 00000000000..19b5a9c142b
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleBooleanCellEditorConfiguration.java
@@ -0,0 +1,97 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST and others.

+ * 

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.emf.nattable.celleditor.config;

+

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

+import org.eclipse.emf.ecore.EDataType;

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

+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultBooleanDisplayConverter;

+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

+import org.eclipse.nebula.widgets.nattable.edit.editor.CheckBoxCellEditor;

+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

+import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

+import org.eclipse.papyrus.infra.nattable.painter.CustomCheckBoxPainter;

+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

+import org.eclipse.papyrus.infra.tools.util.TypesConstants;

+

+/**

+ * @author MA244259

+ *

+ */

+public class SingleBooleanCellEditorConfiguration implements ICellAxisConfiguration {

+

+	/**

+	 * the id of this editor

+	 */

+	private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.SingleBooleanCellEditorConfiguration.CheckBox";//$NON-NLS-1$	

+

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()

+	 *

+	 * @return

+	 */

+	@Override

+	public String getConfigurationId() {

+		return ID;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationDescription()

+	 *

+	 * @return

+	 */

+	@Override

+	public String getConfigurationDescription() {

+		return "This configuration provides a CheckBox editor for a single Boolean"; //$NON-NLS-1$

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

+	 *

+	 * @param table

+	 * @param axisElement

+	 * @return

+	 */

+	@Override

+	public boolean handles(Table table, Object axisElement) {

+		Object object = AxisUtils.getRepresentedElement(axisElement);

+		if (object instanceof EStructuralFeature) {

+			EStructuralFeature feature = (EStructuralFeature) object;

+			EClassifier etype = feature.getEType();

+			if (etype instanceof EDataType) {

+				EDataType datatype = (EDataType) etype;

+				

+				return TypesConstants.BOOLEAN.equals(datatype.getName());

+			}

+		}

+		return false;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#configureCellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)

+	 *

+	 * @param configRegistry

+	 * @param axis

+	 * @param configLabel

+	 */

+	@Override

+	public void configureCellEditor(IConfigRegistry configRegistry, Object axis, String configLabel) {

+		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomCheckBoxPainter(), DisplayMode.NORMAL, configLabel);

+		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new CheckBoxCellEditor(), DisplayMode.NORMAL, configLabel);

+		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new DefaultBooleanDisplayConverter(), DisplayMode.NORMAL, configLabel);

+	}

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleEEnumTypeCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleEEnumTypeCellEditorConfiguration.java
new file mode 100644
index 00000000000..f682b19bc7b
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleEEnumTypeCellEditorConfiguration.java
@@ -0,0 +1,116 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST and others.

+ * 

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.emf.nattable.celleditor.config;

+

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

+import org.eclipse.emf.ecore.EEnum;

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

+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

+import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;

+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

+import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;

+import org.eclipse.nebula.widgets.nattable.painter.cell.ComboBoxPainter;

+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

+import org.eclipse.papyrus.infra.emf.nattable.dataprovider.EEnumComboBoxDataProvider;

+import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider;

+import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

+

+/**

+ * @author MA244259

+ *

+ */

+public class SingleEEnumTypeCellEditorConfiguration implements ICellAxisConfiguration {

+

+	/**

+	 * the id of this editor

+	 */

+	private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.SingleEEnumTypeCellEditorConfiguration.ComboBox";//$NON-NLS-1$	

+

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()

+	 *

+	 * @return

+	 */

+	@Override

+	public String getConfigurationId() {

+		return ID;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationDescription()

+	 *

+	 * @return

+	 */

+	@Override

+	public String getConfigurationDescription() {

+		return "This configuration provides a ComboBox editor for a single EEnum type"; //$NON-NLS-1$

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.ICellAxisEditorConfiguration#handles(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)

+	 *

+	 * @param table

+	 * @param axisElement

+	 * @return

+	 *         <code>true</code> if axisElement is a {@link EEnum} {@link EStructuralFeature}

+	 */

+	@Override

+	public boolean handles(Table table, Object axisElement) {

+		Object representedElement = AxisUtils.getRepresentedElement(axisElement);

+		if (representedElement instanceof EStructuralFeature) {

+			EClassifier eType = ((EStructuralFeature) representedElement).getEType();

+			return eType instanceof EEnum;

+		}

+		return false;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.ICellAxisEditorConfiguration#configureCellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)

+	 *

+	 * @param configRegistry

+	 * @param axis

+	 * @param configLabel

+	 */

+	@Override

+	public void configureCellEditor(final IConfigRegistry configRegistry, Object axis, String configLabel) {

+		Object representedElement = AxisUtils.getRepresentedElement(axis);

+		EEnum eenum =(EEnum)((EStructuralFeature) representedElement).getEType();

+

+		IDisplayConverter displayConverter = new DisplayConverter() {

+

+			@Override

+			public Object displayToCanonicalValue(Object displayValue) {

+				return null;

+			}

+

+			@Override

+			public Object canonicalToDisplayValue(Object canonicalValue) {

+				// for others case

+				// LabelProviderService service = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

+				// return service.getLabelProvider(canonicalValue).getText(canonicalValue);

+				//

+

+				return new EMFLabelProvider().getText(canonicalValue);

+			}

+		};

+

+		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new ComboBoxPainter(), DisplayMode.EDIT, configLabel);

+		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new ComboBoxCellEditor(new EEnumComboBoxDataProvider(eenum)), DisplayMode.EDIT, configLabel);

+		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, displayConverter, DisplayMode.EDIT, configLabel);

+	}

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleIntegerCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleIntegerCellEditorConfiguration.java
new file mode 100644
index 00000000000..ea0a025c8b2
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleIntegerCellEditorConfiguration.java
@@ -0,0 +1,97 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST and others.

+ * 

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.emf.nattable.celleditor.config;

+

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

+import org.eclipse.emf.ecore.EDataType;

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

+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultIntegerDisplayConverter;

+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

+import org.eclipse.nebula.widgets.nattable.edit.editor.TextCellEditor;

+import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;

+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

+import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

+import org.eclipse.papyrus.infra.tools.util.TypesConstants;

+

+/**

+ * @author MA244259

+ *

+ */

+public class SingleIntegerCellEditorConfiguration implements ICellAxisConfiguration{

+

+	/**

+	 * the id of this editor

+	 */

+	private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.SingleIntegerCellEditorConfiguration.Text";//$NON-NLS-1$	

+

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()

+	 *

+	 * @return

+	 */

+	@Override

+	public String getConfigurationId() {

+		return ID;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationDescription()

+	 *

+	 * @return

+	 */

+	@Override

+	public String getConfigurationDescription() {

+		return "This configuration provides a Text editor for a single Integer"; //$NON-NLS-1$

+	}

+	

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

+	 *

+	 * @param table

+	 * @param axisElement

+	 * @return

+	 */

+	@Override

+	public boolean handles(Table table, Object axisElement) {

+		Object object = AxisUtils.getRepresentedElement(axisElement);

+		if (object instanceof EStructuralFeature) {

+			EStructuralFeature feature = (EStructuralFeature) object;

+			EClassifier etype = feature.getEType();

+			if (etype instanceof EDataType) {

+				EDataType datatype = (EDataType) etype;

+				return TypesConstants.INTEGER.equals(datatype.getName());

+			}

+		}

+		return false;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#configureCellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)

+	 *

+	 * @param configRegistry

+	 * @param axis

+	 * @param configLabel

+	 */

+	@Override

+	public void configureCellEditor(IConfigRegistry configRegistry, Object axis, String configLabel) {

+		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new TextPainter(), DisplayMode.EDIT, configLabel);

+		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new TextCellEditor(), DisplayMode.EDIT, configLabel);

+		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new DefaultIntegerDisplayConverter(), DisplayMode.EDIT, configLabel);

+	}

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleStringCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleStringCellEditorConfiguration.java
new file mode 100644
index 00000000000..b8fb2a6b080
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleStringCellEditorConfiguration.java
@@ -0,0 +1,97 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST and others.

+ * 

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.emf.nattable.celleditor.config;

+

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

+import org.eclipse.emf.ecore.EDataType;

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

+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultIntegerDisplayConverter;

+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

+import org.eclipse.nebula.widgets.nattable.edit.editor.TextCellEditor;

+import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;

+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

+import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

+import org.eclipse.papyrus.infra.tools.util.TypesConstants;

+

+/**

+ * @author MA244259

+ *

+ */

+public class SingleStringCellEditorConfiguration implements ICellAxisConfiguration{

+

+	/**

+	 * the id of this editor

+	 */

+	private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.SingleStringCellEditorConfiguration.MultiLineText";//$NON-NLS-1$	

+

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()

+	 *

+	 * @return

+	 */

+	@Override

+	public String getConfigurationId() {

+		return ID;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationDescription()

+	 *

+	 * @return

+	 */

+	@Override

+	public String getConfigurationDescription() {

+		return "This configuration provides a multi-line text editor for a single String"; //$NON-NLS-1$

+	}

+	

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

+	 *

+	 * @param table

+	 * @param axisElement

+	 * @return

+	 */

+	@Override

+	public boolean handles(Table table, Object axisElement) {

+		Object object = AxisUtils.getRepresentedElement(axisElement);

+		if (object instanceof EStructuralFeature) {

+			EStructuralFeature feature = (EStructuralFeature) object;

+			EClassifier etype = feature.getEType();

+			if (etype instanceof EDataType) {

+				EDataType datatype = (EDataType) etype;

+				return TypesConstants.STRING.equals(datatype.getName());

+			}

+		}

+		return false;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#configureCellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)

+	 *

+	 * @param configRegistry

+	 * @param axis

+	 * @param configLabel

+	 */

+	@Override

+	public void configureCellEditor(IConfigRegistry configRegistry, Object axis, String configLabel) {

+		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new TextPainter(), DisplayMode.EDIT, configLabel);

+		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new TextCellEditor(), DisplayMode.EDIT, configLabel);

+		//I believe that we don't need converters because we are working with the standard type --String. 

+		//configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, null, DisplayMode.EDIT, configLabel);

+	}

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
deleted file mode 100644
index 90f3c54ca69..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.1.0.qualifier

-Bundle-Name: Papyrus Table Documentation

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.doc

-Bundle-Description: %pluginDescription

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/build.properties
deleted file mode 100644
index 7c204388500..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = META-INF/,\

-               about.html,\

-               tablemetamodeldocumentation.mediawiki,\

-src.includes = about.html

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/tablemetamodeldocumentation.mediawiki b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/tablemetamodeldocumentation.mediawiki
deleted file mode 100644
index 1564bbf26e5..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/tablemetamodeldocumentation.mediawiki
+++ /dev/null
@@ -1,80 +0,0 @@
-=Metamodel Description= 

-==CellEditorDeclaration==

-This enumeration allows to describe the way to declare the cell editor in the table : 

-<li>by column </li>

-<li>by row </li>

-<li>by cell </li>

-

-==AxisIndexStyle==

-This enumeration allows to describe how to display the index of the axis : 

-<li>Alphabetic : A, B, C ... Y, Z, AA, AB, ... </li>

-<li>Numeric : 1, 2, 3 </li>

-

-==TableNamedElement==

-abstract object used when an element need to have a name and a description

-

-==TableConfiguration==

-this object is used to configure the table

-

-===Fields=== 

- <li>type : the type of the table</li>

- <li>iconPath : the icon associated to the table</li>

- <li>cellEditorDeclaration : describe how the cell editor will be declared in the table : They can be declared by row, by column or by cells</li>

- <li>rowAxisProviders : the possible axis providers used for rows for this configuration</li>

- <li>columnAxisProviders : the possible axis providers used for the columns for this configuration</li>

- <li>defaultRowAxisProvider : the axis provider used for row just after the table creation </li>

- <li>defaultColumnAxisProvider : the axis provider used for column just after the table creation </li>

- 

- 

- ????rowAxisProviderConfiguration -> a la bonne place ? -> peut-�tre sur un (local)AbstractAxisProvider?

- ????columnAxisProviderConfiguration -> � la bonne place? -> peut-�tre sur un (local)AbstractAxisProvider?

- 

- ===Constraints===

- the field defaultRowAxisProvider must references an axis owned by rowAxisProviders

- the field defaultColumnAxisProvider must references an axis owned by columnAxisProviders

-  

-

-==Table==

-This object represents the model of the table used in Papyrus

-===Fields===

-<li>invertAxis : indicates if the rows and the columns are inverted</li>

-<li>tableConfiguration : the configuration used for the table</li>

-<li>currentColumnAxisProvider : the current axis provider used for columns</li>

-<li>currentRowAxisProvider : the current axis provider used for rows</li>

-<li>rowAxisProvidersHistory : an history of the axis provider used for rows</li>

-<li>columnAxisProvidersHistory : an history of the axis provider used for columns</li>

- 

-===Constraints===

-<li>the field currentRowAxisProvider must references an axis owned by rowAxisProviderHistory</li>

-<li>The field currentColumnAxisProvider must references one of axis provider referenced by columnAxisProviderHistory </li>

-<li>the field rowAxisProviderHistory will contains only 1 axisProvider just after the table creation even if the config provides several row axis providers in rowAxisProviders</li>

-<li>the field columnAxisProviderHistory will contains only 1 axisProvider just after the table creation even if the config provides several column axis providers in columnAxisProviders</li>

-<li> the axis providers owned by columnAxisProviderHistory and rowAxisProviderHistory contains only the axis provider already used by the user. </li>

-

-

-??? localTableConfiguration : must be here?

-

-??? add header in the name of the label configuration????

-==AbstractLabelConfiguration==

-This object allows to store the configuration for the label provider.

-===Fields===

-<li>labelProviderContext : the context to use to find the label provider to use</li>

-

-

-==ObjectLabelProviderConfiguration==

-This label provider can be used for all element displayed in a table

-===Fields===

-<li>displayIcon : indicates if we want display the icon of the object in the header</li>

-<li>displayLabel : indicates if we want display the label of the object in the header</li>

-

-==FeatureLabelProviderConfiguration==

-The label provider used for object representing properties/features of others objects

-===Fields===

-<li>displayIsDerived: indicates if we want display the "/" for the derived feature</li>

-<li>displayType: indicates if we want display the type of the feature</li>

-<li>displayMultiplicity: : indicates if we want display the multiplicity of the feature</li>

-<li>displayName:indicates if the want display the name of the feature</li>

-

-

-==AbstractAxisProvider==

-This class stores in an ordered list the IAxis displayed in rows or in columns
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.classpath
index 342ed2c14c6..9070d33ae66 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.classpath
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="bin" sourcepath="bin"/>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..f08be2b06c4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
index b500859fb49..ff542d5b060 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
@@ -24,7 +24,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.1.0",

  org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",

  org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="1.1.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0"

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .,

@@ -38,3 +41,4 @@ Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.modelexplorer;
  singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Bundle-Description: %pluginDescription

+Import-Package: org.eclipse.papyrus.uml.diagram.menu.actions

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.xml
index 917ae285f4c..9fb5aa5135b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.xml
@@ -26,4 +26,50 @@
                type="org.eclipse.jface.viewers.IStructuredSelection">

          </propertyTester>

       </extension>

+      

+         <extension

+      id="PapyrusQuickFormatHandler"

+      name="QuickFormatHandler"

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

+   <handler

+         class="org.eclipse.papyrus.infra.nattable.modelexplorer.handlers.NattableQuickFormatHandler"

+         commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingUpperCaseCommand">

+       <activeWhen>

+         <and>

+            <with

+                  variable="selection">

+               <test

+                     property="org.eclipse.papyrus.infra.nattable.modelexplorer.menu.quickformatpropertytester.isNameChangeable"

+                     value="true">

+               </test>

+            </with>

+         </and>

+      </activeWhen>

+   </handler>

+   <handler 

+         class="org.eclipse.papyrus.infra.nattable.modelexplorer.handlers.NattableQuickFormatHandler"

+         commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingLowerCaseCommand">

+       <activeWhen>

+         <and>

+            <with

+                  variable="selection">

+               <test

+                     property="org.eclipse.papyrus.infra.nattable.modelexplorer.menu.quickformatpropertytester.isNameChangeable"

+                     value="true">

+               </test>

+            </with>

+         </and>

+      </activeWhen>

+   </handler>

+</extension>

+      <extension

+            point="org.eclipse.core.expressions.propertyTesters">

+         <propertyTester

+               class="org.eclipse.papyrus.infra.nattable.modelexplorer.handlers.NattableNamePropertyTester"

+               id="org.eclipse.papyrus.infra.nattable.modelexplorer.menu.quickformatpropertytester"

+               namespace="org.eclipse.papyrus.infra.nattable.modelexplorer.menu.quickformatpropertytester"

+               properties="isNameChangeable"

+               type="org.eclipse.jface.viewers.IStructuredSelection">

+         </propertyTester>

+      </extension>

 </plugin>

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/Activator.java
index 18e743fa088..481742a05c7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/Activator.java
@@ -11,15 +11,26 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.nattable.modelexplorer;

 

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

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

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

 import org.osgi.framework.BundleContext;

 

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

-public class Activator extends Plugin {

+public class Activator extends AbstractUIPlugin {

+

+	/**

+	 * The plug-in ID

+	 */

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable.modelexplorer"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

 

+	/**

+	 * The plug-in's logger

+	 */

+	public static LogHelper log;

+

 	@Override

 	public void start(final BundleContext context) throws Exception {

 		super.start(context);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableNameNormalizationCommand.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableNameNormalizationCommand.java
new file mode 100644
index 00000000000..a9d4c05a4e1
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableNameNormalizationCommand.java
@@ -0,0 +1,59 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.modelexplorer.actions;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;
+
+/**
+ * @author flefevre
+ * 
+ */
+public class NattableNameNormalizationCommand extends NameNormalizationCommand{
+	
+
+	public NattableNameNormalizationCommand(TransactionalEditingDomain domain, EObject source, String parameter){ 
+		super(domain,source,parameter);
+	}
+
+
+	/**
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+	@Override
+	protected void doExecute() {
+		if(source instanceof TableNamedElement){
+			String name = ((TableNamedElement)source).getName();
+			
+			switch (parameter) {
+			case UPPERCASE_ACTION:
+				((TableNamedElement)source).setName(name.toUpperCase());
+				break;
+			case LOWERCASE_ACTION:
+				((TableNamedElement)source).setName(name.toLowerCase());
+				break;
+
+			default:
+				((TableNamedElement)source).setName(name.toUpperCase());
+				break;
+			}
+			
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableQuickFormatAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableQuickFormatAction.java
new file mode 100644
index 00000000000..600d390093f
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableQuickFormatAction.java
@@ -0,0 +1,52 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST.

+ *

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.modelexplorer.actions;

+

+import java.util.List;

+

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.common.command.CompoundCommand;

+import org.eclipse.emf.common.command.UnexecutableCommand;

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

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.papyrus.infra.ui.menu.AbstractEMFParametricOnSelectedElementsAction;

+import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;

+

+public class NattableQuickFormatAction extends AbstractEMFParametricOnSelectedElementsAction {

+

+	public NattableQuickFormatAction(String parameter , List<EObject> selectedElements) {

+		super(parameter, selectedElements);

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.ui.menu.AbstractEMFParametricOnSelectedElementsAction#getBuildedCommand()

+	 *

+	 * @return

+	 */

+	@Override

+	protected Command getBuildedCommand() {

+		CompoundCommand cc = new CompoundCommand(NameNormalizationCommand.NAME_ACTION);

+		for(EObject igEP : getSelection()){

+			final TransactionalEditingDomain domain = getEditingDomain();

+			NattableNameNormalizationCommand myCmd = new NattableNameNormalizationCommand(domain, igEP, parameter);

+			cc.append(myCmd);

+		}

+		

+		if (!cc.isEmpty() && cc.canExecute()) {

+			return cc;

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/AbstractGenericCommandHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/AbstractGenericCommandHandler.java
new file mode 100644
index 00000000000..b8e11bc27ae
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/AbstractGenericCommandHandler.java
@@ -0,0 +1,123 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.ui.ISources;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * This abstract command handler: - calculates the current selection -
+ * calculates the visibility and enablement based on command executability -
+ * executes the command in Papyrus command stack
+ *
+ */
+public abstract class AbstractGenericCommandHandler extends AbstractHandler {
+
+	protected abstract Command getCommand(ExecutionEvent event);
+
+	/**
+	 * Iterate over current selection and build a list of the {@link EObject} contained in the selection.
+	 *
+	 * @return the currently selected {@link EObject}
+	 */
+	protected List<EObject> getSelectedElements() {
+		List<EObject> result = new LinkedList<EObject>();
+		for (Object element : getSelection()) {
+			EObject elementi = EMFHelper.getEObject(element) ;
+			if(elementi instanceof TableNamedElement){
+				result.add( elementi);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return null
+	 * @throws ExecutionException
+	 */
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		try {
+			ISelection selection = HandlerUtil.getCurrentSelection(event);
+			this.selection = (selection instanceof IStructuredSelection) ? ((IStructuredSelection) selection).toList() : Collections.EMPTY_LIST;
+			getEditingDomain(event).getCommandStack().execute(getCommand(event));
+		} finally {
+			// clear the selection
+			this.selection = Collections.EMPTY_LIST;
+		}
+
+		return null;
+	}
+
+	protected TransactionalEditingDomain getEditingDomain(ExecutionEvent event) {
+		try {
+			return ServiceUtilsForHandlers.getInstance().getTransactionalEditingDomain(event);
+		} catch (ServiceException ex) {
+			return null;
+		}
+	}
+
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		if (evaluationContext instanceof IEvaluationContext) {
+			Object selection = ((IEvaluationContext) evaluationContext).getVariable(ISources.ACTIVE_CURRENT_SELECTION_NAME);
+			if (selection instanceof Collection<?>) {
+				this.selection = (selection instanceof List<?>) ? (List<?>) selection : new java.util.ArrayList<Object>((Collection<?>) selection);
+			} else if (selection instanceof IStructuredSelection) {
+				this.selection = ((IStructuredSelection) selection).toList();
+			}
+			setBaseEnabled(computeEnabled());
+			this.selection = Collections.EMPTY_LIST;
+		}
+		super.setEnabled(evaluationContext);
+	}
+
+	protected boolean computeEnabled() {
+		boolean result = true;
+		List<EObject> elts = getSelectedElements();
+		if(elts.size()==0){
+			result=false;
+		}
+
+		return result;
+	}
+
+	protected List<?> getSelection() {
+		return selection;
+	}
+
+	private List<?> selection = Collections.EMPTY_LIST;
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableNamePropertyTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableNamePropertyTester.java
new file mode 100644
index 00000000000..e9348feb08a
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableNamePropertyTester.java
@@ -0,0 +1,40 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST.

+ *

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;

+

+import java.util.Iterator;

+

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

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

+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

+import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;

+

+public class NattableNamePropertyTester extends NamePropertyTester {

+

+	protected boolean isNameChangeable(IStructuredSelection selection){

+		boolean onlyWaitElement=true;

+		if (!selection.isEmpty()) {

+			Iterator<?> iter = selection.iterator();

+			while (iter.hasNext()) {

+				EObject object = EMFHelper.getEObject(iter.next());

+				if ( !(object instanceof TableNamedElement)) {

+					onlyWaitElement  =false;

+					break;

+				}

+			}

+		}

+		return onlyWaitElement;

+	}

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableQuickFormatHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableQuickFormatHandler.java
new file mode 100644
index 00000000000..a60a085360e
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableQuickFormatHandler.java
@@ -0,0 +1,67 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST.

+ *

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;

+

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

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.common.command.UnexecutableCommand;

+import org.eclipse.papyrus.infra.nattable.modelexplorer.actions.NattableQuickFormatAction;

+import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;

+import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;

+

+/**

+ * The handler for the {@link NattableQuickFormatAction}

+ *

+ *

+ *

+ */

+public class NattableQuickFormatHandler extends AbstractGenericCommandHandler {

+

+	/**

+	 *

+	 * Constructor.

+	 */

+	public NattableQuickFormatHandler() {

+		super();

+	}

+	

+	/**

+	 * @see org.eclipse.papyrus.infra.nattable.modelexplorer.handlers.AbstractGenericCommandHandler#getCommand(org.eclipse.core.commands.ExecutionEvent)

+	 *

+	 * @param event

+	 * @return

+	 */

+	@Override

+	protected Command getCommand(ExecutionEvent event) {

+		String parameter = event.getParameter(NamePropertyTester.PARAMETER_ID);

+		

+		NattableQuickFormatAction action = new NattableQuickFormatAction(parameter,getSelectedElements());

+		setBaseEnabled(action.isEnabled());

+		if (action.isEnabled()) {

+			return action.getCommand();

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+

+	@Override

+	public void setEnabled(Object evaluationContext) {

+		NattableQuickFormatAction action = new NattableQuickFormatAction(NameNormalizationCommand.DEFAULT_ACTION, getSelectedElements());

+		setBaseEnabled(action.isEnabled());

+	}

+

+

+

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.celleditor.configuration.exsd b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.celleditor.configuration.exsd
index 0683d205574..df497e55889 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.celleditor.configuration.exsd
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.celleditor.configuration.exsd
@@ -19,6 +19,7 @@
       <complexType>

          <sequence>

             <element ref="configuration" minOccurs="1" maxOccurs="unbounded"/>

+            <element ref="cellAxisConfiguration" minOccurs="1" maxOccurs="unbounded"/>

          </sequence>

          <attribute name="point" type="string" use="required">

             <annotation>

@@ -49,8 +50,12 @@
 

    <element name="configuration">

       <annotation>

+         <appinfo>

+            <meta.element deprecated="true"/>

+         </appinfo>

          <documentation>

             This extension point allows to register configuration used for celleditor in the table

+@Deprecated since Papyrus 1.1.0. use cellAxisConfiguration instead

          </documentation>

       </annotation>

       <complexType>

@@ -60,7 +65,30 @@
                   The class providing cell editor configuration for one or several type.

                </documentation>

                <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.nattable.celleditor.configs.IAxisCellEditorConfiguration"/>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration"/>

+               </appinfo>

+            </annotation>

+         </attribute>

+         <attribute name="order" type="string" use="required">

+            <annotation>

+               <documentation>

+                  Several configuration can be used for the same type, so we use this attribute to sort them.

+more the order is small, more the configuration is prioritary

+               </documentation>

+            </annotation>

+         </attribute>

+      </complexType>

+   </element>

+

+   <element name="cellAxisConfiguration">

+      <complexType>

+         <attribute name="class" type="string" use="required">

+            <annotation>

+               <documentation>

+                  The class providing cell editor configuration for one or several type.

+               </documentation>

+               <appinfo>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.ICellAxisConfiguration"/>

                </appinfo>

             </annotation>

          </attribute>

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellAxisConfigurationRegistry.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellAxisConfigurationRegistry.java
new file mode 100644
index 00000000000..addc9fd7b4a
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellAxisConfigurationRegistry.java
@@ -0,0 +1,132 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST and others.

+ * 

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.nattable.celleditor.config;

+

+import java.util.ArrayList;

+import java.util.List;

+import java.util.Map;

+import java.util.TreeMap;

+

+import org.eclipse.core.runtime.Assert;

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

+import org.eclipse.core.runtime.IConfigurationElement;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.papyrus.infra.emf.Activator;

+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

+

+

+/**

+ * @author MA244259

+ *

+ */

+public class CellAxisConfigurationRegistry {

+

+	private Map<Integer, ICellAxisConfiguration> registry;

+

+	public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.celleditor.configuration"; //$NON-NLS-1$

+

+	public static final String CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$

+

+	public static final String ORDER_ATTRIBUTE = "order"; //$NON-NLS-1$

+

+	public static final CellAxisConfigurationRegistry INSTANCE = new CellAxisConfigurationRegistry();

+

+//	public static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.papyrus.infra.nattable.celleditor";

+

+	public static final String CONFIGURATION_EXT_NEW = "cellAxisConfiguration";

+

+	/**

+	 *

+	 * Constructor.

+	 * Initial the registry of the configuration factories

+	 */

+	private CellAxisConfigurationRegistry() {

+		// to prevent instantiation

+		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

+		// final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_NAMESPACE, EXTENSION_POINT_NAME, EXTENSION_ID);

+		this.registry = new TreeMap<Integer, ICellAxisConfiguration>();

+		for (final IConfigurationElement iConfigurationElement : configElements) {

+			if (CONFIGURATION_EXT_NEW.equals(iConfigurationElement.getName())) {

+				// final String id = iConfigurationElement.getAttribute(FACTORY_ID_ATTRIBUTE);

+				final Integer order = new Integer(iConfigurationElement.getAttribute(ORDER_ATTRIBUTE));

+				try {

+					final ICellAxisConfiguration factory = (ICellAxisConfiguration) iConfigurationElement.createExecutableExtension(CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE);

+					// factory.initFactory(id);

+

+					if (factory != null) {

+						this.registry.put(order, factory);

+					}

+				} catch (final CoreException e) {

+					Activator.log.error(e);

+				}

+			}

+		}

+	}

+

+	/**

+	 *

+	 * @param configurationId

+	 *            the id of the factory

+	 * @return

+	 *         the cellEditorFactory declared on this id or <code>null</code> if not found

+	 * 

+	 * 

+	 */

+	public ICellAxisConfiguration getCellEditorConfiguration(final String configurationId) {

+		Assert.isNotNull(configurationId);

+		for (final Integer order : this.registry.keySet()) {

+			final ICellAxisConfiguration current = this.registry.get(order);

+			if (configurationId.equals(current.getConfigurationId())) {

+				return current;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 *

+	 * @param table

+	 *            the table for which we are looking for a cell editor factory

+	 * @param obj

+	 *            the object for which we are looking for a cell editor factory

+	 * @return

+	 *         the first cell editor configuration factory which is able to manage this object

+	 */

+	public ICellAxisConfiguration getFirstCellEditorConfiguration(final Table table, final Object obj) {

+		final List<ICellAxisConfiguration> configurations = getCellEditorConfigurationFactories(table, obj);

+		if (!configurations.isEmpty()) {

+			return configurations.get(0);

+		}

+		return null;

+	}

+

+	/**

+	 *

+	 * @param table

+	 *            the table for which we are looking for a cell editor factory

+	 * @param obj

+	 *            the object for which we are looking for a cell editor factory

+	 * @return

+	 *         the list of the cell editor configuration which are able to manage this object

+	 */

+	public List<ICellAxisConfiguration> getCellEditorConfigurationFactories(final Table table, final Object obj) {

+		final List<ICellAxisConfiguration> factories = new ArrayList<ICellAxisConfiguration>();

+		for (final ICellAxisConfiguration current : this.registry.values()) {

+			if (current.handles(table, obj)) {

+				factories.add(current);

+			}

+		}

+		return factories;

+	}

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java
index f5ecd423ab4..4cfe0238275 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java
@@ -42,6 +42,10 @@ public class CellEditorConfigurationFactory {
 

 	public static final CellEditorConfigurationFactory INSTANCE = new CellEditorConfigurationFactory();

 

+	public static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.papyrus.infra.nattable.celleditor";

+

+	public static final String EXTENSION_POINT_NAME = "configuration";

+

 	/**

 	 *

 	 * Constructor.

@@ -49,20 +53,23 @@ public class CellEditorConfigurationFactory {
 	 */

 	private CellEditorConfigurationFactory() {

 		// to prevent instanciation

-		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

+		// final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

+		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_NAMESPACE, EXTENSION_POINT_NAME);

 		this.registry = new TreeMap<Integer, IAxisCellEditorConfiguration>();

 		for (final IConfigurationElement iConfigurationElement : configElements) {

-			// final String id = iConfigurationElement.getAttribute(FACTORY_ID_ATTRIBUTE);

-			final Integer order = new Integer(iConfigurationElement.getAttribute(ORDER_ATTRIBUTE));

-			try {

-				final IAxisCellEditorConfiguration factory = (IAxisCellEditorConfiguration) iConfigurationElement.createExecutableExtension(CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE);

-				// factory.initFactory(id);

-

-				if (factory != null) {

-					this.registry.put(order, factory);

+			if (EXTENSION_POINT_NAME.equals(iConfigurationElement.getName())) {

+				// final String id = iConfigurationElement.getAttribute(FACTORY_ID_ATTRIBUTE);

+				final Integer order = new Integer(iConfigurationElement.getAttribute(ORDER_ATTRIBUTE));

+				try {

+					final IAxisCellEditorConfiguration factory = (IAxisCellEditorConfiguration) iConfigurationElement.createExecutableExtension(CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE);

+					// factory.initFactory(id);

+

+					if (factory != null) {

+						this.registry.put(order, factory);

+					}

+				} catch (final CoreException e) {

+					Activator.log.error(e);

 				}

-			} catch (final CoreException e) {

-				Activator.log.error(e);

 			}

 		}

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/ICellAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/ICellAxisConfiguration.java
new file mode 100644
index 00000000000..362c2b086c3
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/ICellAxisConfiguration.java
@@ -0,0 +1,40 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST and others.

+ * 

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.nattable.celleditor.config;

+

+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

+import org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

+

+/**

+ * @author MA244259

+ *

+ */

+public interface ICellAxisConfiguration extends IPapyrusNatTableConfiguration{

+

+	/**

+	 * @param table

+	 * @param axisElement

+	 * @return

+	 */

+	boolean handles(Table table, Object axisElement);

+

+	/**

+	 * @param configRegistry

+	 * @param axis

+	 * @param configLabel

+	 */

+	void configureCellEditor(IConfigRegistry configRegistry, Object axis, String configLabel);

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
index 86447d3cc7f..8694306ffe7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
@@ -17,6 +17,9 @@ import java.util.ArrayList;
 import java.util.Collection;

 import java.util.List;

 

+

+

+import org.eclipse.core.runtime.Assert;

 import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

 import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

 import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

@@ -31,8 +34,10 @@ import org.eclipse.osgi.util.NLS;
 import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider;

 import org.eclipse.papyrus.infra.nattable.Activator;

 import org.eclipse.papyrus.infra.nattable.accumulator.CustomRowOverrideLabelAccumulator;

+import org.eclipse.papyrus.infra.nattable.celleditor.config.CellAxisConfigurationRegistry;

 import org.eclipse.papyrus.infra.nattable.celleditor.config.CellEditorConfigurationFactory;

 import org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration;

+import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;

 import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;

 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

 import org.eclipse.papyrus.infra.nattable.messages.Messages;

@@ -91,17 +96,13 @@ public class EditConfiguration extends DefaultEditConfiguration {
 			// not yet supported

 			throw new UnsupportedOperationException(Messages.EditConfiguration_DeclarationNotYetSupported);

 		}

-

-

 	}

 

 	private void declaredCellEditors(final List<Object> elements, final IConfigRegistry configRegistry, final ColumnOverrideLabelAccumulator columnAccumulator, final CustomRowOverrideLabelAccumulator rowAccumulator) {

 		INattableModelManager modelManager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

 		boolean declareOnColumn = columnAccumulator != null;

 		boolean declareOnRow = rowAccumulator != null;

-		assert declareOnColumn != declareOnRow;

-		final CellEditorConfigurationFactory factory = CellEditorConfigurationFactory.INSTANCE;

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

+		Assert.isTrue(declareOnColumn != declareOnRow);

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

 			// TODO : for containement feature : see oep.views.properties.

 			// example : create Usecase in a class from the property view : EcorePropertyEditorFactory create a popup to display available type

@@ -111,51 +112,91 @@ public class EditConfiguration extends DefaultEditConfiguration {
 				current = ((IAxis) current).getElement();

 			}

 			final Table table = modelManager.getTable();

-			final IAxisCellEditorConfiguration config = factory.getFirstCellEditorConfiguration(table, current);

-			if (config != null) {

-				final ICellEditor editor = config.getICellEditor(table, current, modelManager.getTableAxisElementProvider());

-				if (editor != null) {

-					final String editorId = config.getEditorConfigId() + Integer.toString(i);

-					if (existingEditorIds.contains(editorId)) {

-						org.eclipse.papyrus.infra.nattable.Activator.log.warn("Several editor have the same id"); //$NON-NLS-1$

-					} else {

-						existingEditorIds.add(editorId);

-					}

-

-					final String cellId = editorId + "_cellId"; //$NON-NLS-1$

-

-					final ICellPainter painter = config.getCellPainter(table, current);

-					final String displayMode = config.getDisplayMode(table, current);

-					final IDisplayConverter converter = config.getDisplayConvert(table, current, new EMFLabelProvider());// TODO : label provider

-

-					final IDataValidator validator = config.getDataValidator(table, current);

-					assert !cellId.equals(editorId);

-					if (declareOnColumn) {

-						columnAccumulator.registerColumnOverrides(i, editorId, cellId);

-					} else {

-						rowAccumulator.registerRowOverrides(i, editorId, cellId);

-					}

-					if (painter != null) {

-						configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, painter, displayMode, cellId);

-					}

-					configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, editor, displayMode, editorId);

-

-					if (converter != null) {

-						configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, converter, displayMode, cellId);

-					}

-

-					if (validator != null) {

-						configRegistry.registerConfigAttribute(EditConfigAttributes.DATA_VALIDATOR, validator, displayMode, cellId);

-					}

-				} else {

-					final String errorMessage = NLS.bind(Messages.EditConfiguration_FactoryHandlesElementButDoesntProvideEditor, config.getEditorConfigId(), current);

-					if (!this.messagesAlreadyDisplayed.contains(errorMessage)) {

-						Activator.log.warn(errorMessage);

-						this.messagesAlreadyDisplayed.add(errorMessage);

-					}

 

+			boolean configWithNewRegistry = configureWithNewFactory(table, configRegistry, current, i, declareOnColumn, columnAccumulator, rowAccumulator);

+			boolean configWithOldFactory = false;

+			if (!configWithNewRegistry) {

+				final String errorMessage = NLS.bind("You should use the new interface {0} to declare cell editor for {1}", ICellAxisConfiguration.class.getName(), current);

+				if (!this.messagesAlreadyDisplayed.contains(errorMessage)) {

+					Activator.log.warn(errorMessage);

+					this.messagesAlreadyDisplayed.add(errorMessage);

 				}

-			} else {

+				configWithOldFactory = configureWithOldFactory(table, configRegistry, modelManager, current, i, declareOnColumn, columnAccumulator, rowAccumulator);

+			}

+			// // 1. Try to find configuration in the new factory --ceFactory-- of type CellEdConfigurationFactory. If found, then configure and continue()!

+			// final ICellAxisConfiguration ceConfig = ceFactory.getFirstCellEditorConfiguration(table, current);

+			// if (ceConfig != null) {

+			// if (existingEditorIds.contains(ceConfig.getConfigurationId())) {

+			//					org.eclipse.papyrus.infra.nattable.Activator.log.warn("Several editor have the same id"); //$NON-NLS-1$

+			// } else {

+			// existingEditorIds.add(ceConfig.getConfigurationId());

+			// }

+			// // final ICellEditor editor = ceConfig.getICellEditor(table, current, modelManager.getTableAxisElementProvider());

+			// ceConfig.configureCellEditor(configRegistry, current, ceConfig.getConfigurationId());

+			// continue;// go to the next element

+			// } else {

+			// final String errorMessage = NLS.bind(Messages.EditConfiguration_FactoryHandlesElementButDoesntProvideEditor, ceFactory, current);

+			// if (!this.messagesAlreadyDisplayed.contains(errorMessage)) {

+			// Activator.log.warn(errorMessage);

+			// this.messagesAlreadyDisplayed.add(errorMessage);

+			// }

+			// }

+			//

+			// // 2. if the program does not find the configuration, it will continue using the old, (i.e., deprecated) factory --factory-- of type CellEditorConfigurationFactory

+			//

+			// final IAxisCellEditorConfiguration config = factory.getFirstCellEditorConfiguration(table, current);

+			// if (config != null) {

+			// final ICellEditor editor = config.getICellEditor(table, current, modelManager.getTableAxisElementProvider());

+			// if (editor != null) {

+			// final String editorId = config.getEditorConfigId() + Integer.toString(i);

+			// if (existingEditorIds.contains(editorId)) {

+			//						org.eclipse.papyrus.infra.nattable.Activator.log.warn("Several editor have the same id"); //$NON-NLS-1$

+			// } else {

+			// existingEditorIds.add(editorId);

+			// }

+			//

+			//					final String cellId = editorId + "_cellId"; //$NON-NLS-1$

+			//

+			// final ICellPainter painter = config.getCellPainter(table, current);

+			// final String displayMode = config.getDisplayMode(table, current);

+			// final IDisplayConverter converter = config.getDisplayConvert(table, current, new EMFLabelProvider());// TODO : label provider

+			//

+			// final IDataValidator validator = config.getDataValidator(table, current);

+			// assert !cellId.equals(editorId);

+			// if (declareOnColumn) {

+			// columnAccumulator.registerColumnOverrides(i, editorId, cellId);

+			// } else {

+			// rowAccumulator.registerRowOverrides(i, editorId, cellId);

+			// }

+			// if (painter != null) {

+			// configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, painter, displayMode, cellId);

+			// }

+			// configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, editor, displayMode, editorId);

+			//

+			// if (converter != null) {

+			// configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, converter, displayMode, cellId);

+			// }

+			//

+			// if (validator != null) {

+			// configRegistry.registerConfigAttribute(EditConfigAttributes.DATA_VALIDATOR, validator, displayMode, cellId);

+			// }

+			// } else {

+			// final String errorMessage = NLS.bind(Messages.EditConfiguration_FactoryHandlesElementButDoesntProvideEditor, config.getEditorConfigId(), current);

+			// if (!this.messagesAlreadyDisplayed.contains(errorMessage)) {

+			// Activator.log.warn(errorMessage);

+			// this.messagesAlreadyDisplayed.add(errorMessage);

+			// }

+			//

+			// }

+			// } else {

+			// final String errorMessage = NLS.bind(Messages.EditConfiguration_ConfigurationNotFound, current);

+			// if (!this.messagesAlreadyDisplayed.contains(errorMessage)) {

+			// Activator.log.warn(errorMessage);

+			// this.messagesAlreadyDisplayed.add(errorMessage);

+			// }

+			// }

+

+			if (!configWithNewRegistry && !configWithOldFactory) {

 				final String errorMessage = NLS.bind(Messages.EditConfiguration_ConfigurationNotFound, current);

 				if (!this.messagesAlreadyDisplayed.contains(errorMessage)) {

 					Activator.log.warn(errorMessage);

@@ -165,4 +206,70 @@ public class EditConfiguration extends DefaultEditConfiguration {
 		}

 	}

 

+

+	/**

+	 * @param table

+	 * @param configRegistry

+	 * @param current

+	 * @return

+	 */

+	private boolean configureWithOldFactory(Table table, IConfigRegistry configRegistry, INattableModelManager modelManager, Object current, int indexOfTheAxis, boolean declareOnColumn, final ColumnOverrideLabelAccumulator columnAccumulator,

+			final CustomRowOverrideLabelAccumulator rowAccumulator) {

+		final CellEditorConfigurationFactory factory = CellEditorConfigurationFactory.INSTANCE; // this factory was used until Papyrus Luna. Better use CellEdConfigurationFactory

+

+		final IAxisCellEditorConfiguration config = factory.getFirstCellEditorConfiguration(table, current);

+

+		final ICellEditor editor = config.getICellEditor(table, current, modelManager.getTableAxisElementProvider());

+		if (editor != null) {

+			final String editorId = config.getEditorConfigId() + Integer.toString(indexOfTheAxis);

+			final String cellId = editorId + "_cellId"; //$NON-NLS-1$

+

+			final ICellPainter painter = config.getCellPainter(table, current);

+			final String displayMode = config.getDisplayMode(table, current);

+			final IDisplayConverter converter = config.getDisplayConvert(table, current, new EMFLabelProvider());// TODO : label provider

+

+			final IDataValidator validator = config.getDataValidator(table, current);

+			if (declareOnColumn) {

+				columnAccumulator.registerColumnOverrides(indexOfTheAxis, editorId, cellId);

+			} else {

+				rowAccumulator.registerRowOverrides(indexOfTheAxis, editorId, cellId);

+			}

+			if (painter != null) {

+				configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, painter, displayMode, cellId);

+			}

+			configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, editor, displayMode, editorId);

+

+			if (converter != null) {

+				configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, converter, displayMode, cellId);

+			}

+

+			if (validator != null) {

+				configRegistry.registerConfigAttribute(EditConfigAttributes.DATA_VALIDATOR, validator, displayMode, cellId);

+			}

+			return true;

+		}

+		return false;

+	}

+

+	protected final boolean configureWithNewFactory(Table table, IConfigRegistry configRegistry, Object current, int indexOfTheAxis, boolean declareOnColumn, final ColumnOverrideLabelAccumulator columnAccumulator,

+			final CustomRowOverrideLabelAccumulator rowAccumulator) {

+		final CellAxisConfigurationRegistry ceFactory = CellAxisConfigurationRegistry.INSTANCE;

+		final ICellAxisConfiguration ceConfig = ceFactory.getFirstCellEditorConfiguration(table, current);

+		

+

+		if (ceConfig != null) {

+			final String editorId = ceConfig.getConfigurationId() + Integer.toString(indexOfTheAxis);

+			final String cellId = editorId + "_cellId"; //$NON-NLS-1$

+			ceConfig.configureCellEditor(configRegistry, current, cellId);

+			if (declareOnColumn) {

+				columnAccumulator.registerColumnOverrides(indexOfTheAxis, editorId, cellId);

+			} else {

+				rowAccumulator.registerRowOverrides(indexOfTheAxis, editorId, cellId);

+			}

+			return true;

+		}

+		return false;

+	}

+

+

 }

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_containerConfiguration_ContainerConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_containerConfiguration_ContainerConfiguration.gif
index 449ab3b658f..6135e64b5fc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_containerConfiguration_ContainerConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_containerConfiguration_ContainerConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_MatcherConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_MatcherConfiguration.gif
index 72ec7324273..d84cb0a088c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_MatcherConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_MatcherConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_MatcherConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_MatcherConfiguration.gif
index 0231726db96..d84cb0a088c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_MatcherConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_MatcherConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeConfiguration_iconEntry_IconEntry.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeConfiguration_iconEntry_IconEntry.gif
index de788347894..6f73fe27ba1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeConfiguration_iconEntry_IconEntry.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeConfiguration_iconEntry_IconEntry.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_AdviceBindingConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_AdviceBindingConfiguration.gif
index e0846e72b6b..06f97473e10 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_AdviceBindingConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_AdviceBindingConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_MetamodelTypeConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_MetamodelTypeConfiguration.gif
index 6ac69d31c5f..d1e84691c85 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_MetamodelTypeConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_MetamodelTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_SpecializationTypeConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_SpecializationTypeConfiguration.gif
index 22997f51130..f6149c3081a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_SpecializationTypeConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_SpecializationTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_containerConfiguration_ContainerConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_containerConfiguration_ContainerConfiguration.gif
index 706dc412834..6135e64b5fc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_containerConfiguration_ContainerConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_containerConfiguration_ContainerConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_editHelperAdviceConfiguration_EditHelperAdviceConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_editHelperAdviceConfiguration_EditHelperAdviceConfiguration.gif
index 05a14746bd2..75f44fbcbc9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_editHelperAdviceConfiguration_EditHelperAdviceConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_editHelperAdviceConfiguration_EditHelperAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_MatcherConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_MatcherConfiguration.gif
index c01322f2958..d84cb0a088c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_MatcherConfiguration.gif
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_MatcherConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesEditionAdviceConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesEditionAdviceConfiguration.gif
new file mode 100644
index 00000000000..a149010ace4
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesEditionAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationEditPlugin.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationEditPlugin.java
new file mode 100644
index 00000000000..3265778c06e
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationEditPlugin.java
@@ -0,0 +1,111 @@
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * 

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

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

+ * which accompanies this distribution, and is available at

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

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider;

+

+import org.eclipse.emf.common.EMFPlugin;

+

+import org.eclipse.emf.common.util.ResourceLocator;

+

+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

+

+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;

+

+import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementTypesConfigurationsEditPlugin;

+

+import org.eclipse.papyrus.views.properties.environment.provider.PropertiesEditPlugin;

+

+/**

+ * This is the central singleton for the RuntimeValuesEditionAdviceConfiguration edit plugin.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public final class RuntimeValuesEditionAdviceConfigurationEditPlugin extends EMFPlugin {

+	/**

+	 * Keep track of the singleton.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final RuntimeValuesEditionAdviceConfigurationEditPlugin INSTANCE = new RuntimeValuesEditionAdviceConfigurationEditPlugin();

+

+	/**

+	 * Keep track of the singleton.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static Implementation plugin;

+

+	/**

+	 * Create the instance.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public RuntimeValuesEditionAdviceConfigurationEditPlugin() {

+		super

+		  (new ResourceLocator [] {

+		     ConstraintsEditPlugin.INSTANCE,

+		     EcoreEditPlugin.INSTANCE,

+		     ElementTypesConfigurationsEditPlugin.INSTANCE,

+		     PropertiesEditPlugin.INSTANCE,

+		   });

+	}

+

+	/**

+	 * Returns the singleton instance of the Eclipse plugin.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the singleton instance.

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getPluginResourceLocator() {

+		return plugin;

+	}

+

+	/**

+	 * Returns the singleton instance of the Eclipse plugin.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the singleton instance.

+	 * @generated

+	 */

+	public static Implementation getPlugin() {

+		return plugin;

+	}

+

+	/**

+	 * The actual implementation of the Eclipse <b>Plugin</b>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static class Implementation extends EclipsePlugin {

+		/**

+		 * Creates an instance.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public Implementation() {

+			super();

+

+			// Remember the static instance.

+			//

+			plugin = this;

+		}

+	}

+

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_NotInvariantRuleConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_NotInvariantRuleConfiguration.gif
new file mode 100644
index 00000000000..6f6c92e3feb
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_NotInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_NotInvariantRuleConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_NotInvariantRuleConfiguration.gif
new file mode 100644
index 00000000000..6f6c92e3feb
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_NotInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_AndInvariantRuleConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_AndInvariantRuleConfiguration.gif
new file mode 100644
index 00000000000..1295f5216ee
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_AndInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_NotInvariantRuleConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_NotInvariantRuleConfiguration.gif
new file mode 100644
index 00000000000..6f6c92e3feb
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_NotInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_OrInvariantRuleConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_OrInvariantRuleConfiguration.gif
new file mode 100644
index 00000000000..4fa1d3e6761
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_OrInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/NotInvariantRuleConfiguration.gif b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/NotInvariantRuleConfiguration.gif
new file mode 100644
index 00000000000..6f6c92e3feb
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/NotInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations
new file mode 100644
index 00000000000..a377822234f
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ASCII"?>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_ScP1oFYCEeS0WsAAtVmToA"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <adviceBindingsConfigurations

+      xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.DefaultInvariantEditHelperAdvice"

+      editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.DefaultInvariantEditHelperAdvice"

+      inheritance="all">

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA"/>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore
index 94d0b7da302..70d5cbff9f1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore
@@ -4,7 +4,7 @@
     nsPrefix="elementtypesconfigurations">

   <eClassifiers xsi:type="ecore:EClass" name="ElementTypeSetConfiguration" eSuperTypes="#//ConfigurationElement">

     <eStructuralFeatures xsi:type="ecore:EReference" name="elementTypeConfigurations"

-        lowerBound="1" upperBound="-1" eType="#//ElementTypeConfiguration" containment="true"/>

+        upperBound="-1" eType="#//ElementTypeConfiguration" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="adviceBindingsConfigurations"

         upperBound="-1" eType="#//AdviceBindingConfiguration" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="metamodelNsURI" lowerBound="1"

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AdviceBindingConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AdviceBindingConfiguration.java
index bc736ec4bed..35d389fcd40 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AdviceBindingConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AdviceBindingConfiguration.java
@@ -20,12 +20,12 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration#getTarget <em>Target</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration#getContainerConfiguration <em>Container Configuration</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAdviceBindingConfiguration()

  * @model

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AdviceConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AdviceConfiguration.java
index 846e3ca8de4..e2dbfa11177 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AdviceConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AdviceConfiguration.java
@@ -21,13 +21,13 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration#getBefore <em>Before</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration#getAfter <em>After</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration#getInheritance <em>Inheritance</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAdviceConfiguration()

  * @model abstract="true"

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ConfigurationElement.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ConfigurationElement.java
index deff3a3d701..ed2c63fed3d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ConfigurationElement.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ConfigurationElement.java
@@ -21,12 +21,12 @@ import org.eclipse.emf.ecore.EObject;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement#getName <em>Name</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement#getDescription <em>Description</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement#getIdentifier <em>Identifier</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getConfigurationElement()

  * @model abstract="true"

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ContainerConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ContainerConfiguration.java
index 1db10fc3f6e..af0632a6b99 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ContainerConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ContainerConfiguration.java
@@ -24,11 +24,11 @@ import org.eclipse.emf.ecore.EReference;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration#getContainerMatcherConfiguration <em>Container Matcher Configuration</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration#getEContainmentFeatures <em>EContainment Features</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getContainerConfiguration()

  * @model

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/EditHelperAdviceConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/EditHelperAdviceConfiguration.java
index abc7b675425..fa0cae32507 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/EditHelperAdviceConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/EditHelperAdviceConfiguration.java
@@ -20,10 +20,10 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration#getTarget <em>Target</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getEditHelperAdviceConfiguration()

  * @model

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypeConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypeConfiguration.java
index 4b6dd71fdfc..a5ac681b6ef 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypeConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypeConfiguration.java
@@ -20,12 +20,12 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getHint <em>Hint</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getKind <em>Kind</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getElementTypeConfiguration()

  * @model abstract="true"

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypeSetConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypeSetConfiguration.java
index 424bf4d73d3..ba77b6129f4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypeSetConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypeSetConfiguration.java
@@ -21,12 +21,12 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration#getElementTypeConfigurations <em>Element Type Configurations</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration#getAdviceBindingsConfigurations <em>Advice Bindings Configurations</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration#getMetamodelNsURI <em>Metamodel Ns URI</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getElementTypeSetConfiguration()

  * @model

@@ -44,7 +44,7 @@ public interface ElementTypeSetConfiguration extends ConfigurationElement {
 	 * <!-- end-user-doc -->

 	 * @return the value of the '<em>Element Type Configurations</em>' containment reference list.

 	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getElementTypeSetConfiguration_ElementTypeConfigurations()

-	 * @model containment="true" required="true"

+	 * @model containment="true"

 	 * @generated

 	 */

 	EList<ElementTypeConfiguration> getElementTypeConfigurations();

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/IconEntry.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/IconEntry.java
index a5f0852996b..97cad4c2e12 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/IconEntry.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/IconEntry.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.EObject;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry#getIconPath <em>Icon Path</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry#getBundleId <em>Bundle Id</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getIconEntry()

  * @model

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/InheritanceKind.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/InheritanceKind.java
index c223892e71f..0217601c43e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/InheritanceKind.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/InheritanceKind.java
@@ -102,6 +102,8 @@ public enum InheritanceKind implements Enumerator {
 	 * Returns the '<em><b>Inheritance Kind</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * @param literal the literal.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static InheritanceKind get(String literal) {

@@ -118,6 +120,8 @@ public enum InheritanceKind implements Enumerator {
 	 * Returns the '<em><b>Inheritance Kind</b></em>' literal with the specified name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * @param name the name.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static InheritanceKind getByName(String name) {

@@ -134,6 +138,8 @@ public enum InheritanceKind implements Enumerator {
 	 * Returns the '<em><b>Inheritance Kind</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * @param value the integer value.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static InheritanceKind get(int value) {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/MatcherConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/MatcherConfiguration.java
index 6163b5fb783..f387d50cac8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/MatcherConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/MatcherConfiguration.java
@@ -21,10 +21,10 @@ import org.eclipse.emf.ecore.EObject;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration#getMatcherClassName <em>Matcher Class Name</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getMatcherConfiguration()

  * @model

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/MetamodelTypeConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/MetamodelTypeConfiguration.java
index dd582a5af93..26a8bb5ff15 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/MetamodelTypeConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/MetamodelTypeConfiguration.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.EClass;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration#getEClass <em>EClass</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration#getEditHelperClassName <em>Edit Helper Class Name</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getMetamodelTypeConfiguration()

  * @model

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/SpecializationTypeConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/SpecializationTypeConfiguration.java
index 7da24aa068d..940d1de95ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/SpecializationTypeConfiguration.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/SpecializationTypeConfiguration.java
@@ -21,13 +21,13 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getSpecializationTypeConfiguration()

  * @model

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AdviceBindingConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AdviceBindingConfigurationImpl.java
index 684b808d8de..a41525c12ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AdviceBindingConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AdviceBindingConfigurationImpl.java
@@ -32,12 +32,12 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceBindingConfigurationImpl#getTarget <em>Target</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceBindingConfigurationImpl#getContainerConfiguration <em>Container Configuration</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceBindingConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AdviceConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AdviceConfigurationImpl.java
index 11639fbc56c..0e3f955d60a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AdviceConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AdviceConfigurationImpl.java
@@ -34,13 +34,13 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.InheritanceKind;
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceConfigurationImpl#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceConfigurationImpl#getBefore <em>Before</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceConfigurationImpl#getAfter <em>After</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceConfigurationImpl#getInheritance <em>Inheritance</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfigurationElementImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfigurationElementImpl.java
index 549815fede9..4320c119c84 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfigurationElementImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfigurationElementImpl.java
@@ -28,12 +28,12 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfigurationElementImpl#getName <em>Name</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfigurationElementImpl#getDescription <em>Description</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfigurationElementImpl#getIdentifier <em>Identifier</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ContainerConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ContainerConfigurationImpl.java
index f30f1afa8b9..392015b4f43 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ContainerConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ContainerConfigurationImpl.java
@@ -38,11 +38,11 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ContainerConfigurationImpl#getContainerMatcherConfiguration <em>Container Matcher Configuration</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ContainerConfigurationImpl#getEContainmentFeatures <em>EContainment Features</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/EditHelperAdviceConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/EditHelperAdviceConfigurationImpl.java
index 635fa180243..57cf7332445 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/EditHelperAdviceConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/EditHelperAdviceConfigurationImpl.java
@@ -32,10 +32,10 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeCo
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.EditHelperAdviceConfigurationImpl#getTarget <em>Target</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeConfigurationImpl.java
index 571c3d6b221..24e8dca28ab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeConfigurationImpl.java
@@ -30,12 +30,12 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry;
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeConfigurationImpl#getHint <em>Hint</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeConfigurationImpl#getKind <em>Kind</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeConfigurationImpl#getIconEntry <em>Icon Entry</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeSetConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeSetConfigurationImpl.java
index 8ddce81959c..02b2afd228b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeSetConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeSetConfigurationImpl.java
@@ -38,12 +38,12 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl#getElementTypeConfigurations <em>Element Type Configurations</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl#getAdviceBindingsConfigurations <em>Advice Bindings Configurations</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl#getMetamodelNsURI <em>Metamodel Ns URI</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementtypesconfigurationsPackageImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementtypesconfigurationsPackageImpl.java
index fcc47dad6f8..5c02e9626db 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementtypesconfigurationsPackageImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementtypesconfigurationsPackageImpl.java
@@ -667,7 +667,7 @@ public class ElementtypesconfigurationsPackageImpl extends EPackageImpl implemen
 

 		// Initialize classes, features, and operations; add parameters

 		initEClass(elementTypeSetConfigurationEClass, ElementTypeSetConfiguration.class, "ElementTypeSetConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getElementTypeSetConfiguration_ElementTypeConfigurations(), this.getElementTypeConfiguration(), null, "elementTypeConfigurations", null, 1, -1, ElementTypeSetConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getElementTypeSetConfiguration_ElementTypeConfigurations(), this.getElementTypeConfiguration(), null, "elementTypeConfigurations", null, 0, -1, ElementTypeSetConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 		initEReference(getElementTypeSetConfiguration_AdviceBindingsConfigurations(), this.getAdviceBindingConfiguration(), null, "adviceBindingsConfigurations", null, 0, -1, ElementTypeSetConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 		initEAttribute(getElementTypeSetConfiguration_MetamodelNsURI(), ecorePackage.getEString(), "metamodelNsURI", null, 1, 1, ElementTypeSetConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/IconEntryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/IconEntryImpl.java
index fc8cae37240..1445eae1253 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/IconEntryImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/IconEntryImpl.java
@@ -28,11 +28,11 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry;
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.IconEntryImpl#getIconPath <em>Icon Path</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.IconEntryImpl#getBundleId <em>Bundle Id</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/MatcherConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/MatcherConfigurationImpl.java
index d40c82a7f21..cf5b20d6aee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/MatcherConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/MatcherConfigurationImpl.java
@@ -28,10 +28,10 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MatcherConfigurationImpl#getMatcherClassName <em>Matcher Class Name</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/MetamodelTypeConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/MetamodelTypeConfigurationImpl.java
index c7718566396..63ef54a1630 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/MetamodelTypeConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/MetamodelTypeConfigurationImpl.java
@@ -28,11 +28,11 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfigu
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MetamodelTypeConfigurationImpl#getEClass <em>EClass</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MetamodelTypeConfigurationImpl#getEditHelperClassName <em>Edit Helper Class Name</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/SpecializationTypeConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/SpecializationTypeConfigurationImpl.java
index adf86773146..d026e9fbbb4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/SpecializationTypeConfigurationImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/SpecializationTypeConfigurationImpl.java
@@ -38,13 +38,13 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeCo
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl#getSpecializedTypesID <em>Specialized Types ID</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl#getContainerConfiguration <em>Container Configuration</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/util/ElementtypesconfigurationsSwitch.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/util/ElementtypesconfigurationsSwitch.java
index c54c74e6a43..e7eb0eeca54 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/util/ElementtypesconfigurationsSwitch.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/util/ElementtypesconfigurationsSwitch.java
@@ -57,7 +57,7 @@ public class ElementtypesconfigurationsSwitch<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

 	 */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/IConfiguredHintedElementType.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/IConfiguredHintedElementType.java
new file mode 100644
index 00000000000..3fdc760a6e2
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/IConfiguredHintedElementType.java
@@ -0,0 +1,23 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST and others.

+ * 

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.elementtypesconfigurations;

+

+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

+

+

+public interface IConfiguredHintedElementType extends IHintedType {

+

+	ElementTypeConfiguration getConfiguration();

+

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/MetamodelTypeFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/MetamodelTypeFactory.java
index 57964519bef..c27f9170547 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/MetamodelTypeFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/MetamodelTypeFactory.java
@@ -25,7 +25,7 @@ public class MetamodelTypeFactory extends AbstractElementTypeConfigurationFactor
 	 * {@inheritDoc}
 	 */
 	public IHintedType createElementType(MetamodelTypeConfiguration configuration) {
-		return new ConfiguredHintedMetamodelElementType(getID(configuration), getIconURL(configuration), getDisplayName(configuration), getEClass(configuration), createEditHelper(configuration), getSemanticHint(configuration));
+		return new ConfiguredHintedMetamodelElementType(getID(configuration), getIconURL(configuration), getDisplayName(configuration), getEClass(configuration), createEditHelper(configuration), getSemanticHint(configuration), configuration);
 	}
 
 	protected EClass getEClass(MetamodelTypeConfiguration configuration) {
@@ -34,7 +34,7 @@ public class MetamodelTypeFactory extends AbstractElementTypeConfigurationFactor
 
 	protected IEditHelper createEditHelper(MetamodelTypeConfiguration configuration) {
 		String editHelperClassName = configuration.getEditHelperClassName();
-		if(editHelperClassName == null) {
+		if (editHelperClassName == null) {
 			return null;
 		}
 		IEditHelper editHelper = ClassLoaderHelper.newInstance(editHelperClassName, IEditHelper.class);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/SpecializationTypeFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/SpecializationTypeFactory.java
index 6ffd55b25ea..6fa912111bd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/SpecializationTypeFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/SpecializationTypeFactory.java
@@ -42,7 +42,7 @@ public class SpecializationTypeFactory extends AbstractElementTypeConfigurationF
 	@Override

 	public IHintedType createElementType(SpecializationTypeConfiguration elementTypeConfiguration) {

 		return new ConfiguredHintedSpecializationElementType(getID(elementTypeConfiguration), getIconURL(elementTypeConfiguration), getDisplayName(elementTypeConfiguration), getSpecializedID(elementTypeConfiguration),

-				createElementMatcher(elementTypeConfiguration), createContainerDescriptor(elementTypeConfiguration), getEditHelperAdvice(elementTypeConfiguration), getSemanticHint(elementTypeConfiguration));

+				createElementMatcher(elementTypeConfiguration), createContainerDescriptor(elementTypeConfiguration), getEditHelperAdvice(elementTypeConfiguration), getSemanticHint(elementTypeConfiguration), elementTypeConfiguration);

 	}

 

 	protected IEditHelperAdvice getEditHelperAdvice(SpecializationTypeConfiguration elementTypeConfiguration) {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredHintedMetamodelElementType.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredHintedMetamodelElementType.java
index d30e28a9dc9..dbbea14453f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredHintedMetamodelElementType.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredHintedMetamodelElementType.java
@@ -15,17 +15,22 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
 import java.net.URL;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.emf.type.core.MetamodelType;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredHintedElementType;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration;
 
-public class ConfiguredHintedMetamodelElementType extends MetamodelType implements IHintedType {
+public class ConfiguredHintedMetamodelElementType extends MetamodelType implements IConfiguredHintedElementType {
 
 	private String semanticHint;
 
-	public ConfiguredHintedMetamodelElementType(String id, URL iconURL, String displayName, EClass eClass, IEditHelper editHelper, String semanticHint) {
+	private ElementTypeConfiguration configuration;
+
+	public ConfiguredHintedMetamodelElementType(String id, URL iconURL, String displayName, EClass eClass, IEditHelper editHelper, String semanticHint, MetamodelTypeConfiguration configuration) {
 		super(id, iconURL, displayName, eClass, editHelper);
 		this.semanticHint = semanticHint;
+		this.configuration = configuration;
 	}
 
 	public String getSemanticHint() {
@@ -43,4 +48,14 @@ public class ConfiguredHintedMetamodelElementType extends MetamodelType implemen
 	public String toString() {
 		return "Configured Metamodel Type: " + getDisplayName() + " [" + getId() + "]";
 	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredHintedElementType#getConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	public ElementTypeConfiguration getConfiguration() {
+		return configuration;
+	}
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredHintedSpecializationElementType.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredHintedSpecializationElementType.java
index b72e286c838..a8cc5bec426 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredHintedSpecializationElementType.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredHintedSpecializationElementType.java
@@ -17,15 +17,19 @@ import java.net.URL;
 import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.emf.type.core.SpecializationType;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredHintedElementType;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
 
 
-public class ConfiguredHintedSpecializationElementType extends SpecializationType implements IHintedType {
+public class ConfiguredHintedSpecializationElementType extends SpecializationType implements IConfiguredHintedElementType {
 
 	private String semanticHint;
 
+	private ElementTypeConfiguration configuration;
+
 	/**
 	 * @param id
 	 * @param iconURL
@@ -36,9 +40,11 @@ public class ConfiguredHintedSpecializationElementType extends SpecializationTyp
 	 * @param editHelperAdvice
 	 * @param iElementCreationValidator
 	 */
-	public ConfiguredHintedSpecializationElementType(String id, URL iconURL, String displayName, IElementType[] elementTypes, IElementMatcher matcher, IContainerDescriptor containerDescriptor, IEditHelperAdvice editHelperAdvice, String semanticHint) {
+	public ConfiguredHintedSpecializationElementType(String id, URL iconURL, String displayName, IElementType[] elementTypes, IElementMatcher matcher, IContainerDescriptor containerDescriptor, IEditHelperAdvice editHelperAdvice, String semanticHint,
+			SpecializationTypeConfiguration configuration) {
 		super(id, iconURL, displayName, elementTypes, matcher, containerDescriptor, editHelperAdvice);
 		this.semanticHint = semanticHint;
+		this.configuration = configuration;
 	}
 
 	public String getSemanticHint() {
@@ -56,4 +62,14 @@ public class ConfiguredHintedSpecializationElementType extends SpecializationTyp
 	public String toString() {
 		return "Configured Specialization Type: " + getDisplayName() + " [" + getId() + "]";
 	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredHintedElementType#getConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	public ElementTypeConfiguration getConfiguration() {
+		return configuration;
+	}
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java
index 5b4580458aa..6deb1bdbc47 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java
@@ -167,15 +167,25 @@ public class ElementTypeSetConfigurationRegistry {
 		return result;
 	}
 
+	protected boolean isAlreadyRegistred(String elementTypeID, IClientContext context) {
+		if (ElementTypeRegistry.getInstance().getType(elementTypeID) != null) {
+			if (!elementTypeID.equals(NullElementType.ID)) {
+				if (ElementTypeRegistryUtils.getType(context, elementTypeID) == null) {
+					// The elementType is already existing but not binded yet
+					context.bindId(elementTypeID);
+					Activator.log.info(elementTypeID + " is already registred elementtype but it is not binded yet. It has beeen binded to Papyrus context. ");
+				}
+			}
+			return true;
+		}
+
+		return false;
+	}
+
 	protected boolean registerElementTypeConfiguration(ElementTypeConfiguration elementTypeConfiguration, Map<String, ElementTypeConfiguration> elementTypeConfigurationsDefinitions, IClientContext context)
 	{
 		String elementTypeID = elementTypeConfiguration.getIdentifier();
-		if (ElementTypeRegistry.getInstance().getType(elementTypeID) != null) {
-			if (ElementTypeRegistryUtils.getType(context, elementTypeID) == null) {
-				// The elementType is already existing but not binded yet
-				context.bindId(elementTypeID);
-				Activator.log.info(elementTypeID + " is already registred elementtype but it is not binded yet. It has beeen binded to Papyrus context. ");
-			}
+		if (isAlreadyRegistred(elementTypeID, context)) {
 			return true;
 		}
 
@@ -183,18 +193,20 @@ public class ElementTypeSetConfigurationRegistry {
 			// First, check if dependencies are registered
 			for (String specializedTypeId : ((SpecializationTypeConfiguration) elementTypeConfiguration).getSpecializedTypesID()) {
 
-				// try to register the dependency
-				ElementTypeConfiguration specializedTypeConfiguration = elementTypeConfigurationsDefinitions.get(specializedTypeId);
-				if (specializedTypeConfiguration != null) {
-					boolean registred = registerElementTypeConfiguration(specializedTypeConfiguration, elementTypeConfigurationsDefinitions, context);
-					if (!registred) {
-						Activator.log.info("Failed to register " + specializedTypeId);
-						return false;
-					}
-				} else {
-					if (!specializedTypeId.equals(NullElementType.ID)) {
-						Activator.log.info("Cannot find ElementTypeConfiguration for " + specializedTypeId);
-						return false;
+				if (!isAlreadyRegistred(specializedTypeId, context)) {
+					// try to register the dependency
+					ElementTypeConfiguration specializedTypeConfiguration = elementTypeConfigurationsDefinitions.get(specializedTypeId);
+					if (specializedTypeConfiguration != null) {
+						boolean registred = registerElementTypeConfiguration(specializedTypeConfiguration, elementTypeConfigurationsDefinitions, context);
+						if (!registred) {
+							Activator.log.info("Failed to register " + specializedTypeId);
+							return false;
+						}
+					} else {
+						if (!specializedTypeId.equals(NullElementType.ID)) {
+							Activator.log.info("Cannot find ElementTypeConfiguration for " + specializedTypeId);
+							return false;
+						}
 					}
 				}
 			}
@@ -226,7 +238,6 @@ public class ElementTypeSetConfigurationRegistry {
 
 	}
 
-
 	public void loadElementTypeSetConfigurations(Collection<ElementTypeSetConfiguration> elementTypeSetConfigurations) {
 		Map<String, ElementTypeConfiguration> elementTypeConfigurationsDefinitions = new HashMap<String, ElementTypeConfiguration>();
 
@@ -352,7 +363,7 @@ public class ElementTypeSetConfigurationRegistry {
 			}
 			ElementTypeSetConfiguration set = getElementTypeSetConfiguration(elementTypeSetId, modelPath, contributorID);
 			if (set != null && !workspaceDefinitions.contains(elementTypeSetId)) { // do not add if it is locally redefined
-				if (platformElementTypeSets.containsKey(elementTypeSetId)){
+				if (platformElementTypeSets.containsKey(elementTypeSetId)) {
 					Activator.log.warn("An element type set is already registered with the id : " + elementTypeSetId);
 				}
 				platformElementTypeSets.put(elementTypeSetId, set);
@@ -412,7 +423,7 @@ public class ElementTypeSetConfigurationRegistry {
 					// not found in fragments. Look in the plugin itself
 					elementTypeSetConfiguration = getElementTypeSetConfigurationInBundle(modelPath, bundleId);
 				}
-				
+
 				if (elementTypeSetConfiguration == null) {
 					Activator.log.warn("Cannot find resource " + modelPath + " in bundle " + bundleId);
 				}
@@ -463,7 +474,7 @@ public class ElementTypeSetConfigurationRegistry {
 		try {
 			resource.load(null);
 		} catch (IOException e) {
-			return null; //Don't log the error yet; we're trying several options
+			return null; // Don't log the error yet; we're trying several options
 		}
 		EObject content = resource.getContents().get(0);
 		if (content instanceof ElementTypeSetConfiguration) {
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeRegistryUtils.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeRegistryUtils.java
index 74281a506b0..b767cfc9fc8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeRegistryUtils.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeRegistryUtils.java
@@ -13,12 +13,18 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.elementtypesconfigurations.utils;

 

+import java.util.ArrayList;

+import java.util.List;

+

 import org.eclipse.gmf.runtime.emf.type.core.ClientContext;

 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

 import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;

 import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

 import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;

+import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;

 

 public class ElementTypeRegistryUtils {

 

@@ -47,4 +53,28 @@ public class ElementTypeRegistryUtils {
 			Activator.log.warn("Cannot unbind type ID from context of unknown class: " + context.getClass().getName());

 		}

 	}

+

+	static public List<IElementType> getElementTypesBySemanticHint(String semanticHint) {

+		List<IElementType> matchingElementTypes = new ArrayList<IElementType>();

+

+		IClientContext context;

+		try {

+			context = TypeContext.getContext();

+			IElementType[] elementTypes = ElementTypeRegistry.getInstance().getElementTypes(context);

+

+			for (IElementType iElementType : elementTypes) {

+				if (iElementType instanceof IHintedType) {

+					if (((IHintedType) iElementType).getSemanticHint().equals(semanticHint)) {

+						matchingElementTypes.add(iElementType);

+					}

+				}

+			}

+		} catch (ServiceException e1) {

+			Activator.log.error(e1);

+		}

+

+

+

+		return matchingElementTypes;

+	}

 }

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/DeveloperDoc.wikimedia b/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/DeveloperDoc.wikimedia
deleted file mode 100644
index 96dd9372ad6..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/DeveloperDoc.wikimedia
+++ /dev/null
@@ -1,70 +0,0 @@
-__TOC__= New Child Menu into the model explorer ===Requirements==
-- AddNewChild (id=newChild001): 
- Papyrus shall add in the menu new child for new customized elements by using extended type
-- HideElement (id=newChild002): 
- Papyrus shall not display all UML or SysML element creation
-- newChildFromProfile (id=newChild003): 
- Papyrus shall add the creation of new element from a subset of profile
-- newChildMenuDisplay (id=newChild004): 
- Papyrus shall be able to associated icons to folder or creation menu
-- RoleAndElementCreation (id=newChild005): 
- When an element can created from several  roles for a container, Papyrus shall let the possibility to choose the role or to let to the possibility to be created from all role.==Use Cases==[[Image:C:/git/org.eclipse.papyrus/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/UseCaseDiagram.png|UseCaseDiagram]]<br>===UseCreateMenu===
-The Papyrus User shall use this functionality from the model explorer in order to create elements in the model. It can decide to display or not this element creation====How to====
-A user can create an element by  select element in the model explorer, click on it ant then click on the diagram.

-In order to not display a menu,  a user can edit the model that represent the creation menu and set the attribute visibility to false. [[Image:C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\EnableCreationMenu.png|EnableCreationMenu]]<br>===Create or modify ElementCreationModel===
-An advanced User is able to create of modify creation menu. This menu is a model that can be edited ====How to====
-An advanced user can contribuate to the menu by adding a new plugin that contains:

-	-a xmi file that represents a creation menu. The model must be a instance of org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore. It contains

-		�	CreationMenu

-			o	It correspond to a menu

-			o	The ElemenTypeIDRef correspond a reference to the element Type.

-			o	The role can be filled in order to specify the role play by the element.

-			o	If displayAllRole is set to true, it displays all roles played by the element if the number of roles is greater than 1. By default this property is true;

-		�	Folder

-			o	It is possible to add owns label an icon.

-			o  Visibilty to specify if the folder is visible.

-	-a reference to an extension point, to specify that papyrus must take in account this file display the menu

-<code>

-<extension

-         point="org.eclipse.papyrus.infra.newchild">

-      <menuCreationModel

-            model="YourCreationMenu.xmi">

-      </menuCreationModel>

-</extension>

-</code>
-In the following example, a menu creation for a package is presented. This menu is contained in the folder SimpleUMLTest. We have associated a image for this menu.[[Image:C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\PackageWithIconO.png|Creation menu for a package with a specific icon]]<br>[[Image:C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\PackageWithIconOIllustration.png|Result for this menu]]<br>
-In this following example, a creation menu will be specify  to allow creation of nested classifier. That 's why the role "nestedClassifier" is precised. The label for this creation is "nestedClass"[[Image:C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\NestedClassifierIllustration.png|Result for the menu nestedClass]]<br>[[Image:C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\NestedClassifier.png|Creation menu model for nested class]]<br>
-In the followin examplen a creation menu is created for activities. In this case, all roles are displayed. Thanks to this, when we want to associate an activity to a state, 3 roles are proposed. [[Image:C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\AllPossibleActivities.png|Creation menu model for activity]]<br>[[Image:C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\AllPossibleActivitiesIllustration.png|Result for this menu activity]]<br>===Generate "ElementCreationModel" from a profile===
-From a stereotyped profile, a model of new child menu can be generated.

-For example a user after designing a profile, want to have a dedicated menu  from this profile/

-For the moment this function is not implemented.===Hide, change order or add submenus===
-The User can modify the creation menu by adding submenus: order about new child menu, precise if the role must be displayed.====How to====
-test===Create or modify ElementCreationModel at runtime thanks to a GUI===
-A user  can edit a the model that represent the creation menu  at runtime for papyrus thanks to a dedicated UI.==Design==[[Image:C:/git/org.eclipse.papyrus/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/Architecture.png|Architecture]]<br>
-The system is done by two plugins:

-	�	org.eclipse.papyrus.infra.newchild

-	It has in charge to provide and construct swt.Menu from the ecore model. To do that the developer has to:

-		o	instantiate a CreationMenuFactory, 

-		o	ask to get all Root model and populate it

-	<code>

-		CreationMenuFactory creationMenuFactory= new CreationMenuFactory(editingDomain);

-		ArrayList<Folder> folders= creationMenuRegistry.getRootFolder();

-		Iterator<Folder> iterFolder= folders.iterator();

-		while (iterFolder.hasNext()) {

-			Folder currentFolder= iterFolder.next();

-			creationMenuFactory.populateMenu(menu, currentFolder,eObject);

-		}

-</code>

-	�	org.eclipse.papyrus.views.modelexplorer.newchild

-	It has in charge to add menu in the model explorer of papyrus.

-[[Image:C:/git/org.eclipse.papyrus/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NewDiagram.png|NewDiagram]]<br>
-This the structure of EMF model for model

-	�	CreationMenu

-		o	It correspond to a menu

-		o	The ElemenTypeIDRef correspond a reference to the element Type.

-		o	The role can be filled in order to specify the role play by the element.

-		o	If displayAllRole is set to true, it displays all roles played by the element if the number of roles is greater than 1. By default this property is true;

-	�	Folder

-		o	It is possible to add owns label an icon.

-[[Image:C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\MenuExample.png|Example of obtained Menu]]<br>[[Image:C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\codeXML.PNG|Example of xml for a creation menu]]<br>
-Here an example of xml of creation menu.==Tests=====Create a model without nothing======createa model with only a root======create a model with elementType as String======Use a menu from a model without ElementType model======Use a menu with elementType model======Use a menu with stereotyped element===</html>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/action/CopyFilesAndFoldersOperation.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/action/CopyFilesAndFoldersOperation.java
index 46d315df90c..1e3e15d4f77 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/action/CopyFilesAndFoldersOperation.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/action/CopyFilesAndFoldersOperation.java
@@ -18,6 +18,8 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.filesystem.EFS;
@@ -129,33 +131,37 @@ public class CopyFilesAndFoldersOperation {
 	 * @return the new full path for the copy
 	 */
 	static IPath getAutoNewNameFor(IPath originalName, IWorkspace workspace) {
-		int counter = 1;
 		String resourceName = originalName.lastSegment();
 		IPath leadupSegment = originalName.removeLastSegments(1);
+		boolean isFile = !originalName.hasTrailingSeparator();
 
+		String newName = computeNewName(resourceName, isFile);
 		while (true) {
-			String nameSegment;
-
-			if (counter > 1) {
-				nameSegment = NLS
-						.bind(
-								IDEWorkbenchMessages.CopyFilesAndFoldersOperation_copyNameTwoArgs,
-								new Integer(counter), resourceName);
-			} else {
-				nameSegment = NLS
-						.bind(
-								IDEWorkbenchMessages.CopyFilesAndFoldersOperation_copyNameOneArg,
-								resourceName);
-			}
-
-			IPath pathToTry = leadupSegment.append(nameSegment);
-
+			IPath pathToTry = leadupSegment.append(newName);
 			if (!workspace.getRoot().exists(pathToTry)) {
 				return pathToTry;
 			}
+			newName = computeNewName(newName, isFile);
+		}
+	}
 
-			counter++;
+	private static String computeNewName(String str, boolean isFile) {
+		int lastIndexOfDot = str.lastIndexOf('.');
+		String fileExtension = ""; //$NON-NLS-1$
+		String fileNameNoExtension = str;
+		if (isFile && lastIndexOfDot > 0) {
+			fileExtension = str.substring(lastIndexOfDot);
+			fileNameNoExtension = str.substring(0, lastIndexOfDot);
+		}
+		Pattern p = Pattern.compile("[0-9]+$"); //$NON-NLS-1$
+		Matcher m = p.matcher(fileNameNoExtension);
+		if (m.find()) {
+			// String ends with a number: increment it by 1
+			int newNumber = Integer.parseInt(m.group()) + 1;
+			String numberStr = m.replaceFirst(Integer.toString(newNumber));
+			return numberStr + fileExtension;
 		}
+		return fileNameNoExtension + "2" + fileExtension; //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/.classpath b/plugins/infra/org.eclipse.papyrus.infra.ui/.classpath
new file mode 100644
index 00000000000..a95e0906ca0
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/.gitignore b/plugins/infra/org.eclipse.papyrus.infra.ui/.gitignore
new file mode 100644
index 00000000000..de5a788c8c3
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/.gitignore
@@ -0,0 +1,2 @@
+/.project~
+/.classpath~
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/.project b/plugins/infra/org.eclipse.papyrus.infra.ui/.project
new file mode 100644
index 00000000000..d6fae3f9482
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.infra.ui</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>

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

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

+	</natures>

+</projectDescription>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..9ca8e68231b
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1

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

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

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

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

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

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

+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_assignment=0

+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_after_package=1

+org.eclipse.jdt.core.formatter.blank_lines_before_field=0

+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

+org.eclipse.jdt.core.formatter.blank_lines_before_method=1

+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

+org.eclipse.jdt.core.formatter.blank_lines_before_package=0

+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

+org.eclipse.jdt.core.formatter.comment.format_block_comments=true

+org.eclipse.jdt.core.formatter.comment.format_header=false

+org.eclipse.jdt.core.formatter.comment.format_html=true

+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

+org.eclipse.jdt.core.formatter.comment.format_line_comments=true

+org.eclipse.jdt.core.formatter.comment.format_source_code=true

+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

+org.eclipse.jdt.core.formatter.comment.line_length=260

+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

+org.eclipse.jdt.core.formatter.compact_else_if=true

+org.eclipse.jdt.core.formatter.continuation_indentation=2

+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_empty_lines=false

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

+org.eclipse.jdt.core.formatter.indentation.size=4

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.join_lines_in_comments=false

+org.eclipse.jdt.core.formatter.join_wrapped_lines=false

+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.lineSplit=260

+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

+org.eclipse.jdt.core.formatter.tabulation.char=tab

+org.eclipse.jdt.core.formatter.tabulation.size=4

+org.eclipse.jdt.core.formatter.use_on_off_tags=false

+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..f15dc4a668a
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.infra.ui,

+ org.eclipse.papyrus.infra.ui.menu

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Bundle-Vendor: %providerName

+Bundle-Version: 1.1.0.qualifier

+Eclipse-BuddyPolicy: dependent

+Bundle-Activator: org.eclipse.papyrus.infra.ui.Activator

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.infra.ui;singleton:=

+ true

+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

+ org.eclipse.ui;bundle-version="3.107.0",

+ org.eclipse.core.runtime;bundle-version="3.10.0",

+ org.eclipse.core.expressions;bundle-version="3.4.600",

+ org.eclipse.emf.ecore,

+ org.eclipse.emf.transaction

+Import-Package: org.eclipse.papyrus.infra.emf.utils

+Bundle-Description: Plugin dedicated to manage generic menus and actions, linked to EMF but not to UML nor GMF technologies.

+

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/about.html b/plugins/infra/org.eclipse.papyrus.infra.ui/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

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

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

+<head>

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

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

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

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

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

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

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

+

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

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

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

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

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

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

+

+</body>

+</html>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/build.properties b/plugins/infra/org.eclipse.papyrus.infra.ui/build.properties
new file mode 100644
index 00000000000..488c00bbd17
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/build.properties
@@ -0,0 +1,8 @@
+source.. = src/main/java/

+output.. = target/classes/

+bin.includes = plugin.xml,\

+               META-INF/,\

+               .,\

+               about.html,\

+               plugin.properties

+src.includes = about.html

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.properties b/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.properties
new file mode 100644
index 00000000000..76d4e448199
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=Papyrus Generic menus/commands
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.xml
new file mode 100644
index 00000000000..9bb05a45e56
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<?eclipse version="3.0"?>

+

+<!--
+ <copyright>
+ </copyright>
+
+ $Id$
+-->

+<plugin>

+ <extension

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

+      <menuContribution

+            locationURI="menu:org.eclipse.ui.main.menu?after=navigate">

+         <menu

+               id="org.eclipse.papyrus.ui.menu"

+               label="Papyrus"

+               tooltip="Papyrus Editor Menu">

+            <visibleWhen>

+               <with

+                     variable="activeEditorId">

+                  <equals

+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

+                  </equals>

+               </with>

+            </visibleWhen>

+         </menu>

+      </menuContribution>

+  </extension>

+  <extension

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

+      

+        <menuContribution

+              allPopups="false"

+              locationURI="menu:org.eclipse.papyrus.ui.menu">

+                <menu

+            label="&amp;Quick Formatting..."

+            tooltip="Quick formatting for labels">

+         <command

+               commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingUpperCaseCommand"

+               label="&amp;Uppercase Quick Formatting"

+               style="push">

+            <parameter

+                  name="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

+                  value="uppercase">

+            </parameter>

+      	 </command>

+      	 <command

+              commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingLowerCaseCommand"

+              label="&amp;Lowercase Quick Formatting"

+              style="push">

+           <parameter

+                 name="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

+                 value="lowercase">

+           </parameter>

+      	 </command>

+        <visibleWhen

+              checkEnabled="true">

+        </visibleWhen>

+      </menu>

+        </menuContribution>

+  </extension>   

+<extension

+      id="PapyrusQuickFormattingCommand" 

+      name="QuickFormattingCommand"

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

+   <command

+         categoryId="org.eclipse.papyrus.infra.ui.quickformat"

+         description="The command to quickly format in uppercase the selected labels"

+         id="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingUpperCaseCommand"

+         name="Upper Case Quick Format Command">

+      <commandParameter

+            id="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

+            name="name"

+            optional="false">

+      </commandParameter>

+   </command>

+   <command

+         categoryId="org.eclipse.papyrus.infra.ui.quickformat"

+         description="The command to quickly format in lowercase the selected labels"

+         id="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingLowerCaseCommand"

+         name="Lower Case Quick Format Command">

+      <commandParameter

+            id="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

+            name="name"

+            optional="false">

+      </commandParameter>

+   </command>

+   <category

+         description="quickformat routines"

+         id="org.eclipse.papyrus.infra.ui.quickformat"

+         name="quickformat routines">

+   </category>

+</extension>

+

+
+</plugin>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.ui/pom.xml
new file mode 100644
index 00000000000..ee0cff241c0
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/pom.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../../../releng/top-pom-main.xml</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.ui</artifactId>
+	<groupId>org.eclipse.papyrus</groupId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+	<description>Plugin dedicated to manage generic menus and actions, linked to EMF but not to UML nor GMF technologies.</description>
+
+	<issueManagement>
+		<url>https://bugs.eclipse.org/bugs</url>
+		<system>Eclipse Bugzilla Issues</system>
+	</issueManagement>
+
+	<licenses>
+		<license>
+			<name>Eclipse Public License</name>
+			<url>https://www.eclipse.org/legal/epl-v10.html</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<scm>
+		<url>https://git.eclipse.org/c/papyrus/org.eclipse.papyrus.git</url>
+		<connection>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git</connection>
+		<developerConnection>scm:git:git@github.com:kevinsawicki/github-maven-example.gitssh://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git</developerConnection>
+	</scm>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
+				<version>1.3</version>
+				<executions>
+					<execution>
+						<phase>pre-site</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+						<configuration>
+							<doCheck>false</doCheck>
+							<doUpdate>false</doUpdate>
+							<format>{0,date,yyyy-MM-dd_HH-mm}</format>
+							<items>
+								<item>timestamp</item>
+							</items>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.3</version>
+				<configuration>
+					<skipDeploy>false</skipDeploy>
+					<!-- stagingSiteURL>file://${siteMainDirectory}</stagingSiteURL -->
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>lt.velykis.maven.skins</groupId>
+						<artifactId>reflow-velocity-tools</artifactId>
+						<version>1.1.1</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.velocity</groupId>
+						<artifactId>velocity</artifactId>
+						<version>1.7</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-pdf-plugin</artifactId>
+				<version>1.3</version>
+				<executions>
+					<execution>
+						<id>pdf</id>
+						<phase>site</phase>
+						<goals>
+							<goal>pdf</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
+							<includeReports>false</includeReports>
+							<docDescriptor>src/site/pdf/main.pdf.xml</docDescriptor>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.2</version>
+				<configuration>
+					<show>private</show>
+					<!-- nohelp>true</nohelp -->
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>2.8</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.2</version>
+				<configuration>
+					<!-- stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile -->
+					<!-- show>public</show -->
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+</project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/Activator.java b/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/Activator.java
new file mode 100644
index 00000000000..27101698e64
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/Activator.java
@@ -0,0 +1,74 @@
+/*****************************************************************************

+ * Copyright (c) 2011 CEA LIST.

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.ui;

+

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

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

+import org.osgi.framework.BundleContext;

+

+/**

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

+ */

+public class Activator extends AbstractUIPlugin {

+

+	/**

+	 * The plug-in ID

+	 */

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.ui"; //$NON-NLS-1$

+

+	// The shared instance

+	private static Activator plugin;

+

+	/**

+	 * The plug-in's logger

+	 */

+	public static LogHelper log;

+

+	/**

+	 * The constructor

+	 */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 *

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

+	 */

+	@Override

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+		log = new LogHelper(this);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 *

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

+	 */

+	@Override

+	public void stop(BundleContext context) throws Exception {

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 *

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return plugin;

+	}

+

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractCommonCommandHandler.java b/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractCommonCommandHandler.java
new file mode 100644
index 00000000000..0dde1df49b9
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractCommonCommandHandler.java
@@ -0,0 +1,97 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.menu;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;
+import org.eclipse.ui.ISources;
+
+/**
+ * This abstract command handler: - calculates the current selection -
+ * calculates the visibility and enablement based on command executability -
+ * executes the command in Papyrus command stack
+ *
+ */
+public abstract class AbstractCommonCommandHandler extends AbstractHandler {
+
+	/**
+	 * Iterate over current selection and build a list of the {@link EObject} contained in the selection.
+	 *
+	 * @return the currently selected {@link EObject}
+	 */
+	protected abstract List<EObject> getSelectedElements();
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return null
+	 * @throws ExecutionException
+	 */
+	public abstract Object execute(ExecutionEvent event) throws ExecutionException;
+
+	protected TransactionalEditingDomain getEditingDomain(ExecutionEvent event) {
+		try {
+			return ServiceUtilsForHandlers.getInstance().getTransactionalEditingDomain(event);
+		} catch (ServiceException ex) {
+			return null;
+		}
+	}
+
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		if (evaluationContext instanceof IEvaluationContext) {
+			Object selection = ((IEvaluationContext) evaluationContext).getVariable(ISources.ACTIVE_CURRENT_SELECTION_NAME);
+			if (selection instanceof Collection<?>) {
+				this.selection = (selection instanceof List<?>) ? (List<?>) selection : new java.util.ArrayList<Object>((Collection<?>) selection);
+			} else if (selection instanceof IStructuredSelection) {
+				this.selection = ((IStructuredSelection) selection).toList();
+			}
+			setBaseEnabled(computeEnabled());
+			this.selection = Collections.EMPTY_LIST;
+		}
+		super.setEnabled(evaluationContext);
+	}
+
+	protected boolean computeEnabled() {
+		List<EObject> elts = getSelectedElements();
+		return !(elts.size()==0);
+	}
+
+	protected List<?> getSelection() {
+		return selection;
+	}
+
+	protected List<?> selection = Collections.EMPTY_LIST;
+
+	/**
+	 *
+	 * @return true if the command can be executed
+	 */
+	public boolean isVisible() {
+		return isEnabled();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractEMFParametricOnSelectedElementsAction.java b/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractEMFParametricOnSelectedElementsAction.java
new file mode 100644
index 00000000000..857d4373055
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractEMFParametricOnSelectedElementsAction.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST.

+ *

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.ui.menu;

+

+import java.util.List;

+

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.common.command.UnexecutableCommand;

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

+import org.eclipse.papyrus.infra.ui.menu.AbstractParametricOnSelectedElementsAction;

+

+

+public abstract class AbstractEMFParametricOnSelectedElementsAction extends AbstractParametricOnSelectedElementsAction {

+

+	/**

+	 *

+	 * Constructor.

+	 *

+	 * @param parameter

+	 *            parameter for the action

+	 * @param selectedEditPart

+	 *            the selectedEditPart for the action

+	 */

+	public AbstractEMFParametricOnSelectedElementsAction(String parameter, List<EObject> selectedEditPart) {

+		super(parameter, selectedEditPart);

+	}

+

+	/**

+	 * Returns the command for this action

+	 *

+	 * @return

+	 *         the command for this action

+	 */

+	public Command getCommand() {

+		if (isEnabled()) {

+			Command cmd = getBuildedCommand();

+			if (cmd != null && cmd.canExecute()) {

+				return cmd;

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 *

+	 * @return

+	 *         the command for this action

+	 */

+	protected abstract Command getBuildedCommand();

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractParametricOnSelectedElementsAction.java b/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractParametricOnSelectedElementsAction.java
new file mode 100644
index 00000000000..ef2255fc632
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractParametricOnSelectedElementsAction.java
@@ -0,0 +1,115 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST.

+ *

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.ui.menu;

+

+import java.util.List;

+

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

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

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;

+import org.eclipse.papyrus.infra.ui.Activator;

+

+

+public abstract class AbstractParametricOnSelectedElementsAction {

+

+	/**

+	 * parameter for the action

+	 */

+	protected String parameter;

+

+	/**

+	 * selected EditPart

+	 */

+	private List<EObject> selection;

+

+	/**

+	 *

+	 * Constructor.

+	 *

+	 * @param parameter

+	 *            parameter for the action

+	 * @param selectedEditPart

+	 *            the selectedEditPart for the action

+	 */

+	public AbstractParametricOnSelectedElementsAction(String parameter, List<EObject> selectedEditPart) {

+		this.parameter = parameter;

+		this.selection = selectedEditPart;

+	}

+

+	/**

+	 * Returns the selected Editparts for this action

+	 *

+	 * @return

+	 *         {@link #selection}

+	 */

+	protected List<EObject> getSelection() {

+		return selection;

+	}

+

+	/**

+	 * Test if the command can be build

+	 *

+	 * @return

+	 *         <code>true</code> if the command can be build

+	 */

+	public boolean isEnabled() {

+		return true;

+		//return !selection.isEmpty();

+	}

+

+	/**

+	 * Gets the parameter.

+	 *

+	 * @return the parameter

+	 */

+	public String getParameter() {

+		return parameter;

+	}

+

+

+	/**

+	 * Sets the parameter.

+	 *

+	 * @param parameter

+	 *            the new parameter

+	 */

+	public void setParameter(String parameter) {

+		this.parameter = parameter;

+	}

+

+	/**

+	 * executes the action

+	 */

+	public void doRun(IProgressMonitor progressMonitor) {

+		// may be implemented by inherited class

+	};

+

+	

+	/**

+	 * Returns the {@link TransactionalEditingDomain}

+	 *

+	 * @return the {@link TransactionalEditingDomain} or <code>null</code> if it can not be found

+	 */

+	protected TransactionalEditingDomain getEditingDomain() {

+		TransactionalEditingDomain editingDomain = null;

+		try {

+			editingDomain = ServiceUtilsForActionHandlers.getInstance().getTransactionalEditingDomain();

+		} catch (ServiceException e) {

+			Activator.log.error(e);

+		}

+		return editingDomain;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/NameNormalizationCommand.java b/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/NameNormalizationCommand.java
new file mode 100644
index 00000000000..b372e14df6f
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/NameNormalizationCommand.java
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.menu;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+
+/**
+ * this command is used to create a link "satisfyBy" between requirement and namedElement
+ *
+ */
+public abstract class NameNormalizationCommand extends RecordingCommand{
+	protected EObject source;
+	protected String parameter;
+	
+	public static final String NAME_ACTION="name quick formatting action";//$NON-NLS-1$
+	
+	public static final String DEFAULT_ACTION="default";//$NON-NLS-1$
+	public static final String UPPERCASE_ACTION="uppercase";//$NON-NLS-1$
+	public static final String LOWERCASE_ACTION="lowercase";//$NON-NLS-1$
+	
+
+	public NameNormalizationCommand(TransactionalEditingDomain domain, EObject source, String normalization){ 
+		super(domain,NAME_ACTION+": "+normalization);
+		this.source=source;
+		this.parameter=normalization;
+	}
+
+}
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/NamePropertyTester.java b/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/NamePropertyTester.java
new file mode 100644
index 00000000000..d8d10a71890
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/NamePropertyTester.java
@@ -0,0 +1,41 @@
+/*****************************************************************************

+ * Copyright (c) 2011 CEA LIST.

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.ui.menu;

+

+import org.eclipse.core.expressions.PropertyTester;

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

+

+public abstract class NamePropertyTester extends PropertyTester {

+	/**

+	 * property associated with the parameter linked to the command in the plugin.xml

+	 */

+	public static final String PARAMETER_ID = new String("org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"); //$NON-NLS-1$

+	/**

+	 * property to test if a diagram has the required edit policy

+	 */

+	public static final String IS_NAME_CHANGEABLE = "isNameChangeable"; //$NON-NLS-1$

+

+

+	/**

+	 *

+	 * {@inheritDoc}

+	 */

+	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {

+		if (IS_NAME_CHANGEABLE.equals(property) && receiver instanceof IStructuredSelection) {

+			boolean answer = isNameChangeable((IStructuredSelection) receiver);

+			return new Boolean(answer).equals(expectedValue);

+		}

+		return false;

+	}

+	

+	protected abstract boolean isNameChangeable(IStructuredSelection selection);

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/pdf/main.pdf.xml b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/pdf/main.pdf.xml
new file mode 100644
index 00000000000..77c0f61bafa
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/pdf/main.pdf.xml
@@ -0,0 +1,24 @@
+<document xmlns="http://maven.apache.org/DOCUMENT/1.0.1"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/DOCUMENT/1.0.1 http://maven.apache.org/xsd/document-1.0.1.xsd"
+  outputName="org.eclipse.papyrus.infra.ui.doc">
+
+  <meta>
+    <title>org.eclipse.papyrus.infra.ui</title>
+    <author>CEA LISE</author>
+  </meta>
+
+  <toc name="Table of Contents">
+    <item name="Home" ref="home.html"/>
+  </toc>
+
+  <cover>
+    <coverTitle>${project.name}</coverTitle>
+    <coverSubTitle>v. ${project.version} build ${buildNumber}</coverSubTitle>
+    <coverType>Developer Documentation</coverType>
+    <projectName>${project.name}</projectName>
+    <projectLogo>./images/papyrus.png</projectLogo>
+    <companyName>Eclipse</companyName>
+    <companyLogo>./images/eclipse-800x188.png</companyLogo>
+  </cover>
+</document>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/resources/images/eclipse-800x188.png b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/resources/images/eclipse-800x188.png
new file mode 100644
index 00000000000..0c469529da5
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/resources/images/eclipse-800x188.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/resources/images/papyrus.png b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/resources/images/papyrus.png
new file mode 100644
index 00000000000..edf2a1c9a32
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/resources/images/papyrus.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/site.xml b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/site.xml
new file mode 100644
index 00000000000..d3180b77035
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/site.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Reflow Maven Skin"
+  xmlns="http://maven.apache.org/DECORATION/1.3.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+
+  <bannerLeft>
+    <name><![CDATA[
+     Eclipse <span class="color-highlight">Papyrus</span> project
+      ]]>
+    </name>
+    <href>https://www.eclipse.org/papyrus/</href>
+  </bannerLeft>
+  
+  <publishDate position="bottom" format="yyyy-MM-dd" />
+  <version position="bottom" />
+
+  <skin>
+    <groupId>lt.velykis.maven.skins</groupId>
+    <artifactId>reflow-maven-skin</artifactId>
+    <version>1.1.1</version>
+  </skin>
+  <custom>
+    <reflowSkin>
+      <!-- Make this to 'false' for local development, i.e. file:// URLs -->
+      <protocolRelativeURLs>false</protocolRelativeURLs>
+      <smoothScroll>true</smoothScroll>
+      <theme>bootswatch-cosmo</theme>
+      <highlightJs>true</highlightJs>
+      <highlightJsTheme>github</highlightJsTheme>
+      <!-- absoluteResourceURL>http://flefevre.github.io/testpapy/</absoluteResourceURL-->
+      <brand>
+        <!-- Brand text in top-left part of the site -->
+        <name>
+          <![CDATA[
+          Eclipse <span class="color-highlight">Papyrus</span> Project
+          ]]>
+        </name>
+        <href>https://www.eclipse.org/papyrus/</href>
+      </brand>
+      <slogan>an integrated and user-consumable environment for editing any kind of EMF model (UML, SysML, MARTE...)</slogan>
+      <titleTemplate>%2$s | %1$s</titleTemplate>
+      <!-- Use Table of Contents at the top of the page (max 6 elements) -->
+      <toc>top</toc>
+      <tocTopMax>6</tocTopMax>
+      <!-- Include the documentation and tools in the top navigation (in addition to links) -->
+      <topNav>Main|reports|modules|parent</topNav>
+      <!-- Split menus in the bottom navigation -->
+      <bottomNav maxSpan="9" >
+        <column>Main</column>
+        <column>Download</column>
+        <column>reports|modules|parent</column>
+      </bottomNav>
+      <bottomDescription>
+        <![CDATA[
+         Eclipse <span class="color-highlight">Papyrus</span> project is aiming at providing an ntegrated and user-consumable environment for editing any kind of EMF model and particularly supporting UML and related modeling languages such as SysML and MARTE.
+        ]]>
+      </bottomDescription>
+      <pages>
+        <index project="infra.ui">
+          <!-- Override the title -->
+          <titleTemplate>Papyrus</titleTemplate>
+          <!-- no breadcrumbs on the main index page -->
+          <breadcrumbs>false</breadcrumbs>
+          <!-- no ToC on the main index page -->
+          <toc>false</toc>
+          <markPageHeader>false</markPageHeader>
+          <sections>
+            <!-- carousel /-->
+            <columns>2</columns>
+            <body />
+            <sidebar />
+          </sections>
+        </index>
+        <contribute>
+          <breadcrumbs>false</breadcrumbs>
+        </contribute>
+        <!-- Disable source highlighting for Maven reports -->
+        <source-repository>
+          <highlightJs>false</highlightJs>
+        </source-repository>
+        <issue-tracking>
+          <highlightJs>false</highlightJs>
+          <toc>false</toc>
+        </issue-tracking>
+        <license>
+          <highlightJs>false</highlightJs>
+          <toc>false</toc>
+        </license>
+        <!-- Disable ToC for some Maven reports -->
+        <project-info>
+          <toc>false</toc>
+        </project-info>
+        <!-- github-report>
+          <toc>false</toc>
+        </github-report-->
+        <dependencies>
+          <tocTopMax>4</tocTopMax>
+        </dependencies>
+      </pages>
+    </reflowSkin>
+  </custom>
+
+  <body>
+  
+    <links>
+      <item name="Online" href="http://www.eclipse.org/papyrus" />
+      <item name="Nexus repository" href="https://repo.eclipse.org/index.html#welcome" />
+      <item name="Pdf" href="org.eclipse.papyrus.infra.ui.doc.pdf" />
+    </links>
+
+    <breadcrumbs>
+      <item name="nf-doc" href="/" />
+    </breadcrumbs>
+  
+    <menu name="Main" inherit="top">
+      <item name="Home" href="home.html" />
+      <item name="Index" href="index.html" />
+    </menu>
+    <menu name="Maven documentation" ref="reports" inherit="bottom"/>
+    <menu ref="modules" inherit="top" />
+	<menu ref="parent" inherit="top" />
+  </body>
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/xdoc/home.xml b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/xdoc/home.xml
new file mode 100644
index 00000000000..09934bebfa2
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/xdoc/home.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+
+	<properties>
+		<title>org.eclipse.papyrus.infra.ui</title>
+	</properties>
+
+	<body>
+		<section name="org.eclipse.papyrus.uinfra.ui for developers">
+			<p>section dedicated for developers</p>
+			<subsection name="Context">
+				<p>This plugin is dedicated to hold any generic menu or actions, linked eventually to EMF, but not to GMF nor UML.
+				</p>
+			</subsection>
+		</section>
+		<section name="Documentation generation">
+			<subsection name="Javadoc generation defined in plugin section">
+				<source>mvn javadoc:javadoc</source>
+			</subsection>
+			<subsection name="Web site generation with javadoc defined in report section">
+				<source>mvn site:site</source>
+			</subsection>
+			<subsection name="Pdf generation">
+				<source>mvn pdf:pdf</source>
+			</subsection>
+		</section>
+	</body>
+</document>
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomBlockCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
index 7b15239e938..64186cf5082 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.GraphicalTypeR
 import org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockCompositeSemanticEditPolicy;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLCreateOrShowExistingElementHelper;
 import org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper;
-import org.eclipse.papyrus.uml.service.types.command.AssociationReorientCommand;
 import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;
 import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;
 import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsCreateCommand;
@@ -112,18 +111,4 @@ public class CustomBlockCompositeSemanticEditPolicy extends BlockCompositeSemant
 
 		return super.getReorientReferenceRelationshipCommand(req);
 	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy#getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)
-	 *
-	 * @param req
-	 * @return
-	 */
-	@Override
-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
-		return getGEFWrapper(new AssociationReorientCommand(req));
-	}
-
-
-
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
index db3bd4eae0e..281198aa5a9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
@@ -23,10 +23,10 @@ import org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockCompositeSemant
 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomGraphicalTypeRegistry;

 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;

 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.GraphicalTypeRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;

+import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;

+import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsCreateCommand;

+import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsReorientCommand;

 

 /**

  * <pre>

@@ -50,11 +50,11 @@ public class CustomBlockCompositeSemanticEditPolicy extends BlockCompositeSemant
 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

 

 		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementsCreateCommand(req));

 		}

 

 		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementsCreateCommand(req));

 		}

 

 		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

@@ -80,11 +80,11 @@ public class CustomBlockCompositeSemanticEditPolicy extends BlockCompositeSemant
 		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

 

 		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+			return getGEFWrapper(new CommentAnnotatedElementsReorientCommand(req));

 		}

 

 		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+			return getGEFWrapper(new ConstraintConstrainedElementsReorientCommand(req));

 		}

 

 		return super.getReorientReferenceRelationshipCommand(req);

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeSemanticEditPolicy.java
index 0ac72630331..177eb86776c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeSemanticEditPolicy.java
@@ -26,10 +26,10 @@ import org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomGraphicalT
 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;

 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.GraphicalTypeRegistry;

 import org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;

+import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;

+import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsCreateCommand;

+import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsReorientCommand;

 import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

 

 /**

@@ -59,11 +59,11 @@ public class CustomBlockPropertyCompositeSemanticEditPolicy extends BlockPropert
 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

 

 		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementsCreateCommand(req));

 		}

 

 		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementsCreateCommand(req));

 		}

 

 		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

@@ -99,11 +99,11 @@ public class CustomBlockPropertyCompositeSemanticEditPolicy extends BlockPropert
 		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

 

 		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+			return getGEFWrapper(new CommentAnnotatedElementsReorientCommand(req));

 		}

 

 		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+			return getGEFWrapper(new ConstraintConstrainedElementsReorientCommand(req));

 		}

 

 		return super.getReorientReferenceRelationshipCommand(req);

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDefaultSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDefaultSemanticEditPolicy.java
index 7c5f1c648eb..008d39285a3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDefaultSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDefaultSemanticEditPolicy.java
@@ -26,10 +26,10 @@ import org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomGraphicalT
 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;

 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.GraphicalTypeRegistry;

 import org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;

+import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;

+import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsCreateCommand;

+import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsReorientCommand;

 import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

 

 /**

@@ -60,11 +60,11 @@ public class CustomDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {
 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

 

 		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementsCreateCommand(req));

 		}

 

 		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementsCreateCommand(req));

 		}

 

 		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

@@ -101,11 +101,11 @@ public class CustomDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {
 		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

 

 		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+			return getGEFWrapper(new CommentAnnotatedElementsReorientCommand(req));

 		}

 

 		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+			return getGEFWrapper(new ConstraintConstrainedElementsReorientCommand(req));

 		}

 

 		return super.getReorientReferenceRelationshipCommand(req);

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomNestedBlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomNestedBlockPropertyCompositeSemanticEditPolicy.java
index ae215599766..7b659b42d00 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomNestedBlockPropertyCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomNestedBlockPropertyCompositeSemanticEditPolicy.java
@@ -23,10 +23,10 @@ import org.eclipse.papyrus.sysml.diagram.common.edit.policy.NestedBlockPropertyC
 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomGraphicalTypeRegistry;

 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;

 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.GraphicalTypeRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;

+import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;

+import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsCreateCommand;

+import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsReorientCommand;

 

 /**

  * <pre>

@@ -51,11 +51,11 @@ public class CustomNestedBlockPropertyCompositeSemanticEditPolicy extends Nested
 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

 

 		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementsCreateCommand(req));

 		}

 

 		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementsCreateCommand(req));

 		}

 

 		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

@@ -81,11 +81,11 @@ public class CustomNestedBlockPropertyCompositeSemanticEditPolicy extends Nested
 		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

 

 		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+			return getGEFWrapper(new CommentAnnotatedElementsReorientCommand(req));

 		}

 

 		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+			return getGEFWrapper(new ConstraintConstrainedElementsReorientCommand(req));

 		}

 

 		return super.getReorientReferenceRelationshipCommand(req);

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDefaultSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDefaultSemanticEditPolicy.java
index 73fcf2612f3..f3e58bef495 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDefaultSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDefaultSemanticEditPolicy.java
@@ -28,8 +28,8 @@ import org.eclipse.papyrus.sysml.diagram.parametric.provider.CustomGraphicalType
 import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
 import org.eclipse.papyrus.sysml.diagram.parametric.provider.GraphicalTypeRegistry;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
+import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;
+import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;
 import org.eclipse.papyrus.uml.service.types.command.ConnectorReorientCommand;
 
 /**
@@ -54,7 +54,7 @@ public class CustomDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {
 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
 
 		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));
+			return getGEFWrapper(new CommentAnnotatedElementsCreateCommand(req));
 		}
 
 		if (ElementTypes.CONTEXT_LINK == req.getElementType()) {
@@ -84,7 +84,7 @@ public class CustomDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {
 		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;
 
 		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
+			return getGEFWrapper(new CommentAnnotatedElementsReorientCommand(req));
 		}
 
 		if (UMLGraphicalTypes.LINK_UML_CONNECTOR_ID.equals(reconnectedViewType)) {
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/xmlElementHandlers.xml b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/xmlElementHandlers.xml
deleted file mode 100644
index b81c08f4861..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/xmlElementHandlers.xml
+++ /dev/null
@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-<!-- Creation command declarations -->
-<extension point="org.eclipse.ui.commands">
-	<!-- Creation command for Allocate -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.AllocateHandler" description="Create a new Allocate" id="org.eclipse.papyrus.sysml.modelexplorer.AllocateCreateCommand" name="Create a new Allocate">
-	</command>
-	
-	<!-- Creation command for Association -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.AssociationHandler" description="Create a new Association" id="org.eclipse.papyrus.sysml.modelexplorer.AssociationCreateCommand" name="Create a new Association">
-	</command>
-	
-	<!-- Creation command for AssociationComposite -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.AssociationCompositeHandler" description="Create a new AssociationComposite" id="org.eclipse.papyrus.sysml.modelexplorer.AssociationCompositeCreateCommand" name="Create a new AssociationComposite">
-	</command>
-	
-	<!-- Creation command for AssociationCompositeDirected -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.AssociationCompositeDirectedHandler" description="Create a new AssociationCompositeDirected" id="org.eclipse.papyrus.sysml.modelexplorer.AssociationCompositeDirectedCreateCommand" name="Create a new AssociationCompositeDirected">
-	</command>
-	
-	<!-- Creation command for AssociationNone -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.AssociationNoneHandler" description="Create a new AssociationNone" id="org.eclipse.papyrus.sysml.modelexplorer.AssociationNoneCreateCommand" name="Create a new AssociationNone">
-	</command>
-	
-	<!-- Creation command for AssociationNoneDirected -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.AssociationNoneDirectedHandler" description="Create a new AssociationNoneDirected" id="org.eclipse.papyrus.sysml.modelexplorer.AssociationNoneDirectedCreateCommand" name="Create a new AssociationNoneDirected">
-	</command>
-	
-	<!-- Creation command for AssociationShared -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.AssociationSharedHandler" description="Create a new AssociationShared" id="org.eclipse.papyrus.sysml.modelexplorer.AssociationSharedCreateCommand" name="Create a new AssociationShared">
-	</command>
-	
-	<!-- Creation command for AssociationSharedDirected -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.AssociationSharedDirectedHandler" description="Create a new AssociationSharedDirected" id="org.eclipse.papyrus.sysml.modelexplorer.AssociationSharedDirectedCreateCommand" name="Create a new AssociationSharedDirected">
-	</command>
-	
-	<!-- Creation command for Block -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.BlockHandler" description="Create a new Block" id="org.eclipse.papyrus.sysml.modelexplorer.BlockCreateCommand" name="Create a new Block">
-	</command>
-	
-	<!-- Creation command for Conform -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ConformHandler" description="Create a new Conform" id="org.eclipse.papyrus.sysml.modelexplorer.ConformCreateCommand" name="Create a new Conform">
-	</command>
-	
-	<!-- Creation command for ConstraintBlock -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ConstraintBlockHandler" description="Create a new ConstraintBlock" id="org.eclipse.papyrus.sysml.modelexplorer.ConstraintBlockCreateCommand" name="Create a new ConstraintBlock">
-	</command>
-	
-	<!-- Creation command for ConstraintProperty -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ConstraintPropertyHandler" description="Create a new ConstraintProperty" id="org.eclipse.papyrus.sysml.modelexplorer.ConstraintPropertyCreateCommand" name="Create a new ConstraintProperty">
-	</command>
-	
-	<!-- Creation command for Copy -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.CopyHandler" description="Create a new Copy" id="org.eclipse.papyrus.sysml.modelexplorer.CopyCreateCommand" name="Create a new Copy">
-	</command>
-	
-	<!-- Creation command for DeriveReqt -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.DeriveReqtHandler" description="Create a new DeriveReqt" id="org.eclipse.papyrus.sysml.modelexplorer.DeriveReqtCreateCommand" name="Create a new DeriveReqt">
-	</command>
-	
-	<!-- Creation command for Dimension -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.DimensionHandler" description="Create a new Dimension" id="org.eclipse.papyrus.sysml.modelexplorer.DimensionCreateCommand" name="Create a new Dimension">
-	</command>
-	
-	<!-- Creation command for FlowPort -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPortHandler" description="Create a new FlowPort" id="org.eclipse.papyrus.sysml.modelexplorer.FlowPortCreateCommand" name="Create a new FlowPort">
-	</command>
-	
-	<!-- Creation command for FlowPort_InOut -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPort_InOutHandler" description="Create a new FlowPort_InOut" id="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_InOutCreateCommand" name="Create a new FlowPort_InOut">
-	</command>
-	
-	<!-- Creation command for FlowPort_In -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPort_InHandler" description="Create a new FlowPort_In" id="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_InCreateCommand" name="Create a new FlowPort_In">
-	</command>
-	
-	<!-- Creation command for FlowPort_Out -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPort_OutHandler" description="Create a new FlowPort_Out" id="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_OutCreateCommand" name="Create a new FlowPort_Out">
-	</command>
-	
-	<!-- Creation command for FlowPort_NA -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPort_NAHandler" description="Create a new FlowPort_NA" id="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_NACreateCommand" name="Create a new FlowPort_NA">
-	</command>
-	
-	<!-- Creation command for FlowProperty -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPropertyHandler" description="Create a new FlowProperty" id="org.eclipse.papyrus.sysml.modelexplorer.FlowPropertyCreateCommand" name="Create a new FlowProperty">
-	</command>
-	
-	<!-- Creation command for FlowSpecification -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowSpecificationHandler" description="Create a new FlowSpecification" id="org.eclipse.papyrus.sysml.modelexplorer.FlowSpecificationCreateCommand" name="Create a new FlowSpecification">
-	</command>
-	
-	<!-- Creation command for ItemFlow -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ItemFlowHandler" description="Create a new ItemFlow" id="org.eclipse.papyrus.sysml.modelexplorer.ItemFlowCreateCommand" name="Create a new ItemFlow">
-	</command>
-	
-	<!-- Creation command for PartProperty -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.PartPropertyHandler" description="Create a new PartProperty" id="org.eclipse.papyrus.sysml.modelexplorer.PartPropertyCreateCommand" name="Create a new PartProperty">
-	</command>
-	
-	<!-- Creation command for Problem -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ProblemHandler" description="Create a new Problem" id="org.eclipse.papyrus.sysml.modelexplorer.ProblemCreateCommand" name="Create a new Problem">
-	</command>
-	
-	<!-- Creation command for Rationale -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.RationaleHandler" description="Create a new Rationale" id="org.eclipse.papyrus.sysml.modelexplorer.RationaleCreateCommand" name="Create a new Rationale">
-	</command>
-	
-	<!-- Creation command for ReferenceProperty -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ReferencePropertyHandler" description="Create a new ReferenceProperty" id="org.eclipse.papyrus.sysml.modelexplorer.ReferencePropertyCreateCommand" name="Create a new ReferenceProperty">
-	</command>
-	
-	<!-- Creation command for Requirement -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.RequirementHandler" description="Create a new Requirement" id="org.eclipse.papyrus.sysml.modelexplorer.RequirementCreateCommand" name="Create a new Requirement">
-	</command>
-	
-	<!-- Creation command for Satisfy -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.SatisfyHandler" description="Create a new Satisfy" id="org.eclipse.papyrus.sysml.modelexplorer.SatisfyCreateCommand" name="Create a new Satisfy">
-	</command>
-	
-	<!-- Creation command for Unit -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.UnitHandler" description="Create a new Unit" id="org.eclipse.papyrus.sysml.modelexplorer.UnitCreateCommand" name="Create a new Unit">
-	</command>
-	
-	<!-- Creation command for ValueProperty -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ValuePropertyHandler" description="Create a new ValueProperty" id="org.eclipse.papyrus.sysml.modelexplorer.ValuePropertyCreateCommand" name="Create a new ValueProperty">
-	</command>
-	
-	<!-- Creation command for ValueType -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ValueTypeHandler" description="Create a new ValueType" id="org.eclipse.papyrus.sysml.modelexplorer.ValueTypeCreateCommand" name="Create a new ValueType">
-	</command>
-	
-	<!-- Creation command for ValueType_Enumeration -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ValueType_EnumerationHandler" description="Create a new ValueType_Enumeration" id="org.eclipse.papyrus.sysml.modelexplorer.ValueType_EnumerationCreateCommand" name="Create a new ValueType_Enumeration">
-	</command>
-	
-	<!-- Creation command for ValueType_PrimitiveType -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ValueType_PrimitiveTypeHandler" description="Create a new ValueType_PrimitiveType" id="org.eclipse.papyrus.sysml.modelexplorer.ValueType_PrimitiveTypeCreateCommand" name="Create a new ValueType_PrimitiveType">
-	</command>
-	
-	<!-- Creation command for Verify -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.VerifyHandler" description="Create a new Verify" id="org.eclipse.papyrus.sysml.modelexplorer.VerifyCreateCommand" name="Create a new Verify">
-	</command>
-	
-	<!-- Creation command for View -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ViewHandler" description="Create a new View" id="org.eclipse.papyrus.sysml.modelexplorer.ViewCreateCommand" name="Create a new View">
-	</command>
-	
-	<!-- Creation command for ViewPoint -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ViewPointHandler" description="Create a new ViewPoint" id="org.eclipse.papyrus.sysml.modelexplorer.ViewPointCreateCommand" name="Create a new ViewPoint">
-	</command>
-	
-</extension>
-
-	
-<!-- UI Menu declaration for creation commands -->
-<extension point="org.eclipse.ui.menus">
-
-	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.createsysmlchild" allPopups="false">
-
-		<!-- Creation menu action for Allocate -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.AllocateCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" label="Create a new Allocate" style="push" tooltip="Create a new Allocate">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Association -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.AssociationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" label="Create a new Association" style="push" tooltip="Create a new Association">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for AssociationComposite -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.AssociationCompositeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" label="Create a new AssociationComposite" style="push" tooltip="Create a new AssociationComposite">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for AssociationCompositeDirected -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.AssociationCompositeDirectedCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" label="Create a new AssociationCompositeDirected" style="push" tooltip="Create a new AssociationCompositeDirected">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for AssociationNone -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.AssociationNoneCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" label="Create a new AssociationNone" style="push" tooltip="Create a new AssociationNone">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for AssociationNoneDirected -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.AssociationNoneDirectedCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" label="Create a new AssociationNoneDirected" style="push" tooltip="Create a new AssociationNoneDirected">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for AssociationShared -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.AssociationSharedCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" label="Create a new AssociationShared" style="push" tooltip="Create a new AssociationShared">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for AssociationSharedDirected -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.AssociationSharedDirectedCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" label="Create a new AssociationSharedDirected" style="push" tooltip="Create a new AssociationSharedDirected">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Block -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.BlockCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif" label="Create a new Block" style="push" tooltip="Create a new Block">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Conform -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ConformCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Conform.gif" label="Create a new Conform" style="push" tooltip="Create a new Conform">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ConstraintBlock -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ConstraintBlockCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif" label="Create a new ConstraintBlock" style="push" tooltip="Create a new ConstraintBlock">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ConstraintProperty -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ConstraintPropertyCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif" label="Create a new ConstraintProperty" style="push" tooltip="Create a new ConstraintProperty">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Copy -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.CopyCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Copy.gif" label="Create a new Copy" style="push" tooltip="Create a new Copy">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for DeriveReqt -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.DeriveReqtCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/DeriveReqt.gif" label="Create a new DeriveReqt" style="push" tooltip="Create a new DeriveReqt">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Dimension -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.DimensionCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif" label="Create a new Dimension" style="push" tooltip="Create a new Dimension">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for FlowPort -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPortCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif" label="Create a new FlowPort" style="push" tooltip="Create a new FlowPort">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for FlowPort_InOut -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_InOutCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT.gif" label="Create a new FlowPort_InOut" style="push" tooltip="Create a new FlowPort_InOut">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for FlowPort_In -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_InCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN.gif" label="Create a new FlowPort_In" style="push" tooltip="Create a new FlowPort_In">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for FlowPort_Out -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_OutCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT.gif" label="Create a new FlowPort_Out" style="push" tooltip="Create a new FlowPort_Out">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for FlowPort_NA -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_NACreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_NA.gif" label="Create a new FlowPort_NA" style="push" tooltip="Create a new FlowPort_NA">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for FlowProperty -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPropertyCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty.gif" label="Create a new FlowProperty" style="push" tooltip="Create a new FlowProperty">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for FlowSpecification -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowSpecificationCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif" label="Create a new FlowSpecification" style="push" tooltip="Create a new FlowSpecification">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ItemFlow -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ItemFlowCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/ItemFlow.gif" label="Create a new ItemFlow" style="push" tooltip="Create a new ItemFlow">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for PartProperty -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.PartPropertyCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" label="Create a new PartProperty" style="push" tooltip="Create a new PartProperty">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Problem -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ProblemCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Problem.gif" label="Create a new Problem" style="push" tooltip="Create a new Problem">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Rationale -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.RationaleCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Rationale.gif" label="Create a new Rationale" style="push" tooltip="Create a new Rationale">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ReferenceProperty -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ReferencePropertyCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" label="Create a new ReferenceProperty" style="push" tooltip="Create a new ReferenceProperty">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Requirement -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.RequirementCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif" label="Create a new Requirement" style="push" tooltip="Create a new Requirement">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Satisfy -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.SatisfyCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif" label="Create a new Satisfy" style="push" tooltip="Create a new Satisfy">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Unit -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.UnitCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif" label="Create a new Unit" style="push" tooltip="Create a new Unit">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ValueProperty -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ValuePropertyCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" label="Create a new ValueProperty" style="push" tooltip="Create a new ValueProperty">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ValueType -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ValueTypeCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" label="Create a new ValueType" style="push" tooltip="Create a new ValueType">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ValueType_Enumeration -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ValueType_EnumerationCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" label="Create a new ValueType_Enumeration" style="push" tooltip="Create a new ValueType_Enumeration">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ValueType_PrimitiveType -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ValueType_PrimitiveTypeCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" label="Create a new ValueType_PrimitiveType" style="push" tooltip="Create a new ValueType_PrimitiveType">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Verify -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.VerifyCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Verify.gif" label="Create a new Verify" style="push" tooltip="Create a new Verify">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for View -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ViewCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/View.gif" label="Create a new View" style="push" tooltip="Create a new View">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ViewPoint -->
-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ViewPointCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Viewpoint.gif" label="Create a new ViewPoint" style="push" tooltip="Create a new ViewPoint">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-	</menuContribution>
-	
-</extension>
-</plugin>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationEditHelperAdvice.java
index 3ae57c4ccb7..0ece0a73eef 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationEditHelperAdvice.java
@@ -49,6 +49,7 @@ import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

 import org.eclipse.papyrus.uml.service.types.utils.ElementUtil;

 import org.eclipse.papyrus.uml.service.types.utils.RequestParameterUtils;

+import org.eclipse.papyrus.uml.tools.databinding.OwnedAttributeHelper;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.UMLPackage;

@@ -291,4 +292,33 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 

 		return viewsToDestroy;

 	}

+

+	/**

+	 * Change owners for navigable OwnedEnd in association. For SysML diagrams only.

+	 * Bug 364066

+	 */

+	@Override

+	protected ICommand getAfterSetCommand(SetRequest request) {

+		if (request.getElementToEdit() instanceof Association) {

+			Association association = (Association) request.getElementToEdit();

+			if (request.getFeature() == UMLPackage.eINSTANCE.getAssociation_NavigableOwnedEnd()) {

+				return changeAllNavigableElementsOwners((List<?>) request.getValue(), association);

+			}

+		}

+		return super.getAfterSetCommand(request);

+	}

+

+	private ICommand changeAllNavigableElementsOwners(List<?> members, Association association) {

+		if (members.isEmpty()) {

+			return null;

+		}

+

+		CompositeCommand cc = new CompositeCommand("Change association's properties owners"); //$NON-NLS-1$

+		for (Object member : members) {

+			if (member instanceof Property) {

+				cc.add(OwnedAttributeHelper.getSetTypeOwnerForAssociationAttributeCommand(association, (Property)member));

+			}

+		}

+		return cc.isEmpty() ? null : cc.reduce();

+	}

 }

diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/.settings/org.eclipse.jdt.core.prefs
index c537b63063c..94d61f00da6 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/.settings/org.eclipse.jdt.core.prefs
@@ -5,3 +5,287 @@ org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF
index 62423e5b7f0..9f38a78dbc0 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: BDD1.4 Configuration for Papyrus
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.blockdefinition;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.sysml14.diagram.blockdefinition.Activator
-Bundle-Vendor: Eclipse Modeling Project
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/plugin.properties b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/plugin.properties
new file mode 100644
index 00000000000..c01ed2e493b
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/plugin.properties
@@ -0,0 +1,15 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################
+pluginName=org.eclipse.papyrus.sysml14.diagram.blockdefinition
+pluginDescription=This plug-in contains the block definition diagram
+providerName=Eclipse Modeling Project
+
+
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/plugin.xml b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/plugin.xml
index 5fdbb329b73..6eb746f23bd 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/plugin.xml
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/plugin.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
+<!--
+  Copyright (c) 2015 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+ 
+  Contributors:
+  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+-->
+
 <plugin>
    <extension
          point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
@@ -8,12 +20,4 @@
             original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
       </contribution>
    </extension>
-   
-      <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
-      <elementTypeSet
-            id="org.eclipse.papyrus.sysml14.service.types.elementTypeSet.bdd"
-            path="resources/SysML14UMLClassDiagram.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
 </plugin>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/configuration/BlockDefinitionDiagram.configuration b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/configuration/BlockDefinitionDiagram.configuration
index cb9fca7bea1..f507c69dd88 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/configuration/BlockDefinitionDiagram.configuration
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/configuration/BlockDefinitionDiagram.configuration
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">
   <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_ZrBf4JaBEeS8eNvSwD0lgA" name="SysML 1.4 Block Definition" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.blockdefinition/icons/obj16/Diagram_BlockDefinition.gif" implementationID="PapyrusUMLClassDiagram" customPalette="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/BddDiagram.paletteconfiguration" customStyle="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/style/blockdiagram.css">
+    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_ZrBf4JaBEeS8eNvSwD0lgA" name="SysML 1.4 Block Definition" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.blockdefinition/icons/obj16/Diagram_BlockDefinition.gif" implementationID="PapyrusUMLClassDiagram" categories="_8pA0sMyjEeSuYbPdZwWlyw" customPalette="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagram.paletteconfiguration" customStyle="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/style/blockdiagram.css">
       <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>
       <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>
       <modelRules xmi:id="_ZrBf4ZaBEeS8eNvSwD0lgA">
@@ -10,11 +10,11 @@
       <owningRules xmi:id="_ZrBf45aBEeS8eNvSwD0lgA">
         <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>
       <childRules xmi:id="_ZrBf5ZaBEeS8eNvSwD0lgA"/>
       <paletteRules xmi:id="_N4GzIKFQEeSx6MYdei1rKA" permit="false" element="clazz.group.*"/>
     </modelKinds>
   </viewpoints>
   <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>
   <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+  <categories xmi:id="_8pA0sMyjEeSuYbPdZwWlyw" name="SysML14"/>
 </configuration:PapyrusConfiguration>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/BddDiagram.paletteconfiguration b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/BddDiagram.paletteconfiguration
deleted file mode 100644
index b78abf30ccf..00000000000
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/BddDiagram.paletteconfiguration
+++ /dev/null
@@ -1,708 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<paletteconfiguration:PaletteConfiguration

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7"

-    id="palettemodel"

-    label="SysML">

-  <drawerConfigurations

-      id="WorkingPalette"

-      label="WorkingPalette"

-      description="WorkingPalette">

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Block"

-        label="Block"

-        description="Create a Block">

-      <icon

-          pluginID="org.eclipse.papyrus.sysml"

-          iconPath="icons/blocks/Block.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Block_2008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Block_3004"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Block_3008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Block_3010"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Block_3014"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Requirement"

-        label="Requirement"

-        description="Create a Requirement">

-      <icon

-          pluginID="org.eclipse.papyrus.sysml"

-          iconPath="icons/requirements/Requirement.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Requirement_2008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Requirement_3004"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Requirement_3008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Requirement_3010"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Requirement_3014"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Satisfy_Abstraction"

-        label="Satisfy"

-        description="Create a Satisfy"

-        kind="ConnectionTool">

-      <icon

-          pluginID="org.eclipse.papyrus.sysml"

-          iconPath="icons/requirements/Satisfy.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Satisfy_Abstraction_4006"/>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <drawerConfigurations

-      id="Nodes"

-      label="Nodes"

-      description="Nodes">

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Rationale"

-        label="Rationale"

-        description="Create a Rationale">

-      <icon

-          pluginID="org.eclipse.papyrus.sysml"

-          iconPath="icons/modelelements/Rationale.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Rationale_2012"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Rationale_3028"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.DistributedProperty"

-        label="DistributedProperty"

-        description="Create a DistributedProperty">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Property.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3002"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3005"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3006"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3012"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3018"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3041"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.ConnectorProperty"

-        label="ConnectorProperty"

-        description="Create a ConnectorProperty">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Property.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3002"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3005"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3006"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3012"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3018"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3041"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.ParticipantProperty"

-        label="ParticipantProperty"

-        description="Create a ParticipantProperty">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Property.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3002"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3005"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3006"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3012"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3018"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3041"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.ElementGroup"

-        label="ElementGroup"

-        description="Create a ElementGroup">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Comment.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ElementGroup_2012"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ElementGroup_3028"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.ViewPoint"

-        label="ViewPoint"

-        description="Create a ViewPoint">

-      <icon

-          pluginID="org.eclipse.papyrus.sysml.edit"

-          iconPath="icons/full/obj16/ViewPoint.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_2008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3004"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3010"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3014"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.FlowProperty"

-        label="FlowProperty"

-        description="Create a FlowProperty">

-      <icon

-          pluginID="org.eclipse.papyrus.sysml"

-          iconPath="icons/portandflows/FlowProperty.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3002"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3005"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3006"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3012"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3018"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3041"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.ValueType"

-        label="ValueType"

-        description="Create a ValueType">

-      <icon

-          pluginID="org.eclipse.papyrus.sysml"

-          iconPath="icons/blocks/ValueType.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ValueType_2010"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ValueType_3027"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ValueType_3043"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ValueType_3044"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ValueType_3045"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.ConstraintBlock"

-        label="ConstraintBlock"

-        description="Create a ConstraintBlock">

-      <icon

-          pluginID="org.eclipse.papyrus.sysml"

-          iconPath="icons/constraints/ConstraintBlock.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_2008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3004"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3010"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3014"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Problem"

-        label="Problem"

-        description="Create a Problem">

-      <icon

-          pluginID="org.eclipse.papyrus.sysml"

-          iconPath="icons/modelelements/Problem.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Problem_2012"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Problem_3028"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.EndPathMultiplicity"

-        label="EndPathMultiplicity"

-        description="Create a EndPathMultiplicity">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Property.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3002"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3005"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3006"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3012"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3018"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3041"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.BoundReference"

-        label="BoundReference"

-        description="Create a BoundReference">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Property.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3002"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3005"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3006"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3012"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3018"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3041"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.AdjunctProperty"

-        label="AdjunctProperty"

-        description="Create a AdjunctProperty">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Property.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3002"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3005"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3006"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3012"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3018"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3041"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty"

-        label="ClassifierBehaviorProperty"

-        description="Create a ClassifierBehaviorProperty">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Property.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3002"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3005"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3006"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3012"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3018"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3041"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.InterfaceBlock"

-        label="InterfaceBlock"

-        description="Create a InterfaceBlock">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Class.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_2008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3004"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3010"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3014"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.ControlOperator_Operation"

-        label="ControlOperator"

-        description="Create a ControlOperator">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Operation.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3003"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3007"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3013"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3019"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3042"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.TestCase_Operation"

-        label="TestCase"

-        description="Create a TestCase">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Operation.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3003"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3007"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3013"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3019"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3042"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.View_Package"

-        label="View"

-        description="Create a View">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Package.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.View_Package_2007"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.View_Package_3009"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.View_Class"

-        label="View Class"

-        description="Create a View Class">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Class.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.View_Class_2008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.View_Class_3004"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.View_Class_3008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.View_Class_3010"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.View_Class_3014"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.FlowSpecification"

-        label="FlowSpecification"

-        description="Create a FlowSpecification">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Interface.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_2004"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3023"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3036"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3037"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3038"/>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <drawerConfigurations

-      id="Edges"

-      label="Edges"

-      description="Edges">

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Copy_Abstraction"

-        label="Copy"

-        description="Create a Copy"

-        kind="ConnectionTool">

-      <icon

-          pluginID="org.eclipse.papyrus.sysml"

-          iconPath="icons/requirements/Copy.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Copy_Abstraction_4006"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Verify_Abstraction"

-        label="Verify"

-        description="Create a Verify">

-      <icon

-          pluginID="org.eclipse.papyrus.sysml"

-          iconPath="icons/requirements/Verify.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Verify_Abstraction_4006"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Trace_Abstraction"

-        label="Trace"

-        description="Create a Trace"

-        kind="ConnectionTool">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Abstraction.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Trace_Abstraction_4006"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Refine_Abstraction"

-        label="Refine"

-        description="Create a Refine"

-        kind="ConnectionTool">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Abstraction.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Refine_Abstraction_4006"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Conform_Generalization"

-        label="Conform"

-        description="Create a Conform Generalization"

-        kind="ConnectionTool">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Generalization.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Conform_Generalization_4002"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Allocate_Abstraction"

-        label="Allocate"

-        description="Create a Allocate Abstraction"

-        kind="ConnectionTool">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Abstraction.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Allocate_Abstraction_4006"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.DeriveReqt_Abstraction"

-        label="DeriveReqt"

-        description="Create a DeriveReqt Abstraction"

-        kind="ConnectionTool">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Abstraction.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.DeriveReqt_Abstraction_4006"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Conform_Dependency"

-        label="Conform"

-        description="Create a Conform "

-        kind="ConnectionTool">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Dependency.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_2014"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_4008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_4018"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Expose"

-        label="Expose"

-        description="Create a Expose"

-        kind="ConnectionTool">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Dependency.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Expose_2014"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Expose_4008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Expose_4018"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.ItemFlow"

-        label="ItemFlow"

-        description="Create a ItemFlow"

-        kind="ConnectionTool">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/InformationFlow.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.ItemFlow_4026"/>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <drawerConfigurations

-      id="Other SysML Elements"

-      label="Other SysML Elements"

-      description="Other SysML Elements">

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.View_Package_PapyrusUMLClassDi"

-        label="View"

-        description="Create a View">

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.View_Package_PapyrusUMLClassDiagram"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Allocated"

-        label="Allocated"

-        description="Create a Allocated">

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Allocated_2097"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.RequirementRelated"

-        label="RequirementRelated"

-        description="Create a RequirementRelated">

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.RequirementRelated_2097"/>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <drawerConfigurations

-      id="Deprecated"

-      label="Deprecated"

-      description="Deprecated">

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Deprecated_Property"

-        label="Property (Deprecated)"

-        description="Create a Deprecated Property">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Property.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3002"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3005"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3006"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3012"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3018"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3041"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification"

-        label="InstanceSpecification (Deprecated)"

-        description="Create a Deprecated InstanceSpecification">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/InstanceSpecification.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_4021"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_2001"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_3020"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Deprecated_Class"

-        label="Class (Deprecated)"

-        description="Create a Deprecated Class"

-        kind="ConnectionTool">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Class.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_2008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3004"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3008"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3010"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3014"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Deprecated_Association"

-        label="Association (Deprecated)"

-        description="Create a Deprecated Association"

-        kind="ConnectionTool">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Association.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_2015"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_4001"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_4019"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Deprecated_Generalization"

-        label="Generalization (Deprecated)"

-        description="Create a Deprecated Generalization"

-        kind="ConnectionTool">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/Generalization.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Generalization_4002"/>

-    </ownedConfigurations>

-    <ownedConfigurations

-        xsi:type="paletteconfiguration:ToolConfiguration"

-        id="org.eclipse.papyrus.sysML.Deprecated_DataType"

-        label="DataType (Deprecated)"

-        description="Create a Deprecated DataType">

-      <icon

-          pluginID="org.eclipse.uml2.uml.edit"

-          iconPath="icons/full/obj16/DataType.gif"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_2010"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3027"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3043"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3044"/>

-      <elementDescriptors

-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3045"/>

-    </ownedConfigurations>

-  </drawerConfigurations>

-</paletteconfiguration:PaletteConfiguration>

diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagram.paletteconfiguration b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagram.paletteconfiguration
new file mode 100644
index 00000000000..3b32816b51f
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagram.paletteconfiguration
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="ASCII"?>
+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="palettemodel" label="SysML">
+  <drawerConfigurations id="WorkingPalette" label="WorkingPalette" description="WorkingPalette">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Block" label="Block" description="Create a Block">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/blocks/Block.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Requirement" label="Requirement" description="Create a Requirement">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Requirement.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Satisfy_Abstraction" label="Satisfy" description="Create a Satisfy" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Satisfy.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Satisfy_Abstraction_4006"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations id="Nodes" label="Nodes" description="Nodes">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.AdjunctProperty" label="AdjunctProperty" description="Create a AdjunctProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.BoundReference" label="BoundReference" description="Create a BoundReference">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty" label="ClassifierBehaviorProperty" description="Create a ClassifierBehaviorProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ConnectorProperty" label="ConnectorProperty" description="Create a ConnectorProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ConstraintBlock" label="ConstraintBlock" description="Create a ConstraintBlock">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/constraints/ConstraintBlock.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ControlOperator_Operation" label="ControlOperator" description="Create a ControlOperator">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Operation.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3003"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3007"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3013"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3019"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3042"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.DistributedProperty" label="DistributedProperty" description="Create a DistributedProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ElementGroup" label="ElementGroup" description="Create a ElementGroup">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Comment.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ElementGroup_2012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ElementGroup_3028"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.EndPathMultiplicity" label="EndPathMultiplicity" description="Create a EndPathMultiplicity">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.FlowProperty" label="FlowProperty" description="Create a FlowProperty">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/portandflows/FlowProperty.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.FlowSpecification" label="FlowSpecification" description="Create a FlowSpecification">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Interface.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_2004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3023"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3036"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3037"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3038"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.InterfaceBlock" label="InterfaceBlock" description="Create a InterfaceBlock">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ParticipantProperty" label="ParticipantProperty" description="Create a ParticipantProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Problem" label="Problem" description="Create a Problem">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/modelelements/Problem.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Problem_2012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Problem_3028"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Rationale" label="Rationale" description="Create a Rationale">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/modelelements/Rationale.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Rationale_2012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Rationale_3028"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.TestCase_Operation" label="TestCase" description="Create a TestCase">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Operation.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3003"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3007"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3013"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3019"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3042"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.View_Package" label="View" description="Create a View">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Package.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Package_2007"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Package_3009"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ViewPoint" label="ViewPoint" description="Create a ViewPoint">
+      <icon pluginID="org.eclipse.papyrus.sysml.edit" iconPath="icons/full/obj16/ViewPoint.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.View_Class" label="View Class" description="Create a View Class">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ValueType" label="ValueType" description="Create a ValueType">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/blocks/ValueType.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_2010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_3027"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_3043"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_3044"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_3045"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations id="Edges" label="Edges" description="Edges">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Copy_Abstraction" label="Copy" description="Create a Copy" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Copy.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Copy_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Verify_Abstraction" label="Verify" description="Create a Verify">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Verify.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Verify_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Trace_Abstraction" label="Trace" description="Create a Trace" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Trace_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Refine_Abstraction" label="Refine" description="Create a Refine" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Refine_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Conform_Generalization" label="Conform" description="Create a Conform Generalization" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Conform_Generalization_4002"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Allocate_Abstraction" label="Allocate" description="Create a Allocate Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Allocate_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.DeriveReqt_Abstraction" label="DeriveReqt" description="Create a DeriveReqt Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DeriveReqt_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Conform_Dependency" label="Conform" description="Create a Conform " kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_2014"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_4008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_4018"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Expose" label="Expose" description="Create a Expose" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Expose_2014"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Expose_4008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Expose_4018"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ItemFlow" label="ItemFlow" description="Create a ItemFlow" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/InformationFlow.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ItemFlow_4026"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations id="Other SysML Elements" label="Other SysML Elements" description="Other SysML Elements">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.View_Package_PapyrusUMLClassDi" label="View" description="Create a View">
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Package_PapyrusUMLClassDiagram"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Allocated" label="Allocated" description="Create a Allocated">
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Allocated_2097"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.RequirementRelated" label="RequirementRelated" description="Create a RequirementRelated">
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.RequirementRelated_2097"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations id="Deprecated" label="Deprecated" description="Deprecated">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_Property" label="Property (Deprecated)" description="Create a Deprecated Property">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification" label="InstanceSpecification (Deprecated)" description="Create a Deprecated InstanceSpecification">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/InstanceSpecification.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_4021"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_2001"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_3020"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_Class" label="Class (Deprecated)" description="Create a Deprecated Class" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_Association" label="Association (Deprecated)" description="Create a Deprecated Association" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Association.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_2015"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_4001"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_4019"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_Generalization" label="Generalization (Deprecated)" description="Create a Deprecated Generalization" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Generalization_4002"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_DataType" label="DataType (Deprecated)" description="Create a Deprecated DataType">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/DataType.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_2010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3027"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3043"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3044"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3045"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagramPalette.xml b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagramPalette.xml
deleted file mode 100644
index 643ec927dd0..00000000000
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagramPalette.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- Copyright (c) 2015 CEA.
- 
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
- 
- Contributors:
-   CEA - Initial API and implementation
-   Benoit Maggi benoit.maggi@cea.fr
-   
--->
-<paletteDefinition>
-	<content>
-	<!-- ASSOCIATIONS -->
-			
-	<drawer	id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__Associations" 
-		iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"  name="Associations">
-			
-		<aspectTool description="Create a new Association" id="blockdefinition_associations.tool.association_none" name="Association" refToolId="clazz.tool.association"/>
-			<aspectTool description="Create a new DirectedAssociation" id="blockdefinition_associations.tool.association_none_directed"
-			iconpath="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_none_directed.gif"
-				name="DirectedAssociation" refToolId="clazz.tool.association">
-			</aspectTool>
-			
-			<aspectTool description="Create a new Composition" id="blockdefinition_associations.tool.association_composite"
-			iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association_composite.gif"
-				name="Composition" refToolId="clazz.tool.association">
-			</aspectTool>
-
-			<aspectTool description="Create a new DirectedComposition" id="blockdefinition_associations.tool.association_composite_directed"
-			iconpath="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_composite_directed.gif"
-				name="DirectedComposition" refToolId="clazz.tool.association">
-			</aspectTool>
-	
-			<aspectTool description="Create a new Aggregation" id="blockdefinition_associations.tool.association_shared"
-			iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association_shared.gif"
-				name="Aggregation" refToolId="clazz.tool.association">
-			</aspectTool>
-
-			<aspectTool description="Create a new DirectedAggregation" id="blockdefinition_associations.tool.association_shared_directed"
-			iconpath="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_shared_directed.gif"
-				name="DirectedAggregation" refToolId="clazz.tool.association">
-			</aspectTool>							
-	</drawer>
-
-	<!-- MODEL ELEMENTS -->		
-	<drawer	id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__ModelElements"
-		iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" name="ModelElements">
-			
-			<aspectTool description="Create a new Package" id="blockdefinition_modelelements.tool.package" name="Package" refToolId="clazz.tool.package"/>
-			<aspectTool description="Create a new Actor" id="blockdefinition_modelelements.tool.actor"
-				name="Actor" refToolId="usecase.tool.actor">
-			</aspectTool>
-			<aspectTool  id="blockdefinition_modelelements.tool.block" name="Block"
-				 refToolId="clazz.tool.class" description="Create a new Block">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="SysML::Blocks::Block" />
-					</stereotypesToApply>
-				</postAction>				
-			</aspectTool>
-	
-			<aspectTool description="Create a new Signal" id="blockdefinition_modelelements.tool.signal" name="Signal" refToolId="clazz.tool.signal"/>
-			<aspectTool description="Create a new Operation" id="blockdefinition_modelelements.tool.operation" name="Operation" refToolId="clazz.tool.operation"/>
-			<aspectTool description="Create a new Reception" id="blockdefinition_modelelements.tool.reception" name="Reception" refToolId="clazz.tool.reception"/>
-			<aspectTool description="Create a new Property" id="blockdefinition_modelelements.tool.property" name="Property" refToolId="clazz.tool.property"/>
-			
-			<!--
-			<aspectTool description="Create a new Part" id="blockdefinition_modelelements.tool.part"
-				name="Part" refToolId="blockdefinition.tool.part">
-			</aspectTool>
-			<aspectTool description="Create a new Reference" id="blockdefinition_modelelements.tool.reference"
-				name="Reference" refToolId="blockdefinition.tool.reference">
-			</aspectTool>
-			<aspectTool description="Create a new ActorPart" id="blockdefinition_modelelements.tool.actorpart"
-				name="ActorPart" refToolId="blockdefinition.tool.actorpart">
-			</aspectTool>			
-			<aspectTool description="Create a new Value" id="blockdefinition_modelelements.tool.value"
-				name="Value" refToolId="blockdefinition.tool.value">
-			</aspectTool>
-			-->
-			<aspectTool description="Create a new InstanceSpecification" id="blockdefinition_modelelements.tool.instancespecification" name="InstanceSpecification" refToolId="clazz.tool.instancespecification"/>
-			<aspectTool description="Create a new Slot" id="blockdefinition_modelelements.tool.slot" name="Slot" refToolId="clazz.tool.slot"/>
-			<aspectTool description="Create a new Dependency" id="blockdefinition_modelelements.tool.dependency" name="Dependency" refToolId="clazz.tool.dependency"/>			
-			<aspectTool description="Create a new Generalization" id="blockdefinition_modelelements.tool.generalization" name="Generalization" refToolId="clazz.tool.generalization"/>					
-		
-		</drawer>	
-	
-	<drawer	id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__PortAndFlowTools"
-	iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" name="PortAndFlows">
-		<!--
-			<aspectTool description="Create a new Port" id="blockdefinition_portandflows.tool.port"
-				name="Port" refToolId="blockdefinition.tool.port">
-			</aspectTool>
-			<aspectTool description="Create a new FlowPort" id="blockdefinition_portandflows.tool.flowport"
-				name="FlowPort" refToolId="blockdefinition.tool.flowport">
-			</aspectTool>			
-			<aspectTool description="Create a new FlowSpecification" id="blockdefinition_portandflows.tool.flowspecification"
-				name="FlowSpecification" refToolId="blockdefinition.tool.flowspecification">
-			</aspectTool>			
-			<aspectTool description="Create a new FlowProperty" id="blockdefinition_portandflows.tool.flowproperty"
-				name="FlowProperty" refToolId="blockdefinition.tool.flowproperty">
-			</aspectTool>
-			<aspectTool description="Create a new Interface" id="blockdefinition_portandflows.tool.interface"
-				name="Interface" refToolId="blockdefinition.tool.interface">
-			</aspectTool>
-			<aspectTool description="Create a new InterfaceRealization" id="blockdefinition_portandflows.tool.interfacerealization"
-				name="InterfaceRealization" refToolId="blockdefinition.tool.interfacerealization">
-			</aspectTool>
-			<aspectTool description="Create a new Usage" id="blockdefinition_portandflows.tool.usage" name="Usage" refToolId="blockdefinition.tool.usage">
-			</aspectTool>
-		-->		
-	</drawer>	
-				
-	<drawer	id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__DataTypeTools"
-		iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" name="DataTypes">
-			
-		<aspectTool description="Create a new DataType" id="blockdefinition_datatypes.tool.datatype" name="DataType" refToolId="clazz.tool.datatype"/>
-			<!--
-			<aspectTool description="Create a new ValueType" id="blockdefinition_datatypes.tool.valuetype"
-				name="ValueType" refToolId="blockdefinition.tool.valuetype">
-			</aspectTool>
-			-->
-		<aspectTool description="Create a new PrimitiveType" id="blockdefinition_datatypes.tool.primitivetype" name="PrimitiveType" refToolId="clazz.tool.primitivetype"/>				
-		<aspectTool description="Create a new Enumeration" id="blockdefinition_datatypes.tool.enumeration" name="Enumeration" refToolId="clazz.tool.enumeration"/>
-		<aspectTool description="Create a new EnumerationLiteral" id="blockdefinition_datatypes.tool.enumerationliteral" name="EnumerationLiteral" refToolId="clazz.tool.enumerationliteral"/>
-			<!--		
-			<aspectTool description="Create a new Dimension" id="blockdefinition_datatypes.tool.dimension"
-				name="Dimension" refToolId="blockdefinition.tool.dimension">
-			</aspectTool>
-			<aspectTool description="Create a new Unit" id="blockdefinition_datatypes.tool.unit"
-				name="Unit" refToolId="blockdefinition.tool.unit">
-			</aspectTool>	
-			-->		
-	</drawer>
-		
-	<drawer id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__ContraintTools" 
-		iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" name="CommentAndConstraints">
-
-		<aspectTool description="Create a new ConstraintBlock" id="blockdefinition_constraints.tool.constraintblock"
-				name="ConstraintBlock" refToolId="clazz.tool.class">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="SysML::Constraints::ConstraintBlock" />
-					</stereotypesToApply>
-				</postAction>	
-		</aspectTool>
-			
-		<aspectTool description="Create a new ConstraintProperty" id="blockdefinition_constraints.tool.constraintproperty"
-				name="ConstraintProperty" refToolId="clazz.tool.property">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="SysML::Constraints::ConstraintProperty" />
-					</stereotypesToApply>
-				</postAction>				
-		</aspectTool>
-		<aspectTool description="Create a new Parameter (Property)" id="blockdefinition_constraints.tool.property" name="Parameter" refToolId="clazz.tool.property"/>	
-		<aspectTool description="Create a new Constraint" id="blockdefinition_constraints.tool.constraint" name="Constraint" refToolId="clazz.tool.constraint"/>
-		<aspectTool description="Create a new Comment" id="blockdefinition_constraints.tool.comment" name="Comment" refToolId="clazz.tool.comment"/>		
-		<aspectTool description="Create a new Comment / Constraint link" id="blockdefinition_constraints.tool.comment_constraint_link" name="Comment / Constraint link" refToolId="clazz.tool.contextlink"/>		
-	</drawer>
-	</content>	
-</paletteDefinition>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/.classpath b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/.classpath
index 0c22b5d7e6d..ad32c83a788 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/.classpath
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/.project b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/.project
index 5b041d73e14..151fbcf1f05 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/.project
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.sysml14.diagram.common</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..7233c8ab411
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.common;singleton:=true
+Bundle-Version: 1.1.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.sysml14.diagram.common.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.diagram.common,
+ org.eclipse.uml2.uml;bundle-version="5.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml14;bundle-version="1.1.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.papyrus.sysml14.diagram.common
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Bundle-Description: %pluginDescription
+Bundle-Vendor: %providerName
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/about.html b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/build.properties b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/build.properties
new file mode 100644
index 00000000000..aa060dce6f6
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/build.properties
@@ -0,0 +1,9 @@
+#
+
+bin.includes = .,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/plugin.properties b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/plugin.properties
new file mode 100644
index 00000000000..34bc8ef0818
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/plugin.properties
@@ -0,0 +1,15 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################
+pluginName=org.eclipse.papyrus.sysml14.diagram.common
+pluginDescription=This plug-in contains the common part of all SysML 1.4 diagram
+providerName=Eclipse Modeling Project
+
+
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/plugin.xml b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/plugin.xml
new file mode 100644
index 00000000000..fb070af612f
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/plugin.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+-->
+
+<plugin> 
+   
+   
+         <extension
+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      <elementTypeSet
+            id="org.eclipse.papyrus.sysml14.service.types.elementTypeSet.composite"
+            path="resources/SysML14CompositeStructureDiagram.elementtypesconfigurations">
+      </elementTypeSet>
+   </extension>
+   
+         <extension
+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      <elementTypeSet
+            id="org.eclipse.papyrus.sysml14.service.types.elementTypeSet.class"
+            path="resources/SysML14UMLClassDiagram.elementtypesconfigurations">
+      </elementTypeSet>
+   </extension>
+   
+</plugin>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/pom.xml b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/pom.xml
index bac7e8281ca..fe19a9bf726 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/pom.xml
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/pom.xml
@@ -5,10 +5,8 @@
 		<artifactId>org.eclipse.papyrus</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>1.1.0-SNAPSHOT</version>
-		<relativePath>../../../../../releng/top-pom-main.xml</relativePath>
+		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
 	</parent>
-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.1.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.papyrus.sysml14.diagram.common</artifactId>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14CompositeStructureDiagram.elementtypesconfigurations b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14CompositeStructureDiagram.elementtypesconfigurations
new file mode 100644
index 00000000000..a4f199857d5
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14CompositeStructureDiagram.elementtypesconfigurations
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.0" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration" xmi:id="_Qt9c4Mv4EeS5BpE3hOblyw" name="SysML" identifier="org.eclipse.papyrus.SysML14.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c4cv4EeS5BpE3hOblyw" name="ValueType (3080)" identifier="org.eclipse.papyrus.SysML14.ValueType_3080" hint="3080">
+    <iconEntry xmi:id="_Qt9c4sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ValueType</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.DataType_3080</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c48v4EeS5BpE3hOblyw" name="ValueType (2068)" identifier="org.eclipse.papyrus.SysML14.ValueType_2068" hint="2068">
+    <iconEntry xmi:id="_Qt9c5Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ValueType</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.DataType_2068</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c5cv4EeS5BpE3hOblyw" name="DistributedProperty (3070)" identifier="org.eclipse.papyrus.SysML14.DistributedProperty_3070" hint="3070">
+    <iconEntry xmi:id="_Qt9c5sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.DistributedProperty</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c58v4EeS5BpE3hOblyw" name="DistributedProperty (3101)" identifier="org.eclipse.papyrus.SysML14.DistributedProperty_3101" hint="3101">
+    <iconEntry xmi:id="_Qt9c6Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.DistributedProperty</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c6cv4EeS5BpE3hOblyw" name="ConnectorProperty (3070)" identifier="org.eclipse.papyrus.SysML14.ConnectorProperty_3070" hint="3070">
+    <iconEntry xmi:id="_Qt9c6sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ConnectorProperty</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c68v4EeS5BpE3hOblyw" name="ConnectorProperty (3101)" identifier="org.eclipse.papyrus.SysML14.ConnectorProperty_3101" hint="3101">
+    <iconEntry xmi:id="_Qt9c7Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ConnectorProperty</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c7cv4EeS5BpE3hOblyw" name="ParticipantProperty (3070)" identifier="org.eclipse.papyrus.SysML14.ParticipantProperty_3070" hint="3070">
+    <iconEntry xmi:id="_Qt9c7sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ParticipantProperty</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c78v4EeS5BpE3hOblyw" name="ParticipantProperty (3101)" identifier="org.eclipse.papyrus.SysML14.ParticipantProperty_3101" hint="3101">
+    <iconEntry xmi:id="_Qt9c8Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ParticipantProperty</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c8cv4EeS5BpE3hOblyw" name="BindingConnector" identifier="org.eclipse.papyrus.SysML14.BindingConnector_4013" hint="4013">
+    <iconEntry xmi:id="_Qt9c8sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.BindingConnector</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Connector_4013</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c88v4EeS5BpE3hOblyw" name="Block (3085)" identifier="org.eclipse.papyrus.SysML14.Block_3085" hint="3085">
+    <iconEntry xmi:id="_Qt9c9Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Block</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c9cv4EeS5BpE3hOblyw" name="Block (2073)" identifier="org.eclipse.papyrus.SysML14.Block_2073" hint="2073">
+    <iconEntry xmi:id="_Qt9c9sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Block</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c98v4EeS5BpE3hOblyw" name="EndPathMultiplicity (3070)" identifier="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3070" hint="3070">
+    <iconEntry xmi:id="_Qt9c-Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.EndPathMultiplicity</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c-cv4EeS5BpE3hOblyw" name="EndPathMultiplicity (3101)" identifier="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3101" hint="3101">
+    <iconEntry xmi:id="_Qt9c-sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.EndPathMultiplicity</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c-8v4EeS5BpE3hOblyw" name="BoundReference (3070)" identifier="org.eclipse.papyrus.SysML14.BoundReference_3070" hint="3070">
+    <iconEntry xmi:id="_Qt9c_Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.BoundReference</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c_cv4EeS5BpE3hOblyw" name="BoundReference (3101)" identifier="org.eclipse.papyrus.SysML14.BoundReference_3101" hint="3101">
+    <iconEntry xmi:id="_Qt9c_sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.BoundReference</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c_8v4EeS5BpE3hOblyw" name="AdjunctProperty (3070)" identifier="org.eclipse.papyrus.SysML14.AdjunctProperty_3070" hint="3070">
+    <iconEntry xmi:id="_Qt9dAMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.AdjunctProperty</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dAcv4EeS5BpE3hOblyw" name="AdjunctProperty (3101)" identifier="org.eclipse.papyrus.SysML14.AdjunctProperty_3101" hint="3101">
+    <iconEntry xmi:id="_Qt9dAsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.AdjunctProperty</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dA8v4EeS5BpE3hOblyw" name="ClassifierBehaviorProperty (3070)" identifier="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3070" hint="3070">
+    <iconEntry xmi:id="_Qt9dBMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dBcv4EeS5BpE3hOblyw" name="ClassifierBehaviorProperty (3101)" identifier="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3101" hint="3101">
+    <iconEntry xmi:id="_Qt9dBsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dB8v4EeS5BpE3hOblyw" name="ItemFlow" identifier="org.eclipse.papyrus.SysML14.ItemFlow_4021" hint="4021">
+    <iconEntry xmi:id="_Qt9dCMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/InformationFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ItemFlow</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dCcv4EeS5BpE3hOblyw" name="FlowProperty (3070)" identifier="org.eclipse.papyrus.SysML14.FlowProperty_3070" hint="3070">
+    <iconEntry xmi:id="_Qt9dCsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.FlowProperty</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dC8v4EeS5BpE3hOblyw" name="FlowProperty (3101)" identifier="org.eclipse.papyrus.SysML14.FlowProperty_3101" hint="3101">
+    <iconEntry xmi:id="_Qt9dDMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.FlowProperty</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dDcv4EeS5BpE3hOblyw" name="FullPort" identifier="org.eclipse.papyrus.SysML14.FullPort_3069" hint="3069">
+    <iconEntry xmi:id="_Qt9dDsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.FullPort</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Port_3069</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dD8v4EeS5BpE3hOblyw" name="InterfaceBlock (3085)" identifier="org.eclipse.papyrus.SysML14.InterfaceBlock_3085" hint="3085">
+    <iconEntry xmi:id="_Qt9dEMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.InterfaceBlock</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dEcv4EeS5BpE3hOblyw" name="InterfaceBlock (2073)" identifier="org.eclipse.papyrus.SysML14.InterfaceBlock_2073" hint="2073">
+    <iconEntry xmi:id="_Qt9dEsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.InterfaceBlock</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dE8v4EeS5BpE3hOblyw" name="ProxyPort" identifier="org.eclipse.papyrus.SysML14.ProxyPort_3069" hint="3069">
+    <iconEntry xmi:id="_Qt9dFMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ProxyPort</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Port_3069</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dFcv4EeS5BpE3hOblyw" name="ChangeStructuralFeatureEvent" identifier="org.eclipse.papyrus.SysML14.ChangeStructuralFeatureEvent_2088" hint="2088">
+    <iconEntry xmi:id="_Qt9dFsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/ChangeEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ChangeStructuralFeatureEvent</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dF8v4EeS5BpE3hOblyw" name="ControlOperator Operation" identifier="org.eclipse.papyrus.SysML14.ControlOperator_Operation_3102" hint="3102">
+    <iconEntry xmi:id="_Qt9dGMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ControlOperator_Operation</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Operation_3102</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dGcv4EeS5BpE3hOblyw" name="Rate Parameter" identifier="org.eclipse.papyrus.SysML14.Rate_Parameter_3088" hint="3088">
+    <iconEntry xmi:id="_Qt9dGsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Rate_Parameter</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Parameter_3088</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dG8v4EeS5BpE3hOblyw" name="Discrete Parameter" identifier="org.eclipse.papyrus.SysML14.Discrete_Parameter_3088" hint="3088">
+    <iconEntry xmi:id="_Qt9dHMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Discrete_Parameter</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Parameter_3088</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dHcv4EeS5BpE3hOblyw" name="Continuous Parameter" identifier="org.eclipse.papyrus.SysML14.Continuous_Parameter_3088" hint="3088">
+    <iconEntry xmi:id="_Qt9dHsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Continuous_Parameter</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Parameter_3088</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dH8v4EeS5BpE3hOblyw" name="Optional" identifier="org.eclipse.papyrus.SysML14.Optional_3088" hint="3088">
+    <iconEntry xmi:id="_Qt9dIMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Optional</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Parameter_3088</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dIcv4EeS5BpE3hOblyw" name="Rationale (3097)" identifier="org.eclipse.papyrus.SysML14.Rationale_3097" hint="3097">
+    <iconEntry xmi:id="_Qt9dIsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Rationale</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Comment_3097</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dI8v4EeS5BpE3hOblyw" name="Rationale (2109)" identifier="org.eclipse.papyrus.SysML14.Rationale_2109" hint="2109">
+    <iconEntry xmi:id="_Qt9dJMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Rationale</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Comment_2109</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dJcv4EeS5BpE3hOblyw" name="View Package" identifier="org.eclipse.papyrus.SysML14.View_Package_CompositeStructure" hint="CompositeStructure">
+    <iconEntry xmi:id="_Qt9dJsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Package_1000</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_Qt9dJ8v4EeS5BpE3hOblyw">
+      <stereotypesQualifiedNames>SysML::ModelElements::View</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dKMv4EeS5BpE3hOblyw" name="View (3085)" identifier="org.eclipse.papyrus.SysML14.View_Class_3085" hint="3085">
+    <iconEntry xmi:id="_Qt9dKcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.View_Class</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dKsv4EeS5BpE3hOblyw" name="View (2073)" identifier="org.eclipse.papyrus.SysML14.View_Class_2073" hint="2073">
+    <iconEntry xmi:id="_Qt9dK8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.View_Class</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dLMv4EeS5BpE3hOblyw" name="Conform Dependency" identifier="org.eclipse.papyrus.SysML14.Conform_Dependency_4010" hint="4010">
+    <iconEntry xmi:id="_Qt9dLcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Conform_Dependency</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Dependency_4010</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dLsv4EeS5BpE3hOblyw" name="Conform Generalization" identifier="org.eclipse.papyrus.SysML14.Conform_Generalization_4015" hint="4015">
+    <iconEntry xmi:id="_Qt9dL8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Generalization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Conform_Generalization</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Generalization_4015</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dMMv4EeS5BpE3hOblyw" name="Problem (3097)" identifier="org.eclipse.papyrus.SysML14.Problem_3097" hint="3097">
+    <iconEntry xmi:id="_Qt9dMcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Problem</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Comment_3097</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dMsv4EeS5BpE3hOblyw" name="Problem (2109)" identifier="org.eclipse.papyrus.SysML14.Problem_2109" hint="2109">
+    <iconEntry xmi:id="_Qt9dM8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Problem</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Comment_2109</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dNMv4EeS5BpE3hOblyw" name="ViewPoint (3085)" identifier="org.eclipse.papyrus.SysML14.ViewPoint_3085" hint="3085">
+    <iconEntry xmi:id="_Qt9dNcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ViewPoint</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dNsv4EeS5BpE3hOblyw" name="ViewPoint (2073)" identifier="org.eclipse.papyrus.SysML14.ViewPoint_2073" hint="2073">
+    <iconEntry xmi:id="_Qt9dN8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ViewPoint</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dOMv4EeS5BpE3hOblyw" name="Expose" identifier="org.eclipse.papyrus.SysML14.Expose_4010" hint="4010">
+    <iconEntry xmi:id="_Qt9dOcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Expose</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Dependency_4010</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dOsv4EeS5BpE3hOblyw" name="ElementGroup (3097)" identifier="org.eclipse.papyrus.SysML14.ElementGroup_3097" hint="3097">
+    <iconEntry xmi:id="_Qt9dO8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ElementGroup</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Comment_3097</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dPMv4EeS5BpE3hOblyw" name="ElementGroup (2109)" identifier="org.eclipse.papyrus.SysML14.ElementGroup_2109" hint="2109">
+    <iconEntry xmi:id="_Qt9dPcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ElementGroup</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Comment_2109</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dPsv4EeS5BpE3hOblyw" name="ConstraintBlock (3085)" identifier="org.eclipse.papyrus.SysML14.ConstraintBlock_3085" hint="3085">
+    <iconEntry xmi:id="_Qt9dP8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ConstraintBlock</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dQMv4EeS5BpE3hOblyw" name="ConstraintBlock (2073)" identifier="org.eclipse.papyrus.SysML14.ConstraintBlock_2073" hint="2073">
+    <iconEntry xmi:id="_Qt9dQcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.ConstraintBlock</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dQsv4EeS5BpE3hOblyw" name="Allocate Abstraction" identifier="org.eclipse.papyrus.SysML14.Allocate_Abstraction_4007" hint="4007">
+    <iconEntry xmi:id="_Qt9dQ8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Allocate_Abstraction</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dRMv4EeS5BpE3hOblyw" name="DeriveReqt Abstraction" identifier="org.eclipse.papyrus.SysML14.DeriveReqt_Abstraction_4007" hint="4007">
+    <iconEntry xmi:id="_Qt9dRcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.DeriveReqt_Abstraction</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dRsv4EeS5BpE3hOblyw" name="Copy Abstraction" identifier="org.eclipse.papyrus.SysML14.Copy_Abstraction_4007" hint="4007">
+    <iconEntry xmi:id="_Qt9dR8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Copy_Abstraction</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dSMv4EeS5BpE3hOblyw" name="Satisfy Abstraction" identifier="org.eclipse.papyrus.SysML14.Satisfy_Abstraction_4007" hint="4007">
+    <iconEntry xmi:id="_Qt9dScv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Satisfy_Abstraction</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dSsv4EeS5BpE3hOblyw" name="TestCase Operation" identifier="org.eclipse.papyrus.SysML14.TestCase_Operation_3102" hint="3102">
+    <iconEntry xmi:id="_Qt9dS8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.TestCase_Operation</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Operation_3102</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dTMv4EeS5BpE3hOblyw" name="Requirement (3085)" identifier="org.eclipse.papyrus.SysML14.Requirement_3085" hint="3085">
+    <iconEntry xmi:id="_Qt9dTcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Requirement</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dTsv4EeS5BpE3hOblyw" name="Requirement (2073)" identifier="org.eclipse.papyrus.SysML14.Requirement_2073" hint="2073">
+    <iconEntry xmi:id="_Qt9dT8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Requirement</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dUMv4EeS5BpE3hOblyw" name="Verify Abstraction" identifier="org.eclipse.papyrus.SysML14.Verify_Abstraction_4007" hint="4007">
+    <iconEntry xmi:id="_Qt9dUcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Verify_Abstraction</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dUsv4EeS5BpE3hOblyw" name="Trace Abstraction" identifier="org.eclipse.papyrus.SysML14.Trace_Abstraction_4007" hint="4007">
+    <iconEntry xmi:id="_Qt9dU8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Trace_Abstraction</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dVMv4EeS5BpE3hOblyw" name="Refine Abstraction" identifier="org.eclipse.papyrus.SysML14.Refine_Abstraction_4007" hint="4007">
+    <iconEntry xmi:id="_Qt9dVcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Refine_Abstraction</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dVsv4EeS5BpE3hOblyw" name="FlowPort" identifier="org.eclipse.papyrus.SysML14.FlowPort_3069" hint="3069">
+    <iconEntry xmi:id="_Qt9dV8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.FlowPort</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Port_3069</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dWMv4EeS5BpE3hOblyw" name="FlowSpecification (3087)" identifier="org.eclipse.papyrus.SysML14.FlowSpecification_3087" hint="3087">
+    <iconEntry xmi:id="_Qt9dWcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.FlowSpecification</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Interface_3087</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dWsv4EeS5BpE3hOblyw" name="FlowSpecification (2076)" identifier="org.eclipse.papyrus.SysML14.FlowSpecification_2076" hint="2076">
+    <iconEntry xmi:id="_Qt9dW8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.FlowSpecification</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Interface_2076</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dXMv4EeS5BpE3hOblyw" name="Deprecated (3070)" identifier="org.eclipse.papyrus.SysML14.Deprecated_Property_3070" hint="3070">
+    <iconEntry xmi:id="_Qt9dXcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Property</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dXsv4EeS5BpE3hOblyw" name="Deprecated (3101)" identifier="org.eclipse.papyrus.SysML14.Deprecated_Property_3101" hint="3101">
+    <iconEntry xmi:id="_Qt9dX8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Property</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dYMv4EeS5BpE3hOblyw" name="Deprecated (3085)" identifier="org.eclipse.papyrus.SysML14.Deprecated_Class_3085" hint="3085">
+    <iconEntry xmi:id="_Qt9dYcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Class</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dYsv4EeS5BpE3hOblyw" name="Deprecated (2073)" identifier="org.eclipse.papyrus.SysML14.Deprecated_Class_2073" hint="2073">
+    <iconEntry xmi:id="_Qt9dY8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Class</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dZMv4EeS5BpE3hOblyw" name="Deprecated Generalization" identifier="org.eclipse.papyrus.SysML14.Deprecated_Generalization_4015" hint="4015">
+    <iconEntry xmi:id="_Qt9dZcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Generalization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Generalization</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Generalization_4015</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dZsv4EeS5BpE3hOblyw" name="Deprecated (3080)" identifier="org.eclipse.papyrus.SysML14.Deprecated_DataType_3080" hint="3080">
+    <iconEntry xmi:id="_Qt9dZ8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_DataType</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.DataType_3080</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9daMv4EeS5BpE3hOblyw" name="Deprecated (2068)" identifier="org.eclipse.papyrus.SysML14.Deprecated_DataType_2068" hint="2068">
+    <iconEntry xmi:id="_Qt9dacv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_DataType</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.DataType_2068</specializedTypesID>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_Qt9dasv4EeS5BpE3hOblyw" name="Apply View" identifier="org.eclipse.papyrus.SysML14.view_CompositeStructure" target="_Qt9dJcv4EeS5BpE3hOblyw">
+    <stereotypesToApply xmi:id="_Qt9da8v4EeS5BpE3hOblyw" stereotypeQualifiedName="SysML::ModelElements::View" updateName="true">
+      <requiredProfiles>SysML</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/SysML14UMLClassDiagram.elementtypesconfigurations b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14UMLClassDiagram.elementtypesconfigurations
index 605cdc825e3..605cdc825e3 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/SysML14UMLClassDiagram.elementtypesconfigurations
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14UMLClassDiagram.elementtypesconfigurations
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/Activator.java b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/Activator.java
new file mode 100644
index 00000000000..169be97cc60
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/Activator.java
@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml14.diagram.common;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.sysml14.diagram.common"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/.settings/org.eclipse.jdt.core.prefs
index c537b63063c..94d61f00da6 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/.settings/org.eclipse.jdt.core.prefs
@@ -5,3 +5,287 @@ org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF
index 4a00296925c..12dd6055889 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: BDD1.4 Configuration for Papyrus
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.internalblock;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.sysml14.diagram.internalblock.Activator
-Bundle-Vendor: Eclipse Modeling Project
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/plugin.properties b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/plugin.properties
new file mode 100644
index 00000000000..65e7367ef90
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/plugin.properties
@@ -0,0 +1,15 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################
+pluginName=org.eclipse.papyrus.sysml14.diagram.internalblock
+pluginDescription=This plug-in contains the internal block diagram of SysML 1.4
+providerName=Eclipse Modeling Project
+
+
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/plugin.xml b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/plugin.xml
index 3d496f6d923..6b46a4e29f7 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/plugin.xml
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/plugin.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
+<!--
+  Copyright (c) 2015 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+ 
+  Contributors:
+  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+-->
+
 <plugin>
    <extension
          point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/configuration/InternalBlockDiagram.configuration b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/configuration/InternalBlockDiagram.configuration
index d77bf64be0e..dfc063efe97 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/configuration/InternalBlockDiagram.configuration
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/configuration/InternalBlockDiagram.configuration
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_ZrBf4JaBEeS8eNvSwD0lgA" name="SysML 1.4 Internal Block" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.internalblock/icons/obj16/Diagram_InternalBlock.gif" implementationID="PapyrusUMLClassDiagram" customPalette="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/palette/internalBlockDiagramPalette.xml">

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>

-      <modelRules xmi:id="_ZrBf4ZaBEeS8eNvSwD0lgA">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_ZrBf45aBEeS8eNvSwD0lgA">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_ZrBf5ZaBEeS8eNvSwD0lgA"/>

-      <paletteRules xmi:id="_N4GzIKFQEeSx6MYdei1rKA" permit="false" element="clazz.group.*"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">
+  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">
+    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_ZrBf4JaBEeS8eNvSwD0lgA" name="SysML 1.4 Internal Block" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.internalblock/icons/obj16/Diagram_InternalBlock.gif" implementationID="CompositeStructure" categories="_a6cL0MykEeSuYbPdZwWlyw" customPalette="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/palette/internalBlockDiagram.paletteconfiguration">
+      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>
+      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>
+      <modelRules xmi:id="_ZrBf4ZaBEeS8eNvSwD0lgA">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_ZrBf45aBEeS8eNvSwD0lgA">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_ZrBf5ZaBEeS8eNvSwD0lgA"/>
+      <paletteRules xmi:id="_N4GzIKFQEeSx6MYdei1rKA" permit="false" element="composite.group.*"/>
+    </modelKinds>
+  </viewpoints>
+  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>
+  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+  <categories xmi:id="_a6cL0MykEeSuYbPdZwWlyw" name="SysML14"/>
+</configuration:PapyrusConfiguration>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/palette/internalBlockDiagram.paletteconfiguration b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/palette/internalBlockDiagram.paletteconfiguration
new file mode 100644
index 00000000000..6356115b552
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/palette/internalBlockDiagram.paletteconfiguration
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="ASCII"?>
+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="palettemodel" label="SysML">
+  <drawerConfigurations id="SysML Nodes" label="SysML Nodes" description="SysML Nodes">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ClassifierBehaviorProperty" label="ClassifierBehaviorProperty" description="Create a ClassifierBehaviorProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.DistributedProperty" label="DistributedProperty" description="Create a DistributedProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.DistributedProperty_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.DistributedProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ConnectorProperty" label="ConnectorProperty" description="Create a ConnectorProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ConnectorProperty_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ConnectorProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ParticipantProperty" label="ParticipantProperty" description="Create a ParticipantProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ParticipantProperty_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ParticipantProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.FlowProperty" label="FlowProperty" description="Create a FlowProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowProperty_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Block" label="Block" description="Create a Block">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/blocks/Block.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Block_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Block_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ValueType" label="ValueType" description="Create a ValueType">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/blocks/ValueType.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ValueType_3080"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ValueType_2068"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ConstraintBlock" label="ConstraintBlock" description="Create a ConstraintBlock">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/constraints/ConstraintBlock.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ConstraintBlock_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ConstraintBlock_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Requirement" label="Requirement" description="Create a Requirement">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Requirement.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Requirement_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Requirement_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Problem" label="Problem" description="Create a Problem">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/modelelements/Problem.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Problem_3097"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Problem_2109"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.FlowSpecification" label="FlowSpecification" description="Create a FlowSpecification">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Interface.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowSpecification_3087"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowSpecification_2076"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ViewPoint" label="ViewPoint" description="Create a ViewPoint">
+      <icon pluginID="org.eclipse.papyrus.sysml.edit" iconPath="icons/full/obj16/ViewPoint.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ViewPoint_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ViewPoint_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.TestCase Operation" label="TestCase Operation" description="Create a TestCase Operation">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Operation.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.TestCase_Operation_3102"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ControlOperator Operation" label="ControlOperator Operation" description="Create a ControlOperator Operation">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Operation.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ControlOperator_Operation_3102"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Rationale" label="Rationale" description="Create a Rationale">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/modelelements/Rationale.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Rationale_3097"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Rationale_2109"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.View_Class" label="View" description="Create a View">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.View_Class_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.View_Class_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.View Package" label="View Package" description="Create a View Package">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Package.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.View_Package_CompositeStructure"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.InterfaceBlock " label="InterfaceBlock" description="Create a InterfaceBlock">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.InterfaceBlock_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.InterfaceBlock_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.AdjunctProperty" label="AdjunctProperty" description="Create a AdjunctProperty ">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.AdjunctProperty_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.AdjunctProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.FlowPort" label="FlowPort" description="Create a FlowPort">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/portandflows/FlowPort.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowPort_3069"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.EndPathMultiplicity " label="EndPathMultiplicity" description="Create a EndPathMultiplicity">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Rate Parameter" label="Rate Parameter" description="Create a Rate Parameter">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Parameter.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Rate_Parameter_3088"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Discrete Parameter" label="Discrete Parameter" description="Create a Discrete Parameter">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Parameter.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Discrete_Parameter_3088"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Continuous Parameter" label="Continuous Parameter" description="Create a Continuous Parameter">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Parameter.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Continuous_Parameter_3088"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ChangeStructuralFeatureEvent" label="ChangeStructuralFeatureEvent" description="Create a ChangeStructuralFeatureEvent">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/ChangeEvent.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ChangeStructuralFeatureEvent_2088"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ElementGroup" label="ElementGroup" description="Create a ElementGroup">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Comment.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ElementGroup_3097"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ElementGroup_2109"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Optional" label="Optional" description="Create a Optional">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Parameter.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Optional_3088"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.FullPort" label="FullPort" description="Create a FullPort">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Port.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FullPort_3069"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ProxyPort" label="ProxyPort" description="Create a ProxyPort">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Port.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ProxyPort_3069"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.BoundReference" label="BoundReference" description="Create a BoundReference">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.BoundReference_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.BoundReference_3101"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations id="SysML Edges" label="SysML Edges" description="SysML Edges">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Expose" label="Expose" description="Create a Expose" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Expose_4010"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Copy Abstraction" label="Copy Abstraction" description="Create a Copy Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Copy.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Copy_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Verify Abstraction" label="Verify Abstraction" description="Create a Verify Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Verify.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Verify_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Trace Abstraction" label="Trace Abstraction" description="Create a Trace Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Trace_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Conform Dependency" label="Conform Dependency" description="Create a Conform Dependency" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Conform_Dependency_4010"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Conform Generalization" label="Conform Generalization" description="Create a Conform Generalization" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Conform_Generalization_4015"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Refine Abstraction" label="Refine Abstraction" description="Create a Refine Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Refine_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Allocate Abstraction" label="Allocate Abstraction" description="Create a Allocate Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Allocate_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.DeriveReqt Abstraction" label="DeriveReqt Abstraction" description="Create a DeriveReqt Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.DeriveReqt_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Satisfy Abstraction" label="Satisfy Abstraction" description="Create a Satisfy Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Satisfy.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Satisfy_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ItemFlow" label="ItemFlow" description="Create a ItemFlow" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/portandflows/ItemFlow.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ItemFlow_4021"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.BindingConnector" label="BindingConnector" description="Create a BindingConnector">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Connector.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.BindingConnector_4013"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations id="Deprecated" label="Deprecated" description="Deprecated">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Deprecated_DataType" label="Deprecated_DataType" description="Create a Deprecated">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/DataType.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_DataType_2068"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_DataType_3080"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Deprecated Generalization" label="Deprecated Generalization" description="Create a Deprecated Generalization" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Generalization_4015"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Deprecated.property" label="Deprecated_Property" description="Create a Deprecated Property">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Property_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Property_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Deprecated_Class" label="Deprecated_Class" description="Create a Deprecated_Class">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Class_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Class_2073"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/palette/internalBlockDiagramPalette.xml b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/palette/internalBlockDiagramPalette.xml
deleted file mode 100644
index 5951dd18d99..00000000000
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/palette/internalBlockDiagramPalette.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- Copyright (c) 2015 CEA.
- 
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
- 
- Contributors:
-   CEA - Initial API and implementation
-   Benoit Maggi benoit.maggi@cea.fr
-   
--->
-<paletteDefinition>
-	<content>
-
-	<drawer id="internalblock.drawer.nodes" name="Nodes" iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-
-	<!--  
-		<aspectTool description="Create a new Port" id="internalblock_main.tool.port"
-			name="Port" refToolId="internalblock.tool.port">
-		</aspectTool>
-		<aspectTool description="Create a new FlowPort (IN)" id="internalblock_main.tool.flowport_in"
-			name="FlowPort (IN)" refToolId="internalblock.tool.flowport_in">
-		</aspectTool>
-		<aspectTool description="Create a new FlowPort (OUT)" id="internalblock_main.tool.flowport_out"
-			name="FlowPort (OUT)" refToolId="internalblock.tool.flowport_out">
-		</aspectTool>
-		<aspectTool description="Create a new FlowPort (INOUT)" id="internalblock_main.tool.flowport_inout"
-			name="FlowPort (INOUT)" refToolId="internalblock.tool.flowport_inout">
-		</aspectTool>
-		<aspectTool description="Create a new FlowPort (Non Atomic)" id="internalblock_main.tool.flowport_na"
-			name="FlowPort (Non Atomic)" refToolId="internalblock.tool.flowport_na">
-		</aspectTool>
-		<aspectTool description="Create a new Property" id="internalblock_main.tool.property"
-			name="Property" refToolId="internalblock.tool.property">
-		</aspectTool>
-		<aspectTool description="Create a new Part" id="internalblock_main.tool.part"
-			name="Part" refToolId="internalblock.tool.part">
-		</aspectTool>
-		<aspectTool description="Create a new Reference" id="internalblock_main.tool.reference"
-			name="Reference" refToolId="internalblock.tool.reference">
-		</aspectTool>
-		<aspectTool description="Create a new ActorPart" id="internalblock_main.tool.actorpart"
-			name="ActorPart" refToolId="internalblock.tool.actorpart">
-		</aspectTool>
-		<aspectTool description="Create a new Value" id="internalblock_main.tool.value"
-			name="Value" refToolId="internalblock.tool.value">
-		</aspectTool>
-		-->
-		
-		<aspectTool name="Comment" id="internalblock_main.tool.comment" refToolId="clazz.tool.comment" description="Create a new Comment" />
-		<aspectTool name="Constraint" id="internalblock_main.tool.constraint" refToolId="clazz.tool.constraint" description="Create a new Constraint" />
-		
-	</drawer>
-	
-	<!--  
-	<drawer id="internalblock.drawer.edges" name="Edges" iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-	
-		<aspectTool description="Create a new Connector" id="internalblock_main.tool.connector"
-			name="Connector" refToolId="internalblock.tool.connector">
-		</aspectTool>
-		<aspectTool description="Create a new Dependency" id="internalblock_main.tool.dependency"
-			name="Dependency" refToolId="internalblock.tool.dependency">
-		</aspectTool>
-		<aspectTool description="Create a new Comment / Constraint link" id="internalblock_main.tool.comment_constraint_link"
-			name="Comment / Constraint link" refToolId="internalblock.tool.comment_constraint_link">
-		</aspectTool>
-	</drawer>
-	-->
-	</content>	
-</paletteDefinition>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/.settings/org.eclipse.jdt.core.prefs
index c537b63063c..94d61f00da6 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/.settings/org.eclipse.jdt.core.prefs
@@ -5,3 +5,287 @@ org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF
index 68ac6ef2134..847928bdef0 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF
@@ -15,6 +15,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.ecore.editor,
  org.eclipse.papyrus.infra.onefile;bundle-version="1.1.0",
  com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml14.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/plugin.properties b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/plugin.properties
new file mode 100644
index 00000000000..bbd510d8337
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/plugin.properties
@@ -0,0 +1,15 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################
+pluginName=org.eclipse.papyrus.sysml14.diagram.parametric
+pluginDescription=This plug-in contains the parametric diagram of SysML 1.4
+providerName=Eclipse Modeling Project
+
+
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/plugin.xml b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/plugin.xml
index e929de651b4..f5498a37e6b 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/plugin.xml
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/plugin.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
+<!--
+  Copyright (c) 2015 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+ 
+  Contributors:
+  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+-->
+
 <plugin>
    <extension
          point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/configuration/ParametricDiagram.configuration b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/configuration/ParametricDiagram.configuration
index a61cf8c8347..0c81949cc8b 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/configuration/ParametricDiagram.configuration
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/configuration/ParametricDiagram.configuration
@@ -1,20 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_ZrBf4JaBEeS8eNvSwD0lgA" name="SysML 1.4 Parametric" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.parametric/icons/obj16/Diagram_Parametric.png" implementationID="CompositeStructure" customPalette="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.parametric/resources/palette/parametricDiagramPalette.xml">

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>

-      <modelRules xmi:id="_ZrBf4ZaBEeS8eNvSwD0lgA">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_ZrBf45aBEeS8eNvSwD0lgA">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_ZrBf5ZaBEeS8eNvSwD0lgA"/>

-      <paletteRules xmi:id="_N4GzIKFQEeSx6MYdei1rKA" permit="false" element="composite.group.*"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">
+  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">
+    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_ZrBf4JaBEeS8eNvSwD0lgA" name="SysML 1.4 Parametric" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.parametric/icons/obj16/Diagram_Parametric.png" implementationID="CompositeStructure" categories="_fUk00MykEeSuYbPdZwWlyw" customPalette="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.parametric/resources/palette/parametricDiagramPalette.paletteconfiguration">
+      <profiles href="http://www.eclipse.org/papyrus/1.4/SysML/Allocations#/"/>
+      <profiles href="http://www.eclipse.org/papyrus/1.4/SysML/Blocks#/"/>
+      <profiles href="http://www.eclipse.org/papyrus/1.4/SysML/ConstraintBlocks#/"/>
+      <profiles href="http://www.eclipse.org/papyrus/1.4/SysML/DeprecatedElements#/"/>
+      <profiles href="http://www.eclipse.org/papyrus/1.4/SysML/ModelElements#/"/>
+      <profiles href="http://www.eclipse.org/papyrus/1.4/SysML/PortAndFlows#/"/>
+      <profiles href="http://www.eclipse.org/papyrus/1.4/SysML/Requirements#/"/>
+      <modelRules xmi:id="_ZrBf4ZaBEeS8eNvSwD0lgA">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_ZrBf45aBEeS8eNvSwD0lgA">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_ZrBf5ZaBEeS8eNvSwD0lgA"/>
+      <paletteRules xmi:id="_N4GzIKFQEeSx6MYdei1rKA" permit="false" element="composite.group.*"/>
+    </modelKinds>
+  </viewpoints>
+  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>
+  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+  <categories xmi:id="_fUk00MykEeSuYbPdZwWlyw" name="SysML14"/>
+</configuration:PapyrusConfiguration>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/palette/parametricDiagramPalette.paletteconfiguration b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/palette/parametricDiagramPalette.paletteconfiguration
new file mode 100644
index 00000000000..6356115b552
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/palette/parametricDiagramPalette.paletteconfiguration
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="ASCII"?>
+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="palettemodel" label="SysML">
+  <drawerConfigurations id="SysML Nodes" label="SysML Nodes" description="SysML Nodes">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ClassifierBehaviorProperty" label="ClassifierBehaviorProperty" description="Create a ClassifierBehaviorProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.DistributedProperty" label="DistributedProperty" description="Create a DistributedProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.DistributedProperty_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.DistributedProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ConnectorProperty" label="ConnectorProperty" description="Create a ConnectorProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ConnectorProperty_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ConnectorProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ParticipantProperty" label="ParticipantProperty" description="Create a ParticipantProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ParticipantProperty_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ParticipantProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.FlowProperty" label="FlowProperty" description="Create a FlowProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowProperty_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Block" label="Block" description="Create a Block">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/blocks/Block.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Block_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Block_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ValueType" label="ValueType" description="Create a ValueType">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/blocks/ValueType.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ValueType_3080"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ValueType_2068"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ConstraintBlock" label="ConstraintBlock" description="Create a ConstraintBlock">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/constraints/ConstraintBlock.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ConstraintBlock_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ConstraintBlock_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Requirement" label="Requirement" description="Create a Requirement">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Requirement.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Requirement_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Requirement_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Problem" label="Problem" description="Create a Problem">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/modelelements/Problem.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Problem_3097"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Problem_2109"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.FlowSpecification" label="FlowSpecification" description="Create a FlowSpecification">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Interface.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowSpecification_3087"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowSpecification_2076"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ViewPoint" label="ViewPoint" description="Create a ViewPoint">
+      <icon pluginID="org.eclipse.papyrus.sysml.edit" iconPath="icons/full/obj16/ViewPoint.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ViewPoint_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ViewPoint_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.TestCase Operation" label="TestCase Operation" description="Create a TestCase Operation">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Operation.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.TestCase_Operation_3102"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ControlOperator Operation" label="ControlOperator Operation" description="Create a ControlOperator Operation">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Operation.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ControlOperator_Operation_3102"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Rationale" label="Rationale" description="Create a Rationale">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/modelelements/Rationale.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Rationale_3097"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Rationale_2109"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.View_Class" label="View" description="Create a View">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.View_Class_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.View_Class_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.View Package" label="View Package" description="Create a View Package">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Package.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.View_Package_CompositeStructure"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.InterfaceBlock " label="InterfaceBlock" description="Create a InterfaceBlock">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.InterfaceBlock_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.InterfaceBlock_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.AdjunctProperty" label="AdjunctProperty" description="Create a AdjunctProperty ">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.AdjunctProperty_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.AdjunctProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.FlowPort" label="FlowPort" description="Create a FlowPort">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/portandflows/FlowPort.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowPort_3069"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.EndPathMultiplicity " label="EndPathMultiplicity" description="Create a EndPathMultiplicity">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Rate Parameter" label="Rate Parameter" description="Create a Rate Parameter">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Parameter.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Rate_Parameter_3088"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Discrete Parameter" label="Discrete Parameter" description="Create a Discrete Parameter">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Parameter.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Discrete_Parameter_3088"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Continuous Parameter" label="Continuous Parameter" description="Create a Continuous Parameter">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Parameter.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Continuous_Parameter_3088"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ChangeStructuralFeatureEvent" label="ChangeStructuralFeatureEvent" description="Create a ChangeStructuralFeatureEvent">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/ChangeEvent.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ChangeStructuralFeatureEvent_2088"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ElementGroup" label="ElementGroup" description="Create a ElementGroup">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Comment.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ElementGroup_3097"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ElementGroup_2109"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Optional" label="Optional" description="Create a Optional">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Parameter.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Optional_3088"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.FullPort" label="FullPort" description="Create a FullPort">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Port.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FullPort_3069"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ProxyPort" label="ProxyPort" description="Create a ProxyPort">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Port.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ProxyPort_3069"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.BoundReference" label="BoundReference" description="Create a BoundReference">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.BoundReference_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.BoundReference_3101"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations id="SysML Edges" label="SysML Edges" description="SysML Edges">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Expose" label="Expose" description="Create a Expose" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Expose_4010"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Copy Abstraction" label="Copy Abstraction" description="Create a Copy Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Copy.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Copy_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Verify Abstraction" label="Verify Abstraction" description="Create a Verify Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Verify.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Verify_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Trace Abstraction" label="Trace Abstraction" description="Create a Trace Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Trace_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Conform Dependency" label="Conform Dependency" description="Create a Conform Dependency" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Conform_Dependency_4010"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Conform Generalization" label="Conform Generalization" description="Create a Conform Generalization" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Conform_Generalization_4015"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Refine Abstraction" label="Refine Abstraction" description="Create a Refine Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Refine_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Allocate Abstraction" label="Allocate Abstraction" description="Create a Allocate Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Allocate_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.DeriveReqt Abstraction" label="DeriveReqt Abstraction" description="Create a DeriveReqt Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.DeriveReqt_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Satisfy Abstraction" label="Satisfy Abstraction" description="Create a Satisfy Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Satisfy.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Satisfy_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ItemFlow" label="ItemFlow" description="Create a ItemFlow" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/portandflows/ItemFlow.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ItemFlow_4021"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.BindingConnector" label="BindingConnector" description="Create a BindingConnector">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Connector.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.BindingConnector_4013"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations id="Deprecated" label="Deprecated" description="Deprecated">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Deprecated_DataType" label="Deprecated_DataType" description="Create a Deprecated">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/DataType.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_DataType_2068"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_DataType_3080"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Deprecated Generalization" label="Deprecated Generalization" description="Create a Deprecated Generalization" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Generalization_4015"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Deprecated.property" label="Deprecated_Property" description="Create a Deprecated Property">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Property_3070"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Property_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Deprecated_Class" label="Deprecated_Class" description="Create a Deprecated_Class">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Class_3085"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Class_2073"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/palette/parametricDiagramPalette.xml b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/palette/parametricDiagramPalette.xml
deleted file mode 100644
index 16b12294c7e..00000000000
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/palette/parametricDiagramPalette.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- Copyright (c) 2015 CEA.
- 
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
- 
- Contributors:
-   CEA - Initial API and implementation
-   Benoit Maggi benoit.maggi@cea.fr
-   
--->
-<paletteDefinition>
-	<content>
-	<!--  
-		<drawer id="parametric.drawer.nodes" name="Nodes"
-			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-			<aspectTool description="Create a new ConstraintProperty"
-				id="parametric.tool.constraintblockpropertycomposite" name="ConstraintProperty"
-				refToolId="parametric.tool.constraintblockpropertycomposite">
-			</aspectTool>
-			<aspectTool description="Create a new ConstraintParameter"
-				id="parametric.tool.parameter" name="ConstraintParameter" refToolId="parametric.tool.parameter">
-			</aspectTool>
-			<aspectTool description="Create a new Part"
-				id="parametric.tool.blockpropertycomposite" name="Part"
-				refToolId="parametric.tool.blockpropertycomposite">
-			</aspectTool>
-			<aspectTool description="Create a new Reference" id="parametric.tool.reference"
-				name="Reference" refToolId="parametric.tool.reference">
-			</aspectTool>
-			<aspectTool description="Create a new Value" id="parametric.tool.value"
-				name="Value" refToolId="parametric.tool.value">
-			</aspectTool>
-		</drawer>
-	
-		<drawer id="parametric.drawer.edges" name="Edges"
-			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-			<aspectTool description="Create a new BindingConnector"
-				id="parametric.tool.connector" name="BindingConnector" refToolId="parametric.tool.connector">
-			</aspectTool>
-		</drawer>
-	-->		
-		<drawer id="parametric.drawer.others" name="Others"
-			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-			<!--  
-			<aspectTool description="Create a new Dependency" id="parametric.tool.dependency"
-				name="Dependency" refToolId="parametric.tool.dependency">
-			</aspectTool>
-			-->
-			<aspectTool description="Create a new Comment" id="parametric.tool.comment"
-				name="Comment" refToolId="composite.tool.comment">
-			</aspectTool>
-			<aspectTool description="Create a new Constraint" id="parametric.tool.constraint"
-				name="Constraint" refToolId="composite.tool.constraint">
-			</aspectTool>
-			<!--  
-			<aspectTool description="Create a new CommentAnnotatedElement"
-				id="parametric.tool.commentannotatedelement" name="CommentAnnotatedElement"
-				refToolId="parametric.tool.comment_constraint_link">
-			</aspectTool>
-			<aspectTool description="Create a new ContextLink" id="parametric.tool.context_link"
-				name="ContextLink" refToolId="parametric.tool.context_link">
-			</aspectTool>
-			-->
-		</drawer>
-	</content>
-</paletteDefinition>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/.settings/org.eclipse.jdt.core.prefs
index f42de363afa..f08be2b06c4 100755
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/.settings/org.eclipse.jdt.core.prefs
@@ -5,3 +5,287 @@ org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF
index fc7175555cd..b513d4841a9 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Requirement1.4 Configuration for Papyrus
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.requirement;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.sysml14.diagram.requirement.Activator
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.viewpoints.policy
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse Modeling Project
+Bundle-Vendor: %providerName
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/about.html b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

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

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

+<head>

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

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

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

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

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

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

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

+

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

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

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

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

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

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

+

+</body>

+</html>

diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/plugin.properties b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/plugin.properties
new file mode 100644
index 00000000000..2a178885d87
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/plugin.properties
@@ -0,0 +1,15 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################
+pluginName=org.eclipse.papyrus.sysml14.diagram.requirement
+pluginDescription=This plug-in contains the requirement diagram of SysML 1.4
+providerName=Eclipse Modeling Project
+
+
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/plugin.xml b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/plugin.xml
index a4d8049218e..b85be80e0d9 100755..100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/plugin.xml
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/plugin.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
+<!--
+  Copyright (c) 2015 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+ 
+  Contributors:
+  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+-->
+
 <plugin>
    <extension
          point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/configuration/RequirementDiagram.configuration b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/configuration/RequirementDiagram.configuration
index 5f975257958..7e7e5dd574e 100755..100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/configuration/RequirementDiagram.configuration
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/configuration/RequirementDiagram.configuration
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">
   <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_ZrBf4JaBEeS8eNvSwD0lgA" name="SysML 1.4 Requirement" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.requirement/icons/obj16/Diagram_Requirement.gif" implementationID="PapyrusUMLClassDiagram" customPalette="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagramPalette.xml">
+    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_ZrBf4JaBEeS8eNvSwD0lgA" name="SysML 1.4 Requirement" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.requirement/icons/obj16/Diagram_Requirement.gif" implementationID="PapyrusUMLClassDiagram" categories="_lfthYMykEeSuYbPdZwWlyw" customPalette="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration">
       <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>
       <modelRules xmi:id="_ZrBf4ZaBEeS8eNvSwD0lgA">
         <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
@@ -9,11 +9,11 @@
       <owningRules xmi:id="_ZrBf45aBEeS8eNvSwD0lgA">
         <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>
       <childRules xmi:id="_ZrBf5ZaBEeS8eNvSwD0lgA"/>
       <paletteRules xmi:id="_QdpyAKJhEeS3RsrRENQYiQ" permit="false" element="clazz.group.*"/>
     </modelKinds>
   </viewpoints>
   <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>
   <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+  <categories xmi:id="_lfthYMykEeSuYbPdZwWlyw" name="SysML14"/>
 </configuration:PapyrusConfiguration>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration
new file mode 100644
index 00000000000..3b32816b51f
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="ASCII"?>
+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="palettemodel" label="SysML">
+  <drawerConfigurations id="WorkingPalette" label="WorkingPalette" description="WorkingPalette">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Block" label="Block" description="Create a Block">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/blocks/Block.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Requirement" label="Requirement" description="Create a Requirement">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Requirement.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Satisfy_Abstraction" label="Satisfy" description="Create a Satisfy" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Satisfy.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Satisfy_Abstraction_4006"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations id="Nodes" label="Nodes" description="Nodes">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.AdjunctProperty" label="AdjunctProperty" description="Create a AdjunctProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.BoundReference" label="BoundReference" description="Create a BoundReference">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty" label="ClassifierBehaviorProperty" description="Create a ClassifierBehaviorProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ConnectorProperty" label="ConnectorProperty" description="Create a ConnectorProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ConstraintBlock" label="ConstraintBlock" description="Create a ConstraintBlock">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/constraints/ConstraintBlock.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ControlOperator_Operation" label="ControlOperator" description="Create a ControlOperator">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Operation.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3003"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3007"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3013"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3019"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3042"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.DistributedProperty" label="DistributedProperty" description="Create a DistributedProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ElementGroup" label="ElementGroup" description="Create a ElementGroup">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Comment.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ElementGroup_2012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ElementGroup_3028"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.EndPathMultiplicity" label="EndPathMultiplicity" description="Create a EndPathMultiplicity">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.FlowProperty" label="FlowProperty" description="Create a FlowProperty">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/portandflows/FlowProperty.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.FlowSpecification" label="FlowSpecification" description="Create a FlowSpecification">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Interface.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_2004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3023"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3036"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3037"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3038"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.InterfaceBlock" label="InterfaceBlock" description="Create a InterfaceBlock">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ParticipantProperty" label="ParticipantProperty" description="Create a ParticipantProperty">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Problem" label="Problem" description="Create a Problem">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/modelelements/Problem.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Problem_2012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Problem_3028"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Rationale" label="Rationale" description="Create a Rationale">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/modelelements/Rationale.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Rationale_2012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Rationale_3028"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.TestCase_Operation" label="TestCase" description="Create a TestCase">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Operation.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3003"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3007"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3013"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3019"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3042"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.View_Package" label="View" description="Create a View">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Package.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Package_2007"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Package_3009"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ViewPoint" label="ViewPoint" description="Create a ViewPoint">
+      <icon pluginID="org.eclipse.papyrus.sysml.edit" iconPath="icons/full/obj16/ViewPoint.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.View_Class" label="View Class" description="Create a View Class">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ValueType" label="ValueType" description="Create a ValueType">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/blocks/ValueType.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_2010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_3027"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_3043"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_3044"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_3045"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations id="Edges" label="Edges" description="Edges">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Copy_Abstraction" label="Copy" description="Create a Copy" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Copy.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Copy_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Verify_Abstraction" label="Verify" description="Create a Verify">
+      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Verify.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Verify_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Trace_Abstraction" label="Trace" description="Create a Trace" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Trace_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Refine_Abstraction" label="Refine" description="Create a Refine" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Refine_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Conform_Generalization" label="Conform" description="Create a Conform Generalization" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Conform_Generalization_4002"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Allocate_Abstraction" label="Allocate" description="Create a Allocate Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Allocate_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.DeriveReqt_Abstraction" label="DeriveReqt" description="Create a DeriveReqt Abstraction" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DeriveReqt_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Conform_Dependency" label="Conform" description="Create a Conform " kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_2014"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_4008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_4018"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Expose" label="Expose" description="Create a Expose" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Expose_2014"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Expose_4008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Expose_4018"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ItemFlow" label="ItemFlow" description="Create a ItemFlow" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/InformationFlow.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ItemFlow_4026"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations id="Other SysML Elements" label="Other SysML Elements" description="Other SysML Elements">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.View_Package_PapyrusUMLClassDi" label="View" description="Create a View">
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Package_PapyrusUMLClassDiagram"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Allocated" label="Allocated" description="Create a Allocated">
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Allocated_2097"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.RequirementRelated" label="RequirementRelated" description="Create a RequirementRelated">
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.RequirementRelated_2097"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations id="Deprecated" label="Deprecated" description="Deprecated">
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_Property" label="Property (Deprecated)" description="Create a Deprecated Property">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3002"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3005"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3006"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3012"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3018"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification" label="InstanceSpecification (Deprecated)" description="Create a Deprecated InstanceSpecification">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/InstanceSpecification.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_4021"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_2001"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_3020"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_Class" label="Class (Deprecated)" description="Create a Deprecated Class" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_2008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3004"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3008"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_Association" label="Association (Deprecated)" description="Create a Deprecated Association" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Association.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_2015"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_4001"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_4019"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_Generalization" label="Generalization (Deprecated)" description="Create a Deprecated Generalization" kind="ConnectionTool">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Generalization_4002"/>
+    </ownedConfigurations>
+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_DataType" label="DataType (Deprecated)" description="Create a Deprecated DataType">
+      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/DataType.gif"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_2010"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3027"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3043"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3044"/>
+      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3045"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagramPalette.xml b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagramPalette.xml
deleted file mode 100755
index 7075f797dba..00000000000
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagramPalette.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-	<paletteDefinition>
-		<content>
-			<drawer iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" id="requirement.drawer.nodes" name="Nodes">
-		
-				<aspectTool description="Create a new Package" 
-					id="requirement.tool.package" 
-					name="Package" refToolId="clazz.tool.package">
-				</aspectTool>
-		
-				<aspectTool description="Create a new Requirement"
-					 id="requirement.tool.class" name="Requirement" 
-					 refToolId="clazz.tool.class" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif">
-					 	<postAction id="org.eclipse.papyrus.postaction.displayAppliedStereotypePropertiesInCompartmentactionprovider">
-					 		<propertiesToDisplay>
-					 			<propertyToDisplay name="SysML::Requirements::Requirement.id"/>
-					 			<propertyToDisplay name="SysML::Requirements::Requirement.text"/>
-					 		</propertiesToDisplay>
-					 	</postAction>
-					 	
-					 	<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					 		<stereotypesToApply>
-					 			<stereotype stereotypeName="SysML::Requirements::Requirement"/>	
-					 		</stereotypesToApply>
-					 	</postAction>
-				 </aspectTool>
-			
-			<aspectTool description="Create a new Problem"
-					 id="requirement.tool.comment" name="Problem" 
-					 refToolId="clazz.tool.comment" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Problem.gif">
-					 					 	
-					 	<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					 		<stereotypesToApply>
-					 			<stereotype stereotypeName="SysML::ModelElements::Problem"/>	
-					 		</stereotypesToApply>
-					 	</postAction>
-					 	
-				 </aspectTool>
-				 
-				 <aspectTool description="Create a new Rationale"
-					 id="requirement.tool.comment" name="Rationale" 
-					 refToolId="clazz.tool.comment" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Rationale.gif">
-					 					 	
-					 	<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					 		<stereotypesToApply>
-					 			<stereotype stereotypeName="SysML::ModelElements::Rationale"/>	
-					 		</stereotypesToApply>
-					 	</postAction>
-					 	
-				 </aspectTool>
-				 
-			<aspectTool description="Create a new Comment" id="requirement.tool.comment"
-				name="Comment" refToolId="clazz.tool.comment">
-			</aspectTool>
-			
-			<aspectTool description="Create a new Constraint" id="requirement.tool.constraint"
-				name="Constraint" refToolId="clazz.tool.constraint">
-			</aspectTool>
-			
-				</drawer>
-				 	
-			<drawer iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" id="requirement.drawer.edges" name="Edges">
-			
-				<aspectTool description="Create a Copy Link"
-					id="requirement.tool.copy" name="Copy"
-					refToolId="clazz.tool.abstraction" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Copy.gif">
-					<postAction
-						id="org.eclipse.papyrus.applystereotypeactionprovider">
-						<stereotypesToApply>
-							<stereotype stereotypeName="SysML::Requirements::Copy" />
-						</stereotypesToApply>
-					</postAction>
-				</aspectTool>
-					<aspectTool description="Create a new Dependency" id="requirement.tool.dependency"
-				name="Dependency" refToolId="clazz.tool.dependency">
-			</aspectTool>
-				
-				<aspectTool description="Create a Derive Link"
-					id="requirement.tool.derive" name="Derive"
-					refToolId="clazz.tool.abstraction" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/DeriveReqt.gif">
-					<postAction
-						id="org.eclipse.papyrus.applystereotypeactionprovider">
-						<stereotypesToApply>
-							<stereotype
-								stereotypeName="SysML::Requirements::DeriveReqt" />
-						</stereotypesToApply>
-					</postAction>
-				</aspectTool>
-				
-				<aspectTool description="Create a Decompose Link"
-					id="requirement.tool.decompose" name="Decompose"
-					refToolId="clazz.tool.containmentlink"/>
-				<aspectTool description="Create a new PackageImport" id="requirement.tool.packageimport"
-				name="PackageImport" refToolId="clazz.tool.packageimport">
-				</aspectTool>
-					<aspectTool description="Create a new Realization" id="requirement.tool.realization"
-				name="Realization" refToolId="clazz.tool.realization">
-			</aspectTool>	
-				<aspectTool description="Create a Satisfy Link"
-					id="requirement.tool.satisfy" name="Satisfy"
-					refToolId="clazz.tool.abstraction" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif">
-					<postAction
-						id="org.eclipse.papyrus.applystereotypeactionprovider">
-						<stereotypesToApply>
-							<stereotype
-								stereotypeName="SysML::Requirements::Satisfy" />
-						</stereotypesToApply>
-					</postAction>
-				</aspectTool>
-				
-				<aspectTool description="Create a Verify Link"
-					id="requirement.tool.verify" name="Verify"
-					refToolId="clazz.tool.abstraction" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Verify.gif">
-					<postAction
-						id="org.eclipse.papyrus.applystereotypeactionprovider">
-						<stereotypesToApply>
-							<stereotype
-								stereotypeName="SysML::Requirements::Verify" />
-						</stereotypesToApply>
-					</postAction>
-				</aspectTool>
-			
-		
-		
-			<!-- Attention : The element is added manually, can combine the two links comment and constraint, and therefore is not deleted -->
-			<aspectTool description="Create a new Link" id="package.tool.link"
-				name="Link" refToolId="clazz.tool.link">
-			</aspectTool>
-			
-			</drawer>
-		</content>
-</paletteDefinition>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/src/org/eclipse/papyrus/sysml14/diagram/requirement/Activator.java b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/src/org/eclipse/papyrus/sysml14/diagram/requirement/Activator.java
index 752b0818a20..bbb6d630daf 100755..100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/src/org/eclipse/papyrus/sysml14/diagram/requirement/Activator.java
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/src/org/eclipse/papyrus/sysml14/diagram/requirement/Activator.java
@@ -1,3 +1,14 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *****************************************************************************/
 package org.eclipse.papyrus.sysml14.diagram.requirement;
 
 import org.osgi.framework.BundleActivator;
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..4d72ad12656
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,288 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/META-INF/MANIFEST.MF b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/META-INF/MANIFEST.MF
index f899ac71cab..9de4650c84b 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/META-INF/MANIFEST.MF
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.papyrus.sysml14.activities.provider,
  org.eclipse.papyrus.sysml14.provider,
  org.eclipse.papyrus.sysml14.requirements.provider
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.sysml14;visibility:=reexport,
+ org.eclipse.papyrus.sysml14;bundle-version="1.1.0";visibility:=reexport,
  org.eclipse.emf.edit;visibility:=reexport,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.edit;visibility:=reexport,
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/about.html b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

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

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

+<head>

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

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

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

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

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

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

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

+

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

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

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

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

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

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

+

+</body>

+</html>

diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/plugin.properties b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/plugin.properties
index 576235c23c9..8285a17b9c6 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/plugin.properties
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit/plugin.properties
@@ -6,7 +6,7 @@
 #  http://www.eclipse.org/legal/epl-v10.html
 
 pluginName = SysML Edit Support
-providerName = www.example.org
+providerName = Eclipse Modeling Project
 
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/.settings/org.eclipse.jdt.core.prefs
index f287d53cf45..410244d65a6 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/.settings/org.eclipse.jdt.core.prefs
@@ -5,3 +5,287 @@ org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

 org.eclipse.jdt.core.compiler.source=1.6

+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_assignment=0

+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_after_package=1

+org.eclipse.jdt.core.formatter.blank_lines_before_field=0

+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

+org.eclipse.jdt.core.formatter.blank_lines_before_method=1

+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

+org.eclipse.jdt.core.formatter.blank_lines_before_package=0

+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

+org.eclipse.jdt.core.formatter.comment.format_block_comments=true

+org.eclipse.jdt.core.formatter.comment.format_header=false

+org.eclipse.jdt.core.formatter.comment.format_html=true

+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

+org.eclipse.jdt.core.formatter.comment.format_line_comments=true

+org.eclipse.jdt.core.formatter.comment.format_source_code=true

+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

+org.eclipse.jdt.core.formatter.comment.line_length=260

+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

+org.eclipse.jdt.core.formatter.compact_else_if=true

+org.eclipse.jdt.core.formatter.continuation_indentation=2

+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_empty_lines=false

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

+org.eclipse.jdt.core.formatter.indentation.size=4

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.join_lines_in_comments=false

+org.eclipse.jdt.core.formatter.join_wrapped_lines=false

+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.lineSplit=260

+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

+org.eclipse.jdt.core.formatter.tabulation.char=tab

+org.eclipse.jdt.core.formatter.tabulation.size=4

+org.eclipse.jdt.core.formatter.use_on_off_tags=false

+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/model/SysML14.creationmenumodel b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/model/SysML14.creationmenumodel
deleted file mode 100644
index df00128e44f..00000000000
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/model/SysML14.creationmenumodel
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ElementCreationMenuModel:Folder xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel" label="SysML 1.4">
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ValueType" elementTypeIdRef="org.eclipse.papyrus.SysML14.ValueType"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="DistributedProperty" elementTypeIdRef="org.eclipse.papyrus.SysML14.DistributedProperty"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ConnectorProperty" elementTypeIdRef="org.eclipse.papyrus.SysML14.ConnectorProperty"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ParticipantProperty" elementTypeIdRef="org.eclipse.papyrus.SysML14.ParticipantProperty"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="BindingConnector" elementTypeIdRef="org.eclipse.papyrus.SysML14.BindingConnector"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Block" elementTypeIdRef="org.eclipse.papyrus.SysML14.Block"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="PropertySpecificType" elementTypeIdRef="org.eclipse.papyrus.SysML14.PropertySpecificType"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="NestedConnectorEnd ConnectorEnd" elementTypeIdRef="org.eclipse.papyrus.SysML14.NestedConnectorEnd_ConnectorEnd"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="NestedConnectorEnd Element" elementTypeIdRef="org.eclipse.papyrus.SysML14.NestedConnectorEnd_Element"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="DirectedRelationshipPropertyPath" elementTypeIdRef="org.eclipse.papyrus.SysML14.DirectedRelationshipPropertyPath"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ElementPropertyPath" elementTypeIdRef="org.eclipse.papyrus.SysML14.ElementPropertyPath"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="EndPathMultiplicity" elementTypeIdRef="org.eclipse.papyrus.SysML14.EndPathMultiplicity"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="BoundReference" elementTypeIdRef="org.eclipse.papyrus.SysML14.BoundReference"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="AdjunctProperty" elementTypeIdRef="org.eclipse.papyrus.SysML14.AdjunctProperty"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ClassifierBehaviorProperty" elementTypeIdRef="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ItemFlow" elementTypeIdRef="org.eclipse.papyrus.SysML14.ItemFlow"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="FlowProperty" elementTypeIdRef="org.eclipse.papyrus.SysML14.FlowProperty"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="FullPort" elementTypeIdRef="org.eclipse.papyrus.SysML14.FullPort"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="InterfaceBlock" elementTypeIdRef="org.eclipse.papyrus.SysML14.InterfaceBlock"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ProxyPort" elementTypeIdRef="org.eclipse.papyrus.SysML14.ProxyPort"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="AcceptChangeStructuralFeatureEventAction" elementTypeIdRef="org.eclipse.papyrus.SysML14.AcceptChangeStructuralFeatureEventAction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ChangeStructuralFeatureEvent" elementTypeIdRef="org.eclipse.papyrus.SysML14.ChangeStructuralFeatureEvent"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="DirectedFeature" elementTypeIdRef="org.eclipse.papyrus.SysML14.DirectedFeature"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="InvocationOnNestedPortAction InvocationAction" elementTypeIdRef="org.eclipse.papyrus.SysML14.InvocationOnNestedPortAction_InvocationAction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="InvocationOnNestedPortAction Element" elementTypeIdRef="org.eclipse.papyrus.SysML14.InvocationOnNestedPortAction_Element"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="TriggerOnNestedPort Trigger" elementTypeIdRef="org.eclipse.papyrus.SysML14.TriggerOnNestedPort_Trigger"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="TriggerOnNestedPort Element" elementTypeIdRef="org.eclipse.papyrus.SysML14.TriggerOnNestedPort_Element"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Overwrite" elementTypeIdRef="org.eclipse.papyrus.SysML14.Overwrite"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ControlOperator Behavior" elementTypeIdRef="org.eclipse.papyrus.SysML14.ControlOperator_Behavior"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ControlOperator Operation" elementTypeIdRef="org.eclipse.papyrus.SysML14.ControlOperator_Operation"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Rate ActivityEdge" elementTypeIdRef="org.eclipse.papyrus.SysML14.Rate_ActivityEdge"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Rate Parameter" elementTypeIdRef="org.eclipse.papyrus.SysML14.Rate_Parameter"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="NoBuffer" elementTypeIdRef="org.eclipse.papyrus.SysML14.NoBuffer"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Discrete ActivityEdge" elementTypeIdRef="org.eclipse.papyrus.SysML14.Discrete_ActivityEdge"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Discrete Parameter" elementTypeIdRef="org.eclipse.papyrus.SysML14.Discrete_Parameter"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Continuous ActivityEdge" elementTypeIdRef="org.eclipse.papyrus.SysML14.Continuous_ActivityEdge"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Continuous Parameter" elementTypeIdRef="org.eclipse.papyrus.SysML14.Continuous_Parameter"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Probability ActivityEdge" elementTypeIdRef="org.eclipse.papyrus.SysML14.Probability_ActivityEdge"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Probability ParameterSet" elementTypeIdRef="org.eclipse.papyrus.SysML14.Probability_ParameterSet"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Optional" elementTypeIdRef="org.eclipse.papyrus.SysML14.Optional"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Rationale" elementTypeIdRef="org.eclipse.papyrus.SysML14.Rationale"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="View Package" elementTypeIdRef="org.eclipse.papyrus.SysML14.View_Package"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="View Class" elementTypeIdRef="org.eclipse.papyrus.SysML14.View_Class"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Conform Dependency" elementTypeIdRef="org.eclipse.papyrus.SysML14.Conform_Dependency"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Conform Generalization" elementTypeIdRef="org.eclipse.papyrus.SysML14.Conform_Generalization"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Problem" elementTypeIdRef="org.eclipse.papyrus.SysML14.Problem"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ViewPoint" elementTypeIdRef="org.eclipse.papyrus.SysML14.ViewPoint"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Stakeholder" elementTypeIdRef="org.eclipse.papyrus.SysML14.Stakeholder"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Expose" elementTypeIdRef="org.eclipse.papyrus.SysML14.Expose"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ElementGroup" elementTypeIdRef="org.eclipse.papyrus.SysML14.ElementGroup"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ConstraintBlock" elementTypeIdRef="org.eclipse.papyrus.SysML14.ConstraintBlock"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="AllocateActivityPartition" elementTypeIdRef="org.eclipse.papyrus.SysML14.AllocateActivityPartition"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Allocate Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.Allocate_Abstraction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Allocate DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.Allocate_DirectedRelationship"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="DeriveReqt Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.DeriveReqt_Abstraction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="DeriveReqt DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.DeriveReqt_DirectedRelationship"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Copy Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.Copy_Abstraction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Copy DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.Copy_DirectedRelationship"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Satisfy Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.Satisfy_Abstraction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Satisfy DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.Satisfy_DirectedRelationship"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="TestCase Operation" elementTypeIdRef="org.eclipse.papyrus.SysML14.TestCase_Operation"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="TestCase Behavior" elementTypeIdRef="org.eclipse.papyrus.SysML14.TestCase_Behavior"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Requirement" elementTypeIdRef="org.eclipse.papyrus.SysML14.Requirement"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Verify Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.Verify_Abstraction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Verify DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.Verify_DirectedRelationship"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Trace Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.Trace_Abstraction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Trace DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.Trace_DirectedRelationship"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Refine Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.Refine_Abstraction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Refine DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.Refine_DirectedRelationship"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="FlowPort" elementTypeIdRef="org.eclipse.papyrus.SysML14.FlowPort"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="FlowSpecification" elementTypeIdRef="org.eclipse.papyrus.SysML14.FlowSpecification"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Allocated" elementTypeIdRef="org.eclipse.papyrus.SysML14.Allocated"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="RequirementRelated" elementTypeIdRef="org.eclipse.papyrus.SysML14.RequirementRelated"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Deprecated ValueSpecification" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_ValueSpecification"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Deprecated Property" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_Property"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Deprecated InstanceSpecification" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_InstanceSpecification"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Deprecated Class" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_Class"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Deprecated Association" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_Association_UML::Association"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Deprecated Generalization" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_Generalization"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Deprecated DataType" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_DataType"/>
-</ElementCreationMenuModel:Folder>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/plugin.xml b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/plugin.xml
index be973ffca1a..5db2a31d1c2 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/plugin.xml
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/plugin.xml
@@ -1,17 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">

-      <elementTypeSet

-            id="org.eclipse.papyrus.sysml14.service.types.elementTypeSet"

-            path="model/SysML14.elementtypesconfigurations">

-      </elementTypeSet>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.newchild">

-      <menuCreationModel

-            model="model/SysML14.creationmenumodel">

-      </menuCreationModel>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      <elementTypeSet
+            id="org.eclipse.papyrus.sysml14.service.types.elementTypeSet"
+            path="model/SysML14.elementtypesconfigurations">
+      </elementTypeSet>
+   </extension>
+
+</plugin>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/.classpath b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/.classpath
new file mode 100644
index 00000000000..ad32c83a788
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/.project b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/.project
index d38510b07bd..6ddfdcd1df9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/.project
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/.project
@@ -1,22 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.nattable.doc</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.sysml14.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..0090027daee
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.sysml14.ui;singleton:=true
+Bundle-Version: 1.1.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.sysml14.ui.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.diagram.common,
+ org.eclipse.uml2.uml;bundle-version="5.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml14;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.properties;bundle-version="1.1.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.papyrus.sysml14.ui
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Bundle-Description: %pluginDescription
+Bundle-Vendor: %providerName
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/about.html b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/build.properties b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/build.properties
new file mode 100644
index 00000000000..aa060dce6f6
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/build.properties
@@ -0,0 +1,9 @@
+#
+
+bin.includes = .,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/plugin.properties b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/plugin.properties
new file mode 100644
index 00000000000..52701326fec
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/plugin.properties
@@ -0,0 +1,15 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################
+pluginName=org.eclipse.papyrus.sysml14.ui
+pluginDescription=This plug-in contains all graphical interface for the SyML 1.4 tooling.
+providerName=Eclipse Modeling Project
+
+
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/plugin.xml b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/plugin.xml
new file mode 100644
index 00000000000..2892223f6a2
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/plugin.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!--
+  Copyright (c) 2015 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+ 
+  Contributors:
+  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+-->
+
+<plugin> 
+   
+   
+    <extension point="org.eclipse.papyrus.infra.core.papyrusDiagram">
+	     <diagramCategory
+	            class="org.eclipse.papyrus.sysml14.ui.CreateSysML14ModelCommand"
+	            description="SysML 1.4 diagrams"
+	            icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.common/icons/category_sysml.gif"
+	            id="SysML14"
+	            label="SysML 1.4">
+	     </diagramCategory>
+    </extension>
+
+   
+   <extension point="org.eclipse.papyrus.infra.newchild">
+      <menuCreationModel model="resources/SysML14.creationmenumodel"></menuCreationModel>
+   </extension>    
+   
+   <extension point="org.eclipse.papyrus.views.properties.context">
+      <context contextModel="resources/properties/SysML1.4.ctx"></context>
+   </extension>
+      
+   <extension point="org.eclipse.papyrus.infra.constraints.ConstraintEnvironment">
+      <environment environmentModel="resources/SysML1.4ConstraintEnvironment.xmi"></environment>
+   </extension>      
+      
+</plugin>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/pom.xml b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/pom.xml
new file mode 100644
index 00000000000..24bac88d344
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.sysml14.ui</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi
new file mode 100644
index 00000000000..38087bc342c
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ASCII"?>
+<environment:ConstraintEnvironment
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:environment="http://www.eclipse.org/papyrus/constraints/environment/0.9">
+  <constraintTypes
+      label="Has Stereotype Sysml 1.4"
+      constraintClass="org.eclipse.papyrus.sysml14.ui.constraints.HasStereotypeSysml14Constraint"/>
+</environment:ConstraintEnvironment>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/SysML14.creationmenumodel b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/SysML14.creationmenumodel
new file mode 100644
index 00000000000..2b96cbea392
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/SysML14.creationmenumodel
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="ASCII"?>
+<ElementCreationMenuModel:Folder xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel" xmi:id="_FUfLgMyuEeSuYbPdZwWlyw" label="SysML 1.4" icon="">
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfykMyuEeSuYbPdZwWlyw" label="ValueType" elementTypeIdRef="org.eclipse.papyrus.SysML14.ValueType"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfykcyuEeSuYbPdZwWlyw" label="DistributedProperty" elementTypeIdRef="org.eclipse.papyrus.SysML14.DistributedProperty"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfyksyuEeSuYbPdZwWlyw" label="ConnectorProperty" elementTypeIdRef="org.eclipse.papyrus.SysML14.ConnectorProperty"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfyk8yuEeSuYbPdZwWlyw" label="ParticipantProperty" elementTypeIdRef="org.eclipse.papyrus.SysML14.ParticipantProperty"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfylMyuEeSuYbPdZwWlyw" label="BindingConnector" elementTypeIdRef="org.eclipse.papyrus.SysML14.BindingConnector"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfylcyuEeSuYbPdZwWlyw" label="Block" elementTypeIdRef="org.eclipse.papyrus.SysML14.Block"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfylsyuEeSuYbPdZwWlyw" label="PropertySpecificType" elementTypeIdRef="org.eclipse.papyrus.SysML14.PropertySpecificType"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfyl8yuEeSuYbPdZwWlyw" label="NestedConnectorEnd ConnectorEnd" elementTypeIdRef="org.eclipse.papyrus.SysML14.NestedConnectorEnd_ConnectorEnd"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfymMyuEeSuYbPdZwWlyw" label="NestedConnectorEnd Element" elementTypeIdRef="org.eclipse.papyrus.SysML14.NestedConnectorEnd_Element"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfymcyuEeSuYbPdZwWlyw" label="DirectedRelationshipPropertyPath" elementTypeIdRef="org.eclipse.papyrus.SysML14.DirectedRelationshipPropertyPath"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfymsyuEeSuYbPdZwWlyw" label="ElementPropertyPath" elementTypeIdRef="org.eclipse.papyrus.SysML14.ElementPropertyPath"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfym8yuEeSuYbPdZwWlyw" label="EndPathMultiplicity" elementTypeIdRef="org.eclipse.papyrus.SysML14.EndPathMultiplicity"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfynMyuEeSuYbPdZwWlyw" label="BoundReference" elementTypeIdRef="org.eclipse.papyrus.SysML14.BoundReference"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfyncyuEeSuYbPdZwWlyw" label="AdjunctProperty" elementTypeIdRef="org.eclipse.papyrus.SysML14.AdjunctProperty"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfynsyuEeSuYbPdZwWlyw" label="ClassifierBehaviorProperty" elementTypeIdRef="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfyn8yuEeSuYbPdZwWlyw" label="ItemFlow" elementTypeIdRef="org.eclipse.papyrus.SysML14.ItemFlow"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfyoMyuEeSuYbPdZwWlyw" label="FlowProperty" elementTypeIdRef="org.eclipse.papyrus.SysML14.FlowProperty"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfyocyuEeSuYbPdZwWlyw" label="FullPort" elementTypeIdRef="org.eclipse.papyrus.SysML14.FullPort"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfyosyuEeSuYbPdZwWlyw" label="InterfaceBlock" elementTypeIdRef="org.eclipse.papyrus.SysML14.InterfaceBlock"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfyo8yuEeSuYbPdZwWlyw" label="ProxyPort" elementTypeIdRef="org.eclipse.papyrus.SysML14.ProxyPort"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfypMyuEeSuYbPdZwWlyw" label="AcceptChangeStructuralFeatureEventAction" elementTypeIdRef="org.eclipse.papyrus.SysML14.AcceptChangeStructuralFeatureEventAction"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfypcyuEeSuYbPdZwWlyw" label="ChangeStructuralFeatureEvent" elementTypeIdRef="org.eclipse.papyrus.SysML14.ChangeStructuralFeatureEvent"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfypsyuEeSuYbPdZwWlyw" label="DirectedFeature" elementTypeIdRef="org.eclipse.papyrus.SysML14.DirectedFeature"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfyp8yuEeSuYbPdZwWlyw" label="InvocationOnNestedPortAction InvocationAction" elementTypeIdRef="org.eclipse.papyrus.SysML14.InvocationOnNestedPortAction_InvocationAction"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfyqMyuEeSuYbPdZwWlyw" label="InvocationOnNestedPortAction Element" elementTypeIdRef="org.eclipse.papyrus.SysML14.InvocationOnNestedPortAction_Element"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUfyqcyuEeSuYbPdZwWlyw" label="TriggerOnNestedPort Trigger" elementTypeIdRef="org.eclipse.papyrus.SysML14.TriggerOnNestedPort_Trigger"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZoMyuEeSuYbPdZwWlyw" label="TriggerOnNestedPort Element" elementTypeIdRef="org.eclipse.papyrus.SysML14.TriggerOnNestedPort_Element"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZocyuEeSuYbPdZwWlyw" label="Overwrite" elementTypeIdRef="org.eclipse.papyrus.SysML14.Overwrite"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZosyuEeSuYbPdZwWlyw" label="ControlOperator Behavior" elementTypeIdRef="org.eclipse.papyrus.SysML14.ControlOperator_Behavior"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZo8yuEeSuYbPdZwWlyw" label="ControlOperator Operation" elementTypeIdRef="org.eclipse.papyrus.SysML14.ControlOperator_Operation"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZpMyuEeSuYbPdZwWlyw" label="Rate ActivityEdge" elementTypeIdRef="org.eclipse.papyrus.SysML14.Rate_ActivityEdge"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZpcyuEeSuYbPdZwWlyw" label="Rate Parameter" elementTypeIdRef="org.eclipse.papyrus.SysML14.Rate_Parameter"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZpsyuEeSuYbPdZwWlyw" label="NoBuffer" elementTypeIdRef="org.eclipse.papyrus.SysML14.NoBuffer"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZp8yuEeSuYbPdZwWlyw" label="Discrete ActivityEdge" elementTypeIdRef="org.eclipse.papyrus.SysML14.Discrete_ActivityEdge"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZqMyuEeSuYbPdZwWlyw" label="Discrete Parameter" elementTypeIdRef="org.eclipse.papyrus.SysML14.Discrete_Parameter"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZqcyuEeSuYbPdZwWlyw" label="Continuous ActivityEdge" elementTypeIdRef="org.eclipse.papyrus.SysML14.Continuous_ActivityEdge"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZqsyuEeSuYbPdZwWlyw" label="Continuous Parameter" elementTypeIdRef="org.eclipse.papyrus.SysML14.Continuous_Parameter"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZq8yuEeSuYbPdZwWlyw" label="Probability ActivityEdge" elementTypeIdRef="org.eclipse.papyrus.SysML14.Probability_ActivityEdge"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZrMyuEeSuYbPdZwWlyw" label="Probability ParameterSet" elementTypeIdRef="org.eclipse.papyrus.SysML14.Probability_ParameterSet"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZrcyuEeSuYbPdZwWlyw" label="Optional" elementTypeIdRef="org.eclipse.papyrus.SysML14.Optional"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZrsyuEeSuYbPdZwWlyw" label="Rationale" elementTypeIdRef="org.eclipse.papyrus.SysML14.Rationale"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZr8yuEeSuYbPdZwWlyw" label="View Package" elementTypeIdRef="org.eclipse.papyrus.SysML14.View_Package"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZsMyuEeSuYbPdZwWlyw" label="View Class" elementTypeIdRef="org.eclipse.papyrus.SysML14.View_Class"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZscyuEeSuYbPdZwWlyw" label="Conform Dependency" elementTypeIdRef="org.eclipse.papyrus.SysML14.Conform_Dependency"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZssyuEeSuYbPdZwWlyw" label="Conform Generalization" elementTypeIdRef="org.eclipse.papyrus.SysML14.Conform_Generalization"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZs8yuEeSuYbPdZwWlyw" label="Problem" elementTypeIdRef="org.eclipse.papyrus.SysML14.Problem"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZtMyuEeSuYbPdZwWlyw" label="ViewPoint" elementTypeIdRef="org.eclipse.papyrus.SysML14.ViewPoint"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZtcyuEeSuYbPdZwWlyw" label="Stakeholder" elementTypeIdRef="org.eclipse.papyrus.SysML14.Stakeholder"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZtsyuEeSuYbPdZwWlyw" label="Expose" elementTypeIdRef="org.eclipse.papyrus.SysML14.Expose"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZt8yuEeSuYbPdZwWlyw" label="ElementGroup" elementTypeIdRef="org.eclipse.papyrus.SysML14.ElementGroup"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZuMyuEeSuYbPdZwWlyw" label="ConstraintBlock" elementTypeIdRef="org.eclipse.papyrus.SysML14.ConstraintBlock"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZucyuEeSuYbPdZwWlyw" label="AllocateActivityPartition" elementTypeIdRef="org.eclipse.papyrus.SysML14.AllocateActivityPartition"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZusyuEeSuYbPdZwWlyw" label="Allocate Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.Allocate_Abstraction"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZu8yuEeSuYbPdZwWlyw" label="Allocate DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.Allocate_DirectedRelationship"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZvMyuEeSuYbPdZwWlyw" label="DeriveReqt Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.DeriveReqt_Abstraction"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZvcyuEeSuYbPdZwWlyw" label="DeriveReqt DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.DeriveReqt_DirectedRelationship"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZvsyuEeSuYbPdZwWlyw" label="Copy Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.Copy_Abstraction"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZv8yuEeSuYbPdZwWlyw" label="Copy DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.Copy_DirectedRelationship"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZwMyuEeSuYbPdZwWlyw" label="Satisfy Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.Satisfy_Abstraction"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZwcyuEeSuYbPdZwWlyw" label="Satisfy DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.Satisfy_DirectedRelationship"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZwsyuEeSuYbPdZwWlyw" label="TestCase Operation" elementTypeIdRef="org.eclipse.papyrus.SysML14.TestCase_Operation"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZw8yuEeSuYbPdZwWlyw" label="TestCase Behavior" elementTypeIdRef="org.eclipse.papyrus.SysML14.TestCase_Behavior"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZxMyuEeSuYbPdZwWlyw" label="Requirement" elementTypeIdRef="org.eclipse.papyrus.SysML14.Requirement"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZxcyuEeSuYbPdZwWlyw" label="Verify Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.Verify_Abstraction"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZxsyuEeSuYbPdZwWlyw" label="Verify DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.Verify_DirectedRelationship"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZx8yuEeSuYbPdZwWlyw" label="Trace Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.Trace_Abstraction"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZyMyuEeSuYbPdZwWlyw" label="Trace DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.Trace_DirectedRelationship"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZycyuEeSuYbPdZwWlyw" label="Refine Abstraction" elementTypeIdRef="org.eclipse.papyrus.SysML14.Refine_Abstraction"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZysyuEeSuYbPdZwWlyw" label="Refine DirectedRelationship" elementTypeIdRef="org.eclipse.papyrus.SysML14.Refine_DirectedRelationship"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZy8yuEeSuYbPdZwWlyw" label="FlowPort" elementTypeIdRef="org.eclipse.papyrus.SysML14.FlowPort"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZzMyuEeSuYbPdZwWlyw" label="FlowSpecification" elementTypeIdRef="org.eclipse.papyrus.SysML14.FlowSpecification"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZzcyuEeSuYbPdZwWlyw" label="Allocated" elementTypeIdRef="org.eclipse.papyrus.SysML14.Allocated"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZzsyuEeSuYbPdZwWlyw" label="RequirementRelated" elementTypeIdRef="org.eclipse.papyrus.SysML14.RequirementRelated"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZz8yuEeSuYbPdZwWlyw" label="Deprecated ValueSpecification" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_ValueSpecification"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZ0MyuEeSuYbPdZwWlyw" label="Property (Deprecated)" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_Property"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZ0cyuEeSuYbPdZwWlyw" label="InstanceSpecification(Deprecated)" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_InstanceSpecification"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZ0syuEeSuYbPdZwWlyw" label="Class (Deprecated)" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_Class"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZ08yuEeSuYbPdZwWlyw" label="Association (Deprecated)" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_Association_UML::Association"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZ1MyuEeSuYbPdZwWlyw" label="Generalization (Deprecated)" icon="" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_Generalization"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu" xmi:id="_FUgZ1cyuEeSuYbPdZwWlyw" label="DataType (Deprecated)" elementTypeIdRef="org.eclipse.papyrus.SysML14.Deprecated_DataType"/>
+</ElementCreationMenuModel:Folder>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/SysML1.4.ctx b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/SysML1.4.ctx
new file mode 100644
index 00000000000..7fdfdfb54a7
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/SysML1.4.ctx
@@ -0,0 +1,1242 @@
+<?xml version="1.0" encoding="ASCII"?>
+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_z-Na8M1XEeSGVbFNM4m8gQ" name="SysML 1.4">
+  <dependencies href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_69QJkKDJEeSZxfCXzZz3-w"/>
+  <tabs xmi:id="_2xXfEM1XEeSGVbFNM4m8gQ" label="SysML 1.4" id="osysml14" priority="100">
+    <sections xmi:id="_2xok0M1XEeSGVbFNM4m8gQ" name="Single Allocated" sectionFile="ui/SingleAllocated.xwt">
+      <widget href="ui/SingleAllocated.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xpL4M1XEeSGVbFNM4m8gQ" name="Multiple Allocated" sectionFile="ui/MultipleAllocated.xwt">
+      <widget href="ui/MultipleAllocated.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xpy8M1XEeSGVbFNM4m8gQ" name="Single RequirementRelated" sectionFile="ui/SingleRequirementRelated.xwt">
+      <widget href="ui/SingleRequirementRelated.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xqaAM1XEeSGVbFNM4m8gQ" name="Multiple RequirementRelated" sectionFile="ui/MultipleRequirementRelated.xwt">
+      <widget href="ui/MultipleRequirementRelated.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xs2QM1XEeSGVbFNM4m8gQ" name="Single Deprecated" sectionFile="ui/SingleDeprecated.xwt">
+      <widget href="ui/SingleDeprecated.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xs2Qc1XEeSGVbFNM4m8gQ" name="Multiple Deprecated" sectionFile="ui/MultipleDeprecated.xwt">
+      <widget href="ui/MultipleDeprecated.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xtdUM1XEeSGVbFNM4m8gQ" name="Single FlowSpecification" sectionFile="ui/SingleFlowSpecification.xwt">
+      <widget href="ui/SingleFlowSpecification.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xtdUc1XEeSGVbFNM4m8gQ" name="Multiple FlowSpecification" sectionFile="ui/MultipleFlowSpecification.xwt">
+      <widget href="ui/MultipleFlowSpecification.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xuEYM1XEeSGVbFNM4m8gQ" name="Single FlowPort" sectionFile="ui/SingleFlowPort.xwt">
+      <widget href="ui/SingleFlowPort.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xuEYc1XEeSGVbFNM4m8gQ" name="Multiple FlowPort" sectionFile="ui/MultipleFlowPort.xwt">
+      <widget href="ui/MultipleFlowPort.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xurcM1XEeSGVbFNM4m8gQ" name="Single NestedConnectorEnd" sectionFile="ui/SingleNestedConnectorEnd.xwt">
+      <widget href="ui/SingleNestedConnectorEnd.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xurcc1XEeSGVbFNM4m8gQ" name="Multiple NestedConnectorEnd" sectionFile="ui/MultipleNestedConnectorEnd.xwt">
+      <widget href="ui/MultipleNestedConnectorEnd.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xurcs1XEeSGVbFNM4m8gQ" name="Single BoundReference" sectionFile="ui/SingleBoundReference.xwt">
+      <widget href="ui/SingleBoundReference.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xvSgM1XEeSGVbFNM4m8gQ" name="Multiple BoundReference" sectionFile="ui/MultipleBoundReference.xwt">
+      <widget href="ui/MultipleBoundReference.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xvSgc1XEeSGVbFNM4m8gQ" name="Single ValueType" sectionFile="ui/SingleValueType.xwt">
+      <widget href="ui/SingleValueType.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xv5kM1XEeSGVbFNM4m8gQ" name="Multiple ValueType" sectionFile="ui/MultipleValueType.xwt">
+      <widget href="ui/MultipleValueType.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xv5kc1XEeSGVbFNM4m8gQ" name="Single PropertySpecificType" sectionFile="ui/SinglePropertySpecificType.xwt">
+      <widget href="ui/SinglePropertySpecificType.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xv5ks1XEeSGVbFNM4m8gQ" name="Multiple PropertySpecificType" sectionFile="ui/MultiplePropertySpecificType.xwt">
+      <widget href="ui/MultiplePropertySpecificType.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xwgoM1XEeSGVbFNM4m8gQ" name="Single Block" sectionFile="ui/SingleBlock.xwt">
+      <widget href="ui/SingleBlock.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xxHsM1XEeSGVbFNM4m8gQ" name="Multiple Block" sectionFile="ui/MultipleBlock.xwt">
+      <widget href="ui/MultipleBlock.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xxHsc1XEeSGVbFNM4m8gQ" name="Single BindingConnector" sectionFile="ui/SingleBindingConnector.xwt">
+      <widget href="ui/SingleBindingConnector.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xxHss1XEeSGVbFNM4m8gQ" name="Multiple BindingConnector" sectionFile="ui/MultipleBindingConnector.xwt">
+      <widget href="ui/MultipleBindingConnector.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xxHs81XEeSGVbFNM4m8gQ" name="Single DistributedProperty" sectionFile="ui/SingleDistributedProperty.xwt">
+      <widget href="ui/SingleDistributedProperty.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xxuwM1XEeSGVbFNM4m8gQ" name="Multiple DistributedProperty" sectionFile="ui/MultipleDistributedProperty.xwt">
+      <widget href="ui/MultipleDistributedProperty.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xxuwc1XEeSGVbFNM4m8gQ" name="Single ElementPropertyPath" sectionFile="ui/SingleElementPropertyPath.xwt">
+      <widget href="ui/SingleElementPropertyPath.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xxuws1XEeSGVbFNM4m8gQ" name="Multiple ElementPropertyPath" sectionFile="ui/MultipleElementPropertyPath.xwt">
+      <widget href="ui/MultipleElementPropertyPath.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xyV0M1XEeSGVbFNM4m8gQ" name="Single EndPathMultiplicity" sectionFile="ui/SingleEndPathMultiplicity.xwt">
+      <widget href="ui/SingleEndPathMultiplicity.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xy84M1XEeSGVbFNM4m8gQ" name="Multiple EndPathMultiplicity" sectionFile="ui/MultipleEndPathMultiplicity.xwt">
+      <widget href="ui/MultipleEndPathMultiplicity.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xy84c1XEeSGVbFNM4m8gQ" name="Single ConnectorProperty" sectionFile="ui/SingleConnectorProperty.xwt">
+      <widget href="ui/SingleConnectorProperty.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xzj8M1XEeSGVbFNM4m8gQ" name="Multiple ConnectorProperty" sectionFile="ui/MultipleConnectorProperty.xwt">
+      <widget href="ui/MultipleConnectorProperty.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xzj8c1XEeSGVbFNM4m8gQ" name="Single ClassifierBehaviorProperty" sectionFile="ui/SingleClassifierBehaviorProperty.xwt">
+      <widget href="ui/SingleClassifierBehaviorProperty.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2xzj8s1XEeSGVbFNM4m8gQ" name="Multiple ClassifierBehaviorProperty" sectionFile="ui/MultipleClassifierBehaviorProperty.xwt">
+      <widget href="ui/MultipleClassifierBehaviorProperty.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x0LAM1XEeSGVbFNM4m8gQ" name="Single DirectedRelationshipPropertyPath" sectionFile="ui/SingleDirectedRelationshipPropertyPath.xwt">
+      <widget href="ui/SingleDirectedRelationshipPropertyPath.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x0yEM1XEeSGVbFNM4m8gQ" name="Multiple DirectedRelationshipPropertyPath" sectionFile="ui/MultipleDirectedRelationshipPropertyPath.xwt">
+      <widget href="ui/MultipleDirectedRelationshipPropertyPath.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x0yEc1XEeSGVbFNM4m8gQ" name="Single AdjunctProperty" sectionFile="ui/SingleAdjunctProperty.xwt">
+      <widget href="ui/SingleAdjunctProperty.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x1ZIM1XEeSGVbFNM4m8gQ" name="Multiple AdjunctProperty" sectionFile="ui/MultipleAdjunctProperty.xwt">
+      <widget href="ui/MultipleAdjunctProperty.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x1ZIc1XEeSGVbFNM4m8gQ" name="Single ParticipantProperty" sectionFile="ui/SingleParticipantProperty.xwt">
+      <widget href="ui/SingleParticipantProperty.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x1ZIs1XEeSGVbFNM4m8gQ" name="Multiple ParticipantProperty" sectionFile="ui/MultipleParticipantProperty.xwt">
+      <widget href="ui/MultipleParticipantProperty.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x2nQM1XEeSGVbFNM4m8gQ" name="Single Requirement" sectionFile="ui/SingleRequirement.xwt">
+      <widget href="ui/SingleRequirement.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x3OUM1XEeSGVbFNM4m8gQ" name="Multiple Requirement" sectionFile="ui/MultipleRequirement.xwt">
+      <widget href="ui/MultipleRequirement.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x3OUc1XEeSGVbFNM4m8gQ" name="Single Trace" sectionFile="ui/SingleTrace.xwt">
+      <widget href="ui/SingleTrace.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x3OUs1XEeSGVbFNM4m8gQ" name="Multiple Trace" sectionFile="ui/MultipleTrace.xwt">
+      <widget href="ui/MultipleTrace.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x3OU81XEeSGVbFNM4m8gQ" name="Single Copy" sectionFile="ui/SingleCopy.xwt">
+      <widget href="ui/SingleCopy.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x31YM1XEeSGVbFNM4m8gQ" name="Multiple Copy" sectionFile="ui/MultipleCopy.xwt">
+      <widget href="ui/MultipleCopy.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x31Yc1XEeSGVbFNM4m8gQ" name="Single Verify" sectionFile="ui/SingleVerify.xwt">
+      <widget href="ui/SingleVerify.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x31Ys1XEeSGVbFNM4m8gQ" name="Multiple Verify" sectionFile="ui/MultipleVerify.xwt">
+      <widget href="ui/MultipleVerify.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x4ccM1XEeSGVbFNM4m8gQ" name="Single TestCase" sectionFile="ui/SingleTestCase.xwt">
+      <widget href="ui/SingleTestCase.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x4ccc1XEeSGVbFNM4m8gQ" name="Multiple TestCase" sectionFile="ui/MultipleTestCase.xwt">
+      <widget href="ui/MultipleTestCase.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x4ccs1XEeSGVbFNM4m8gQ" name="Single Refine" sectionFile="ui/SingleRefine.xwt">
+      <widget href="ui/SingleRefine.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x4cc81XEeSGVbFNM4m8gQ" name="Multiple Refine" sectionFile="ui/MultipleRefine.xwt">
+      <widget href="ui/MultipleRefine.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x5DgM1XEeSGVbFNM4m8gQ" name="Single Satisfy" sectionFile="ui/SingleSatisfy.xwt">
+      <widget href="ui/SingleSatisfy.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x5Dgc1XEeSGVbFNM4m8gQ" name="Multiple Satisfy" sectionFile="ui/MultipleSatisfy.xwt">
+      <widget href="ui/MultipleSatisfy.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x5Dgs1XEeSGVbFNM4m8gQ" name="Single DeriveReqt" sectionFile="ui/SingleDeriveReqt.xwt">
+      <widget href="ui/SingleDeriveReqt.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x5Dg81XEeSGVbFNM4m8gQ" name="Multiple DeriveReqt" sectionFile="ui/MultipleDeriveReqt.xwt">
+      <widget href="ui/MultipleDeriveReqt.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x5DhM1XEeSGVbFNM4m8gQ" name="Single ConstraintBlock" sectionFile="ui/SingleConstraintBlock.xwt">
+      <widget href="ui/SingleConstraintBlock.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x5qkM1XEeSGVbFNM4m8gQ" name="Multiple ConstraintBlock" sectionFile="ui/MultipleConstraintBlock.xwt">
+      <widget href="ui/MultipleConstraintBlock.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x5qkc1XEeSGVbFNM4m8gQ" name="Single DirectedFeature" sectionFile="ui/SingleDirectedFeature.xwt">
+      <widget href="ui/SingleDirectedFeature.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x6RoM1XEeSGVbFNM4m8gQ" name="Multiple DirectedFeature" sectionFile="ui/MultipleDirectedFeature.xwt">
+      <widget href="ui/MultipleDirectedFeature.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x6Roc1XEeSGVbFNM4m8gQ" name="Single FlowProperty" sectionFile="ui/SingleFlowProperty.xwt">
+      <widget href="ui/SingleFlowProperty.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x64sM1XEeSGVbFNM4m8gQ" name="Multiple FlowProperty" sectionFile="ui/MultipleFlowProperty.xwt">
+      <widget href="ui/MultipleFlowProperty.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x64sc1XEeSGVbFNM4m8gQ" name="Single AcceptChangeStructuralFeatureEventAction" sectionFile="ui/SingleAcceptChangeStructuralFeatureEventAction.xwt">
+      <widget href="ui/SingleAcceptChangeStructuralFeatureEventAction.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x64ss1XEeSGVbFNM4m8gQ" name="Multiple AcceptChangeStructuralFeatureEventAction" sectionFile="ui/MultipleAcceptChangeStructuralFeatureEventAction.xwt">
+      <widget href="ui/MultipleAcceptChangeStructuralFeatureEventAction.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x7fwM1XEeSGVbFNM4m8gQ" name="Single TriggerOnNestedPort" sectionFile="ui/SingleTriggerOnNestedPort.xwt">
+      <widget href="ui/SingleTriggerOnNestedPort.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x7fwc1XEeSGVbFNM4m8gQ" name="Multiple TriggerOnNestedPort" sectionFile="ui/MultipleTriggerOnNestedPort.xwt">
+      <widget href="ui/MultipleTriggerOnNestedPort.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x7fws1XEeSGVbFNM4m8gQ" name="Single FullPort" sectionFile="ui/SingleFullPort.xwt">
+      <widget href="ui/SingleFullPort.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x8G0M1XEeSGVbFNM4m8gQ" name="Multiple FullPort" sectionFile="ui/MultipleFullPort.xwt">
+      <widget href="ui/MultipleFullPort.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x8t4M1XEeSGVbFNM4m8gQ" name="Single InterfaceBlock" sectionFile="ui/SingleInterfaceBlock.xwt">
+      <widget href="ui/SingleInterfaceBlock.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x8t4c1XEeSGVbFNM4m8gQ" name="Multiple InterfaceBlock" sectionFile="ui/MultipleInterfaceBlock.xwt">
+      <widget href="ui/MultipleInterfaceBlock.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x8t4s1XEeSGVbFNM4m8gQ" name="Single InvocationOnNestedPortAction" sectionFile="ui/SingleInvocationOnNestedPortAction.xwt">
+      <widget href="ui/SingleInvocationOnNestedPortAction.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x8t481XEeSGVbFNM4m8gQ" name="Multiple InvocationOnNestedPortAction" sectionFile="ui/MultipleInvocationOnNestedPortAction.xwt">
+      <widget href="ui/MultipleInvocationOnNestedPortAction.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x9U8M1XEeSGVbFNM4m8gQ" name="Single ProxyPort" sectionFile="ui/SingleProxyPort.xwt">
+      <widget href="ui/SingleProxyPort.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x9U8c1XEeSGVbFNM4m8gQ" name="Multiple ProxyPort" sectionFile="ui/MultipleProxyPort.xwt">
+      <widget href="ui/MultipleProxyPort.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x9U8s1XEeSGVbFNM4m8gQ" name="Single ChangeStructuralFeatureEvent" sectionFile="ui/SingleChangeStructuralFeatureEvent.xwt">
+      <widget href="ui/SingleChangeStructuralFeatureEvent.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x9U881XEeSGVbFNM4m8gQ" name="Multiple ChangeStructuralFeatureEvent" sectionFile="ui/MultipleChangeStructuralFeatureEvent.xwt">
+      <widget href="ui/MultipleChangeStructuralFeatureEvent.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x98AM1XEeSGVbFNM4m8gQ" name="Single ItemFlow" sectionFile="ui/SingleItemFlow.xwt">
+      <widget href="ui/SingleItemFlow.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x98Ac1XEeSGVbFNM4m8gQ" name="Multiple ItemFlow" sectionFile="ui/MultipleItemFlow.xwt">
+      <widget href="ui/MultipleItemFlow.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x98As1XEeSGVbFNM4m8gQ" name="Single NoBuffer" sectionFile="ui/SingleNoBuffer.xwt">
+      <widget href="ui/SingleNoBuffer.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x98A81XEeSGVbFNM4m8gQ" name="Multiple NoBuffer" sectionFile="ui/MultipleNoBuffer.xwt">
+      <widget href="ui/MultipleNoBuffer.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x98BM1XEeSGVbFNM4m8gQ" name="Single ControlOperator" sectionFile="ui/SingleControlOperator.xwt">
+      <widget href="ui/SingleControlOperator.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x-jEM1XEeSGVbFNM4m8gQ" name="Multiple ControlOperator" sectionFile="ui/MultipleControlOperator.xwt">
+      <widget href="ui/MultipleControlOperator.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x-jEc1XEeSGVbFNM4m8gQ" name="Single Continuous" sectionFile="ui/SingleContinuous.xwt">
+      <widget href="ui/SingleContinuous.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x-jEs1XEeSGVbFNM4m8gQ" name="Multiple Continuous" sectionFile="ui/MultipleContinuous.xwt">
+      <widget href="ui/MultipleContinuous.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x-jE81XEeSGVbFNM4m8gQ" name="Single Overwrite" sectionFile="ui/SingleOverwrite.xwt">
+      <widget href="ui/SingleOverwrite.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x-jFM1XEeSGVbFNM4m8gQ" name="Multiple Overwrite" sectionFile="ui/MultipleOverwrite.xwt">
+      <widget href="ui/MultipleOverwrite.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x-jFc1XEeSGVbFNM4m8gQ" name="Single Discrete" sectionFile="ui/SingleDiscrete.xwt">
+      <widget href="ui/SingleDiscrete.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x_KIM1XEeSGVbFNM4m8gQ" name="Multiple Discrete" sectionFile="ui/MultipleDiscrete.xwt">
+      <widget href="ui/MultipleDiscrete.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x_xMM1XEeSGVbFNM4m8gQ" name="Single Optional" sectionFile="ui/SingleOptional.xwt">
+      <widget href="ui/SingleOptional.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2x_xMc1XEeSGVbFNM4m8gQ" name="Multiple Optional" sectionFile="ui/MultipleOptional.xwt">
+      <widget href="ui/MultipleOptional.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yAYQM1XEeSGVbFNM4m8gQ" name="Single Rate" sectionFile="ui/SingleRate.xwt">
+      <widget href="ui/SingleRate.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yAYQc1XEeSGVbFNM4m8gQ" name="Multiple Rate" sectionFile="ui/MultipleRate.xwt">
+      <widget href="ui/MultipleRate.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yAYQs1XEeSGVbFNM4m8gQ" name="Single Probability" sectionFile="ui/SingleProbability.xwt">
+      <widget href="ui/SingleProbability.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yAYQ81XEeSGVbFNM4m8gQ" name="Multiple Probability" sectionFile="ui/MultipleProbability.xwt">
+      <widget href="ui/MultipleProbability.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yAYRM1XEeSGVbFNM4m8gQ" name="Single AllocateActivityPartition" sectionFile="ui/SingleAllocateActivityPartition.xwt">
+      <widget href="ui/SingleAllocateActivityPartition.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yA_UM1XEeSGVbFNM4m8gQ" name="Multiple AllocateActivityPartition" sectionFile="ui/MultipleAllocateActivityPartition.xwt">
+      <widget href="ui/MultipleAllocateActivityPartition.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yA_Uc1XEeSGVbFNM4m8gQ" name="Single Allocate" sectionFile="ui/SingleAllocate.xwt">
+      <widget href="ui/SingleAllocate.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yA_Us1XEeSGVbFNM4m8gQ" name="Multiple Allocate" sectionFile="ui/MultipleAllocate.xwt">
+      <widget href="ui/MultipleAllocate.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yA_U81XEeSGVbFNM4m8gQ" name="Single Problem" sectionFile="ui/SingleProblem.xwt">
+      <widget href="ui/SingleProblem.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yA_VM1XEeSGVbFNM4m8gQ" name="Multiple Problem" sectionFile="ui/MultipleProblem.xwt">
+      <widget href="ui/MultipleProblem.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yA_Vc1XEeSGVbFNM4m8gQ" name="Single Conform" sectionFile="ui/SingleConform.xwt">
+      <widget href="ui/SingleConform.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yA_Vs1XEeSGVbFNM4m8gQ" name="Multiple Conform" sectionFile="ui/MultipleConform.xwt">
+      <widget href="ui/MultipleConform.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yBmYM1XEeSGVbFNM4m8gQ" name="Single ViewPoint" sectionFile="ui/SingleViewPoint.xwt">
+      <widget href="ui/SingleViewPoint.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yBmYc1XEeSGVbFNM4m8gQ" name="Multiple ViewPoint" sectionFile="ui/MultipleViewPoint.xwt">
+      <widget href="ui/MultipleViewPoint.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yCNcM1XEeSGVbFNM4m8gQ" name="Single View" sectionFile="ui/SingleView.xwt">
+      <widget href="ui/SingleView.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yCNcc1XEeSGVbFNM4m8gQ" name="Multiple View" sectionFile="ui/MultipleView.xwt">
+      <widget href="ui/MultipleView.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yCNcs1XEeSGVbFNM4m8gQ" name="Single ElementGroup" sectionFile="ui/SingleElementGroup.xwt">
+      <widget href="ui/SingleElementGroup.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yC0gM1XEeSGVbFNM4m8gQ" name="Multiple ElementGroup" sectionFile="ui/MultipleElementGroup.xwt">
+      <widget href="ui/MultipleElementGroup.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yC0gc1XEeSGVbFNM4m8gQ" name="Single Expose" sectionFile="ui/SingleExpose.xwt">
+      <widget href="ui/SingleExpose.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yC0gs1XEeSGVbFNM4m8gQ" name="Multiple Expose" sectionFile="ui/MultipleExpose.xwt">
+      <widget href="ui/MultipleExpose.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yC0g81XEeSGVbFNM4m8gQ" name="Single Stakeholder" sectionFile="ui/SingleStakeholder.xwt">
+      <widget href="ui/SingleStakeholder.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yC0hM1XEeSGVbFNM4m8gQ" name="Multiple Stakeholder" sectionFile="ui/MultipleStakeholder.xwt">
+      <widget href="ui/MultipleStakeholder.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yDbkM1XEeSGVbFNM4m8gQ" name="Single Rationale" sectionFile="ui/SingleRationale.xwt">
+      <widget href="ui/SingleRationale.xwt#/"/>
+    </sections>
+    <sections xmi:id="_2yDbkc1XEeSGVbFNM4m8gQ" name="Multiple Rationale" sectionFile="ui/MultipleRationale.xwt">
+      <widget href="ui/MultipleRationale.xwt#/"/>
+    </sections>
+  </tabs>
+  <views xmi:id="_z-OCAM1XEeSGVbFNM4m8gQ" name="Single Allocated" sections="_2xok0M1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODYM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCAc1XEeSGVbFNM4m8gQ" name="isSingleAllocated">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCAs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::DeprecatedElements::Allocated"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCA81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Allocated" sections="_2xpL4M1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODYM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCBM1XEeSGVbFNM4m8gQ" name="isMultipleAllocated">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCBc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::DeprecatedElements::Allocated"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCBs1XEeSGVbFNM4m8gQ" name="Single RequirementRelated" sections="_2xpy8M1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODY81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCB81XEeSGVbFNM4m8gQ" name="isSingleRequirementRelated">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCCM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::DeprecatedElements::RequirementRelated"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCCc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple RequirementRelated" sections="_2xqaAM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODY81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCCs1XEeSGVbFNM4m8gQ" name="isMultipleRequirementRelated">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCC81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::DeprecatedElements::RequirementRelated"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCDM1XEeSGVbFNM4m8gQ" name="Single Deprecated" sections="_2xs2QM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODac1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCDc1XEeSGVbFNM4m8gQ" name="isSingleDeprecated">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCDs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::DeprecatedElements::Deprecated"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCD81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Deprecated" sections="_2xs2Qc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODac1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCEM1XEeSGVbFNM4m8gQ" name="isMultipleDeprecated">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCEc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::DeprecatedElements::Deprecated"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCEs1XEeSGVbFNM4m8gQ" name="Single FlowSpecification" sections="_2xtdUM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODaM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCE81XEeSGVbFNM4m8gQ" name="isSingleFlowSpecification">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCFM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::DeprecatedElements::FlowSpecification"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCFc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple FlowSpecification" sections="_2xtdUc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODaM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCFs1XEeSGVbFNM4m8gQ" name="isMultipleFlowSpecification">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCF81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::DeprecatedElements::FlowSpecification"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCGM1XEeSGVbFNM4m8gQ" name="Single FlowPort" sections="_2xuEYM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODa81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCGc1XEeSGVbFNM4m8gQ" name="isSingleFlowPort">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCGs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::DeprecatedElements::FlowPort"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCG81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple FlowPort" sections="_2xuEYc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODa81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCHM1XEeSGVbFNM4m8gQ" name="isMultipleFlowPort">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCHc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::DeprecatedElements::FlowPort"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCHs1XEeSGVbFNM4m8gQ" name="Single NestedConnectorEnd" sections="_2xurcM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODpc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCH81XEeSGVbFNM4m8gQ" name="isSingleNestedConnectorEnd">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCIM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::NestedConnectorEnd"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCIc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple NestedConnectorEnd" sections="_2xurcc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODpc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCIs1XEeSGVbFNM4m8gQ" name="isMultipleNestedConnectorEnd">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCI81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::NestedConnectorEnd"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCJM1XEeSGVbFNM4m8gQ" name="Single BoundReference" sections="_2xurcs1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODsM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCJc1XEeSGVbFNM4m8gQ" name="isSingleBoundReference">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCJs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::BoundReference"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCJ81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple BoundReference" sections="_2xvSgM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODsM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCKM1XEeSGVbFNM4m8gQ" name="isMultipleBoundReference">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCKc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::BoundReference"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCKs1XEeSGVbFNM4m8gQ" name="Single ValueType" sections="_2xvSgc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODts1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCK81XEeSGVbFNM4m8gQ" name="isSingleValueType">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCLM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::ValueType"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCLc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple ValueType" sections="_2xv5kM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODts1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCLs1XEeSGVbFNM4m8gQ" name="isMultipleValueType">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCL81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::ValueType"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCMM1XEeSGVbFNM4m8gQ" name="Single PropertySpecificType" sections="_2xv5kc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODoM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCMc1XEeSGVbFNM4m8gQ" name="isSinglePropertySpecificType">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCMs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::PropertySpecificType"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCM81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple PropertySpecificType" sections="_2xv5ks1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODoM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCNM1XEeSGVbFNM4m8gQ" name="isMultiplePropertySpecificType">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCNc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::PropertySpecificType"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCNs1XEeSGVbFNM4m8gQ" name="Single Block" sections="_2xwgoM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODrs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_9QI7YM7uEeSvDdRKNsUTWQ" name="isBlock">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCOM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::Block"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCOc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Block" sections="_2xxHsM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODrs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCOs1XEeSGVbFNM4m8gQ" name="isMultipleBlock">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCO81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::Block"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCPM1XEeSGVbFNM4m8gQ" name="Single BindingConnector" sections="_2xxHsc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODtc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCPc1XEeSGVbFNM4m8gQ" name="isSingleBindingConnector">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCPs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::BindingConnector"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCP81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple BindingConnector" sections="_2xxHss1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODtc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCQM1XEeSGVbFNM4m8gQ" name="isMultipleBindingConnector">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCQc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::BindingConnector"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCQs1XEeSGVbFNM4m8gQ" name="Single DistributedProperty" sections="_2xxHs81XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODnM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCQ81XEeSGVbFNM4m8gQ" name="isSingleDistributedProperty">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCRM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::DistributedProperty"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCRc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple DistributedProperty" sections="_2xxuwM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODnM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCRs1XEeSGVbFNM4m8gQ" name="isMultipleDistributedProperty">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCR81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::DistributedProperty"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCSM1XEeSGVbFNM4m8gQ" name="Single ElementPropertyPath" sections="_2xxuwc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODs81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCSc1XEeSGVbFNM4m8gQ" name="isSingleElementPropertyPath">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCSs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::ElementPropertyPath"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCS81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple ElementPropertyPath" sections="_2xxuws1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODs81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCTM1XEeSGVbFNM4m8gQ" name="isMultipleElementPropertyPath">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCTc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::ElementPropertyPath"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCTs1XEeSGVbFNM4m8gQ" name="Single EndPathMultiplicity" sections="_2xyV0M1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODnc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCT81XEeSGVbFNM4m8gQ" name="isSingleEndPathMultiplicity">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCUM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::EndPathMultiplicity"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCUc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple EndPathMultiplicity" sections="_2xy84M1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODnc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCUs1XEeSGVbFNM4m8gQ" name="isMultipleEndPathMultiplicity">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCU81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::EndPathMultiplicity"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCVM1XEeSGVbFNM4m8gQ" name="Single ConnectorProperty" sections="_2xy84c1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODoc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCVc1XEeSGVbFNM4m8gQ" name="isSingleConnectorProperty">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCVs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::ConnectorProperty"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCV81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple ConnectorProperty" sections="_2xzj8M1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODoc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCWM1XEeSGVbFNM4m8gQ" name="isMultipleConnectorProperty">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCWc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::ConnectorProperty"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCWs1XEeSGVbFNM4m8gQ" name="Single ClassifierBehaviorProperty" sections="_2xzj8c1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODrc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCW81XEeSGVbFNM4m8gQ" name="isSingleClassifierBehaviorProperty">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCXM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::ClassifierBehaviorProperty"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCXc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple ClassifierBehaviorProperty" sections="_2xzj8s1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODrc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCXs1XEeSGVbFNM4m8gQ" name="isMultipleClassifierBehaviorProperty">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCX81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::ClassifierBehaviorProperty"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCYM1XEeSGVbFNM4m8gQ" name="Single DirectedRelationshipPropertyPath" sections="_2x0LAM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODps1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCYc1XEeSGVbFNM4m8gQ" name="isSingleDirectedRelationshipPropertyPath">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCYs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::DirectedRelationshipPropertyPath"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCY81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple DirectedRelationshipPropertyPath" sections="_2x0yEM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODps1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCZM1XEeSGVbFNM4m8gQ" name="isMultipleDirectedRelationshipPropertyPath">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCZc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::DirectedRelationshipPropertyPath"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCZs1XEeSGVbFNM4m8gQ" name="Single AdjunctProperty" sections="_2x0yEc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODq81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCZ81XEeSGVbFNM4m8gQ" name="isSingleAdjunctProperty">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCaM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::AdjunctProperty"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCac1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple AdjunctProperty" sections="_2x1ZIM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODq81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCas1XEeSGVbFNM4m8gQ" name="isMultipleAdjunctProperty">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCa81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::AdjunctProperty"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCbM1XEeSGVbFNM4m8gQ" name="Single ParticipantProperty" sections="_2x1ZIc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODo81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCbc1XEeSGVbFNM4m8gQ" name="isSingleParticipantProperty">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCbs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::ParticipantProperty"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCb81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple ParticipantProperty" sections="_2x1ZIs1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODo81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCcM1XEeSGVbFNM4m8gQ" name="isMultipleParticipantProperty">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCcc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Blocks::ParticipantProperty"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCcs1XEeSGVbFNM4m8gQ" name="Single Requirement" sections="_2x2nQM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODvs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCc81XEeSGVbFNM4m8gQ" name="isSingleRequirement">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCdM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::Requirement"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCdc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Requirement" sections="_2x3OUM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODvs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCds1XEeSGVbFNM4m8gQ" name="isMultipleRequirement">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCd81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::Requirement"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCeM1XEeSGVbFNM4m8gQ" name="Single Trace" sections="_2x3OUc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODyM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCec1XEeSGVbFNM4m8gQ" name="isSingleTrace">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCes1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::Trace"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCe81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Trace" sections="_2x3OUs1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODyM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCfM1XEeSGVbFNM4m8gQ" name="isMultipleTrace">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCfc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::Trace"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCfs1XEeSGVbFNM4m8gQ" name="Single Copy" sections="_2x3OU81XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODyc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCf81XEeSGVbFNM4m8gQ" name="isSingleCopy">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCgM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::Copy"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCgc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Copy" sections="_2x31YM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODyc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCgs1XEeSGVbFNM4m8gQ" name="isMultipleCopy">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCg81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::Copy"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OChM1XEeSGVbFNM4m8gQ" name="Single Verify" sections="_2x31Yc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODys1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OChc1XEeSGVbFNM4m8gQ" name="isSingleVerify">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OChs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::Verify"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCh81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Verify" sections="_2x31Ys1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODys1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCiM1XEeSGVbFNM4m8gQ" name="isMultipleVerify">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCic1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::Verify"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCis1XEeSGVbFNM4m8gQ" name="Single TestCase" sections="_2x4ccM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODvM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCi81XEeSGVbFNM4m8gQ" name="isSingleTestCase">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCjM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::TestCase"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCjc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple TestCase" sections="_2x4ccc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODvM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCjs1XEeSGVbFNM4m8gQ" name="isMultipleTestCase">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCj81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::TestCase"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCkM1XEeSGVbFNM4m8gQ" name="Single Refine" sections="_2x4ccs1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODvc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCkc1XEeSGVbFNM4m8gQ" name="isSingleRefine">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCks1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::Refine"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCk81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Refine" sections="_2x4cc81XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODvc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OClM1XEeSGVbFNM4m8gQ" name="isMultipleRefine">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OClc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::Refine"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCls1XEeSGVbFNM4m8gQ" name="Single Satisfy" sections="_2x5DgM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODu81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCl81XEeSGVbFNM4m8gQ" name="isSingleSatisfy">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCmM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::Satisfy"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCmc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Satisfy" sections="_2x5Dgc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODu81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCms1XEeSGVbFNM4m8gQ" name="isMultipleSatisfy">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCm81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::Satisfy"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCnM1XEeSGVbFNM4m8gQ" name="Single DeriveReqt" sections="_2x5Dgs1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODus1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCnc1XEeSGVbFNM4m8gQ" name="isSingleDeriveReqt">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCns1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::DeriveReqt"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCn81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple DeriveReqt" sections="_2x5Dg81XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODus1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCoM1XEeSGVbFNM4m8gQ" name="isMultipleDeriveReqt">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCoc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Requirements::DeriveReqt"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCos1XEeSGVbFNM4m8gQ" name="Single ConstraintBlock" sections="_2x5DhM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODb81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCo81XEeSGVbFNM4m8gQ" name="isSingleConstraintBlock">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCpM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ConstraintBlocks::ConstraintBlock"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCpc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple ConstraintBlock" sections="_2x5qkM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODb81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCps1XEeSGVbFNM4m8gQ" name="isMultipleConstraintBlock">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCp81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ConstraintBlocks::ConstraintBlock"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCqM1XEeSGVbFNM4m8gQ" name="Single DirectedFeature" sections="_2x5qkc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODc81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCqc1XEeSGVbFNM4m8gQ" name="isSingleDirectedFeature">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCqs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::DirectedFeature"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCq81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple DirectedFeature" sections="_2x6RoM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODc81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCrM1XEeSGVbFNM4m8gQ" name="isMultipleDirectedFeature">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCrc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::DirectedFeature"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCrs1XEeSGVbFNM4m8gQ" name="Single FlowProperty" sections="_2x6Roc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODcc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCr81XEeSGVbFNM4m8gQ" name="isSingleFlowProperty">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCsM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::FlowProperty"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCsc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple FlowProperty" sections="_2x64sM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODcc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCss1XEeSGVbFNM4m8gQ" name="isMultipleFlowProperty">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCs81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::FlowProperty"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCtM1XEeSGVbFNM4m8gQ" name="Single AcceptChangeStructuralFeatureEventAction" sections="_2x64sc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODfM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCtc1XEeSGVbFNM4m8gQ" name="isSingleAcceptChangeStructuralFeatureEventAction">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCts1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::AcceptChangeStructuralFeatureEventAction"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCt81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple AcceptChangeStructuralFeatureEventAction" sections="_2x64ss1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODfM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCuM1XEeSGVbFNM4m8gQ" name="isMultipleAcceptChangeStructuralFeatureEventAction">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCuc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::AcceptChangeStructuralFeatureEventAction"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCus1XEeSGVbFNM4m8gQ" name="Single TriggerOnNestedPort" sections="_2x7fwM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODfs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCu81XEeSGVbFNM4m8gQ" name="isSingleTriggerOnNestedPort">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCvM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::TriggerOnNestedPort"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCvc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple TriggerOnNestedPort" sections="_2x7fwc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODfs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCvs1XEeSGVbFNM4m8gQ" name="isMultipleTriggerOnNestedPort">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCv81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::TriggerOnNestedPort"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCwM1XEeSGVbFNM4m8gQ" name="Single FullPort" sections="_2x7fws1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODfc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCwc1XEeSGVbFNM4m8gQ" name="isSingleFullPort">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCws1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::FullPort"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCw81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple FullPort" sections="_2x8G0M1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODfc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCxM1XEeSGVbFNM4m8gQ" name="isMultipleFullPort">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCxc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::FullPort"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCxs1XEeSGVbFNM4m8gQ" name="Single InterfaceBlock" sections="_2x8t4M1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODgM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCx81XEeSGVbFNM4m8gQ" name="isSingleInterfaceBlock">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCyM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::InterfaceBlock"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCyc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple InterfaceBlock" sections="_2x8t4c1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODgM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCys1XEeSGVbFNM4m8gQ" name="isMultipleInterfaceBlock">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCy81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::InterfaceBlock"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCzM1XEeSGVbFNM4m8gQ" name="Single InvocationOnNestedPortAction" sections="_2x8t4s1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODd81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OCzc1XEeSGVbFNM4m8gQ" name="isSingleInvocationOnNestedPortAction">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OCzs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::InvocationOnNestedPortAction"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OCz81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple InvocationOnNestedPortAction" sections="_2x8t481XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODd81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC0M1XEeSGVbFNM4m8gQ" name="isMultipleInvocationOnNestedPortAction">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC0c1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::InvocationOnNestedPortAction"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC0s1XEeSGVbFNM4m8gQ" name="Single ProxyPort" sections="_2x9U8M1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODe81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC081XEeSGVbFNM4m8gQ" name="isSingleProxyPort">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC1M1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::ProxyPort"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC1c1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple ProxyPort" sections="_2x9U8c1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODe81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC1s1XEeSGVbFNM4m8gQ" name="isMultipleProxyPort">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC181XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::ProxyPort"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC2M1XEeSGVbFNM4m8gQ" name="Single ChangeStructuralFeatureEvent" sections="_2x9U8s1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODdc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC2c1XEeSGVbFNM4m8gQ" name="isSingleChangeStructuralFeatureEvent">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC2s1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::ChangeStructuralFeatureEvent"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC281XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple ChangeStructuralFeatureEvent" sections="_2x9U881XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODdc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC3M1XEeSGVbFNM4m8gQ" name="isMultipleChangeStructuralFeatureEvent">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC3c1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::ChangeStructuralFeatureEvent"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC3s1XEeSGVbFNM4m8gQ" name="Single ItemFlow" sections="_2x98AM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODec1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC381XEeSGVbFNM4m8gQ" name="isSingleItemFlow">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC4M1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::ItemFlow"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC4c1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple ItemFlow" sections="_2x98Ac1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODec1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC4s1XEeSGVbFNM4m8gQ" name="isMultipleItemFlow">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC481XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::PortsandFlows::ItemFlow"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC5M1XEeSGVbFNM4m8gQ" name="Single NoBuffer" sections="_2x98As1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODW81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC5c1XEeSGVbFNM4m8gQ" name="isSingleNoBuffer">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC5s1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::NoBuffer"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC581XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple NoBuffer" sections="_2x98A81XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODW81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC6M1XEeSGVbFNM4m8gQ" name="isMultipleNoBuffer">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC6c1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::NoBuffer"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC6s1XEeSGVbFNM4m8gQ" name="Single ControlOperator" sections="_2x98BM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODVM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC681XEeSGVbFNM4m8gQ" name="isSingleControlOperator">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC7M1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::ControlOperator"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC7c1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple ControlOperator" sections="_2x-jEM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODVM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC7s1XEeSGVbFNM4m8gQ" name="isMultipleControlOperator">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC781XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::ControlOperator"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC8M1XEeSGVbFNM4m8gQ" name="Single Continuous" sections="_2x-jEc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODVc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC8c1XEeSGVbFNM4m8gQ" name="isSingleContinuous">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC8s1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::Continuous"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC881XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Continuous" sections="_2x-jEs1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODVc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC9M1XEeSGVbFNM4m8gQ" name="isMultipleContinuous">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC9c1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::Continuous"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC9s1XEeSGVbFNM4m8gQ" name="Single Overwrite" sections="_2x-jE81XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODU81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC981XEeSGVbFNM4m8gQ" name="isSingleOverwrite">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC-M1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::Overwrite"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC-c1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Overwrite" sections="_2x-jFM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODU81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC-s1XEeSGVbFNM4m8gQ" name="isMultipleOverwrite">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC-81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::Overwrite"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC_M1XEeSGVbFNM4m8gQ" name="Single Discrete" sections="_2x-jFc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODUs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-OC_c1XEeSGVbFNM4m8gQ" name="isSingleDiscrete">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-OC_s1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::Discrete"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-OC_81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Discrete" sections="_2x_KIM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODUs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODAM1XEeSGVbFNM4m8gQ" name="isMultipleDiscrete">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODAc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::Discrete"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODAs1XEeSGVbFNM4m8gQ" name="Single Optional" sections="_2x_xMM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODWM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODA81XEeSGVbFNM4m8gQ" name="isSingleOptional">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODBM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::Optional"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODBc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Optional" sections="_2x_xMc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODWM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODBs1XEeSGVbFNM4m8gQ" name="isMultipleOptional">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODB81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::Optional"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODCM1XEeSGVbFNM4m8gQ" name="Single Rate" sections="_2yAYQM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODWc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODCc1XEeSGVbFNM4m8gQ" name="isSingleRate">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODCs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::Rate"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODC81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Rate" sections="_2yAYQc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODWc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODDM1XEeSGVbFNM4m8gQ" name="isMultipleRate">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODDc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::Rate"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODDs1XEeSGVbFNM4m8gQ" name="Single Probability" sections="_2yAYQs1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODVs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODD81XEeSGVbFNM4m8gQ" name="isSingleProbability">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODEM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::Probability"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODEc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Probability" sections="_2yAYQ81XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODVs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODEs1XEeSGVbFNM4m8gQ" name="isMultipleProbability">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODE81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Activities::Probability"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODFM1XEeSGVbFNM4m8gQ" name="Single AllocateActivityPartition" sections="_2yAYRM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODXc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODFc1XEeSGVbFNM4m8gQ" name="isSingleAllocateActivityPartition">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODFs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Allocations::AllocateActivityPartition"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODF81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple AllocateActivityPartition" sections="_2yA_UM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODXc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODGM1XEeSGVbFNM4m8gQ" name="isMultipleAllocateActivityPartition">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODGc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Allocations::AllocateActivityPartition"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODGs1XEeSGVbFNM4m8gQ" name="Single Allocate" sections="_2yA_Uc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODXs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODG81XEeSGVbFNM4m8gQ" name="isSingleAllocate">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODHM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Allocations::Allocate"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODHc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Allocate" sections="_2yA_Us1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODXs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODHs1XEeSGVbFNM4m8gQ" name="isMultipleAllocate">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODH81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::Allocations::Allocate"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODIM1XEeSGVbFNM4m8gQ" name="Single Problem" sections="_2yA_U81XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODk81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODIc1XEeSGVbFNM4m8gQ" name="isSingleProblem">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODIs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::Problem"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODI81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Problem" sections="_2yA_VM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODk81XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODJM1XEeSGVbFNM4m8gQ" name="isMultipleProblem">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODJc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::Problem"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODJs1XEeSGVbFNM4m8gQ" name="Single Conform" sections="_2yA_Vc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODlM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODJ81XEeSGVbFNM4m8gQ" name="isSingleConform">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODKM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::Conform"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODKc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Conform" sections="_2yA_Vs1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODlM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODKs1XEeSGVbFNM4m8gQ" name="isMultipleConform">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODK81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::Conform"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODLM1XEeSGVbFNM4m8gQ" name="Single ViewPoint" sections="_2yBmYM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODgs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODLc1XEeSGVbFNM4m8gQ" name="isSingleViewPoint">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODLs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::ViewPoint"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODL81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple ViewPoint" sections="_2yBmYc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODgs1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODMM1XEeSGVbFNM4m8gQ" name="isMultipleViewPoint">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODMc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::ViewPoint"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODMs1XEeSGVbFNM4m8gQ" name="Single View" sections="_2yCNcM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODlc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODM81XEeSGVbFNM4m8gQ" name="isSingleView">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODNM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::View"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODNc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple View" sections="_2yCNcc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODlc1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODNs1XEeSGVbFNM4m8gQ" name="isMultipleView">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODN81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::View"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODOM1XEeSGVbFNM4m8gQ" name="Single ElementGroup" sections="_2yCNcs1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODis1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODOc1XEeSGVbFNM4m8gQ" name="isSingleElementGroup">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODOs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::ElementGroup"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODO81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple ElementGroup" sections="_2yC0gM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODis1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODPM1XEeSGVbFNM4m8gQ" name="isMultipleElementGroup">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODPc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::ElementGroup"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODPs1XEeSGVbFNM4m8gQ" name="Single Expose" sections="_2yC0gc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODks1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODP81XEeSGVbFNM4m8gQ" name="isSingleExpose">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODQM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::Expose"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODQc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Expose" sections="_2yC0gs1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODks1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODQs1XEeSGVbFNM4m8gQ" name="isMultipleExpose">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODQ81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::Expose"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODRM1XEeSGVbFNM4m8gQ" name="Single Stakeholder" sections="_2yC0g81XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODmM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODRc1XEeSGVbFNM4m8gQ" name="isSingleStakeholder">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODRs1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::Stakeholder"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODR81XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Stakeholder" sections="_2yC0hM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODmM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODSM1XEeSGVbFNM4m8gQ" name="isMultipleStakeholder">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODSc1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::Stakeholder"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODSs1XEeSGVbFNM4m8gQ" name="Single Rationale" sections="_2yDbkM1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODkM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODS81XEeSGVbFNM4m8gQ" name="isSingleRationale">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODTM1XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::Rationale"/>
+    </constraints>
+  </views>
+  <views xmi:id="_z-ODTc1XEeSGVbFNM4m8gQ" elementMultiplicity="-1" name="Multiple Rationale" sections="_2yDbkc1XEeSGVbFNM4m8gQ" automaticContext="true" datacontexts="_z-ODkM1XEeSGVbFNM4m8gQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_z-ODTs1XEeSGVbFNM4m8gQ" name="isMultipleRationale">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.sysml14.ui/resources/SysML1.4ConstraintEnvironment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_z-ODT81XEeSGVbFNM4m8gQ" name="stereotypeName" value="SysML::ModelElements::Rationale"/>
+    </constraints>
+  </views>
+  <dataContexts xmi:id="_z-ODUM1XEeSGVbFNM4m8gQ" name="SysML">
+    <elements xsi:type="contexts:DataContextPackage" xmi:id="_z-ODUc1XEeSGVbFNM4m8gQ" name="Activities">
+      <elements xmi:id="_z-ODUs1XEeSGVbFNM4m8gQ" name="Discrete"/>
+      <elements xmi:id="_z-ODU81XEeSGVbFNM4m8gQ" name="Overwrite">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690zb6DJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODVM1XEeSGVbFNM4m8gQ" name="ControlOperator">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yQKDJEeSZxfCXzZz3-w"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yVaDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODVc1XEeSGVbFNM4m8gQ" name="Continuous"/>
+      <elements xmi:id="_z-ODVs1XEeSGVbFNM4m8gQ" name="Probability">
+        <properties xmi:id="_z-ODV81XEeSGVbFNM4m8gQ" name="probability" type="Reference"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690zVKDJEeSZxfCXzZz3-w"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690y06DJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODWM1XEeSGVbFNM4m8gQ" name="Optional">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yBaDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODWc1XEeSGVbFNM4m8gQ" name="Rate">
+        <properties xmi:id="_z-ODWs1XEeSGVbFNM4m8gQ" name="rate" type="Reference"/>
+      </elements>
+      <elements xmi:id="_z-ODW81XEeSGVbFNM4m8gQ" name="NoBuffer">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690zb6DJEeSZxfCXzZz3-w"/>
+      </elements>
+    </elements>
+    <elements xsi:type="contexts:DataContextPackage" xmi:id="_z-ODXM1XEeSGVbFNM4m8gQ" name="Allocations">
+      <elements xmi:id="_z-ODXc1XEeSGVbFNM4m8gQ" name="AllocateActivityPartition">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690zX6DJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODXs1XEeSGVbFNM4m8gQ" name="Allocate"/>
+    </elements>
+    <elements xsi:type="contexts:DataContextPackage" xmi:id="_z-ODX81XEeSGVbFNM4m8gQ" name="DeprecatedElements">
+      <elements xmi:id="_z-ODYM1XEeSGVbFNM4m8gQ" name="Allocated">
+        <properties xmi:id="_z-ODYc1XEeSGVbFNM4m8gQ" name="allocatedFrom" type="Reference" multiplicity="-1" description="Reverse of allocatedTo: the element types and names of the set of elements that are clients (from) of an &#xab;allocate&#xbb; whose supplier is extended by this stereotype (instance). The same characteristics apply as to /allocatedTo. Each allocatedFrom property will be expressed as &#xab;elementType&#xbb; ElementName."/>
+        <properties xmi:id="_z-ODYs1XEeSGVbFNM4m8gQ" name="allocatedTo" type="Reference" multiplicity="-1" description="The element types and names of the set of elements that are suppliers (&#x201c;to&#x201d; end of the concrete syntax) of an &#xab;allocate&#xbb; whose client is extended by this stereotype (instance). This property is the union of all suppliers to which this instance is the client, i.e., there may be more than one /allocatedTo property per allocated model element. Each allocatedTo property will be expressed as &#xab;elementType&#xbb; ElementName."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xk6DJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODY81XEeSGVbFNM4m8gQ" name="RequirementRelated">
+        <properties xmi:id="_z-ODZM1XEeSGVbFNM4m8gQ" name="TracedFrom" type="Reference" multiplicity="-1" description="Derived from all requirements that are the supplier of a &#xab;trace&#xbb; relationship for which this element is a client."/>
+        <properties xmi:id="_z-ODZc1XEeSGVbFNM4m8gQ" name="Satisfies" type="Reference" multiplicity="-1" description="Derived from all requirements that are the supplier of a &#xab;satisfy&#xbb; relationship for which this element is a client."/>
+        <properties xmi:id="_z-ODZs1XEeSGVbFNM4m8gQ" name="Refines" type="Reference" multiplicity="-1" description="Derived from all requirements that are the supplier of a &#xab;refine&#xbb; relationship for which this element is a client."/>
+        <properties xmi:id="_z-ODZ81XEeSGVbFNM4m8gQ" name="Verifies" type="Reference" multiplicity="-1" description="Derived from all requirements that are the supplier of a &#xab;verify&#xbb; relationship for which this element is a client."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xk6DJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODaM1XEeSGVbFNM4m8gQ" name="FlowSpecification">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690ybKDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODac1XEeSGVbFNM4m8gQ" name="Deprecated">
+        <properties xmi:id="_z-ODas1XEeSGVbFNM4m8gQ" name="deprecatedReason"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yXqDJEeSZxfCXzZz3-w"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690zC6DJEeSZxfCXzZz3-w"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xu6DJEeSZxfCXzZz3-w"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yG6DJEeSZxfCXzZz3-w"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690x7aDJEeSZxfCXzZz3-w"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xtqDJEeSZxfCXzZz3-w"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690y1qDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODa81XEeSGVbFNM4m8gQ" name="FlowPort">
+        <properties xmi:id="_z-ODbM1XEeSGVbFNM4m8gQ" name="direction" type="Enumeration" description="Indicates the direction in which an atomic flow port relays its items. If the direction is set to &#x201c;in,&#x201d; then the items are relayed from an external connector via the flow port into the flow port&#x2019;s owner (or one of its parts). If the direction is set to &#x201c;out,&#x201d; then the items are relayed from the flow port&#x2019;s owner, via the flow port, through an external connector attached to the flow port. If the direction is set to &#x201c;inout,&#x201d; then items can flow both ways. By default, the value is inout."/>
+        <properties xmi:id="_z-ODbc1XEeSGVbFNM4m8gQ" name="isAtomic" type="Boolean" description="This is a derived attribute (derived from the flow port&#x2019;s type). For a flow port typed by a flow specification the value of this attribute is False, otherwise the value is True."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690ylaDJEeSZxfCXzZz3-w"/>
+      </elements>
+    </elements>
+    <elements xsi:type="contexts:DataContextPackage" xmi:id="_z-ODbs1XEeSGVbFNM4m8gQ" name="ConstraintBlocks">
+      <elements xmi:id="_z-ODb81XEeSGVbFNM4m8gQ" name="ConstraintBlock"/>
+    </elements>
+    <elements xsi:type="contexts:DataContextPackage" xmi:id="_z-ODcM1XEeSGVbFNM4m8gQ" name="PortsandFlows">
+      <elements xmi:id="_z-ODcc1XEeSGVbFNM4m8gQ" name="FlowProperty">
+        <properties xmi:id="_z-ODcs1XEeSGVbFNM4m8gQ" name="direction" type="Enumeration" description="Specifies if the property value is received from an external block (direction=&#x201c;in&#x201d;), transmitted to an external Block (direction=&#x201c;out&#x201d;) or both (direction=&#x201c;inout&#x201d;)."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yG6DJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODc81XEeSGVbFNM4m8gQ" name="DirectedFeature">
+        <properties xmi:id="_z-ODdM1XEeSGVbFNM4m8gQ" name="featureDirection" type="Enumeration"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690x96DJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODdc1XEeSGVbFNM4m8gQ" name="ChangeStructuralFeatureEvent">
+        <properties xmi:id="_z-ODds1XEeSGVbFNM4m8gQ" name="structuralFeature" type="Reference"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690z0aDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODd81XEeSGVbFNM4m8gQ" name="InvocationOnNestedPortAction">
+        <properties xmi:id="_z-ODeM1XEeSGVbFNM4m8gQ" name="onNestedPort" type="Reference" multiplicity="-1"/>
+      </elements>
+      <elements xmi:id="_z-ODec1XEeSGVbFNM4m8gQ" name="ItemFlow">
+        <properties xmi:id="_z-ODes1XEeSGVbFNM4m8gQ" name="itemProperty" type="Reference" description="An optional property that relates the flowing item to the instances of the connector&#x2019;s enclosing block. This property is applicable only for item flows assigned to connectors. The multiplicity is zero if the item flow is assigned to an Association."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_6964PaDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODe81XEeSGVbFNM4m8gQ" name="ProxyPort">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690ylaDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODfM1XEeSGVbFNM4m8gQ" name="AcceptChangeStructuralFeatureEventAction">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_6964XqDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODfc1XEeSGVbFNM4m8gQ" name="FullPort">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690ylaDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODfs1XEeSGVbFNM4m8gQ" name="TriggerOnNestedPort">
+        <properties xmi:id="_z-ODf81XEeSGVbFNM4m8gQ" name="onNestedPort" type="Reference" multiplicity="-1"/>
+      </elements>
+      <elements xmi:id="_z-ODgM1XEeSGVbFNM4m8gQ" name="InterfaceBlock"/>
+    </elements>
+    <elements xsi:type="contexts:DataContextPackage" xmi:id="_z-ODgc1XEeSGVbFNM4m8gQ" name="ModelElements">
+      <elements xmi:id="_z-ODgs1XEeSGVbFNM4m8gQ" name="ViewPoint">
+        <properties xmi:id="_z-ODg81XEeSGVbFNM4m8gQ" name="stakeholder" type="Reference" multiplicity="-1" description="Set of stakeholders."/>
+        <properties xmi:id="_z-ODhM1XEeSGVbFNM4m8gQ" name="purpose" description="The purpose addresses the stakeholder concerns."/>
+        <properties xmi:id="_z-ODhc1XEeSGVbFNM4m8gQ" name="concernList" type="Reference" multiplicity="-1" description="The interest of the stakeholders."/>
+        <properties xmi:id="_z-ODhs1XEeSGVbFNM4m8gQ" name="language" multiplicity="-1" description="The languages used to construct the viewpoint."/>
+        <properties xmi:id="_z-ODh81XEeSGVbFNM4m8gQ" name="method" type="Reference" multiplicity="-1" description="The methods used to construct the views for this viewpoint."/>
+        <properties xmi:id="_z-ODiM1XEeSGVbFNM4m8gQ" name="presentation" multiplicity="-1"/>
+        <properties xmi:id="_z-ODic1XEeSGVbFNM4m8gQ" name="concern" multiplicity="-1"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yXqDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODis1XEeSGVbFNM4m8gQ" name="ElementGroup">
+        <properties xmi:id="_z-ODi81XEeSGVbFNM4m8gQ" name="name"/>
+        <properties xmi:id="_z-ODjM1XEeSGVbFNM4m8gQ" name="criterion"/>
+        <properties xmi:id="_z-ODjc1XEeSGVbFNM4m8gQ" name="size" type="Integer"/>
+        <properties xmi:id="_z-ODjs1XEeSGVbFNM4m8gQ" name="member" type="Reference" multiplicity="-1" description="Set specifying the members of the group.&#xA;Derived from Comment::annotatedElement."/>
+        <properties xmi:id="_z-ODj81XEeSGVbFNM4m8gQ" name="orderedMember" type="Reference" multiplicity="-1" description="Organize member according to an arbitrary order. Optional."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xgqDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODkM1XEeSGVbFNM4m8gQ" name="Rationale">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xgqDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xsi:type="contexts:DataContextPackage" xmi:id="_z-ODkc1XEeSGVbFNM4m8gQ" name="Deprecated"/>
+      <elements xmi:id="_z-ODks1XEeSGVbFNM4m8gQ" name="Expose">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xmqDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODk81XEeSGVbFNM4m8gQ" name="Problem">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xgqDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODlM1XEeSGVbFNM4m8gQ" name="Conform">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xmqDJEeSZxfCXzZz3-w"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690x7aDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODlc1XEeSGVbFNM4m8gQ" name="View">
+        <properties xmi:id="_z-ODls1XEeSGVbFNM4m8gQ" name="viewPoint" type="Reference" description="The viewpoint for this View, derived from the supplier of the &#xab;conform&#xbb; dependency whose client is this View."/>
+        <properties xmi:id="_z-ODl81XEeSGVbFNM4m8gQ" name="stakeholder" type="Reference" multiplicity="-1"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xiaDJEeSZxfCXzZz3-w"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yXqDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODmM1XEeSGVbFNM4m8gQ" name="Stakeholder">
+        <properties xmi:id="_z-ODmc1XEeSGVbFNM4m8gQ" name="concern" type="Reference" multiplicity="-1"/>
+        <properties xmi:id="_z-ODms1XEeSGVbFNM4m8gQ" name="concernList" type="Reference"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xwaDJEeSZxfCXzZz3-w"/>
+      </elements>
+    </elements>
+    <elements xsi:type="contexts:DataContextPackage" xmi:id="_z-ODm81XEeSGVbFNM4m8gQ" name="Blocks">
+      <elements xmi:id="_z-ODnM1XEeSGVbFNM4m8gQ" name="DistributedProperty">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yG6DJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODnc1XEeSGVbFNM4m8gQ" name="EndPathMultiplicity">
+        <properties xmi:id="_z-ODns1XEeSGVbFNM4m8gQ" name="lower" type="Integer" description="Gives the minimum number of values of the property at the end of the related bindingPath, for each object reached by navigation along the bindingPath from an instance of the block owning the property to which EndPathMultiplicity is applied"/>
+        <properties xmi:id="_z-ODn81XEeSGVbFNM4m8gQ" name="upper" description="Gives the maximum number of values of the property at the end of the related bindingPath, for each object reached by navigation along the bindingPath from an instance of the block owning the property to which EndPathMultiplicity is applied."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yG6DJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODoM1XEeSGVbFNM4m8gQ" name="PropertySpecificType">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xwaDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODoc1XEeSGVbFNM4m8gQ" name="ConnectorProperty">
+        <properties xmi:id="_z-ODos1XEeSGVbFNM4m8gQ" name="connector" type="Reference" description="A connector of the block owning the property on which the stereotype is applied."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yG6DJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODo81XEeSGVbFNM4m8gQ" name="ParticipantProperty">
+        <properties xmi:id="_z-ODpM1XEeSGVbFNM4m8gQ" name="end" type="Reference" description="A member end of the association block owning the property on which the stereotype is applied."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yG6DJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODpc1XEeSGVbFNM4m8gQ" name="NestedConnectorEnd"/>
+      <elements xmi:id="_z-ODps1XEeSGVbFNM4m8gQ" name="DirectedRelationshipPropertyPath">
+        <properties xmi:id="_z-ODp81XEeSGVbFNM4m8gQ" name="sourcePropertyPath" type="Reference" multiplicity="-1"/>
+        <properties xmi:id="_z-ODqM1XEeSGVbFNM4m8gQ" name="targetPropertyPath" type="Reference" multiplicity="-1"/>
+        <properties xmi:id="_z-ODqc1XEeSGVbFNM4m8gQ" name="sourceContext" type="Reference"/>
+        <properties xmi:id="_z-ODqs1XEeSGVbFNM4m8gQ" name="targetContext" type="Reference"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xnaDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODq81XEeSGVbFNM4m8gQ" name="AdjunctProperty">
+        <properties xmi:id="_z-ODrM1XEeSGVbFNM4m8gQ" name="principal" type="Reference" description="Gives the element that determines the values of the property.  Must be a connector, call action, object node, variable, or parameter."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yG6DJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODrc1XEeSGVbFNM4m8gQ" name="ClassifierBehaviorProperty">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yG6DJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODrs1XEeSGVbFNM4m8gQ" name="Block">
+        <properties xmi:id="_z-ODr81XEeSGVbFNM4m8gQ" name="isEncapsulated" type="Boolean" description="If true, then the block is treated as a black box; a part typed by this black box can only be connected via its ports or directly to its outer boundary. If false, or if a value is not present, then connections can be established to elements of its internal structure via deep-nested connector ends."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yXqDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODsM1XEeSGVbFNM4m8gQ" name="BoundReference">
+        <properties xmi:id="_z-ODsc1XEeSGVbFNM4m8gQ" name="boundEnd" type="Reference" description="Gives a connector end of a binding connector opposite to the end linked to the stereotyped property, or linked to a property that generalizes the stereotyped one through redefinition."/>
+        <properties xmi:id="_z-ODss1XEeSGVbFNM4m8gQ" name="bindingPath" type="Reference" multiplicity="-1" description="Gives the propertyPath of the NestedConnectorEnd applied, if any, to the boundEnd, appended to the role of the boundEnd. "/>
+      </elements>
+      <elements xmi:id="_z-ODs81XEeSGVbFNM4m8gQ" name="ElementPropertyPath">
+        <properties xmi:id="_z-ODtM1XEeSGVbFNM4m8gQ" name="propertyPath" type="Reference" multiplicity="-1" description="The propertyPath list of the NestedConnectorEnd stereotype must identify a path of containing properties that identify the connected property in the context of the block that owns the connector. The ordering of properties is from a property of the block that owns the connector, through a property of each intermediate block that types the preceding property, until a property is reached that contains a connector end property within its type. The connector end property is not included in the propertyPath list, but instead is held by the role property of the UML ConnectorEnd metaclass."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690xhaDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODtc1XEeSGVbFNM4m8gQ" name="BindingConnector">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yvqDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODts1XEeSGVbFNM4m8gQ" name="ValueType">
+        <properties xmi:id="_z-ODt81XEeSGVbFNM4m8gQ" name="unit" type="Reference" description="A quantity in terms of which the magnitudes of other quantities that have the same dimension can be stated, as identified by an instance of the Unit stereotype."/>
+        <properties xmi:id="_z-ODuM1XEeSGVbFNM4m8gQ" name="quantityKind" type="Reference" description="A kind of quantity that may be stated by means of defined units, as identified by an instance of the Dimension stereotype. A value type may optionally specify a dimension without any unit. Such a value has no concrete representation, but may be used to express a value in an abstract form independent of any specific units."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690y1qDJEeSZxfCXzZz3-w"/>
+      </elements>
+    </elements>
+    <elements xsi:type="contexts:DataContextPackage" xmi:id="_z-ODuc1XEeSGVbFNM4m8gQ" name="Requirements">
+      <elements xmi:id="_z-ODus1XEeSGVbFNM4m8gQ" name="DeriveReqt"/>
+      <elements xmi:id="_z-ODu81XEeSGVbFNM4m8gQ" name="Satisfy"/>
+      <elements xmi:id="_z-ODvM1XEeSGVbFNM4m8gQ" name="TestCase">
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yQKDJEeSZxfCXzZz3-w"/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yVaDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODvc1XEeSGVbFNM4m8gQ" name="Refine"/>
+      <elements xmi:id="_z-ODvs1XEeSGVbFNM4m8gQ" name="Requirement">
+        <properties xmi:id="_z-ODv81XEeSGVbFNM4m8gQ" name="text" description="The textual representation or a reference to the textual representation of the requirement."/>
+        <properties xmi:id="_z-ODwM1XEeSGVbFNM4m8gQ" name="id" description="The unique id of the requirement."/>
+        <properties xmi:id="_z-ODwc1XEeSGVbFNM4m8gQ" name="derived" type="Reference" multiplicity="-1" description="Derived from all requirements that are the client of a &#xab;deriveReqt&#xbb; relationship for which this requirement is a supplier."/>
+        <properties xmi:id="_z-ODws1XEeSGVbFNM4m8gQ" name="derivedFrom" type="Reference" multiplicity="-1" description="Derived from all requirements that are the supplier of a &#xab;deriveReqt&#xbb; relationship for which this requirement is a client."/>
+        <properties xmi:id="_z-ODw81XEeSGVbFNM4m8gQ" name="satisfiedBy" type="Reference" multiplicity="-1" description="Derived from all elements that are the client of a &#xab;satisfy&#xbb; relationship for which this requirement is a supplier."/>
+        <properties xmi:id="_z-ODxM1XEeSGVbFNM4m8gQ" name="refinedBy" type="Reference" multiplicity="-1" description="Derived from all elements that are the client of a &#xab;refine&#xbb; relationship for which this requirement is a supplier."/>
+        <properties xmi:id="_z-ODxc1XEeSGVbFNM4m8gQ" name="tracedTo" type="Reference" multiplicity="-1" description="Derived from all elements that are the client of a &#xab;trace&#xbb; relationship for which this requirement is a supplier."/>
+        <properties xmi:id="_z-ODxs1XEeSGVbFNM4m8gQ" name="verifiedBy" type="Reference" multiplicity="-1" description="Derived from all elements that are the client of a &#xab;verify&#xbb; relationship for which this requirement is a supplier."/>
+        <properties xmi:id="_z-ODx81XEeSGVbFNM4m8gQ" name="master" type="Reference" description="This is a derived property that lists the master requirement for this slave requirement. The master attribute is derived from the supplier of the Copy dependency that has this requirement as the slave."/>
+        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yXqDJEeSZxfCXzZz3-w"/>
+      </elements>
+      <elements xmi:id="_z-ODyM1XEeSGVbFNM4m8gQ" name="Trace"/>
+      <elements xmi:id="_z-ODyc1XEeSGVbFNM4m8gQ" name="Copy"/>
+      <elements xmi:id="_z-ODys1XEeSGVbFNM4m8gQ" name="Verify"/>
+    </elements>
+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@modelElementFactories.2"/>
+  </dataContexts>
+</contexts:Context>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAcceptChangeStructuralFeatureEventAction.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAcceptChangeStructuralFeatureEventAction.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAcceptChangeStructuralFeatureEventAction.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAdjunctProperty.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAdjunctProperty.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAdjunctProperty.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAllocate.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAllocate.xwt
new file mode 100644
index 00000000000..f79893843c4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAllocate.xwt
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppel:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppel:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAllocateActivityPartition.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAllocateActivityPartition.xwt
new file mode 100644
index 00000000000..2d68d1a0632
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAllocateActivityPartition.xwt
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:ActivityPartition:isDimension"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:ActivityPartition:isExternal"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAllocated.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAllocated.xwt
new file mode 100644
index 00000000000..15940ef71c5
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleAllocated.xwt
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleBindingConnector.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleBindingConnector.xwt
new file mode 100644
index 00000000000..aa2a57777b2
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleBindingConnector.xwt
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Connector:kind"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleBlock.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleBlock.xwt
new file mode 100644
index 00000000000..0653a20fe0d
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleBlock.xwt
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="SysML:Blocks:Block:isEncapsulated"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleBoundReference.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleBoundReference.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleBoundReference.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleChangeStructuralFeatureEvent.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleChangeStructuralFeatureEvent.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleChangeStructuralFeatureEvent.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleClassifierBehaviorProperty.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleClassifierBehaviorProperty.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleClassifierBehaviorProperty.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleConform.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleConform.xwt
new file mode 100644
index 00000000000..af797366c04
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleConform.xwt
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+<Composite>
+<Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout>
+<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleConnectorProperty.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleConnectorProperty.xwt
new file mode 100644
index 00000000000..74d595fb47a
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleConnectorProperty.xwt
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleConstraintBlock.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleConstraintBlock.xwt
new file mode 100644
index 00000000000..19b7f6337e6
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleConstraintBlock.xwt
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleContinuous.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleContinuous.xwt
new file mode 100644
index 00000000000..0a4ecf97e13
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleContinuous.xwt
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleControlOperator.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleControlOperator.xwt
new file mode 100644
index 00000000000..5b884109a96
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleControlOperator.xwt
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Operation:isQuery"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleCopy.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleCopy.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleCopy.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDeprecated.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDeprecated.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDeprecated.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDeriveReqt.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDeriveReqt.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDeriveReqt.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDirectedFeature.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDirectedFeature.xwt
new file mode 100644
index 00000000000..53475f8515b
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDirectedFeature.xwt
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="SysML:PortsandFlows:DirectedFeature:featureDirection"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDirectedRelationshipPropertyPath.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDirectedRelationshipPropertyPath.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDirectedRelationshipPropertyPath.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDiscrete.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDiscrete.xwt
new file mode 100644
index 00000000000..0a4ecf97e13
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDiscrete.xwt
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDistributedProperty.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDistributedProperty.xwt
new file mode 100644
index 00000000000..74d595fb47a
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleDistributedProperty.xwt
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleElementGroup.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleElementGroup.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleElementGroup.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleElementPropertyPath.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleElementPropertyPath.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleElementPropertyPath.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleEndPathMultiplicity.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleEndPathMultiplicity.xwt
new file mode 100644
index 00000000000..53e540fee04
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleEndPathMultiplicity.xwt
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="SysML:Blocks:EndPathMultiplicity:lower"></ppe:IntegerEditor>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleExpose.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleExpose.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleExpose.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleFlowPort.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleFlowPort.xwt
new file mode 100644
index 00000000000..9b69c6409b9
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleFlowPort.xwt
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Port:isBehavior"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Port:isService"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="SysML:DeprecatedElements:FlowPort:direction"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+		
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleFlowProperty.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleFlowProperty.xwt
new file mode 100644
index 00000000000..1077e56222a
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleFlowProperty.xwt
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="SysML:PortsandFlows:FlowProperty:direction"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleFlowSpecification.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleFlowSpecification.xwt
new file mode 100644
index 00000000000..3dee8d61d56
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleFlowSpecification.xwt
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleFullPort.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleFullPort.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleFullPort.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleInterfaceBlock.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleInterfaceBlock.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleInterfaceBlock.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleInvocationOnNestedPortAction.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleInvocationOnNestedPortAction.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleInvocationOnNestedPortAction.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleItemFlow.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleItemFlow.xwt
new file mode 100644
index 00000000000..83cdf7768dd
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleItemFlow.xwt
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleNestedConnectorEnd.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleNestedConnectorEnd.xwt
new file mode 100644
index 00000000000..91f3ad270af
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleNestedConnectorEnd.xwt
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleNoBuffer.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleNoBuffer.xwt
new file mode 100644
index 00000000000..1b53555b327
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleNoBuffer.xwt
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:ObjectNode:isControlType"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleOptional.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleOptional.xwt
new file mode 100644
index 00000000000..d70003b64f9
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleOptional.xwt
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleOverwrite.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleOverwrite.xwt
new file mode 100644
index 00000000000..1b53555b327
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleOverwrite.xwt
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:ObjectNode:isControlType"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleParticipantProperty.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleParticipantProperty.xwt
new file mode 100644
index 00000000000..74d595fb47a
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleParticipantProperty.xwt
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleProbability.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleProbability.xwt
new file mode 100644
index 00000000000..0548c761d7e
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleProbability.xwt
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleProblem.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleProblem.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleProblem.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultiplePropertySpecificType.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultiplePropertySpecificType.xwt
new file mode 100644
index 00000000000..3dee8d61d56
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultiplePropertySpecificType.xwt
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleProxyPort.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleProxyPort.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleProxyPort.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRate.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRate.xwt
new file mode 100644
index 00000000000..0a4ecf97e13
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRate.xwt
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRationale.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRationale.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRationale.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRefine.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRefine.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRefine.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRequirement.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRequirement.xwt
new file mode 100644
index 00000000000..ebdd0458ee2
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRequirement.xwt
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRequirementRelated.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRequirementRelated.xwt
new file mode 100644
index 00000000000..707c7653835
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleRequirementRelated.xwt
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleSatisfy.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleSatisfy.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleSatisfy.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleStakeholder.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleStakeholder.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleStakeholder.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleTestCase.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleTestCase.xwt
new file mode 100644
index 00000000000..5b884109a96
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleTestCase.xwt
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Operation:isQuery"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleTrace.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleTrace.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleTrace.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleTriggerOnNestedPort.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleTriggerOnNestedPort.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleTriggerOnNestedPort.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleValueType.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleValueType.xwt
new file mode 100644
index 00000000000..3dee8d61d56
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleValueType.xwt
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleVerify.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleVerify.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleVerify.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleView.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleView.xwt
new file mode 100644
index 00000000000..83cdf7768dd
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleView.xwt
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleViewPoint.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleViewPoint.xwt
new file mode 100644
index 00000000000..19b7f6337e6
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/MultipleViewPoint.xwt
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAcceptChangeStructuralFeatureEventAction.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAcceptChangeStructuralFeatureEventAction.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAcceptChangeStructuralFeatureEventAction.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAdjunctProperty.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAdjunctProperty.xwt
new file mode 100644
index 00000000000..f36704ea9b6
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAdjunctProperty.xwt
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:Blocks:AdjunctProperty:principal"></ppe:ReferenceDialog>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAllocate.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAllocate.xwt
new file mode 100644
index 00000000000..3f7e7a38176
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAllocate.xwt
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}" property="UML:Dependency:client"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}" property="UML:Dependency:supplier"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAllocateActivityPartition.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAllocateActivityPartition.xwt
new file mode 100644
index 00000000000..5b332d05e8f
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAllocateActivityPartition.xwt
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:ActivityPartition:isDimension"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:ActivityPartition:isExternal"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAllocated.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAllocated.xwt
new file mode 100644
index 00000000000..d988721cf23
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleAllocated.xwt
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Allocations:Allocated:allocatedFrom"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Allocations:Allocated:allocatedTo"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleBindingConnector.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleBindingConnector.xwt
new file mode 100644
index 00000000000..59eada83aa0
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleBindingConnector.xwt
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Connector:kind"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleBlock.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleBlock.xwt
new file mode 100644
index 00000000000..0458c3deb3c
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleBlock.xwt
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="SysML:Blocks:Block:isEncapsulated"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleBoundReference.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleBoundReference.xwt
new file mode 100644
index 00000000000..61c08d71116
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleBoundReference.xwt
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:Blocks:BoundReference:boundEnd"></ppe:ReferenceDialog>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleChangeStructuralFeatureEvent.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleChangeStructuralFeatureEvent.xwt
new file mode 100644
index 00000000000..d75dfec8faa
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleChangeStructuralFeatureEvent.xwt
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:PortsandFlows:ChangeStructuralFeatureEvent:structuralFeature"></ppe:ReferenceDialog>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleClassifierBehaviorProperty.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleClassifierBehaviorProperty.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleClassifierBehaviorProperty.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConform.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConform.xwt
new file mode 100644
index 00000000000..3f7e7a38176
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConform.xwt
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}" property="UML:Dependency:client"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}" property="UML:Dependency:supplier"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConnectorProperty.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConnectorProperty.xwt
new file mode 100644
index 00000000000..7f4e4087a85
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConnectorProperty.xwt
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:Blocks:ConnectorProperty:connector"></ppe:ReferenceDialog>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConstraintBlock.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConstraintBlock.xwt
new file mode 100644
index 00000000000..1fdb4769e43
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConstraintBlock.xwt
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
+		
+		<ppe:BooleanRadio input="{Binding}"	property="SysML:ConstraintBlocks:ConstraintBlock:isEncapsulated"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"	property="SysML:Blocks:Block:isEncapsulated"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"	property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleContinuous.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleContinuous.xwt
new file mode 100644
index 00000000000..55e054fb34e
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleContinuous.xwt
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:Activities:Rate:rate"></ppe:ReferenceDialog>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleControlOperator.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleControlOperator.xwt
new file mode 100644
index 00000000000..57ee29a1dde
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleControlOperator.xwt
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Operation:isQuery"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleCopy.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleCopy.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleCopy.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDeprecated.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDeprecated.xwt
new file mode 100644
index 00000000000..1985b77ef2d
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDeprecated.xwt
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="SysML:DeprecatedElements:Deprecated:deprecatedReason"></ppe:StringEditor>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDeriveReqt.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDeriveReqt.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDeriveReqt.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDirectedFeature.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDirectedFeature.xwt
new file mode 100644
index 00000000000..53475f8515b
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDirectedFeature.xwt
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="SysML:PortsandFlows:DirectedFeature:featureDirection"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDirectedRelationshipPropertyPath.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDirectedRelationshipPropertyPath.xwt
new file mode 100644
index 00000000000..c4ee34bcf8c
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDirectedRelationshipPropertyPath.xwt
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:Blocks:DirectedRelationshipPropertyPath:sourceContext"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:Blocks:DirectedRelationshipPropertyPath:targetContext"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Blocks:DirectedRelationshipPropertyPath:sourcePropertyPath"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Blocks:DirectedRelationshipPropertyPath:targetPropertyPath"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDiscrete.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDiscrete.xwt
new file mode 100644
index 00000000000..55e054fb34e
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDiscrete.xwt
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:Activities:Rate:rate"></ppe:ReferenceDialog>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDistributedProperty.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDistributedProperty.xwt
new file mode 100644
index 00000000000..13a1baf47a2
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDistributedProperty.xwt
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleElementGroup.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleElementGroup.xwt
new file mode 100644
index 00000000000..50853bfb02a
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleElementGroup.xwt
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="SysML:ModelElements:ElementGroup:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:ModelElements:ElementGroup:orderedMember"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleElementPropertyPath.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleElementPropertyPath.xwt
new file mode 100644
index 00000000000..ca1e2ee7b27
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleElementPropertyPath.xwt
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Blocks:ElementPropertyPath:propertyPath"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleEndPathMultiplicity.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleEndPathMultiplicity.xwt
new file mode 100644
index 00000000000..c1882e6bd81
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleEndPathMultiplicity.xwt
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="SysML:Blocks:EndPathMultiplicity:upper"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="SysML:Blocks:EndPathMultiplicity:lower"></ppe:IntegerEditor>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleExpose.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleExpose.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleExpose.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFlowPort.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFlowPort.xwt
new file mode 100644
index 00000000000..02b83909923
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFlowPort.xwt
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="SysML:PortsandFlows:FlowPort:isAtomic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Port:isBehavior"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="SysML:PortsandFlows:FlowPort:isConjugated"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Port:isService"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="SysML:DeprecatedElements:FlowPort:direction"></ppe:EnumCombo>
+					<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+			
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFlowProperty.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFlowProperty.xwt
new file mode 100644
index 00000000000..8c5d79ccaed
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFlowProperty.xwt
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="SysML:PortsandFlows:FlowProperty:direction"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFlowSpecification.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFlowSpecification.xwt
new file mode 100644
index 00000000000..bb837c397fe
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFlowSpecification.xwt
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFullPort.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFullPort.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFullPort.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleInterfaceBlock.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleInterfaceBlock.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleInterfaceBlock.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleInvocationOnNestedPortAction.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleInvocationOnNestedPortAction.xwt
new file mode 100644
index 00000000000..c3ebfd27d2f
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleInvocationOnNestedPortAction.xwt
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:PortsandFlows:InvocationOnNestedPortAction:onNestedPort"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleItemFlow.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleItemFlow.xwt
new file mode 100644
index 00000000000..d0f48519ba7
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleItemFlow.xwt
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:PortsandFlows:ItemFlow:itemProperty"></ppe:ReferenceDialog>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleNestedConnectorEnd.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleNestedConnectorEnd.xwt
new file mode 100644
index 00000000000..395e15ad420
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleNestedConnectorEnd.xwt
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Blocks:NestedConnectorEnd:propertyPath"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleNoBuffer.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleNoBuffer.xwt
new file mode 100644
index 00000000000..bce284110ee
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleNoBuffer.xwt
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:ObjectNode:isControlType"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleOptional.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleOptional.xwt
new file mode 100644
index 00000000000..61798a09ea2
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleOptional.xwt
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleOverwrite.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleOverwrite.xwt
new file mode 100644
index 00000000000..bce284110ee
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleOverwrite.xwt
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:ObjectNode:isControlType"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleParticipantProperty.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleParticipantProperty.xwt
new file mode 100644
index 00000000000..f058af6ed0d
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleParticipantProperty.xwt
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:Blocks:ParticipantProperty:end"></ppe:ReferenceDialog>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProbability.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProbability.xwt
new file mode 100644
index 00000000000..01675c72c81
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProbability.xwt
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:Activities:Probability:probability"></ppe:ReferenceDialog>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProblem.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProblem.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProblem.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SinglePropertySpecificType.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SinglePropertySpecificType.xwt
new file mode 100644
index 00000000000..78735d79174
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SinglePropertySpecificType.xwt
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProxyPort.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProxyPort.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProxyPort.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRate.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRate.xwt
new file mode 100644
index 00000000000..55e054fb34e
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRate.xwt
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:Activities:Rate:rate"></ppe:ReferenceDialog>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRationale.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRationale.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRationale.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRefine.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRefine.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRefine.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRequirement.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRequirement.xwt
new file mode 100644
index 00000000000..df7a3966a2b
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRequirement.xwt
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="SysML:Requirements:Requirement:id"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringMultiline input="{Binding}"
+			property="SysML:Requirements:Requirement:text"></ppe:StringMultiline>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:Requirements:Requirement:master"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Requirements:Requirement:derived"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Requirements:Requirement:derivedFrom"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Requirements:Requirement:refinedBy"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Requirements:Requirement:satisfiedBy"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Requirements:Requirement:tracedTo"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Requirements:Requirement:verifiedBy"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRequirementRelated.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRequirementRelated.xwt
new file mode 100644
index 00000000000..bab1e9a1fff
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRequirementRelated.xwt
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Requirements:RequirementRelated:refines"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Requirements:RequirementRelated:satisfies"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Requirements:RequirementRelated:tracedFrom"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Requirements:RequirementRelated:verifies"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleSatisfy.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleSatisfy.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleSatisfy.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleStakeholder.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleStakeholder.xwt
new file mode 100644
index 00000000000..188bacbd618
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleStakeholder.xwt
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:ModelElements:Stakeholder:concern"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleTestCase.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleTestCase.xwt
new file mode 100644
index 00000000000..746fec3071d
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleTestCase.xwt
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Operation:isQuery"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:Requirements:TestCase:verifies"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleTrace.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleTrace.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleTrace.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleTriggerOnNestedPort.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleTriggerOnNestedPort.xwt
new file mode 100644
index 00000000000..1c01a997c4a
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleTriggerOnNestedPort.xwt
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:PortsandFlows:TriggerOnNestedPort:onNestedPort"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleValueType.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleValueType.xwt
new file mode 100644
index 00000000000..a81d72872f6
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleValueType.xwt
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:Blocks:ValueType:unit"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:Blocks:ValueType:quantityKind"></ppe:ReferenceDialog>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleVerify.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleVerify.xwt
new file mode 100644
index 00000000000..08a3897dfb4
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleVerify.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleView.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleView.xwt
new file mode 100644
index 00000000000..1579d73c5f6
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleView.xwt
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="SysML:ModelElements:View:viewPoint"></ppe:ReferenceDialog>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleViewPoint.xwt b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleViewPoint.xwt
new file mode 100644
index 00000000000..46eca7ae025
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleViewPoint.xwt
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="SysML:ModelElements:ViewPoint:concerns"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="SysML:ModelElements:ViewPoint:languages"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="SysML:ModelElements:ViewPoint:methods"></ppe:MultiString>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="SysML:ModelElements:ViewPoint:purpose"></ppe:StringEditor>
+		<ppe:MultiString input="{Binding}"
+			property="SysML:ModelElements:ViewPoint:stakeHolders"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="SysML:ModelElements:ViewPoint:language"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="SysML:ModelElements:ViewPoint:presentation"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:ModelElements:ViewPoint:stakeholder"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="SysML:ModelElements:ViewPoint:concernList"></ppe:MultiReference>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/Activator.java b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/Activator.java
new file mode 100644
index 00000000000..f62197d276f
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/Activator.java
@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml14.ui;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.sysml14.ui"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/CreateSysML14ModelCommand.java b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/CreateSysML14ModelCommand.java
new file mode 100644
index 00000000000..bd6b280ed56
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/CreateSysML14ModelCommand.java
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml14.ui;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.sysml14.util.SysmlResource;
+import org.eclipse.papyrus.uml.diagram.common.commands.ModelCreationCommandBase;
+import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.UMLFactory;
+
+
+/**
+ * The Class CreateSysMLModelCommand.
+ */
+public class CreateSysML14ModelCommand extends ModelCreationCommandBase {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#createRootElement()
+	 *
+	 * @return
+	 */
+
+	@Override
+	protected EObject createRootElement() {
+		return UMLFactory.eINSTANCE.createModel();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#initializeModel(org.eclipse.emf.ecore.EObject)
+	 *
+	 * @param owner
+	 */
+
+	@Override
+	protected void initializeModel(EObject owner) {
+		super.initializeModel(owner);
+		((org.eclipse.uml2.uml.Package) owner).setName(getModelName());
+
+		// Retrieve SysML profile and apply with Sub-profile
+		Profile sysml = (Profile) PackageUtil.loadPackage(URI.createURI(SysmlResource.PROFILE_PATH), owner.eResource().getResourceSet());
+		if (sysml != null) {
+			PackageUtil.applyProfile(((org.eclipse.uml2.uml.Package) owner), sysml, true);
+		}
+	}
+
+	/**
+	 * Gets the model name.
+	 *
+	 * @return the model name
+	 */
+	protected String getModelName() {
+		return "SysMLmodel 1.4";
+	}
+}
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/constraints/HasStereotypeSysml14Constraint.java b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/constraints/HasStereotypeSysml14Constraint.java
new file mode 100644
index 00000000000..0d3a3a3883a
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui/src/org/eclipse/papyrus/sysml14/ui/constraints/HasStereotypeSysml14Constraint.java
@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml14.ui.constraints;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.papyrus.sysml14.util.SysmlResource;
+import org.eclipse.papyrus.uml.properties.constraints.HasStereotypeConstraint;
+import org.eclipse.uml2.uml.Profile;
+
+/**
+ * A constraint to test if the given object is a UML Element and
+ * has the given Stereotype and Sysml1.4 profile applied
+ *
+ * @author Benoit Maggi
+ */
+public class HasStereotypeSysml14Constraint extends HasStereotypeConstraint {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#match(java.lang.Object)
+	 * Check if the containing package has profilUri applied.
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		if (super.match(selection)){
+			EList<Profile> allAppliedProfiles = umlElement.getNearestPackage().getAllAppliedProfiles();
+			for (Profile profile : allAppliedProfiles) {
+				String uri = profile.getURI();
+				if (SysmlResource.PROFILE_URI.equals(uri)){
+					return true;
+				}
+			}
+		}
+		return false; // always called even when not defined 
+	}
+
+	
+
+	/**
+	 * @see java.lang.Object#toString()
+	 *
+	 * @return
+	 */
+	@Override
+	public String toString() {
+		return String.format("HasStereotypeSysml14 %s (%s)", stereotypeName, getDisplayUnit().getElementMultiplicity() == 1 ? "Single" : "Multiple"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)
+	 * 
+	 * @param constraint
+	 * @return
+	 */
+	@Override
+	protected boolean equivalent(Constraint constraint) { 
+		if (super.equivalent(constraint)) {
+			return (constraint instanceof HasStereotypeSysml14Constraint);
+		}
+		return false;
+	}
+}
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/.settings/org.eclipse.jdt.core.prefs
index f287d53cf45..410244d65a6 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/.settings/org.eclipse.jdt.core.prefs
@@ -5,3 +5,287 @@ org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

 org.eclipse.jdt.core.compiler.source=1.6

+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_assignment=0

+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_after_package=1

+org.eclipse.jdt.core.formatter.blank_lines_before_field=0

+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

+org.eclipse.jdt.core.formatter.blank_lines_before_method=1

+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

+org.eclipse.jdt.core.formatter.blank_lines_before_package=0

+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

+org.eclipse.jdt.core.formatter.comment.format_block_comments=true

+org.eclipse.jdt.core.formatter.comment.format_header=false

+org.eclipse.jdt.core.formatter.comment.format_html=true

+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

+org.eclipse.jdt.core.formatter.comment.format_line_comments=true

+org.eclipse.jdt.core.formatter.comment.format_source_code=true

+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

+org.eclipse.jdt.core.formatter.comment.line_length=260

+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

+org.eclipse.jdt.core.formatter.compact_else_if=true

+org.eclipse.jdt.core.formatter.continuation_indentation=2

+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_empty_lines=false

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

+org.eclipse.jdt.core.formatter.indentation.size=4

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.join_lines_in_comments=false

+org.eclipse.jdt.core.formatter.join_wrapped_lines=false

+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.lineSplit=260

+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

+org.eclipse.jdt.core.formatter.tabulation.char=tab

+org.eclipse.jdt.core.formatter.tabulation.size=4

+org.eclipse.jdt.core.formatter.use_on_off_tags=false

+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/META-INF/MANIFEST.MF b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/META-INF/MANIFEST.MF
index cb19decd7b9..886ca0c1e22 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/META-INF/MANIFEST.MF
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/META-INF/MANIFEST.MF
@@ -35,7 +35,8 @@ Export-Package: org.eclipse.papyrus.sysml14.activities,
  org.eclipse.papyrus.sysml14.portandflows.util,
  org.eclipse.papyrus.sysml14.requirements,
  org.eclipse.papyrus.sysml14.requirements.internal.impl,
- org.eclipse.papyrus.sysml14.requirements.util
+ org.eclipse.papyrus.sysml14.requirements.util,
+ org.eclipse.papyrus.sysml14.util
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Bundle-Description: %pluginDescription
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/src/org/eclipse/papyrus/sysml14/util/SysmlResource.java b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/src/org/eclipse/papyrus/sysml14/util/SysmlResource.java
new file mode 100644
index 00000000000..6e1eaf76bfd
--- /dev/null
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14/src/org/eclipse/papyrus/sysml14/util/SysmlResource.java
@@ -0,0 +1,21 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml14.util;
+
+public class SysmlResource {
+
+	public static final String PROFILE_PATH = "platform:/plugin/org.eclipse.papyrus.sysml14/model/SysML.profile.uml"; //$NON-NLS-1$
+
+	public static final String PROFILE_URI = "http://www.omg.org/spec/SysML/20131201/SysML"; //$NON-NLS-1$
+
+	
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityParameterMaskEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityParameterMaskEditPolicy.java
new file mode 100644
index 00000000000..58f03bc792f
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityParameterMaskEditPolicy.java
@@ -0,0 +1,293 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.activity.edit.policies;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ParameterNodeNameEditPart;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.helper.ActivityParameterNodeLabelHelper;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
+import org.eclipse.uml2.uml.ActivityParameterNode;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.State;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.UMLPackage;
+
+
+public class ActivityParameterMaskEditPolicy extends AbstractMaskManagedEditPolicy {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void addAdditionalListeners() {
+		super.addAdditionalListeners();
+		ActivityParameterNode node = getUMLElement();
+		if (node == null) {
+			return;
+		}
+		//add listner to parameter
+		addListener(node.getParameter());
+		//add listner to type
+		addListener(node.getType());
+		//add listner to states
+		for (State state : node.getInStates()) {
+			addListener(state);
+		}
+	}
+
+	/**
+	 * Add this class to target's listners.
+	 * @param target may be null
+	 */
+	protected void addListener(Object target) {
+		if (target instanceof EObject) {
+			getDiagramEventBroker().addNotificationListener((EObject)target, this);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Collection<String> getDefaultDisplayValue() {
+		return ICustomAppearance.DEFAULT_UML_ACTIVITYPARAMETERNODE;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Map<String, String> getMasks() {
+		return ActivityParameterNodeLabelHelper.getInstance().getMasks();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ActivityParameterNode getUMLElement() {
+		if (hostSemanticElement instanceof ActivityParameterNode) {
+			return (ActivityParameterNode) hostSemanticElement;
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritedDoc}
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		super.notifyChanged(notification);
+		Object object = notification.getNotifier();
+		ActivityParameterNode activityParameterNode = getUMLElement();
+		if (object == null || activityParameterNode == null) {
+			return;
+		}
+		if (object.equals(activityParameterNode)) {
+			notifyActivityParameterNodeChanged(activityParameterNode, notification);
+		} else if (isParameter(object)) {
+			notifyParameterChanged(notification);
+		} else if (isType(object)) {
+			notifyTypeChanged(notification);
+		} else if (isState(object)) {
+			notifyStateChanged(notification);
+		}
+	}
+
+	/**
+	 * Checks if the given object is a Type of the ActivityParameterNode
+	 */
+	protected boolean isType(Object object) {
+		if (false == object instanceof Type) {
+			return false;
+		}
+		return object.equals(getUMLElement().getType());
+	}
+
+	/**
+	 * Checks if the given object is a Parameter of the ActivityParameterNode
+	 */
+	protected boolean isParameter(Object object) {
+		if (false == object instanceof Parameter) {
+			return false;
+		}
+		return object.equals(getUMLElement().getParameter());
+	}
+
+	/**
+	 * Checks if the given object is a State of the ActivityParameterNode
+	 */
+	protected boolean isState(Object object) {
+		if (false == object instanceof State) {
+			return false;
+		}
+		return getUMLElement().getInStates().contains(object);
+	}
+
+	/**
+	 * Checks if the given object is a Type of the ActivityParameterNode
+	 *
+	 * @param parameter
+	 *            the {@link Parameter} that has changed
+	 * @param notification
+	 *            the notification send when the element has been changed
+	 */
+	protected void notifyParameterChanged(Notification notification) {
+		if (UMLPackage.PARAMETER__NAME == notification.getFeatureID(Parameter.class)) {
+			refreshDisplay();
+		}
+	}
+
+	/**
+	 * notifies that a type of the activity parameter node has changed.
+	 *
+	 * @param parameter
+	 *            the {@link Parameter} that has changed
+	 * @param notification
+	 *            the notification send when the element has been changed
+	 */
+	protected void notifyTypeChanged(Notification notification) {
+		if (UMLPackage.TYPE__NAME == notification.getFeatureID(notification.getNotifier().getClass())) {
+			refreshDisplay();
+		}
+	}
+
+	protected void notifyStateChanged(Notification notification) {
+		if (UMLPackage.STATE__NAME == notification.getFeatureID(notification.getNotifier().getClass())) {
+			refreshDisplay();
+		}
+	}
+
+	/**
+	 * notifies that the the property has changed.
+	 *
+	 * @param node
+	 *            the ActivityParameterNode that has changed
+	 * @param notification
+	 *            the notification send when the element has been changed
+	 */
+	protected void notifyActivityParameterNodeChanged(ActivityParameterNode node, Notification notification) {
+		switch (notification.getFeatureID(ActivityParameterNode.class)) {
+		case UMLPackage.ACTIVITY_PARAMETER_NODE__NAME:
+			refreshDisplay();
+			break;
+		case UMLPackage.ACTIVITY_PARAMETER_NODE__PARAMETER:
+		case UMLPackage.ACTIVITY_PARAMETER_NODE__TYPE:
+		case UMLPackage.ACTIVITY_PARAMETER_NODE__IN_STATE:
+			switch (notification.getEventType()) {
+			case Notification.ADD:
+				addListener(notification.getNewValue());
+				refreshDisplay();
+				break;
+			case Notification.ADD_MANY:
+				if (notification.getNewValue() instanceof List<?>) {
+					List<?> addedElements = (List<?>) notification.getNewValue();
+					for (Object addedElement : addedElements) {
+						addListener(addedElement);
+					}
+				}
+				refreshDisplay();
+				break;
+			case Notification.REMOVE:
+				removeListenerFromElement(notification.getOldValue());
+				refreshDisplay();
+				break;
+			case Notification.REMOVE_MANY:
+				if (notification.getOldValue() instanceof List<?>) {
+					List<?> removedElements = (List<?>) notification.getOldValue();
+					for (Object removedElement : removedElements) {
+						removeListenerFromElement(removedElement);
+					}
+				}
+				refreshDisplay();
+				break;
+			case Notification.SET:
+				addListener(notification.getNewValue());
+				removeListenerFromElement(notification.getOldValue());
+				refreshDisplay();
+				break;
+			}
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void refreshDisplay() {
+		ActivityParameterNodeLabelHelper.getInstance().refreshEditPartDisplay((GraphicalEditPart) getHost());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void removeAdditionalListeners() {
+		super.removeAdditionalListeners();
+		ActivityParameterNode activityParameterNode = getUMLElement();
+		if (activityParameterNode == null) {
+			return;
+		}
+		// remove listner from parameter
+		removeListenerFromElement(activityParameterNode.getParameter());
+		// remove listner from type
+		removeListenerFromElement(activityParameterNode.getType());
+		// remove listner from states
+		for (State state: activityParameterNode.getInStates()) {
+			removeListenerFromElement(state);
+		}
+	}
+	
+	protected void removeListenerFromElement(Object target) {	
+		if (target instanceof EObject) {
+			getDiagramEventBroker().removeNotificationListener((EObject) target, this);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public EditPart getHost() {
+		GraphicalEditPart ep = (GraphicalEditPart) super.getHost();
+		if (ep instanceof ParameterNodeNameEditPart) {
+			return ep;
+		}
+		return ep.getChildBySemanticHint(Integer.toString(ParameterNodeNameEditPart.VISUAL_ID));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected View getView() {
+		View view = super.getView();
+		if (view instanceof Shape) {
+			return view;
+		}
+		return (View)view.eContainer();
+	}
+}
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/MaskManagedPinEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/MaskManagedPinEditPolicy.java
new file mode 100644
index 00000000000..89125e5ce72
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/MaskManagedPinEditPolicy.java
@@ -0,0 +1,63 @@
+/*****************************************************************************

+ * Copyright (c) 2009 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

+ *  Nizar GUEDIDI (CEA LIST) - Update getUMLElement()

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.activity.edit.policies;

+

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.Map;

+

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.papyrus.uml.diagram.activity.helper.PinLabelHelper;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEditPolicy;

+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;

+import org.eclipse.uml2.uml.Pin;

+

+public class MaskManagedPinEditPolicy extends AbstractMaskManagedEditPolicy {

+

+	public MaskManagedPinEditPolicy() {

+		super();

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	public Collection<String> getDefaultDisplayValue() {

+		return Arrays.asList(ICustomAppearance.DISP_NAME);

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	public Map<String, String> getMasks() {

+		return PinLabelHelper.getInstance().getMasks();

+	}

+

+	/**

+	 * {@inheritedDoc}

+	 */

+	@Override

+	public Pin getUMLElement() {

+		return PinLabelHelper.getInstance().getUMLElement((GraphicalEditPart) getHost());

+	}

+

+	/**

+	 * {@inheritedDoc}

+	 */

+	@Override

+	public void refreshDisplay() {

+		PinLabelHelper.getInstance().refreshEditPartDisplay((GraphicalEditPart) getHost());

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinLabelHelper.java
new file mode 100644
index 00000000000..f4190a8e127
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinLabelHelper.java
@@ -0,0 +1,97 @@
+package org.eclipse.papyrus.uml.diagram.activity.helper;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.Messages;
+import org.eclipse.papyrus.uml.diagram.common.helper.StereotypedElementLabelHelper;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
+import org.eclipse.papyrus.uml.tools.utils.TypeUtil;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Pin;
+import org.eclipse.uml2.uml.TypedElement;
+
+/**
+ * Helper for labels displaying {@link Pin}
+ */
+public class PinLabelHelper extends StereotypedElementLabelHelper {
+
+	private static PinLabelHelper labelHelper;
+
+	private final Map<String, String> masks = new HashMap<String, String>();
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public static PinLabelHelper getInstance() {
+		if (labelHelper == null) {
+			labelHelper = new PinLabelHelper();
+		}
+		return labelHelper;
+	}
+
+
+	private PinLabelHelper() {
+		masks.put(ICustomAppearance.DISP_TYPE, Messages.ICustomAppearance_PIN_DISP_TYPE);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected String elementLabel(GraphicalEditPart editPart) {
+		IMaskManagedLabelEditPolicy policy = (IMaskManagedLabelEditPolicy) editPart.getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (policy == null) {
+			policy = (IMaskManagedLabelEditPolicy) editPart.getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		Collection<String> displayValue = Collections.emptySet();
+		if (policy != null) {
+			displayValue = policy.getCurrentDisplayValue();
+		}
+		NamedElement namedElement = getUMLElement(editPart);
+		return namedElement != null ? getCustomLabel(namedElement, displayValue) : "";
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	private String getCustomLabel(NamedElement namedElement, Collection<String> maskValues) {
+		StringBuffer buffer = new StringBuffer();
+		if (maskValues.contains(ICustomAppearance.DISP_NAME)) {
+			buffer.append(" ");
+			buffer.append(namedElement.getName());
+		}
+		if (namedElement instanceof TypedElement) {
+			if (maskValues.contains(ICustomAppearance.DISP_TYPE)) {
+				if (((TypedElement) namedElement).getType() != null) {
+					buffer.append(": " + ((TypedElement) namedElement).getType().getName());
+				} else {
+					buffer.append(": " + TypeUtil.UNDEFINED_TYPE_NAME);
+				}
+			}
+		}
+		return buffer.toString();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Map<String, String> getMasks() {
+		return masks;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Pin getUMLElement(GraphicalEditPart editPart) {
+		Element element = super.getUMLElement(editPart);
+		return element instanceof Pin ? (Pin) element : null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/JoinSpecParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/JoinSpecParser.java
index 31208082513..a110d30bb8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/JoinSpecParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/parser/custom/JoinSpecParser.java
@@ -178,6 +178,9 @@ public class JoinSpecParser extends MessageFormatParser implements ISemanticPars
 	 * @return true if is valid, false otherwise

 	 */

 	private boolean isValidFeature(EStructuralFeature feature) {

+		if (feature == null){

+			return false;

+		}

 		return UMLPackage.eINSTANCE.getNamedElement_Name().equals(feature) || UMLPackage.eINSTANCE.getJoinNode_JoinSpec().equals(feature) || ValueSpecification.class.isAssignableFrom(feature.getContainerClass());

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen
index 3cc26ec2ab8..6e8730fffe5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.gmfgen
@@ -1780,6 +1780,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -1881,6 +1885,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -1982,6 +1990,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -2069,6 +2081,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -2261,6 +2277,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -2366,6 +2386,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -2471,6 +2495,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -2562,6 +2590,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -2752,6 +2784,10 @@
             notationViewFactoryClassName="ActionInputPinLabelViewFactory">
           <diagramRunTimeClass
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
@@ -2861,6 +2897,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -2967,6 +3007,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -3058,6 +3102,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -3150,6 +3198,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -3253,6 +3305,10 @@
             notationViewFactoryClassName="ActionInputPinLabelViewFactory">
           <diagramRunTimeClass
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
@@ -3362,6 +3418,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -4865,6 +4925,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -4967,6 +5031,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -5069,6 +5137,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -5157,6 +5229,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -5259,6 +5335,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -5361,6 +5441,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -5550,6 +5634,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -5652,6 +5740,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -5754,6 +5846,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -5842,6 +5938,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -5944,6 +6044,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -6046,6 +6150,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -6104,6 +6212,10 @@
             xsi:type="gmfgen:CustomBehaviour"
             key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy"/>
+        <behaviour
+            xsi:type="gmfgen:CustomBehaviour"
+            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityParameterMaskEditPolicy"/>
         <modelFacet>
           <metaClass
               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ActivityParameterNode"/>
@@ -6138,6 +6250,10 @@
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getNameLabel"
               figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>
+          <behaviour
+            xsi:type="gmfgen:CustomBehaviour"
+            key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityParameterMaskEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.15"/>
         </labels>
@@ -6336,6 +6452,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -6528,6 +6648,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -7012,6 +7136,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -7111,6 +7239,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -7211,6 +7343,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -7298,6 +7434,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -7385,6 +7525,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -7606,6 +7750,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -7688,6 +7836,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -7785,6 +7937,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -7882,6 +8038,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -8265,6 +8425,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -8562,6 +8726,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -8808,6 +8976,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -8891,6 +9063,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -9084,6 +9260,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -9172,6 +9352,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -9260,6 +9444,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -9348,6 +9536,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -9449,6 +9641,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -9550,6 +9746,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -9651,6 +9851,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -9752,6 +9956,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -9853,6 +10061,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -9953,6 +10165,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -10144,6 +10360,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -10230,6 +10450,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -10329,6 +10553,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -10530,6 +10758,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -10723,6 +10955,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -10811,6 +11047,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -10899,6 +11139,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -11000,6 +11244,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -11101,6 +11349,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -11202,6 +11454,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -11408,6 +11664,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -11510,6 +11770,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -11612,6 +11876,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -11998,6 +12266,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -12082,6 +12354,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -12166,6 +12442,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -12264,6 +12544,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -12362,6 +12646,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -12446,6 +12734,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -12543,6 +12835,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -12736,6 +13032,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -12816,6 +13116,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -12896,6 +13200,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -12976,6 +13284,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -13069,6 +13381,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -13162,6 +13478,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -13255,6 +13575,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -13455,6 +13779,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -13539,6 +13867,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -13623,6 +13955,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -13717,6 +14053,10 @@
             itemSemanticEditPolicyClassName="ActionInputPinInClearStructuralFeatureActionAsObjectLabelItemSemanticEditPolicy">
           <diagramRunTimeClass
               href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
@@ -13917,6 +14257,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -14001,6 +14345,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -14098,6 +14446,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -14296,6 +14648,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -14380,6 +14736,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -14464,6 +14824,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -14561,6 +14925,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -14758,6 +15126,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -14842,6 +15214,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -14939,6 +15315,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -15131,6 +15511,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -15215,6 +15599,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -15312,6 +15700,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -15505,6 +15897,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -15685,6 +16081,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -15769,6 +16169,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -15866,6 +16270,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -16059,6 +16467,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -16143,6 +16555,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -16227,6 +16643,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -16324,6 +16744,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -16517,6 +16941,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -16601,6 +17029,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -16685,6 +17117,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -16782,6 +17218,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -16974,6 +17414,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -17058,6 +17502,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
@@ -17155,6 +17603,10 @@
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel"/>
+          <behaviour
+              xsi:type="gmfgen:CustomBehaviour"
+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"
+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy"/>
           <modelFacet
               parser="/0/@labelParsers/@implementations.6"/>
         </labels>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCBActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCBActLabelEditPart.java
index 23d6815cda1..f7c6cfae3d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCBActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCBActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ActionInputPinInCBActLabelEditPart extends PapyrusLabelEditPart imp
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCOActAsTargetLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCOActAsTargetLabelEditPart.java
index dccaaa2a53d..a39111aaa01 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCOActAsTargetLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCOActAsTargetLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ActionInputPinInCOActAsTargetLabelEditPart extends PapyrusLabelEdit
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCOActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCOActLabelEditPart.java
index 1ab2c98bd88..7e67bc2f095 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCOActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCOActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ActionInputPinInCOActLabelEditPart extends PapyrusLabelEditPart imp
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInClearStructuralFeatureActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInClearStructuralFeatureActionAsObjectLabelEditPart.java
index 376d4fee25e..7130c8ff571 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInClearStructuralFeatureActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInClearStructuralFeatureActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionInputPinInClearStructuralFeatureActionAsObjectLabelEditPart e
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCreateLinkActionAsInputValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCreateLinkActionAsInputValueLabelEditPart.java
index 8719571e1d3..7ebc094f0e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCreateLinkActionAsInputValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCreateLinkActionAsInputValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionInputPinInCreateLinkActionAsInputValueLabelEditPart extends P
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInDestroyLinkActionAsInputValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInDestroyLinkActionAsInputValueLabelEditPart.java
index 7f0143b7dff..15497ee2ada 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInDestroyLinkActionAsInputValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInDestroyLinkActionAsInputValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionInputPinInDestroyLinkActionAsInputValueLabelEditPart extends
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInOActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInOActLabelEditPart.java
index 018390645fe..2bda213e7ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInOActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInOActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ActionInputPinInOActLabelEditPart extends PapyrusLabelEditPart impl
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInReadLinkActionAsInputValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInReadLinkActionAsInputValueLabelEditPart.java
index a830f207b48..cfca8be82b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInReadLinkActionAsInputValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInReadLinkActionAsInputValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionInputPinInReadLinkActionAsInputValueLabelEditPart extends Pap
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsReqLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsReqLabelEditPart.java
index 0b46c4b660e..8f416cbe9a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsReqLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsReqLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ActionInputPinInSendObjActAsReqLabelEditPart extends PapyrusLabelEd
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsTargetLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsTargetLabelEditPart.java
index 16ac32e18d3..234a91e4bd2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsTargetLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsTargetLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ActionInputPinInSendObjActAsTargetLabelEditPart extends PapyrusLabe
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActAsTargetLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActAsTargetLabelEditPart.java
index d5d962b5d78..f77fa0f09af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActAsTargetLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActAsTargetLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ActionInputPinInSendSigActAsTargetLabelEditPart extends PapyrusLabe
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActLabelEditPart.java
index 9cb62dc7114..4421b073f64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ActionInputPinInSendSigActLabelEditPart extends PapyrusLabelEditPar
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddStructuralFeatureValueActionAsInserAtLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddStructuralFeatureValueActionAsInserAtLabelEditPart.java
index d732e5fc54a..43066782d6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddStructuralFeatureValueActionAsInserAtLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddStructuralFeatureValueActionAsInserAtLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInAddStructuralFeatureValueActionAsInserAtLabelEditPart ex
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddStructuralFeatureValueActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddStructuralFeatureValueActionAsObjectLabelEditPart.java
index 43bed1f752a..3d7cd23145d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddStructuralFeatureValueActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddStructuralFeatureValueActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInAddStructuralFeatureValueActionAsObjectLabelEditPart ext
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddStructuralFeatureValueActionAsValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddStructuralFeatureValueActionAsValueLabelEditPart.java
index 53099bb5fed..dc59e1a3de2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddStructuralFeatureValueActionAsValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddStructuralFeatureValueActionAsValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInAddStructuralFeatureValueActionAsValueLabelEditPart exte
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddVariableValueActionAsInsertAtLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddVariableValueActionAsInsertAtLabelEditPart.java
index b7b9ecb36bd..e05ad3f50fa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddVariableValueActionAsInsertAtLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddVariableValueActionAsInsertAtLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInAddVariableValueActionAsInsertAtLabelEditPart extends Pa
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddVariableValueActionAsValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddVariableValueActionAsValueLabelEditPart.java
index 8343d0869d9..29f8c3b36cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddVariableValueActionAsValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInAddVariableValueActionAsValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInAddVariableValueActionAsValueLabelEditPart extends Papyr
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInBroadcastSignalActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInBroadcastSignalActionLabelEditPart.java
index db94250e898..7d6dd15e6ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInBroadcastSignalActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInBroadcastSignalActionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInBroadcastSignalActionLabelEditPart extends PapyrusLabelE
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInClearAssociationActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInClearAssociationActionAsObjectLabelEditPart.java
index 82a1459f883..60512a890a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInClearAssociationActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInClearAssociationActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInClearAssociationActionAsObjectLabelEditPart extends Papy
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInDestroyObjectActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInDestroyObjectActionLabelEditPart.java
index c5bdaf6e8af..bc5ed61ef15 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInDestroyObjectActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInDestroyObjectActionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInDestroyObjectActionLabelEditPart extends PapyrusLabelEdi
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInLoopNodeAsVariableLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInLoopNodeAsVariableLabelEditPart.java
index eef6b71ba44..d347fdc497a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInLoopNodeAsVariableLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInLoopNodeAsVariableLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInLoopNodeAsVariableLabelEditPart extends PapyrusLabelEdit
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInReadIsClassifiedObjectActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInReadIsClassifiedObjectActionAsObjectLabelEditPart.java
index 4bc2f9fd22b..f97c1151731 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInReadIsClassifiedObjectActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInReadIsClassifiedObjectActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInReadIsClassifiedObjectActionAsObjectLabelEditPart extend
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInReclassifyObjectActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInReclassifyObjectActionAsObjectLabelEditPart.java
index 7d4a66e5706..52055d1350c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInReclassifyObjectActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInReclassifyObjectActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInReclassifyObjectActionAsObjectLabelEditPart extends Papy
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInReduceActionAsCollectionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInReduceActionAsCollectionLabelEditPart.java
index 6a6234b345c..ea89d145da7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInReduceActionAsCollectionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInReduceActionAsCollectionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInReduceActionAsCollectionLabelEditPart extends PapyrusLab
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStartClassifierBehaviorActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStartClassifierBehaviorActionAsObjectLabelEditPart.java
index 7b5708d9575..bb38fa89041 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStartClassifierBehaviorActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStartClassifierBehaviorActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInStartClassifierBehaviorActionAsObjectLabelEditPart exten
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStartObjectBehaviorActionAsArgumentLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStartObjectBehaviorActionAsArgumentLabelEditPart.java
index c9819d8c9a8..0eb86cce3ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStartObjectBehaviorActionAsArgumentLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStartObjectBehaviorActionAsArgumentLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInStartObjectBehaviorActionAsArgumentLabelEditPart extends
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStartObjectBehaviorActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStartObjectBehaviorActionAsObjectLabelEditPart.java
index e4fa71c319e..d138f879f11 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStartObjectBehaviorActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStartObjectBehaviorActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInStartObjectBehaviorActionAsObjectLabelEditPart extends P
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java
index e261183bddf..d67e8ea162d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPar
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInTestIdentityActionAsFirstLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInTestIdentityActionAsFirstLabelEditPart.java
index 505e1b694dc..14e1c1892a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInTestIdentityActionAsFirstLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInTestIdentityActionAsFirstLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInTestIdentityActionAsFirstLabelEditPart extends PapyrusLa
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInTestIdentityActionAsSecondLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInTestIdentityActionAsSecondLabelEditPart.java
index 9e87afa4b29..cf424814c3c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInTestIdentityActionAsSecondLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionPinInTestIdentityActionAsSecondLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ActionPinInTestIdentityActionAsSecondLabelEditPart extends PapyrusL
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityParameterNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityParameterNodeEditPart.java
index ae9697df0e9..19cd30cb786 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityParameterNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityParameterNodeEditPart.java
@@ -30,8 +30,10 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityParameterMaskEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -81,6 +83,7 @@ public class ActivityParameterNodeEditPart extends RoundedBorderNamedElementEdit
 		installEditPolicy(EditPolicyRoles.OPEN_ROLE, new OpenDiagramEditPolicy());
 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PinLayoutEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new ActivityParameterMaskEditPolicy());
 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsInserAtLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsInserAtLabelEditPart.java
index f31670f81cf..f127357a5cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsInserAtLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsInserAtLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInAddStructuralFeatureValueActionAsInserAtLabelEditPart ext
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsObjectLabelEditPart.java
index 33897ee6cf4..0acd8084fd5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class InputPinInAddStructuralFeatureValueActionAsObjectLabelEditPart exte
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsValueLabel2EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsValueLabel2EditPart.java
index a62539d1284..5ce79f12ee8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsValueLabel2EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsValueLabel2EditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class InputPinInAddStructuralFeatureValueActionAsValueLabel2EditPart exte
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsInsertAtLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsInsertAtLabelEditPart.java
index fc06cfc0da8..2823ffb1366 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsInsertAtLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsInsertAtLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class InputPinInAddVariableValueActionAsInsertAtLabelEditPart extends Pap
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsValueLabelEditPart.java
index 991ce00fb24..553695bfcfa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class InputPinInAddVariableValueActionAsValueLabelEditPart extends Papyru
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInBroadcastSignalActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInBroadcastSignalActionLabelEditPart.java
index 668cabf654b..8c85db975ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInBroadcastSignalActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInBroadcastSignalActionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class InputPinInBroadcastSignalActionLabelEditPart extends PapyrusLabelEd
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCBActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCBActLabelEditPart.java
index 3926cab28b3..cafe0b46e2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCBActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCBActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class InputPinInCBActLabelEditPart extends PapyrusLabelEditPart implement
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCOActAsTargetLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCOActAsTargetLabelEditPart.java
index ab3d2ff8146..3167c4926fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCOActAsTargetLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCOActAsTargetLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class InputPinInCOActAsTargetLabelEditPart extends PapyrusLabelEditPart i
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCOActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCOActLabelEditPart.java
index 5e15e8d6a4b..b0bf223c56e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCOActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCOActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class InputPinInCOActLabelEditPart extends PapyrusLabelEditPart implement
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInClearAssociationActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInClearAssociationActionAsObjectLabelEditPart.java
index c0f4e9ae5db..e5edb6e9b58 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInClearAssociationActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInClearAssociationActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInClearAssociationActionAsObjectLabelEditPart extends Papyr
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInClearStructuralFeatureActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInClearStructuralFeatureActionAsObjectLabelEditPart.java
index 8d4a12777e1..e9ac4b31bc5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInClearStructuralFeatureActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInClearStructuralFeatureActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInClearStructuralFeatureActionAsObjectLabelEditPart extends
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCreateLinkActionAsInputValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCreateLinkActionAsInputValueLabelEditPart.java
index f2f77e12fc7..8d50af06991 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCreateLinkActionAsInputValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCreateLinkActionAsInputValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInCreateLinkActionAsInputValueLabelEditPart extends Papyrus
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInDestroyLinkActionAsInputValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInDestroyLinkActionAsInputValueLabelEditPart.java
index 9b350a3e64d..c1cdc3610db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInDestroyLinkActionAsInputValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInDestroyLinkActionAsInputValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInDestroyLinkActionAsInputValueLabelEditPart extends Papyru
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInDestroyObjectActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInDestroyObjectActionLabelEditPart.java
index 84c5f133909..60a4c07a361 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInDestroyObjectActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInDestroyObjectActionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class InputPinInDestroyObjectActionLabelEditPart extends PapyrusLabelEdit
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInLoopNodeAsVariableLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInLoopNodeAsVariableLabelEditPart.java
index 32f9090f207..31b195775bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInLoopNodeAsVariableLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInLoopNodeAsVariableLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class InputPinInLoopNodeAsVariableLabelEditPart extends PapyrusLabelEditP
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInOActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInOActLabelEditPart.java
index 7fa75200c6f..19cafac4baf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInOActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInOActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class InputPinInOActLabelEditPart extends PapyrusLabelEditPart implements
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadIsClassifiedObjectActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadIsClassifiedObjectActionAsObjectLabelEditPart.java
index 0289414757c..6c2951e9fe7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadIsClassifiedObjectActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadIsClassifiedObjectActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInReadIsClassifiedObjectActionAsObjectLabelEditPart extends
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadLinkActionAsInputValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadLinkActionAsInputValueLabelEditPart.java
index 637d6d93ed0..e9d3052c748 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadLinkActionAsInputValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadLinkActionAsInputValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInReadLinkActionAsInputValueLabelEditPart extends PapyrusLa
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadStructuralFeatureAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadStructuralFeatureAsObjectLabelEditPart.java
index 73eb1e7d6d4..87cf8d9dd60 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadStructuralFeatureAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadStructuralFeatureAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class InputPinInReadStructuralFeatureAsObjectLabelEditPart extends Papyru
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReclassifyObjectActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReclassifyObjectActionAsObjectLabelEditPart.java
index 633bfa0e5ed..ac62a323c7d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReclassifyObjectActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReclassifyObjectActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInReclassifyObjectActionAsObjectLabelEditPart extends Papyr
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReduceActionAsCollectionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReduceActionAsCollectionLabelEditPart.java
index 89bac79eba6..96e946bb8b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReduceActionAsCollectionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReduceActionAsCollectionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInReduceActionAsCollectionLabelEditPart extends PapyrusLabe
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsReqLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsReqLabelEditPart.java
index 32d4aa84fcc..4d96ac5a57e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsReqLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsReqLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class InputPinInSendObjActAsReqLabelEditPart extends PapyrusLabelEditPart
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsTargetLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsTargetLabelEditPart.java
index 9376a4e3ef3..a081f626d33 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsTargetLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsTargetLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class InputPinInSendObjActAsTargetLabelEditPart extends PapyrusLabelEditP
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActAsTargetLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActAsTargetLabelEditPart.java
index 07775697286..1f0b3ea599d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActAsTargetLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActAsTargetLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class InputPinInSendSigActAsTargetLabelEditPart extends PapyrusLabelEditP
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActLabelEditPart.java
index 3b1e5f16940..70b86c832b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class InputPinInSendSigActLabelEditPart extends PapyrusLabelEditPart impl
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStartClassifierBehaviorActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStartClassifierBehaviorActionAsObjectLabelEditPart.java
index a7bb0169052..5a60b886546 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStartClassifierBehaviorActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStartClassifierBehaviorActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInStartClassifierBehaviorActionAsObjectLabelEditPart extend
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStartObjectBehaviorActionAsArgumentLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStartObjectBehaviorActionAsArgumentLabelEditPart.java
index 7b6d7b687c6..7289c746cc4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStartObjectBehaviorActionAsArgumentLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStartObjectBehaviorActionAsArgumentLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInStartObjectBehaviorActionAsArgumentLabelEditPart extends
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStartObjectBehaviorActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStartObjectBehaviorActionAsObjectLabelEditPart.java
index df760f7ee16..7d440ac0f02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStartObjectBehaviorActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStartObjectBehaviorActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInStartObjectBehaviorActionAsObjectLabelEditPart extends Pa
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java
index c216107b591..7f819a8d458 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInTestIdentityActionAsFirstLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInTestIdentityActionAsFirstLabelEditPart.java
index d47684177b9..a196eddc3dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInTestIdentityActionAsFirstLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInTestIdentityActionAsFirstLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInTestIdentityActionAsFirstLabelEditPart extends PapyrusLab
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInTestIdentityActionAsSecondLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInTestIdentityActionAsSecondLabelEditPart.java
index fce8d581e47..1f711ec1938 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInTestIdentityActionAsSecondLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInTestIdentityActionAsSecondLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class InputPinInTestIdentityActionAsSecondLabelEditPart extends PapyrusLa
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAcceptEventActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAcceptEventActionLabelEditPart.java
index 1ac3d01192b..a15e664f9c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAcceptEventActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAcceptEventActionLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class OutputPinInAcceptEventActionLabelEditPart extends PapyrusLabelEditP
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAddStructuralFeatureValueActionAsResultLabel3EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAddStructuralFeatureValueActionAsResultLabel3EditPart.java
index e540a71f3ec..63b82bed536 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAddStructuralFeatureValueActionAsResultLabel3EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAddStructuralFeatureValueActionAsResultLabel3EditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class OutputPinInAddStructuralFeatureValueActionAsResultLabel3EditPart ex
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCBActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCBActLabelEditPart.java
index 09d7132af98..450496e79f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCBActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCBActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class OutputPinInCBActLabelEditPart extends PapyrusLabelEditPart implemen
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCOActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCOActLabelEditPart.java
index a8023e0c081..01bd5c0b758 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCOActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCOActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class OutputPinInCOActLabelEditPart extends PapyrusLabelEditPart implemen
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInClearStructuralFeatureActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInClearStructuralFeatureActionLabelEditPart.java
index 977fa9b7bc5..e58a151afa0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInClearStructuralFeatureActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInClearStructuralFeatureActionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class OutputPinInClearStructuralFeatureActionLabelEditPart extends Papyru
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCreateObjectActionAsResultLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCreateObjectActionAsResultLabelEditPart.java
index 28dcbc0b2a1..51f08576340 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCreateObjectActionAsResultLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCreateObjectActionAsResultLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class OutputPinInCreateObjectActionAsResultLabelEditPart extends PapyrusL
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsBodyOutputEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsBodyOutputEditPart.java
index ee8f4afaf46..4b02f8ce698 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsBodyOutputEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsBodyOutputEditPart.java
@@ -25,6 +25,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;
 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;
@@ -32,6 +33,7 @@ import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPol
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.OutputPinFigure;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedFloatingLabelEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
 import org.eclipse.swt.graphics.Color;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsBodyOutputLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsBodyOutputLabelEditPart.java
index 883b6d76c94..7d44707a8e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsBodyOutputLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsBodyOutputLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -59,6 +60,7 @@ import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
 import org.eclipse.papyrus.uml.diagram.activity.providers.UMLParserProvider;
 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedFloatingLabelEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.AccessibleEvent;
@@ -136,6 +138,7 @@ public class OutputPinInLoopNodeAsBodyOutputLabelEditPart extends PapyrusLabelEd
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsLoopVariableLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsLoopVariableLabelEditPart.java
index 45648c9a2ab..bd3dac05d7a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsLoopVariableLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsLoopVariableLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class OutputPinInLoopNodeAsLoopVariableLabelEditPart extends PapyrusLabel
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsResultLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsResultLabelEditPart.java
index d7ee65893f9..4c812a6a8c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsResultLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsResultLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class OutputPinInLoopNodeAsResultLabelEditPart extends PapyrusLabelEditPa
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInOActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInOActLabelEditPart.java
index 9778441d439..55259b72db7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInOActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInOActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class OutputPinInOActLabelEditPart extends PapyrusLabelEditPart implement
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadExtentActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadExtentActionLabelEditPart.java
index 4b45f265958..76f8e49168b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadExtentActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadExtentActionLabelEditPart.java
@@ -51,6 +51,7 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class OutputPinInReadExtentActionLabelEditPart extends AbstractLabelEditP
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadIsClassifiedObjectActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadIsClassifiedObjectActionLabelEditPart.java
index 5560fd26403..6abd14b7cdd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadIsClassifiedObjectActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadIsClassifiedObjectActionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class OutputPinInReadIsClassifiedObjectActionLabelEditPart extends Papyru
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadLinkActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadLinkActionLabelEditPart.java
index 2e61fb99b09..1a96e07f65b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadLinkActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadLinkActionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class OutputPinInReadLinkActionLabelEditPart extends PapyrusLabelEditPart
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadSelfActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadSelfActionLabelEditPart.java
index e53b434a1d5..819e8d705c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadSelfActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadSelfActionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class OutputPinInReadSelfActionLabelEditPart extends PapyrusLabelEditPart
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadStructuralFeatureAsResultLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadStructuralFeatureAsResultLabelEditPart.java
index 42bc031b407..ceb14580ac6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadStructuralFeatureAsResultLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadStructuralFeatureAsResultLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class OutputPinInReadStructuralFeatureAsResultLabelEditPart extends Papyr
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadVariableActionAsResultLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadVariableActionAsResultLabelEditPart.java
index 6e20eee533b..4906ec15c16 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadVariableActionAsResultLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadVariableActionAsResultLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -136,6 +137,7 @@ public class OutputPinInReadVariableActionAsResultLabelEditPart extends PapyrusL
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReduceActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReduceActionLabelEditPart.java
index f57f53ce153..4dfe1d4254e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReduceActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReduceActionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class OutputPinInReduceActionLabelEditPart extends PapyrusLabelEditPart i
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInStartObjectBehaviorActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInStartObjectBehaviorActionLabelEditPart.java
index 93a3f6a936f..887504c8e75 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInStartObjectBehaviorActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInStartObjectBehaviorActionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class OutputPinInStartObjectBehaviorActionLabelEditPart extends PapyrusLa
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java
index c6bd5a3e739..9c57831d00a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class OutputPinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPar
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInTestIdentityActionItemLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInTestIdentityActionItemLabelEditPart.java
index 1c34701594c..32509589c12 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInTestIdentityActionItemLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInTestIdentityActionItemLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class OutputPinInTestIdentityActionItemLabelEditPart extends PapyrusLabel
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInValSpecActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInValSpecActLabelEditPart.java
index b9df7606ac2..c8ea0b6e24e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInValSpecActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInValSpecActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class OutputPinInValSpecActLabelEditPart extends PapyrusLabelEditPart imp
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ParameterNodeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ParameterNodeNameEditPart.java
index c2daa08e5e7..42fb44b30b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ParameterNodeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ParameterNodeNameEditPart.java
@@ -50,6 +50,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirect
 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityParameterMaskEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
 import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
@@ -127,6 +128,7 @@ public class ParameterNodeNameEditPart extends PapyrusCompartmentEditPart implem
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new ActivityParameterMaskEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddStructuralFeatureValueActionAsInserAtLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddStructuralFeatureValueActionAsInserAtLabelEditPart.java
index 0a894f61d2a..efeebe5fc28 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddStructuralFeatureValueActionAsInserAtLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddStructuralFeatureValueActionAsInserAtLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInAddStructuralFeatureValueActionAsInserAtLabelEditPart ext
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddStructuralFeatureValueActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddStructuralFeatureValueActionAsObjectLabelEditPart.java
index f61deac8c30..4320b94a8e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddStructuralFeatureValueActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddStructuralFeatureValueActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInAddStructuralFeatureValueActionAsObjectLabelEditPart exte
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddStructuralFeatureValueActionAsValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddStructuralFeatureValueActionAsValueLabelEditPart.java
index a9b1022cb82..327f6e2c459 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddStructuralFeatureValueActionAsValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddStructuralFeatureValueActionAsValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInAddStructuralFeatureValueActionAsValueLabelEditPart exten
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddVariableValueActionAsInsertAtLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddVariableValueActionAsInsertAtLabelEditPart.java
index d0fbd381700..2538e97e881 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddVariableValueActionAsInsertAtLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddVariableValueActionAsInsertAtLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInAddVariableValueActionAsInsertAtLabelEditPart extends Pap
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddVariableValueActionAsValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddVariableValueActionAsValueLabelEditPart.java
index 854491dbea1..a5fb3c32b89 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddVariableValueActionAsValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInAddVariableValueActionAsValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInAddVariableValueActionAsValueLabelEditPart extends Papyru
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInBroadcastSignalActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInBroadcastSignalActionLabelEditPart.java
index 79762d2b744..aa5d431ac36 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInBroadcastSignalActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInBroadcastSignalActionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInBroadcastSignalActionLabelEditPart extends PapyrusLabelEd
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCBActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCBActLabelEditPart.java
index d764a389056..97039e36e6b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCBActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCBActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ValuePinInCBActLabelEditPart extends PapyrusLabelEditPart implement
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCOActAsTargetLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCOActAsTargetLabelEditPart.java
index c665f28e4f6..7221ce5dc6b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCOActAsTargetLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCOActAsTargetLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ValuePinInCOActAsTargetLabelEditPart extends PapyrusLabelEditPart i
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCOActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCOActLabelEditPart.java
index 6e81e8cb426..d88cbde17e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCOActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCOActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ValuePinInCOActLabelEditPart extends PapyrusLabelEditPart implement
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInClearAssociationActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInClearAssociationActionAsObjectLabelEditPart.java
index 1be03120e39..307041b08fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInClearAssociationActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInClearAssociationActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInClearAssociationActionAsObjectLabelEditPart extends Papyr
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInClearStructuralFeatureActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInClearStructuralFeatureActionAsObjectLabelEditPart.java
index 6b1f15848e7..7b6ff9e3587 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInClearStructuralFeatureActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInClearStructuralFeatureActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInClearStructuralFeatureActionAsObjectLabelEditPart extends
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCreateLinkActionAsInputValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCreateLinkActionAsInputValueLabelEditPart.java
index 217ea765f4c..5fd0a1ee195 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCreateLinkActionAsInputValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCreateLinkActionAsInputValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInCreateLinkActionAsInputValueLabelEditPart extends Papyrus
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInDestroyLinkActionAsInputValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInDestroyLinkActionAsInputValueLabelEditPart.java
index 4f95bb6699e..2cc44d32d19 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInDestroyLinkActionAsInputValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInDestroyLinkActionAsInputValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInDestroyLinkActionAsInputValueLabelEditPart extends Papyru
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInDestroyObjectActionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInDestroyObjectActionLabelEditPart.java
index 82d9f4d7c79..42c05be4c6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInDestroyObjectActionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInDestroyObjectActionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInDestroyObjectActionLabelEditPart extends PapyrusLabelEdit
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInLoopNodeAsVariableLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInLoopNodeAsVariableLabelEditPart.java
index 0b3cb81ddc6..f9bbb14fa23 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInLoopNodeAsVariableLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInLoopNodeAsVariableLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInLoopNodeAsVariableLabelEditPart extends PapyrusLabelEditP
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInOActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInOActLabelEditPart.java
index 7b1f81f11de..9c7d5eca08a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInOActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInOActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ValuePinInOActLabelEditPart extends PapyrusLabelEditPart implements
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReadIsClassifiedObjectActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReadIsClassifiedObjectActionAsObjectLabelEditPart.java
index d937c531ed7..6fa273400e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReadIsClassifiedObjectActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReadIsClassifiedObjectActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInReadIsClassifiedObjectActionAsObjectLabelEditPart extends
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReadLinkActionAsInputValueLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReadLinkActionAsInputValueLabelEditPart.java
index a6c182420cc..63c180c895e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReadLinkActionAsInputValueLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReadLinkActionAsInputValueLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInReadLinkActionAsInputValueLabelEditPart extends PapyrusLa
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReclassifyObjectActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReclassifyObjectActionAsObjectLabelEditPart.java
index dc89d56cbcd..1f5928eaee1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReclassifyObjectActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReclassifyObjectActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInReclassifyObjectActionAsObjectLabelEditPart extends Papyr
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReduceActionAsCollectionLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReduceActionAsCollectionLabelEditPart.java
index 8ce0c631e6c..8cafb8c4cbb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReduceActionAsCollectionLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInReduceActionAsCollectionLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInReduceActionAsCollectionLabelEditPart extends PapyrusLabe
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsReqLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsReqLabelEditPart.java
index 25fb2cdc530..fea2869fdc8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsReqLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsReqLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ValuePinInSendObjActAsReqLabelEditPart extends PapyrusLabelEditPart
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsTargetLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsTargetLabelEditPart.java
index 079ac0c4cf4..b762af31047 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsTargetLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsTargetLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ValuePinInSendObjActAsTargetLabelEditPart extends PapyrusLabelEditP
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActAsTargetLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActAsTargetLabelEditPart.java
index 0943e2524b8..1186b410289 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActAsTargetLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActAsTargetLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ValuePinInSendSigActAsTargetLabelEditPart extends PapyrusLabelEditP
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActLabelEditPart.java
index 1719833687e..3a1ea3c75d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActLabelEditPart.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -141,6 +142,7 @@ public class ValuePinInSendSigActLabelEditPart extends PapyrusLabelEditPart impl
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStartClassifierBehaviorActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStartClassifierBehaviorActionAsObjectLabelEditPart.java
index 5d087e2c36e..264a3362f08 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStartClassifierBehaviorActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStartClassifierBehaviorActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInStartClassifierBehaviorActionAsObjectLabelEditPart extend
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStartObjectBehaviorActionAsArgumentLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStartObjectBehaviorActionAsArgumentLabelEditPart.java
index e775977e39c..880f2a55b22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStartObjectBehaviorActionAsArgumentLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStartObjectBehaviorActionAsArgumentLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInStartObjectBehaviorActionAsArgumentLabelEditPart extends
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStartObjectBehaviorActionAsObjectLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStartObjectBehaviorActionAsObjectLabelEditPart.java
index 0a564ea8ee8..ac4aca9cba0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStartObjectBehaviorActionAsObjectLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStartObjectBehaviorActionAsObjectLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInStartObjectBehaviorActionAsObjectLabelEditPart extends Pa
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java
index bdc1302b5f0..42ff20e7289 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInStructuredActivityNodeAsStructuredNodeInputsLabelEditPart
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInTestIdentityActionAsFirstLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInTestIdentityActionAsFirstLabelEditPart.java
index 6f9d04efeff..2eacbdf8411 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInTestIdentityActionAsFirstLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInTestIdentityActionAsFirstLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInTestIdentityActionAsFirstLabelEditPart extends PapyrusLab
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInTestIdentityActionAsSecondLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInTestIdentityActionAsSecondLabelEditPart.java
index c230fc0cfba..8be3455c2f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInTestIdentityActionAsSecondLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInTestIdentityActionAsSecondLabelEditPart.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MaskManagedPinEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.UMLTextSelectionEditPolicy;
 import org.eclipse.papyrus.uml.diagram.activity.figures.SimpleLabel;
 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
@@ -135,6 +136,7 @@ public class ValuePinInTestIdentityActionAsSecondLabelEditPart extends PapyrusLa
 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy());
+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedPinEditPolicy());
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java
deleted file mode 100644
index fc7971086ad..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.clazz.custom.policies;

-

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.uml2.uml.ElementImport;

-

-/**

- * Edit Policy for Applied Stereotype Label for {@link ElementImport}.

- * <p>

- * It simply adds a tag "import" to the label. Thanks to GMF, it is not possible to call a cTor with a parameter. So it calls super cTor with the "import" parameter

- * </p>

- */

-public class AppliedStereotypeElementImportLabelDisplayEditPolicy extends AppliedStereotypeLinkLabelDisplayEditPolicy {

-

-	/**

-	 * Creates a new AppliedStereotypeElementImportLabelDisplayEditPolicy, with the correct tag.

-	 */

-	public AppliedStereotypeElementImportLabelDisplayEditPolicy() {

-		super("Import");

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeInformationFlowLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeInformationFlowLabelDisplayEditPolicy.java
deleted file mode 100644
index 5c23528d9e1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeInformationFlowLabelDisplayEditPolicy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.clazz.custom.policies;

-

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.uml2.uml.InformationFlow;

-

-/**

- * Edit Policy for Applied Stereotype Label for {@link InformationFlow}.

- */

-public class AppliedStereotypeInformationFlowLabelDisplayEditPolicy extends AppliedStereotypeLinkLabelDisplayEditPolicy {

-

-	/**

-	 * Creates the EditPolicy, with the correct tag.

-	 */

-	public AppliedStereotypeInformationFlowLabelDisplayEditPolicy() {

-		super("flow"); //$NON-NLS-1$

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/providers/CustomUMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/providers/CustomUMLParserProvider.java
index ff7df039e9a..c8cea05014b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/providers/CustomUMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/providers/CustomUMLParserProvider.java
@@ -24,6 +24,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeDepende
 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeElementImportEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeInterfaceRealizationEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageMergeEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeRealizationEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeSubstitutionEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeUsageEditPart;

@@ -33,6 +34,8 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchRoleEdi
 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNameEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationSourceNameEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationTargetNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowAppliedStereotypeEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

@@ -44,6 +47,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPar
 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.parsers.MessageFormatParser;

 import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.parser.custom.AssociationEndParser;

 import org.eclipse.papyrus.uml.diagram.common.parser.custom.AssociationMultiplicityParser;

 import org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser;

@@ -65,8 +69,11 @@ public class CustomUMLParserProvider extends UMLParserProvider {
 	}

 

 	protected IParser getAppliedStereotypeParser() {

-		IParser parser = new AppliedStereotypeParser();

-		return parser;

+		return new AppliedStereotypeParser();

+	}

+

+	protected IParser getAppliedStereotypeParser(String defaultPrintString) {

+		return new AppliedStereotypeParser(defaultPrintString);

 	}

 

 	protected IParser getAssociationBranchRole() {

@@ -170,15 +177,21 @@ public class CustomUMLParserProvider extends UMLParserProvider {
 		case AppliedStereotypeRealizationEditPart.VISUAL_ID:

 			return getAppliedStereotypeParser();

 		case AppliedStereotypeAbstractionEditPart.VISUAL_ID:

-			return getAppliedStereotypeParser();

+			return getAppliedStereotypeParser("abstraction"); //$NON-NLS-1$

 		case AppliedStereotypeUsageEditPart.VISUAL_ID:

-			return getAppliedStereotypeParser();

+			return getAppliedStereotypeParser("use"); //$NON-NLS-1$

 		case AppliedStereotypeDependencyEditPart.VISUAL_ID:

 			return getAppliedStereotypeParser();

 		case AppliedStereotypeElementImportEditPart.VISUAL_ID:

-			return getAppliedStereotypeParser();

+			return getAppliedStereotypeParser("Import"); //$NON-NLS-1$

 		case AppliedStereotypePackageImportEditPart.VISUAL_ID:

 			return getAppliedStereotypeParser();

+		case InformationFlowAppliedStereotypeEditPart.VISUAL_ID:

+			return getAppliedStereotypeParser("flow"); //$NON-NLS-1$

+		case ContextLinkAppliedStereotypeEditPart.VISUAL_ID:

+			return getAppliedStereotypeParser(CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy.APPLIED_STEREOTYPE_LABEL);

+		case AppliedStereotypePackageMergeEditPart.VISUAL_ID:

+			return getAppliedStereotypeParser("merge"); //$NON-NLS-1$

 		}

 		return super.getParser(visualID);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations
index 979b16d2987..c955ea5acd4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations
@@ -1,388 +1,1162 @@
 <?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" name="PapyrusUMLClassDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxfnPzEeSnGJwaJWHCSg" name="Abstraction" identifier="org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006" hint="4006">
-    <iconEntry xmi:id="_rWNxf3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+<elementtypesconfigurations:ElementTypeSetConfiguration
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
+    xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"
+    name="PapyrusUMLClassDiagram"
+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxfnPzEeSnGJwaJWHCSg"
+      name="Abstraction"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006"
+      hint="4006">
+    <iconEntry
+        xmi:id="_rWNxf3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Abstraction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxSnPzEeSnGJwaJWHCSg" name="Association Class" identifier="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_2013" hint="2013">
-    <iconEntry xmi:id="_rWNxS3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxSnPzEeSnGJwaJWHCSg"
+      name="Association Class"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_2013"
+      hint="2013">
+    <iconEntry
+        xmi:id="_rWNxS3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/AssociationClass.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.AssociationClass</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxcHPzEeSnGJwaJWHCSg" name="Association Class Link" identifier="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_4017" hint="4017">
-    <iconEntry xmi:id="_rWNxcXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxcHPzEeSnGJwaJWHCSg"
+      name="Association Class Link"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_4017"
+      hint="4017">
+    <iconEntry
+        xmi:id="_rWNxcXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/AssociationClass.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.AssociationClass</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxTHPzEeSnGJwaJWHCSg" name="Association Node" identifier="org.eclipse.papyrus.uml.diagram.clazz.Association_2015" hint="2015">
-    <iconEntry xmi:id="_rWNxTXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxTHPzEeSnGJwaJWHCSg"
+      name="Association Node"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Association_2015"
+      hint="2015">
+    <iconEntry
+        xmi:id="_rWNxTXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Association.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxcnPzEeSnGJwaJWHCSg" name="Association Link" identifier="org.eclipse.papyrus.uml.diagram.clazz.Association_4001" hint="4001">
-    <iconEntry xmi:id="_rWNxc3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxcnPzEeSnGJwaJWHCSg"
+      name="Association Link"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Association_4001"
+      hint="4001">
+    <iconEntry
+        xmi:id="_rWNxc3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Association.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxdHPzEeSnGJwaJWHCSg" name="Association Branch Link" identifier="org.eclipse.papyrus.uml.diagram.clazz.Association_4019" hint="4019">
-    <iconEntry xmi:id="_rWNxdXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxdHPzEeSnGJwaJWHCSg"
+      name="Association Branch Link"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Association_4019"
+      hint="4019">
+    <iconEntry
+        xmi:id="_rWNxdXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Association.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxXnPzEeSnGJwaJWHCSg" name="Class" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_2008" hint="2008">
-    <iconEntry xmi:id="_rWNxX3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxXnPzEeSnGJwaJWHCSg"
+      name="Class"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_2008"
+      hint="2008">
+    <iconEntry
+        xmi:id="_rWNxX3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw7nPzEeSnGJwaJWHCSg" name="Class" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3004" hint="3004">
-    <iconEntry xmi:id="_rWNw73PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw7nPzEeSnGJwaJWHCSg"
+      name="Class"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3004"
+      hint="3004">
+    <iconEntry
+        xmi:id="_rWNw73PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw8HPzEeSnGJwaJWHCSg" name="Class" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3008" hint="3008">
-    <iconEntry xmi:id="_rWNw8XPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw8HPzEeSnGJwaJWHCSg"
+      name="Class"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3008"
+      hint="3008">
+    <iconEntry
+        xmi:id="_rWNw8XPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxIHPzEeSnGJwaJWHCSg" name="Class" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3010" hint="3010">
-    <iconEntry xmi:id="_rWNxIXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxIHPzEeSnGJwaJWHCSg"
+      name="Class"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3010"
+      hint="3010">
+    <iconEntry
+        xmi:id="_rWNxIXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw7HPzEeSnGJwaJWHCSg" name="Class" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3014" hint="3014">
-    <iconEntry xmi:id="_rWNw7XPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw7HPzEeSnGJwaJWHCSg"
+      name="Class"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3014"
+      hint="3014">
+    <iconEntry
+        xmi:id="_rWNw7XPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxAHPzEeSnGJwaJWHCSg" name="Classifier Template Parameter" identifier="org.eclipse.papyrus.uml.diagram.clazz.ClassifierTemplateParameter_3031" hint="3031">
-    <iconEntry xmi:id="_rWNxAXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/ClassifierTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxAHPzEeSnGJwaJWHCSg"
+      name="Classifier Template Parameter"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.ClassifierTemplateParameter_3031"
+      hint="3031">
+    <iconEntry
+        xmi:id="_rWNxAXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/ClassifierTemplateParameter.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ClassifierTemplateParameter</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxjnPzEeSnGJwaJWHCSg" name="Comment Annotated Element" identifier="org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013" hint="4013">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxjnPzEeSnGJwaJWHCSg"
+      name="Comment Annotated Element"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"
+      hint="4013">
     <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxZnPzEeSnGJwaJWHCSg" name="Comment" identifier="org.eclipse.papyrus.uml.diagram.clazz.Comment_2012" hint="2012">
-    <iconEntry xmi:id="_rWNxZ3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxZnPzEeSnGJwaJWHCSg"
+      name="Comment"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"
+      hint="2012">
+    <iconEntry
+        xmi:id="_rWNxZ3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Comment.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxJnPzEeSnGJwaJWHCSg" name="Comment" identifier="org.eclipse.papyrus.uml.diagram.clazz.Comment_3028" hint="3028">
-    <iconEntry xmi:id="_rWNxJ3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxJnPzEeSnGJwaJWHCSg"
+      name="Comment"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"
+      hint="3028">
+    <iconEntry
+        xmi:id="_rWNxJ3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Comment.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxUHPzEeSnGJwaJWHCSg" name="Component" identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_2002" hint="2002">
-    <iconEntry xmi:id="_rWNxUXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxUHPzEeSnGJwaJWHCSg"
+      name="Component"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_2002"
+      hint="2002">
+    <iconEntry
+        xmi:id="_rWNxUXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Component.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxEnPzEeSnGJwaJWHCSg" name="Component" identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_3021" hint="3021">
-    <iconEntry xmi:id="_rWNxE3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxEnPzEeSnGJwaJWHCSg"
+      name="Component"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_3021"
+      hint="3021">
+    <iconEntry
+        xmi:id="_rWNxE3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Component.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw_HPzEeSnGJwaJWHCSg" name="Connectable Element Template Parameter" identifier="org.eclipse.papyrus.uml.diagram.clazz.ConnectableElementTemplateParameter_3034" hint="3034">
-    <iconEntry xmi:id="_rWNw_XPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/ConnectableElementTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw_HPzEeSnGJwaJWHCSg"
+      name="Connectable Element Template Parameter"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.ConnectableElementTemplateParameter_3034"
+      hint="3034">
+    <iconEntry
+        xmi:id="_rWNw_XPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/ConnectableElementTemplateParameter.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ConnectableElementTemplateParameter</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxj3PzEeSnGJwaJWHCSg" name="Constraint Constrained Element" identifier="org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014" hint="4014">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxj3PzEeSnGJwaJWHCSg"
+      name="Constraint Constrained Element"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"
+      hint="4014">
     <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWOX8HPzEeSnGJwaJWHCSg" name="Constraint Context" identifier="org.eclipse.papyrus.uml.diagram.clazz.ConstraintContext_8500" hint="8500">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWOX8HPzEeSnGJwaJWHCSg"
+      name="Constraint Context"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.ConstraintContext_8500"
+      hint="8500">
     <specializedTypesID>org.eclipse.papyrus.uml.Constraint.Context</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxZHPzEeSnGJwaJWHCSg" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011" hint="2011">
-    <iconEntry xmi:id="_rWNxZXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>

-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxKHPzEeSnGJwaJWHCSg" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029" hint="3029">
-    <iconEntry xmi:id="_rWNxKXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>

-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxlnPzEeSnGJwaJWHCSg" name="org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023" identifier="org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023" hint="4023">
-    <specializedTypesID>org.eclipse.papyrus.uml.Namespace.OwnedMember</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxYnPzEeSnGJwaJWHCSg" name="Data Type" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_2010" hint="2010">
-    <iconEntry xmi:id="_rWNxY3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxZHPzEeSnGJwaJWHCSg"
+      name="Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"
+      hint="2011">
+    <iconEntry
+        xmi:id="_rWNxZXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Constraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxKHPzEeSnGJwaJWHCSg"
+      name="Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"
+      hint="3029">
+    <iconEntry
+        xmi:id="_rWNxKXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Constraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxlnPzEeSnGJwaJWHCSg"
+      name="org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023"
+      hint="4023">
+    <specializedTypesID>org.eclipse.papyrus.uml.Element.OwnedElement</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxYnPzEeSnGJwaJWHCSg"
+      name="Data Type"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_2010"
+      hint="2010">
+    <iconEntry
+        xmi:id="_rWNxY3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/DataType.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxJHPzEeSnGJwaJWHCSg" name="Data Type" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027" hint="3027">
-    <iconEntry xmi:id="_rWNxJXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxJHPzEeSnGJwaJWHCSg"
+      name="Data Type"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"
+      hint="3027">
+    <iconEntry
+        xmi:id="_rWNxJXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/DataType.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxQHPzEeSnGJwaJWHCSg" name="Data Type" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3043" hint="3043">
-    <iconEntry xmi:id="_rWNxQXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxQHPzEeSnGJwaJWHCSg"
+      name="Data Type"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3043"
+      hint="3043">
+    <iconEntry
+        xmi:id="_rWNxQXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/DataType.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxPHPzEeSnGJwaJWHCSg" name="Data Type" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3044" hint="3044">
-    <iconEntry xmi:id="_rWNxPXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxPHPzEeSnGJwaJWHCSg"
+      name="Data Type"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3044"
+      hint="3044">
+    <iconEntry
+        xmi:id="_rWNxPXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/DataType.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxPnPzEeSnGJwaJWHCSg" name="Data Type" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3045" hint="3045">
-    <iconEntry xmi:id="_rWNxP3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxPnPzEeSnGJwaJWHCSg"
+      name="Data Type"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3045"
+      hint="3045">
+    <iconEntry
+        xmi:id="_rWNxP3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/DataType.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxSHPzEeSnGJwaJWHCSg" name="Dependency Node" identifier="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014" hint="2014">
-    <iconEntry xmi:id="_rWNxSXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxSHPzEeSnGJwaJWHCSg"
+      name="Dependency Node"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"
+      hint="2014">
+    <iconEntry
+        xmi:id="_rWNxSXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Dependency.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxgnPzEeSnGJwaJWHCSg" name="Dependency Link" identifier="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008" hint="4008">
-    <iconEntry xmi:id="_rWNxg3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxgnPzEeSnGJwaJWHCSg"
+      name="Dependency Link"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"
+      hint="4008">
+    <iconEntry
+        xmi:id="_rWNxg3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Dependency.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxhHPzEeSnGJwaJWHCSg" name="Dependency Branch Link" identifier="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018" hint="4018">
-    <iconEntry xmi:id="_rWNxhXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxhHPzEeSnGJwaJWHCSg"
+      name="Dependency Branch Link"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018"
+      hint="4018">
+    <iconEntry
+        xmi:id="_rWNxhXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Dependency.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxaHPzEeSnGJwaJWHCSg" name="Short Cut Diagram" identifier="org.eclipse.papyrus.uml.diagram.clazz.Diagram_2016" hint="2016">
-    <iconEntry xmi:id="_rWNxaXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Diagram.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxmHPzEeSnGJwaJWHCSg" name="Duration Observation Event" identifier="org.eclipse.papyrus.uml.diagram.clazz.DurationObservationEvent_4025" hint="4025">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxaHPzEeSnGJwaJWHCSg"
+      name="Short Cut Diagram"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Diagram_2016"
+      hint="2016">
+    <iconEntry
+        xmi:id="_rWNxaXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Diagram.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxmHPzEeSnGJwaJWHCSg"
+      name="Duration Observation Event"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.DurationObservationEvent_4025"
+      hint="4025">
+    <specializedTypesID>org.eclipse.papyrus.uml.DurationObservation</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxanPzEeSnGJwaJWHCSg" name="Duration Observation" identifier="org.eclipse.papyrus.uml.diagram.clazz.DurationObservation_2095" hint="2095">
-    <iconEntry xmi:id="_rWNxa3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxanPzEeSnGJwaJWHCSg"
+      name="Duration Observation"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.DurationObservation_2095"
+      hint="2095">
+    <iconEntry
+        xmi:id="_rWNxa3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/DurationObservation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.DurationObservation</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxhnPzEeSnGJwaJWHCSg" name="Element Import" identifier="org.eclipse.papyrus.uml.diagram.clazz.ElementImport_4009" hint="4009">
-    <iconEntry xmi:id="_rWNxh3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/ElementImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxhnPzEeSnGJwaJWHCSg"
+      name="Element Import"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.ElementImport_4009"
+      hint="4009">
+    <iconEntry
+        xmi:id="_rWNxh3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/ElementImport.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ElementImport</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxBHPzEeSnGJwaJWHCSg" name="Enumeration Literal" identifier="org.eclipse.papyrus.uml.diagram.clazz.EnumerationLiteral_3017" hint="3017">
-    <iconEntry xmi:id="_rWNxBXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/EnumerationLiteral.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxBHPzEeSnGJwaJWHCSg"
+      name="Enumeration Literal"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.EnumerationLiteral_3017"
+      hint="3017">
+    <iconEntry
+        xmi:id="_rWNxBXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/EnumerationLiteral.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.EnumerationLiteral</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxWHPzEeSnGJwaJWHCSg" name="Enumeration" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_2006" hint="2006">
-    <iconEntry xmi:id="_rWNxWXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxWHPzEeSnGJwaJWHCSg"
+      name="Enumeration"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_2006"
+      hint="2006">
+    <iconEntry
+        xmi:id="_rWNxWXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Enumeration.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxGnPzEeSnGJwaJWHCSg" name="Enumeration" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025" hint="3025">
-    <iconEntry xmi:id="_rWNxG3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxGnPzEeSnGJwaJWHCSg"
+      name="Enumeration"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"
+      hint="3025">
+    <iconEntry
+        xmi:id="_rWNxG3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Enumeration.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxMHPzEeSnGJwaJWHCSg" name="Enumeration" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3052" hint="3052">
-    <iconEntry xmi:id="_rWNxMXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxMHPzEeSnGJwaJWHCSg"
+      name="Enumeration"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3052"
+      hint="3052">
+    <iconEntry
+        xmi:id="_rWNxMXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Enumeration.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxMnPzEeSnGJwaJWHCSg" name="Enumeration" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3053" hint="3053">
-    <iconEntry xmi:id="_rWNxM3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxMnPzEeSnGJwaJWHCSg"
+      name="Enumeration"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3053"
+      hint="3053">
+    <iconEntry
+        xmi:id="_rWNxM3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Enumeration.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxNHPzEeSnGJwaJWHCSg" name="Enumeration" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3054" hint="3054">
-    <iconEntry xmi:id="_rWNxNXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxNHPzEeSnGJwaJWHCSg"
+      name="Enumeration"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3054"
+      hint="3054">
+    <iconEntry
+        xmi:id="_rWNxNXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Enumeration.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxknPzEeSnGJwaJWHCSg" name="Generalization Set" identifier="org.eclipse.papyrus.uml.diagram.clazz.GeneralizationSet_4020" hint="4020">
-    <iconEntry xmi:id="_rWNxk3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/GeneralizationSet.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxknPzEeSnGJwaJWHCSg"
+      name="Generalization Set"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.GeneralizationSet_4020"
+      hint="4020">
+    <iconEntry
+        xmi:id="_rWNxk3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/GeneralizationSet.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.GeneralizationSet</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxdnPzEeSnGJwaJWHCSg" name="Generalization" identifier="org.eclipse.papyrus.uml.diagram.clazz.Generalization_4002" hint="4002">
-    <iconEntry xmi:id="_rWNxd3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Generalization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxdnPzEeSnGJwaJWHCSg"
+      name="Generalization"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Generalization_4002"
+      hint="4002">
+    <iconEntry
+        xmi:id="_rWNxd3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Generalization.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxmXPzEeSnGJwaJWHCSg" name="Information Flow" identifier="org.eclipse.papyrus.uml.diagram.clazz.InformationFlow_4026" hint="4026">
-    <iconEntry xmi:id="_rWNxmnPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/InformationFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxmXPzEeSnGJwaJWHCSg"
+      name="Information Flow"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.InformationFlow_4026"
+      hint="4026">
+    <iconEntry
+        xmi:id="_rWNxmnPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/InformationFlow.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxXHPzEeSnGJwaJWHCSg" name="Information Item" identifier="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_2099" hint="2099">
-    <iconEntry xmi:id="_rWNxXXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxXHPzEeSnGJwaJWHCSg"
+      name="Information Item"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_2099"
+      hint="2099">
+    <iconEntry
+        xmi:id="_rWNxXXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/InformationItem.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InformationItem</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxHnPzEeSnGJwaJWHCSg" name="Information Item" identifier="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_3040" hint="3040">
-    <iconEntry xmi:id="_rWNxH3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxHnPzEeSnGJwaJWHCSg"
+      name="Information Item"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_3040"
+      hint="3040">
+    <iconEntry
+        xmi:id="_rWNxH3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/InformationItem.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InformationItem</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxlHPzEeSnGJwaJWHCSg" name="Instance Specification Link" identifier="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecificationLink_4021" hint="4021">
-    <iconEntry xmi:id="_rWNxlXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxlHPzEeSnGJwaJWHCSg"
+      name="Instance Specification Link"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecificationLink_4021"
+      hint="4021">
+    <iconEntry
+        xmi:id="_rWNxlXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/InstanceSpecification.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxTnPzEeSnGJwaJWHCSg" name="Instance Specification" identifier="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001" hint="2001">
-    <iconEntry xmi:id="_rWNxT3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxTnPzEeSnGJwaJWHCSg"
+      name="Instance Specification"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001"
+      hint="2001">
+    <iconEntry
+        xmi:id="_rWNxT3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/InstanceSpecification.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxEHPzEeSnGJwaJWHCSg" name="Instance Specification" identifier="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_3020" hint="3020">
-    <iconEntry xmi:id="_rWNxEXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxEHPzEeSnGJwaJWHCSg"
+      name="Instance Specification"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_3020"
+      hint="3020">
+    <iconEntry
+        xmi:id="_rWNxEXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/InstanceSpecification.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxeHPzEeSnGJwaJWHCSg" name="Interface Realization" identifier="org.eclipse.papyrus.uml.diagram.clazz.InterfaceRealization_4003" hint="4003">
-    <iconEntry xmi:id="_rWNxeXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/InterfaceRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxeHPzEeSnGJwaJWHCSg"
+      name="Interface Realization"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.InterfaceRealization_4003"
+      hint="4003">
+    <iconEntry
+        xmi:id="_rWNxeXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/InterfaceRealization.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InterfaceRealization</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxVHPzEeSnGJwaJWHCSg" name="Interface" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_2004" hint="2004">
-    <iconEntry xmi:id="_rWNxVXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxVHPzEeSnGJwaJWHCSg"
+      name="Interface"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_2004"
+      hint="2004">
+    <iconEntry
+        xmi:id="_rWNxVXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Interface.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxFnPzEeSnGJwaJWHCSg" name="Interface" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3023" hint="3023">
-    <iconEntry xmi:id="_rWNxF3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxFnPzEeSnGJwaJWHCSg"
+      name="Interface"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3023"
+      hint="3023">
+    <iconEntry
+        xmi:id="_rWNxF3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Interface.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxKnPzEeSnGJwaJWHCSg" name="Interface" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3036" hint="3036">
-    <iconEntry xmi:id="_rWNxK3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxKnPzEeSnGJwaJWHCSg"
+      name="Interface"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3036"
+      hint="3036">
+    <iconEntry
+        xmi:id="_rWNxK3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Interface.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxLHPzEeSnGJwaJWHCSg" name="Interface" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3037" hint="3037">
-    <iconEntry xmi:id="_rWNxLXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxLHPzEeSnGJwaJWHCSg"
+      name="Interface"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3037"
+      hint="3037">
+    <iconEntry
+        xmi:id="_rWNxLXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Interface.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxLnPzEeSnGJwaJWHCSg" name="Interface" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3038" hint="3038">
-    <iconEntry xmi:id="_rWNxL3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxLnPzEeSnGJwaJWHCSg"
+      name="Interface"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3038"
+      hint="3038">
+    <iconEntry
+        xmi:id="_rWNxL3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Interface.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxVnPzEeSnGJwaJWHCSg" name="Model" identifier="org.eclipse.papyrus.uml.diagram.clazz.Model_2005" hint="2005">
-    <iconEntry xmi:id="_rWNxV3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Model.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxVnPzEeSnGJwaJWHCSg"
+      name="Model"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Model_2005"
+      hint="2005">
+    <iconEntry
+        xmi:id="_rWNxV3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Model.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxGHPzEeSnGJwaJWHCSg" name="Model" identifier="org.eclipse.papyrus.uml.diagram.clazz.Model_3024" hint="3024">
-    <iconEntry xmi:id="_rWNxGXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Model.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxGHPzEeSnGJwaJWHCSg"
+      name="Model"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Model_3024"
+      hint="3024">
+    <iconEntry
+        xmi:id="_rWNxGXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Model.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxbnPzEeSnGJwaJWHCSg" name="Default Named Element" identifier="org.eclipse.papyrus.uml.diagram.clazz.NamedElement_2097" hint="2097">
-    <iconEntry xmi:id="_rWNxb3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/NamedElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxbnPzEeSnGJwaJWHCSg"
+      name="Default Named Element"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.NamedElement_2097"
+      hint="2097">
+    <iconEntry
+        xmi:id="_rWNxb3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/NamedElement.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw_nPzEeSnGJwaJWHCSg" name="Operation Template Parameter" identifier="org.eclipse.papyrus.uml.diagram.clazz.OperationTemplateParameter_3035" hint="3035">
-    <iconEntry xmi:id="_rWNw_3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/OperationTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw_nPzEeSnGJwaJWHCSg"
+      name="Operation Template Parameter"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.OperationTemplateParameter_3035"
+      hint="3035">
+    <iconEntry
+        xmi:id="_rWNw_3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/OperationTemplateParameter.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OperationTemplateParameter</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw9HPzEeSnGJwaJWHCSg" name="Operation" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003" hint="3003">
-    <iconEntry xmi:id="_rWNw9XPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw9HPzEeSnGJwaJWHCSg"
+      name="Operation"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"
+      hint="3003">
+    <iconEntry
+        xmi:id="_rWNw9XPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw9nPzEeSnGJwaJWHCSg" name="Operation" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3007" hint="3007">
-    <iconEntry xmi:id="_rWNw93PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw9nPzEeSnGJwaJWHCSg"
+      name="Operation"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3007"
+      hint="3007">
+    <iconEntry
+        xmi:id="_rWNw93PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw8nPzEeSnGJwaJWHCSg" name="Operation" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3013" hint="3013">
-    <iconEntry xmi:id="_rWNw83PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw8nPzEeSnGJwaJWHCSg"
+      name="Operation"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3013"
+      hint="3013">
+    <iconEntry
+        xmi:id="_rWNw83PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw-nPzEeSnGJwaJWHCSg" name="Operation" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3019" hint="3019">
-    <iconEntry xmi:id="_rWNw-3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw-nPzEeSnGJwaJWHCSg"
+      name="Operation"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3019"
+      hint="3019">
+    <iconEntry
+        xmi:id="_rWNw-3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw-HPzEeSnGJwaJWHCSg" name="Operation" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3042" hint="3042">
-    <iconEntry xmi:id="_rWNw-XPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw-HPzEeSnGJwaJWHCSg"
+      name="Operation"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3042"
+      hint="3042">
+    <iconEntry
+        xmi:id="_rWNw-XPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxiHPzEeSnGJwaJWHCSg" name="Package Import" identifier="org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010" hint="4010">
-    <iconEntry xmi:id="_rWNxiXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/PackageImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxiHPzEeSnGJwaJWHCSg"
+      name="Package Import"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"
+      hint="4010">
+    <iconEntry
+        xmi:id="_rWNxiXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/PackageImport.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.PackageImport</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxinPzEeSnGJwaJWHCSg" name="Package Merge" identifier="org.eclipse.papyrus.uml.diagram.clazz.PackageMerge_4011" hint="4011">
-    <iconEntry xmi:id="_rWNxi3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/PackageMerge.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxinPzEeSnGJwaJWHCSg"
+      name="Package Merge"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.PackageMerge_4011"
+      hint="4011">
+    <iconEntry
+        xmi:id="_rWNxi3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/PackageMerge.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.PackageMerge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxWnPzEeSnGJwaJWHCSg" name="Package" identifier="org.eclipse.papyrus.uml.diagram.clazz.Package_2007" hint="2007">
-    <iconEntry xmi:id="_rWNxW3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxWnPzEeSnGJwaJWHCSg"
+      name="Package"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Package_2007"
+      hint="2007">
+    <iconEntry
+        xmi:id="_rWNxW3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Package.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxHHPzEeSnGJwaJWHCSg" name="Package" identifier="org.eclipse.papyrus.uml.diagram.clazz.Package_3009" hint="3009">
-    <iconEntry xmi:id="_rWNxHXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxHHPzEeSnGJwaJWHCSg"
+      name="Package"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Package_3009"
+      hint="3009">
+    <iconEntry
+        xmi:id="_rWNxHXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Package.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxYHPzEeSnGJwaJWHCSg" name="Primitive Type" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_2009" hint="2009">
-    <iconEntry xmi:id="_rWNxYXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxYHPzEeSnGJwaJWHCSg"
+      name="Primitive Type"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_2009"
+      hint="2009">
+    <iconEntry
+        xmi:id="_rWNxYXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/PrimitiveType.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxInPzEeSnGJwaJWHCSg" name="Primitive Type" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026" hint="3026">
-    <iconEntry xmi:id="_rWNxI3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxInPzEeSnGJwaJWHCSg"
+      name="Primitive Type"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"
+      hint="3026">
+    <iconEntry
+        xmi:id="_rWNxI3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/PrimitiveType.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxOHPzEeSnGJwaJWHCSg" name="Primitive Type" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3046" hint="3046">
-    <iconEntry xmi:id="_rWNxOXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxOHPzEeSnGJwaJWHCSg"
+      name="Primitive Type"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3046"
+      hint="3046">
+    <iconEntry
+        xmi:id="_rWNxOXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/PrimitiveType.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxNnPzEeSnGJwaJWHCSg" name="Primitive Type" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3047" hint="3047">
-    <iconEntry xmi:id="_rWNxN3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxNnPzEeSnGJwaJWHCSg"
+      name="Primitive Type"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3047"
+      hint="3047">
+    <iconEntry
+        xmi:id="_rWNxN3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/PrimitiveType.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxOnPzEeSnGJwaJWHCSg" name="Primitive Type" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3048" hint="3048">
-    <iconEntry xmi:id="_rWNxO3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxOnPzEeSnGJwaJWHCSg"
+      name="Primitive Type"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3048"
+      hint="3048">
+    <iconEntry
+        xmi:id="_rWNxO3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/PrimitiveType.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxjHPzEeSnGJwaJWHCSg" name="Profile Application" identifier="org.eclipse.papyrus.uml.diagram.clazz.ProfileApplication_4012" hint="4012">
-    <iconEntry xmi:id="_rWNxjXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/ProfileApplication.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxjHPzEeSnGJwaJWHCSg"
+      name="Profile Application"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.ProfileApplication_4012"
+      hint="4012">
+    <iconEntry
+        xmi:id="_rWNxjXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/ProfileApplication.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ProfileApplication</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw4nPzEeSnGJwaJWHCSg" name="Property" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3002" hint="3002">
-    <iconEntry xmi:id="_rWNw43PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw4nPzEeSnGJwaJWHCSg"
+      name="Property"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"
+      hint="3002">
+    <iconEntry
+        xmi:id="_rWNw43PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw5HPzEeSnGJwaJWHCSg" name="Property" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3005" hint="3005">
-    <iconEntry xmi:id="_rWNw5XPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw5HPzEeSnGJwaJWHCSg"
+      name="Property"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3005"
+      hint="3005">
+    <iconEntry
+        xmi:id="_rWNw5XPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw5nPzEeSnGJwaJWHCSg" name="Property" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3006" hint="3006">
-    <iconEntry xmi:id="_rWNw53PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw5nPzEeSnGJwaJWHCSg"
+      name="Property"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3006"
+      hint="3006">
+    <iconEntry
+        xmi:id="_rWNw53PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw4HPzEeSnGJwaJWHCSg" name="Property" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3012" hint="3012">
-    <iconEntry xmi:id="_rWNw4XPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw4HPzEeSnGJwaJWHCSg"
+      name="Property"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3012"
+      hint="3012">
+    <iconEntry
+        xmi:id="_rWNw4XPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw6nPzEeSnGJwaJWHCSg" name="Property" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3018" hint="3018">
-    <iconEntry xmi:id="_rWNw63PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw6nPzEeSnGJwaJWHCSg"
+      name="Property"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3018"
+      hint="3018">
+    <iconEntry
+        xmi:id="_rWNw63PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNw6HPzEeSnGJwaJWHCSg" name="Property" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3041" hint="3041">
-    <iconEntry xmi:id="_rWNw6XPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNw6HPzEeSnGJwaJWHCSg"
+      name="Property"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3041"
+      hint="3041">
+    <iconEntry
+        xmi:id="_rWNw6XPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxfHPzEeSnGJwaJWHCSg" name="Realization" identifier="org.eclipse.papyrus.uml.diagram.clazz.Realization_4005" hint="4005">
-    <iconEntry xmi:id="_rWNxfXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Realization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxfHPzEeSnGJwaJWHCSg"
+      name="Realization"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Realization_4005"
+      hint="4005">
+    <iconEntry
+        xmi:id="_rWNxfXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Realization.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Realization</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxBnPzEeSnGJwaJWHCSg" name="Reception" identifier="org.eclipse.papyrus.uml.diagram.clazz.Reception_3011" hint="3011">
-    <iconEntry xmi:id="_rWNxB3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Reception.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxBnPzEeSnGJwaJWHCSg"
+      name="Reception"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Reception_3011"
+      hint="3011">
+    <iconEntry
+        xmi:id="_rWNxB3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Reception.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Reception</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxCHPzEeSnGJwaJWHCSg" name="Reception" identifier="org.eclipse.papyrus.uml.diagram.clazz.Reception_3039" hint="3039">
-    <iconEntry xmi:id="_rWNxCXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Reception.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxCHPzEeSnGJwaJWHCSg"
+      name="Reception"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Reception_3039"
+      hint="3039">
+    <iconEntry
+        xmi:id="_rWNxCXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Reception.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Reception</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxDHPzEeSnGJwaJWHCSg" name="Redefinable Template Signature" identifier="org.eclipse.papyrus.uml.diagram.clazz.RedefinableTemplateSignature_3015" hint="3015">
-    <iconEntry xmi:id="_rWNxDXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxDHPzEeSnGJwaJWHCSg"
+      name="Redefinable Template Signature"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.RedefinableTemplateSignature_3015"
+      hint="3015">
+    <iconEntry
+        xmi:id="_rWNxDXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.RedefinableTemplateSignature</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxUnPzEeSnGJwaJWHCSg" name="Signal" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003" hint="2003">
-    <iconEntry xmi:id="_rWNxU3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxUnPzEeSnGJwaJWHCSg"
+      name="Signal"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"
+      hint="2003">
+    <iconEntry
+        xmi:id="_rWNxU3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Signal.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxFHPzEeSnGJwaJWHCSg" name="Signal" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3022" hint="3022">
-    <iconEntry xmi:id="_rWNxFXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxFHPzEeSnGJwaJWHCSg"
+      name="Signal"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3022"
+      hint="3022">
+    <iconEntry
+        xmi:id="_rWNxFXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Signal.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxRnPzEeSnGJwaJWHCSg" name="Signal" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3049" hint="3049">
-    <iconEntry xmi:id="_rWNxR3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxRnPzEeSnGJwaJWHCSg"
+      name="Signal"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3049"
+      hint="3049">
+    <iconEntry
+        xmi:id="_rWNxR3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Signal.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxQnPzEeSnGJwaJWHCSg" name="Signal" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3050" hint="3050">
-    <iconEntry xmi:id="_rWNxQ3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxQnPzEeSnGJwaJWHCSg"
+      name="Signal"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3050"
+      hint="3050">
+    <iconEntry
+        xmi:id="_rWNxQ3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Signal.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxRHPzEeSnGJwaJWHCSg" name="Signal" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3051" hint="3051">
-    <iconEntry xmi:id="_rWNxRXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxRHPzEeSnGJwaJWHCSg"
+      name="Signal"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3051"
+      hint="3051">
+    <iconEntry
+        xmi:id="_rWNxRXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Signal.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxCnPzEeSnGJwaJWHCSg" name="Slot" identifier="org.eclipse.papyrus.uml.diagram.clazz.Slot_3030" hint="3030">
-    <iconEntry xmi:id="_rWNxC3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Slot.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxCnPzEeSnGJwaJWHCSg"
+      name="Slot"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Slot_3030"
+      hint="3030">
+    <iconEntry
+        xmi:id="_rWNxC3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Slot.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Slot</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxenPzEeSnGJwaJWHCSg" name="Substitution" identifier="org.eclipse.papyrus.uml.diagram.clazz.Substitution_4004" hint="4004">
-    <iconEntry xmi:id="_rWNxe3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Substitution.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxenPzEeSnGJwaJWHCSg"
+      name="Substitution"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Substitution_4004"
+      hint="4004">
+    <iconEntry
+        xmi:id="_rWNxe3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Substitution.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Substitution</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxkHPzEeSnGJwaJWHCSg" name="Template Binding" identifier="org.eclipse.papyrus.uml.diagram.clazz.TemplateBinding_4015" hint="4015">
-    <iconEntry xmi:id="_rWNxkXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/TemplateBinding.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxkHPzEeSnGJwaJWHCSg"
+      name="Template Binding"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.TemplateBinding_4015"
+      hint="4015">
+    <iconEntry
+        xmi:id="_rWNxkXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/TemplateBinding.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.TemplateBinding</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxAnPzEeSnGJwaJWHCSg" name="Template Parameter" identifier="org.eclipse.papyrus.uml.diagram.clazz.TemplateParameter_3016" hint="3016">
-    <iconEntry xmi:id="_rWNxA3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/TemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxAnPzEeSnGJwaJWHCSg"
+      name="Template Parameter"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.TemplateParameter_3016"
+      hint="3016">
+    <iconEntry
+        xmi:id="_rWNxA3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/TemplateParameter.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.TemplateParameter</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxDnPzEeSnGJwaJWHCSg" name="Template Signature" identifier="org.eclipse.papyrus.uml.diagram.clazz.TemplateSignature_3033" hint="3033">
-    <iconEntry xmi:id="_rWNxD3PzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/TemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxDnPzEeSnGJwaJWHCSg"
+      name="Template Signature"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.TemplateSignature_3033"
+      hint="3033">
+    <iconEntry
+        xmi:id="_rWNxD3PzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/TemplateSignature.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.TemplateSignature</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxl3PzEeSnGJwaJWHCSg" name="Time Observation Event" identifier="org.eclipse.papyrus.uml.diagram.clazz.TimeObservationEvent_4024" hint="4024">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxl3PzEeSnGJwaJWHCSg"
+      name="Time Observation Event"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.TimeObservationEvent_4024"
+      hint="4024">
+    <specializedTypesID>org.eclipse.papyrus.uml.TimeObservation</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxbHPzEeSnGJwaJWHCSg" name="Time Observation" identifier="org.eclipse.papyrus.uml.diagram.clazz.TimeObservation_2096" hint="2096">
-    <iconEntry xmi:id="_rWNxbXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/TimeObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxbHPzEeSnGJwaJWHCSg"
+      name="Time Observation"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.TimeObservation_2096"
+      hint="2096">
+    <iconEntry
+        xmi:id="_rWNxbXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/TimeObservation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.TimeObservation</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWNxgHPzEeSnGJwaJWHCSg" name="Usage" identifier="org.eclipse.papyrus.uml.diagram.clazz.Usage_4007" hint="4007">
-    <iconEntry xmi:id="_rWNxgXPzEeSnGJwaJWHCSg" iconPath="/icons/full/obj16/Usage.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rWNxgHPzEeSnGJwaJWHCSg"
+      name="Usage"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Usage_4007"
+      hint="4007">
+    <iconEntry
+        xmi:id="_rWNxgXPzEeSnGJwaJWHCSg"
+        iconPath="/icons/full/obj16/Usage.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Usage</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Blq1UK_vEeSWIf43-VACFg" name="Package" identifier="org.eclipse.papyrus.uml.diagram.clazz.Package_1000" hint="PapyrusUMLClassDiagram">
-    <iconEntry xmi:id="_Blq1Ua_vEeSWIf43-VACFg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Blq1UK_vEeSWIf43-VACFg"
+      name="Package"
+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Package_1000"
+      hint="PapyrusUMLClassDiagram">
+    <iconEntry
+        xmi:id="_Blq1Ua_vEeSWIf43-VACFg"
+        iconPath="/icons/full/obj16/Package.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
   </elementTypeConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen
index 5295015a6fc..d90cb5b0290 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen
@@ -6013,7 +6013,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

@@ -6106,7 +6106,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

@@ -6336,7 +6336,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeElementImportLabelDisplayEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

@@ -6487,7 +6487,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypePackageMergeLabelDisplayEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

@@ -6915,7 +6915,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeInformationFlowLabelDisplayEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:TypeLinkModelFacet">

           <metaClass

@@ -7018,7 +7018,7 @@
         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy"/>

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy"/>

         <modelFacet

             xsi:type="gmfgen:FeatureLinkModelFacet">

           <metaFeature

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
index 653636d902d..78a6111e29b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
@@ -16,89 +16,89 @@
 -->
 <plugin> 
 
-   <extension point="org.eclipse.ui.contexts" id="ui-context">
-				      <?gmfgen generated="true"?>
-				      <context
-				         description="%context.description"
-				         id="org.eclipse.papyrus.uml.diagram.clazz.ui.diagramContext"
-				         name="%context.name"
-				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
-				      </context>
-				   </extension>
-
-<extension point="org.eclipse.core.runtime.preferences" id="prefs">
-      <?gmfgen generated="true"?>
-      <initializer class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPreferenceInitializer"/>
-   </extension>
-<extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
-      <?gmfgen generated="true"?>
-      <propertyContributor
-            contributorId="org.eclipse.papyrus.uml.diagram.clazz"
-            labelProvider="org.eclipse.papyrus.uml.diagram.clazz.sheet.UMLSheetLabelProvider">
-         <propertyCategory category="domain"/>
-         <propertyCategory category="visual"/>
-         <propertyCategory category="extra"/>
-      </propertyContributor>
-   </extension>
-<extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
-      <?gmfgen generated="true"?>   
-      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.clazz">
-         <propertyTab
-             category="visual"
-             id="property.tab.AppearancePropertySection"
-             label="%tab.appearance"/>
-          <propertyTab
-             category="visual"
-             id="property.tab.DiagramPropertySection"
-             label="%tab.diagram"/>
-          <propertyTab
-             category="domain"
-             id="property.tab.domain"
-             label="%tab.domain"/>
-      </propertyTabs>
-   </extension>
-<extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
-      <?gmfgen generated="true"?>   
-      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.clazz">
-         <propertySection id="property.section.ConnectorAppearancePropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
-            tab="property.tab.AppearancePropertySection">
-         </propertySection>
-         <propertySection id="property.section.ShapeColorAndFontPropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
-            tab="property.tab.AppearancePropertySection">
-         </propertySection> 
-         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
-            tab="property.tab.AppearancePropertySection">
-         </propertySection>     
-         <propertySection id="property.section.RulerGridPropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
-            tab="property.tab.DiagramPropertySection">
-         </propertySection>     
-         <propertySection
-            id="property.section.domain" 
-            tab="property.tab.domain"
-            class="org.eclipse.papyrus.uml.diagram.clazz.sheet.UMLPropertySection">
-            <input type="org.eclipse.gmf.runtime.notation.View"/>
-            <input type="org.eclipse.gef.EditPart"/>
-            <input type="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
-         </propertySection>
-      </propertySections>
-   </extension>
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
-      <?gmfgen generated="true"?>
-      <viewProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider">
-         <Priority name="Lowest"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLClassDiagram"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2014,2013,2015,2001,2002,2003,2004,2005,2006,2007,2099,2008,2009,2010,2011,2012,2016,2095,2096,2097,3012,3002,3005,3006,3041,3018,3014,3004,3008,3013,3003,3007,3042,3019,3034,3035,3031,3016,3017,3011,3039,3030,3015,3033,3020,3021,3022,3023,3024,3025,3009,3040,3010,3026,3027,3028,3029,3036,3037,3038,3052,3053,3054,3047,3046,3048,3044,3045,3043,3050,3051,3049"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4016,4017,4001,4019,4002,4003,4004,4005,4006,4007,4008,4018,4009,4010,4011,4012,4013,4014,4015,4020,4021,4023,4024,4025,4026,8500"/>
-      </viewProvider>
-   </extension>
+   <extension point="org.eclipse.ui.contexts" id="ui-context">

+				      <?gmfgen generated="true"?>

+				      <context

+				         description="%context.description"

+				         id="org.eclipse.papyrus.uml.diagram.clazz.ui.diagramContext"

+				         name="%context.name"

+				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">

+				      </context>

+				   </extension>

+
+<extension point="org.eclipse.core.runtime.preferences" id="prefs">

+      <?gmfgen generated="true"?>

+      <initializer class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPreferenceInitializer"/>

+   </extension>

+<extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">

+      <?gmfgen generated="true"?>

+      <propertyContributor

+            contributorId="org.eclipse.papyrus.uml.diagram.clazz"

+            labelProvider="org.eclipse.papyrus.uml.diagram.clazz.sheet.UMLSheetLabelProvider">

+         <propertyCategory category="domain"/>

+         <propertyCategory category="visual"/>

+         <propertyCategory category="extra"/>

+      </propertyContributor>

+   </extension>

+<extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">

+      <?gmfgen generated="true"?>   

+      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.clazz">

+         <propertyTab

+             category="visual"

+             id="property.tab.AppearancePropertySection"

+             label="%tab.appearance"/>

+          <propertyTab

+             category="visual"

+             id="property.tab.DiagramPropertySection"

+             label="%tab.diagram"/>

+          <propertyTab

+             category="domain"

+             id="property.tab.domain"

+             label="%tab.domain"/>

+      </propertyTabs>

+   </extension>

+<extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">

+      <?gmfgen generated="true"?>   

+      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.clazz">

+         <propertySection id="property.section.ConnectorAppearancePropertySection" 

+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 

+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 

+            tab="property.tab.AppearancePropertySection">

+         </propertySection>

+         <propertySection id="property.section.ShapeColorAndFontPropertySection" 

+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 

+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 

+            tab="property.tab.AppearancePropertySection">

+         </propertySection> 

+         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 

+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 

+            tab="property.tab.AppearancePropertySection">

+         </propertySection>     

+         <propertySection id="property.section.RulerGridPropertySection" 

+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 

+            tab="property.tab.DiagramPropertySection">

+         </propertySection>     

+         <propertySection

+            id="property.section.domain" 

+            tab="property.tab.domain"

+            class="org.eclipse.papyrus.uml.diagram.clazz.sheet.UMLPropertySection">

+            <input type="org.eclipse.gmf.runtime.notation.View"/>

+            <input type="org.eclipse.gef.EditPart"/>

+            <input type="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>

+         </propertySection>

+      </propertySections>

+   </extension>

+<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

+      <?gmfgen generated="true"?>

+      <viewProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider">

+         <Priority name="Lowest"/>

+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLClassDiagram"/>

+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2014,2013,2015,2001,2002,2003,2004,2005,2006,2007,2099,2008,2009,2010,2011,2012,2016,2095,2096,2097,3012,3002,3005,3006,3041,3018,3014,3004,3008,3013,3003,3007,3042,3019,3034,3035,3031,3016,3017,3011,3039,3030,3015,3033,3020,3021,3022,3023,3024,3025,3009,3040,3010,3026,3027,3028,3029,3036,3037,3038,3052,3053,3054,3047,3046,3048,3044,3045,3043,3050,3051,3049"/>

+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4016,4017,4001,4019,4002,4003,4004,4005,4006,4007,4008,4018,4009,4010,4011,4012,4013,4014,4015,4020,4021,4023,4024,4025,4026,8500"/>

+      </viewProvider>

+   </extension>

 <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
       <?gmfgen generated="false"?>
       <editpartProvider class="org.eclipse.papyrus.uml.diagram.clazz.custom.providers.CustomUMLEditPartProvider">
@@ -121,144 +121,137 @@
          <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
       </editpartProvider>
    </extension>
-<extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
-      <?gmfgen generated="true"?>
-      <IconProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLIconProvider">
-         <Priority name="Low"/>
-      </IconProvider>
-   </extension>
-<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
-      <?gmfgen generated="true"?>
-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider">
-         <Priority name="Lowest"/>
-      </ParserProvider>
-   </extension>
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
-      <?gmfgen generated="false"?>
-
-      <binding context="org.eclipse.papyrus.uml.diagram.clazz.TypeContext">
-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-         <advice ref="org.eclipse.papyrus.infra.emf.readOnlyAdvice"/>
-      </binding>
-   </extension>
-<extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">
-      <?gmfgen generated="true"?>
-      <propertyTester
-            id="org.eclipse.papyrus.uml.diagram.clazz.URIEditorInputPropertyTester"
-            type="org.eclipse.emf.common.ui.URIEditorInput"
-            namespace="org.eclipse.papyrus.uml.diagram.clazz"
-            properties="isURIEditorInput"
-            class="org.eclipse.papyrus.uml.diagram.clazz.part.UMLUriEditorInputTester">
-      </propertyTester>
-   </extension>
-<extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">
-      <?gmfgen generated="true"?>
-      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
-         <includes>
-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.resourceContent"/>
-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.domainResourceContent"/>
-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.navigatorLinkHelper"/>
-         </includes>
-      </viewerContentBinding>
-      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
-         <includes>
-            <actionExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.navigatorActionProvider"/>
-         </includes>
-      </viewerActionBinding>
-   </extension>
-<extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">
-      <?gmfgen generated="true"?>
-      <navigatorContent
-            id="org.eclipse.papyrus.uml.diagram.clazz.resourceContent" 
-            name="%navigatorContentName" 
-            priority="normal" 
-            contentProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorContentProvider" 
-            labelProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorLabelProvider"
-            icon="icons/obj16/UMLDiagramFile.gif"
-            activeByDefault="true">
-         <triggerPoints>
-            <or>
-               <and>
-                  <instanceof value="org.eclipse.core.resources.IFile"/>
-                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLClass_diagram"/>
-               </and>
-               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
-            </or>
-         </triggerPoints>
-         <possibleChildren>
-            <or>
-               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
-            </or>
-         </possibleChildren>
-         <commonSorter 
-               id="org.eclipse.papyrus.uml.diagram.clazz.navigatorSorter" 
-               class="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorSorter">
-            <parentExpression>
-               <or>
-                  <and>
-                     <instanceof value="org.eclipse.core.resources.IFile"/>
-                     <test property="org.eclipse.core.resources.extension" value="PapyrusUMLClass_diagram"/>
-                  </and>
-                  <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
-               </or>
-            </parentExpression>
-         </commonSorter>
-      </navigatorContent>
-      <navigatorContent
-            id="org.eclipse.papyrus.uml.diagram.clazz.domainResourceContent" 
-            name="%domainNavigatorContentName" 
-            priority="normal" 
-            contentProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorContentProvider" 
-            labelProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorLabelProvider"
-            icon="icons/obj16/UMLDiagramFile.gif"
-            activeByDefault="true">
-         <triggerPoints>
-            <or>
-               <and>
-                  <instanceof value="org.eclipse.core.resources.IFile"/>
-                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLClass"/>
-               </and>
-               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem"/>
-            </or>
-         </triggerPoints>
-         <possibleChildren>
-            <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem"/>
-         </possibleChildren>
-      </navigatorContent>
-      <actionProvider
-            id="org.eclipse.papyrus.uml.diagram.clazz.navigatorActionProvider"
-            class="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorActionProvider">
-         <enablement>
-            <or>
-               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
-            </or>
-         </enablement>
-      </actionProvider>
-   </extension>
-<extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">
-      <?gmfgen generated="true"?>
-      <linkHelper
-            id="org.eclipse.papyrus.uml.diagram.clazz.navigatorLinkHelper"
-            class="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorLinkHelper">
-         <editorInputEnablement>
-            <and>
-               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>
-               <test property="org.eclipse.papyrus.uml.diagram.clazz.isURIEditorInput"/>
-            </and>
-         </editorInputEnablement>
-         <selectionEnablement>
-            <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
-         </selectionEnablement>
-      </linkHelper>
-   </extension>
-<extension point="org.eclipse.ui.commands" id="menu-commands">
-      <?gmfgen generated="true"?>
-      <category id="org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
-      <command id="org.eclipse.papyrus.uml.diagram.clazz.LoadResourceAction"
-         name="Load Resource"
-         categoryId="org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorID"
-         defaultHandler="org.eclipse.papyrus.uml.diagram.clazz.part.LoadResourceAction"/>
-   </extension>
+<extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

+      <?gmfgen generated="true"?>

+      <IconProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLIconProvider">

+         <Priority name="Low"/>

+      </IconProvider>

+   </extension>

+<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

+      <?gmfgen generated="true"?>

+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider">

+         <Priority name="Lowest"/>

+      </ParserProvider>

+   </extension>

+
+<extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">

+      <?gmfgen generated="true"?>

+      <propertyTester

+            id="org.eclipse.papyrus.uml.diagram.clazz.URIEditorInputPropertyTester"

+            type="org.eclipse.emf.common.ui.URIEditorInput"

+            namespace="org.eclipse.papyrus.uml.diagram.clazz"

+            properties="isURIEditorInput"

+            class="org.eclipse.papyrus.uml.diagram.clazz.part.UMLUriEditorInputTester">

+      </propertyTester>

+   </extension>

+<extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">

+      <?gmfgen generated="true"?>

+      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">

+         <includes>

+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.resourceContent"/>

+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.domainResourceContent"/>

+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.navigatorLinkHelper"/>

+         </includes>

+      </viewerContentBinding>

+      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">

+         <includes>

+            <actionExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.navigatorActionProvider"/>

+         </includes>

+      </viewerActionBinding>

+   </extension>

+<extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">

+      <?gmfgen generated="true"?>

+      <navigatorContent

+            id="org.eclipse.papyrus.uml.diagram.clazz.resourceContent" 

+            name="%navigatorContentName" 

+            priority="normal" 

+            contentProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorContentProvider" 

+            labelProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorLabelProvider"

+            icon="icons/obj16/UMLDiagramFile.gif"

+            activeByDefault="true">

+         <triggerPoints>

+            <or>

+               <and>

+                  <instanceof value="org.eclipse.core.resources.IFile"/>

+                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLClass_diagram"/>

+               </and>

+               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>

+            </or>

+         </triggerPoints>

+         <possibleChildren>

+            <or>

+               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>

+            </or>

+         </possibleChildren>

+         <commonSorter 

+               id="org.eclipse.papyrus.uml.diagram.clazz.navigatorSorter" 

+               class="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorSorter">

+            <parentExpression>

+               <or>

+                  <and>

+                     <instanceof value="org.eclipse.core.resources.IFile"/>

+                     <test property="org.eclipse.core.resources.extension" value="PapyrusUMLClass_diagram"/>

+                  </and>

+                  <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>

+               </or>

+            </parentExpression>

+         </commonSorter>

+      </navigatorContent>

+      <navigatorContent

+            id="org.eclipse.papyrus.uml.diagram.clazz.domainResourceContent" 

+            name="%domainNavigatorContentName" 

+            priority="normal" 

+            contentProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorContentProvider" 

+            labelProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorLabelProvider"

+            icon="icons/obj16/UMLDiagramFile.gif"

+            activeByDefault="true">

+         <triggerPoints>

+            <or>

+               <and>

+                  <instanceof value="org.eclipse.core.resources.IFile"/>

+                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLClass"/>

+               </and>

+               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem"/>

+            </or>

+         </triggerPoints>

+         <possibleChildren>

+            <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem"/>

+         </possibleChildren>

+      </navigatorContent>

+      <actionProvider

+            id="org.eclipse.papyrus.uml.diagram.clazz.navigatorActionProvider"

+            class="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorActionProvider">

+         <enablement>

+            <or>

+               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>

+            </or>

+         </enablement>

+      </actionProvider>

+   </extension>

+<extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">

+      <?gmfgen generated="true"?>

+      <linkHelper

+            id="org.eclipse.papyrus.uml.diagram.clazz.navigatorLinkHelper"

+            class="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorLinkHelper">

+         <editorInputEnablement>

+            <and>

+               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>

+               <test property="org.eclipse.papyrus.uml.diagram.clazz.isURIEditorInput"/>

+            </and>

+         </editorInputEnablement>

+         <selectionEnablement>

+            <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>

+         </selectionEnablement>

+      </linkHelper>

+   </extension>

+<extension point="org.eclipse.ui.commands" id="menu-commands">

+      <?gmfgen generated="true"?>

+      <category id="org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>

+      <command id="org.eclipse.papyrus.uml.diagram.clazz.LoadResourceAction"

+         name="Load Resource"

+         categoryId="org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorID"

+         defaultHandler="org.eclipse.papyrus.uml.diagram.clazz.part.LoadResourceAction"/>

+   </extension>

 <extension point="org.eclipse.ui.commands">
 	<command
             categoryId="org.eclipse.papyrus.editor.category"
@@ -286,7 +279,7 @@
             icon="icons/obj16/Diagram_Class.gif"
             id="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand"
             language="uml"
-            label="Class Diagram">
+            label="UML Class Diagram">
       </creationCommand>
       <editorDiagram
             actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
@@ -449,62 +442,62 @@
          </action>
       </objectContribution>
 </extension>
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">
-      <?gmfgen generated="true"?>
-<page
-      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLClassDiagram"
-      name="PapyrusUMLClassDiagram Diagram"
-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
-      class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramGeneralPreferencePage">
-</page>
-<page
-      id="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPrintingPreferencePage"
-      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLClassDiagram"
-      class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPrintingPreferencePage">
-</page>
-<page
-      id="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramRulersAndGridPreferencePage"
-      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLClassDiagram"
-      class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramRulersAndGridPreferencePage">
-</page>
-   </extension>
-
-<extension point="org.eclipse.ui.menus" id="context-menus">
-      <?gmfgen generated="true"?>
-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
-      </menuContribution>
-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
-      </menuContribution -->
-      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
-         <command commandId="org.eclipse.papyrus.uml.diagram.clazz.LoadResourceAction">
-            <visibleWhen>
-               <and>
-                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorID"/></with>
-                  <with variable="selection"><iterate ifEmpty="false"> 
-                     <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart"/>
-                  </iterate></with>
-               </and>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-
-
-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
-				      <?gmfgen generated="true"?>
-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLMarkerNavigationProvider">
-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.clazz.diagnostic"/>
-				         <Priority name="Lowest"/>
-				      </MarkerNavigationProvider>
-				   </extension>
-
-<extension id="diagnostic" name="PapyrusUMLClassDiagram problems" point="org.eclipse.core.resources.markers">
-				      <?gmfgen generated="true"?>
-				      <super type="org.eclipse.core.resources.problemmarker"/>
-				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
-				      <persistent value="true"/>
+<extension point="org.eclipse.ui.preferencePages" id="prefpages">

+      <?gmfgen generated="true"?>

+<page

+      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLClassDiagram"

+      name="PapyrusUMLClassDiagram Diagram"

+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

+      class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramGeneralPreferencePage">

+</page>

+<page

+      id="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPrintingPreferencePage"

+      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLClassDiagram"

+      class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPrintingPreferencePage">

+</page>

+<page

+      id="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramRulersAndGridPreferencePage"

+      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLClassDiagram"

+      class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramRulersAndGridPreferencePage">

+</page>

+   </extension>

+
+<extension point="org.eclipse.ui.menus" id="context-menus">

+      <?gmfgen generated="true"?>

+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">

+      </menuContribution>

+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">

+      </menuContribution -->

+      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">

+         <command commandId="org.eclipse.papyrus.uml.diagram.clazz.LoadResourceAction">

+            <visibleWhen>

+               <and>

+                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorID"/></with>

+                  <with variable="selection"><iterate ifEmpty="false"> 

+                     <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart"/>

+                  </iterate></with>

+               </and>

+            </visibleWhen>

+         </command>

+      </menuContribution>

+   </extension>

+
+
+<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

+				      <?gmfgen generated="true"?>

+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLMarkerNavigationProvider">

+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.clazz.diagnostic"/>

+				         <Priority name="Lowest"/>

+				      </MarkerNavigationProvider>

+				   </extension>

+
+<extension id="diagnostic" name="PapyrusUMLClassDiagram problems" point="org.eclipse.core.resources.markers">

+				      <?gmfgen generated="true"?>

+				      <super type="org.eclipse.core.resources.problemmarker"/>

+				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

+				      <persistent value="true"/>

 				   </extension><extension
       point="org.eclipse.gmf.runtime.common.ui.services.parserProviders">
    <ParserProvider
@@ -514,749 +507,749 @@
       </Priority>
    </ParserProvider>
 </extension>
-<extension
-			id="PapyrusUMLClassDiagram.palettedefinition"
-			name="PapyrusUMLClassDiagram Predefined Entries"
-			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
-			
-			<?gmfgen generated="true"?>	
-			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-				<Priority name="Lowest"/>
-				   		<contribution
-				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.clazz.part.UMLPaletteFactory">
-				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
-				
-				<entry
-				      defineOnly="true"
-				      description="Create a new Class"
-				      id="clazz.tool.class"
-				      kind="tool"
-				      label="Class"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a ClassifiertemplateParameter"
-				      id="clazz.tool.classifiertemplateparameter"
-				      kind="tool"
-				      label="ClassifierTemplateParameter"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClassifierTemplateParameter.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClassifierTemplateParameter.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a comment"
-				      id="clazz.tool.comment"
-				      kind="tool"
-				      label="Comment"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a component"
-				      id="clazz.tool.component"
-				      kind="tool"
-				      label="Component"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a constraint"
-				      id="clazz.tool.constraint"
-				      kind="tool"
-				      label="Constraint"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a new DataType"
-				      id="clazz.tool.datatype"
-				      kind="tool"
-				      label="DataType"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new DurationObservation"
-				      id="createDurationObservation7CreationTool"
-				      kind="tool"
-				      label="DurationObservation"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an enumeration"
-				      id="clazz.tool.enumeration"
-				      kind="tool"
-				      label="Enumeration"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an enumeration literal"
-				      id="clazz.tool.enumerationliteral"
-				      kind="tool"
-				      label="Enumeration literal"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an interface"
-				      id="clazz.tool.interface"
-				      kind="tool"
-				      label="Interface"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an InstanceSpecification"
-				      id="clazz.tool.instancespecification"
-				      kind="tool"
-				      label="InstanceSpecification"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an InformationItem"
-				      id="clazz.tool.informationitem"
-				      kind="tool"
-				      label="InformationItem"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Primitivetype"
-				      id="clazz.tool.primitivetype"
-				      kind="tool"
-				      label="PrimitiveType"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a model"
-				      id="clazz.tool.model"
-				      kind="tool"
-				      label="Model"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an operation"
-				      id="clazz.tool.operation"
-				      kind="tool"
-				      label="Operation"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an OperationTemplateParameter"
-				      id="clazz.tool.OperationTemplateParameter"
-				      kind="tool"
-				      label="OperationTemplateParameter"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OperationTemplateParameter.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OperationTemplateParameter.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Package"
-				      id="clazz.tool.package"
-				      kind="tool"
-				      label="Package"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a new Property"
-				      id="clazz.tool.property"
-				      kind="tool"
-				      label="Property"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a reception"
-				      id="clazz.tool.reception"
-				      kind="tool"
-				      label="Reception"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a RedefinableTemplateSignature"
-				      id="clazz.tool.redefinabletemplatesignature"
-				      kind="tool"
-				      label="RedefinableTemplateSignature"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RedefinableTemplateSignature.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RedefinableTemplateSignature.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a signal"
-				      id="clazz.tool.signal"
-				      kind="tool"
-				      label="Signal"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Slot"
-				      id="clazz.tool.slot"
-				      kind="tool"
-				      label="Slot"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a templateParameter"
-				      id="clazz.tool.templateparameter"
-				      kind="tool"
-				      label="TemplateParameter"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateParameter.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateParameter.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a TemplateSignature"
-				      id="clazz.tool.templatesignature"
-				      kind="tool"
-				      label="TemplateSignature"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateSignature.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateSignature.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new TimeObservation"
-				      id="createTimeObservation22CreationTool"
-				      kind="tool"
-				      label="TimeObservation"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a ConnectableElementTemplateParameter"
-				      id="clazz.tool.connectableelementtemplateparameter"
-				      kind="tool"
-				      label="ConnectableElementTemplateParameter"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectableElementTemplateParameter.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectableElementTemplateParameter.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an Abstraction"
-				      id="clazz.tool.abstraction"
-				      kind="tool"
-				      label="Abstraction"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an association"
-				      id="clazz.tool.association"
-				      kind="tool"
-				      label="Association"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an association branch"
-				      id="clazz.tool.associationbranch"
-				      kind="tool"
-				      label="AssociationBranch"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="AssociationClass"
-				      id="clazz.tool.associationclass"
-				      kind="tool"
-				      label="AssociationClass"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AssociationClass.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AssociationClass.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a ContainmentLink"
-				      id="clazz.tool.containmentlink"
-				      kind="tool"
-				      label="ContainmentLink"
-				      large_icon="icons/obj16/ContainmentConnection.gif"
-				      path=""
-				      small_icon="icons/obj16/ContainmentConnection.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Creation of a context link for a Constraint"
-				      id="clazz.tool.contextlink"
-				      kind="tool"
-				      label="ContextLink"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a dependency"
-				      id="clazz.tool.dependency"
-				      kind="tool"
-				      label="Dependency"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a dependency branch"
-				      id="clazz.tool.dependencybranch"
-				      kind="tool"
-				      label="DependencyBranch"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a  elementImport"
-				      id="clazz.tool.elementimport"
-				      kind="tool"
-				      label="ElementImport"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ElementImport.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ElementImport.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description=" Create a generalization"
-				      id="clazz.tool.generalization"
-				      kind="tool"
-				      label="Generalization"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="GeneralizationSet"
-				      id="clazz.tool.generalizationset"
-				      kind="tool"
-				      label="GeneralizationSet"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralizationSet.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralizationSet.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an InformationFlow link"
-				      id="clazz.tool.informationflowlink"
-				      kind="tool"
-				      label="InformationFlow link"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an InstanceSpecification link"
-				      id="clazz.tool.instancespecificationlink"
-				      kind="tool"
-				      label="InstanceSpecification link"
-				      large_icon="icons/obj16/InstanceLink.gif"
-				      path=""
-				      small_icon="icons/obj16/InstanceLink.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an InterfaceRealization"
-				      id="clazz.tool.interfacerealization"
-				      kind="tool"
-				      label="InterfaceRealization"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Creation of a link for comment, constraint, TimeObservation, DurationObservation"
-				      id="clazz.tool.link"
-				      kind="tool"
-				      label="Link"
-				      large_icon="icons/obj16/Link.gif"
-				      path=""
-				      small_icon="icons/obj16/Link.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description=" Create a packageImport"
-				      id="clazz.tool.packageimport"
-				      kind="tool"
-				      label="PackageImport"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a packageMerge"
-				      id="clazz.tool.packagemerge"
-				      kind="tool"
-				      label="PackageMerge"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a profileApplication"
-				      id="clazz.tool.profileapplication"
-				      kind="tool"
-				      label="ProfileApplication"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Realization"
-				      id="clazz.tool.realization"
-				      kind="tool"
-				      label="Realization"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a substitution"
-				      id="clazz.tool.substitution"
-				      kind="tool"
-				      label="Substitution"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a TemplateBinding"
-				      id="clazz.tool.templatebinding"
-				      kind="tool"
-				      label="TemplateBinding"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateBinding.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateBinding.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an Usage"
-				      id="clazz.tool.usage"
-				      kind="tool"
-				      label="Usage"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">
-					</entry>
-				
-				</contribution>
-			</paletteProvider>	
-				
-		</extension>
-
-<extension
-	id="PapyrusUMLClassDiagram.standard"
-	name="PapyrusUMLClassDiagram Standard Palette"
-	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
-	
-	<?gmfgen generated="true"?>	
-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-		<Priority name="Low"/>
-		   		<contribution
-		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.clazz.part.UMLPaletteFactory">
-		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
-		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
-		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
-		
-		<entry
-		      description="Nodes"
-		      id="clazz.group.nodes"
-		      kind="drawer"
-		      label="Nodes"
-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-		      path="/"
-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-		   <expand
-		         force="true">
-		   </expand>
-		</entry>
-		<predefinedEntry
-		        id="clazz.tool.class"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.classifiertemplateparameter"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.comment"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.component"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.constraint"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.datatype"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="createDurationObservation7CreationTool"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.enumeration"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.enumerationliteral"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.interface"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.instancespecification"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.informationitem"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.primitivetype"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.model"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.operation"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.OperationTemplateParameter"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.package"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.property"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.reception"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.redefinabletemplatesignature"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.signal"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.slot"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.templateparameter"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.templatesignature"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="createTimeObservation22CreationTool"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.connectableelementtemplateparameter"
-				path="/clazz.group.nodes">
-		  </predefinedEntry>
-		<entry
-		      description="Edges"
-		      id="clazz.group.relationships"
-		      kind="drawer"
-		      label="Edges"
-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-		      path="/"
-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-		   <expand
-		         force="true">
-		   </expand>
-		</entry>
-		<predefinedEntry
-		        id="clazz.tool.abstraction"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.association"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.associationbranch"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.associationclass"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.containmentlink"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.contextlink"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.dependency"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.dependencybranch"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.elementimport"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.generalization"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.generalizationset"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.informationflowlink"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.instancespecificationlink"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.interfacerealization"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.link"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.packageimport"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.packagemerge"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.profileapplication"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.realization"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.substitution"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.templatebinding"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="clazz.tool.usage"
-				path="/clazz.group.relationships">
-		  </predefinedEntry>
-		</contribution>
-		<editor id="org.eclipse.papyrus.uml.diagram.clazz"/>
-	</paletteProvider>	
-		
-</extension>
-<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
-				      <?gmfgen generated="true"?>
-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLValidationDecoratorProvider">
-				         <Priority name="Lowest"/>
-				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
-				         <context decoratorTargets="PRIMARY_VIEW"/>
-				      </decoratorProvider>
-				   </extension>
+<extension

+			id="PapyrusUMLClassDiagram.palettedefinition"

+			name="PapyrusUMLClassDiagram Predefined Entries"

+			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 

+			

+			<?gmfgen generated="true"?>	

+			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

+				<Priority name="Lowest"/>

+				   		<contribution

+				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.clazz.part.UMLPaletteFactory">

+				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

+				

+				<entry

+				      defineOnly="true"

+				      description="Create a new Class"

+				      id="clazz.tool.class"

+				      kind="tool"

+				      label="Class"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a ClassifiertemplateParameter"

+				      id="clazz.tool.classifiertemplateparameter"

+				      kind="tool"

+				      label="ClassifierTemplateParameter"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClassifierTemplateParameter.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClassifierTemplateParameter.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a comment"

+				      id="clazz.tool.comment"

+				      kind="tool"

+				      label="Comment"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a component"

+				      id="clazz.tool.component"

+				      kind="tool"

+				      label="Component"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a constraint"

+				      id="clazz.tool.constraint"

+				      kind="tool"

+				      label="Constraint"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a new DataType"

+				      id="clazz.tool.datatype"

+				      kind="tool"

+				      label="DataType"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new DurationObservation"

+				      id="createDurationObservation7CreationTool"

+				      kind="tool"

+				      label="DurationObservation"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an enumeration"

+				      id="clazz.tool.enumeration"

+				      kind="tool"

+				      label="Enumeration"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an enumeration literal"

+				      id="clazz.tool.enumerationliteral"

+				      kind="tool"

+				      label="Enumeration literal"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an interface"

+				      id="clazz.tool.interface"

+				      kind="tool"

+				      label="Interface"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an InstanceSpecification"

+				      id="clazz.tool.instancespecification"

+				      kind="tool"

+				      label="InstanceSpecification"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an InformationItem"

+				      id="clazz.tool.informationitem"

+				      kind="tool"

+				      label="InformationItem"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Primitivetype"

+				      id="clazz.tool.primitivetype"

+				      kind="tool"

+				      label="PrimitiveType"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a model"

+				      id="clazz.tool.model"

+				      kind="tool"

+				      label="Model"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an operation"

+				      id="clazz.tool.operation"

+				      kind="tool"

+				      label="Operation"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an OperationTemplateParameter"

+				      id="clazz.tool.OperationTemplateParameter"

+				      kind="tool"

+				      label="OperationTemplateParameter"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OperationTemplateParameter.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OperationTemplateParameter.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Package"

+				      id="clazz.tool.package"

+				      kind="tool"

+				      label="Package"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a new Property"

+				      id="clazz.tool.property"

+				      kind="tool"

+				      label="Property"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a reception"

+				      id="clazz.tool.reception"

+				      kind="tool"

+				      label="Reception"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a RedefinableTemplateSignature"

+				      id="clazz.tool.redefinabletemplatesignature"

+				      kind="tool"

+				      label="RedefinableTemplateSignature"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RedefinableTemplateSignature.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RedefinableTemplateSignature.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a signal"

+				      id="clazz.tool.signal"

+				      kind="tool"

+				      label="Signal"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Slot"

+				      id="clazz.tool.slot"

+				      kind="tool"

+				      label="Slot"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a templateParameter"

+				      id="clazz.tool.templateparameter"

+				      kind="tool"

+				      label="TemplateParameter"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateParameter.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateParameter.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a TemplateSignature"

+				      id="clazz.tool.templatesignature"

+				      kind="tool"

+				      label="TemplateSignature"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateSignature.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateSignature.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new TimeObservation"

+				      id="createTimeObservation22CreationTool"

+				      kind="tool"

+				      label="TimeObservation"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a ConnectableElementTemplateParameter"

+				      id="clazz.tool.connectableelementtemplateparameter"

+				      kind="tool"

+				      label="ConnectableElementTemplateParameter"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectableElementTemplateParameter.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectableElementTemplateParameter.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an Abstraction"

+				      id="clazz.tool.abstraction"

+				      kind="tool"

+				      label="Abstraction"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an association"

+				      id="clazz.tool.association"

+				      kind="tool"

+				      label="Association"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an association branch"

+				      id="clazz.tool.associationbranch"

+				      kind="tool"

+				      label="AssociationBranch"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="AssociationClass"

+				      id="clazz.tool.associationclass"

+				      kind="tool"

+				      label="AssociationClass"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AssociationClass.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AssociationClass.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a ContainmentLink"

+				      id="clazz.tool.containmentlink"

+				      kind="tool"

+				      label="ContainmentLink"

+				      large_icon="icons/obj16/ContainmentConnection.gif"

+				      path=""

+				      small_icon="icons/obj16/ContainmentConnection.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Creation of a context link for a Constraint"

+				      id="clazz.tool.contextlink"

+				      kind="tool"

+				      label="ContextLink"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a dependency"

+				      id="clazz.tool.dependency"

+				      kind="tool"

+				      label="Dependency"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a dependency branch"

+				      id="clazz.tool.dependencybranch"

+				      kind="tool"

+				      label="DependencyBranch"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a  elementImport"

+				      id="clazz.tool.elementimport"

+				      kind="tool"

+				      label="ElementImport"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ElementImport.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ElementImport.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description=" Create a generalization"

+				      id="clazz.tool.generalization"

+				      kind="tool"

+				      label="Generalization"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="GeneralizationSet"

+				      id="clazz.tool.generalizationset"

+				      kind="tool"

+				      label="GeneralizationSet"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralizationSet.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralizationSet.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an InformationFlow link"

+				      id="clazz.tool.informationflowlink"

+				      kind="tool"

+				      label="InformationFlow link"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an InstanceSpecification link"

+				      id="clazz.tool.instancespecificationlink"

+				      kind="tool"

+				      label="InstanceSpecification link"

+				      large_icon="icons/obj16/InstanceLink.gif"

+				      path=""

+				      small_icon="icons/obj16/InstanceLink.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an InterfaceRealization"

+				      id="clazz.tool.interfacerealization"

+				      kind="tool"

+				      label="InterfaceRealization"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Creation of a link for comment, constraint, TimeObservation, DurationObservation"

+				      id="clazz.tool.link"

+				      kind="tool"

+				      label="Link"

+				      large_icon="icons/obj16/Link.gif"

+				      path=""

+				      small_icon="icons/obj16/Link.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description=" Create a packageImport"

+				      id="clazz.tool.packageimport"

+				      kind="tool"

+				      label="PackageImport"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a packageMerge"

+				      id="clazz.tool.packagemerge"

+				      kind="tool"

+				      label="PackageMerge"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a profileApplication"

+				      id="clazz.tool.profileapplication"

+				      kind="tool"

+				      label="ProfileApplication"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Realization"

+				      id="clazz.tool.realization"

+				      kind="tool"

+				      label="Realization"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a substitution"

+				      id="clazz.tool.substitution"

+				      kind="tool"

+				      label="Substitution"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a TemplateBinding"

+				      id="clazz.tool.templatebinding"

+				      kind="tool"

+				      label="TemplateBinding"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateBinding.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateBinding.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an Usage"

+				      id="clazz.tool.usage"

+				      kind="tool"

+				      label="Usage"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">

+					</entry>

+				

+				</contribution>

+			</paletteProvider>	

+				

+		</extension>

+
+<extension

+	id="PapyrusUMLClassDiagram.standard"

+	name="PapyrusUMLClassDiagram Standard Palette"

+	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 

+	

+	<?gmfgen generated="true"?>	

+	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

+		<Priority name="Low"/>

+		   		<contribution

+		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.clazz.part.UMLPaletteFactory">

+		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

+		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

+		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

+		

+		<entry

+		      description="Nodes"

+		      id="clazz.group.nodes"

+		      kind="drawer"

+		      label="Nodes"

+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+		      path="/"

+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

+		   <expand

+		         force="true">

+		   </expand>

+		</entry>

+		<predefinedEntry

+		        id="clazz.tool.class"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.classifiertemplateparameter"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.comment"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.component"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.constraint"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.datatype"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="createDurationObservation7CreationTool"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.enumeration"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.enumerationliteral"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.interface"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.instancespecification"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.informationitem"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.primitivetype"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.model"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.operation"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.OperationTemplateParameter"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.package"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.property"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.reception"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.redefinabletemplatesignature"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.signal"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.slot"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.templateparameter"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.templatesignature"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="createTimeObservation22CreationTool"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.connectableelementtemplateparameter"

+				path="/clazz.group.nodes">

+		  </predefinedEntry>

+		<entry

+		      description="Edges"

+		      id="clazz.group.relationships"

+		      kind="drawer"

+		      label="Edges"

+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+		      path="/"

+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

+		   <expand

+		         force="true">

+		   </expand>

+		</entry>

+		<predefinedEntry

+		        id="clazz.tool.abstraction"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.association"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.associationbranch"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.associationclass"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.containmentlink"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.contextlink"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.dependency"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.dependencybranch"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.elementimport"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.generalization"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.generalizationset"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.informationflowlink"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.instancespecificationlink"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.interfacerealization"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.link"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.packageimport"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.packagemerge"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.profileapplication"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.realization"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.substitution"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.templatebinding"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="clazz.tool.usage"

+				path="/clazz.group.relationships">

+		  </predefinedEntry>

+		</contribution>

+		<editor id="org.eclipse.papyrus.uml.diagram.clazz"/>

+	</paletteProvider>	

+		

+</extension>

+<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

+				      <?gmfgen generated="true"?>

+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLValidationDecoratorProvider">

+				         <Priority name="Lowest"/>

+				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

+				         <context decoratorTargets="PRIMARY_VIEW"/>

+				      </decoratorProvider>

+				   </extension>

 
 <!-- Diagram specific advices -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
@@ -1811,9 +1804,9 @@
 
 		</diagramMappings>
 	</extension>
-<extension point="org.eclipse.ui.handlers" id="menu-handlers">
-      <?gmfgen generated="true"?>
-   </extension>
+<extension point="org.eclipse.ui.handlers" id="menu-handlers">

+      <?gmfgen generated="true"?>

+   </extension>

 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
@@ -1828,9 +1821,9 @@
          path="model/classdiagram-notation.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
-      <?gmfgen generated="true"?>
-   </extension>
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">

+      <?gmfgen generated="true"?>

+   </extension>

 <extension
       point="org.eclipse.papyrus.infra.gmfdiag.assistant.modelProviders">
    <modelProvider
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionEditPart.java
index 4c616090aed..ad6740faa71 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionEditPart.java
@@ -20,8 +20,8 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

@@ -48,7 +48,7 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeAbstractionLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkEditPart.java
index c9630cb57c0..a7d864b83fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkEditPart.java
@@ -19,10 +19,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.CustomContextLinkFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportEditPart.java
index fd0e6933ced..f462533bcc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportEditPart.java
@@ -18,10 +18,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeElementImportLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

@@ -48,7 +48,7 @@ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeElementImportLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowEditPart.java
index f03b59e13f7..c1b7793e04c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowEditPart.java
@@ -18,9 +18,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.InformationFlowFigure;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeInformationFlowLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 

 /**

  * @generated

@@ -46,7 +46,7 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeInformationFlowLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageMergeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageMergeEditPart.java
index a1133b5bf8d..730679926eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageMergeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageMergeEditPart.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEdit
 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypePackageMergeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

@@ -48,7 +48,7 @@ public class PackageMergeEditPart extends UMLConnectionNodeEditPart implements I
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePackageMergeLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageEditPart.java
index 6228ba52428..200fbe0bf14 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageEditPart.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEdit
 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

@@ -48,7 +48,7 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeUsageLabelDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/messages.properties
index cf04fa5b87b..0d5288bf8f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/messages.properties
@@ -44,6 +44,9 @@ AppliedStereotypeLabel_PackageImportAccessTag=access
 AppliedStereotypeLabel_AbstractionTag=abstraction
 AppliedStereotypeLabel_PackageMergeTag=merge
 
+############# Label Customization ###################
+ICustomAppearance_PIN_DISP_TYPE=Pin Type
+
 ############# Palette Customisation #################
 PapyrusPaletteCustomizerDialog_AddButtonTooltip=Add the selection to the palette
 PapyrusPaletteCustomizerDialog_RemoveButtonTooltip=Remove the selection from the palette
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/Messages.java
index b31c97e5235..cae8c6b57fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/Messages.java
@@ -88,6 +88,8 @@ public class Messages extends NLS {
 
 	public static String RotateAction_rotate_command;
 
+	public static String ICustomAppearance_PIN_DISP_TYPE;
+
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy.java
index d7cf444095a..1d016313226 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy.java
@@ -11,12 +11,11 @@
  *  Boutheina Bannour (CEA LIST) boutheina.bannour@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.clazz.custom.policies;

+package org.eclipse.papyrus.uml.diagram.common.editpolicies;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.gef.GraphicalEditPart;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure;

 

 /**

@@ -24,11 +23,13 @@ import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigu
  */

 public class CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy extends AppliedStereotypeLinkLabelDisplayEditPolicy {

 

+	public static final String APPLIED_STEREOTYPE_LABEL = "context"; //$NON-NLS-1$

+

 	/**

 	 * Creates the EditPolicy, with the correct tag.

 	 */

 	public CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy() {

-		super("context"); //$NON-NLS-1$

+		super(APPLIED_STEREOTYPE_LABEL); //$NON-NLS-1$

 	}

 

 	@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/MaskManagedFloatingLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/MaskManagedFloatingLabelEditPolicy.java
index 7de6f25b5f0..450abb48d6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/MaskManagedFloatingLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/MaskManagedFloatingLabelEditPolicy.java
@@ -12,7 +12,6 @@
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.common.editpolicies;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
@@ -24,17 +23,11 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.uml.diagram.common.Activator;
 import org.eclipse.papyrus.uml.diagram.common.helper.FloatingLabelHelper;
 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.MultiplicityElement;
 import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Signal;
 import org.eclipse.uml2.uml.TypedElement;
 import org.eclipse.uml2.uml.UMLPackage;
 
-// TODO: Auto-generated Javadoc
 /**
  * Specific edit policy for label displaying stereotypes and their properties for edges representing
  * UML elements.
@@ -77,45 +70,6 @@ public class MaskManagedFloatingLabelEditPolicy extends AbstractMaskManagedEditP
 	 */
 	@Override
 	public Collection<String> getDefaultDisplayValue() {
-		NamedElement umlElement = getUMLElement();
-		if (umlElement != null) {
-
-			/**
-			 * default uml operation display.
-			 */
-			if (umlElement instanceof Operation) {
-				return ICustomAppearance.DEFAULT_UML_OPERATION;
-			}
-
-			/**
-			 * default uml Port ins composite diagrams.
-			 */
-			if (umlElement instanceof Port) {
-				return ICustomAppearance.DEFAULT_UML_PORT;
-			}
-
-			/**
-			 * default uml Parameter in composite diagrams.
-			 */
-			if (umlElement instanceof Parameter) {
-				return ICustomAppearance.DEFAULT_UML_PARAMETER;
-			}
-
-			/**
-			 * default uml instancespecification .
-			 */
-			if (umlElement instanceof InstanceSpecification) {
-				return ICustomAppearance.DEFAULT_UML_INSTANCESPECIFICATION;
-			}
-
-			/**
-			 * default uml Signal .
-			 */
-			if (umlElement instanceof Signal) {
-				return Arrays.asList(ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_TYPE);
-			}
-
-		}
 		return ICustomAppearance.DEFAULT_UML_FLOATING_LABEL;
 	}
 
@@ -248,7 +202,7 @@ public class MaskManagedFloatingLabelEditPolicy extends AbstractMaskManagedEditP
 			getDiagramEventBroker().removeNotificationListener(((MultiplicityElement) umlElement).getLowerValue(), this);
 		}
 	}
-	
+
 	/**
 	 * @see org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEditPolicy#getCurrentDisplayValue()
 	 *
@@ -256,7 +210,7 @@ public class MaskManagedFloatingLabelEditPolicy extends AbstractMaskManagedEditP
 	 */
 	@Override
 	public Collection<String> getCurrentDisplayValue() {
-		if (getView() == null){
+		if (getView() == null) {
 			return Collections.emptySet();
 		}
 		return super.getCurrentDisplayValue();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java
index 632e08bd68d..f89a00b1015 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java
@@ -100,16 +100,12 @@ public class AutomaticCompartmentLayoutManager extends AbstractLayout {
 					minimumWith = wl.getPreferredSize().width + 2;
 				}
 			}
-
 		}
 		if (!visibleCompartments.isEmpty()) {
 			for (Object o : container.getChildren()) {
-				// only for child which are compartment
-				if (o instanceof ResizableCompartmentFigure) {
-					IFigure child = (IFigure) o;
-					minimumHeight += child.getPreferredSize().height;
-					minimumWith = Math.max(minimumWith, child.getPreferredSize().width);
-				}
+				IFigure child = (IFigure) o;
+				minimumHeight += child.getPreferredSize().height;
+				minimumWith = Math.max(minimumWith, child.getPreferredSize().width);
 			}
 		} else {
 			for (IFigure child : visibleOthers) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/ActivityParameterNodeLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/ActivityParameterNodeLabelHelper.java
new file mode 100644
index 00000000000..26520778547
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/ActivityParameterNodeLabelHelper.java
@@ -0,0 +1,145 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.common.helper;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
+import org.eclipse.uml2.uml.ActivityParameterNode;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.State;
+
+
+public class ActivityParameterNodeLabelHelper extends StereotypedElementLabelHelper {
+	
+	/**
+	 * String for separate masked label part
+	 */
+	private static final String SEPARATOR = ": ";
+
+	private static final String STATE_SEPARATOR = ", ";
+
+	private static final String START_STATE_SEQUENCE = "[";
+
+	private static final String END_STATE_SEQUENCE = "]";
+
+	private static ActivityParameterNodeLabelHelper labelHelper;
+
+	/**
+	 * Returns the singleton instance of this class
+	 *
+	 * @return the singleton instance.
+	 */
+	public static ActivityParameterNodeLabelHelper getInstance() {
+		if (labelHelper == null) {
+			labelHelper = new ActivityParameterNodeLabelHelper();
+		}
+		return labelHelper;
+	}
+
+	/** Map for masks */
+	protected final Map<String, String> masks = new HashMap<String, String>();
+
+	/**
+	 * Creates a new {@link ActivityParameterNode} label helper.
+	 */
+	protected ActivityParameterNodeLabelHelper() {
+		// initialize the map
+		masks.put(ICustomAppearance.DISP_NAME, "Name");
+		masks.put(ICustomAppearance.DISP_PARAMETER_NAME, "Parameter Name");
+		masks.put(ICustomAppearance.DISP_TYPE, "Type");
+		masks.put(ICustomAppearance.DISP_STATE, "States");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected String elementLabel(GraphicalEditPart editPart) {
+		Collection<String> displayValue = ICustomAppearance.DEFAULT_UML_ACTIVITYPARAMETERNODE;
+
+		IMaskManagedLabelEditPolicy policy = (IMaskManagedLabelEditPolicy) editPart.getParent().getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (policy != null) {
+			displayValue = policy.getCurrentDisplayValue();
+		}
+		return parse(displayValue, getUMLElement(editPart));
+	}
+
+	public Map<String, String> getMasks() {
+		return masks;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ActivityParameterNode getUMLElement(GraphicalEditPart editPart) {
+		return (ActivityParameterNode) ((View) editPart.getModel()).getElement();
+	}
+
+	protected String parse(Collection<String> values, ActivityParameterNode node) {
+		StringBuilder result = new StringBuilder();
+		if (node == null) {
+			return "";
+		}
+		// building label value take from
+		// org.eclipse.papyrus.uml.diagram.activity.parser.custom.ActivityParameterNodeParser#getPrintString
+		if (values.contains(ICustomAppearance.DISP_NAME)) {
+			appendName(result, node);
+		}
+		if (values.contains(ICustomAppearance.DISP_PARAMETER_NAME) || result.length() == 0) {
+			appendName(result, node.getParameter());
+		}
+		if (values.contains(ICustomAppearance.DISP_TYPE)) {
+			appendName(result, node.getType());
+		}
+		if (values.contains(ICustomAppearance.DISP_STATE)) {
+			StringBuffer stateLabel = new StringBuffer();
+			for (State state : node.getInStates()) {
+				String stateName = state.getName();
+				if (stateName != null && stateName.length() > 0) {
+					if (stateLabel.length() > 0) {
+						stateLabel.append(STATE_SEPARATOR);
+					}
+					stateLabel.append(stateName);
+				}
+			}
+			if (stateLabel.length() > 0) {
+				if (result.length() > 0) {
+					result.append(System.getProperty("line.separator"));
+				} 
+				result.append(START_STATE_SEQUENCE).append(stateLabel).append(END_STATE_SEQUENCE);
+			}
+		}
+		return result.toString();
+	}
+	
+	private void appendName(StringBuilder builder, NamedElement element) {
+		if (element == null) {
+			return;
+		}
+		String name = element.getName();
+		if (name != null && name.length() > 0) {
+			if (builder.length() > 0) {
+				builder.append(SEPARATOR);
+			}
+			builder.append(name);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/FloatingLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/FloatingLabelHelper.java
index 05014b9ec21..2f0fdcc0bc4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/FloatingLabelHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/FloatingLabelHelper.java
@@ -21,38 +21,38 @@ import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.uml.tools.utils.CollaborationUseUtil;
 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.papyrus.uml.tools.utils.InstanceSpecificationUtil;
 import org.eclipse.papyrus.uml.tools.utils.MultiplicityElementUtil;
 import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
-import org.eclipse.papyrus.uml.tools.utils.OperationUtil;
-import org.eclipse.papyrus.uml.tools.utils.ParameterUtil;
-import org.eclipse.papyrus.uml.tools.utils.PortUtil;
-import org.eclipse.papyrus.uml.tools.utils.PropertyUtil;
 import org.eclipse.papyrus.uml.tools.utils.SignalUtil;
-import org.eclipse.papyrus.uml.tools.utils.TypeUtil;
+import org.eclipse.papyrus.uml.tools.utils.TypedElementUtil;
 import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.CollaborationUse;
-import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.MultiplicityElement;
 import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Signal;
-import org.eclipse.uml2.uml.TemplateParameter;
 import org.eclipse.uml2.uml.TypedElement;
 
-//TODO Check for usefull property to display
-
 /**
  * Helper for labels displaying {@link NamedElement}.
  */
 public class FloatingLabelHelper extends StereotypedElementLabelHelper {
 
-	// Einstance
+
+	/** The Constant SLASH. */
+	private static final String SLASH = "/";//$NON-NLS-1$
+
+	/** The Constant DOUBLE_DOT. */
+	private static final String DOUBLE_DOT = ": ";//$NON-NLS-1$
+
+	/** The Constant ONE_SPACE. */
+	private static final String ONE_SPACE = " ";//$NON-NLS-1$
+
+	/** The Constant EMPTY. */
+	private static final String EMPTY = ""; //$NON-NLS-1$
+
+	/** The Constant STEREOTYPE. */
+	private static final String STEREOTYPE = "stereotype"; //$NON-NLS-1$
+
 	/** The label helper. */
 	private static FloatingLabelHelper labelHelper;
 
@@ -105,45 +105,17 @@ public class FloatingLabelHelper extends StereotypedElementLabelHelper {
 		/**
 		 * Style constant for default value display in labels.
 		 */
-		masks.put(ICustomAppearance.DISP_DEFAULT_VALUE, "Default  Value");
-
-		/**
-		 * Style constant for modifiers display in labels.
-		 */
-		masks.put(ICustomAppearance.DISP_MODIFIERS, "Modifiers");
-
-		/** Style constant for carriage return in labels */
-		masks.put(ICustomAppearance.DISP_MULTI_LINE, "Multiline");
-
-		/** Style constant for operation#parameter direction display in labels */
-		masks.put(ICustomAppearance.DISP_PARAMETER_DIRECTION, "Parameters Direction");
+		masks.put(ICustomAppearance.DISP_DEFAULT_VALUE, "Default Value");
 
 		/** Style constant for direction display in labels */
 		masks.put(ICustomAppearance.DISP_DIRECTION, "Direction");
 
-		/** Style constant for operation#parameter name display in labels */
-		masks.put(ICustomAppearance.DISP_PARAMETER_NAME, "Parameters Name");
-
-		/** Style constant for operation#parameter type display in labels */
-		masks.put(ICustomAppearance.DISP_PARAMETER_TYPE, "Parameters Type");
-
-		/** Style constant for operation#parameter multiplicity display in labels */
-		masks.put(ICustomAppearance.DISP_PARAMETER_MULTIPLICITY, "Parameters Multiplicity");
-
-		/** Style constant for operation#parameter default value display in labels */
-		masks.put(ICustomAppearance.DISP_PARAMETER_DEFAULT, "Parameters Default");
-
-		/** Style constant for operation#parameter modifiers display in labels */
-		masks.put(ICustomAppearance.DISP_PARAMETER_MODIFIERS, "Parameters Modifiers");
-
 		/** Style constant for return type display in labels */
 		masks.put(ICustomAppearance.DISP_RT_TYPE, "returnType");
 
 		/** Style constant for return multiplicity display in labels */
 		masks.put(ICustomAppearance.DISP_RT_MULTIPLICITY, "Return Multiplicity");
 
-		/** Style constant for conjugated labels */
-		masks.put(ICustomAppearance.DISP_CONJUGATED, "Conjugated");
 	}
 
 	/**
@@ -184,12 +156,18 @@ public class FloatingLabelHelper extends StereotypedElementLabelHelper {
 	 */
 	protected String parseString(GraphicalEditPart editPart, Collection<String> displayValue) {
 		NamedElement namedElement = getUMLElement(editPart);
+		StringBuilder buffer = new StringBuilder();
+
+		if (displayValue.contains(STEREOTYPE)) {
+			// computes the label for the stereotype (horizontal presentation)
+			buffer.append(stereotypesToDisplay((GraphicalEditPart) editPart.getParent()));
+		}
 
 		if (namedElement != null) {
-			return getCustomLabel(namedElement, displayValue);
+			buffer.append(getCustomLabel(namedElement, displayValue));
 		}
 
-		return "";
+		return buffer.toString();
 	}
 
 
@@ -217,6 +195,15 @@ public class FloatingLabelHelper extends StereotypedElementLabelHelper {
 	}
 
 	/**
+	 * Computes the label to be displayed for the floating label
+	 */
+	@Override
+	protected String labelToDisplay(GraphicalEditPart editPart) {
+		// computes the string label to be displayed
+		return elementLabel(editPart);
+	}
+
+	/**
 	 * return the custom label of the property, given UML2 specification and a custom style.
 	 *
 	 * @param namedElement
@@ -225,52 +212,21 @@ public class FloatingLabelHelper extends StereotypedElementLabelHelper {
 	 *            the mask values
 	 * @return the string corresponding to the label of the property
 	 */
-	public static String getCustomLabel(NamedElement namedElement, Collection<String> maskValues) {
+	public String getCustomLabel(NamedElement namedElement, Collection<String> maskValues) {
 
 		// Use of specific existing custom label
 
-		// use CollaborationUse custom label
-		if (namedElement instanceof CollaborationUse) {
-			return CollaborationUseUtil.getCustomLabel((CollaborationUse) namedElement, maskValues);
-		}
-
-		// use InstanceSpecification custom label
-		if (namedElement instanceof InstanceSpecification) {
-			return InstanceSpecificationUtil.getCustomLabel((InstanceSpecification) namedElement, maskValues);
-		}
-
-		// use Operation custom label
-		if (namedElement instanceof Operation) {
-			return OperationUtil.getCustomLabel((Operation) namedElement, maskValues);
-		}
-
-		// use Parameter custom label
-		if (namedElement instanceof Parameter) {
-			return ParameterUtil.getCustomLabel((Parameter) namedElement, maskValues);
-		}
-
 		// use Signal custom label
 		if (namedElement instanceof Signal) {
 			return SignalUtil.getCustomLabel((Signal) namedElement, maskValues);
 		}
 
-		// use Port custom label
-		if (namedElement instanceof Port) {
-			return PortUtil.getCustomLabel((Port) namedElement, maskValues);
-		}
-
-		// use Property custom label
-		if (namedElement instanceof Property) {
-			return PropertyUtil.getCustomLabel((Property) namedElement, maskValues);
-		}
-		// TODO add others usefull properties
-
 		// default custom label
-		StringBuffer buffer = new StringBuffer();
+		StringBuilder buffer = new StringBuilder();
 
 		// visibility
 		if (maskValues.contains(ICustomAppearance.DISP_VISIBILITY)) {
-			buffer.append(" ");
+			buffer.append(ONE_SPACE);
 			buffer.append(NamedElementUtil.getVisibilityAsSign(namedElement));
 		}
 
@@ -278,25 +234,22 @@ public class FloatingLabelHelper extends StereotypedElementLabelHelper {
 		if (namedElement instanceof Association) {
 			if (maskValues.contains(ICustomAppearance.DISP_DERIVE)) {
 				if (((Association) namedElement).isDerived()) {
-					buffer.append("/");
+					buffer.append(SLASH);
 				}
 			}
 		}
 		// name
 		if (maskValues.contains(ICustomAppearance.DISP_NAME)) {
-			buffer.append(" ");
-			buffer.append(namedElement.getName());
+			buffer.append(ONE_SPACE);
+			final String name = namedElement.getName();
+			buffer.append(name != null ? name : EMPTY);
 		}
 
 		// Type of TypedElement
 		if (namedElement instanceof TypedElement) {
-			if (maskValues.contains(ICustomAppearance.DISP_TYPE)) {
-				// type
-				if (((TypedElement) namedElement).getType() != null) {
-					buffer.append(": " + ((TypedElement) namedElement).getType().getName());
-				} else {
-					buffer.append(": " + TypeUtil.UNDEFINED_TYPE_NAME);
-				}
+			if (maskValues.contains(ICustomAppearance.DISP_RT_TYPE) || maskValues.contains(ICustomAppearance.DISP_TYPE)) {
+				buffer.append(DOUBLE_DOT);
+				buffer.append(TypedElementUtil.getTypeAsString((TypedElement) namedElement));
 			}
 		}
 
@@ -309,17 +262,6 @@ public class FloatingLabelHelper extends StereotypedElementLabelHelper {
 			}
 		}
 
-		// Template Parameter(not sure of the uml element
-		if (namedElement instanceof TemplateParameter) {
-			if (maskValues.contains(ICustomAppearance.DISP_DEFAULT_VALUE)) {
-				// default value
-				if (((TemplateParameter) namedElement).getDefault() != null) {
-					buffer.append(" = ");
-					buffer.append(((TemplateParameter) namedElement).getDefault());
-				}
-			}
-		}
-
 		return buffer.toString();
 	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/stereotype/AppliedStereotypeParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/stereotype/AppliedStereotypeParser.java
index 7cc25dac0a7..28ac8c419ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/stereotype/AppliedStereotypeParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/stereotype/AppliedStereotypeParser.java
@@ -34,6 +34,16 @@ public class AppliedStereotypeParser implements ISemanticParser {
 
 	private static final MessageFormat APPLIED_PROFILE = new MessageFormat("\u00AB{0}\u00BB"); //$NON-NLS-1$
 
+	private final String myDefaultPrintString;
+
+	public AppliedStereotypeParser() {
+		this(null);
+	}
+
+	public AppliedStereotypeParser(String defaultPrintString) {
+		myDefaultPrintString = defaultPrintString;
+	}
+
 	@Override
 	public boolean areSemanticElementsAffected(EObject listener, Object notification) {
 		if (notification instanceof Notification) {
@@ -94,7 +104,8 @@ public class AppliedStereotypeParser implements ISemanticParser {
 	@Override
 	public String getPrintString(IAdaptable element, int flags) {
 		String editString = getEditString(element, flags);
-		return editString == null || editString.length() == 0 ? editString : APPLIED_PROFILE.format(new Object[] { editString });
+		editString = editString == null || editString.isEmpty() ? myDefaultPrintString : editString;
+		return editString == null || editString.isEmpty() ? "" : APPLIED_PROFILE.format(new Object[] { editString });
 	}
 
 	@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/CommunicationDeferredCreateConnectionViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/CommunicationDeferredCreateConnectionViewCommand.java
index 71623baf2e8..0b02d57bbfe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/CommunicationDeferredCreateConnectionViewCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/CommunicationDeferredCreateConnectionViewCommand.java
@@ -1,6 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
+ * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,6 +8,7 @@
  *
  * Contributors:
  *  Saadia Dhouib saadia.dhouib@cea.fr  - Initial API and Implementation
+ *  Christian W. Damus - bug 462958
  *
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.communication.custom.commands;
@@ -17,6 +17,7 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gef.EditPartViewer;
@@ -26,8 +27,12 @@ import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.CommonDeferredCreateConnectionViewCommand;
+import org.eclipse.papyrus.uml.diagram.communication.edit.parts.MessageEditPart;
 import org.eclipse.papyrus.uml.diagram.communication.edit.parts.MessageNameEditPart;
 import org.eclipse.papyrus.uml.diagram.communication.part.UMLVisualIDRegistry;
 
@@ -96,14 +101,32 @@ public class CommunicationDeferredCreateConnectionViewCommand extends CommonDefe
 		CreateConnectionViewRequest createRequest = new CreateConnectionViewRequest(viewDescriptor);
 		createConnectionCmd = CreateConnectionViewRequest.getCreateCommand(createRequest, sourceEditPart, targetEditPart);
 
-		if (createConnectionCmd.canExecute()) {
-			createConnectionCmd.execute();
+		// Double-check that another drop command didn't already create the edge
+		View messagePath = findCommunicationPath(sourceEditPart, targetEditPart);
+		if (messagePath != null) {
+			// Pretend that we created it
+			createRequest.getConnectionViewDescriptor().setView(messagePath);
+
+			// And create a label, instead
+			if (labelElement != null) {
+				IAdaptable semanticAdapter = new SemanticAdapter(labelElement, null);
+				// Location where the label will be dropped, as in the drop edit policy
+				Point loc = new Point(1, -23);
+				ICommand cmd = new CustomMessageViewCreateCommand(getEditingDomain(), viewer, preferencesHint, loc, semanticAdapter, messagePath);
+				if (cmd.canExecute()) {
+					cmd.execute(null, null);
+				}
+			}
+		} else {
+			if (createConnectionCmd.canExecute()) {
+				createConnectionCmd.execute();
+			}
 		}
 		if (labelElement != null) {
 
 			/*
 			 * Code Commented to no more set the the semantic element of the connector
-			 *
+			 * 
 			 * //Set element of the connector to Interaction !! This has to be changed in the next release, because it is incoherent !!!
 			 * //If setElement(null) , I can not do the reorient anymore !!
 			 * // View temp = (View)(createRequest.getConnectionViewDescriptor().getAdapter(View.class));
@@ -119,20 +142,22 @@ public class CommunicationDeferredCreateConnectionViewCommand extends CommonDefe
 			 * // }
 			 */
 
+			messagePath = (View) createRequest.getConnectionViewDescriptor().getAdapter(View.class);
+			if (messagePath == null) {
+				viewer = null;// for garbage collection
+				return CommandResult.newErrorCommandResult("Failed to obtain or create communication-path link.");
+			}
+
 			// set element of the label of the connector to element
-			if (((View) (createRequest.getConnectionViewDescriptor().getAdapter(View.class))).getChildren().size() > 1) {
-
-				for (int i = 0; i < ((View) (createRequest.getConnectionViewDescriptor().getAdapter(View.class))).getChildren().size(); i++) {
-					// ---------------------------------------------------------
-					// help to debug
-					// System.err.println("Child of connector view :" + (((View)(createRequest.getConnectionViewDescriptor().getAdapter(View.class))).getChildren().get(i)));
-					// System.err.println("VisualID of Child of connector view :" + UMLVisualIDRegistry.getType(MessageNameEditPart.VISUAL_ID));
-					// System.err.println("VisualID  of MessageNameEditPart :" + ((View)(((View)(createRequest.getConnectionViewDescriptor().getAdapter(View.class))).getChildren().get(i))).getType());
-					// ---------------------------------------------------------
-					if (((View) (((View) (createRequest.getConnectionViewDescriptor().getAdapter(View.class))).getChildren().get(i))).getType().equals(UMLVisualIDRegistry.getType(MessageNameEditPart.VISUAL_ID))) {// this is the label that coresponds to the
-																																																						// message
-						((View) (((View) (createRequest.getConnectionViewDescriptor().getAdapter(View.class))).getChildren().get(i))).setElement(labelElement);
-						// System.err.println("VisualID  of MessageNameEditPart == VisualID of Child of connector view ");
+			if (messagePath.getChildren().size() > 1) {
+
+				for (int i = 0; i < messagePath.getChildren().size(); i++) {
+					View label = (View) (messagePath.getChildren().get(i));
+					if (UMLVisualIDRegistry.getType(MessageNameEditPart.VISUAL_ID).equals(label.getType())) {
+						// This is a message label. Is it the one we need to set?
+						if (!label.eIsSet(NotationPackage.Literals.VIEW__ELEMENT) || (label.getElement() == null)) {
+							label.setElement(labelElement);
+						}
 					}
 				}
 			}
@@ -140,6 +165,36 @@ public class CommunicationDeferredCreateConnectionViewCommand extends CommonDefe
 		}
 
 		viewer = null;// for garbage collection
-		return CommandResult.newOKCommandResult();
+		return CommandResult.newOKCommandResult(createRequest.getConnectionViewDescriptor());
+	}
+
+	@SuppressWarnings("unchecked")
+	protected View findCommunicationPath(IGraphicalEditPart sourceEditPart, IGraphicalEditPart targetEditPart) {
+		View result = null;
+
+		View sourceView = sourceEditPart.getNotationView();
+		View targetView = targetEditPart.getNotationView();
+
+		if ((sourceView != null) && (targetView != null)) {
+			for (Edge next : (Iterable<? extends Edge>) sourceView.getSourceEdges()) {
+				if ((UMLVisualIDRegistry.getType(MessageEditPart.VISUAL_ID)).equals(next.getType())
+						&& (next.getTarget() == targetView)) {
+					result = next;
+					break;
+				}
+			}
+			if (result == null) {
+				// Try the reverse orientation
+				for (Edge next : (Iterable<? extends Edge>) sourceView.getTargetEdges()) {
+					if ((UMLVisualIDRegistry.getType(MessageEditPart.VISUAL_ID)).equals(next.getType())
+							&& (next.getSource() == targetView)) {
+						result = next;
+						break;
+					}
+				}
+			}
+		}
+
+		return result;
 	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/CustomMessageViewCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/CustomMessageViewCreateCommand.java
index fc5b78c8dd6..6a9c48d4f67 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/CustomMessageViewCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/CustomMessageViewCreateCommand.java
@@ -1,6 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
+ * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,7 +7,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *  Saadia Dhouib saadia.dhouib@cea.fr
+ *  Saadia Dhouib saadia.dhouib@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 462958
  *
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.communication.custom.commands;
@@ -24,7 +24,6 @@ import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gef.ConnectionEditPart;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPartViewer;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
@@ -38,7 +37,7 @@ import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationFactory;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter;
 import org.eclipse.papyrus.uml.diagram.communication.edit.parts.MessageNameEditPart;
 import org.eclipse.papyrus.uml.diagram.communication.part.UMLVisualIDRegistry;
 
@@ -74,7 +73,7 @@ public class CustomMessageViewCreateCommand extends AbstractTransactionalCommand
 	private EditPartViewer viewer;
 
 	/** The existing link. */
-	private ConnectionEditPart existingLink;
+	private View existingLink;
 
 	/**
 	 * Instantiates a new custom message view create command.
@@ -94,7 +93,7 @@ public class CustomMessageViewCreateCommand extends AbstractTransactionalCommand
 	 * @param link
 	 *            the link
 	 */
-	public CustomMessageViewCreateCommand(TransactionalEditingDomain domain, EditPartViewer viewer, PreferencesHint preferencesHint, Point point, IAdaptable semanticAdapter, ConnectionEditPart link) {
+	public CustomMessageViewCreateCommand(TransactionalEditingDomain domain, EditPartViewer viewer, PreferencesHint preferencesHint, Point point, IAdaptable semanticAdapter, View link) {
 		super(domain, "MessageClassViewCreateCommand", null); //$NON-NLS-1$
 		// this.containerView = container;
 		this.viewer = viewer;
@@ -114,13 +113,10 @@ public class CustomMessageViewCreateCommand extends AbstractTransactionalCommand
 	 * @return
 	 * @throws ExecutionException
 	 */
-	@SuppressWarnings("static-access")
 	@Override
 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// IFigure linkEditPart = (IFigure)existingLink.getFigure();
-		View linkView = ((IGraphicalEditPart) existingLink).getNotationView();
 		// Connector linkConnector = linkView.get
-		CustomMessageViewCreateCommand.node = customCreateLabel(((EObject) semanticApdater.getAdapter(EObject.class)), linkView, UMLVisualIDRegistry.getType(MessageNameEditPart.VISUAL_ID));
+		CustomMessageViewCreateCommand.node = customCreateLabel(((EObject) semanticApdater.getAdapter(EObject.class)), existingLink, UMLVisualIDRegistry.getType(MessageNameEditPart.VISUAL_ID));
 		// put to the good position
 		Location notationLocation = NotationFactory.eINSTANCE.createLocation();
 		// notationLocation.setX(location.x);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/edit/policies/CustomDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
index dec8cd5f19f..e310326380b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
@@ -1,6 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2010 CEA
- *
+ * Copyright (c) 2010, 2015 CEA, Christian W. Damus, and others.
  *    
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,9 +7,10 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
-
- *   Saadia DHOUIB (CEA LIST) saadia.dhouib@cea.fr
+ *   Saadia DHOUIB (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
  *   Vincent LORENZO (CEA-LIST) vincent.lorenzo@cea.fr
+ *   Christian W. Damus - bug 462958
+ *   
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.communication.custom.edit.policies;
 
@@ -46,8 +46,8 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CommonDiagramDragDropEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewServiceUtil;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CommonDiagramDragDropEditPolicy;
 import org.eclipse.papyrus.uml.diagram.communication.custom.commands.CommunicationDeferredCreateConnectionViewCommand;
 import org.eclipse.papyrus.uml.diagram.communication.custom.commands.CustomMessageViewCreateCommand;
 import org.eclipse.papyrus.uml.diagram.communication.custom.helper.CommunicationLinkMappingHelper;
@@ -90,7 +90,7 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
 	 * Gets the UML element type.
 	 * 
 	 * @param elementID
-	 *        the element id
+	 *            the element id
 	 * @return the UML element type {@inheritDoc}
 	 */
 	@Override
@@ -102,9 +102,9 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
 	 * Gets the node visual id.
 	 * 
 	 * @param containerView
-	 *        the container view
+	 *            the container view
 	 * @param domainElement
-	 *        the domain element
+	 *            the domain element
 	 * @return the node visual id {@inheritDoc}
 	 */
 	@Override
@@ -116,7 +116,7 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
 	 * Gets the link with class visual id.
 	 * 
 	 * @param domainElement
-	 *        the domain element
+	 *            the domain element
 	 * @return the link with class visual id {@inheritDoc}
 	 */
 	@Override
@@ -125,8 +125,7 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.uml.diagram.common.editpolicies.CommonDiagramDragDropEditPolicy#getSpecificDropCommand(org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest,
-	 *      org.eclipse.uml2.uml.Element, int, int)
+	 * @see org.eclipse.papyrus.uml.diagram.common.editpolicies.CommonDiagramDragDropEditPolicy#getSpecificDropCommand(org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest, org.eclipse.uml2.uml.Element, int, int)
 	 * 
 	 * @param dropRequest
 	 * @param semanticElement
@@ -136,22 +135,22 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
 	 */
 	@Override
 	protected Command getSpecificDropCommand(DropObjectsRequest dropRequest, Element semanticElement, int nodeVISUALID, int linkVISUALID) {
-		switch(linkVISUALID) {
+		switch (linkVISUALID) {
 		case MessageEditPart.VISUAL_ID:
 			return dropMessage(dropRequest, semanticElement, linkVISUALID);
 		default:
 			// Switch test over nodeVISUALID
-			switch(nodeVISUALID) {
+			switch (nodeVISUALID) {
 			case LifelineEditPartCN.VISUAL_ID:
 				return dropChildNode(dropRequest, semanticElement, nodeVISUALID);
-				//			case CommentEditPartCN.VISUAL_ID:
-				//				return dropChildNode(dropRequest, semanticElement, nodeVISUALID);
-				//			case ConstraintEditPartCN.VISUAL_ID:
-				//				return dropChildNode(dropRequest, semanticElement, nodeVISUALID);
+				// case CommentEditPartCN.VISUAL_ID:
+				// return dropChildNode(dropRequest, semanticElement, nodeVISUALID);
+				// case ConstraintEditPartCN.VISUAL_ID:
+				// return dropChildNode(dropRequest, semanticElement, nodeVISUALID);
 			case TimeObservationEditPartCN.VISUAL_ID:
-				return dropTimeObservation(dropRequest, (TimeObservation)semanticElement, nodeVISUALID);
+				return dropTimeObservation(dropRequest, (TimeObservation) semanticElement, nodeVISUALID);
 			case DurationObservationEditPartCN.VISUAL_ID:
-				return dropDurationObservation(dropRequest, (DurationObservation)semanticElement, nodeVISUALID);
+				return dropDurationObservation(dropRequest, (DurationObservation) semanticElement, nodeVISUALID);
 			case CommentEditPartCN.VISUAL_ID:
 				return dropComment(dropRequest, semanticElement, nodeVISUALID);
 			case ConstraintEditPartCN.VISUAL_ID:
@@ -166,86 +165,88 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
 	 * Returns the command to drop the Comment + the link to attach it to its annotated elements
 	 * 
 	 * @param dropRequest
-	 *        the drop request
+	 *            the drop request
 	 * @param semanticLink
-	 *        the semantic link
+	 *            the semantic link
 	 * @param nodeVISUALID
-	 *        the node visual id
+	 *            the node visual id
 	 * 
 	 * @return the command
 	 */
 	protected Command dropComment(DropObjectsRequest dropRequest, Element semanticLink, int nodeVISUALID) {
-		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart)getHost();
+		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart) getHost();
 		EObject graphicalParentObject = graphicalParentEditPart.resolveSemanticElement();
-		if(!(graphicalParentObject instanceof Interaction)) {
+		if (!(graphicalParentObject instanceof Interaction)) {
 			return UnexecutableCommand.INSTANCE;
 		}
-		return getDropCommentCommand((Comment)semanticLink, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart)getHost()).getNotationView(), (IHintedType)UMLElementTypes.Comment_8005, (IHintedType)UMLElementTypes.CommentAnnotatedElement_8010);
+		return getDropCommentCommand((Comment) semanticLink, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart) getHost()).getNotationView(), (IHintedType) UMLElementTypes.Comment_8005,
+				(IHintedType) UMLElementTypes.CommentAnnotatedElement_8010);
 	}
 
 	/**
 	 * Returns the command to drop the Constraint + the link to attach it to its contrainted elements
 	 * 
 	 * @param dropRequest
-	 *        the drop request
+	 *            the drop request
 	 * @param semanticLink
-	 *        the semantic link
+	 *            the semantic link
 	 * @param nodeVISUALID
-	 *        the node visual id
+	 *            the node visual id
 	 * 
 	 * @return the command
 	 */
 	protected Command dropConstraint(DropObjectsRequest dropRequest, Element semanticLink, int nodeVISUALID) {
-		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart)getHost();
+		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart) getHost();
 		EObject graphicalParentObject = graphicalParentEditPart.resolveSemanticElement();
-		if(!(graphicalParentObject instanceof Interaction)) {
+		if (!(graphicalParentObject instanceof Interaction)) {
 			return UnexecutableCommand.INSTANCE;
 		}
-		return getDropConstraintCommand((Constraint)semanticLink, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart)getHost()).getNotationView(), (IHintedType)UMLElementTypes.Constraint_8004, (IHintedType)UMLElementTypes.ConstraintConstrainedElement_8011);
+		return getDropConstraintCommand((Constraint) semanticLink, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart) getHost()).getNotationView(), (IHintedType) UMLElementTypes.Constraint_8004,
+				(IHintedType) UMLElementTypes.ConstraintConstrainedElement_8011);
 	}
 
 	/**
 	 * Returns the drop command for TimeObservation nodes.
 	 * 
 	 * @param dropRequest
-	 *        the drop request
+	 *            the drop request
 	 * @param droppedElement
-	 *        the element to drop
+	 *            the element to drop
 	 * @param nodeVISUALID
-	 *        the visual identifier of the EditPart of the dropped element
+	 *            the visual identifier of the EditPart of the dropped element
 	 * @return the drop command
 	 */
 	protected Command dropTimeObservation(DropObjectsRequest dropRequest, TimeObservation droppedElement, int nodeVISUALID) {
 		// Test canvas element
-		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart)getHost();
+		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart) getHost();
 		EObject graphicalParentObject = graphicalParentEditPart.resolveSemanticElement();
-		if(!(graphicalParentObject instanceof org.eclipse.uml2.uml.Interaction)) {
+		if (!(graphicalParentObject instanceof org.eclipse.uml2.uml.Interaction)) {
 			return UnexecutableCommand.INSTANCE;
 		}
 		TimeObservationHelper timeObservationHelper = new TimeObservationHelper(getEditingDomain());
-		return timeObservationHelper.dropTimeObservation(droppedElement, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart)getHost()).getNotationView());
+		return timeObservationHelper.dropTimeObservation(droppedElement, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart) getHost()).getNotationView());
 	}
 
 	/**
 	 * Returns the drop command for ShortCutDiagram nodes.
 	 * 
 	 * @param dropRequest
-	 *        the drop request
+	 *            the drop request
 	 * @param droppedElement
-	 *        the element to drop
+	 *            the element to drop
 	 * @param nodeVISUALID
-	 *        the visual identifier of the EditPart of the dropped element
+	 *            the visual identifier of the EditPart of the dropped element
 	 * @return the drop command
 	 */
 	protected Command dropShortCutDiagram(DropObjectsRequest dropRequest, Diagram droppedElement, int nodeVISUALID) {
 		// Test canvas element
-		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart)getHost();
+		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart) getHost();
 		EObject graphicalParentObject = graphicalParentEditPart.resolveSemanticElement();
-		if(!(graphicalParentObject instanceof org.eclipse.uml2.uml.Interaction)) {
+		if (!(graphicalParentObject instanceof org.eclipse.uml2.uml.Interaction)) {
 			return UnexecutableCommand.INSTANCE;
 		}
 		DiagramShortCutHelper diagramShortCutHelper = new DiagramShortCutHelper(getEditingDomain());
-		return diagramShortCutHelper.dropDiagramShortCut(droppedElement, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart)getHost()).getNotationView());
+		return diagramShortCutHelper.dropDiagramShortCut(droppedElement, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart) getHost()).getNotationView());
 	}
 
 	/**
@@ -256,18 +257,18 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
 	 * </pre>
 	 * 
 	 * @param dropRequest
-	 *        the drop request
+	 *            the drop request
 	 * @param semanticElement
-	 *        the semantic element
+	 *            the semantic element
 	 * @param nodeVISUALID
-	 *        the visual identifier of the EditPart of the dropped element
+	 *            the visual identifier of the EditPart of the dropped element
 	 * 
 	 * @return the drop command
 	 */
 	protected Command dropChildNode(DropObjectsRequest dropRequest, Element semanticElement, int nodeVISUALID) {
-		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart)getHost();
+		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart) getHost();
 		EObject graphicalParentObject = graphicalParentEditPart.resolveSemanticElement();
-		if(graphicalParentObject instanceof org.eclipse.uml2.uml.Interaction) {
+		if (graphicalParentObject instanceof org.eclipse.uml2.uml.Interaction) {
 			return new ICommandProxy(getDefaultDropNodeCommand(nodeVISUALID, dropRequest.getLocation(), semanticElement));
 		}
 		return UnexecutableCommand.INSTANCE;
@@ -277,59 +278,59 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
 	 * Returns the drop command for DurationObservation nodes.
 	 * 
 	 * @param dropRequest
-	 *        the drop request
+	 *            the drop request
 	 * @param droppedElement
-	 *        the element to drop
+	 *            the element to drop
 	 * @param nodeVISUALID
-	 *        the visual identifier of the EditPart of the dropped element
+	 *            the visual identifier of the EditPart of the dropped element
 	 * @return the drop command
 	 */
 	protected Command dropDurationObservation(DropObjectsRequest dropRequest, DurationObservation droppedElement, int nodeVISUALID) {
 		// Test canvas element
-		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart)getHost();
+		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart) getHost();
 		EObject graphicalParentObject = graphicalParentEditPart.resolveSemanticElement();
-		if(!(graphicalParentObject instanceof org.eclipse.uml2.uml.Interaction)) {
+		if (!(graphicalParentObject instanceof org.eclipse.uml2.uml.Interaction)) {
 			return UnexecutableCommand.INSTANCE;
 		}
 		DurationObservationHelper durationObservationHelper = new DurationObservationHelper(getEditingDomain());
-		return durationObservationHelper.dropDurationObservation(droppedElement, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart)getHost()).getNotationView());
+		return durationObservationHelper.dropDurationObservation(droppedElement, getViewer(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart) getHost()).getNotationView());
 	}
 
 	/**
 	 * Returns the drop command for Message links.
 	 * 
 	 * @param dropRequest
-	 *        the drop request
+	 *            the drop request
 	 * 
 	 * @param semanticLink
-	 *        the link to drop
+	 *            the link to drop
 	 * @param linkVISUALID
-	 *        the visual identifier of the EditPart of the dropped element
+	 *            the visual identifier of the EditPart of the dropped element
 	 * @return the drop command
 	 * 
 	 */
 	public Command dropMessage(DropObjectsRequest dropRequest, Element semanticLink, int linkVISUALID) {
-		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart)getHost();
+		GraphicalEditPart graphicalParentEditPart = (GraphicalEditPart) getHost();
 		EObject graphicalParentObject = graphicalParentEditPart.resolveSemanticElement();
-		if(!(graphicalParentObject instanceof org.eclipse.uml2.uml.Interaction)) {
+		if (!(graphicalParentObject instanceof org.eclipse.uml2.uml.Interaction)) {
 			return UnexecutableCommand.INSTANCE;
 		}
-		if(semanticLink instanceof Message) {//if the drop request concerns a UML message
-			//1. verify if source and target of the message are already connected 
+		if (semanticLink instanceof Message) {// if the drop request concerns a UML message
+			// 1. verify if source and target of the message are already connected
 			Collection<?> sources = CommunicationLinkMappingHelper.getInstance().getSource(semanticLink);
 			Collection<?> targets = CommunicationLinkMappingHelper.getInstance().getTarget(semanticLink);
-			if(!sources.isEmpty() && !targets.isEmpty()) {
-				Element source = (Element)sources.toArray()[0];
-				Element target = (Element)targets.toArray()[0];
-				if((source instanceof Lifeline) && (target instanceof Lifeline)) {
-					Set<Message> messages = CommunicationUtil.verifyUMLLifelinesConnected((Lifeline)source, (Lifeline)target);
-					if(!(messages == null) && (messages.size() >= 1)) {//the UML lifelines are already connected by one or more than one more message
-						//1. search for the edit parts of the messages
+			if (!sources.isEmpty() && !targets.isEmpty()) {
+				Element source = (Element) sources.toArray()[0];
+				Element target = (Element) targets.toArray()[0];
+				if ((source instanceof Lifeline) && (target instanceof Lifeline)) {
+					Set<Message> messages = CommunicationUtil.verifyUMLLifelinesConnected((Lifeline) source, (Lifeline) target);
+					if (!(messages == null) && (messages.size() >= 1)) {// the UML lifelines are already connected by one or more than one more message
+						// 1. search for the edit parts of the messages
 						List<EditPart> messagesEP = null;
-						for(Message current : messages) {
+						for (Message current : messages) {
 							EditPart messageEP = lookForEditPart(current);
-							if(!(messageEP == null)) {
-								if(messagesEP == null) {
+							if (!(messageEP == null)) {
+								if (messagesEP == null) {
 									messagesEP = new ArrayList<EditPart>();
 									messagesEP.add(messageEP);
 								} else {
@@ -337,19 +338,20 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
 								}
 							}
 						}
-						//System.err.println("Messages edit parts on the link :" + messagesEP);
-						//System.err.println("Semantic messages  on the link :" + messages);
-						//2. Create the drop commands
-						if(messagesEP == null) {//There is no graphical connection between the two lifelines (in  this diagram)
-							//create a dropMessageAsConnector Command
+						// System.err.println("Messages edit parts on the link :" + messagesEP);
+						// System.err.println("Semantic messages  on the link :" + messages);
+						// 2. Create the drop commands
+						if (messagesEP == null) {// There is no graphical connection between the two lifelines (in this diagram)
+							// create a dropMessageAsConnector Command
 							return new ICommandProxy(dropMessageAsConnector(new CompositeCommand("drop Message"), source, target, linkVISUALID, dropRequest.getLocation(), semanticLink)); //$NON-NLS-1$
-						} else {//add the message as a label of the graphical connector
-							ConnectionEditPart conEP = (ConnectionEditPart)messagesEP.get(0).getParent();
+						} else {// add the message as a label of the graphical connector
+							ConnectionEditPart conEP = (ConnectionEditPart) messagesEP.get(0).getParent();
 							IAdaptable linkAdapter = new SemanticAdapter(semanticLink, null);
-							//location where the label will be dropped
+							// location where the label will be dropped
 							Point loc = new Point(1, -23);
-							//reuse of the CustomMessageViewCreateCommand
-							return new ICommandProxy(new CustomMessageViewCreateCommand(((IGraphicalEditPart)getHost()).getEditingDomain(), conEP.getViewer(), ((IGraphicalEditPart)conEP).getDiagramPreferencesHint(), loc, linkAdapter, conEP));
+							// reuse of the CustomMessageViewCreateCommand
+							return new ICommandProxy(
+									new CustomMessageViewCreateCommand(((IGraphicalEditPart) getHost()).getEditingDomain(), conEP.getViewer(), ((IGraphicalEditPart) conEP).getDiagramPreferencesHint(), loc, linkAdapter, conEP.getNotationView()));
 						}
 					}
 				}
@@ -363,53 +365,55 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
 	 * If the source and the target views do not exist, these views will be created.
 	 * 
 	 * @param cc
-	 *        the composite command that will contain the set of command to create the message
+	 *            the composite command that will contain the set of command to create the message
 	 * @param source
-	 *        the source the element source of the link
+	 *            the source the element source of the link
 	 * @param target
-	 *        the target the element target of the link
+	 *            the target the element target of the link
 	 * @param linkVISUALID
-	 *        the link VISUALID used to create the view
+	 *            the link VISUALID used to create the view
 	 * @param location
-	 *        the location the location where the view will be be created
+	 *            the location the location where the view will be be created
 	 * @param semanticLink
-	 *        the semantic link that will be attached to the view
+	 *            the semantic link that will be attached to the view
 	 * 
 	 * @return the composite command
 	 */
 	public CompositeCommand dropMessageAsConnector(CompositeCommand cc, Element source, Element target, int linkVISUALID, Point location, Element semanticLink) {
 		// look for editpart
-		GraphicalEditPart sourceEditPart = (GraphicalEditPart)lookForEditPart(source);
-		GraphicalEditPart targetEditPart = (GraphicalEditPart)lookForEditPart(target);
+		GraphicalEditPart sourceEditPart = (GraphicalEditPart) lookForEditPart(source);
+		GraphicalEditPart targetEditPart = (GraphicalEditPart) lookForEditPart(target);
 		// descriptor of the link
-		CreateConnectionViewRequest.ConnectionViewDescriptor linkdescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(getUMLElementType(linkVISUALID), ((IHintedType)getUMLElementType(linkVISUALID)).getSemanticHint(), getDiagramPreferencesHint());
+		CreateConnectionViewRequest.ConnectionViewDescriptor linkdescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(getUMLElementType(linkVISUALID), ((IHintedType) getUMLElementType(linkVISUALID)).getSemanticHint(),
+				getDiagramPreferencesHint());
 		IAdaptable sourceAdapter = null;
 		IAdaptable targetAdapter = null;
-		if(sourceEditPart == null) {
+		if (sourceEditPart == null) {
 			// creation of the node
-			ViewDescriptor descriptor = new ViewDescriptor(new EObjectAdapter(source), Node.class, null, ViewUtil.APPEND, true, ((IGraphicalEditPart)getHost()).getDiagramPreferencesHint());
+			ViewDescriptor descriptor = new ViewDescriptor(new EObjectAdapter(source), Node.class, null, ViewUtil.APPEND, true, ((IGraphicalEditPart) getHost()).getDiagramPreferencesHint());
 			// get the command and execute it.
-			CreateCommand nodeCreationCommand = new CreateCommand(((IGraphicalEditPart)getHost()).getEditingDomain(), descriptor, ((View)getHost().getModel()));
+			CreateCommand nodeCreationCommand = new CreateCommand(((IGraphicalEditPart) getHost()).getEditingDomain(), descriptor, ((View) getHost().getModel()));
 			cc.compose(nodeCreationCommand);
-			SetBoundsCommand setBoundsCommand = new SetBoundsCommand(getEditingDomain(), "move", (IAdaptable)nodeCreationCommand.getCommandResult().getReturnValue(), new Point(location.x, location.y + 100)); //$NON-NLS-1$
+			SetBoundsCommand setBoundsCommand = new SetBoundsCommand(getEditingDomain(), "move", (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue(), new Point(location.x, location.y + 100)); //$NON-NLS-1$
 			cc.compose(setBoundsCommand);
-			sourceAdapter = (IAdaptable)nodeCreationCommand.getCommandResult().getReturnValue();
+			sourceAdapter = (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue();
 		} else {
 			sourceAdapter = new SemanticAdapter(null, sourceEditPart.getModel());
 		}
-		if(targetEditPart == null) {
+		if (targetEditPart == null) {
 			// creation of the node
-			ViewDescriptor descriptor = new ViewDescriptor(new EObjectAdapter(target), Node.class, null, ViewUtil.APPEND, true, ((IGraphicalEditPart)getHost()).getDiagramPreferencesHint());
+			ViewDescriptor descriptor = new ViewDescriptor(new EObjectAdapter(target), Node.class, null, ViewUtil.APPEND, true, ((IGraphicalEditPart) getHost()).getDiagramPreferencesHint());
 			// get the command and execute it.
-			CreateCommand nodeCreationCommand = new CreateCommand(((IGraphicalEditPart)getHost()).getEditingDomain(), descriptor, ((View)getHost().getModel()));
+			CreateCommand nodeCreationCommand = new CreateCommand(((IGraphicalEditPart) getHost()).getEditingDomain(), descriptor, ((View) getHost().getModel()));
 			cc.compose(nodeCreationCommand);
-			SetBoundsCommand setBoundsCommand = new SetBoundsCommand(getEditingDomain(), "move", (IAdaptable)nodeCreationCommand.getCommandResult().getReturnValue(), new Point(location.x, location.y - 100)); //$NON-NLS-1$
+			SetBoundsCommand setBoundsCommand = new SetBoundsCommand(getEditingDomain(), "move", (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue(), new Point(location.x, location.y - 100)); //$NON-NLS-1$
 			cc.compose(setBoundsCommand);
-			targetAdapter = (IAdaptable)nodeCreationCommand.getCommandResult().getReturnValue();
+			targetAdapter = (IAdaptable) nodeCreationCommand.getCommandResult().getReturnValue();
 		} else {
 			targetAdapter = new SemanticAdapter(null, targetEditPart.getModel());
 		}
-		CommunicationDeferredCreateConnectionViewCommand aLinkCommand = new CommunicationDeferredCreateConnectionViewCommand(((IGraphicalEditPart)getHost()).getEditingDomain(), ((IHintedType)getUMLElementType(linkVISUALID)).getSemanticHint(), sourceAdapter, targetAdapter, getViewer(), getDiagramPreferencesHint(), linkdescriptor, null, semanticLink);
+		CommunicationDeferredCreateConnectionViewCommand aLinkCommand = new CommunicationDeferredCreateConnectionViewCommand(((IGraphicalEditPart) getHost()).getEditingDomain(), ((IHintedType) getUMLElementType(linkVISUALID)).getSemanticHint(), sourceAdapter,
+				targetAdapter, getViewer(), getDiagramPreferencesHint(), linkdescriptor, null, semanticLink);
 		cc.compose(aLinkCommand);
 		return cc;
 	}
@@ -448,55 +452,55 @@ public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPo
 		// the command for that.
 		CompositeCommand cc = new CompositeCommand("Drop"); //$NON-NLS-1$
 		Iterator<?> iter = dropRequest.getObjects().iterator();
-		if(dropRequest.getObjects().size() > 0 && dropRequest.getObjects().get(0) instanceof String) {
+		if (dropRequest.getObjects().size() > 0 && dropRequest.getObjects().get(0) instanceof String) {
 			return getDropFileCommand(dropRequest);
 		}
 		Point location = dropRequest.getLocation().getCopy();
-		((GraphicalEditPart)getHost()).getContentPane().translateToRelative(location);
-		((GraphicalEditPart)getHost()).getContentPane().translateFromParent(location);
-		location.translate(((GraphicalEditPart)getHost()).getContentPane().getClientArea().getLocation().getNegated());
-		while(iter.hasNext()) {
-			EObject droppedObject = (EObject)iter.next();
-			int nodeVISUALID = getNodeVisualID(((IGraphicalEditPart)getHost()).getNotationView(), droppedObject);
+		((GraphicalEditPart) getHost()).getContentPane().translateToRelative(location);
+		((GraphicalEditPart) getHost()).getContentPane().translateFromParent(location);
+		location.translate(((GraphicalEditPart) getHost()).getContentPane().getClientArea().getLocation().getNegated());
+		while (iter.hasNext()) {
+			EObject droppedObject = (EObject) iter.next();
+			int nodeVISUALID = getNodeVisualID(((IGraphicalEditPart) getHost()).getNotationView(), droppedObject);
 			int linkVISUALID = getLinkWithClassVisualID(droppedObject);
-			if(getDroppableElementVisualId().contains(nodeVISUALID) || getDroppableElementVisualId().contains(linkVISUALID)) {
+			if (getDroppableElementVisualId().contains(nodeVISUALID) || getDroppableElementVisualId().contains(linkVISUALID)) {
 				dropRequest.setLocation(location);
 				// TODO: add to composite command ?
-				if(nodeVISUALID == -1 && linkVISUALID == -1 && (droppedObject instanceof Diagram)) {//if the dropped element is the diagram short cut
-					cc.add(new CommandProxy(dropShortCutDiagram(dropRequest, (Diagram)droppedObject, nodeVISUALID)));
+				if (nodeVISUALID == -1 && linkVISUALID == -1 && (droppedObject instanceof Diagram)) {// if the dropped element is the diagram short cut
+					cc.add(new CommandProxy(dropShortCutDiagram(dropRequest, (Diagram) droppedObject, nodeVISUALID)));
 				} else {
-					cc.add(new CommandProxy(getSpecificDropCommand(dropRequest, (Element)droppedObject, nodeVISUALID, linkVISUALID)));
+					cc.add(new CommandProxy(getSpecificDropCommand(dropRequest, (Element) droppedObject, nodeVISUALID, linkVISUALID)));
 				}
 				continue;
 			}
-			if(linkVISUALID == -1 && nodeVISUALID != -1) {
+			if (linkVISUALID == -1 && nodeVISUALID != -1) {
 				// The element to drop is a node
 				// Retrieve it's expected graphical parent
-				EObject graphicalParent = ((GraphicalEditPart)getHost()).resolveSemanticElement();
+				EObject graphicalParent = ((GraphicalEditPart) getHost()).resolveSemanticElement();
 				// Restrict the default node creation to the following cases:
 				// . Take the containment relationship into consideration
 				// . Release the constraint when GraphicalParent is a Package (Canvas for most
 				// diagrams)
-				if(graphicalParent instanceof Package) {
+				if (graphicalParent instanceof Package) {
 					cc.add(getDefaultDropNodeCommand(nodeVISUALID, location, droppedObject));
 				} else {
-					if((graphicalParent instanceof Element) && ((Element)graphicalParent).getOwnedElements().contains(droppedObject)) {
+					if ((graphicalParent instanceof Element) && ((Element) graphicalParent).getOwnedElements().contains(droppedObject)) {
 						cc.add(getDefaultDropNodeCommand(nodeVISUALID, location, droppedObject));
 					} else {
 						return UnexecutableCommand.INSTANCE;
 					}
 				}
 			} else {
-				if(linkVISUALID != -1) {
-					Collection<?> sources = linkmappingHelper.getSource((Element)droppedObject);
-					Collection<?> targets = linkmappingHelper.getTarget((Element)droppedObject);
-					if(sources.size() == 0 || targets.size() == 0) {
+				if (linkVISUALID != -1) {
+					Collection<?> sources = linkmappingHelper.getSource((Element) droppedObject);
+					Collection<?> targets = linkmappingHelper.getTarget((Element) droppedObject);
+					if (sources.size() == 0 || targets.size() == 0) {
 						return UnexecutableCommand.INSTANCE;
 					}
 					// binary association
-					Element source = (Element)sources.toArray()[0];
-					Element target = (Element)targets.toArray()[0];
-					dropBinaryLink(cc, source, target, linkVISUALID, dropRequest.getLocation(), (Element)droppedObject);
+					Element source = (Element) sources.toArray()[0];
+					Element target = (Element) targets.toArray()[0];
+					dropBinaryLink(cc, source, target, linkVISUALID, dropRequest.getLocation(), (Element) droppedObject);
 				}
 			}
 		}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/MessageHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/MessageHelper.java
index bb9bba78c8c..4daa3cd3c52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/MessageHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/MessageHelper.java
@@ -1,6 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
+ * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,7 +7,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *  Saadia Dhouib saadia.dhouib@cea.fr
+ *  Saadia Dhouib saadia.dhouib@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 462958
  *
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.communication.custom.helper;
@@ -110,7 +110,7 @@ public class MessageHelper extends ElementHelper {
 		// 3. Aggregates the create node command
 		// parentView = (View)((View)sourceEditPart.getModel()).eContainer();
 		CustomMessageViewCreateCommand nodeCreation = new CustomMessageViewCreateCommand(getEditingDomain(), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), nodeLocation,
-				(IAdaptable) ((ICommand) customMessageCreateComand).getCommandResult().getReturnValue(), link);
+				(IAdaptable) ((ICommand) customMessageCreateComand).getCommandResult().getReturnValue(), (View) link.getModel());
 		((CompoundCommand) command).add(new ICommandProxy(nodeCreation));
 		// return the command that contains the semantic creation and the view creation
 		return command;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/build.properties
index 9ab0cf4ba61..4ad531716e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/build.properties
@@ -1,7 +1,14 @@
 #

 #Mon Sep 12 09:29:45 CEST 2011

 output..=bin/

-bin.includes=.,icons/,META-INF/,plugin.xml,plugin.properties,messages.properties,about.html

+bin.includes = .,\

+               icons/,\

+               META-INF/,\

+               plugin.xml,\

+               plugin.properties,\

+               messages.properties,\

+               about.html,\

+               model/

 jars.compile.order=.

 src.includes = about.html

 source..=src/,custom-src/

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram-notation.elementtypesconfigurations
new file mode 100644
index 00000000000..0edcb694e36
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram-notation.elementtypesconfigurations
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ASCII"?>

+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_XB3QgM2QEeSF96aioTD1kQ" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XB33kc2QEeSF96aioTD1kQ" name="InterfacePortLink" identifier="org.eclipse.papyrus.uml.diagram.component.Link_4018" hint="4018" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XB33kM2QEeSF96aioTD1kQ" name="Undefined" identifier="org.eclipse.papyrus.uml.diagram.component.Link_4016" hint="4016" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations
new file mode 100644
index 00000000000..8b0394e22a2
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="ASCII"?>

+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_WyQuQM2QEeSF96aioTD1kQ" name="PapyrusUMLComponentDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBmx0M2QEeSF96aioTD1kQ" name="Abstraction" identifier="org.eclipse.papyrus.uml.diagram.component.Abstraction_4013" hint="4013">

+    <iconEntry xmi:id="_XBmx0c2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_wXsM2QEeSF96aioTD1kQ" name="Comment" identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3074" hint="3074">

+    <iconEntry xmi:id="_W_w-wM2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAwdQM2QEeSF96aioTD1kQ" name="Comment" identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3201" hint="3201">

+    <iconEntry xmi:id="_XAxEUM2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBnY4M2QEeSF96aioTD1kQ" name="Comment Annotated Element" identifier="org.eclipse.papyrus.uml.diagram.component.CommentAnnotatedElement_4008" hint="4015">

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_qREM2QEeSF96aioTD1kQ" name="Component" identifier="org.eclipse.papyrus.uml.diagram.component.Component_3070" hint="3070">

+    <iconEntry xmi:id="_W_q4IM2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_t7cM2QEeSF96aioTD1kQ" name="Component" identifier="org.eclipse.papyrus.uml.diagram.component.Component_3071" hint="3071">

+    <iconEntry xmi:id="_W_t7cc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAafAM2QEeSF96aioTD1kQ" name="Component" identifier="org.eclipse.papyrus.uml.diagram.component.Component_2002" hint="2002">

+    <iconEntry xmi:id="_XAafAc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBhSQM2QEeSF96aioTD1kQ" name="Component Realization" identifier="org.eclipse.papyrus.uml.diagram.component.ComponentRealization_4007" hint="4007">

+    <iconEntry xmi:id="_XBhSQc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/ComponentRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ComponentRealization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XB2pcM2QEeSF96aioTD1kQ" name="Connector" identifier="org.eclipse.papyrus.uml.diagram.component.Connector_4019" hint="4019">

+    <iconEntry xmi:id="_XB2pcc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_0CEM2QEeSF96aioTD1kQ" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.component.Constraint_3075" hint="3075">

+    <iconEntry xmi:id="_W_0CEc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XA180M2QEeSF96aioTD1kQ" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3199" hint="3199">

+    <iconEntry xmi:id="_XA180c2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBnY4c2QEeSF96aioTD1kQ" name="Constraint Constrained Element" identifier="org.eclipse.papyrus.uml.diagram.component.ConstraintConstrainedElement_4009" hint="4009">

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XA61UM2QEeSF96aioTD1kQ" name="Default Named Element" identifier="org.eclipse.papyrus.uml.diagram.component.DefaultNamedElement_3204" hint="3204">

+    <iconEntry xmi:id="_XA61Uc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/NamedElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBxw8M2QEeSF96aioTD1kQ" name="Dependency" identifier="org.eclipse.papyrus.uml.diagram.component.Dependency_4017" hint="4017">

+    <iconEntry xmi:id="_XBxw8c2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBsRYM2QEeSF96aioTD1kQ" name="Dependency Link" identifier="org.eclipse.papyrus.uml.diagram.component.Dependency_4010" hint="4010">

+    <iconEntry xmi:id="_XBsRYc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XATxUM2QEeSF96aioTD1kQ" name="Dependency Node" identifier="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203" hint="3203">

+    <iconEntry xmi:id="_XATxUc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBQzkM2QEeSF96aioTD1kQ" name="Generalization" identifier="org.eclipse.papyrus.uml.diagram.component.Generalization_4003" hint="4003">

+    <iconEntry xmi:id="_XBQzkc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Generalization.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_i8UM2QEeSF96aioTD1kQ" name="Interface" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3078" hint="3078">

+    <iconEntry xmi:id="_W_i8Uc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAHkEM2QEeSF96aioTD1kQ" name="Interface" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3072" hint="3072">

+    <iconEntry xmi:id="_XAHkEc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAq9sM2QEeSF96aioTD1kQ" name="Interface" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3205" hint="3205">

+    <iconEntry xmi:id="_XAq9sc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBAU4M2QEeSF96aioTD1kQ" name="Interface" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_2003" hint="2003">

+    <iconEntry xmi:id="_XBAU4c2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBLUAM2QEeSF96aioTD1kQ" name="Interface Realization" identifier="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006" hint="4006">

+    <iconEntry xmi:id="_XBLUAc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/InterfaceRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InterfaceRealization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBbysM2QEeSF96aioTD1kQ" name="Manifestation" identifier="org.eclipse.papyrus.uml.diagram.component.Manifestation_4014" hint="4014">

+    <iconEntry xmi:id="_XBbysc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Manifestation.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Manifestation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_bnkM2QEeSF96aioTD1kQ" name="Model" identifier="org.eclipse.papyrus.uml.diagram.component.Model_3077" hint="3077">

+    <iconEntry xmi:id="_W_bnkc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Model.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAfXgM2QEeSF96aioTD1kQ" name="Model" identifier="org.eclipse.papyrus.uml.diagram.component.Model_3202" hint="3202">

+    <iconEntry xmi:id="_XAfXgc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Model.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_8k8M2QEeSF96aioTD1kQ" name="Operation" identifier="org.eclipse.papyrus.uml.diagram.component.Operation_5" hint="5">

+    <iconEntry xmi:id="_W_8k8c2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W-nvQM2QEeSF96aioTD1kQ" name="Package" identifier="org.eclipse.papyrus.uml.diagram.component.Model_1000" hint="PapyrusUMLComponentDiagram">

+    <iconEntry xmi:id="_W-nvQc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_eq4M2QEeSF96aioTD1kQ" name="Package" identifier="org.eclipse.papyrus.uml.diagram.component.Package_3076" hint="3076">

+    <iconEntry xmi:id="_W_eq4c2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAmFMM2QEeSF96aioTD1kQ" name="Package" identifier="org.eclipse.papyrus.uml.diagram.component.Package_3200" hint="3200">

+    <iconEntry xmi:id="_XAmFMc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_X9MM2QEeSF96aioTD1kQ" name="Port" identifier="org.eclipse.papyrus.uml.diagram.component.Port_3069" hint="3069">

+    <iconEntry xmi:id="_W_X9Mc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_3FYM2QEeSF96aioTD1kQ" name="Property" identifier="org.eclipse.papyrus.uml.diagram.component.Property_1" hint="1">

+    <iconEntry xmi:id="_W_3FYc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAORwM2QEeSF96aioTD1kQ" name="Property" identifier="org.eclipse.papyrus.uml.diagram.component.Property_3079" hint="3079">

+    <iconEntry xmi:id="_XAORwc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XACrkM2QEeSF96aioTD1kQ" name="Reception" identifier="org.eclipse.papyrus.uml.diagram.component.Reception_6" hint="6">

+    <iconEntry xmi:id="_XACrkc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Reception.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Reception</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBWTIM2QEeSF96aioTD1kQ" name="Substitution" identifier="org.eclipse.papyrus.uml.diagram.component.Substitution_4012" hint="4012">

+    <iconEntry xmi:id="_XBWTIc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Substitution.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Substitution</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBF0cM2QEeSF96aioTD1kQ" name="Usage" identifier="org.eclipse.papyrus.uml.diagram.component.Usage_4001" hint="4001">

+    <iconEntry xmi:id="_XBF0cc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Usage.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Usage</specializedTypesID>

+  </elementTypeConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
index 7c8ceae1549..471c295b2e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
@@ -27,7 +27,7 @@
         liveValidationUIFeedback="true">

       <diagramRunTimeClass

           href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram"/>

-      <elementType

+      <elementType definedExternally="true"

           xsi:type="gmfgen:MetamodelType"

           uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Model_1000"

           displayName="ComponentDiagram"

@@ -56,7 +56,7 @@
           containers="/0/@diagram/@topLevelNodes.1 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.12">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Port_3069"

             editHelperClassName="PortEditHelper"/>

@@ -70,10 +70,6 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomPortItemSemanticEditPolicy"/>

-        <behaviour

-            xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

@@ -186,7 +182,7 @@
           containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1 /0/@diagram/@compartments.4">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Model_3077"

             displayName="Model"

@@ -266,7 +262,7 @@
           containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Package_3076"

             displayName="Package"

@@ -342,7 +338,7 @@
           containers="/0/@diagram/@compartments.1 /0/@diagram/@compartments.2 /0/@diagram/@compartments.3 /0/@diagram/@compartments.4">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

@@ -432,7 +428,7 @@
           containers="/0/@diagram/@compartments.5 /0/@diagram/@compartments.6 /0/@diagram/@compartments.0">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:SpecializationType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Component_3070"

             displayName="Component"

@@ -552,7 +548,7 @@
           containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:SpecializationType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Component_3071"

             displayName="Component"

@@ -669,7 +665,7 @@
           containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:SpecializationType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Comment_3074"

             metamodelType="/0/@diagram/@topLevelNodes.5/@elementType"/>

@@ -737,7 +733,7 @@
           containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:SpecializationType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Constraint_3075"

             metamodelType="/0/@diagram/@topLevelNodes.6/@elementType"/>

@@ -829,7 +825,7 @@
           containers="/0/@diagram/@compartments.7 /0/@diagram/@compartments.9">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

@@ -877,7 +873,7 @@
           containers="/0/@diagram/@compartments.8 /0/@diagram/@compartments.10">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

@@ -925,7 +921,7 @@
           containers="/0/@diagram/@compartments.8 /0/@diagram/@compartments.10">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

@@ -967,7 +963,7 @@
           containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.3 /0/@diagram/@compartments.1">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:SpecializationType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Interface_3072"

             displayName="Interface"

@@ -1052,7 +1048,7 @@
           containers="/0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.6">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

@@ -1064,10 +1060,6 @@
         </viewmap>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.itemsemantic.PropertyPartItemSemanticEditPolicyCN"/>

-        <behaviour

-            xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

         <behaviour

@@ -1144,7 +1136,7 @@
           createCommandClassName="DependencyNodeCreateCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"

             displayName="DependencyNode"

@@ -1226,7 +1218,7 @@
           createCommandClassName="ComponentCreateCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Component_2002"

             editHelperClassName="ComponentEditHelper"/>

@@ -1341,7 +1333,7 @@
           createCommandClassName="ModelCreateCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Model_3202"

             displayName="Model"

@@ -1420,7 +1412,7 @@
           createCommandClassName="PackageCreateCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Package_3200"

             displayName="Package"

@@ -1499,7 +1491,7 @@
           createCommandClassName="RectangleInterfaceCreateCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

@@ -1586,7 +1578,7 @@
           createCommandClassName="CommentCreateCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Comment_3201"

             displayName="Comment"

@@ -1654,7 +1646,7 @@
           createCommandClassName="ConstraintCreateCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Comment_3199"

             displayName="Constraint"

@@ -1745,7 +1737,7 @@
           createCommandClassName="DefaultNamedElementCreateCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.DefaultNamedElement_3204"

             displayName="DefaultNamedElement"

@@ -1774,10 +1766,6 @@
             xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY"

             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.ComponentDiagramChangeStereotypedShapeEditpolicy"/>

-        <behaviour

-            xsi:type="gmfgen:CustomBehaviour"

-            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

-            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.itemsemantic.CustomDefaultNamedElementItemSemanticEditPolicy"/>

         <modelFacet>

           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement"/>

@@ -1813,7 +1801,7 @@
           createCommandClassName="InterfaceCreateCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Interface_2003"

             editHelperClassName="InterfaceEditHelper"/>

@@ -1895,7 +1883,7 @@
           reorientCommandClassName="UsageReorientCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Usage_4001"

             editHelperClassName="UsageEditHelper"/>

@@ -1940,7 +1928,7 @@
           reorientCommandClassName="InterfaceRealizationReorientCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006"

             editHelperClassName="InterfaceRealizationEditHelper"/>

@@ -1985,7 +1973,7 @@
           reorientCommandClassName="GeneralizationReorientCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Generalization_4003"

             editHelperClassName="GeneralizationEditHelper"/>

@@ -2051,7 +2039,7 @@
           reorientCommandClassName="SubstitutionReorientCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Substitution_4012"

             displayName="Substitution"

@@ -2147,7 +2135,7 @@
           reorientCommandClassName="ManifestationReorientCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Manifestation_4014"

             displayName="Manifestation"

@@ -2243,7 +2231,7 @@
           reorientCommandClassName="ComponentRealizationReorientCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             editHelperClassName="ComponentRealizationEditHelper"/>

         <viewmap

@@ -2338,7 +2326,7 @@
           reorientCommandClassName="AbstractionReorientCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Abstraction_4013"

             displayName="Abstraction"

@@ -2434,7 +2422,7 @@
           reorientCommandClassName="LinkDescriptorReorientCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:NotationType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

@@ -2452,7 +2440,7 @@
           reorientCommandClassName="CommentAnnotatedElementReorientCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:SpecializationType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.CommentAnnotatedElement_4008"

             displayName="CommentAnnotatedElement"/>

@@ -2477,7 +2465,7 @@
           reorientCommandClassName="ConstraintConstrainedElementReorientCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:SpecializationType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.ConstraintConstrainedElement_4009"

             displayName="ConstraintConstrainedElement"/>

@@ -2502,7 +2490,7 @@
           reorientCommandClassName="DependencyReorientCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:SpecializationType"

             displayName="DependencyLink"

             metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"/>

@@ -2598,7 +2586,7 @@
           reorientCommandClassName="DependencyBranchReorientCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:SpecializationType"

             uniqueIdentifier="org.eclipse.papyrus.uml.diagram.component.Dependency_4017"

             metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"

@@ -2642,7 +2630,7 @@
           reorientCommandClassName="InterfacePortLinkReorientCommand">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:NotationType"

             displayName="InterfacePortLink"/>

         <viewmap

@@ -2654,7 +2642,7 @@
           editPartClassName="ConnectorEditPart">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType

+        <elementType definedExternally="true"

             xsi:type="gmfgen:MetamodelType"/>

         <viewmap

             xsi:type="gmfgen:FigureViewmap"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
index dce270504f4..5790d6e0737 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
@@ -278,362 +278,6 @@
    
    <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
       <?gmfgen generated="true"?>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Model_1000"
-               name="%metatype.name.Package_1000"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Package"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ModelEditHelper">
-            <param name="semanticHint" value="1000"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"
-               name="%metatype.name.Dependency_3203"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Dependency"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.DependencyEditHelper">
-            <param name="semanticHint" value="3203"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Component_2002"
-               name="%metatype.name.Component_2002"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Component"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ComponentEditHelper">
-            <param name="semanticHint" value="2002"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Model_3202"
-               name="%metatype.name.Model_3202"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Model"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ModelEditHelper">
-            <param name="semanticHint" value="3202"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Package_3200"
-               name="%metatype.name.Package_3200"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Package"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PackageEditHelper">
-            <param name="semanticHint" value="3200"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Interface_3205"
-               name="%metatype.name.Interface_3205"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Interface"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.InterfaceEditHelper">
-            <param name="semanticHint" value="3205"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Comment_3201"
-               name="%metatype.name.Comment_3201"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Comment"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.CommentEditHelper">
-            <param name="semanticHint" value="3201"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Comment_3199"
-               name="%metatype.name.Constraint_3199"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Constraint"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ConstraintEditHelper">
-            <param name="semanticHint" value="3199"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.DefaultNamedElement_3204"
-               name="%metatype.name.NamedElement_3204"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="NamedElement"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.DefaultNamedElementEditHelper">
-            <param name="semanticHint" value="3204"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Interface_2003"
-               name="%metatype.name.Interface_2003"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Interface"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.InterfaceEditHelper">
-            <param name="semanticHint" value="2003"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Port_3069"
-               name="%metatype.name.Port_3069"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Port"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PortEditHelper">
-            <param name="semanticHint" value="3069"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Model_3077"
-               name="%metatype.name.Model_3077"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Model"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ModelEditHelper">
-            <param name="semanticHint" value="3077"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Package_3076"
-               name="%metatype.name.Package_3076"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Package"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PackageEditHelper">
-            <param name="semanticHint" value="3076"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Interface_3078"
-               name="%metatype.name.Interface_3078"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Interface"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.InterfaceEditHelper">
-            <param name="semanticHint" value="3078"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.component.Component_3070"
-               name="%metatype.name.Component_3070"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.component.Component_2002"/>
-            <param name="semanticHint" value="3070"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.component.Component_3071"
-               name="%metatype.name.Component_3071"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.component.Component_2002"/>
-            <param name="semanticHint" value="3071"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.component.Comment_3074"
-               name="%metatype.name.Comment_3074"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.component.Comment_3201"/>
-            <param name="semanticHint" value="3074"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.component.Constraint_3075"
-               name="%metatype.name.Constraint_3075"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.component.Comment_3199"/>
-            <param name="semanticHint" value="3075"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Property_1"
-               name="%metatype.name.Property_1"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Property"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PropertyEditHelper">
-            <param name="semanticHint" value="1"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Operation_5"
-               name="%metatype.name.Operation_5"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Operation"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.OperationEditHelper">
-            <param name="semanticHint" value="5"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Reception_6"
-               name="%metatype.name.Reception_6"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Reception"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ReceptionEditHelper">
-            <param name="semanticHint" value="6"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.component.Interface_3072"
-               name="%metatype.name.Interface_3072"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.component.Interface_2003"/>
-            <param name="semanticHint" value="3072"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Property_3079"
-               name="%metatype.name.Property_3079"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Property"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PropertyEditHelper">
-            <param name="semanticHint" value="3079"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Usage_4001"
-               name="%metatype.name.Usage_4001"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Usage"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.UsageEditHelper">
-            <param name="semanticHint" value="4001"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006"
-               name="%metatype.name.InterfaceRealization_4006"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="InterfaceRealization"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.InterfaceRealizationEditHelper">
-            <param name="semanticHint" value="4006"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Generalization_4003"
-               name="%metatype.name.Generalization_4003"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Generalization"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.GeneralizationEditHelper">
-            <param name="semanticHint" value="4003"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Substitution_4012"
-               name="%metatype.name.Substitution_4012"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Substitution"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.SubstitutionEditHelper">
-            <param name="semanticHint" value="4012"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Manifestation_4014"
-               name="%metatype.name.Manifestation_4014"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Manifestation"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ManifestationEditHelper">
-            <param name="semanticHint" value="4014"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.ComponentRealization_4007"
-               name="%metatype.name.ComponentRealization_4007"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ComponentRealization"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ComponentRealizationEditHelper">
-            <param name="semanticHint" value="4007"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Abstraction_4013"
-               name="%metatype.name.Abstraction_4013"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Abstraction"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.AbstractionEditHelper">
-            <param name="semanticHint" value="4013"/>
-         </metamodelType>
-      </metamodel>
-      <specializationType
-            id="org.eclipse.papyrus.uml.diagram.component.Link_4016"
-            name="%metatype.name.Link_4016"
-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-         <param name="semanticHint" value="4016"/>
-      </specializationType>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.component.CommentAnnotatedElement_4008"
-               name="%metatype.name.CommentAnnotatedElement_4015"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="4015"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.component.ConstraintConstrainedElement_4009"
-               name="%metatype.name.ConstraintConstrainedElement_4009"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="4009"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.component.Dependency_4010"
-               name="%metatype.name.Dependency_4010"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"/>
-            <param name="semanticHint" value="4010"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.component.Dependency_4017"
-               name="%metatype.name.Dependency_4017"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               edithelperadvice="org.eclipse.papyrus.uml.diagram.component.edit.helpers.DependencyBranchLink">
-            <specializes id="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"/>
-            <param name="semanticHint" value="4017"/>
-         </specializationType>
-      </metamodel>
-      <specializationType
-            id="org.eclipse.papyrus.uml.diagram.component.Link_4018"
-            name="%metatype.name.Link_4018"
-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-         <param name="semanticHint" value="4018"/>
-      </specializationType>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.component.Connector_4019"
-               name="%metatype.name.Connector_4019"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Connector"
-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ConnectorEditHelper">
-            <param name="semanticHint" value="4019"/>
-         </metamodelType>
-      </metamodel>
    </extension>
 
    <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
@@ -646,43 +290,6 @@
          </enablement>
       </clientContext> 
       <binding context="org.eclipse.papyrus.uml.diagram.component.TypeContext">
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Model_1000"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Component_2002"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Model_3202"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Package_3200"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_3205"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Comment_3201"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Comment_3199"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.DefaultNamedElement_3204"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_2003"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Port_3069"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Model_3077"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Package_3076"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_3078"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Component_3070"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Component_3071"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Comment_3074"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Constraint_3075"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Property_1"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Operation_5"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Reception_6"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_3072"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Property_3079"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Usage_4001"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Generalization_4003"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Substitution_4012"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Manifestation_4014"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.ComponentRealization_4007"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Abstraction_4013"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Link_4016"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.CommentAnnotatedElement_4008"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.ConstraintConstrainedElement_4009"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Dependency_4010"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Dependency_4017"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Link_4018"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Connector_4019"/>
          <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
       </binding>
    </extension>
@@ -1378,4 +985,12 @@
 	</diagramMappings>
 </extension>
 
+<extension
+      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+   <elementTypeSet
+         id="org.eclipse.papyrus.uml.diagram.component.elementTypeSet"
+         path="model/ComponentDiagram.elementtypesconfigurations">
+   </elementTypeSet>
+</extension>
+
 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/AbstractionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/AbstractionReorientCommand.java
deleted file mode 100644
index fe5ca967cfd..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/AbstractionReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Abstraction;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class AbstractionReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public AbstractionReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Abstraction) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAbstraction_4013(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAbstraction_4013(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Abstraction getLink() {

-		return (Abstraction) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentCreateCommand.java
deleted file mode 100644
index 8c30290d952..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CommentCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public CommentCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Comment newElement = UMLFactory.eINSTANCE.createComment();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Element qualifiedTarget = (Element) target;

-				qualifiedTarget.getOwnedComments()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Comment_3201(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Comment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentCreateCommandPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentCreateCommandPCN.java
deleted file mode 100644
index 3c72136c021..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/CommentCreateCommandPCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CommentCreateCommandPCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public CommentCreateCommandPCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Comment newElement = UMLFactory.eINSTANCE.createComment();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Element qualifiedTarget = (Element) target;

-				qualifiedTarget.getOwnedComments()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Comment_3074(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Comment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommand.java
deleted file mode 100644
index 7540d2498a4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommand.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Component;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ComponentCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComponent());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Component newElement = UMLFactory.eINSTANCE.createComponent();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Component_2002(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Component newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java
deleted file mode 100644
index 9a427977230..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Component;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ComponentCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComponent());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Component newElement = UMLFactory.eINSTANCE.createComponent();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Component qualifiedTarget = (Component) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Component_3070(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Component newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandPCN.java
deleted file mode 100644
index 53a2945ea9c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandPCN.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Component;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentCreateCommandPCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ComponentCreateCommandPCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComponent());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Component newElement = UMLFactory.eINSTANCE.createComponent();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Component_3071(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Component newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentRealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentRealizationReorientCommand.java
deleted file mode 100644
index 9fed05cf1c7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentRealizationReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.ComponentRealization;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class ComponentRealizationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public ComponentRealizationReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof ComponentRealization) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistComponentRealization_4007(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistComponentRealization_4007(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ComponentRealization getLink() {

-		return (ComponentRealization) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorReorientCommand.java
deleted file mode 100644
index 2e7f2c5748a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Connector;

-import org.eclipse.uml2.uml.ConnectorEnd;

-import org.eclipse.uml2.uml.StructuredClassifier;

-

-/**

- * @generated

- */

-public class ConnectorReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public ConnectorReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Connector) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {

-			return false;

-		}

-		if (getLink().getEnds()

-				.size() != 1) {

-			return false;

-		}

-		ConnectorEnd target = getLink().getEnds()

-				.get(0);

-		if (!(getLink().eContainer() instanceof StructuredClassifier)) {

-			return false;

-		}

-		StructuredClassifier container = (StructuredClassifier) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConnector_4019(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {

-			return false;

-		}

-		if (getLink().getEnds()

-				.size() != 1) {

-			return false;

-		}

-		ConnectorEnd source = getLink().getEnds()

-				.get(0);

-		if (!(getLink().eContainer() instanceof StructuredClassifier)) {

-			return false;

-		}

-		StructuredClassifier container = (StructuredClassifier) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConnector_4019(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getEnds()

-				.remove(getOldSource());

-		getLink().getEnds()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getEnds()

-				.remove(getOldTarget());

-		getLink().getEnds()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Connector getLink() {

-		return (Connector) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ConnectorEnd getOldSource() {

-		return (ConnectorEnd) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ConnectorEnd getNewSource() {

-		return (ConnectorEnd) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ConnectorEnd getOldTarget() {

-		return (ConnectorEnd) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ConnectorEnd getNewTarget() {

-		return (ConnectorEnd) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintCreateCommand.java
deleted file mode 100644
index a33dcd6a7de..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintCreateCommand.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ConstraintCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Constraint_3199(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Constraint newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintCreateCommandPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintCreateCommandPCN.java
deleted file mode 100644
index 9c2ed818a5d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConstraintCreateCommandPCN.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ConstraintCreateCommandPCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ConstraintCreateCommandPCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Constraint_3075(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Constraint newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DefaultNamedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DefaultNamedElementCreateCommand.java
deleted file mode 100644
index e40aad4d05a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DefaultNamedElementCreateCommand.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DefaultNamedElementCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DefaultNamedElementCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getNamedElement());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		throw new UnsupportedOperationException("Unimplemented operation (abstract domain element).");

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(NamedElement newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyNodeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyNodeCreateCommand.java
deleted file mode 100644
index 63bd52b33d5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyNodeCreateCommand.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DependencyNodeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DependencyNodeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDependency());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Dependency newElement = UMLFactory.eINSTANCE.createDependency();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Dependency newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyReorientCommand.java
deleted file mode 100644
index 9def2e1c8cf..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class DependencyReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public DependencyReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Dependency) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4010(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4010(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Dependency getLink() {

-		return (Dependency) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/GeneralizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/GeneralizationCreateCommand.java
deleted file mode 100644
index 8398ae31adf..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/GeneralizationCreateCommand.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Generalization;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class GeneralizationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Classifier container;

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof Classifier) {

-			return false;

-		}

-		if (target != null && false == target instanceof Classifier) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateGeneralization_4003(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		Generalization newElement = UMLFactory.eINSTANCE.createGeneralization();

-		getContainer().getGeneralizations()

-				.add(newElement);

-		newElement.setSpecific(

-				getSource()

-				);

-		newElement.setGeneral(

-				getTarget()

-				);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Generalization newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getSource() {

-		return (Classifier) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getTarget() {

-		return (Classifier) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Classifier getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Classifier deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof Classifier) {

-				return (Classifier) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/GeneralizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/GeneralizationReorientCommand.java
deleted file mode 100644
index efd06b815d0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/GeneralizationReorientCommand.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Generalization;

-

-/**

- * @generated

- */

-public class GeneralizationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Generalization) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof Classifier && newEnd instanceof Classifier)) {

-			return false;

-		}

-		Classifier target = getLink().getGeneral();

-		if (!(getLink().eContainer() instanceof Classifier)) {

-			return false;

-		}

-		Classifier container = (Classifier) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistGeneralization_4003(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Classifier && newEnd instanceof Classifier)) {

-			return false;

-		}

-		Classifier source = getLink().getSpecific();

-		if (!(getLink().eContainer() instanceof Classifier)) {

-			return false;

-		}

-		Classifier container = (Classifier) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistGeneralization_4003(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().setSpecific(

-				getNewSource()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().setGeneral(

-				getNewTarget()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Generalization getLink() {

-		return (Generalization) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getOldSource() {

-		return (Classifier) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getNewSource() {

-		return (Classifier) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getOldTarget() {

-		return (Classifier) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getNewTarget() {

-		return (Classifier) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/InterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/InterfaceCreateCommand.java
deleted file mode 100644
index e648066c15b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/InterfaceCreateCommand.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterface());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Interface newElement = UMLFactory.eINSTANCE.createInterface();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Interface_3078(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Interface newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/InterfaceCreateCommandPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/InterfaceCreateCommandPCN.java
deleted file mode 100644
index 4ca0835d18a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/InterfaceCreateCommandPCN.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceCreateCommandPCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceCreateCommandPCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterface());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Interface newElement = UMLFactory.eINSTANCE.createInterface();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Interface_3072(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Interface newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/InterfaceRealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/InterfaceRealizationReorientCommand.java
deleted file mode 100644
index 80896f8acf8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/InterfaceRealizationReorientCommand.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.InterfaceRealization;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class InterfaceRealizationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceRealizationReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof InterfaceRealization) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		Interface target = getLink().getContract();

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInterfaceRealization_4006(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Interface && newEnd instanceof Interface)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInterfaceRealization_4006(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().setContract(

-				getNewTarget()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected InterfaceRealization getLink() {

-		return (InterfaceRealization) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Interface getOldTarget() {

-		return (Interface) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Interface getNewTarget() {

-		return (Interface) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ManifestationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ManifestationReorientCommand.java
deleted file mode 100644
index 518256ac29e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ManifestationReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Manifestation;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class ManifestationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public ManifestationReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Manifestation) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistManifestation_4014(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistManifestation_4014(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Manifestation getLink() {

-		return (Manifestation) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ModelCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ModelCreateCommand.java
deleted file mode 100644
index 079a00e0f44..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ModelCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ModelCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ModelCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getModel());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Model newElement = UMLFactory.eINSTANCE.createModel();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Model_3202(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Model newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ModelCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ModelCreateCommandCN.java
deleted file mode 100644
index 12097649cdb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ModelCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ModelCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ModelCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getModel());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Model newElement = UMLFactory.eINSTANCE.createModel();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Model_3077(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Model newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/OperationForInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/OperationForInterfaceCreateCommand.java
deleted file mode 100644
index f8597517e23..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/OperationForInterfaceCreateCommand.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class OperationForInterfaceCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public OperationForInterfaceCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOperation());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Operation newElement = UMLFactory.eINSTANCE.createOperation();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Interface qualifiedTarget = (Interface) target;

-				qualifiedTarget.getOwnedOperations()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Operation_5(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Operation newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PackageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PackageCreateCommand.java
deleted file mode 100644
index a20fd3f818d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PackageCreateCommand.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PackageCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PackageCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPackage());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Package newElement = UMLFactory.eINSTANCE.createPackage();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Package_3200(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Package newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PackageCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PackageCreateCommandCN.java
deleted file mode 100644
index b104f7b69a4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PackageCreateCommandCN.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PackageCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PackageCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPackage());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Package newElement = UMLFactory.eINSTANCE.createPackage();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Package_3076(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Package newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyCreateCommand.java
deleted file mode 100644
index 404e4a0475b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyCreateCommand.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.StructuredClassifier;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PropertyCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PropertyCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProperty());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Property newElement = UMLFactory.eINSTANCE.createProperty();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;

-				qualifiedTarget.getOwnedAttributes()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Property_3079(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Property newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyForInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyForInterfaceCreateCommand.java
deleted file mode 100644
index 3d92257ae90..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyForInterfaceCreateCommand.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PropertyForInterfaceCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PropertyForInterfaceCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProperty());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Property newElement = UMLFactory.eINSTANCE.createProperty();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Interface qualifiedTarget = (Interface) target;

-				qualifiedTarget.getOwnedAttributes()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Property_1(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Property newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ReceptionInInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ReceptionInInterfaceCreateCommand.java
deleted file mode 100644
index 48d196fbd29..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ReceptionInInterfaceCreateCommand.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.Reception;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ReceptionInInterfaceCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ReceptionInInterfaceCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getReception());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Reception newElement = UMLFactory.eINSTANCE.createReception();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Interface qualifiedTarget = (Interface) target;

-				qualifiedTarget.getOwnedReceptions()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Reception_6(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Reception newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/RectangleInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/RectangleInterfaceCreateCommand.java
deleted file mode 100644
index bc00c31d6a2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/RectangleInterfaceCreateCommand.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class RectangleInterfaceCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public RectangleInterfaceCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterface());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Interface newElement = UMLFactory.eINSTANCE.createInterface();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Interface_3205(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Interface newElement, IProgressMonitor monitor, IAdaptable info)

-			throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/SubstitutionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/SubstitutionReorientCommand.java
deleted file mode 100644
index 4d465c90f7b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/SubstitutionReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Substitution;

-

-/**

- * @generated

- */

-public class SubstitutionReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public SubstitutionReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Substitution) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistSubstitution_4012(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistSubstitution_4012(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Substitution getLink() {

-		return (Substitution) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/UsageReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/UsageReorientCommand.java
deleted file mode 100644
index 9cdb5535431..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/UsageReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Usage;

-

-/**

- * @generated

- */

-public class UsageReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public UsageReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Usage) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistUsage_4001(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistUsage_4001(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Usage getLink() {

-		return (Usage) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/AbstractionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/AbstractionEditHelper.java
deleted file mode 100644
index 0aaa2fb0987..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/AbstractionEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class AbstractionEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/CommentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/CommentEditHelper.java
deleted file mode 100644
index d867b03bf70..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/CommentEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class CommentEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ComponentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ComponentEditHelper.java
deleted file mode 100644
index 5a5261b18a0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ComponentEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ComponentEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ComponentRealizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ComponentRealizationEditHelper.java
deleted file mode 100644
index 74b7b1a764a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ComponentRealizationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ComponentRealizationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ConnectorEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ConnectorEditHelper.java
deleted file mode 100644
index 4ed8130db00..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ConnectorEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ConnectorEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ConstraintEditHelper.java
deleted file mode 100644
index 86419a56111..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ConstraintEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ConstraintEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/DefaultNamedElementEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/DefaultNamedElementEditHelper.java
deleted file mode 100644
index 9277c75fc70..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/DefaultNamedElementEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class DefaultNamedElementEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/DependencyBranchLink.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/DependencyBranchLink.java
deleted file mode 100644
index 955107af214..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/DependencyBranchLink.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-

-public class DependencyBranchLink extends AbstractEditHelperAdvice {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/DependencyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/DependencyEditHelper.java
deleted file mode 100644
index fee54a226b2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/DependencyEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class DependencyEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/GeneralizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/GeneralizationEditHelper.java
deleted file mode 100644
index 197ee6e2b6d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/GeneralizationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class GeneralizationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/InterfaceEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/InterfaceEditHelper.java
deleted file mode 100644
index fffbca45b1c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/InterfaceEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class InterfaceEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/InterfaceRealizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/InterfaceRealizationEditHelper.java
deleted file mode 100644
index 63c8301b7b8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/InterfaceRealizationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class InterfaceRealizationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ManifestationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ManifestationEditHelper.java
deleted file mode 100644
index 7d802c47872..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ManifestationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ManifestationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/OperationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/OperationEditHelper.java
deleted file mode 100644
index 62026b1ad8b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/OperationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class OperationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/PackageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/PackageEditHelper.java
deleted file mode 100644
index 601c7bfaccf..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/PackageEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class PackageEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/PortEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/PortEditHelper.java
deleted file mode 100644
index c76e52baced..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/PortEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class PortEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/PropertyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/PropertyEditHelper.java
deleted file mode 100644
index 50830782442..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/PropertyEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class PropertyEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ReceptionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ReceptionEditHelper.java
deleted file mode 100644
index 194b7528f96..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ReceptionEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ReceptionEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/SubstitutionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/SubstitutionEditHelper.java
deleted file mode 100644
index 1aa28fec780..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/SubstitutionEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class SubstitutionEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/UsageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/UsageEditHelper.java
deleted file mode 100644
index e303bde5cb1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/UsageEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class UsageEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionEditPart.java
index 50ec9e95141..b908c5f41c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/AbstractionEditPart.java
@@ -17,13 +17,13 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.AbstractionItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -48,8 +48,8 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AbstractionItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeAbstractionLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeAbstractionLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentAnnotatedElementEditPart.java
index bd465a9890e..4965a49bb30 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentAnnotatedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentAnnotatedElementEditPart.java
@@ -17,9 +17,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -44,7 +44,7 @@ public class CommentAnnotatedElementEditPart extends ConnectionEditPart implemen
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CommentAnnotatedElementItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPart.java
index 5dc374333f4..beb67a0e0b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPart.java
@@ -450,8 +450,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPartPCN.java
index d08234236bb..1748aca2ad3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentBodyEditPartPCN.java
@@ -450,8 +450,7 @@ public class CommentBodyEditPartPCN extends PapyrusCompartmentEditPart implement
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java
index 1d38121a3b3..300e2759f41 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java
@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusReflowableShapeEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -35,7 +37,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.CommentItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -72,7 +73,10 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CommentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java
index 8377ebd406c..07b01846eac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java
@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusReflowableShapeEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -35,7 +37,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.CommentItemSemanticEditPolicyPCN;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -72,7 +73,10 @@ public class CommentEditPartPCN extends AbstractCommentEditPart {
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CommentItemSemanticEditPolicyPCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPart.java
index 6a6737334ac..60f34fc169a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPart.java
@@ -27,11 +27,11 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentCompositeCompartmentItemSemanticEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.part.Messages;
 
 /**
@@ -66,8 +66,8 @@ public class ComponentCompositeCompartmentEditPart extends ShapeCompartmentEditP
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
 		// in Papyrus diagrams are not strongly synchronised
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartCN.java
index c6c47780590..bbce47fb217 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartCN.java
@@ -27,11 +27,11 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentCompositeCompartmentItemSemanticEditPolicyCN;
 import org.eclipse.papyrus.uml.diagram.component.part.Messages;
 
 /**
@@ -66,8 +66,8 @@ public class ComponentCompositeCompartmentEditPartCN extends ShapeCompartmentEdi
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
 		// in Papyrus diagrams are not strongly synchronised
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartPCN.java
index 67297b1991a..de812c2dca0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentCompositeCompartmentEditPartPCN.java
@@ -27,11 +27,11 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentCompositeCompartmentItemSemanticEditPolicyPCN;
 import org.eclipse.papyrus.uml.diagram.component.part.Messages;
 
 /**
@@ -66,8 +66,8 @@ public class ComponentCompositeCompartmentEditPartPCN extends ShapeCompartmentEd
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeCompartmentItemSemanticEditPolicyPCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
 		// in Papyrus diagrams are not strongly synchronised
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentDiagramEditPart.java
index a64d309e534..c6605965380 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentDiagramEditPart.java
@@ -14,11 +14,11 @@ package org.eclipse.papyrus.uml.diagram.component.edit.parts;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentDiagramItemSemanticEditPolicy;
 
 /**
  * @generated
@@ -49,10 +49,10 @@ public class ComponentDiagramEditPart extends PapyrusDiagramEditPart {
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
 
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentDiagramItemSemanticEditPolicy());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
 		// in Papyrus diagrams are not strongly synchronised
 		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.component.edit.policies.ModelCanonicalEditPolicy());
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java
index fc0bfb9ec6f..548a7902422 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java
@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,7 +49,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

@@ -56,7 +58,6 @@ import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiag
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -92,9 +93,12 @@ public class ComponentEditPart extends RoundedCompartmentEditPart {
 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		// in Papyrus diagrams are not strongly synchronised

 		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentCanonicalEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java
index a7ddfc70e7e..0d3ba1e145f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java
@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,7 +49,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

@@ -56,7 +58,6 @@ import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiag
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -92,9 +93,12 @@ public class ComponentEditPartCN extends RoundedCompartmentEditPart {
 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		// in Papyrus diagrams are not strongly synchronised

 		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentCanonicalEditPolicyCN());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java
index 90ec5640ebe..95b1e5b9273 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java
@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,7 +49,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

@@ -56,7 +58,6 @@ import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiag
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.CompositeFigure;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentItemSemanticEditPolicyPCN;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -92,9 +93,12 @@ public class ComponentEditPartPCN extends RoundedCompartmentEditPart {
 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentItemSemanticEditPolicyPCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		// in Papyrus diagrams are not strongly synchronised

 		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentCanonicalEditPolicyPCN());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPart.java
index a655aa1263a..28c33d353b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPart.java
@@ -484,8 +484,7 @@ public class ComponentFloatingLabelEditPart extends FloatingLabelEditPart implem
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartCN.java
index 463399258ef..5df6deb87fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartCN.java
@@ -484,8 +484,7 @@ public class ComponentFloatingLabelEditPartCN extends FloatingLabelEditPart impl
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartPCN.java
index 1351f68e034..a7848845a93 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentFloatingLabelEditPartPCN.java
@@ -484,8 +484,7 @@ public class ComponentFloatingLabelEditPartPCN extends FloatingLabelEditPart imp
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPart.java
index c121d071fbc..d423dc194d1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPart.java
@@ -464,8 +464,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart implements
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartCN.java
index 197404d597d..b20200ea9e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartCN.java
@@ -464,8 +464,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart implemen
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartPCN.java
index 357109a7a73..59a01b487f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentNameEditPartPCN.java
@@ -450,8 +450,7 @@ public class ComponentNameEditPartPCN extends PapyrusCompartmentEditPart impleme
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationEditPart.java
index bc62c5c563c..f51463be820 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentRealizationEditPart.java
@@ -17,13 +17,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ComponentRealizationItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -48,8 +47,8 @@ public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart impl
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentRealizationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java
index 9c5e7b0784a..e9aab828f97 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java
@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -146,7 +145,6 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

@@ -467,8 +465,7 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java
index d9cb8efeae0..0669ea64218 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java
@@ -16,11 +16,10 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.ConnectorFigure;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ConnectorItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -45,8 +44,8 @@ public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITre
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConnectorItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintConstrainedElementEditPart.java
index 0dd94c9ff42..9289577b2f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintConstrainedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintConstrainedElementEditPart.java
@@ -16,10 +16,10 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -44,7 +44,7 @@ public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditP
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintConstrainedElementItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java
index 750252d11a5..2adcf32c7fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java
@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -34,7 +36,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ConstraintItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -71,7 +72,10 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java
index c57ec138618..6aff361f1e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java
@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -34,7 +36,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ConstraintItemSemanticEditPolicyPCN;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -71,7 +72,10 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintItemSemanticEditPolicyPCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPart.java
index ad2eecedb26..b79d92093cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPart.java
@@ -464,8 +464,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPartPCN.java
index 57df0873596..91a84f9be63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintNameEditPartPCN.java
@@ -464,8 +464,7 @@ public class ConstraintNameEditPartPCN extends PapyrusCompartmentEditPart implem
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPart.java
index d0b4719b6f5..1e781399e4d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPart.java
@@ -464,8 +464,7 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPartPCN.java
index bc40e1dd6ba..a7a664335e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintSpecificationEditPartPCN.java
@@ -464,8 +464,7 @@ public class ConstraintSpecificationEditPartPCN extends PapyrusCompartmentEditPa
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java
index 5e62bd4a774..90bb2135a3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java
@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -35,8 +37,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayE
 import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.ComponentDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.itemsemantic.CustomDefaultNamedElementItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.DefaultNamedElementItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -73,13 +73,15 @@ public class DefaultNamedElementEditPart extends NodeEditPart {
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultNamedElementItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY, new ComponentDiagramChangeStereotypedShapeEditpolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultNamedElementItemSemanticEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java
index 8331d5c01b7..6f67d8b7888 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java
@@ -450,8 +450,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java
index ad0483a25bf..746bb017142 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java
@@ -16,10 +16,10 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.DependencyBranchItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -44,7 +44,7 @@ public class DependencyBranchEditPart extends UMLConnectionNodeEditPart implemen
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DependencyBranchItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyEditPart.java
index 640b91e4a89..f28cd35480f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyEditPart.java
@@ -17,13 +17,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.DependencyItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -48,8 +47,8 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DependencyItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java
index 06f68a62602..a8c75e7bc3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java
@@ -31,6 +31,8 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -40,7 +42,6 @@ import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigu
 import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.DependencyNodeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -77,7 +78,10 @@ public class DependencyNodeEditPart extends NodeEditPart {
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DependencyNodeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeFloatingLabelEditPart.java
index 3875c35474d..799565ef75b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeFloatingLabelEditPart.java
@@ -484,8 +484,7 @@ public class DependencyNodeFloatingLabelEditPart extends FloatingLabelEditPart i
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationEditPart.java
index 2799eef9936..812f7ccf3e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/GeneralizationEditPart.java
@@ -17,13 +17,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.GeneralizationItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -48,8 +47,8 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new GeneralizationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPart.java
index 6a0658bdfa3..c75f8ba6c3b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPart.java
@@ -27,10 +27,10 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.InterfaceAttributeCompartmentItemSemanticEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.part.Messages;
 
 /**
@@ -73,8 +73,8 @@ public class InterfaceAttributeCompartmentEditPart extends ResizeableListCompart
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceAttributeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
 		// in Papyrus diagrams are not strongly synchronised
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
index 2cf300c5346..58ea1250fa1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
@@ -27,10 +27,10 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.InterfaceAttributeCompartmentItemSemanticEditPolicyCN;
 import org.eclipse.papyrus.uml.diagram.component.part.Messages;
 
 /**
@@ -73,8 +73,8 @@ public class InterfaceAttributeCompartmentEditPartCN extends ListCompartmentEdit
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceAttributeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
 		// in Papyrus diagrams are not strongly synchronised
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java
index 47f3e7b2502..a35ee21efe9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java
@@ -33,6 +33,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -43,7 +45,6 @@ import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPosit
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.InterfaceItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -80,7 +81,10 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java
index 1f195f8246e..70eb26d62ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java
@@ -33,6 +33,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -44,7 +46,6 @@ import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiag
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.LollipopInterfaceFigure;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.InterfaceItemSemanticEditPolicyPCN;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -81,7 +82,10 @@ public class InterfaceEditPartPCN extends RoundedCompartmentEditPart {
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceItemSemanticEditPolicyPCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPart.java
index 723192c53fb..b788f4f2bda 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPart.java
@@ -484,8 +484,7 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart implem
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPartPCN.java
index 248bac7a5e3..02a31fc2a08 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceFloatingLabelEditPartPCN.java
@@ -484,8 +484,7 @@ public class InterfaceFloatingLabelEditPartPCN extends FloatingLabelEditPart imp
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPart.java
index 6b1e69b1cb5..ca35b24e099 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPart.java
@@ -484,8 +484,7 @@ public class InterfaceNameEditPart extends PapyrusLabelEditPart implements IText
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPartPCN.java
index a1e283d9a90..f1d9562c660 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceNameEditPartPCN.java
@@ -484,8 +484,7 @@ public class InterfaceNameEditPartPCN extends PapyrusLabelEditPart implements IT
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPart.java
index 299bd95aafe..98fca7e57c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPart.java
@@ -27,10 +27,10 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.InterfaceOperationCompartmentItemSemanticEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.part.Messages;
 
 /**
@@ -73,8 +73,8 @@ public class InterfaceOperationCompartmentEditPart extends ResizeableListCompart
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceOperationCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
 		// in Papyrus diagrams are not strongly synchronised
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java
index 0418c9b7215..005ccc2f097 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java
@@ -27,10 +27,10 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.InterfaceOperationCompartmentItemSemanticEditPolicyCN;
 import org.eclipse.papyrus.uml.diagram.component.part.Messages;
 
 /**
@@ -73,8 +73,8 @@ public class InterfaceOperationCompartmentEditPartCN extends ListCompartmentEdit
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceOperationCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
 		// in Papyrus diagrams are not strongly synchronised
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationEditPart.java
index 35005267aec..739f7e4f125 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceRealizationEditPart.java
@@ -16,10 +16,10 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.InterfaceRealizationLinkFigure;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.InterfaceRealizationItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -44,7 +44,7 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceRealizationItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationEditPart.java
index f28052c028d..c02a9d667d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ManifestationEditPart.java
@@ -17,13 +17,13 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeManifestationLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ManifestationItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -48,8 +48,8 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart implements
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ManifestationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeManifestationLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeManifestationLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java
index 955d011e7df..af6496c6c63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java
@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -36,7 +38,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEd
 import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ModelItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -73,7 +74,10 @@ public class ModelEditPart extends PackageEditPart {
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ModelItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java
index 1abf5f63808..c7f679aafd5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java
@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -36,7 +38,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEd
 import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ModelItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -73,7 +74,10 @@ public class ModelEditPartCN extends PackageEditPart {
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ModelItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java
index dd392fb892e..08192c77391 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java
@@ -464,8 +464,7 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java
index 8a75ac32c08..b50a52a3d9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java
@@ -464,8 +464,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPart.java
index 4f91d749a8f..5cf9b3f80c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPart.java
@@ -25,11 +25,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ModelPackageableElementCompartmentItemSemanticEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.part.Messages;
 
 /**
@@ -63,8 +63,8 @@ public class ModelPackageableElementCompartmentEditPart extends ShapeCompartment
 	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ModelPackageableElementCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
 		// in Papyrus diagrams are not strongly synchronised
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
index 8c96027ad26..b1dd3235afd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
@@ -25,11 +25,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ModelPackageableElementCompartmentItemSemanticEditPolicyCN;
 import org.eclipse.papyrus.uml.diagram.component.part.Messages;
 
 /**
@@ -63,8 +63,8 @@ public class ModelPackageableElementCompartmentEditPartCN extends ShapeCompartme
 	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ModelPackageableElementCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
 		// in Papyrus diagrams are not strongly synchronised
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java
index 9abdb3928e1..1797adf749f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java
@@ -482,8 +482,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart implement
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java
index 15755265b64..54e6eaab6a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java
@@ -63,6 +63,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

@@ -72,7 +73,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.OperationLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.OperationForInterfaceItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextNonResizableEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

@@ -158,7 +158,7 @@ public class OperationForInterfaceEditPart extends UMLCompartmentEditPart implem
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OperationForInterfaceItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

 		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -475,8 +475,7 @@ public class OperationForInterfaceEditPart extends UMLCompartmentEditPart implem
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java
index f12cdf4b3e3..72fba7b285f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java
@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -35,7 +37,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEd
 import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.PackageItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -72,7 +73,10 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackageItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java
index 1770468da5c..55818360d46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java
@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -36,7 +38,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEd
 import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.PackageItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -73,7 +74,10 @@ public class PackageEditPartCN extends PackageEditPart {
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackageItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPart.java
index f5eccbef0e8..b1480ddff79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPart.java
@@ -464,8 +464,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java
index 1a8cebb1f9c..63944e81624 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java
@@ -464,8 +464,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPart.java
index 4af1a3c9818..96121e13e8e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPart.java
@@ -25,11 +25,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.part.Messages;
 
 /**
@@ -63,8 +63,8 @@ public class PackagePackageableElementCompartmentEditPart extends ShapeCompartme
 	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackagePackageableElementCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
 		// in Papyrus diagrams are not strongly synchronised
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
index 01d1310c1ec..1b99929fab6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
@@ -25,11 +25,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.component.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicyCN;
 import org.eclipse.papyrus.uml.diagram.component.part.Messages;
 
 /**
@@ -63,8 +63,8 @@ public class PackagePackageableElementCompartmentEditPartCN extends ShapeCompart
 	@Override
 	protected void createDefaultEditPolicies() {
 		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackagePackageableElementCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
 		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
 		// in Papyrus diagrams are not strongly synchronised
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortAppliedStereotypeEditPart.java
index 56af9754018..17372c9e22c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortAppliedStereotypeEditPart.java
@@ -487,8 +487,7 @@ public class PortAppliedStereotypeEditPart extends PapyrusLabelEditPart implemen
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java
index 43eca73eb1b..53742376b98 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java
@@ -34,6 +34,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,10 +47,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPoli
 import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomPortItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PortLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PortFigure;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.PortItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -86,9 +86,11 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PortItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomPortItemSemanticEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PortLayoutEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortNameEditPart.java
index 4f810f94fa6..7a8e998823f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortNameEditPart.java
@@ -488,8 +488,7 @@ public class PortNameEditPart extends PapyrusLabelEditPart implements ITextAware
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java
index 4c97a8305ea..fe9cbcb5236 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java
@@ -63,6 +63,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

@@ -72,7 +73,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.PropertyForInterfaceItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextNonResizableEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

@@ -158,7 +158,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart impleme
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyForInterfaceItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

 		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -475,8 +475,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart impleme
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java
index f5433ef6b2f..32d85447d62 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java
@@ -29,6 +29,9 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -37,7 +40,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabe
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

@@ -45,9 +47,7 @@ import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomProperty
 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PropertyLayoutEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.itemsemantic.PropertyPartItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PropertyPartFigure;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.PropertyItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -83,15 +83,17 @@ public class PropertyPartEditPartCN extends CustomPropertyPartEditPartCN {
 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		// in Papyrus diagrams are not strongly synchronised

 		// installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.component.edit.policies.PropertyCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyPartItemSemanticEditPolicyCN());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java
index 9256660950f..db31e5a0caa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java
@@ -466,8 +466,7 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java
index 7fd5b5f77a3..2f2f6bcaced 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java
@@ -64,12 +64,12 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.ReceptionInInterfaceItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextNonResizableEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

@@ -155,7 +155,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart implements
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ReceptionInInterfaceItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

 		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -470,8 +470,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart implements
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java
index baea545dbe5..7c0c959584d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java
@@ -38,17 +38,18 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

 import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.RectangleInterfaceItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

@@ -85,9 +86,12 @@ public class RectangleInterfaceEditPart extends RoundedCompartmentEditPart {
 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new RectangleInterfaceItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

 		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

@@ -376,13 +380,13 @@ public class RectangleInterfaceEditPart extends RoundedCompartmentEditPart {
 		if (request instanceof CreateViewAndElementRequest) {

 			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

 			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);

-			if (type == UMLElementTypes.Property_1) {

+			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_1)) {

 				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPart.VISUAL_ID));

 			}

-			if (type == UMLElementTypes.Operation_5) {

+			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_5)) {

 				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID));

 			}

-			if (type == UMLElementTypes.Reception_6) {

+			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Reception_6)) {

 				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID));

 			}

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java
index f5ab38b75af..7ee482e12dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java
@@ -38,17 +38,18 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

 import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.InterfaceItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

@@ -85,9 +86,12 @@ public class RectangleInterfaceEditPartCN extends RoundedCompartmentEditPart {
 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

+

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

 		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

@@ -376,13 +380,13 @@ public class RectangleInterfaceEditPartCN extends RoundedCompartmentEditPart {
 		if (request instanceof CreateViewAndElementRequest) {

 			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

 			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);

-			if (type == UMLElementTypes.Property_1) {

+			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_1)) {

 				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPartCN.VISUAL_ID));

 			}

-			if (type == UMLElementTypes.Operation_5) {

+			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_5)) {

 				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID));

 			}

-			if (type == UMLElementTypes.Reception_6) {

+			if (UMLElementTypes.isKindOf(type, UMLElementTypes.Reception_6)) {

 				return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID));

 			}

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPart.java
index 41590553c72..7790596b598 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPart.java
@@ -484,8 +484,7 @@ public class RectangleInterfaceFloatingLabelEditPart extends FloatingLabelEditPa
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPartCN.java
index 55d0f698521..8efd31f5711 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceFloatingLabelEditPartCN.java
@@ -484,8 +484,7 @@ public class RectangleInterfaceFloatingLabelEditPartCN extends FloatingLabelEdit
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java
index f2828ff8ba4..81d6f4996eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java
@@ -464,8 +464,7 @@ public class RectangleInterfaceNameEditPart extends PapyrusCompartmentEditPart i
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java
index 9d3279f9ed4..516fac6d0f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java
@@ -450,8 +450,7 @@ public class RectangleInterfaceNameEditPartCN extends PapyrusCompartmentEditPart
 				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionEditPart.java
index 7378369ec35..e3ca95d1749 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/SubstitutionEditPart.java
@@ -17,13 +17,13 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeSubstitutionLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.SubstitutionItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -48,8 +48,8 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SubstitutionItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeSubstitutionLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeSubstitutionLabelDisplayEditPolicy());

 		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageEditPart.java
index 7f03d83657f..2f98fa4fa5d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UsageEditPart.java
@@ -16,10 +16,10 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.UsageLinkFigure;

-import org.eclipse.papyrus.uml.diagram.component.edit.policies.UsageItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -44,7 +44,7 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new UsageItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/AbstractionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/AbstractionItemSemanticEditPolicy.java
deleted file mode 100644
index 79c42864188..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/AbstractionItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public AbstractionItemSemanticEditPolicy() {

-		super(UMLElementTypes.Abstraction_4013);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
deleted file mode 100644
index f1796ad8cb0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CommentAnnotatedElementItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CommentAnnotatedElementItemSemanticEditPolicy() {

-		super(UMLElementTypes.CommentAnnotatedElement_4015);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return getGEFWrapper(new DestroyReferenceCommand(req));

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/CommentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/CommentItemSemanticEditPolicy.java
deleted file mode 100644
index 279d1ad47b9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/CommentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CommentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CommentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Comment_3201);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/CommentItemSemanticEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/CommentItemSemanticEditPolicyPCN.java
deleted file mode 100644
index 9d1dd93db55..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/CommentItemSemanticEditPolicyPCN.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CommentItemSemanticEditPolicyPCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CommentItemSemanticEditPolicyPCN() {

-		super(UMLElementTypes.Comment_3074);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCanonicalEditPolicy.java
deleted file mode 100644
index 72ae415ef5a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getComponent_2002SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PortEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getComponent_2002SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCanonicalEditPolicyCN.java
deleted file mode 100644
index cd366e7f837..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getComponent_3070SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PortEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getComponent_3070SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCanonicalEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCanonicalEditPolicyPCN.java
deleted file mode 100644
index 81b70e6c50e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCanonicalEditPolicyPCN.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentCanonicalEditPolicyPCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getComponent_3071SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PortEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getComponent_3071SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 50f96c0105c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentCompositeCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getComponent_PackagedElement());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getComponentPackagedelements_7001SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == ComponentEditPartCN.VISUAL_ID || visualID == PropertyPartEditPartCN.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getComponentPackagedelements_7001SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index 6464c2b164c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentCompositeCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getComponent_PackagedElement());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getComponentPackagedelements_7003SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == ComponentEditPartCN.VISUAL_ID || visualID == PropertyPartEditPartCN.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getComponentPackagedelements_7003SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java
deleted file mode 100644
index ba99c2b1819..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentCompositeCompartmentCanonicalEditPolicyPCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getComponent_PackagedElement());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getComponentPackagedelements_7004SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == ComponentEditPartCN.VISUAL_ID || visualID == PropertyPartEditPartCN.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getComponentPackagedelements_7004SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 404dba00db8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentCompositeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Component_2002);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Component_3070 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3079 == requestElementType) {

-

-			return getGEFWrapper(new PropertyCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 702d99fe40b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentCompositeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Component_3070);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Component_3070 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3079 == requestElementType) {

-

-			return getGEFWrapper(new PropertyCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java
deleted file mode 100644
index 9a95064f849..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentCompositeCompartmentItemSemanticEditPolicyPCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentCompositeCompartmentItemSemanticEditPolicyPCN() {

-		super(UMLElementTypes.Component_3071);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Component_3070 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3079 == requestElementType) {

-

-			return getGEFWrapper(new PropertyCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentDiagramItemSemanticEditPolicy.java
deleted file mode 100644
index 47f9bd31b6d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentDiagramItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DefaultNamedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyNodeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ModelCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.PackageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.RectangleInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentDiagramItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentDiagramItemSemanticEditPolicy() {

-		super(UMLElementTypes.Package_1000);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Dependency_3203 == requestElementType) {

-

-			return getGEFWrapper(new DependencyNodeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_2002 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Model_3202 == requestElementType) {

-

-			return getGEFWrapper(new ModelCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Package_3200 == requestElementType) {

-

-			return getGEFWrapper(new PackageCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3205 == requestElementType) {

-

-			return getGEFWrapper(new RectangleInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3201 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3199 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.NamedElement_3204 == requestElementType) {

-

-			return getGEFWrapper(new DefaultNamedElementCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_2003 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDuplicateCommand(DuplicateElementsRequest req) {

-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();

-		return getGEFWrapper(new DuplicateAnythingCommand(editingDomain, req));

-	}

-

-	/**

-	 * @generated

-	 */

-	private static class DuplicateAnythingCommand extends DuplicateEObjectsCommand {

-

-		/**

-		 * @generated

-		 */

-		public DuplicateAnythingCommand(TransactionalEditingDomain editingDomain, DuplicateElementsRequest req) {

-			super(editingDomain, req.getLabel(), req.getElementsToBeDuplicated(), req.getAllDuplicatedElementsMap());

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentItemSemanticEditPolicy.java
deleted file mode 100644
index 2dd4714ccba..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Component_2002);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Generalization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentItemSemanticEditPolicyCN.java
deleted file mode 100644
index e4d51573bba..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Component_3070);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Generalization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentItemSemanticEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentItemSemanticEditPolicyPCN.java
deleted file mode 100644
index 7b7c673f181..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentItemSemanticEditPolicyPCN.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentItemSemanticEditPolicyPCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentItemSemanticEditPolicyPCN() {

-		super(UMLElementTypes.Component_3071);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Generalization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentRealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
deleted file mode 100644
index 7a4a1114586..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentRealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentRealizationItemSemanticEditPolicy() {

-		super(UMLElementTypes.ComponentRealization_4007);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConnectorItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConnectorItemSemanticEditPolicy.java
deleted file mode 100644
index 78f32227ba3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConnectorItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConnectorItemSemanticEditPolicy() {

-		super(UMLElementTypes.Connector_4019);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
deleted file mode 100644
index e1dafcfd7af..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConstraintConstrainedElementItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConstraintConstrainedElementItemSemanticEditPolicy() {

-		super(UMLElementTypes.ConstraintConstrainedElement_4009);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return getGEFWrapper(new DestroyReferenceCommand(req));

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConstraintItemSemanticEditPolicy.java
deleted file mode 100644
index 9283786c8f6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConstraintItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConstraintItemSemanticEditPolicy() {

-		super(UMLElementTypes.Constraint_3199);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConstraintItemSemanticEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConstraintItemSemanticEditPolicyPCN.java
deleted file mode 100644
index 30e26bac2e1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConstraintItemSemanticEditPolicyPCN.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConstraintItemSemanticEditPolicyPCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConstraintItemSemanticEditPolicyPCN() {

-		super(UMLElementTypes.Constraint_3075);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyItemSemanticEditPolicy.java
deleted file mode 100644
index a11207a6368..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DependencyItemSemanticEditPolicy() {

-		super(UMLElementTypes.Dependency_4010);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyNodeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyNodeItemSemanticEditPolicy.java
deleted file mode 100644
index ab112cf24a7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyNodeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DependencyNodeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DependencyNodeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Dependency_3203);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/GeneralizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/GeneralizationItemSemanticEditPolicy.java
deleted file mode 100644
index 17acd7a6e2a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/GeneralizationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class GeneralizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationItemSemanticEditPolicy() {

-		super(UMLElementTypes.Generalization_4003);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 8f926cb94d4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceAttributeCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getInterface_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getInterfaceAttributes_7008SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyForInterfaceEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getInterfaceAttributes_7008SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index b167de4f5fb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceAttributeCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getInterface_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getInterfaceAttributes_7010SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PropertyForInterfaceEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getInterfaceAttributes_7010SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 62681741294..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceAttributeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceAttributeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interface_3205);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_1 == requestElementType) {

-

-			return getGEFWrapper(new PropertyForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 23354e66306..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceAttributeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceAttributeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Interface_3078);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_1 == requestElementType) {

-

-			return getGEFWrapper(new PropertyForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 67686941d94..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.DeleteCommand;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interface_3078);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		View view = (View) getHost().getModel();

-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(true);

-		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$

-		if (annotation == null) {

-			// there are indirectly referenced children, need extra commands: false

-			addDestroyChildNodesCommand(cmd);

-			addDestroyShortcutsCommand(cmd, view);

-			// delete host element

-			List<EObject> todestroy = new ArrayList<EObject>();

-			todestroy.add(req.getElementToDestroy());

-			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

-		} else {

-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

-		}

-		return getGEFWrapper(cmd.reduce());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addDestroyChildNodesCommand(ICompositeCommand cmd) {

-		View view = (View) getHost().getModel();

-		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

-			Node node = (Node) nit.next();

-			switch (UMLVisualIDRegistry.getVisualID(node)) {

-			case InterfaceAttributeCompartmentEditPartCN.VISUAL_ID:

-				for (Iterator<?> cit = node.getChildren().iterator(); cit.hasNext();) {

-					Node cnode = (Node) cit.next();

-					switch (UMLVisualIDRegistry.getVisualID(cnode)) {

-					case PropertyForInterfaceEditPart.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getSourceEdges().iterator(); it.hasNext();) {

-							Edge outgoingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-							}

-						}

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					}

-				}

-				break;

-			case InterfaceOperationCompartmentEditPartCN.VISUAL_ID:

-				for (Iterator<?> cit = node.getChildren().iterator(); cit.hasNext();) {

-					Node cnode = (Node) cit.next();

-					switch (UMLVisualIDRegistry.getVisualID(cnode)) {

-					case OperationForInterfaceEditPart.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getSourceEdges().iterator(); it.hasNext();) {

-							Edge outgoingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-							}

-						}

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case ReceptionInInterfaceEditPart.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getSourceEdges().iterator(); it.hasNext();) {

-							Edge outgoingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-							}

-						}

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					}

-				}

-				break;

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceItemSemanticEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceItemSemanticEditPolicyPCN.java
deleted file mode 100644
index 1d6644e2756..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceItemSemanticEditPolicyPCN.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceItemSemanticEditPolicyPCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceItemSemanticEditPolicyPCN() {

-		super(UMLElementTypes.Interface_3072);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index e8f1210b947..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceOperationCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getInterface_OwnedOperation());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getInterface_OwnedReception());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getInterfaceOperations_7009SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == OperationForInterfaceEditPart.VISUAL_ID || visualID == ReceptionInInterfaceEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getInterfaceOperations_7009SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index 7409978dfe1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceOperationCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getInterface_OwnedOperation());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getInterface_OwnedReception());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getInterfaceOperations_7011SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == OperationForInterfaceEditPart.VISUAL_ID || visualID == ReceptionInInterfaceEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getInterfaceOperations_7011SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 361e1ee23c1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.OperationForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ReceptionInInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceOperationCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceOperationCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interface_3205);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Operation_5 == requestElementType) {

-

-			return getGEFWrapper(new OperationForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Reception_6 == requestElementType) {

-

-			return getGEFWrapper(new ReceptionInInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index d6612526ebf..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.OperationForInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ReceptionInInterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceOperationCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceOperationCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Interface_3078);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Operation_5 == requestElementType) {

-

-			return getGEFWrapper(new OperationForInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Reception_6 == requestElementType) {

-

-			return getGEFWrapper(new ReceptionInInterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
deleted file mode 100644
index be7fe08ea01..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceRealizationItemSemanticEditPolicy() {

-		super(UMLElementTypes.InterfaceRealization_4006);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ManifestationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ManifestationItemSemanticEditPolicy.java
deleted file mode 100644
index 6f7f74d7853..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ManifestationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ManifestationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ManifestationItemSemanticEditPolicy() {

-		super(UMLElementTypes.Manifestation_4014);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java
deleted file mode 100644
index b7b5a6c3a0a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java
+++ /dev/null
@@ -1,692 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Bounds;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.Location;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.Size;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.update.UpdaterLinkDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DefaultNamedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfacePortLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.LinkDescriptorEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLLinkDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ModelCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getPackage_PackagedElement());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getElement_OwnedComment());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getNamespace_OwnedRule());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getPackage_1000SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case DependencyNodeEditPart.VISUAL_ID:

-		case ComponentEditPart.VISUAL_ID:

-		case ModelEditPart.VISUAL_ID:

-		case PackageEditPart.VISUAL_ID:

-		case RectangleInterfaceEditPart.VISUAL_ID:

-		case CommentEditPart.VISUAL_ID:

-		case ConstraintEditPart.VISUAL_ID:

-		case DefaultNamedElementEditPart.VISUAL_ID:

-		case InterfaceEditPart.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getPackage_1000SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		HashMap<UMLNodeDescriptor, LinkedList<View>> potentialViews = new HashMap<UMLNodeDescriptor, LinkedList<View>>();

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			LinkedList<View> potentialMatch = new LinkedList<View>(); // semanticElement matches, hint does not

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					} else {

-						potentialMatch.add(childView);

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			} else if (potentialMatch.size() > 0) {

-				potentialViews.put(next, potentialMatch);

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		CompositeTransactionalCommand boundsCommand = new CompositeTransactionalCommand(host().getEditingDomain(), DiagramUIMessages.SetLocationCommand_Label_Resize);

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-			LinkedList<View> possibleMatches = potentialViews.get(next);

-			if (possibleMatches != null) {

-				// from potential matches, leave those that were not eventually used for some other NodeDescriptor (i.e. those left as orphaned)

-				possibleMatches.retainAll(knownViewChildren);

-			}

-			if (possibleMatches != null && !possibleMatches.isEmpty()) {

-				View originalView = possibleMatches.getFirst();

-				knownViewChildren.remove(originalView); // remove not to copy properties of the same view again and again

-				// add command to copy properties

-				if (originalView instanceof Node) {

-					if (((Node) originalView).getLayoutConstraint() instanceof Bounds) {

-						Bounds b = (Bounds) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Rectangle(b.getX(), b.getY(), b.getWidth(), b.getHeight())));

-					} else if (((Node) originalView).getLayoutConstraint() instanceof Location) {

-						Location l = (Location) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Point(l.getX(), l.getY())));

-					} else if (((Node) originalView).getLayoutConstraint() instanceof Size) {

-						Size s = (Size) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Dimension(s.getWidth(), s.getHeight())));

-					}

-				}

-			}

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			if (boundsCommand.canExecute()) {

-				executeCommand(new ICommandProxy(boundsCommand.reduce()));

-			}

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-

-		Collection<IAdaptable> createdConnectionViews = refreshConnections();

-

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		createdViews.addAll(createdConnectionViews);

-

-		makeViewsImmutable(createdViews);

-	}

-

-	/**

-	 * @generated

-	 */

-	private Collection<IAdaptable> refreshConnections() {

-		Domain2Notation domain2NotationMap = new Domain2Notation();

-		Collection<UMLLinkDescriptor> linkDescriptors = collectAllLinks(getDiagram(), domain2NotationMap);

-		List<View> edges = new ArrayList<View>();

-		for (Object edge : getDiagram().getEdges())

-		{

-			if (edge instanceof View)

-			{

-				edges.add((View) edge);

-			}

-		}

-		Collection<View> existingLinks = new LinkedList<View>(edges);

-		for (Iterator<View> linksIterator = existingLinks.iterator(); linksIterator.hasNext();) {

-			Edge nextDiagramLink = (Edge) linksIterator.next();

-			int diagramLinkVisualID = UMLVisualIDRegistry.getVisualID(nextDiagramLink);

-			if (diagramLinkVisualID == -1 || diagramLinkVisualID == LinkDescriptorEditPart.VISUAL_ID || diagramLinkVisualID == InterfacePortLinkEditPart.VISUAL_ID) {

-				if (nextDiagramLink.getSource() != null && nextDiagramLink.getTarget() != null) {

-					linksIterator.remove();

-				}

-				continue;

-			}

-			EObject diagramLinkObject = nextDiagramLink.getElement();

-			EObject diagramLinkSrc = nextDiagramLink.getSource().getElement();

-			EObject diagramLinkDst = nextDiagramLink.getTarget().getElement();

-			for (Iterator<UMLLinkDescriptor> linkDescriptorsIterator = linkDescriptors.iterator(); linkDescriptorsIterator.hasNext();) {

-				UMLLinkDescriptor nextLinkDescriptor = linkDescriptorsIterator.next();

-				if (diagramLinkObject == nextLinkDescriptor.getModelElement() && diagramLinkSrc == nextLinkDescriptor.getSource() && diagramLinkDst == nextLinkDescriptor.getDestination() && diagramLinkVisualID == nextLinkDescriptor.getVisualID()) {

-					linksIterator.remove();

-					linkDescriptorsIterator.remove();

-					break;

-				}

-			}

-		}

-		deleteViews(existingLinks.iterator());

-		return createConnections(linkDescriptors, domain2NotationMap);

-	}

-

-	/**

-	 * @generated

-	 */

-	private Collection<UMLLinkDescriptor> collectAllLinks(View view, Domain2Notation domain2NotationMap) {

-		if (!ComponentDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view))) {

-			return Collections.emptyList();

-		}

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		switch (UMLVisualIDRegistry.getVisualID(view)) {

-		case ComponentDiagramEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getPackage_1000ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case DependencyNodeEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getDependency_3203ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ComponentEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getComponent_2002ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ModelEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getModel_3202ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case PackageEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getPackage_3200ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case RectangleInterfaceEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getInterface_3205ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case CommentEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getComment_3201ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ConstraintEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getConstraint_3199ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case DefaultNamedElementEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getNamedElement_3204ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case InterfaceEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getInterface_2003ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case PortEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getPort_3069ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ModelEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getModel_3077ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case PackageEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getPackage_3076ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case RectangleInterfaceEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getInterface_3078ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ComponentEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getComponent_3070ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ComponentEditPartPCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getComponent_3071ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case CommentEditPartPCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getComment_3074ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ConstraintEditPartPCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getConstraint_3075ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case InterfaceEditPartPCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getInterface_3072ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case PropertyPartEditPartCN.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getProperty_3079ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case UsageEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getUsage_4001ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case InterfaceRealizationEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getInterfaceRealization_4006ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case GeneralizationEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getGeneralization_4003ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case SubstitutionEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getSubstitution_4012ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ManifestationEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getManifestation_4014ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ComponentRealizationEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getComponentRealization_4007ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case AbstractionEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getAbstraction_4013ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case DependencyEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getDependency_4010ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case DependencyBranchEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getDependency_4017ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		case ConnectorEditPart.VISUAL_ID: {

-			if (!domain2NotationMap.containsKey(view.getElement())) {

-				result.addAll(UMLDiagramUpdater.INSTANCE

-						.getConnector_4019ContainedLinks(view));

-			}

-			domain2NotationMap.putView(view.getElement(), view);

-			break;

-		}

-		}

-		for (Iterator<?> children = view.getChildren().iterator(); children.hasNext();) {

-			result.addAll(collectAllLinks((View) children.next(), domain2NotationMap));

-		}

-		for (Iterator<?> edges = view.getSourceEdges().iterator(); edges.hasNext();) {

-			result.addAll(collectAllLinks((View) edges.next(), domain2NotationMap));

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Collection<IAdaptable> createConnections(Collection<UMLLinkDescriptor> linkDescriptors,

-			Domain2Notation domain2NotationMap) {

-		LinkedList<IAdaptable> adapters = new LinkedList<IAdaptable>();

-		for (UMLLinkDescriptor nextLinkDescriptor : linkDescriptors) {

-			EditPart sourceEditPart = getSourceEditPart(nextLinkDescriptor, domain2NotationMap);

-			EditPart targetEditPart = getTargetEditPart(nextLinkDescriptor, domain2NotationMap);

-			if (sourceEditPart == null || targetEditPart == null) {

-				continue;

-			}

-			CreateConnectionViewRequest.ConnectionViewDescriptor descriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(nextLinkDescriptor.getSemanticAdapter(), UMLVisualIDRegistry.getType(nextLinkDescriptor.getVisualID()), ViewUtil.APPEND,

-					false, ((IGraphicalEditPart) getHost()).getDiagramPreferencesHint());

-			CreateConnectionViewRequest ccr = new CreateConnectionViewRequest(descriptor);

-			ccr.setType(org.eclipse.gef.RequestConstants.REQ_CONNECTION_START);

-			ccr.setSourceEditPart(sourceEditPart);

-			sourceEditPart.getCommand(ccr);

-			ccr.setTargetEditPart(targetEditPart);

-			ccr.setType(org.eclipse.gef.RequestConstants.REQ_CONNECTION_END);

-			Command cmd = targetEditPart.getCommand(ccr);

-			if (cmd != null && cmd.canExecute()) {

-				executeCommand(cmd);

-				IAdaptable viewAdapter = (IAdaptable) ccr.getNewObject();

-				if (viewAdapter != null) {

-					adapters.add(viewAdapter);

-				}

-			}

-		}

-		return adapters;

-	}

-

-	/**

-	 * @generated

-	 */

-	private EditPart getEditPart(EObject domainModelElement, Domain2Notation domain2NotationMap) {

-		View view = domain2NotationMap.get(domainModelElement);

-		if (view != null) {

-			return (EditPart) getHost().getViewer().getEditPartRegistry().get(view);

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	private Diagram getDiagram() {

-		return ((View) getHost().getModel()).getDiagram();

-	}

-

-	/**

-	 * @generated

-	 */

-	private EditPart getSourceEditPart(UpdaterLinkDescriptor descriptor, Domain2Notation domain2NotationMap) {

-		return getEditPart(descriptor.getSource(), domain2NotationMap);

-	}

-

-	/**

-	 * @generated

-	 */

-	private EditPart getTargetEditPart(UpdaterLinkDescriptor descriptor, Domain2Notation domain2NotationMap) {

-		return getEditPart(descriptor.getDestination(), domain2NotationMap);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected final EditPart getHintedEditPart(EObject domainModelElement, Domain2Notation domain2NotationMap,

-			int hintVisualId) {

-		View view = domain2NotationMap.getHinted(domainModelElement, UMLVisualIDRegistry.getType(hintVisualId));

-		if (view != null) {

-			return (EditPart) getHost().getViewer().getEditPartRegistry().get(view);

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@SuppressWarnings("serial")

-	protected static class Domain2Notation extends HashMap<EObject, View> {

-

-		/**

-		 * @generated

-		 */

-		public boolean containsDomainElement(EObject domainElement) {

-			return this.containsKey(domainElement);

-		}

-

-		/**

-		 * @generated

-		 */

-		public View getHinted(EObject domainEObject, String hint) {

-			return this.get(domainEObject);

-		}

-

-		/**

-		 * @generated

-		 */

-		public void putView(EObject domainElement, View view) {

-			if (!containsKey(view.getElement())) {

-				this.put(domainElement, view);

-			}

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicy.java
deleted file mode 100644
index 8d41cd8dd5b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,587 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.DeleteCommand;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelPackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ModelItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ModelItemSemanticEditPolicy() {

-		super(UMLElementTypes.Model_3202);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		View view = (View) getHost().getModel();

-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(true);

-		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$

-		if (annotation == null) {

-			// there are indirectly referenced children, need extra commands: false

-			addDestroyChildNodesCommand(cmd);

-			addDestroyShortcutsCommand(cmd, view);

-			// delete host element

-			List<EObject> todestroy = new ArrayList<EObject>();

-			todestroy.add(req.getElementToDestroy());

-			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

-		} else {

-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

-		}

-		return getGEFWrapper(cmd.reduce());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addDestroyChildNodesCommand(ICompositeCommand cmd) {

-		View view = (View) getHost().getModel();

-		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

-			Node node = (Node) nit.next();

-			switch (UMLVisualIDRegistry.getVisualID(node)) {

-			case ModelPackageableElementCompartmentEditPart.VISUAL_ID:

-				for (Iterator<?> cit = node.getChildren().iterator(); cit.hasNext();) {

-					Node cnode = (Node) cit.next();

-					switch (UMLVisualIDRegistry.getVisualID(cnode)) {

-					case RectangleInterfaceEditPartCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case UsageEditPart.VISUAL_ID:

-							case InterfaceRealizationEditPart.VISUAL_ID:

-							case GeneralizationEditPart.VISUAL_ID:

-							case SubstitutionEditPart.VISUAL_ID:

-							case ManifestationEditPart.VISUAL_ID:

-							case ComponentRealizationEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case DependencyBranchEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case ModelEditPartCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case UsageEditPart.VISUAL_ID:

-							case SubstitutionEditPart.VISUAL_ID:

-							case ManifestationEditPart.VISUAL_ID:

-							case ComponentRealizationEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case DependencyBranchEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case PackageEditPartCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case UsageEditPart.VISUAL_ID:

-							case SubstitutionEditPart.VISUAL_ID:

-							case ManifestationEditPart.VISUAL_ID:

-							case ComponentRealizationEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case DependencyBranchEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case ComponentEditPartPCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case UsageEditPart.VISUAL_ID:

-							case GeneralizationEditPart.VISUAL_ID:

-							case SubstitutionEditPart.VISUAL_ID:

-							case ManifestationEditPart.VISUAL_ID:

-							case ComponentRealizationEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case DependencyBranchEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case CommentEditPartPCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case ConstraintEditPartPCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case UsageEditPart.VISUAL_ID:

-							case SubstitutionEditPart.VISUAL_ID:

-							case ManifestationEditPart.VISUAL_ID:

-							case ComponentRealizationEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case DependencyBranchEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case InterfaceEditPartPCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case UsageEditPart.VISUAL_ID:

-							case InterfaceRealizationEditPart.VISUAL_ID:

-							case GeneralizationEditPart.VISUAL_ID:

-							case SubstitutionEditPart.VISUAL_ID:

-							case ManifestationEditPart.VISUAL_ID:

-							case ComponentRealizationEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case DependencyBranchEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					}

-				}

-				break;

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicyCN.java
deleted file mode 100644
index b033b172a80..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,587 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.DeleteCommand;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelPackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ModelItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ModelItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Model_3077);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		View view = (View) getHost().getModel();

-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(true);

-		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$

-		if (annotation == null) {

-			// there are indirectly referenced children, need extra commands: false

-			addDestroyChildNodesCommand(cmd);

-			addDestroyShortcutsCommand(cmd, view);

-			// delete host element

-			List<EObject> todestroy = new ArrayList<EObject>();

-			todestroy.add(req.getElementToDestroy());

-			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

-		} else {

-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

-		}

-		return getGEFWrapper(cmd.reduce());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addDestroyChildNodesCommand(ICompositeCommand cmd) {

-		View view = (View) getHost().getModel();

-		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

-			Node node = (Node) nit.next();

-			switch (UMLVisualIDRegistry.getVisualID(node)) {

-			case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID:

-				for (Iterator<?> cit = node.getChildren().iterator(); cit.hasNext();) {

-					Node cnode = (Node) cit.next();

-					switch (UMLVisualIDRegistry.getVisualID(cnode)) {

-					case RectangleInterfaceEditPartCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case UsageEditPart.VISUAL_ID:

-							case InterfaceRealizationEditPart.VISUAL_ID:

-							case GeneralizationEditPart.VISUAL_ID:

-							case SubstitutionEditPart.VISUAL_ID:

-							case ManifestationEditPart.VISUAL_ID:

-							case ComponentRealizationEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case DependencyBranchEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case ModelEditPartCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case UsageEditPart.VISUAL_ID:

-							case SubstitutionEditPart.VISUAL_ID:

-							case ManifestationEditPart.VISUAL_ID:

-							case ComponentRealizationEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case DependencyBranchEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case PackageEditPartCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case UsageEditPart.VISUAL_ID:

-							case SubstitutionEditPart.VISUAL_ID:

-							case ManifestationEditPart.VISUAL_ID:

-							case ComponentRealizationEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case DependencyBranchEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case ComponentEditPartPCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case UsageEditPart.VISUAL_ID:

-							case GeneralizationEditPart.VISUAL_ID:

-							case SubstitutionEditPart.VISUAL_ID:

-							case ManifestationEditPart.VISUAL_ID:

-							case ComponentRealizationEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case DependencyBranchEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case CommentEditPartPCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case ConstraintEditPartPCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case UsageEditPart.VISUAL_ID:

-							case SubstitutionEditPart.VISUAL_ID:

-							case ManifestationEditPart.VISUAL_ID:

-							case ComponentRealizationEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case DependencyBranchEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case InterfaceEditPartPCN.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case UsageEditPart.VISUAL_ID:

-							case InterfaceRealizationEditPart.VISUAL_ID:

-							case GeneralizationEditPart.VISUAL_ID:

-							case SubstitutionEditPart.VISUAL_ID:

-							case ManifestationEditPart.VISUAL_ID:

-							case ComponentRealizationEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case DependencyBranchEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					}

-				}

-				break;

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index 5be7372ebc2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Bounds;

-import org.eclipse.gmf.runtime.notation.Location;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.Size;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ModelPackageableElementCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getPackage_PackagedElement());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getElement_OwnedComment());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getNamespace_OwnedRule());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getModelPackagedelements_7006SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case RectangleInterfaceEditPartCN.VISUAL_ID:

-		case ModelEditPartCN.VISUAL_ID:

-		case PackageEditPartCN.VISUAL_ID:

-		case ComponentEditPartPCN.VISUAL_ID:

-		case CommentEditPartPCN.VISUAL_ID:

-		case ConstraintEditPartPCN.VISUAL_ID:

-		case InterfaceEditPartPCN.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getModelPackagedelements_7006SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		HashMap<UMLNodeDescriptor, LinkedList<View>> potentialViews = new HashMap<UMLNodeDescriptor, LinkedList<View>>();

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			LinkedList<View> potentialMatch = new LinkedList<View>(); // semanticElement matches, hint does not

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					} else {

-						potentialMatch.add(childView);

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			} else if (potentialMatch.size() > 0) {

-				potentialViews.put(next, potentialMatch);

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		CompositeTransactionalCommand boundsCommand = new CompositeTransactionalCommand(host().getEditingDomain(), DiagramUIMessages.SetLocationCommand_Label_Resize);

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-			LinkedList<View> possibleMatches = potentialViews.get(next);

-			if (possibleMatches != null) {

-				// from potential matches, leave those that were not eventually used for some other NodeDescriptor (i.e. those left as orphaned)

-				possibleMatches.retainAll(knownViewChildren);

-			}

-			if (possibleMatches != null && !possibleMatches.isEmpty()) {

-				View originalView = possibleMatches.getFirst();

-				knownViewChildren.remove(originalView); // remove not to copy properties of the same view again and again

-				// add command to copy properties

-				if (originalView instanceof Node) {

-					if (((Node) originalView).getLayoutConstraint() instanceof Bounds) {

-						Bounds b = (Bounds) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Rectangle(b.getX(), b.getY(), b.getWidth(), b.getHeight())));

-					} else if (((Node) originalView).getLayoutConstraint() instanceof Location) {

-						Location l = (Location) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Point(l.getX(), l.getY())));

-					} else if (((Node) originalView).getLayoutConstraint() instanceof Size) {

-						Size s = (Size) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Dimension(s.getWidth(), s.getHeight())));

-					}

-				}

-			}

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			if (boundsCommand.canExecute()) {

-				executeCommand(new ICommandProxy(boundsCommand.reduce()));

-			}

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index 87de05440d8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Bounds;

-import org.eclipse.gmf.runtime.notation.Location;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.Size;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ModelPackageableElementCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getPackage_PackagedElement());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getElement_OwnedComment());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getNamespace_OwnedRule());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getModelPackagedelements_7007SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case RectangleInterfaceEditPartCN.VISUAL_ID:

-		case ModelEditPartCN.VISUAL_ID:

-		case PackageEditPartCN.VISUAL_ID:

-		case ComponentEditPartPCN.VISUAL_ID:

-		case CommentEditPartPCN.VISUAL_ID:

-		case ConstraintEditPartPCN.VISUAL_ID:

-		case InterfaceEditPartPCN.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getModelPackagedelements_7007SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		HashMap<UMLNodeDescriptor, LinkedList<View>> potentialViews = new HashMap<UMLNodeDescriptor, LinkedList<View>>();

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			LinkedList<View> potentialMatch = new LinkedList<View>(); // semanticElement matches, hint does not

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					} else {

-						potentialMatch.add(childView);

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			} else if (potentialMatch.size() > 0) {

-				potentialViews.put(next, potentialMatch);

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		CompositeTransactionalCommand boundsCommand = new CompositeTransactionalCommand(host().getEditingDomain(), DiagramUIMessages.SetLocationCommand_Label_Resize);

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-			LinkedList<View> possibleMatches = potentialViews.get(next);

-			if (possibleMatches != null) {

-				// from potential matches, leave those that were not eventually used for some other NodeDescriptor (i.e. those left as orphaned)

-				possibleMatches.retainAll(knownViewChildren);

-			}

-			if (possibleMatches != null && !possibleMatches.isEmpty()) {

-				View originalView = possibleMatches.getFirst();

-				knownViewChildren.remove(originalView); // remove not to copy properties of the same view again and again

-				// add command to copy properties

-				if (originalView instanceof Node) {

-					if (((Node) originalView).getLayoutConstraint() instanceof Bounds) {

-						Bounds b = (Bounds) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Rectangle(b.getX(), b.getY(), b.getWidth(), b.getHeight())));

-					} else if (((Node) originalView).getLayoutConstraint() instanceof Location) {

-						Location l = (Location) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Point(l.getX(), l.getY())));

-					} else if (((Node) originalView).getLayoutConstraint() instanceof Size) {

-						Size s = (Size) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Dimension(s.getWidth(), s.getHeight())));

-					}

-				}

-			}

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			if (boundsCommand.canExecute()) {

-				executeCommand(new ICommandProxy(boundsCommand.reduce()));

-			}

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index df6894fef17..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ModelPackageableElementCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ModelPackageableElementCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Model_3202);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Interface_3078 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Model_3077 == requestElementType) {

-

-			return getGEFWrapper(new ModelCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Package_3076 == requestElementType) {

-

-			return getGEFWrapper(new PackageCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3071 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3074 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3075 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3072 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 6477afc7bc9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ModelPackageableElementCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ModelPackageableElementCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Model_3077);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Interface_3078 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Model_3077 == requestElementType) {

-

-			return getGEFWrapper(new ModelCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Package_3076 == requestElementType) {

-

-			return getGEFWrapper(new PackageCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3071 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3074 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3075 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3072 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/OperationForInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/OperationForInterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index ec124f84e05..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/OperationForInterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.DeleteCommand;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class OperationForInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public OperationForInterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Operation_5);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		View view = (View) getHost().getModel();

-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(true);

-		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$

-		if (annotation == null) {

-			// there are indirectly referenced children, need extra commands: false

-			addDestroyShortcutsCommand(cmd, view);

-			// delete host element

-			List<EObject> todestroy = new ArrayList<EObject>();

-			todestroy.add(req.getElementToDestroy());

-			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

-		} else {

-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

-		}

-		return getGEFWrapper(cmd.reduce());

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicy.java
deleted file mode 100644
index cfdd5edd96e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PackageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PackageItemSemanticEditPolicy() {

-		super(UMLElementTypes.Package_3200);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicyCN.java
deleted file mode 100644
index c78437eb405..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PackageItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PackageItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Package_3076);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java
deleted file mode 100644
index ccade8f2334..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Bounds;

-import org.eclipse.gmf.runtime.notation.Location;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.Size;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PackagePackageableElementCompartmentCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getPackage_PackagedElement());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getElement_OwnedComment());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getNamespace_OwnedRule());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getPackagePackagedelements_7002SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case RectangleInterfaceEditPartCN.VISUAL_ID:

-		case CommentEditPartPCN.VISUAL_ID:

-		case ConstraintEditPartPCN.VISUAL_ID:

-		case ComponentEditPartPCN.VISUAL_ID:

-		case ModelEditPartCN.VISUAL_ID:

-		case PackageEditPartCN.VISUAL_ID:

-		case InterfaceEditPartPCN.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getPackagePackagedelements_7002SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		HashMap<UMLNodeDescriptor, LinkedList<View>> potentialViews = new HashMap<UMLNodeDescriptor, LinkedList<View>>();

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			LinkedList<View> potentialMatch = new LinkedList<View>(); // semanticElement matches, hint does not

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					} else {

-						potentialMatch.add(childView);

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			} else if (potentialMatch.size() > 0) {

-				potentialViews.put(next, potentialMatch);

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		CompositeTransactionalCommand boundsCommand = new CompositeTransactionalCommand(host().getEditingDomain(), DiagramUIMessages.SetLocationCommand_Label_Resize);

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-			LinkedList<View> possibleMatches = potentialViews.get(next);

-			if (possibleMatches != null) {

-				// from potential matches, leave those that were not eventually used for some other NodeDescriptor (i.e. those left as orphaned)

-				possibleMatches.retainAll(knownViewChildren);

-			}

-			if (possibleMatches != null && !possibleMatches.isEmpty()) {

-				View originalView = possibleMatches.getFirst();

-				knownViewChildren.remove(originalView); // remove not to copy properties of the same view again and again

-				// add command to copy properties

-				if (originalView instanceof Node) {

-					if (((Node) originalView).getLayoutConstraint() instanceof Bounds) {

-						Bounds b = (Bounds) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Rectangle(b.getX(), b.getY(), b.getWidth(), b.getHeight())));

-					} else if (((Node) originalView).getLayoutConstraint() instanceof Location) {

-						Location l = (Location) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Point(l.getX(), l.getY())));

-					} else if (((Node) originalView).getLayoutConstraint() instanceof Size) {

-						Size s = (Size) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Dimension(s.getWidth(), s.getHeight())));

-					}

-				}

-			}

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			if (boundsCommand.canExecute()) {

-				executeCommand(new ICommandProxy(boundsCommand.reduce()));

-			}

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java
deleted file mode 100644
index 57a077d5074..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Bounds;

-import org.eclipse.gmf.runtime.notation.Location;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.Size;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PackagePackageableElementCompartmentCanonicalEditPolicyCN extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Set<EStructuralFeature> getFeaturesToSynchronize() {

-		if (myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getPackage_PackagedElement());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getElement_OwnedComment());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getNamespace_OwnedRule());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getPackagePackagedelements_7005SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		switch (visualID) {

-		case RectangleInterfaceEditPartCN.VISUAL_ID:

-		case ModelEditPartCN.VISUAL_ID:

-		case PackageEditPartCN.VISUAL_ID:

-		case ComponentEditPartPCN.VISUAL_ID:

-		case CommentEditPartPCN.VISUAL_ID:

-		case ConstraintEditPartPCN.VISUAL_ID:

-		case InterfaceEditPartPCN.VISUAL_ID:

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getPackagePackagedelements_7005SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		HashMap<UMLNodeDescriptor, LinkedList<View>> potentialViews = new HashMap<UMLNodeDescriptor, LinkedList<View>>();

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			LinkedList<View> potentialMatch = new LinkedList<View>(); // semanticElement matches, hint does not

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					} else {

-						potentialMatch.add(childView);

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			} else if (potentialMatch.size() > 0) {

-				potentialViews.put(next, potentialMatch);

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		CompositeTransactionalCommand boundsCommand = new CompositeTransactionalCommand(host().getEditingDomain(), DiagramUIMessages.SetLocationCommand_Label_Resize);

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-			LinkedList<View> possibleMatches = potentialViews.get(next);

-			if (possibleMatches != null) {

-				// from potential matches, leave those that were not eventually used for some other NodeDescriptor (i.e. those left as orphaned)

-				possibleMatches.retainAll(knownViewChildren);

-			}

-			if (possibleMatches != null && !possibleMatches.isEmpty()) {

-				View originalView = possibleMatches.getFirst();

-				knownViewChildren.remove(originalView); // remove not to copy properties of the same view again and again

-				// add command to copy properties

-				if (originalView instanceof Node) {

-					if (((Node) originalView).getLayoutConstraint() instanceof Bounds) {

-						Bounds b = (Bounds) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Rectangle(b.getX(), b.getY(), b.getWidth(), b.getHeight())));

-					} else if (((Node) originalView).getLayoutConstraint() instanceof Location) {

-						Location l = (Location) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Point(l.getX(), l.getY())));

-					} else if (((Node) originalView).getLayoutConstraint() instanceof Size) {

-						Size s = (Size) ((Node) originalView).getLayoutConstraint();

-						boundsCommand.add(new SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new Dimension(s.getWidth(), s.getHeight())));

-					}

-				}

-			}

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			if (boundsCommand.canExecute()) {

-				executeCommand(new ICommandProxy(boundsCommand.reduce()));

-			}

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 779528f28f6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PackagePackageableElementCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PackagePackageableElementCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Package_3200);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Interface_3078 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3074 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3075 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3071 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Model_3077 == requestElementType) {

-

-			return getGEFWrapper(new ModelCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Package_3076 == requestElementType) {

-

-			return getGEFWrapper(new PackageCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3072 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index f9febb04db3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceCreateCommandPCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PackagePackageableElementCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PackagePackageableElementCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Package_3076);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Interface_3078 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Model_3077 == requestElementType) {

-

-			return getGEFWrapper(new ModelCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Package_3076 == requestElementType) {

-

-			return getGEFWrapper(new PackageCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3071 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3074 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3075 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3072 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandPCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyCanonicalEditPolicy.java
deleted file mode 100644
index 45e0445166f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyCanonicalEditPolicy.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PropertyCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for (int i = 0; i < c.size(); i++) {

-			((EditPart) c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		View viewObject = (View) getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.INSTANCE

-				.getProperty_3079SemanticChildren(viewObject);

-		for (UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		return PortEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshSemantic() {

-		if (resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors =

-				UMLDiagramUpdater.INSTANCE

-						.getProperty_3079SemanticChildren((View) getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for (View v : getViewChildren()) {

-			if (isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for (Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for (View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if (next.getModelElement().equals(semanticElement)) {

-					if (hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if (perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for (UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if (cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>) request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if (changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if (createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyForInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyForInterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 1e0a8246adc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyForInterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PropertyForInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PropertyForInterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Property_1);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ReceptionInInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ReceptionInInterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 9646828861b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ReceptionInInterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.DeleteCommand;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ReceptionInInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ReceptionInInterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Reception_6);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		View view = (View) getHost().getModel();

-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(true);

-		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$

-		if (annotation == null) {

-			// there are indirectly referenced children, need extra commands: false

-			addDestroyShortcutsCommand(cmd, view);

-			// delete host element

-			List<EObject> todestroy = new ArrayList<EObject>();

-			todestroy.add(req.getElementToDestroy());

-			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

-		} else {

-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

-		}

-		return getGEFWrapper(cmd.reduce());

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/RectangleInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/RectangleInterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 10f2829cb4d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/RectangleInterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.DeleteCommand;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class RectangleInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public RectangleInterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interface_3205);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		View view = (View) getHost().getModel();

-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(true);

-		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$

-		if (annotation == null) {

-			// there are indirectly referenced children, need extra commands: false

-			addDestroyChildNodesCommand(cmd);

-			addDestroyShortcutsCommand(cmd, view);

-			// delete host element

-			List<EObject> todestroy = new ArrayList<EObject>();

-			todestroy.add(req.getElementToDestroy());

-			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

-		} else {

-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

-		}

-		return getGEFWrapper(cmd.reduce());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addDestroyChildNodesCommand(ICompositeCommand cmd) {

-		View view = (View) getHost().getModel();

-		for (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

-			Node node = (Node) nit.next();

-			switch (UMLVisualIDRegistry.getVisualID(node)) {

-			case InterfaceAttributeCompartmentEditPart.VISUAL_ID:

-				for (Iterator<?> cit = node.getChildren().iterator(); cit.hasNext();) {

-					Node cnode = (Node) cit.next();

-					switch (UMLVisualIDRegistry.getVisualID(cnode)) {

-					case PropertyForInterfaceEditPart.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getSourceEdges().iterator(); it.hasNext();) {

-							Edge outgoingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-							}

-						}

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					}

-				}

-				break;

-			case InterfaceOperationCompartmentEditPart.VISUAL_ID:

-				for (Iterator<?> cit = node.getChildren().iterator(); cit.hasNext();) {

-					Node cnode = (Node) cit.next();

-					switch (UMLVisualIDRegistry.getVisualID(cnode)) {

-					case OperationForInterfaceEditPart.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getSourceEdges().iterator(); it.hasNext();) {

-							Edge outgoingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-							}

-						}

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case ReceptionInInterfaceEditPart.VISUAL_ID:

-

-

-

-

-

-						for (Iterator<?> it = cnode.getSourceEdges().iterator(); it.hasNext();) {

-							Edge outgoingLink = (Edge) it.next();

-							switch (UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-							}

-						}

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					}

-				}

-				break;

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/SubstitutionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/SubstitutionItemSemanticEditPolicy.java
deleted file mode 100644
index 541f7f3905d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/SubstitutionItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.DeleteCommand;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SubstitutionItemSemanticEditPolicy() {

-		super(UMLElementTypes.Substitution_4012);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(true);

-		List<EObject> todestroy = new ArrayList<EObject>();

-		todestroy.add(req.getElementToDestroy());

-		// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

-		return getGEFWrapper(cmd.reduce());

-		// return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java
index ccd620704ad..10affa686a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -47,7 +47,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.uml.diagram.component.expressions.UMLOCLFactory;

@@ -243,8 +242,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	 */

 	protected Command getCreateCommand(CreateElementRequest req) {

 		IElementType requestElementType = req.getElementType();

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			// try to get a semantic create command from the extended type

+		if (requestElementType instanceof IElementType) {

 			IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(req.getContainer());

 			if (commandProvider != null) {

 				ICommand command = commandProvider.getEditCommand(req);

@@ -256,12 +254,10 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		return null;

 	}

 

-	// RS: add code for extended types

 	/**

 	 * @generated

 	 */

-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request,

-			IExtendedHintedElementType requestElementType) {

+	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) {

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());

 		if (provider == null) {

 			return UnexecutableCommand.INSTANCE;

@@ -274,8 +270,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	/**

 	 * @generated

 	 */

-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request,

-			IExtendedHintedElementType requestElementType) {

+	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request, IElementType requestElementType) {

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);

 		if (provider == null) {

 			return UnexecutableCommand.INSTANCE;

@@ -288,8 +283,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	/**

 	 * @generated

 	 */

-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request,

-			IExtendedHintedElementType requestElementType) {

+	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request, IElementType requestElementType) {

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);

 		if (provider == null) {

 			return UnexecutableCommand.INSTANCE;

@@ -373,7 +367,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	 * @generated

 	 */

 	protected final Command getGEFWrapper(ICommand cmd) {

-		return new ICommandProxy(cmd);

+		return (cmd == null) ? UnexecutableCommand.INSTANCE : new ICommandProxy(cmd);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UsageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UsageItemSemanticEditPolicy.java
deleted file mode 100644
index 15c6889ead5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UsageItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public UsageItemSemanticEditPolicy() {

-		super(UMLElementTypes.Usage_4001);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.Usage_4001 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.Substitution_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4014 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4013 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyBranchCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case UsageEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case DependencyBranchEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java
index 30e0574d8c4..c1e38d58995 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java
@@ -469,7 +469,17 @@ public class UMLElementTypes {
 			KNOWN_ELEMENT_TYPES.add(Link_4018);

 			KNOWN_ELEMENT_TYPES.add(Connector_4019);

 		}

-		return KNOWN_ELEMENT_TYPES.contains(elementType);

+

+		boolean result = KNOWN_ELEMENT_TYPES.contains(elementType);

+

+		if (!result) {

+			IElementType[] supertypes = elementType.getAllSuperTypes();

+			for (int i = 0; !result && (i < supertypes.length); i++) {

+				result = KNOWN_ELEMENT_TYPES.contains(supertypes[i]);

+			}

+		}

+

+		return result;

 	}

 

 	/**

@@ -584,4 +594,20 @@ public class UMLElementTypes {
 			return org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes.getElement(elementTypeAdapter);

 		}

 	};

+

+	/**

+	 * @generated

+	 */

+	public static boolean isKindOf(IElementType subtype, IElementType supertype) {

+		boolean result = subtype == supertype;

+

+		if (!result) {

+			IElementType[] supertypes = subtype.getAllSuperTypes();

+			for (int i = 0; !result && (i < supertypes.length); i++) {

+				result = supertype == supertypes[i];

+			}

+		}

+

+		return result;

+	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
index fc7a6e9cc63..7b017ce8420 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
@@ -244,24 +244,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		} else {

 			visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());

 			if (elementType != null) {

-				if (elementType instanceof IExtendedHintedElementType) {

-					if (domainElement != null) {

-						if (!UMLVisualIDRegistry.checkNodeVisualID(op.getContainerView(), domainElement, visualID)) {

-							return false;

-						}

-					}

-				} else {

-					if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {

-						return false; // foreign element type

-					}

+

+				if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {

+					return false; // foreign element type

 				}

+

 				String elementTypeHint = ((IHintedType) elementType).getSemanticHint();

 				if (!op.getSemanticHint().equals(elementTypeHint)) {

 					return false; // if semantic hint is specified it should be the same as in element type

 				}

-				if (domainElement != null && visualID != UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) {

-					return false; // visual id for node EClass should match visual id from element type

-				}

+				// if (domainElement != null && visualID != org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) {

+				// return false; // visual id for node EClass should match visual id from element type

+				// }

 			} else {

 				if (!ComponentDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) {

 					return false; // foreign diagram

@@ -298,13 +292,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				}

 			}

 		}

-		return DependencyNodeEditPart.VISUAL_ID == visualID || ComponentEditPart.VISUAL_ID == visualID || ModelEditPart.VISUAL_ID == visualID || PackageEditPart.VISUAL_ID == visualID || RectangleInterfaceEditPart.VISUAL_ID == visualID

-				|| CommentEditPart.VISUAL_ID == visualID || ConstraintEditPart.VISUAL_ID == visualID || DefaultNamedElementEditPart.VISUAL_ID == visualID || InterfaceEditPart.VISUAL_ID == visualID || PortEditPart.VISUAL_ID == visualID

-				|| ModelEditPartCN.VISUAL_ID == visualID || PackageEditPartCN.VISUAL_ID == visualID || RectangleInterfaceEditPartCN.VISUAL_ID == visualID || ComponentEditPartCN.VISUAL_ID == visualID || ComponentEditPartPCN.VISUAL_ID == visualID

-				|| CommentEditPartPCN.VISUAL_ID == visualID || ConstraintEditPartPCN.VISUAL_ID == visualID || PropertyForInterfaceEditPart.VISUAL_ID == visualID || OperationForInterfaceEditPart.VISUAL_ID == visualID

-				|| ReceptionInInterfaceEditPart.VISUAL_ID == visualID || InterfaceEditPartPCN.VISUAL_ID == visualID || PropertyPartEditPartCN.VISUAL_ID == visualID;

-

 

+		return UMLVisualIDRegistry.canCreateNode(op.getContainerView(), visualID);

 	}

 

 	/**

@@ -331,11 +320,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		if (elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {

 			return false; // our hint is visual id and must be specified, and it should be the same as in element type

 		}

-		int visualID = UMLVisualIDRegistry.getVisualID(elementTypeHint);

-		EObject domainElement = getSemanticElement(op.getSemanticAdapter());

-		if (domainElement != null && visualID != UMLVisualIDRegistry.getLinkWithClassVisualID(domainElement)) {

-			return false; // visual id for link EClass should match visual id from element type

-		}

+		// int visualID = org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry.getVisualID(elementTypeHint);

+		// org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter());

+		// if (domainElement != null && visualID != org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry.getLinkWithClassVisualID(domainElement)) {

+		// return false; // visual id for link EClass should match visual id from element type

+		// }

 		return true;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
index f8a7c32fc0e..dee4ef9cf83 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Export-Package: org.eclipse.papyrus.uml.diagram.composite,
  org.eclipse.papyrus.uml.diagram.composite.custom.helper,

  org.eclipse.papyrus.uml.diagram.composite.custom.locators,

  org.eclipse.papyrus.uml.diagram.composite.custom.parts,

- org.eclipse.papyrus.uml.diagram.composite.edit.commands,

  org.eclipse.papyrus.uml.diagram.composite.edit.helpers,

  org.eclipse.papyrus.uml.diagram.composite.edit.parts,

  org.eclipse.papyrus.uml.diagram.composite.edit.policies,

@@ -20,7 +19,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Require-Bundle: org.eclipse.emf.ecore,

  org.eclipse.core.runtime,

  org.eclipse.core.resources,

@@ -72,7 +71,8 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",

  org.eclipse.papyrus.views.properties;bundle-version="1.1.0",

  org.eclipse.papyrus.uml.diagram.synchronizeview;bundle-version="1.1.0",

- org.eclipse.core.databinding.observable

+ org.eclipse.core.databinding.observable,

+ org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.1.0.qualifier

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/build.properties
index c8d2b6f59e3..fa38cf7f5b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/build.properties
@@ -1,7 +1,15 @@
 #

 #Mon Sep 12 09:29:45 CEST 2011

 output..=bin/

-bin.includes=.,icons/,META-INF/,plugin.xml,plugin.properties,messages.properties,.options,about.html

+bin.includes = .,\

+               icons/,\

+               META-INF/,\

+               plugin.xml,\

+               plugin.properties,\

+               messages.properties,\

+               .options,\

+               about.html,\

+               model/

 jars.compile.order=.

 src.includes = about.html

 source..=src/,custom-src/

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CustomConnectorCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CustomConnectorCreateCommand.java
deleted file mode 100644
index 11371849af3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CustomConnectorCreateCommand.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009-2011 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.command;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.messages.Messages;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.ConnectableElement;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * <pre>
- * This class is a custom creation command for Connector.
- *
- * Difficulties for Connector creation:
- * - differences between semantic (ConnectableEnd) graphical (ConnectableElement) ends of Connector
- * - requires to know not only the graphical end (Port, Property) but also the graphical parent in case of Port.
- *
- * The Connector source and target are declared as ConnectorEnd in the GMFGEN model to ensure correct validation,
- * but the real source and target are ConnectableElement.
- *
- * </pre>
- */
-public class CustomConnectorCreateCommand extends org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConnectorCreateCommand {
-	/** Graphical parent of Source **/
-	protected Property sourcePartWithPort = null;
-	/** Graphical parent of Target **/
-	protected Property targetPartWithPort = null;
-	/** Graphical EditPart of Source **/
-	protected GraphicalEditPart sourceGraphicalEditPart = null;
-	/** Graphical EditPart of Target **/
-	protected GraphicalEditPart targetGraphicalEditPart = null;
-
-	/**
-	 * Constructor of Connector custom creation command
-	 *
-	 * @param req
-	 *            the creation request
-	 * @param source
-	 *            the connector source element
-	 * @param target
-	 *            the connector target element
-	 */
-	public CustomConnectorCreateCommand(CreateRelationshipRequest req, EObject source, EObject target) {
-		super(req, source, target);
-		// Resolve graphical parents of source and target store in request as Parameters
-		// These parameters are added in request by (custom) GraphicalNodeEditPolicy
-		if (req.getParameter(CustomGraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_SOURCE_PARENT) instanceof Property) {
-			sourcePartWithPort = (Property) req.getParameter(CustomGraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_SOURCE_PARENT);
-		}
-		if (req.getParameter(CustomGraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_TARGET_PARENT) instanceof Property) {
-			targetPartWithPort = (Property) req.getParameter(CustomGraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_TARGET_PARENT);
-		}
-		if (req.getParameter(CustomGraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_SOURCE_GRAPHICAL) instanceof GraphicalEditPart) {
-			sourceGraphicalEditPart = (GraphicalEditPart) req.getParameter(CustomGraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_SOURCE_GRAPHICAL);
-		}
-		if (req.getParameter(CustomGraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_TARGET_GRAPHICAL) instanceof GraphicalEditPart) {
-			targetGraphicalEditPart = (GraphicalEditPart) req.getParameter(CustomGraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_TARGET_GRAPHICAL);
-		}
-		container = deduceContainer(_getSource(), _getTarget());
-	}
-
-	/**
-	 * Replaces the original getter which is cast as ConnectorEnd (expected end of Connector)
-	 *
-	 * @return the element that is graphically connected to Connector as source
-	 */
-	protected ConnectableElement _getSource() {
-		return (ConnectableElement) source;
-	}
-
-	/**
-	 * Replaces the original getter which is cast as ConnectorEnd (expected end of Connector)
-	 *
-	 * @return the element that is graphically connected to Connector as target
-	 */
-	protected ConnectableElement _getTarget() {
-		return (ConnectableElement) target;
-	}
-
-	/**
-	 * <pre>
-	 * Checks if the Connector can be created or not.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	public boolean canExecute() {
-		if ((source == null) && (target == null)) {
-			return false;
-		}
-		if ((source != null) && !(source instanceof ConnectableElement)) {
-			return false;
-		}
-		if ((target != null) && !(target instanceof ConnectableElement)) {
-			return false;
-		}
-		if (source == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		if ((target != null) && (getContainer() == null)) {
-			return false;
-		}
-		// return
-		// UMLBaseItemSemanticEditPolicy.LinkConstraints.canCreateConnector_4013(getContainer(),
-		// _getSource(),
-		// _getTarget());
-		// this returns true anyway...
-		return true;
-	}
-
-	/**
-	 * <pre>
-	 * Creates the new Connector.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException(Messages.ConnectorCreateCommand_INVALID_ARGS_MSG);
-		}
-		Connector newElement = UMLFactory.eINSTANCE.createConnector();
-		getContainer().getOwnedConnectors().add(newElement);
-		ConnectorEnd end0 = UMLFactory.eINSTANCE.createConnectorEnd();
-		end0.setLower(1);
-		end0.setUpper(1);
-		if (_getSource() instanceof Port) {
-			end0.setRole(_getSource());
-			end0.setPartWithPort(sourcePartWithPort);
-		} else if (_getSource() instanceof ConnectableElement) {
-			end0.setRole(_getSource());
-		} else {
-			throw new ExecutionException(Messages.ConnectorCreateCommand_INVALID_SOURCE_MSG);
-		}
-		ConnectorEnd end1 = UMLFactory.eINSTANCE.createConnectorEnd();
-		end1.setLower(1);
-		end1.setUpper(1);
-		if (_getTarget() instanceof Port) {
-			end1.setRole(_getTarget());
-			end1.setPartWithPort(targetPartWithPort);
-		} else if (_getTarget() instanceof ConnectableElement) {
-			end1.setRole(_getTarget());
-		} else {
-			throw new ExecutionException(Messages.ConnectorCreateCommand_INVALID_TARGET_MSG);
-		}
-		newElement.getEnds().add(end0);
-		newElement.getEnds().add(end1);
-		ElementInitializers.getInstance().init_Connector_4013(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * <pre>
-	 * This method is the exact copy of the inherited method, except that it uses the local getters
-	 * (_getSource(), _getTarget()).
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected void doConfigure(Connector newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, _getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, _getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 *
-	 * Tries to find a common StructuredClassifier container to add the new Connector.
-	 *
-	 * @see org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConnectorCreateCommand#deduceContainer(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject)
-	 *
-	 * @param source
-	 *            the source object
-	 * @param target
-	 *            the target object
-	 * @return a common StructuredClassifier container (graphical search)
-	 */
-	@Override
-	protected StructuredClassifier deduceContainer(EObject source, EObject target) {
-		if (sourceGraphicalEditPart != null && targetGraphicalEditPart != null) {
-			StructuredClassifier containerProposedBySource = proposedContainer(sourceGraphicalEditPart);
-			StructuredClassifier containerProposedByTarget = proposedContainer(targetGraphicalEditPart);
-			StructuredClassifier deducedContainer = null;
-			if ((containerProposedBySource != null) && (containerProposedByTarget != null)) {
-				if (containerProposedBySource == containerProposedByTarget) {
-					deducedContainer = containerProposedBySource;
-				}
-			}
-			return deducedContainer;
-		}
-		return null;
-	}
-
-	/**
-	 * Parse graphical parent of the graphicalEditPart until a StructureClassifier is found.
-	 *
-	 * @param graphicalEditPart
-	 *            the graphical edit part
-	 * @return null or a StructuredClassifier that graphically contains the graphicalEditPart
-	 */
-	private StructuredClassifier proposedContainer(GraphicalEditPart graphicalEditPart) {
-		for (EditPart ep = graphicalEditPart; ep != null; ep = ep.getParent()) {
-			if (ep instanceof GraphicalEditPart) {
-				GraphicalEditPart parent = (GraphicalEditPart) ep;
-				EObject semanticParent = parent.resolveSemanticElement();
-				if (semanticParent instanceof StructuredClassifier) {
-					return (StructuredClassifier) semanticParent;
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CustomPortCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CustomPortCreateCommand.java
deleted file mode 100644
index a57d8079e7b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CustomPortCreateCommand.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009-2011 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.command;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * Port creation command used to create Port on a Property (no direct containment link between
- * Property and Port).
- *
- */
-public class CustomPortCreateCommand extends org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand {
-
-	/** Constructor **/
-	public CustomPortCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req, diagram);
-	}
-
-	/**
-	 * <pre>
-	 * Checks if the Port can be created on the Property.
-	 * The Property must be typed by a StructuredClassifier (in other words, an element that
-	 * can own Port). The new Port is owned be the type of the Property.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	public boolean canExecute() {
-		Property target = (Property) getElementToEdit();
-
-		if ((target.getType() != null) && (target.getType() instanceof StructuredClassifier)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * <pre>
-	 * Custom creation of the Port :
-	 * - resolve the Property type
-	 * - add a new Port on this type.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Port newElement = UMLFactory.eINSTANCE.createPort();
-
-		StructuredClassifier owner = (StructuredClassifier) ((Property) getElementToEdit()).getType();
-		owner.getOwnedAttributes().add(newElement);
-
-		ElementInitializers.getInstance().init_Port_3069(newElement);
-
-		doConfigure(newElement, monitor, info);
-
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CustomRoleBindingCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CustomRoleBindingCreateCommand.java
deleted file mode 100644
index 44b7f7d95b3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CustomRoleBindingCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009, 2014 CEA LIST and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *  Christian W. Damus (CEA) - bug 410346
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.command;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.uml.diagram.composite.custom.messages.Messages;
-import org.eclipse.papyrus.uml.diagram.composite.custom.ui.CollaborationRoleTreeContentProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.uml2.uml.CollaborationUse;
-import org.eclipse.uml2.uml.ConnectableElement;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * <pre>
- * This class provides a custom creation command for RoleBinding between {@link CollaborationUse} and
- * {@link ConnectableElement}.
- * </pre>
- */
-public class CustomRoleBindingCreateCommand extends org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand {
-
-	/**
-	 * Constructor
-	 *
-	 * @param request
-	 *            the relationship creation request
-	 * @param source
-	 *            element used as source of the new relationship
-	 * @param target
-	 *            element used as target of the new relationship
-	 */
-	public CustomRoleBindingCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request, source, target);
-	}
-
-	/**
-	 * <pre>
-	 *  The method executes the creation :
-	 *  - opens a selection dialog to choose a {@link ConnectableElement} reference as a role by the {@link CollaborationUse} type
-	 *  - created a dependency between the selected role and the {@link ConnectableElement} that will be bind to it
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
-
-		if (!canExecute()) {
-			throw new ExecutionException(Messages.RoleBindingCreateCommand_INVALID_ARGS_MSG);
-		}
-
-		// Retrieve the graphical source of the binding.
-		// This differs from the semantic source of the binding which is a role of the
-		// CollaborationUse type.
-		CollaborationUse graphicalSource = (CollaborationUse) getSource();
-
-		// Create and open the selection dialog
-		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-		Shell currentShell = new Shell(Display.getCurrent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(currentShell, new AdapterFactoryLabelProvider(adapterFactory), new CollaborationRoleTreeContentProvider());
-
-		try {
-			// Set dialog parameters
-			dialog.setTitle(Messages.RoleBindingRoleSelectionDialog_Title);
-			dialog.setMessage(Messages.RoleBindingRoleSelectionDialog_Message);
-			dialog.setAllowMultiple(false);
-			dialog.setHelpAvailable(false);
-			// The source CollaborationUse is set as input for the selection dialog,
-			// the CollaborationRoleTreeContentProvider provides the roles that can possibly be
-			// selected.
-			dialog.setInput(graphicalSource);
-
-			dialog.open();
-		} finally {
-			adapterFactory.dispose();
-		}
-
-		// If a ConnectableElement has been selected, complete command execution
-		// using selection as the "newly created" element and make the edited
-		// Collaboration reference it in the CollaborationRoles eReference.
-		if (dialog.getReturnCode() == Window.OK) {
-
-			ConnectableElement roleToBind = (ConnectableElement) dialog.getFirstResult();
-			// Create a Dependency (the binding) between selected role and a ConnectableElement
-			// (the target)
-			Dependency newBinding = UMLFactory.eINSTANCE.createDependency();
-			getContainer().getPackagedElements().add(newBinding);
-			newBinding.getClients().add(roleToBind);
-			newBinding.setName("binding_" + roleToBind.getName() + "_" + getTarget().getName());
-			newBinding.getSuppliers().add(getTarget());
-			graphicalSource.getRoleBindings().add(newBinding);
-
-			doConfigure(newBinding, monitor, info);
-
-			((CreateElementRequest) getRequest()).setNewElement(newBinding);
-
-			return CommandResult.newOKCommandResult(newBinding);
-		}
-
-		// No role selected: abort element creation
-		return CommandResult.newCancelledCommandResult();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/PropertyPartCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/PropertyPartCreateCommand.java
deleted file mode 100644
index 89e7ffdc142..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/PropertyPartCreateCommand.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009-2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.command;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.StructuredClassifier;

-import org.eclipse.uml2.uml.UMLFactory;

-

-public class PropertyPartCreateCommand extends org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN {

-

-	/** Constructor **/

-	public PropertyPartCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req, diagram);

-	}

-

-	/**

-	 * <pre>

-	 * Checks if the Property can be created on the Property (means appearing graphically on the property).

-	 * The Property must be typed by a StructuredClassifier (in other words, an element that

-	 * can own Property). The new Property is owned be the type of the Property.

-	 *

-	 * {@inheritDoc}

-	 * </pre>

-	 */

-	@Override

-	public boolean canExecute() {

-		Property target = (Property) getElementToEdit();

-

-		if ((target.getType() != null) && (target.getType() instanceof StructuredClassifier)) {

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * <pre>

-	 * Custom creation of the Property type :

-	 * - resolve the Property type

-	 * - add a new Property on this type.

-	 *

-	 * {@inheritDoc}

-	 * </pre>

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Property newElement = UMLFactory.eINSTANCE.createProperty();

-

-		StructuredClassifier owner = (StructuredClassifier) ((Property) getElementToEdit()).getType();

-		owner.getOwnedAttributes().add(newElement);

-

-		ElementInitializers.getInstance().init_Property_3070(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CollaborationRoleItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CollaborationRoleItemSemanticEditPolicy.java
index f864a17c62a..9660fba892d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CollaborationRoleItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CollaborationRoleItemSemanticEditPolicy.java
@@ -20,9 +20,9 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationRoleItemSemanticEditPolicyCN;

 import org.eclipse.uml2.uml.Collaboration;

 import org.eclipse.uml2.uml.UMLPackage;

 

@@ -32,7 +32,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * generated for the CollaborationUse element (when used in CompositeStructure Diagram)

  * </pre>

  */

-public class CollaborationRoleItemSemanticEditPolicy extends CollaborationRoleItemSemanticEditPolicyCN {

+public class CollaborationRoleItemSemanticEditPolicy extends DefaultSemanticEditPolicy {

 

 	/**

 	 * <pre>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomCollaborationCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomCollaborationCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 1c4c9ef407f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomCollaborationCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009-2011 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.command.CollaborationRoleCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * <pre>
- * This class provides a custom edit policy used to replace the SEMANTIC_ROLE
- * generated for the Collaboration element (when used in CompositeStructure Diagram)
- * </pre>
- */
-public class CustomCollaborationCompositeCompartmentItemSemanticEditPolicy extends org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationCompositeCompartmentItemSemanticEditPolicy {
-
-	/**
-	 * <pre>
-	 * Calls a custom creation command to allow the correct creation of a
-	 * role on the Collaboration.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-		if (UMLElementTypes.ConnectableElement_3115 == req.getElementType()) {
-			return getGEFWrapper(new CollaborationRoleCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomCollaborationUseItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomCollaborationUseItemSemanticEditPolicyCN.java
deleted file mode 100644
index b91e95a8400..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomCollaborationUseItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009-2011 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.command.CustomRoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * <pre>
- * This class provides a custom edit policy used to replace the SEMANTIC_ROLE
- * generated for the CollaborationUse element (when used in CompositeStructure Diagram)
- * </pre>
- */
-public class CustomCollaborationUseItemSemanticEditPolicyCN extends org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationUseItemSemanticEditPolicyCN {
-
-	/**
-	 * <pre>
-	 * Calls a custom creation command to allow the creation of a RoleBinding linked
-	 * to a ConnectableElement.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {
-		if (UMLElementTypes.Dependency_4017 == req.getElementType()) {
-			return getGEFWrapper(new CustomRoleBindingCreateCommand(req, req.getSource(), req.getTarget()));
-		}
-		return super.getStartCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * <pre>
-	 * Calls a custom creation command to allow the creation of a RoleBinding linked
-	 * to a ConnectableElement.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {
-		if (UMLElementTypes.Dependency_4017 == req.getElementType()) {
-			return getGEFWrapper(new CustomRoleBindingCreateCommand(req, req.getSource(), req.getTarget()));
-		}
-		return super.getCompleteCreateRelationshipCommand(req);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomGraphicalNodeEditPolicy.java
deleted file mode 100644
index 54a8848524a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomGraphicalNodeEditPolicy.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009-2011 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SemanticCreateCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.command.CustomInformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * <pre>
- * This class provides a custom edit policy used to replace the GRAPHICAL_NODE_ROLE
- * for the Port and Property elements (when used in CompositeStructure Diagram).
- *
- * The reason for this is that the creation of Connector requires not only to know
- * the ConnectableElement(s) on both end (given in CreateRelationshipRequest
- * Source and Target), but also the Property graphically owning the Port used at
- * ConnectorEnd.
- * </pre>
- */
-public class CustomGraphicalNodeEditPolicy extends org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy {
-
-	/**
-	 * The ID for the additional parameter SOURCE_PARENT used in creation request
-	 */
-	public static final String CONNECTOR_CREATE_REQUEST_SOURCE_PARENT = "SOURCE_PARENT"; //$NON-NLS-1$
-
-	/**
-	 * The ID for the additional parameter TARGET_PARENT used in creation request
-	 */
-	public static final String CONNECTOR_CREATE_REQUEST_TARGET_PARENT = "TARGET_PARENT"; //$NON-NLS-1$
-
-	/**
-	 * The ID for the additional parameter SOURCE_GRAPHICAL used in creation request
-	 */
-	public static final String CONNECTOR_CREATE_REQUEST_SOURCE_GRAPHICAL = "SOURCE_GRAPHICAL"; //$NON-NLS-1$
-
-	/**
-	 * The ID for the additional parameter TARGET_GRAPHICAL used in creation request
-	 */
-	public static final String CONNECTOR_CREATE_REQUEST_TARGET_GRAPHICAL = "TARGET_GRAPHICAL"; //$NON-NLS-1$
-
-	/**
-	 * <pre>
-	 * This method is overridden in order to add information (graphical parent of Port)
-	 * in the CreationRelationshipRequest.
-	 *
-	 * These information is stored in the request as Parameters under the following keys:
-	 * - &quot;SOURCE_PARENT&quot; : UML Element used as Graphical parent of the source Port (end of Connector)
-	 * - &quot;TARGET_PARENT&quot; : UML Element used as Graphical parent of the target Port (end of Connector)
-	 * - &quot;SOURCE_GRAPHICAL&quot; : GraphicalEditPart of the source
-	 * - &quot;TARGET_GRAPHICAL&quot; : GraphicalEditPart of the target
-	 *
-	 * This method is used too to call the custom command for InformationFlow creation.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getConnectionAndRelationshipCompleteCommand(CreateConnectionViewAndElementRequest request) {
-		// return super.getConnectionAndRelationshipCompleteCommand(request);
-
-		// get the element descriptor
-		CreateElementRequestAdapter requestAdapter = request.getConnectionViewAndElementDescriptor().getCreateElementRequestAdapter();
-		// get the semantic request
-		CreateRelationshipRequest createElementRequest = (CreateRelationshipRequest) requestAdapter.getAdapter(CreateRelationshipRequest.class);
-
-		createElementRequest.setPrompt(!request.isUISupressed());
-
-		// complete the semantic request by filling in the source and
-		// destination
-		INodeEditPart targetEP = getConnectionCompleteEditPart(request);
-		View sourceView = (View) request.getSourceEditPart().getModel();
-		View targetView = (View) targetEP.getModel();
-
-		// resolve the source
-		EObject source = ViewUtil.resolveSemanticElement(sourceView);
-		if (source == null) {
-			source = sourceView;
-		}
-
-		// resolve the source parent (meaning graphical parent here)
-		View sourceParentView = (request.getSourceEditPart() instanceof ConnectionEditPart) ? null : (View) request.getSourceEditPart().getParent().getModel();
-		EObject sourceParent = (sourceParentView != null) ? ViewUtil.resolveSemanticElement(sourceParentView) : null;
-		if (sourceParent == null) {
-			sourceParent = sourceParentView;
-		}
-
-		createElementRequest.setParameter(CONNECTOR_CREATE_REQUEST_SOURCE_PARENT, sourceParent);
-		createElementRequest.setParameter(CONNECTOR_CREATE_REQUEST_SOURCE_GRAPHICAL, request.getSourceEditPart());
-		createElementRequest.setSource(source);
-
-		// resolve the target
-		EObject target = ViewUtil.resolveSemanticElement(targetView);
-		if (target == null) {
-			target = targetView;
-		}
-
-		// resolve the source parent (meaning graphical parent here)
-		View targetParentView = (request.getTargetEditPart() instanceof ConnectionEditPart) ? null : (View) request.getTargetEditPart().getParent().getModel();
-		EObject targetParent = (targetParentView != null) ? ViewUtil.resolveSemanticElement(targetParentView) : null;
-		if (targetParent == null) {
-			targetParent = targetParentView;
-		}
-
-		createElementRequest.setParameter(CONNECTOR_CREATE_REQUEST_TARGET_PARENT, targetParent);
-		createElementRequest.setParameter(CONNECTOR_CREATE_REQUEST_TARGET_GRAPHICAL, request.getTargetEditPart());
-		createElementRequest.setTarget(target);
-
-		Command createElementCommand = null;
-
-		// we have a custom command for the InformationFlow
-		if (request.getConnectionViewDescriptor().getSemanticHint().equals((((IHintedType) UMLElementTypes.InformationFlow_4021).getSemanticHint()))) {
-
-			createElementCommand = new ICommandProxy(new CustomInformationFlowCreateCommand(createElementRequest, source, target));
-
-		} else {
-			// get the create element request based on the elementdescriptor's
-			// request
-			createElementCommand = targetEP.getCommand(new EditCommandRequestWrapper((CreateRelationshipRequest) requestAdapter.getAdapter(CreateRelationshipRequest.class), request.getExtendedData()));
-
-		}
-
-		// create the create semantic element wrapper command
-		if (null == createElementCommand) {
-			return null;
-		}
-
-		SemanticCreateCommand semanticCommand = new SemanticCreateCommand(requestAdapter, createElementCommand);
-		// get the view command
-		Command viewCommand = getConnectionCompleteCommand(request);
-		if (null == viewCommand) {
-			return null;
-		}
-		// form the compound command and return
-		CompositeCommand cc = new CompositeCommand(semanticCommand.getLabel());
-		cc.compose(semanticCommand);
-		cc.compose(new CommandProxy(viewCommand));
-		return new ICommandProxy(cc);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomParameterItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomParameterItemSemanticEditPolicy.java
deleted file mode 100644
index 5adf6405621..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomParameterItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009-2011 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.command.CustomConnectorCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * <pre>
- * This class provides a custom edit policy used to replace the SEMANTIC_ROLE
- * generated for the Parameter element (when used in CompositeStructure Diagram)
- * </pre>
- */
-public class CustomParameterItemSemanticEditPolicy extends org.eclipse.papyrus.uml.diagram.composite.edit.policies.ParameterItemSemanticEditPolicy {
-
-	/**
-	 * <pre>
-	 * Calls a custom creation command to allow the creation of a Connector connected to a Parameter
-	 * on its source end.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {
-		if (UMLElementTypes.Connector_4013 == req.getElementType()) {
-			return getGEFWrapper(new CustomConnectorCreateCommand(req, req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == req.getElementType()) {
-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));
-		}
-		return super.getStartCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * <pre>
-	 * Calls a custom creation command to allow the creation of a Connector connected to a Parameter
-	 * on its target end.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {
-		if (UMLElementTypes.Connector_4013 == req.getElementType()) {
-			return getGEFWrapper(new CustomConnectorCreateCommand(req, req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == req.getElementType()) {
-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));
-		}
-		return super.getCompleteCreateRelationshipCommand(req);
-	}
-
-	@Override
-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ConnectorEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-
-			// Add graphical new end View in request parameters
-			View targetView = (View) getHost().getModel();
-			req.setParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.EDGE_REORIENT_REQUEST_END_VIEW, targetView);
-
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomPortItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomPortItemSemanticEditPolicy.java
deleted file mode 100644
index ec7588971b0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomPortItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009-2011 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.command.CustomConnectorCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.command.CustomRoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * <pre>
- * This class provides a custom edit policy used to replace the SEMANTIC_ROLE
- * generated for the Port element (when used in CompositeStructure Diagram)
- * </pre>
- */
-public class CustomPortItemSemanticEditPolicy extends org.eclipse.papyrus.uml.diagram.composite.edit.policies.PortItemSemanticEditPolicy {
-
-	@Override
-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ConnectorEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-
-			// Add graphical new end View in request parameters
-			View targetView = (View) getHost().getModel();
-			req.setParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.EDGE_REORIENT_REQUEST_END_VIEW, targetView);
-
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * <pre>
-	 * Forbid direct destruction of Port in case the graphical parent is not
-	 * the semantic parent.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-
-		EObject graphicalParent = ((GraphicalEditPart) getHost().getParent()).resolveSemanticElement();
-		EObject semanticParent = req.getElementToDestroy().eContainer();
-
-		if (graphicalParent != semanticParent) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		return super.getDestroyElementCommand(req);
-	}
-
-	/**
-	 * <pre>
-	 * Calls a custom creation command to allow the creation of a Connector connected to a Port
-	 * on its source end.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {
-		if (UMLElementTypes.Connector_4013 == req.getElementType()) {
-			return getGEFWrapper(new CustomConnectorCreateCommand(req, req.getSource(), null));
-		}
-		if (UMLElementTypes.Dependency_4017 == req.getElementType()) {
-			return getGEFWrapper(new CustomRoleBindingCreateCommand(req, req.getSource(), req.getTarget()));
-		}
-		return super.getStartCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * <pre>
-	 * Calls a custom creation command to allow the creation of a Connector connected to a Port
-	 * on its target end.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {
-		if (UMLElementTypes.Connector_4013 == req.getElementType()) {
-			return getGEFWrapper(new CustomConnectorCreateCommand(req, req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == req.getElementType()) {
-			return getGEFWrapper(new CustomRoleBindingCreateCommand(req, req.getSource(), req.getTarget()));
-		}
-		return super.getCompleteCreateRelationshipCommand(req);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomPropertyPartCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomPropertyPartCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index c008da34468..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomPropertyPartCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009-2011 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.command.PropertyPartCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * <pre>
- * This class provides a custom edit policy used to replace the SEMANTIC_ROLE
- * generated for the PropertyPartCompartment element (when used in CompositeStructure Diagram)
- * </pre>
- */
-public class CustomPropertyPartCompartmentItemSemanticEditPolicyCN extends org.eclipse.papyrus.uml.diagram.composite.edit.policies.PropertyPartCompartmentItemSemanticEditPolicyCN {
-
-	/**
-	 * <pre>
-	 * Calls a custom creation command that allow the creation of a Property
-	 * on an existing Property.
-	 * Semantically the Property is created owned by the type the edited Property.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-		if (UMLElementTypes.Property_3070 == req.getElementType()) {
-			return getGEFWrapper(new PropertyPartCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomPropertyPartItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomPropertyPartItemSemanticEditPolicyCN.java
deleted file mode 100644
index aff19ca71b4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CustomPropertyPartItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009-2011 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.command.CustomConnectorCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.command.CustomPortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.command.CustomRoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * <pre>
- * This class provides a custom edit policy used to replace the SEMANTIC_ROLE
- * generated for the Property element (when used as Composite Part)
- *
- * TODO : This should probably also manage Port clean removal (semantic deletion causes issues)
- * </pre>
- */
-public class CustomPropertyPartItemSemanticEditPolicyCN extends org.eclipse.papyrus.uml.diagram.composite.edit.policies.PropertyPartItemSemanticEditPolicyCN {
-
-	/**
-	 * <pre>
-	 * Calls a custom creation command to allow the creation of a Port on a Property.
-	 * The Property has to be typed by a StructuredClassifier.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-		if (UMLElementTypes.Port_3069 == req.getElementType()) {
-			return getGEFWrapper(new CustomPortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * <pre>
-	 * Forbid direct destruction of Property in case the graphical parent is not
-	 * the semantic parent.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-
-		EObject graphicalParent = ((GraphicalEditPart) getHost().getParent()).resolveSemanticElement();
-		EObject semanticParent = req.getElementToDestroy().eContainer();
-
-		if (graphicalParent != semanticParent) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		return super.getDestroyElementCommand(req);
-	}
-
-	/**
-	 * <pre>
-	 * Calls a custom creation command to allow the creation of a Connector connected to a Property
-	 * on its source end.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {
-		if (UMLElementTypes.Connector_4013 == req.getElementType()) {
-			return getGEFWrapper(new CustomConnectorCreateCommand(req, req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == req.getElementType()) {
-			return getGEFWrapper(new CustomRoleBindingCreateCommand(req, req.getSource(), req.getTarget()));
-		}
-		return super.getStartCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * <pre>
-	 * Calls a custom creation command to allow the creation of a Connector connected to a Property
-	 * on its target end.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {
-		if (UMLElementTypes.Connector_4013 == req.getElementType()) {
-			return getGEFWrapper(new CustomConnectorCreateCommand(req, req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == req.getElementType()) {
-			return getGEFWrapper(new CustomRoleBindingCreateCommand(req, req.getSource(), req.getTarget()));
-		}
-		return super.getCompleteCreateRelationshipCommand(req);
-	}
-
-	@Override
-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ConnectorEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-
-			// Add graphical new end View in request parameters
-			View targetView = (View) getHost().getModel();
-			req.setParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.EDGE_REORIENT_REQUEST_END_VIEW, targetView);
-
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/PortInCompartmentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/PortInCompartmentCreationEditPolicy.java
index 725433086e1..61d824a0c3c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/PortInCompartmentCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/PortInCompartmentCreationEditPolicy.java
@@ -22,9 +22,9 @@ import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gef.requests.ChangeBoundsRequest;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.BehaviorPortEditPart;
 import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
 
@@ -33,7 +33,7 @@ import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
  * a Port or Parameter is created in a Compartment. In such a case the Port (Parameter) should be added to the compartment owner.
  *
  */
-public class PortInCompartmentCreationEditPolicy extends CreationEditPolicy {
+public class PortInCompartmentCreationEditPolicy extends DefaultCreationEditPolicy {
 	@Override
 	public EditPart getTargetEditPart(Request request) {
 		if (request instanceof CreateUnspecifiedTypeRequest) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/messages.properties
index c6246756e48..81d8f82bb79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/messages.properties
@@ -142,3 +142,9 @@ CommandName_OpenDiagram=Open Diagram
 MessageFormatParser_InvalidInputError=Invalid input at {0}
 UMLModelingAssistantProviderTitle=Select domain model element
 UMLModelingAssistantProviderMessage=Available domain model elements:
+ManifestationCreationTool_title=Manifestation
+ManifestationCreationTool_desc=Create new Manifestation
+DeploymentCreationTool_title=Deployment
+DeploymentCreationTool_desc=Create new Deployment
+StringExpressionCreationTool_title=StringExpression
+StringExpressionCreationTool_desc=Create new StringExpression
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram-notation.elementtypesconfigurations
new file mode 100644
index 00000000000..0e567bd53b8
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram-notation.elementtypesconfigurations
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ASCII"?>

+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_tT4HoLazEeSbnofizoRSMQ" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_tT4HobazEeSbnofizoRSMQ" name="Undefined" identifier="org.eclipse.papyrus.uml.diagram.composite.Node_3121" hint="3121" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_tT5VwLazEeSbnofizoRSMQ" name="Undefined" identifier="org.eclipse.papyrus.uml.diagram.composite.Link_4022" hint="4022" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_tT5VwbazEeSbnofizoRSMQ" name="Undefined" identifier="org.eclipse.papyrus.uml.diagram.composite.Link_4001" hint="4001" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations
new file mode 100644
index 00000000000..c906ff16b01
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations
@@ -0,0 +1,1268 @@
+<?xml version="1.0" encoding="ASCII"?>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_tL86sLazEeSbnofizoRSMQ"

+    name="CompositeStructure"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTshcLazEeSbnofizoRSMQ"

+      name="Abstraction"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"

+      hint="4007">

+    <iconEntry

+        xmi:id="_tTshcbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Abstraction.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSdyYLazEeSbnofizoRSMQ"

+      name="Activity"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Activity_3072"

+      hint="3072">

+    <iconEntry

+        xmi:id="_tSdyYbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Activity.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTAk8LazEeSbnofizoRSMQ"

+      name="Activity"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"

+      hint="2060">

+    <iconEntry

+        xmi:id="_tTAk8bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Activity.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSzwoLazEeSbnofizoRSMQ"

+      name="Actor"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"

+      hint="3091">

+    <iconEntry

+        xmi:id="_tSzwobazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Actor.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTMyMLazEeSbnofizoRSMQ"

+      name="Actor"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Actor_2077"

+      hint="2077">

+    <iconEntry

+        xmi:id="_tTMyMbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Actor.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTSRwLazEeSbnofizoRSMQ"

+      name="Any Receive Event"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"

+      hint="2085">

+    <iconEntry

+        xmi:id="_tTSRwbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/AnyReceiveEvent.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AnyReceiveEvent</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS0-wLazEeSbnofizoRSMQ"

+      name="Artifact"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"

+      hint="3093">

+    <iconEntry

+        xmi:id="_tS0-wbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Artifact.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTOAULazEeSbnofizoRSMQ"

+      name="Artifact"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"

+      hint="2079">

+    <iconEntry

+        xmi:id="_tTOAUbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Artifact.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTRqsLazEeSbnofizoRSMQ"

+      name="Call Event"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"

+      hint="2084">

+    <iconEntry

+        xmi:id="_tTRqsbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/CallEvent.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTS40LazEeSbnofizoRSMQ"

+      name="Change Event"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"

+      hint="2088">

+    <iconEntry

+        xmi:id="_tTS40bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/ChangeEvent.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ChangeEvent</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tStqALazEeSbnofizoRSMQ"

+      name="Class"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Class_3085"

+      hint="3085">

+    <iconEntry

+        xmi:id="_tStqAbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTH5sLazEeSbnofizoRSMQ"

+      name="Class"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Class_2073"

+      hint="2073">

+    <iconEntry

+        xmi:id="_tTH5sbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Class.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSu4ILazEeSbnofizoRSMQ"

+      name="Collaboration"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"

+      hint="3086">

+    <iconEntry

+        xmi:id="_tSu4IbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Collaboration.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTJH0LazEeSbnofizoRSMQ"

+      name="Collaboration"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"

+      hint="2075">

+    <iconEntry

+        xmi:id="_tTJH0bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Collaboration.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSZg8LazEeSbnofizoRSMQ"

+      name="Collaboration Role"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.CollaborationRole_3115"

+      hint="3115">

+    <iconEntry

+        xmi:id="_tSZg8bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/ConnectableElement.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration.CollaborationRole</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSb9MLazEeSbnofizoRSMQ"

+      name="Collaboration Use"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"

+      hint="3071">

+    <iconEntry

+        xmi:id="_tSb9MbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/CollaborationUse.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CollaborationUse</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS4pILazEeSbnofizoRSMQ"

+      name="Comment"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"

+      hint="3097">

+    <iconEntry

+        xmi:id="_tS4pIbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Comment.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTj-kLazEeSbnofizoRSMQ"

+      name="Comment"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"

+      hint="2109">

+    <iconEntry

+        xmi:id="_tTj-kbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Comment.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tToQALazEeSbnofizoRSMQ"

+      name="Comment Annotated Element"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"

+      hint="4002">

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSmVQLazEeSbnofizoRSMQ"

+      name="Component"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Component_3081"

+      hint="3081">

+    <iconEntry

+        xmi:id="_tSmVQbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Component.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTE2YLazEeSbnofizoRSMQ"

+      name="Component"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Component_2069"

+      hint="2069">

+    <iconEntry

+        xmi:id="_tTE2YbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Component.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTo3ELazEeSbnofizoRSMQ"

+      name="Component Realization"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"

+      hint="4004">

+    <iconEntry

+        xmi:id="_tTo3EbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/ComponentRealization.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ComponentRealization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTwL0LazEeSbnofizoRSMQ"

+      name="Connector"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Connector_4013"

+      hint="4013">

+    <iconEntry

+        xmi:id="_tTwL0bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Connector.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS9hoLazEeSbnofizoRSMQ"

+      name="Constraint"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"

+      hint="3120">

+    <iconEntry

+        xmi:id="_tS9hobazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Constraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTnB4LazEeSbnofizoRSMQ"

+      name="Constraint"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"

+      hint="2114">

+    <iconEntry

+        xmi:id="_tTnB4bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Constraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tToQAbazEeSbnofizoRSMQ"

+      name="Constraint Constrained Element"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"

+      hint="4003">

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSzJkLazEeSbnofizoRSMQ"

+      name="Data Type"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.DataType_3080"

+      hint="3080">

+    <iconEntry

+        xmi:id="_tSzJkbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/DataType.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTMLILazEeSbnofizoRSMQ"

+      name="Data Type"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"

+      hint="2068">

+    <iconEntry

+        xmi:id="_tTMLIbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/DataType.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTvkwLazEeSbnofizoRSMQ"

+      name="Dependency"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"

+      hint="4010">

+    <iconEntry

+        xmi:id="_tTvkwbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Dependency.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTtvkLazEeSbnofizoRSMQ"

+      name="Deployment"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"

+      hint="4009">

+    <iconEntry

+        xmi:id="_tTtvkbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Deployment.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Deployment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS0XsLazEeSbnofizoRSMQ"

+      name="Deployment Specification"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"

+      hint="3092">

+    <iconEntry

+        xmi:id="_tS0XsbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/DeploymentSpecification.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTNZQLazEeSbnofizoRSMQ"

+      name="Deployment Specification"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"

+      hint="2078">

+    <iconEntry

+        xmi:id="_tTNZQbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/DeploymentSpecification.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSnjYLazEeSbnofizoRSMQ"

+      name="Device"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Device_3082"

+      hint="3082">

+    <iconEntry

+        xmi:id="_tSnjYbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Device.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Device</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTGEgLazEeSbnofizoRSMQ"

+      name="Device"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Device_2070"

+      hint="2070">

+    <iconEntry

+        xmi:id="_tTGEgbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Device.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Device</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTftILazEeSbnofizoRSMQ"

+      name="Duration"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Duration_2104"

+      hint="2104">

+    <iconEntry

+        xmi:id="_tTftIbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Duration.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Duration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS5QMLazEeSbnofizoRSMQ"

+      name="Duration Constraint"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"

+      hint="3116">

+    <iconEntry

+        xmi:id="_tS5QMbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/DurationConstraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTkloLazEeSbnofizoRSMQ"

+      name="Duration Constraint"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"

+      hint="2110">

+    <iconEntry

+        xmi:id="_tTklobazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/DurationConstraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tThiULazEeSbnofizoRSMQ"

+      name="Duration Interval"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"

+      hint="2106">

+    <iconEntry

+        xmi:id="_tThiUbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/DurationInterval.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationInterval</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTVVELazEeSbnofizoRSMQ"

+      name="Duration Observation"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"

+      hint="2093">

+    <iconEntry

+        xmi:id="_tTVVEbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/DurationObservation.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationObservation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tT2ScLazEeSbnofizoRSMQ"

+      name="Duration Observation Event"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"

+      hint="4019">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSyigLazEeSbnofizoRSMQ"

+      name="Enumeration"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"

+      hint="3079">

+    <iconEntry

+        xmi:id="_tSyigbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Enumeration.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTK9ALazEeSbnofizoRSMQ"

+      name="Enumeration"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"

+      hint="2067">

+    <iconEntry

+        xmi:id="_tTK9AbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Enumeration.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS_94LazEeSbnofizoRSMQ"

+      name="Enumeration Literal"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"

+      hint="3066">

+    <iconEntry

+        xmi:id="_tS_94bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/EnumerationLiteral.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.EnumerationLiteral</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSoxgLazEeSbnofizoRSMQ"

+      name="Execution Environment"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"

+      hint="3083">

+    <iconEntry

+        xmi:id="_tSoxgbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/ExecutionEnvironment.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExecutionEnvironment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTGrkLazEeSbnofizoRSMQ"

+      name="Execution Environment"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"

+      hint="2071">

+    <iconEntry

+        xmi:id="_tTGrkbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/ExecutionEnvironment.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExecutionEnvironment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTfGELazEeSbnofizoRSMQ"

+      name="Expression"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Expression_2103"

+      hint="2103">

+    <iconEntry

+        xmi:id="_tTfGEbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Expression.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Expression</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSjR8LazEeSbnofizoRSMQ"

+      name="Function Behavior"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"

+      hint="3076">

+    <iconEntry

+        xmi:id="_tSjR8bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/FunctionBehavior.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.FunctionBehavior</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTDoQLazEeSbnofizoRSMQ"

+      name="Function Behavior"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"

+      hint="2064">

+    <iconEntry

+        xmi:id="_tTDoQbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/FunctionBehavior.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.FunctionBehavior</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tT1EULazEeSbnofizoRSMQ"

+      name="Generalization"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"

+      hint="4015">

+    <iconEntry

+        xmi:id="_tT1EUbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Generalization.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tT3gkLazEeSbnofizoRSMQ"

+      name="Information Flow"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"

+      hint="4021">

+    <iconEntry

+        xmi:id="_tT3gkbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/InformationFlow.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS2M4LazEeSbnofizoRSMQ"

+      name="Information Item"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"

+      hint="3094">

+    <iconEntry

+        xmi:id="_tS2M4bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/InformationItem.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationItem</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTOnYLazEeSbnofizoRSMQ"

+      name="Information Item"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"

+      hint="2080">

+    <iconEntry

+        xmi:id="_tTOnYbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/InformationItem.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationItem</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTiwcLazEeSbnofizoRSMQ"

+      name="Instance Value"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"

+      hint="2108">

+    <iconEntry

+        xmi:id="_tTiwcbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/InstanceValue.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InstanceValue</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSfAgLazEeSbnofizoRSMQ"

+      name="Interaction"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"

+      hint="3073">

+    <iconEntry

+        xmi:id="_tSfAgbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Interaction.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interaction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTBMALazEeSbnofizoRSMQ"

+      name="Interaction"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"

+      hint="2061">

+    <iconEntry

+        xmi:id="_tTBMAbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Interaction.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interaction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS86kLazEeSbnofizoRSMQ"

+      name="Interaction Constraint"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"

+      hint="3119">

+    <iconEntry

+        xmi:id="_tS86kbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/InteractionConstraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InteractionConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTma0LazEeSbnofizoRSMQ"

+      name="Interaction Constraint"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"

+      hint="2113">

+    <iconEntry

+        xmi:id="_tTma0bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/InteractionConstraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InteractionConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSvfMLazEeSbnofizoRSMQ"

+      name="Interface"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"

+      hint="3087">

+    <iconEntry

+        xmi:id="_tSvfMbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTJu4LazEeSbnofizoRSMQ"

+      name="Interface"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Interface_2076"

+      hint="2076">

+    <iconEntry

+        xmi:id="_tTJu4bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTpeILazEeSbnofizoRSMQ"

+      name="Interface Realization"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"

+      hint="4005">

+    <iconEntry

+        xmi:id="_tTpeIbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/InterfaceRealization.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InterfaceRealization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTiJYLazEeSbnofizoRSMQ"

+      name="Interval"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Interval_2107"

+      hint="2107">

+    <iconEntry

+        xmi:id="_tTiJYbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Interval.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interval</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS7scLazEeSbnofizoRSMQ"

+      name="Interval Constraint"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"

+      hint="3118">

+    <iconEntry

+        xmi:id="_tS7scbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/IntervalConstraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTlzwLazEeSbnofizoRSMQ"

+      name="Interval Constraint"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"

+      hint="2112">

+    <iconEntry

+        xmi:id="_tTlzwbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/IntervalConstraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTXKQLazEeSbnofizoRSMQ"

+      name="Literal Boolean"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"

+      hint="2095">

+    <iconEntry

+        xmi:id="_tTXKQbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/LiteralBoolean.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.LiteralBoolean</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTYYYLazEeSbnofizoRSMQ"

+      name="Literal Integer"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"

+      hint="2096">

+    <iconEntry

+        xmi:id="_tTYYYbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/LiteralInteger.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.LiteralInteger</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTY_cLazEeSbnofizoRSMQ"

+      name="Literal Null"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"

+      hint="2097">

+    <iconEntry

+        xmi:id="_tTY_cbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/LiteralNull.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.LiteralNull</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTZmgLazEeSbnofizoRSMQ"

+      name="Literal String"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"

+      hint="2098">

+    <iconEntry

+        xmi:id="_tTZmgbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/LiteralString.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.LiteralString</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTaNkLazEeSbnofizoRSMQ"

+      name="Literal Unlimited Natural"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"

+      hint="2099">

+    <iconEntry

+        xmi:id="_tTaNkbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/LiteralUnlimitedNatural.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.LiteralUnlimitedNatural</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTr6YLazEeSbnofizoRSMQ"

+      name="Manifestation"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"

+      hint="4012">

+    <iconEntry

+        xmi:id="_tTr6YbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Manifestation.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Manifestation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSp_oLazEeSbnofizoRSMQ"

+      name="Node"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Node_3084"

+      hint="3084">

+    <iconEntry

+        xmi:id="_tSp_obazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Node.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Node</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTHSoLazEeSbnofizoRSMQ"

+      name="Node"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Node_2072"

+      hint="2072">

+    <iconEntry

+        xmi:id="_tTHSobazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Node.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Node</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSkgELazEeSbnofizoRSMQ"

+      name="Opaque Behavior"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"

+      hint="3077">

+    <iconEntry

+        xmi:id="_tSkgEbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/OpaqueBehavior.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTEPULazEeSbnofizoRSMQ"

+      name="Opaque Behavior"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"

+      hint="2065">

+    <iconEntry

+        xmi:id="_tTEPUbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/OpaqueBehavior.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTd38LazEeSbnofizoRSMQ"

+      name="Opaque Expression"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"

+      hint="2101">

+    <iconEntry

+        xmi:id="_tTd38bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/OpaqueExpression.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueExpression</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS-vwLazEeSbnofizoRSMQ"

+      name="Operation"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Operation_3102"

+      hint="3102">

+    <iconEntry

+        xmi:id="_tS-vwbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Operation.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tOrekLazEeSbnofizoRSMQ"

+      name="Package"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Package_1000"

+      hint="CompositeStructure">

+    <iconEntry

+        xmi:id="_tOrekbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Package.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSXEsLazEeSbnofizoRSMQ"

+      name="Parameter"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"

+      hint="3088">

+    <iconEntry

+        xmi:id="_tSXEsbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Parameter.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Parameter</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSVPgLazEeSbnofizoRSMQ"

+      name="Port"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Port_3069"

+      hint="3069">

+    <iconEntry

+        xmi:id="_tSVPgbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Port.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSwtULazEeSbnofizoRSMQ"

+      name="Primitive Type"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"

+      hint="3078">

+    <iconEntry

+        xmi:id="_tSwtUbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/PrimitiveType.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTKV8LazEeSbnofizoRSMQ"

+      name="Primitive Type"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"

+      hint="2066">

+    <iconEntry

+        xmi:id="_tTKV8bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/PrimitiveType.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSYS0LazEeSbnofizoRSMQ"

+      name="Property"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Property_3070"

+      hint="3070">

+    <iconEntry

+        xmi:id="_tSYS0bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS-IsLazEeSbnofizoRSMQ"

+      name="Property"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Property_3101"

+      hint="3101">

+    <iconEntry

+        xmi:id="_tS-IsbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSg1sLazEeSbnofizoRSMQ"

+      name="Protocol State Machine"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"

+      hint="3074">

+    <iconEntry

+        xmi:id="_tSg1sbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/ProtocolStateMachine.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ProtocolStateMachine</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTBzELazEeSbnofizoRSMQ"

+      name="Protocol State Machine"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"

+      hint="2062">

+    <iconEntry

+        xmi:id="_tTBzEbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/ProtocolStateMachine.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ProtocolStateMachine</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTrTULazEeSbnofizoRSMQ"

+      name="Realization"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Realization_4006"

+      hint="4006">

+    <iconEntry

+        xmi:id="_tTrTUbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Realization.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Realization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tT2ScbazEeSbnofizoRSMQ"

+      name="Representation"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"

+      hint="4020">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTuWoLazEeSbnofizoRSMQ"

+      name="Role Binding"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"

+      hint="4017">

+    <iconEntry

+        xmi:id="_tTuWobazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Dependency.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CollaborationUse.RoleBinding</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS2z8LazEeSbnofizoRSMQ"

+      name="Signal"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"

+      hint="3095">

+    <iconEntry

+        xmi:id="_tS2z8bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Signal.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTPOcLazEeSbnofizoRSMQ"

+      name="Signal"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Signal_2081"

+      hint="2081">

+    <iconEntry

+        xmi:id="_tTPOcbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Signal.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTQckLazEeSbnofizoRSMQ"

+      name="Signal Event"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"

+      hint="2083">

+    <iconEntry

+        xmi:id="_tTQckbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/SignalEvent.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.SignalEvent</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tSiD0LazEeSbnofizoRSMQ"

+      name="State Machine"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"

+      hint="3075">

+    <iconEntry

+        xmi:id="_tSiD0bazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/StateMachine.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StateMachine</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTCaILazEeSbnofizoRSMQ"

+      name="State Machine"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"

+      hint="2063">

+    <iconEntry

+        xmi:id="_tTCaIbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/StateMachine.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StateMachine</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTa0oLazEeSbnofizoRSMQ"

+      name="String Expression"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"

+      hint="2100">

+    <iconEntry

+        xmi:id="_tTa0obazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/StringExpression.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StringExpression_As_UML::Package::packagedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTqFMLazEeSbnofizoRSMQ"

+      name="Substitution"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"

+      hint="4011">

+    <iconEntry

+        xmi:id="_tTqFMbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Substitution.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Substitution</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS6eULazEeSbnofizoRSMQ"

+      name="Time Constraint"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"

+      hint="3117">

+    <iconEntry

+        xmi:id="_tS6eUbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/TimeConstraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTlMsLazEeSbnofizoRSMQ"

+      name="Time Constraint"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"

+      hint="2111">

+    <iconEntry

+        xmi:id="_tTlMsbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/TimeConstraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTTf4LazEeSbnofizoRSMQ"

+      name="Time Event"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"

+      hint="2089">

+    <iconEntry

+        xmi:id="_tTUuALazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/TimeEvent.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeEvent</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTefALazEeSbnofizoRSMQ"

+      name="Time Expression"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"

+      hint="2102">

+    <iconEntry

+        xmi:id="_tTefAbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/TimeExpression.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeExpression</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTg7QLazEeSbnofizoRSMQ"

+      name="Time Interval"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"

+      hint="2105">

+    <iconEntry

+        xmi:id="_tTg7QbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/TimeInterval.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeInterval</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTWjMLazEeSbnofizoRSMQ"

+      name="Time Observation"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"

+      hint="2094">

+    <iconEntry

+        xmi:id="_tTWjMbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/TimeObservation.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeObservation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tT1rYLazEeSbnofizoRSMQ"

+      name="Time Observation Event"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"

+      hint="4018">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTtIgLazEeSbnofizoRSMQ"

+      name="Usage"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Usage_4008"

+      hint="4008">

+    <iconEntry

+        xmi:id="_tTtIgbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/Usage.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Usage</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tS4CELazEeSbnofizoRSMQ"

+      name="Use Case"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"

+      hint="3096">

+    <iconEntry

+        xmi:id="_tS4CEbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/UseCase.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tTP1gLazEeSbnofizoRSMQ"

+      name="Use Case"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"

+      hint="2082">

+    <iconEntry

+        xmi:id="_tTP1gbazEeSbnofizoRSMQ"

+        iconPath="/icons/full/obj16/UseCase.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations

+      xmi:id="_0kx7YLgREeSsJKs23mSE-A"

+      description="Generalizarion specific advices (remove inconsistent views when a Generalization is deleted"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.GeneralizationHelperAdvice"

+      editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.GeneralizationHelperAdvice"

+      inheritance="all">

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scma8FYCEeS0WsAAtVmToA"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations

+      xmi:id="_DnjXALgSEeSsJKs23mSE-A"

+      description="Property specific advices (remove inconsistent views when a Property type is set"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.PropertyHelperAdvice"

+      editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.PropertyHelperAdvice"

+      inheritance="all">

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations

+      xmi:id="_Q8xrsLgSEeSsJKs23mSE-A"

+      description="Collaboration specific advices (remove inconsistent views when a CollaborationRole is removed"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.CollaborationHelperAdvice"

+      editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.CollaborationHelperAdvice"

+      inheritance="all">

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca07VYCEeS0WsAAtVmToA"/>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen
index f4a2567c753..e0f670fd85d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen
@@ -1,3863 +1,8264 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel" xmlns:papyrusgmfgenextension="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension">

-  <gmfgen:GenEditorGenerator packageNamePrefix="org.eclipse.papyrus.uml.diagram.composite" modelID="CompositeStructure" diagramFileExtension="uml_csd" domainFileExtension="uml" dynamicTemplates="true" templateDirectory="/org.eclipse.papyrus.def/xtend/" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation">

-    <diagram visualID="1000" editPartClassName="CompositeStructureDiagramEditPart" itemSemanticEditPolicyClassName="CompositeStructureDiagramItemSemanticEditPolicy" canonicalEditPolicyClassName="CompositeStructureDiagramCanonicalEditPolicy" iconProviderPriority="Low" baseEditHelperClassName="UMLBaseEditHelper" creationWizardIconPath="icons/obj16/Diagram_CompositeStructure.gif" validationProviderPriority="Low" validationEnabled="true" validationDecorators="true" liveValidationUIFeedback="true" synchronized="false">

-      <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram"/>

-      <elementType xsi:type="gmfgen:MetamodelType" displayName="CompositeStructureDiagram" editHelperClassName="PackageEditHelper"/>

-      <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.draw2d.FreeformLayer"/>

-      <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-      <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-      <domainDiagramElement href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>

-      <childNodes visualID="3121" editPartClassName="BehaviorPortEditPart" itemSemanticEditPolicyClassName="BehaviorPortItemSemanticEditPolicy" canonicalEditPolicyClassName="BehaviorPortCanonicalEditPolicy" graphicalNodeEditPolicyClassName="BehaviorPortGraphicalNodeEditPolicy" createCommandClassName="BehaviorPortCreateCommand" containers="/0/@diagram/@compartments.16">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:NotationType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorSymbolEditPolicy.BEHAVIOR_SYMBOL" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorSymbolEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoConnectableEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6053" editPartClassName="BehaviorPortFloatingLabelEditPart" itemSemanticEditPolicyClassName="NodeFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes xsi:type="gmfgen:GenChildSideAffixedNode" visualID="3069" editPartClassName="PortEditPart" itemSemanticEditPolicyClassName="PortItemSemanticEditPolicy" canonicalEditPolicyClassName="PortCanonicalEditPolicy" graphicalNodeEditPolicyClassName="PortGraphicalNodeEditPolicy" createCommandClassName="PortCreateCommand" containers="/0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.6">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="PortEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.PortFigure">

-          <attributes xsi:type="gmfgen:DefaultSizeAttributes" width="20" height="20"/>

-        </viewmap>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPortItemSemanticEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorPortEditPolicy.BEHAVIOR_PORT" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorPortEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Port"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.1/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property/aggregation"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="5125" editPartClassName="PortNameEditPart" itemSemanticEditPolicyClassName="PortNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25" y="3"/>

-          </viewmap>

-          <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPortLabelEditPolicy"/>

-          <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy.LABEL_ALIGNMENT_KEY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6029" editPartClassName="PortAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="PortAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25" y="-10"/>

-          </viewmap>

-          <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes xsi:type="gmfgen:GenChildSideAffixedNode" visualID="3088" editPartClassName="ParameterEditPart" itemSemanticEditPolicyClassName="ParameterItemSemanticEditPolicy" canonicalEditPolicyClassName="ParameterCanonicalEditPolicy" graphicalNodeEditPolicyClassName="ParameterGraphicalNodeEditPolicy" createCommandClassName="ParameterCreateCommand" containers="/0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088" displayName="Parameter" editHelperClassName="ParameterEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ParameterFigure">

-          <attributes xsi:type="gmfgen:DefaultSizeAttributes" width="20" height="20"/>

-        </viewmap>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomParameterItemSemanticEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ParameterLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Parameter"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Behavior/ownedParameter"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Behavior/ownedParameter"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6033" editPartClassName="ParameterNameEditPart" itemSemanticEditPolicyClassName="ParameterNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25" y="3"/>

-          </viewmap>

-          <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ParameterLabelEditPolicy"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6034" editPartClassName="ParameterAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="ParameterAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25" y="-10"/>

-          </viewmap>

-          <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3070" editPartClassName="PropertyPartEditPartCN" itemSemanticEditPolicyClassName="PropertyPartItemSemanticEditPolicyCN" canonicalEditPolicyClassName="PropertyPartCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.30" graphicalNodeEditPolicyClassName="PropertyPartGraphicalNodeEditPolicyCN" createCommandClassName="PropertyPartCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29 /0/@diagram/@compartments.30">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.PropertyPartFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPropertyPartItemSemanticEditPolicyCN"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PropertyLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.2">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5126" editPartClassName="PropertyPartNameEditPartCN" itemSemanticEditPolicyClassName="PropertyPartNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPropertyLabelEditPolicy"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6054" editPartClassName="PropertyPartFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="PropertyFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3115" editPartClassName="CollaborationRoleEditPartCN" itemSemanticEditPolicyClassName="CollaborationRoleItemSemanticEditPolicyCN" canonicalEditPolicyClassName="CollaborationRoleCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="CollaborationRoleGraphicalNodeEditPolicyCN" createCommandClassName="CollaborationRoleCreateCommandCN" containers="/0/@diagram/@compartments.17 /0/@diagram/@compartments.29">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115" displayName="CollaborationRole" editHelperClassName="CollaborationRoleEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationRoleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationRoleItemSemanticEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ConnectableElement"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/role"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/role"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5198" editPartClassName="CollaborationRoleNameEditPartCN" itemSemanticEditPolicyClassName="CollaborationRoleNameItemSemanticEditPolicyCN" readOnly="true" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}" editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6055" editPartClassName="CollaborationRoleFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="ConnectableElementFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3071" editPartClassName="CollaborationUseEditPartCN" itemSemanticEditPolicyClassName="CollaborationUseItemSemanticEditPolicyCN" canonicalEditPolicyClassName="CollaborationUseCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="CollaborationUseGraphicalNodeEditPolicyCN" createCommandClassName="CollaborationUseCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="CollaborationUseEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationUseItemSemanticEditPolicyCN"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CollaborationUse"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/collaborationUse"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/collaborationUse"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5127" editPartClassName="CollaborationUseNameEditPart" itemSemanticEditPolicyClassName="CollaborationUseNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationUseLabelEditPolicy"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6056" editPartClassName="CollaborationUseFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="CollaborationUseFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3072" editPartClassName="ActivityCompositeEditPartCN" itemSemanticEditPolicyClassName="ActivityCompositeItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ActivityCompositeCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" compartments="/0/@diagram/@compartments.6" graphicalNodeEditPolicyClassName="ActivityCompositeGraphicalNodeEditPolicyCN" createCommandClassName="ActivityCompositeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.0/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5128" editPartClassName="ActivityCompositeNameEditPartCN" itemSemanticEditPolicyClassName="ActivityCompositeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6057" editPartClassName="ActivityCompositeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="ActivityFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3073" editPartClassName="InteractionCompositeEditPartCN" itemSemanticEditPolicyClassName="InteractionCompositeItemSemanticEditPolicyCN" canonicalEditPolicyClassName="InteractionCompositeCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" compartments="/0/@diagram/@compartments.7" graphicalNodeEditPolicyClassName="InteractionCompositeGraphicalNodeEditPolicyCN" createCommandClassName="InteractionCompositeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.1/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5129" editPartClassName="InteractionCompositeNameEditPartCN" itemSemanticEditPolicyClassName="InteractionCompositeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6058" editPartClassName="InteractionCompositeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="InteractionFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3074" editPartClassName="ProtocolStateMachineCompositeEditPartCN" itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ProtocolStateMachineCompositeCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" compartments="/0/@diagram/@compartments.8" graphicalNodeEditPolicyClassName="ProtocolStateMachineCompositeGraphicalNodeEditPolicyCN" createCommandClassName="ProtocolStateMachineCompositeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.2/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ProtocolStateMachine"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5130" editPartClassName="ProtocolStateMachineCompositeNameEditPartCN" itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6059" editPartClassName="ProtocolStateMachineCompositeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="ProtocolStateMachineFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3075" editPartClassName="StateMachineCompositeEditPartCN" itemSemanticEditPolicyClassName="StateMachineCompositeItemSemanticEditPolicyCN" canonicalEditPolicyClassName="StateMachineCompositeCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" compartments="/0/@diagram/@compartments.9" graphicalNodeEditPolicyClassName="StateMachineCompositeGraphicalNodeEditPolicyCN" createCommandClassName="StateMachineCompositeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.3/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StateMachine"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5131" editPartClassName="StateMachineCompositeNameEditPartCN" itemSemanticEditPolicyClassName="StateMachineCompositeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6060" editPartClassName="StateMachineCompositeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="StateMachineFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3076" editPartClassName="FunctionBehaviorCompositeEditPartCN" itemSemanticEditPolicyClassName="FunctionBehaviorCompositeItemSemanticEditPolicyCN" canonicalEditPolicyClassName="FunctionBehaviorCompositeCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" compartments="/0/@diagram/@compartments.10" graphicalNodeEditPolicyClassName="FunctionBehaviorCompositeGraphicalNodeEditPolicyCN" createCommandClassName="FunctionBehaviorCompositeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.4/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/FunctionBehavior"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5132" editPartClassName="FunctionBehaviorCompositeNameEditPartCN" itemSemanticEditPolicyClassName="FunctionBehaviorCompositeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6061" editPartClassName="FunctionBehaviorCompositeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="FunctionBehaviorFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3077" editPartClassName="OpaqueBehaviorCompositeEditPartCN" itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeItemSemanticEditPolicyCN" canonicalEditPolicyClassName="OpaqueBehaviorCompositeCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" compartments="/0/@diagram/@compartments.11" graphicalNodeEditPolicyClassName="OpaqueBehaviorCompositeGraphicalNodeEditPolicyCN" createCommandClassName="OpaqueBehaviorCompositeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.5/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/OpaqueBehavior"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5133" editPartClassName="OpaqueBehaviorCompositeNameEditPartCN" itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6062" editPartClassName="OpaqueBehaviorCompositeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="OpaqueBehaviorFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3081" editPartClassName="ComponentCompositeEditPartCN" itemSemanticEditPolicyClassName="ComponentCompositeItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ComponentCompositeCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.12" graphicalNodeEditPolicyClassName="ComponentCompositeGraphicalNodeEditPolicyCN" createCommandClassName="ComponentCompositeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.6/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5137" editPartClassName="ComponentCompositeNameEditPartCN" itemSemanticEditPolicyClassName="ComponentCompositeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6063" editPartClassName="ComponentCompositeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="ComponentFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3082" editPartClassName="DeviceCompositeEditPartCN" itemSemanticEditPolicyClassName="DeviceCompositeItemSemanticEditPolicyCN" canonicalEditPolicyClassName="DeviceCompositeCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.13" graphicalNodeEditPolicyClassName="DeviceCompositeGraphicalNodeEditPolicyCN" createCommandClassName="DeviceCompositeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.7/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Device"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5138" editPartClassName="DeviceCompositeNameEditPartCN" itemSemanticEditPolicyClassName="DeviceCompositeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6064" editPartClassName="DeviceCompositeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="DeviceFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3083" editPartClassName="ExecutionEnvironmentCompositeEditPartCN" itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.14" graphicalNodeEditPolicyClassName="ExecutionEnvironmentCompositeGraphicalNodeEditPolicyCN" createCommandClassName="ExecutionEnvironmentCompositeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.8/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ExecutionEnvironment"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5139" editPartClassName="ExecutionEnvironmentCompositeNameEditPartCN" itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6065" editPartClassName="ExecutionEnvironmentCompositeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="ExecutionEnvironmentFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3084" editPartClassName="NodeCompositeEditPartCN" itemSemanticEditPolicyClassName="NodeCompositeItemSemanticEditPolicycN" canonicalEditPolicyClassName="NodeCompositeCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.15" graphicalNodeEditPolicyClassName="NodeCompositeGraphicalNodeEditPolicyCN" createCommandClassName="NodeCompositeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.9/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Node"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5140" editPartClassName="NodeCompositeNameEditPartCN" itemSemanticEditPolicyClassName="NodeCompositeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6066" editPartClassName="NodeCompositeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="NodeFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3085" editPartClassName="ClassCompositeEditPartCN" itemSemanticEditPolicyClassName="ClassCompositeItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ClassCompositeCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.16" graphicalNodeEditPolicyClassName="ClassCompositeGraphicalNodeEditPolicyCN" createCommandClassName="ClassCompositeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.10/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5155" editPartClassName="ClassCompositeNameEditPartCN" itemSemanticEditPolicyClassName="ClassCompositeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6067" editPartClassName="ClassCompositeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="ClassFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3086" editPartClassName="CollaborationCompositeEditPartCN" itemSemanticEditPolicyClassName="CollaborationCompositeItemSemanticEditPolicyCN" canonicalEditPolicyClassName="CollaborationCompositeCanonicalEditPolicyCN" compartments="/0/@diagram/@compartments.17" graphicalNodeEditPolicyClassName="CollaborationCompositeGraphicalNodeEditPolicyCN" createCommandClassName="CollaborationCompositeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="CollaborationEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Collaboration"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5141" editPartClassName="CollaborationCompositeNameEditPartCN" itemSemanticEditPolicyClassName="CollaborationCompositeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6068" editPartClassName="CollaborationCompositeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="CollaborationFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3087" editPartClassName="InterfaceEditPartCN" itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicyCN" canonicalEditPolicyClassName="InterfaceCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicyCN" createCommandClassName="InterfaceCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="InterfaceEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5154" editPartClassName="InterfaceNameEditPartCN" itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6069" editPartClassName="InterfaceFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="InterfaceFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3078" editPartClassName="PrimitiveTypeEditPartCN" itemSemanticEditPolicyClassName="PrimitiveTypeItemSemanticEditPolicyCN" canonicalEditPolicyClassName="PrimitiveTypeCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="PrimitiveTypeGraphicalNodeEditPolicyCN" createCommandClassName="PrimitiveTypeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.13/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/PrimitiveType"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5134" editPartClassName="PrimitiveTypeNameEditPartCN" itemSemanticEditPolicyClassName="PrimitiveTypeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6070" editPartClassName="PrimitiveTypeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="PrimitiveTypeFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3079" editPartClassName="EnumerationEditPartCN" itemSemanticEditPolicyClassName="EnumerationItemSemanticEditPolicyCN" canonicalEditPolicyClassName="EnumerationCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.36" compartments="/0/@diagram/@compartments.5" graphicalNodeEditPolicyClassName="EnumerationGraphicalNodeEditPolicyCN" createCommandClassName="EnumerationCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.14/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5135" editPartClassName="EnumerationNameEditPartCN" itemSemanticEditPolicyClassName="EnumerationNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6071" editPartClassName="EnumerationFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="EnumerationFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3080" editPartClassName="DataTypeEditPartCN" itemSemanticEditPolicyClassName="DataTypeItemSemanticEditPolicyCN" canonicalEditPolicyClassName="DataTypeCanonicalEditPolicyCN" compartments="/0/@diagram/@compartments.2 /0/@diagram/@compartments.3" graphicalNodeEditPolicyClassName="DataTypeGraphicalNodeEditPolicyCN" createCommandClassName="DataTypeCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@topLevelNodes.15/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DataType"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5136" editPartClassName="DataTypeNameEditPartCN" itemSemanticEditPolicyClassName="DataTypeNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6072" editPartClassName="DataTypeFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="DataTypeFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3091" editPartClassName="ActorEditPartCN" itemSemanticEditPolicyClassName="ActorItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ActorCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="ActorGraphicalNodeEditPolicyCN" createCommandClassName="ActorCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ActorEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5144" editPartClassName="ActorNameEditPartCN" itemSemanticEditPolicyClassName="ActorNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6073" editPartClassName="ActorFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="ActorFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3092" editPartClassName="DeploymentSpecificationEditPartCN" itemSemanticEditPolicyClassName="DeploymentSpecificationItemSemanticEditPolicyCN" canonicalEditPolicyClassName="DeploymentSpecificationCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="DeploymentSpecificationGraphicalNodeEditPolicyCN" createCommandClassName="DeploymentSpecificationCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="DeploymentSpecificationEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DeploymentSpecification"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5145" editPartClassName="DeploymentSpecificationNameEditPartCN" itemSemanticEditPolicyClassName="DeploymentSpecificationNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6074" editPartClassName="DeploymentSpecificationFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="DeploymentSpecificationFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3093" editPartClassName="ArtifactEditPartCN" itemSemanticEditPolicyClassName="ArtifactItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ArtifactCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="ArtifactGraphicalNodeEditPolicyCN" createCommandClassName="ArtifactCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ArtifactEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Artifact"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5146" editPartClassName="ArtifactNameEditPartCN" itemSemanticEditPolicyClassName="ArtifactNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6075" editPartClassName="ArtifactFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="ArtifactFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3094" editPartClassName="InformationItemEditPartCN" itemSemanticEditPolicyClassName="InformationItemItemSemanticEditPolicyCN" canonicalEditPolicyClassName="InformationItemCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="InformationItemGraphicalNodeEditPolicyCN" createCommandClassName="InformationItemCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="InformationItemEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure">

-          <attributes xsi:type="gmfgen:DefaultSizeAttributes" width="80" height="40"/>

-        </viewmap>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationItem"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.7">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/isAbstract"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5147" editPartClassName="InformationItemNameEditPartCN" itemSemanticEditPolicyClassName="InformationItemNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6076" editPartClassName="InformationItemFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="InformationItemFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3095" editPartClassName="SignalEditPartCN" itemSemanticEditPolicyClassName="SignalItemSemanticEditPolicyCN" canonicalEditPolicyClassName="SignalCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="SignalGraphicalNodeEditPolicyCN" createCommandClassName="SignalCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="SignalEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Signal"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5148" editPartClassName="SignalNameEditPartCN" itemSemanticEditPolicyClassName="SignalNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6077" editPartClassName="SignalFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="SignalFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3096" editPartClassName="UseCaseEditPartCN" itemSemanticEditPolicyClassName="UseCaseItemSemanticEditPolicyCN" canonicalEditPolicyClassName="UseCaseCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="UseCaseGraphicalNodeEditPolicyCN" createCommandClassName="UseCaseCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="UseCaseEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/UseCase"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5149" editPartClassName="UseCaseNameEditPartCN" itemSemanticEditPolicyClassName="UseCaseNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6078" editPartClassName="UseCaseFloatingLabelEditPartCN" itemSemanticEditPolicyClassName="UseCaseFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3097" editPartClassName="CommentEditPartCN" itemSemanticEditPolicyClassName="CommentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="CommentCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="CommentGraphicalNodeEditPolicyCN" createCommandClassName="CommentCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29 /0/@diagram/@compartments.30">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" displayName="Comment" editHelperClassName="CommentEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusReflowableShapeEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.12">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5150" editPartClassName="CommentBodyEditPartCN" itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicyCN">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCornerBentFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.3">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3116" editPartClassName="DurationConstraintEditPartCN" itemSemanticEditPolicyClassName="DurationConstraintItemSemanticEditPolicyCN" canonicalEditPolicyClassName="DurationConstraintCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="DurationConstraintGraphicalNodeEditPolicyCN" createCommandClassName="DurationConstraintCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationConstraint"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.15">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="6040" editPartClassName="DurationConstraintNameEditPartCN" itemSemanticEditPolicyClassName="DurationConstraintNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6041" editPartClassName="DurationConstraintSpecificationEditPartCN" itemSemanticEditPolicyClassName="DurationConstraintSpecificationItemSemanticEditPolicyCN">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getConstraintFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.4">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            <editableMetaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3117" editPartClassName="TimeConstraintEditPartCN" itemSemanticEditPolicyClassName="TimeConstraintItemSemanticEditPolicyCN" canonicalEditPolicyClassName="TimeConstraintCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="TimeConstraintGraphicalNodeEditPolicyCN" createCommandClassName="TimeConstraintCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeConstraint"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.16">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="6042" editPartClassName="TimeConstraintNameEditPartCN" itemSemanticEditPolicyClassName="TimeConstraintNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6043" editPartClassName="TimeConstraintSpecificationEditPartCN" itemSemanticEditPolicyClassName="TimeConstraintSpecificationItemSemanticEditPolicyCN">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getConstraintFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.4">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            <editableMetaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3118" editPartClassName="IntervalConstraintEditPartCN" itemSemanticEditPolicyClassName="IntervalConstraintItemSemanticEditPolicyCN" canonicalEditPolicyClassName="IntervalConstraintCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="IntervalConstraintGraphicalNodeEditPolicyCN" createCommandClassName="IntervalConstraintCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/IntervalConstraint"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.14">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="6044" editPartClassName="IntervalConstraintNameEditPartCN" itemSemanticEditPolicyClassName="IntervalConstraintNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6045" editPartClassName="IntervalConstraintSpecificationEditPartCN" itemSemanticEditPolicyClassName="IntervalConstraintSpecificationItemSemanticEditPolicyCN">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getConstraintFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.4">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            <editableMetaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3119" editPartClassName="InteractionConstraintEditPartCN" itemSemanticEditPolicyClassName="InteractionConstraintItemSemanticEditPolicyCN" canonicalEditPolicyClassName="InteractionConstraintCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="InteractionConstraintGraphicalNodeEditPolicyCN" createCommandClassName="InteractionConstraintCreateCommandCN" containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionConstraint"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.13">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="6046" editPartClassName="InteractionConstraintNameEditPartCN" itemSemanticEditPolicyClassName="InteractionConstraintNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6047" editPartClassName="InteractionConstraintSpecificationEditPartCN" itemSemanticEditPolicyClassName="InteractionConstraintSpecificationItemSemanticEditPolicyCN">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getConstraintFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.4">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            <editableMetaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes visualID="3120" editPartClassName="ConstraintEditPartCN" itemSemanticEditPolicyClassName="ConstraintItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ConstraintCanonicalEditPolicyCN" graphicalNodeEditPolicyClassName="ConstraintGraphicalNodeEditPolicyCN" createCommandClassName="ConstraintCreateCommandCN" containers="/0/@diagram/@compartments.28 /0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.29">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.13">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="6048" editPartClassName="ConstraintNameEditPartCN" itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicyCN" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6049" editPartClassName="ConstraintSpecificationEditPartCN" itemSemanticEditPolicyClassName="ConstraintSpecificationItemSemanticEditPolicyCN">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getConstraintFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.4">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            <editableMetaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-          </modelFacet>

-        </labels>

-      </childNodes>

-      <childNodes xsi:type="gmfgen:GenChildLabelNode" visualID="3101" editPartClassName="PropertyEditPartCLN" itemSemanticEditPolicyClassName="PropertyItemSemanticEditPolicyCLN" canonicalEditPolicyClassName="PropertyCanonicalEditPolicyCLN" graphicalNodeEditPolicyClassName="PropertyGraphicalNodeEditPolicyCLN" createCommandClassName="PropertyCreateCommandCLN" containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.0" labelElementIcon="true">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labelModelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-          <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-        </labelModelFacet>

-      </childNodes>

-      <childNodes xsi:type="gmfgen:GenChildLabelNode" visualID="3102" editPartClassName="OperationEditPartCLN" itemSemanticEditPolicyClassName="OperationItemSemanticEditPolicyCLN" canonicalEditPolicyClassName="OperationCanonicalEditPolicyCLN" graphicalNodeEditPolicyClassName="OperationGraphicalNodeEditPolicyCLN" createCommandClassName="OperationCreateCommandCLN" containers="/0/@diagram/@compartments.3 /0/@diagram/@compartments.1" labelElementIcon="true">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Operation"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/ownedOperation"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/ownedOperation"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labelModelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-          <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-        </labelModelFacet>

-      </childNodes>

-      <childNodes xsi:type="gmfgen:GenChildLabelNode" visualID="3066" editPartClassName="EnumerationLiteralEditPartCLN" itemSemanticEditPolicyClassName="EnumerationLiteralItemSemanticEditPolicyCLN" canonicalEditPolicyClassName="EnumerationLiteralCanonicalEditPolicyCLN" graphicalNodeEditPolicyClassName="EnumerationLiteralGraphicalNodeEditPolicyCLN" createCommandClassName="EnumerationLiteralCreateCommandCLN" containers="/0/@diagram/@compartments.5 /0/@diagram/@compartments.4 /0/@diagram/@topLevelNodes.14 /0/@diagram/@childNodes.20" labelElementIcon="true">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="EnumerationLiteralEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/EnumerationLiteral"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration/ownedLiteral"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration/ownedLiteral"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labelModelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-          <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-        </labelModelFacet>

-      </childNodes>

-      <topLevelNodes visualID="2060" editPartClassName="ActivityCompositeEditPart" itemSemanticEditPolicyClassName="ActivityCompositeItemSemanticEditPolicy" canonicalEditPolicyClassName="ActivityCompositeCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" compartments="/0/@diagram/@compartments.18" graphicalNodeEditPolicyClassName="ActivityCompositeGraphicalNodeEditPolicy" createCommandClassName="ActivityCompositeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ActivityEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5112" editPartClassName="ActivityCompositeNameEditPart" itemSemanticEditPolicyClassName="ActivityCompositeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6079" editPartClassName="ActivityCompositeFloatingLabelEditPart" itemSemanticEditPolicyClassName="ActivityFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2061" editPartClassName="InteractionCompositeEditPart" itemSemanticEditPolicyClassName="InteractionCompositeItemSemanticEditPolicy" canonicalEditPolicyClassName="InteractionCompositeCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" compartments="/0/@diagram/@compartments.19" graphicalNodeEditPolicyClassName="InteractionCompositeGraphicalNodeEditPolicy" createCommandClassName="InteractionCompositeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="InteractionEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5113" editPartClassName="InteractionCompositeNameEditPart" itemSemanticEditPolicyClassName="InteractionCompositeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6080" editPartClassName="InteractionCompositeFloatingLabelEditPart" itemSemanticEditPolicyClassName="InteractionFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2062" editPartClassName="ProtocolStateMachineCompositeEditPart" itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeItemSemanticEditPolicy" canonicalEditPolicyClassName="ProtocolStateMachineCompositeCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" compartments="/0/@diagram/@compartments.20" graphicalNodeEditPolicyClassName="ProtocolStateMachineCompositeGraphicalNodeEditPolicy" createCommandClassName="ProtocolStateMachineCompositeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ProtocolStateMachineEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ProtocolStateMachine"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5114" editPartClassName="ProtocolStateMachineCompositeNameEditPart" itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6081" editPartClassName="ProtocolStateMachineCompositeFloatingLabelEditPart" itemSemanticEditPolicyClassName="ProtocolStateMachineFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2063" editPartClassName="StateMachineCompositeEditPart" itemSemanticEditPolicyClassName="StateMachineCompositeItemSemanticEditPolicy" canonicalEditPolicyClassName="StateMachineCompositeCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" compartments="/0/@diagram/@compartments.21" graphicalNodeEditPolicyClassName="StateMachineCompositeGraphicalNodeEditPolicy" createCommandClassName="StateMachineCompositeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="StateMachineEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StateMachine"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5115" editPartClassName="StateMachineCompositeNameEditPart" itemSemanticEditPolicyClassName="StateMachineCompositeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6082" editPartClassName="StateMachineCompositeFloatingLabelEditPart" itemSemanticEditPolicyClassName="StateMachineFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2064" editPartClassName="FunctionBehaviorCompositeEditPart" itemSemanticEditPolicyClassName="FunctionBehaviorCompositeItemSemanticEditPolicy" canonicalEditPolicyClassName="FunctionBehaviorCompositeCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" compartments="/0/@diagram/@compartments.22" graphicalNodeEditPolicyClassName="FunctionBehaviorCompositeGraphicalNodeEditPolicy" createCommandClassName="FunctionBehaviorCompositeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="FunctionBehaviorEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/FunctionBehavior"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5116" editPartClassName="FunctionBehaviorCompositeNameEditPart" itemSemanticEditPolicyClassName="FunctionBehaviorCompositeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6083" editPartClassName="FunctionBehaviorCompositeFloatingLabelEditPart" itemSemanticEditPolicyClassName="FunctionBehaviorFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2065" editPartClassName="OpaqueBehaviorCompositeEditPart" itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeItemSemanticEditPolicy" canonicalEditPolicyClassName="OpaqueBehaviorCompositeCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" compartments="/0/@diagram/@compartments.23" graphicalNodeEditPolicyClassName="OpaqueBehaviorCompositeGraphicalNodeEditPolicy" createCommandClassName="OpaqueBehaviorCompositeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="OpaqueBehaviorEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/OpaqueBehavior"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5117" editPartClassName="OpaqueBehaviorCompositeNameEditPart" itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6084" editPartClassName="OpaqueBehaviorCompositeFloatingLabelEditPart" itemSemanticEditPolicyClassName="OpaqueBehaviorFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2069" editPartClassName="ComponentCompositeEditPart" itemSemanticEditPolicyClassName="ComponentCompositeItemSemanticEditPolicy" canonicalEditPolicyClassName="ComponentCompositeCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.24" graphicalNodeEditPolicyClassName="ComponentCompositeGraphicalNodeEditPolicy" createCommandClassName="ComponentCompositeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ComponentEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5121" editPartClassName="ComponentCompositeNameEditPart" itemSemanticEditPolicyClassName="ComponentCompositeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6085" editPartClassName="ComponentCompositeFloatingLabelEditPart" itemSemanticEditPolicyClassName="ComponentFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2070" editPartClassName="DeviceCompositeEditPart" itemSemanticEditPolicyClassName="DeviceCompositeItemSemanticEditPolicy" canonicalEditPolicyClassName="DeviceCompositeCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.25" graphicalNodeEditPolicyClassName="DeviceCompositeGraphicalNodeEditPolicy" createCommandClassName="DeviceCompositeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="DeviceEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Device"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5122" editPartClassName="DeviceCompositeNameEditPart" itemSemanticEditPolicyClassName="DeviceCompositeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6086" editPartClassName="DeviceCompositeFloatingLabelEditPart" itemSemanticEditPolicyClassName="DeviceFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2071" editPartClassName="ExecutionEnvironmentCompositeEditPart" itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeItemSemanticEditPolicy" canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.26" graphicalNodeEditPolicyClassName="ExecutionEnvironmentCompositeGraphicalNodeEditPolicy" createCommandClassName="ExecutionEnvironmentCompositeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ExecutionEnvironmentEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ExecutionEnvironment"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5123" editPartClassName="ExecutionEnvironmentCompositeNameEditPart" itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6087" editPartClassName="ExecutionEnvironmentCompositeFloatingLabelEditPart" itemSemanticEditPolicyClassName="ExecutionEnvironmentFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2072" editPartClassName="NodeCompositeEditPart" itemSemanticEditPolicyClassName="NodeCompositeItemSemanticEditPolicy" canonicalEditPolicyClassName="NodeCompositeCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.27" graphicalNodeEditPolicyClassName="NodeCompositeGraphicalNodeEditPolicy" createCommandClassName="NodeCompositeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="NodeEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Node"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5124" editPartClassName="NodeCompositeNameEditPart" itemSemanticEditPolicyClassName="NodeCompositeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6088" editPartClassName="NodeCompositeFloatingLabelEditPart" itemSemanticEditPolicyClassName="NodeFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2073" editPartClassName="ClassCompositeEditPart" itemSemanticEditPolicyClassName="ClassCompositeItemSemanticEditPolicy" canonicalEditPolicyClassName="ClassCompositeCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.28" graphicalNodeEditPolicyClassName="ClassCompositeGraphicalNodeEditPolicy" createCommandClassName="ClassCompositeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ClassEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5156" editPartClassName="ClassCompositeNameEditPart" itemSemanticEditPolicyClassName="ClassCompositeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6089" editPartClassName="ClassCompositeFloatingLabelEditPart" itemSemanticEditPolicyClassName="ClassFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2075" editPartClassName="CollaborationCompositeEditPart" itemSemanticEditPolicyClassName="CollaborationCompositeItemSemanticEditPolicy" canonicalEditPolicyClassName="CollaborationCompositeCanonicalEditPolicy" compartments="/0/@diagram/@compartments.29" graphicalNodeEditPolicyClassName="CollaborationCompositeGraphicalNodeEditPolicy" createCommandClassName="CollaborationCompositeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@childNodes.17/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Collaboration"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5158" editPartClassName="CollaborationCompositeNameEditPart" itemSemanticEditPolicyClassName="CollaborationCompositeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6090" editPartClassName="CollaborationCompositeFloatingLabelEditPart" itemSemanticEditPolicyClassName="CollaborationFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2076" editPartClassName="InterfaceEditPart" itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicy" canonicalEditPolicyClassName="InterfaceCanonicalEditPolicy" graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicy" createCommandClassName="InterfaceCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@childNodes.18/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5159" editPartClassName="InterfaceNameEditPart" itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6091" editPartClassName="InterfaceFloatingLabelEditPart" itemSemanticEditPolicyClassName="InterfaceFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2066" editPartClassName="PrimitiveTypeEditPart" itemSemanticEditPolicyClassName="PrimitiveTypeItemSemanticEditPolicy" canonicalEditPolicyClassName="PrimitiveTypeCanonicalEditPolicy" graphicalNodeEditPolicyClassName="PrimitiveTypeGraphicalNodeEditPolicy" createCommandClassName="PrimitiveTypeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="PrimitiveTypeEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/PrimitiveType"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5118" editPartClassName="PrimitiveTypeNameEditPart" itemSemanticEditPolicyClassName="PrimitiveTypeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6092" editPartClassName="PrimitiveTypeFloatingLabelEditPart" itemSemanticEditPolicyClassName="PrimitiveTypeFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2067" editPartClassName="EnumerationEditPart" itemSemanticEditPolicyClassName="EnumerationItemSemanticEditPolicy" canonicalEditPolicyClassName="EnumerationCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.36" compartments="/0/@diagram/@compartments.4" graphicalNodeEditPolicyClassName="EnumerationGraphicalNodeEditPolicy" createCommandClassName="EnumerationCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="EnumerationEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5119" editPartClassName="EnumerationNameEditPart" itemSemanticEditPolicyClassName="EnumerationNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6093" editPartClassName="EnumerationFloatingLabelEditPart" itemSemanticEditPolicyClassName="EnumerationFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2068" editPartClassName="DataTypeEditPart" itemSemanticEditPolicyClassName="DataTypeItemSemanticEditPolicy" canonicalEditPolicyClassName="DataTypeCanonicalEditPolicy" compartments="/0/@diagram/@compartments.0 /0/@diagram/@compartments.1" graphicalNodeEditPolicyClassName="DataTypeGraphicalNodeEditPolicy" createCommandClassName="DataTypeCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="DataTypeEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DataType"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5120" editPartClassName="DataTypeNameEditPart" itemSemanticEditPolicyClassName="DataTypeNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6094" editPartClassName="DataTypeFloatingLabelEditPart" itemSemanticEditPolicyClassName="DataTypeFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2077" editPartClassName="ActorEditPart" itemSemanticEditPolicyClassName="ActorItemSemanticEditPolicy" canonicalEditPolicyClassName="ActorCanonicalEditPolicy" graphicalNodeEditPolicyClassName="ActorGraphicalNodeEditPolicy" createCommandClassName="ActorCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@childNodes.22/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5160" editPartClassName="ActorNameEditPart" itemSemanticEditPolicyClassName="ActorNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6095" editPartClassName="ActorFloatingLabelEditPart" itemSemanticEditPolicyClassName="ActorFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2078" editPartClassName="DeploymentSpecificationEditPart" itemSemanticEditPolicyClassName="DeploymentSpecificationItemSemanticEditPolicy" canonicalEditPolicyClassName="DeploymentSpecificationCanonicalEditPolicy" graphicalNodeEditPolicyClassName="DeploymentSpecificationGraphicalNodeEditPolicy" createCommandClassName="DeploymentSpecificationCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@childNodes.23/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DeploymentSpecification"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5161" editPartClassName="DeploymentSpecificationNameEditPart" itemSemanticEditPolicyClassName="DeploymentSpecificationNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6096" editPartClassName="DeploymentSpecificationFloatingLabelEditPart" itemSemanticEditPolicyClassName="DeploymentSpecificationFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2079" editPartClassName="ArtifactEditPart" itemSemanticEditPolicyClassName="ArtifactItemSemanticEditPolicy" canonicalEditPolicyClassName="ArtifactCanonicalEditPolicy" graphicalNodeEditPolicyClassName="ArtifactGraphicalNodeEditPolicy" createCommandClassName="ArtifactCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@childNodes.24/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Artifact"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5162" editPartClassName="ArtifactNameEditPart" itemSemanticEditPolicyClassName="ArtifactNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6097" editPartClassName="ArtifactFloatingLabelEditPart" itemSemanticEditPolicyClassName="ArtifactFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2080" editPartClassName="InformationItemEditPart" itemSemanticEditPolicyClassName="InformationItemItemSemanticEditPolicy" canonicalEditPolicyClassName="InformationItemCanonicalEditPolicy" graphicalNodeEditPolicyClassName="InformationItemGraphicalNodeEditPolicy" createCommandClassName="InformationItemCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@childNodes.25/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure">

-          <attributes xsi:type="gmfgen:DefaultSizeAttributes" width="80" height="40"/>

-        </viewmap>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationItem"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.7">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/isAbstract"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5163" editPartClassName="InformationItemNameEditPart" itemSemanticEditPolicyClassName="InformationItemNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6098" editPartClassName="InformationItemFloatingLabelEditPart" itemSemanticEditPolicyClassName="InformationItemFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2081" editPartClassName="SignalEditPart" itemSemanticEditPolicyClassName="SignalItemSemanticEditPolicy" canonicalEditPolicyClassName="SignalCanonicalEditPolicy" graphicalNodeEditPolicyClassName="SignalGraphicalNodeEditPolicy" createCommandClassName="SignalCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@childNodes.26/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Signal"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5164" editPartClassName="SignalNameEditPart" itemSemanticEditPolicyClassName="SignalNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6099" editPartClassName="SignalFloatingLabelEditPart" itemSemanticEditPolicyClassName="SignalFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2082" editPartClassName="UseCaseEditPart" itemSemanticEditPolicyClassName="UseCaseItemSemanticEditPolicy" canonicalEditPolicyClassName="UseCaseCanonicalEditPolicy" graphicalNodeEditPolicyClassName="UseCaseGraphicalNodeEditPolicy" createCommandClassName="UseCaseCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@childNodes.27/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/UseCase"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5165" editPartClassName="UseCaseNameEditPart" itemSemanticEditPolicyClassName="UseCaseNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6100" editPartClassName="UseCaseFloatingLabelEditPart" itemSemanticEditPolicyClassName="UseCaseFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2083" editPartClassName="SignalEventEditPart" itemSemanticEditPolicyClassName="SignalEventItemSemanticEditPolicy" canonicalEditPolicyClassName="SignalEventCanonicalEditPolicy" graphicalNodeEditPolicyClassName="SignalEventGraphicalNodeEditPolicy" createCommandClassName="SignalEventCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="SignalEventEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/SignalEvent"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5166" editPartClassName="SignalEventNameEditPart" itemSemanticEditPolicyClassName="SignalEventNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6101" editPartClassName="SignalEventFloatingLabelEditPart" itemSemanticEditPolicyClassName="SignalEventFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2084" editPartClassName="CallEventEditPart" itemSemanticEditPolicyClassName="CallEventItemSemanticEditPolicy" canonicalEditPolicyClassName="CallEventCanonicalEditPolicy" graphicalNodeEditPolicyClassName="CallEventGraphicalNodeEditPolicy" createCommandClassName="CallEventCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="CallEventEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CallEvent"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5167" editPartClassName="CallEventNameEditPart" itemSemanticEditPolicyClassName="CallEventNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6102" editPartClassName="CallEventFloatingLabelEditPart" itemSemanticEditPolicyClassName="CallEventFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2085" editPartClassName="AnyReceiveEventEditPart" itemSemanticEditPolicyClassName="AnyReceiveEventItemSemanticEditPolicy" canonicalEditPolicyClassName="AnyReceiveEventCanonicalEditPolicy" graphicalNodeEditPolicyClassName="AnyReceiveEventGraphicalNodeEditPolicy" createCommandClassName="AnyReceiveEventCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="AnyReceiveEventEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/AnyReceiveEvent"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5168" editPartClassName="AnyReceiveEventNameEditPart" itemSemanticEditPolicyClassName="AnyReceiveEventNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6103" editPartClassName="AnyReceiveEventFloatingLabelEditPart" itemSemanticEditPolicyClassName="AnyReceiveEventFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2088" editPartClassName="ChangeEventEditPart" itemSemanticEditPolicyClassName="ChangeEventItemSemanticEditPolicy" canonicalEditPolicyClassName="ChangeEventCanonicalEditPolicy" graphicalNodeEditPolicyClassName="ChangeEventGraphicalNodeEditPolicy" createCommandClassName="ChangeEventCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ChangeEventEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ChangeEvent"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5171" editPartClassName="ChangeEventNameEditPart" itemSemanticEditPolicyClassName="ChangeEventNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6104" editPartClassName="ChangeEventFloatingLabelEditPart" itemSemanticEditPolicyClassName="ChangeEventFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2089" editPartClassName="TimeEventEditPart" itemSemanticEditPolicyClassName="TimeEventItemSemanticEditPolicy" canonicalEditPolicyClassName="TimeEventCanonicalEditPolicy" graphicalNodeEditPolicyClassName="TimeEventGraphicalNodeEditPolicy" createCommandClassName="TimeEventCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="TimeEventEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeEvent"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5172" editPartClassName="TimeEventNameEditPart" itemSemanticEditPolicyClassName="TimeEventNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6105" editPartClassName="TimeEventFloatingLabelEditPart" itemSemanticEditPolicyClassName="TimeEventFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2093" editPartClassName="DurationObservationEditPart" itemSemanticEditPolicyClassName="DurationObservationItemSemanticEditPolicy" canonicalEditPolicyClassName="DurationObservationCanonicalEditPolicy" graphicalNodeEditPolicyClassName="DurationObservationGraphicalNodeEditPolicy" createCommandClassName="DurationObservationCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="DurationObservationEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure">

-          <attributes xsi:type="gmfgen:DefaultSizeAttributes" width="20" height="20"/>

-        </viewmap>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="5151" editPartClassName="DurationObservationNameEditPart" itemSemanticEditPolicyClassName="DurationObservationNameItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25" y="3"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="5152" editPartClassName="DurationObservationStereotypeLabelEditPart" itemSemanticEditPolicyClassName="DurationObservationStereotypeLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25" y="-10"/>

-          </viewmap>

-          <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2094" editPartClassName="TimeObservationEditPart" itemSemanticEditPolicyClassName="TimeObservationItemSemanticEditPolicy" canonicalEditPolicyClassName="TimeObservationCanonicalEditPolicy" graphicalNodeEditPolicyClassName="TimeObservationGraphicalNodeEditPolicy" createCommandClassName="TimeObservationCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="TimeObservationEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure">

-          <attributes xsi:type="gmfgen:DefaultSizeAttributes" width="20" height="20"/>

-        </viewmap>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeObservation"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="5142" editPartClassName="TimeObservationNameEditPart" itemSemanticEditPolicyClassName="TimeObservationNameItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25" y="3"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="5143" editPartClassName="TimeObservationStereotypeLabelEditPart" itemSemanticEditPolicyClassName="TimeObservationStereotypeLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25" y="-10"/>

-          </viewmap>

-          <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2095" editPartClassName="LiteralBooleanEditPart" itemSemanticEditPolicyClassName="LiteralBooleanItemSemanticEditPolicy" canonicalEditPolicyClassName="LiteralBooleanCanonicalEditPolicy" graphicalNodeEditPolicyClassName="LiteralBooleanGraphicalNodeEditPolicy" createCommandClassName="LiteralBooleanCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="LiteralBooleanEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralBoolean"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5178" editPartClassName="LiteralBooleanNameEditPart" itemSemanticEditPolicyClassName="LiteralBooleanNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6106" editPartClassName="LiteralBooleanFloatingLabelEditPart" itemSemanticEditPolicyClassName="LiteralBooleanFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2096" editPartClassName="LiteralIntegerEditPart" itemSemanticEditPolicyClassName="LiteralIntegerItemSemanticEditPolicy" canonicalEditPolicyClassName="LiteralIntegerCanonicalEditPolicy" graphicalNodeEditPolicyClassName="LiteralIntegerGraphicalNodeEditPolicy" createCommandClassName="LiteralIntegerCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="LiteralIntegerEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralInteger"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5179" editPartClassName="LiteralIntegerNameEditPart" itemSemanticEditPolicyClassName="LiteralIntegerNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6107" editPartClassName="LiteralIntegerFloatingLabelEditPart" itemSemanticEditPolicyClassName="LiteralIntegerFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2097" editPartClassName="LiteralNullEditPart" itemSemanticEditPolicyClassName="LiteralNullItemSemanticEditPolicy" canonicalEditPolicyClassName="LiteralNullCanonicalEditPolicy" graphicalNodeEditPolicyClassName="LiteralNullGraphicalNodeEditPolicy" createCommandClassName="LiteralNullCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="LiteralNullEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralNull"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5180" editPartClassName="LiteralNullNameEditPart" itemSemanticEditPolicyClassName="LiteralNullNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6108" editPartClassName="LiteralNullFloatingLabelEditPart" itemSemanticEditPolicyClassName="LiteralNullFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2098" editPartClassName="LiteralStringEditPart" itemSemanticEditPolicyClassName="LiteralStringItemSemanticEditPolicy" canonicalEditPolicyClassName="LiteralStringCanonicalEditPolicy" graphicalNodeEditPolicyClassName="LiteralStringGraphicalNodeEditPolicy" createCommandClassName="LiteralStringCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="LiteralStringEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralString"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5181" editPartClassName="LiteralStringNameEditPart" itemSemanticEditPolicyClassName="LiteralStringNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6109" editPartClassName="LiteralStringFloatingLabelEditPart" itemSemanticEditPolicyClassName="LiteralStringFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2099" editPartClassName="LiteralUnlimitedNaturalEditPart" itemSemanticEditPolicyClassName="LiteralUnlimitedNaturalItemSemanticEditPolicy" canonicalEditPolicyClassName="LiteralUnlimitedNaturalCanonicalEditPolicy" graphicalNodeEditPolicyClassName="LiteralUnlimitedNaturalGraphicalNodeEditPolicy" createCommandClassName="LiteralUnlimitedNaturalCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="LiteralUnlimitedNaturalEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralUnlimitedNatural"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5182" editPartClassName="LiteralUnlimitedNaturalNameEditPart" itemSemanticEditPolicyClassName="LiteralUnlimitedNaturalNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6110" editPartClassName="LiteralUnlimitedNaturalFloatingLabelEditPart" itemSemanticEditPolicyClassName="LiteralUnlimitedNaturalFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2100" editPartClassName="StringExpressionEditPart" itemSemanticEditPolicyClassName="StringExpressionItemSemanticEditPolicy" canonicalEditPolicyClassName="StringExpressionCanonicalEditPolicy" graphicalNodeEditPolicyClassName="StringExpressionGraphicalNodeEditPolicy" createCommandClassName="StringExpressionCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="StringExpressionEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StringExpression"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5183" editPartClassName="StringExpressionNameEditPart" itemSemanticEditPolicyClassName="StringExpressionNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6111" editPartClassName="StringExpressionFloatingLabelEditPart" itemSemanticEditPolicyClassName="StringExpressionFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2101" editPartClassName="OpaqueExpressionEditPart" itemSemanticEditPolicyClassName="OpaqueExpressionItemSemanticEditPolicy" canonicalEditPolicyClassName="OpaqueExpressionCanonicalEditPolicy" graphicalNodeEditPolicyClassName="OpaqueExpressionGraphicalNodeEditPolicy" createCommandClassName="OpaqueExpressionCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="OpaqueExpressionEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/OpaqueExpression"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5184" editPartClassName="OpaqueExpressionNameEditPart" itemSemanticEditPolicyClassName="OpaqueExpressionNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6112" editPartClassName="OpaqueExpressionFloatingLabelEditPart" itemSemanticEditPolicyClassName="OpaqueExpressionFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2102" editPartClassName="TimeExpressionEditPart" itemSemanticEditPolicyClassName="TimeExpressionItemSemanticEditPolicy" canonicalEditPolicyClassName="TimeExpressionCanonicalEditPolicy" graphicalNodeEditPolicyClassName="TimeExpressionGraphicalNodeEditPolicy" createCommandClassName="TimeExpressionCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="TimeExpressionEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeExpression"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5185" editPartClassName="TimeExpressionNameEditPart" itemSemanticEditPolicyClassName="TimeExpressionNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6113" editPartClassName="TimeExpressionFloatingLabelEditPart" itemSemanticEditPolicyClassName="TimeExpressionFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2103" editPartClassName="ExpressionEditPart" itemSemanticEditPolicyClassName="ExpressionItemSemanticEditPolicy" canonicalEditPolicyClassName="ExpressionCanonicalEditPolicy" graphicalNodeEditPolicyClassName="ExpressionGraphicalNodeEditPolicy" createCommandClassName="ExpressionCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ExpressionEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Expression"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5186" editPartClassName="ExpressionNameEditPart" itemSemanticEditPolicyClassName="ExpressionNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6114" editPartClassName="ExpressionFloatingLabelEditPart" itemSemanticEditPolicyClassName="ExpressionFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2104" editPartClassName="DurationEditPart" itemSemanticEditPolicyClassName="DurationItemSemanticEditPolicy" canonicalEditPolicyClassName="DurationCanonicalEditPolicy" graphicalNodeEditPolicyClassName="DurationGraphicalNodeEditPolicy" createCommandClassName="DurationCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="DurationEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Duration"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5187" editPartClassName="DurationNameEditPart" itemSemanticEditPolicyClassName="DurationNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6115" editPartClassName="DurationFloatingLabelEditPart" itemSemanticEditPolicyClassName="DurationFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2105" editPartClassName="TimeIntervalEditPart" itemSemanticEditPolicyClassName="TimeIntervalItemSemanticEditPolicy" canonicalEditPolicyClassName="TimeIntervalCanonicalEditPolicy" graphicalNodeEditPolicyClassName="TimeIntervalGraphicalNodeEditPolicy" createCommandClassName="TimeIntervalCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="TimeIntervalEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeInterval"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5188" editPartClassName="TimeIntervalNameEditPart" itemSemanticEditPolicyClassName="TimeIntervalNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6116" editPartClassName="TimeIntervalFloatingLabelEditPart" itemSemanticEditPolicyClassName="TimeIntervalFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2106" editPartClassName="DurationIntervalEditPart" itemSemanticEditPolicyClassName="DurationIntervalItemSemanticEditPolicy" canonicalEditPolicyClassName="DurationIntervalCanonicalEditPolicy" graphicalNodeEditPolicyClassName="DurationIntervalGraphicalNodeEditPolicy" createCommandClassName="DurationIntervalCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="DurationIntervalEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationInterval"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5189" editPartClassName="DurationIntervalNameEditPart" itemSemanticEditPolicyClassName="DurationIntervalNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6117" editPartClassName="DurationIntervalFloatingLabelEditPart" itemSemanticEditPolicyClassName="DurationIntervalFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2107" editPartClassName="IntervalEditPart" itemSemanticEditPolicyClassName="IntervalItemSemanticEditPolicy" canonicalEditPolicyClassName="IntervalCanonicalEditPolicy" graphicalNodeEditPolicyClassName="IntervalGraphicalNodeEditPolicy" createCommandClassName="IntervalCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="IntervalEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interval"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5190" editPartClassName="IntervalNameEditPart" itemSemanticEditPolicyClassName="IntervalNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6118" editPartClassName="IntervalFloatingLabelEditPart" itemSemanticEditPolicyClassName="IntervalFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2108" editPartClassName="InstanceValueEditPart" itemSemanticEditPolicyClassName="InstanceValueItemSemanticEditPolicy" canonicalEditPolicyClassName="InstanceValueCanonicalEditPolicy" graphicalNodeEditPolicyClassName="InstanceValueGraphicalNodeEditPolicy" createCommandClassName="InstanceValueCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="InstanceValueEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InstanceValue"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5191" editPartClassName="InstanceValueNameEditPart" itemSemanticEditPolicyClassName="InstanceValueNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6119" editPartClassName="InstanceValueFloatingLabelEditPart" itemSemanticEditPolicyClassName="InstanceValueFloatingLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2109" editPartClassName="CommentEditPart" itemSemanticEditPolicyClassName="CommentItemSemanticEditPolicy" canonicalEditPolicyClassName="CommentCanonicalEditPolicy" graphicalNodeEditPolicyClassName="CommentGraphicalNodeEditPolicy" createCommandClassName="CommentCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@childNodes.28/@elementType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusReflowableShapeEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.12">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5192" editPartClassName="CommentBodyEditPart" itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCornerBentFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.3">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2110" editPartClassName="DurationConstraintEditPart" itemSemanticEditPolicyClassName="DurationConstraintItemSemanticEditPolicy" canonicalEditPolicyClassName="DurationConstraintCanonicalEditPolicy" graphicalNodeEditPolicyClassName="DurationConstraintGraphicalNodeEditPolicy" createCommandClassName="DurationConstraintCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:SpecializationType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationConstraint"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.15">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5193" editPartClassName="DurationConstraintNameEditPart" itemSemanticEditPolicyClassName="DurationConstraintNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6035" editPartClassName="DurationConstraintSpecificationEditPart" itemSemanticEditPolicyClassName="DurationConstraintSpecificationItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getConstraintFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.4">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            <editableMetaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2111" editPartClassName="TimeConstraintEditPart" itemSemanticEditPolicyClassName="TimeConstraintItemSemanticEditPolicy" canonicalEditPolicyClassName="TimeConstraintCanonicalEditPolicy" graphicalNodeEditPolicyClassName="TimeConstraintGraphicalNodeEditPolicy" createCommandClassName="TimeConstraintCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="TimeConstraintEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeConstraint"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.16">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5194" editPartClassName="TimeConstraintNameEditPart" itemSemanticEditPolicyClassName="TimeConstraintNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6036" editPartClassName="TimeConstraintSpecificationEditPart" itemSemanticEditPolicyClassName="TimeConstraintSpecificationItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getConstraintFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.4">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            <editableMetaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2112" editPartClassName="IntervalConstraintEditPart" itemSemanticEditPolicyClassName="IntervalConstraintItemSemanticEditPolicy" canonicalEditPolicyClassName="IntervalConstraintCanonicalEditPolicy" graphicalNodeEditPolicyClassName="IntervalConstraintGraphicalNodeEditPolicy" createCommandClassName="IntervalConstraintCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="IntervalConstraintEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/IntervalConstraint"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.14">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5195" editPartClassName="IntervalConstraintNameEditPart" itemSemanticEditPolicyClassName="IntervalConstraintNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6037" editPartClassName="IntervalConstraintSpecificationEditPart" itemSemanticEditPolicyClassName="IntervalConstraintSpecificationItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getConstraintFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.4">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            <editableMetaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2113" editPartClassName="InteractionConstraintEditPart" itemSemanticEditPolicyClassName="InteractionConstraintItemSemanticEditPolicy" canonicalEditPolicyClassName="InteractionConstraintCanonicalEditPolicy" graphicalNodeEditPolicyClassName="InteractionConstraintGraphicalNodeEditPolicy" createCommandClassName="InteractionConstraintCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="InteractionConstraintEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionConstraint"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.13">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5196" editPartClassName="InteractionConstraintNameEditPart" itemSemanticEditPolicyClassName="InteractionConstraintNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6038" editPartClassName="InteractionConstraintSpecificationEditPart" itemSemanticEditPolicyClassName="InteractionConstraintSpecificationItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getConstraintFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.4">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            <editableMetaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <topLevelNodes visualID="2114" editPartClassName="ConstraintEditPart" itemSemanticEditPolicyClassName="ConstraintItemSemanticEditPolicy" canonicalEditPolicyClassName="ConstraintCanonicalEditPolicy" graphicalNodeEditPolicyClassName="ConstraintGraphicalNodeEditPolicy" createCommandClassName="ConstraintCreateCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ConstraintEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

-        <modelFacet>

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.13">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            </initializers>

-          </modelElementInitializer>

-        </modelFacet>

-        <labels visualID="5197" editPartClassName="ConstraintNameEditPart" itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6039" editPartClassName="ConstraintSpecificationEditPart" itemSemanticEditPolicyClassName="ConstraintSpecificationItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getConstraintFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure"/>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.4">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-            <editableMetaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>

-          </modelFacet>

-        </labels>

-      </topLevelNodes>

-      <links visualID="4022" editPartClassName="BehaviorPortLinkEditPart" itemSemanticEditPolicyClassName="BehaviorPortLinkItemSemanticEditPolicy" createCommandClassName="BehaviorPortLinkCreateCommand" reorientCommandClassName="BehaviorPortLinkReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:NotationType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoConnectableEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.COMPONENT_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoDeleteFromDiagramEditPolicy"/>

-      </links>

-      <links visualID="4001" editPartClassName="LinkDescriptorEditPart" itemSemanticEditPolicyClassName="LinkDescriptorItemSemanticEditPolicy" createCommandClassName="LinkDescriptorCreateCommand" reorientCommandClassName="LinkDescriptorReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:NotationType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>

-      </links>

-      <links visualID="4002" editPartClassName="CommentAnnotatedElementEditPart" itemSemanticEditPolicyClassName="CommentAnnotatedElementItemSemanticEditPolicy" createCommandClassName="CommentAnnotatedElementCreateCommand" reorientCommandClassName="CommentAnnotatedElementReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:SpecializationType" displayName="CommentAnnotatedElement"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>

-        <modelFacet xsi:type="gmfgen:FeatureLinkModelFacet">

-          <metaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/annotatedElement"/>

-        </modelFacet>

-      </links>

-      <links visualID="4003" editPartClassName="ConstraintConstrainedElementEditPart" itemSemanticEditPolicyClassName="ConstraintConstrainedElementItemSemanticEditPolicy" createCommandClassName="ConstraintConstrainedElementCreateCommand" reorientCommandClassName="ConstraintConstrainedElementReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:SpecializationType" displayName="ConstraintConstrainedElement"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>

-        <modelFacet xsi:type="gmfgen:FeatureLinkModelFacet">

-          <metaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/constrainedElement"/>

-        </modelFacet>

-      </links>

-      <links visualID="4004" editPartClassName="ComponentRealizationEditPart" itemSemanticEditPolicyClassName="ComponentRealizationItemSemanticEditPolicy" createCommandClassName="ComponentRealizationCreateCommand" reorientCommandClassName="ComponentRealizationReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ComponentRealizationEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

-        <modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ComponentRealization"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-          <sourceMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

-          <targetMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

-        </modelFacet>

-        <labels visualID="6001" editPartClassName="ComponentRealizationNameEditPart" itemSemanticEditPolicyClassName="ComponentRealizationNameItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6015" editPartClassName="ComponentRealizationAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="ComponentRealizationAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAppliedStereotypeLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </links>

-      <links visualID="4005" editPartClassName="InterfaceRealizationEditPart" itemSemanticEditPolicyClassName="InterfaceRealizationItemSemanticEditPolicy" createCommandClassName="InterfaceRealizationCreateCommand" reorientCommandClassName="InterfaceRealizationReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="InterfaceRealizationEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

-        <modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InterfaceRealization"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-          <sourceMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

-          <targetMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

-        </modelFacet>

-        <labels visualID="6002" editPartClassName="InterfaceRealizationNameEditPart" itemSemanticEditPolicyClassName="InterfaceRealizationNameItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6016" editPartClassName="InterfaceRealizationAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="InterfaceRealizationAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAppliedStereotypeLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </links>

-      <links visualID="4011" editPartClassName="SubstitutionEditPart" itemSemanticEditPolicyClassName="SubstitutionItemSemanticEditPolicy" createCommandClassName="SubstitutionCreateCommand" reorientCommandClassName="SubstitutionReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="SubstitutionEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeSubstitutionLabelDisplayEditPolicy"/>

-        <modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Substitution"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-          <sourceMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

-          <targetMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

-        </modelFacet>

-        <labels visualID="6003" editPartClassName="SubstitutionNameEditPart" itemSemanticEditPolicyClassName="SubstitutionNameItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6017" editPartClassName="SubstitutionAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="SubstitutionAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAppliedStereotypeLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </links>

-      <links visualID="4006" editPartClassName="RealizationEditPart" itemSemanticEditPolicyClassName="RealizationItemSemanticEditPolicy" createCommandClassName="RealizationCreateCommand" reorientCommandClassName="RealizationReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="RealizationEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

-        <modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Realization"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-          <sourceMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

-          <targetMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

-        </modelFacet>

-        <labels visualID="6004" editPartClassName="RealizationNameEditPart" itemSemanticEditPolicyClassName="RealizationNameItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6018" editPartClassName="RealizationAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="RealizationAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAppliedStereotypeLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </links>

-      <links visualID="4012" editPartClassName="ManifestationEditPart" itemSemanticEditPolicyClassName="ManifestationItemSemanticEditPolicy" createCommandClassName="ManifestationCreateCommand" reorientCommandClassName="ManifestationReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ManifestationEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeManifestationLabelDisplayEditPolicy"/>

-        <modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Manifestation"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-          <sourceMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

-          <targetMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

-        </modelFacet>

-        <labels visualID="6005" editPartClassName="ManifestationNameEditPart" itemSemanticEditPolicyClassName="ManifestationNameItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6019" editPartClassName="ManifestationAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="ManifestationAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAppliedStereotypeLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </links>

-      <links visualID="4007" editPartClassName="AbstractionEditPart" itemSemanticEditPolicyClassName="AbstractionItemSemanticEditPolicy" createCommandClassName="AbstractionCreateCommand" reorientCommandClassName="AbstractionReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="AbstractionEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy"/>

-        <modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Abstraction"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-          <sourceMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

-          <targetMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

-        </modelFacet>

-        <labels visualID="6006" editPartClassName="AbstractionNameEditPart" itemSemanticEditPolicyClassName="AbstractionNameItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6020" editPartClassName="AbstractionAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="AbstractionAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAppliedStereotypeLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </links>

-      <links visualID="4008" editPartClassName="UsageEditPart" itemSemanticEditPolicyClassName="UsageItemSemanticEditPolicy" createCommandClassName="UsageCreateCommand" reorientCommandClassName="UsageReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="UsageEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy"/>

-        <modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Usage"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-          <sourceMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

-          <targetMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

-        </modelFacet>

-        <labels visualID="6007" editPartClassName="UsageNameEditPart" itemSemanticEditPolicyClassName="UsageNameItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6021" editPartClassName="UsageAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="UsageAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAppliedStereotypeLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </links>

-      <links visualID="4009" editPartClassName="DeploymentEditPart" itemSemanticEditPolicyClassName="DeploymentItemSemanticEditPolicy" createCommandClassName="DeploymentCreateCommand" reorientCommandClassName="DeploymentReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="DeploymentEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeDeploymentLabelDisplayEditPolicy"/>

-        <modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Deployment"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-          <sourceMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

-          <targetMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

-        </modelFacet>

-        <labels visualID="6008" editPartClassName="DeploymentNameEditPart" itemSemanticEditPolicyClassName="DeploymentNameItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6022" editPartClassName="DeploymentAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="DeploymentAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAppliedStereotypeLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </links>

-      <links visualID="4017" editPartClassName="RoleBindingEditPart" itemSemanticEditPolicyClassName="RoleBindingItemSemanticEditPolicy" sourceReorientingAllowed="false" createCommandClassName="RoleBindingCreateCommand" reorientCommandClassName="RoleBindingReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:MetamodelType" uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017" displayName="RoleBinding" editHelperClassName="RoleBindingEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.RoleBindingFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

-        <modelFacet xsi:type="gmfgen:TypeLinkModelFacet" modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.4">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <sourceMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

-          <targetMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

-        </modelFacet>

-        <labels visualID="6027" editPartClassName="RoleBindingRoleNameEditPart" itemSemanticEditPolicyClassName="RoleBindingRoleNameItemSemanticEditPolicy" readOnly="true" alignment="SOURCE">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getRoleLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="20"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.2">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6028" editPartClassName="RoleBindingAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="RoleBindingAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAppliedStereotypeLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <creationConstraints sourceEnd="/0/@expressionProviders/@providers.0/@expressions.5" targetEnd="/0/@expressionProviders/@providers.0/@expressions.6"/>

-      </links>

-      <links visualID="4010" editPartClassName="DependencyEditPart" itemSemanticEditPolicyClassName="DependencyItemSemanticEditPolicy" createCommandClassName="DependencyCreateCommand" reorientCommandClassName="DependencyReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="DependencyEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

-        <modelFacet xsi:type="gmfgen:TypeLinkModelFacet" modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.3">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-          <sourceMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client"/>

-          <targetMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

-        </modelFacet>

-        <labels visualID="6009" editPartClassName="DependencyNameEditPart" itemSemanticEditPolicyClassName="DependencyNameItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6023" editPartClassName="DependencyAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="DependencyAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAppliedStereotypeLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </links>

-      <links visualID="4013" editPartClassName="ConnectorEditPart" itemSemanticEditPolicyClassName="ConnectorItemSemanticEditPolicy" createCommandClassName="ConnectorCreateCommand" reorientCommandClassName="ConnectorReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ConnectorEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ConnectorFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

-        <modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedConnector"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedConnector"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-          <sourceMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end"/>

-          <targetMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end"/>

-        </modelFacet>

-        <labels visualID="6025" editPartClassName="ConnectorAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="ConnectorAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAppliedStereotypeLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6050" editPartClassName="ConnectorNameEditPart" itemSemanticEditPolicyClassName="ConnectorNameItemSemanticEditPolicy" elementIcon="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="-20"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6051" editPartClassName="ConnectorMultiplicitySourceEditPart" itemSemanticEditPolicyClassName="ConnectorMultiplicitySourceItemSemanticEditPolicy" readOnly="true" alignment="SOURCE">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getMultiplicitySourceLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="20"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="sourceMul{0}" editorPattern="sourceMul{0}" editPattern="sourceMul{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <labels visualID="6052" editPartClassName="ConnectorMultiplicityTargetEditPart" itemSemanticEditPolicyClassName="ConnectorMultiplicityTargetItemSemanticEditPolicy" readOnly="true" alignment="TARGET">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getMultiplicityTargetLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="20"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="targetMul{0}" editorPattern="targetMul{0}" editPattern="targetMul{0}">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-      </links>

-      <links visualID="4015" editPartClassName="GeneralizationEditPart" itemSemanticEditPolicyClassName="GeneralizationItemSemanticEditPolicy" createCommandClassName="GeneralizationCreateCommand" reorientCommandClassName="GeneralizationReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="GeneralizationEditHelper"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

-        <modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/generalization"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/generalization"/>

-          <sourceMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/specific"/>

-          <targetMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/general"/>

-        </modelFacet>

-        <labels visualID="6024" editPartClassName="GeneralizationAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="GeneralizationAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAppliedStereotypeLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/isSubstitutable"/>

-          </modelFacet>

-        </labels>

-      </links>

-      <links visualID="4018" editPartClassName="TimeObservationEventEditPart" itemSemanticEditPolicyClassName="TimeObservationEventSemanticEditPolicy" createCommandClassName="TimeObservationEventCreateCommand" reorientCommandClassName="TimeObservationEventReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:SpecializationType" displayName="TimeObservationEvent"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>

-        <modelFacet xsi:type="gmfgen:FeatureLinkModelFacet">

-          <metaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeObservation/event"/>

-        </modelFacet>

-      </links>

-      <links visualID="4019" editPartClassName="DurationObservationEventEditPart" itemSemanticEditPolicyClassName="DurationObservationEventItemSemanticEditPolicy" createCommandClassName="DurationObservationEventCreateCommand" reorientCommandClassName="DurationObservationEventReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:SpecializationType" displayName="DurationObservationEvent"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure"/>

-        <modelFacet xsi:type="gmfgen:FeatureLinkModelFacet">

-          <metaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation/event"/>

-        </modelFacet>

-      </links>

-      <links visualID="4020" editPartClassName="RepresentationEditPart" itemSemanticEditPolicyClassName="RepresentationItemSemanticEditPolicy" createCommandClassName="RepresentationCreateCommand" reorientCommandClassName="RepresentationReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:SpecializationType" uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.RepresentationFigure">

-          <attributes xsi:type="gmfgen:ColorAttributes" foregroundColor="black"/>

-        </viewmap>

-        <modelFacet xsi:type="gmfgen:FeatureLinkModelFacet">

-          <metaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationItem/represented"/>

-        </modelFacet>

-        <labels visualID="6030" editPartClassName="RepresentationTagLabelEditPart" itemSemanticEditPolicyClassName="RepresentationTagLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getTagLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="15"/>

-          </viewmap>

-        </labels>

-        <creationConstraints targetEnd="/0/@expressionProviders/@providers.0/@expressions.8"/>

-      </links>

-      <links visualID="4021" editPartClassName="InformationFlowEditPart" itemSemanticEditPolicyClassName="InformationFlowItemSemanticEditPolicy" createCommandClassName="InformationFlowCreateCommand" reorientCommandClassName="InformationFlowReorientCommand">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

-        <elementType xsi:type="gmfgen:MetamodelType"/>

-        <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationFlowFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeInformationFlowLabelDisplayEditPolicy"/>

-        <modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

-          <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationFlow"/>

-          <containmentMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <childMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>

-          <modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

-            <initializers xsi:type="gmfgen:GenFeatureValueSpec" value="/0/@expressionProviders/@providers.0/@expressions.0">

-              <feature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-            </initializers>

-          </modelElementInitializer>

-          <sourceMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationFlow/informationSource"/>

-          <targetMetaFeature href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationFlow/informationTarget"/>

-        </modelFacet>

-        <labels visualID="6031" editPartClassName="InformationFlowConveyedLabelEditPart" itemSemanticEditPolicyClassName="InformationFlowConveyedLabelItemSemanticEditPolicy">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getConveyedLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30"/>

-          </viewmap>

-          <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.AbstractCustomLabelEditPolicy.SPECIFIC_NAME_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.InformationFlowCustomLabelEditPolicy"/>

-        </labels>

-        <labels visualID="6032" editPartClassName="InformationFlowAppliedStereotypeEditPart" itemSemanticEditPolicyClassName="InformationFlowAppliedStereotypeItemSemanticEditPolicy" readOnly="true">

-          <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-          <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAppliedStereotypeLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

-            <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="15"/>

-          </viewmap>

-          <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>" editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

-            <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

-          </modelFacet>

-        </labels>

-        <creationConstraints sourceEnd="/0/@expressionProviders/@providers.0/@expressions.9" targetEnd="/0/@expressionProviders/@providers.0/@expressions.10"/>

-      </links>

-      <compartments visualID="7033" editPartClassName="DataTypeAttributeCompartmentEditPart" itemSemanticEditPolicyClassName="DataTypeAttributeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="DataTypeAttributeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.34" title="attributes" node="/0/@diagram/@topLevelNodes.15">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAttributeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7034" editPartClassName="DataTypeOperationCompartmentEditPart" itemSemanticEditPolicyClassName="DataTypeOperationCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="DataTypeOperationCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.35" title="operations" node="/0/@diagram/@topLevelNodes.15">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getOperationCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7036" editPartClassName="DataTypeAttributeCompartmentEditPartCN" itemSemanticEditPolicyClassName="DataTypeAttributeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="DataTypeAttributeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.34" title="attributes" node="/0/@diagram/@childNodes.21">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAttributeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7037" editPartClassName="DataTypeOperationCompartmentEditPartCN" itemSemanticEditPolicyClassName="DataTypeOperationCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="DataTypeOperationCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.35" title="operations" node="/0/@diagram/@childNodes.21">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getOperationCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7048" editPartClassName="EnumerationEnumerationLiteralCompartmentEditPart" itemSemanticEditPolicyClassName="EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.36" title="literals" node="/0/@diagram/@topLevelNodes.14">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getEnumerationLiteralCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7049" editPartClassName="EnumerationEnumerationLiteralCompartmentEditPartCN" itemSemanticEditPolicyClassName="EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.36" title="literals" node="/0/@diagram/@childNodes.20">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getEnumerationLiteralCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7050" editPartClassName="ActivityCompositeCompartmentEditPartCN" itemSemanticEditPolicyClassName="ActivityCompositeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ActivityCompositeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@childNodes.6" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7051" editPartClassName="InteractionCompositeCompartmentEditPartCN" itemSemanticEditPolicyClassName="InteractionCompositeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="InteractionCompositeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@childNodes.7" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7052" editPartClassName="ProtocolStateMachineCompositeCompartmentEditPartCN" itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ProtocolStateMachineCompositeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@childNodes.8" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7053" editPartClassName="StateMachineCompositeCompartmentEditPartCN" itemSemanticEditPolicyClassName="StateMachineCompositeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="StateMachineCompositeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@childNodes.9" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7054" editPartClassName="FunctionBehaviorCompositeCompartmentEditPartCN" itemSemanticEditPolicyClassName="FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="FunctionBehaviorCompositeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@childNodes.10" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7055" editPartClassName="OpaqueBehaviorCompositeCompartmentEditPartCN" itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="OpaqueBehaviorCompositeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@childNodes.11" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7056" editPartClassName="ComponentCompositeCompartmentEditPartCN" itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@childNodes.12" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7057" editPartClassName="DeviceCompositeCompartmentEditPartCN" itemSemanticEditPolicyClassName="DeviceCompositeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="DeviceCompositeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@childNodes.13" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7058" editPartClassName="ExecutionEnvironmentCompositeCompartmentEditPartCN" itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@childNodes.14" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7059" editPartClassName="NodeCompositeCompartmentEditPartCN" itemSemanticEditPolicyClassName="NodeCompositeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="NodeCompositeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@childNodes.15" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7060" editPartClassName="ClassCompositeCompartmentEditPartCN" itemSemanticEditPolicyClassName="ClassCompositeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="ClassCompositeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.0" title="internal structure" node="/0/@diagram/@childNodes.16" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7061" editPartClassName="CollaborationCompositeCompartmentEditPartCN" itemSemanticEditPolicyClassName="CollaborationCompositeCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="CollaborationCompositeCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@childNodes.17" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationCompositeCompartmentItemSemanticEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7063" editPartClassName="ActivityCompositeCompartmentEditPart" itemSemanticEditPolicyClassName="ActivityCompositeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="ActivityCompositeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@topLevelNodes.0" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7064" editPartClassName="InteractionCompositeCompartmentEditPart" itemSemanticEditPolicyClassName="InteractionCompositeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="InteractionCompositeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@topLevelNodes.1" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7065" editPartClassName="ProtocolStateMachineCompositeCompartmentEditPart" itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="ProtocolStateMachineCompositeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@topLevelNodes.2" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7066" editPartClassName="StateMachineCompositeCompartmentEditPart" itemSemanticEditPolicyClassName="StateMachineCompositeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="StateMachineCompositeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@topLevelNodes.3" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7067" editPartClassName="FunctionBehaviorCompositeCompartmentEditPart" itemSemanticEditPolicyClassName="FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="FunctionBehaviorCompositeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@topLevelNodes.4" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7068" editPartClassName="OpaqueBehaviorCompositeCompartmentEditPart" itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="OpaqueBehaviorCompositeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@topLevelNodes.5" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7069" editPartClassName="ComponentCompositeCompartmentEditPart" itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@topLevelNodes.6" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7070" editPartClassName="DeviceCompositeCompartmentEditPart" itemSemanticEditPolicyClassName="DeviceCompositeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="DeviceCompositeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@topLevelNodes.7" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7071" editPartClassName="ExecutionEnvironmentCompositeCompartmentEditPart" itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@topLevelNodes.8" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7072" editPartClassName="NodeCompositeCompartmentEditPart" itemSemanticEditPolicyClassName="NodeCompositeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="NodeCompositeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@topLevelNodes.9" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7073" editPartClassName="ClassCompositeCompartmentEditPart" itemSemanticEditPolicyClassName="ClassCompositeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="ClassCompositeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32" title="internal structure" node="/0/@diagram/@topLevelNodes.10" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7075" editPartClassName="CollaborationCompositeCompartmentEditPart" itemSemanticEditPolicyClassName="CollaborationCompositeCompartmentItemSemanticEditPolicy" canonicalEditPolicyClassName="CollaborationCompositeCompartmentCanonicalEditPolicy" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" title="internal structure" node="/0/@diagram/@topLevelNodes.11" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationCompositeCompartmentItemSemanticEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <compartments visualID="7077" editPartClassName="PropertyPartCompartmentEditPartCN" itemSemanticEditPolicyClassName="PropertyPartCompartmentItemSemanticEditPolicyCN" canonicalEditPolicyClassName="PropertyPartCompartmentCanonicalEditPolicyCN" childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.28" title="internal structure" node="/0/@diagram/@childNodes.3" listLayout="false">

-        <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

-        <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure" figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPropertyPartCompartmentItemSemanticEditPolicyCN"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy"/>

-        <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy"/>

-      </compartments>

-      <palette>

-        <groups title="Nodes" description="Nodes" largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" createMethodName="createNodesGroup" id="&quot;composite.group.nodes&quot;">

-          <entries xsi:type="gmfgen:ToolEntry" title="Class" description="Create new Class" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" createMethodName="createClassCreationTool" id="&quot;composite.tool.class&quot;" genNodes="/0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.16"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Property" description="Create new Property" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" createMethodName="createPropertyCreationTool" id="&quot;composite.tool.property&quot;" genNodes="/0/@diagram/@childNodes.3"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Port" description="Create new Port" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif" createMethodName="createPortCreationTool" id="&quot;composite.tool.port&quot;" genNodes="/0/@diagram/@childNodes.1"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Collaboration" description="Create new Collaboration" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif" createMethodName="createCollaborationCreationTool" id="&quot;composite.tool.collaboration&quot;" genNodes="/0/@diagram/@childNodes.17 /0/@diagram/@topLevelNodes.11"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="CollaborationRole" description="Create new CollaborationRole" largeIconPath="icons/obj16/CollaborationRole.gif" smallIconPath="icons/obj16/CollaborationRole.gif" createMethodName="createCollaborationRoleCreationTool" id="&quot;composite.tool.collaborationrole&quot;" genNodes="/0/@diagram/@childNodes.4"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="CollaborationUse" description="Create new CollaborationUse" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif" createMethodName="createCollaborationUseCreationTool" id="&quot;composite.tool.collaborationuse&quot;" genNodes="/0/@diagram/@childNodes.5"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Comment" description="Create new Comment" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif" createMethodName="createCommentCreationTool" id="&quot;composite.tool.comment&quot;" genNodes="/0/@diagram/@childNodes.28 /0/@diagram/@topLevelNodes.43"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Constraint" description="Create new Constraint" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" createMethodName="createConstraintCreationTool" id="&quot;composite.tool.constraint&quot;" genNodes="/0/@diagram/@topLevelNodes.48 /0/@diagram/@childNodes.33"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="TimeObservation" description="Create new TimeObservation" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif" createMethodName="createTimeObservationCreationTool" id="&quot;composite.tool.timeobservation&quot;" genNodes="/0/@diagram/@topLevelNodes.28"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="DurationObservation" description="Create new DurationObservation" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif" createMethodName="createDurationObservationCreationTool" id="&quot;composite.tool.durationobservation&quot;" genNodes="/0/@diagram/@topLevelNodes.27"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="InformationItem" description="Create new InformationItem" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif" createMethodName="createInformationItemCreationTool" id="&quot;composite.tool.informationitem&quot;" genNodes="/0/@diagram/@childNodes.25 /0/@diagram/@topLevelNodes.19"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Parameter" description="Create new Parameter" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif" createMethodName="createParameterCreationTool" id="&quot;composite.tool.parameter&quot;" genNodes="/0/@diagram/@childNodes.2"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Activity" description="Create new Activity" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif" createMethodName="createActivityCreationTool" id="&quot;composite.tool.activity&quot;" genNodes="/0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.0"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Interaction" description="Create new Interaction" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif" createMethodName="createInteractionCreationTool" id="&quot;composite.tool.interaction&quot;" genNodes="/0/@diagram/@childNodes.7 /0/@diagram/@topLevelNodes.1"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="ProtocolStateMachine" description="Create new ProtocolStateMachine" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif" createMethodName="createProtocolStateMachineCreationTool" id="&quot;composite.tool.protocolstatemachine&quot;" genNodes="/0/@diagram/@childNodes.8 /0/@diagram/@topLevelNodes.2"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="StateMachine" description="Create new StateMachine" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif" createMethodName="createStateMachineCreationTool" id="&quot;composite.tool.statemachine&quot;" genNodes="/0/@diagram/@childNodes.9 /0/@diagram/@topLevelNodes.3"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="FunctionBehavior" description="Create new FunctionBehavior" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif" createMethodName="createFunctionBehaviorCreationTool" id="&quot;composite.tool.functionbehavior&quot;" genNodes="/0/@diagram/@childNodes.10 /0/@diagram/@topLevelNodes.4"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="OpaqueBehavior" description="Create new OpaqueBehavior" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif" createMethodName="createOpaqueBehaviorCreationTool" id="&quot;composite.tool.opaquebehavior&quot;" genNodes="/0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.5"/>

-        </groups>

-        <groups title="Edges" description="Edges" largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" createMethodName="createEdgesGroup" id="&quot;composite.group.edges&quot;">

-          <entries xsi:type="gmfgen:ToolEntry" title="Link" description="Create new Link (Comment / Constraint)" largeIconPath="icons/obj16/Link.gif" smallIconPath="icons/obj16/Link.gif" createMethodName="createLinkCreationTool" id="&quot;composite.tool.link&quot;" genLinks="/0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.16 /0/@diagram/@links.17"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Connector" description="Create new Connector" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif" createMethodName="createConnectorCreationTool" id="&quot;composite.tool.connector&quot;" genLinks="/0/@diagram/@links.14"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="RoleBinding" description="Create new RoleBinding" largeIconPath="icons/obj16/CollaborationRoleBinding.gif" smallIconPath="icons/obj16/CollaborationRoleBinding.gif" createMethodName="createRoleBindingCreationTool" id="&quot;composite.tool.rolebinding&quot;" genLinks="/0/@diagram/@links.12"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Generalization" description="Create new Generalization" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif" createMethodName="createGeneralizationCreationTool" id="&quot;composite.tool.generalization&quot;" genLinks="/0/@diagram/@links.15"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Realization" description="Create new Realization" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif" createMethodName="createRealizationCreationTool" id="&quot;composite.tool.realization&quot;" genLinks="/0/@diagram/@links.7"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Substitution" description="Create new Substitution" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif" createMethodName="createSubstitutionCreationTool" id="&quot;composite.tool.substitution&quot;" genLinks="/0/@diagram/@links.6"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Abstraction" description="Create new Abstraction" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" createMethodName="createAbstractionCreationTool" id="&quot;composite.tool.abstraction&quot;" genLinks="/0/@diagram/@links.9"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Usage" description="Create new Usage" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif" createMethodName="createUsageCreationTool" id="&quot;composite.tool.usage&quot;" genLinks="/0/@diagram/@links.10"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Dependency" description="Create new Dependency" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif" createMethodName="createDependencyCreationTool" id="&quot;composite.tool.dependency&quot;" genLinks="/0/@diagram/@links.13"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="Representation" description="Create new representation for an InformationItem" largeIconPath="icons/obj16/Representation.gif" smallIconPath="icons/obj16/Representation.gif" createMethodName="createRepresentationCreationTool" id="&quot;composite.tool.representation&quot;" genLinks="/0/@diagram/@links.18"/>

-          <entries xsi:type="gmfgen:ToolEntry" title="InformationFlow" description="Create new InformationFlow" largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif" smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif" createMethodName="createInformationFlowCreationTool" id="&quot;composite.tool.informationflow&quot;" genLinks="/0/@diagram/@links.19"/>

-        </groups>

-      </palette>

-      <preferencePages xsi:type="gmfgen:GenStandardPreferencePage" iD="org.eclipse.uml2.uml.diagram.general" name="UML Diagram">

-        <children xsi:type="gmfgen:GenStandardPreferencePage" iD="org.eclipse.uml2.uml.diagram.appearance" name="Appearance" kind="Appearance"/>

-        <children xsi:type="gmfgen:GenStandardPreferencePage" iD="org.eclipse.uml2.uml.diagram.connections" name="Connections" kind="Connections"/>

-        <children xsi:type="gmfgen:GenStandardPreferencePage" iD="org.eclipse.uml2.uml.diagram.printing" name="Printing" kind="Printing"/>

-        <children xsi:type="gmfgen:GenStandardPreferencePage" iD="org.eclipse.uml2.uml.diagram.rulersAndGrid" name="Rulers And Grid" kind="RulersAndGrid"/>

-      </preferencePages>

-    </diagram>

-    <plugin iD="org.eclipse.papyrus.uml.diagram.composite" name="Papyrus Composite Structure Diagram " provider="Eclipse Modeling Project" version="1.1.0.qualifier">

-      <requiredPlugins>org.eclipse.draw2d</requiredPlugins>

-      <requiredPlugins>org.eclipse.gmf.runtime.draw2d.ui</requiredPlugins>

-    </plugin>

-    <editor/>

-    <diagramUpdater nodeDescriptorClassName="UMLNodeDescriptor"/>

-    <propertySheet>

-      <tabs xsi:type="gmfgen:GenStandardPropertyTab" iD="appearance"/>

-      <tabs xsi:type="gmfgen:GenStandardPropertyTab" iD="diagram"/>

-      <tabs xsi:type="gmfgen:GenCustomPropertyTab" iD="domain" label="Core">

-        <filter xsi:type="gmfgen:TypeTabFilter">

-          <types>org.eclipse.gmf.runtime.notation.View</types>

-          <types>org.eclipse.gef.EditPart</types>

-          <generatedTypes>abstractNavigatorItem</generatedTypes>

-        </filter>

-      </tabs>

-    </propertySheet>

-    <domainGenModel href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#/"/>

-    <expressionProviders>

-      <providers xsi:type="gmfgen:GenJavaExpressionProvider" injectExpressionBody="true">

-        <expressions body="return org.eclipse.papyrus.uml.tools.utils.NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());"/>

-        <expressions body="return it.getBody();"/>

-        <expressions xsi:type="gmfgen:GenConstraint" body="// Property / CollaborationRole constraint&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;// Restriction for the case where domainElement owner is a Collaboration&#xD;&#xA;&#x9;&#x9;// If the domainElement is not referenced as one of its owner role&#xD;&#xA;&#x9;&#x9;// then it should be considered as a Property creation on Collaboration,&#xD;&#xA;&#x9;&#x9;// else the test should return false and be considered as a representation of&#xD;&#xA;&#x9;&#x9;// a collaboration role (ConnectableElement).&#xD;&#xA;&#x9;&#x9;if (containerView.getElement() instanceof org.eclipse.uml2.uml.Collaboration) {&#xD;&#xA;&#x9;&#x9;&#x9;org.eclipse.uml2.uml.Collaboration graphicalParent = (org.eclipse.uml2.uml.Collaboration) containerView.getElement();&#xD;&#xA;&#x9;&#x9;&#x9;if (graphicalParent.getCollaborationRoles().contains(domainElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;// General case : no restriction&#xD;&#xA;&#x9;&#x9;return true;"/>

-        <expressions xsi:type="gmfgen:GenConstraint" body="// Test if the dependency is not a RoleBinding&#xD;&#xA;&#x9;&#x9;if (domainElement.getOwner() instanceof org.eclipse.uml2.uml.CollaborationUse) {&#xD;&#xA;&#x9;&#x9;&#x9;org.eclipse.uml2.uml.CollaborationUse owner = (org.eclipse.uml2.uml.CollaborationUse) domainElement.getOwner();&#xD;&#xA;&#x9;&#x9;&#x9;if (owner.getRoleBindings().contains(domainElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;return true;"/>

-        <expressions xsi:type="gmfgen:GenConstraint" body="// Test if the dependency is a RoleBinding&#xD;&#xA;&#x9;&#x9;if (domainElement.getOwner() instanceof org.eclipse.uml2.uml.CollaborationUse) {&#xD;&#xA;&#x9;&#x9;&#x9;org.eclipse.uml2.uml.CollaborationUse owner = (org.eclipse.uml2.uml.CollaborationUse) domainElement.getOwner();&#xD;&#xA;&#x9;&#x9;&#x9;if (owner.getRoleBindings().contains(domainElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;return true;&#xD;&#xA;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;return false;"/>

-        <expressions xsi:type="gmfgen:GenConstraint" body="// RoleBinding source constraint&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((source != null) &amp;&amp; !(source instanceof org.eclipse.uml2.uml.CollaborationUse)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;// RoleBinding source has a type&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((source != null) &amp;&amp; (((org.eclipse.uml2.uml.CollaborationUse) source).getType() == null)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>

-        <expressions xsi:type="gmfgen:GenConstraint" body="// RoleBinding target constraint&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((target != null) &amp;&amp; !(target instanceof org.eclipse.uml2.uml.ConnectableElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;// RoleBinding source and target have the same semantic parent&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((source != null) &amp;&amp; (target != null) &amp;&amp; (source.getOwner() != target.getOwner())) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>

-        <expressions body="// InformationItem is Abstract&#xD;&#xA;return true;"/>

-        <expressions xsi:type="gmfgen:GenConstraint" body="// Represented InformationItem Target&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if (target != null) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (!((target instanceof org.eclipse.uml2.uml.Class)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Interface)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.InformationItem)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Signal) || &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;(target instanceof org.eclipse.uml2.uml.Component))) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>

-        <expressions xsi:type="gmfgen:GenConstraint" body="//Information Flow source constraint&#xD;&#xA;if (source != null) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (!((source instanceof org.eclipse.uml2.uml.Actor)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Node)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.UseCase)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Artifact)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Class)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Component)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Port)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Property)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Interface)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Package)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.ActivityNode)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.ActivityPartition) || (source instanceof org.eclipse.uml2.uml.InstanceSpecification))) {&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (source instanceof org.eclipse.uml2.uml.InstanceSpecification) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;org.eclipse.emf.common.util.EList&lt; org.eclipse.uml2.uml.Classifier> classes = ((org.eclipse.uml2.uml.InstanceSpecification) source).getClassifiers();&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;for (int i = 0; i &lt; classes.size(); i++) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;if (classes.get(i) instanceof org.eclipse.uml2.uml.Relationship) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>

-        <expressions xsi:type="gmfgen:GenConstraint" body="//Information Flow target constraint&#xD;&#xA;if (target != null) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (!((target instanceof org.eclipse.uml2.uml.Actor)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Node)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.UseCase)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Artifact)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Class)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Component)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Port)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Property)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Interface)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Package)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.ActivityNode)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.ActivityPartition) || (target instanceof org.eclipse.uml2.uml.InstanceSpecification))) {&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (target instanceof org.eclipse.uml2.uml.InstanceSpecification) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;org.eclipse.emf.common.util.EList&lt; org.eclipse.uml2.uml.Classifier> classes = ((org.eclipse.uml2.uml.InstanceSpecification) target).getClassifiers();&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;for (int i = 0; i &lt; classes.size(); i++) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;if (classes.get(i) instanceof org.eclipse.uml2.uml.Relationship) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>

-        <expressions xsi:type="gmfgen:GenConstraint" body="// Creation constraint for TopLevelNodes&#xD;&#xA;&#x9;if(! (getElementToEdit() instanceof org.eclipse.uml2.uml.Package)) {&#xD;&#xA;&#x9;&#x9;return false;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;return true;"/>

-        <expressions body="// Comment body init&#xD;&#xA;return &quot;&quot;;"/>

-        <expressions body="// Constraint specification init&#xD;&#xA;org.eclipse.uml2.uml.LiteralString value = org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createLiteralString();&#xD;&#xA;value.setValue(&quot;&quot;);&#xD;&#xA;return value;"/>

-        <expressions body="// IntervalConstraint specification init&#xD;&#xA;org.eclipse.uml2.uml.Interval value = org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createInterval();&#xD;&#xA;return value;"/>

-        <expressions body="// DurationConstraint specification init&#xD;&#xA;org.eclipse.uml2.uml.DurationInterval value = org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createDurationInterval();&#xD;&#xA;return value;"/>

-        <expressions body="// TimeConstraint specification init&#xD;&#xA;org.eclipse.uml2.uml.TimeInterval value = org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createTimeInterval();&#xD;&#xA;return value;"/>

-      </providers>

-      <providers xsi:type="gmfgen:GenLiteralExpressionProvider">

-        <expressions body="org.eclipse.uml2.uml.AggregationKind.COMPOSITE_LITERAL"/>

-      </providers>

-    </expressionProviders>

-    <labelParsers extensibleViaService="true">

-      <implementations xsi:type="gmfgen:PredefinedParser" uses="/0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.13/@labels.0/@modelFacet /0/@diagram/@childNodes.36/@labelModelFacet /0/@diagram/@topLevelNodes.14/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.15/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labels.0/@modelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labels.0/@modelFacet /0/@diagram/@childNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.19/@labels.0/@modelFacet /0/@diagram/@childNodes.20/@labels.0/@modelFacet /0/@diagram/@childNodes.21/@labels.0/@modelFacet /0/@diagram/@childNodes.12/@labels.0/@modelFacet /0/@diagram/@childNodes.13/@labels.0/@modelFacet /0/@diagram/@childNodes.14/@labels.0/@modelFacet /0/@diagram/@childNodes.15/@labels.0/@modelFacet /0/@diagram/@childNodes.17/@labels.0/@modelFacet /0/@diagram/@childNodes.22/@labels.0/@modelFacet /0/@diagram/@childNodes.23/@labels.0/@modelFacet /0/@diagram/@childNodes.24/@labels.0/@modelFacet /0/@diagram/@childNodes.25/@labels.0/@modelFacet /0/@diagram/@childNodes.26/@labels.0/@modelFacet /0/@diagram/@childNodes.27/@labels.0/@modelFacet /0/@diagram/@childNodes.18/@labels.0/@modelFacet /0/@diagram/@childNodes.16/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.34/@labelModelFacet /0/@diagram/@childNodes.35/@labelModelFacet /0/@diagram/@topLevelNodes.11/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.12/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.16/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.17/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.18/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.19/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.20/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.21/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.22/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.23/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.24/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.25/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.26/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.29/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.30/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.31/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.32/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.33/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.34/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.35/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.36/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.37/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.38/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.39/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.40/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.41/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.42/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.44/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.45/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.46/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.47/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.48/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.6/@labels.0/@modelFacet /0/@diagram/@links.7/@labels.0/@modelFacet /0/@diagram/@links.8/@labels.0/@modelFacet /0/@diagram/@links.9/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@links.11/@labels.0/@modelFacet /0/@diagram/@links.13/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.28/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.27/@labels.0/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.29/@labels.0/@modelFacet /0/@diagram/@childNodes.30/@labels.0/@modelFacet /0/@diagram/@childNodes.31/@labels.0/@modelFacet /0/@diagram/@childNodes.33/@labels.0/@modelFacet /0/@diagram/@childNodes.32/@labels.0/@modelFacet /0/@diagram/@links.14/@labels.1/@modelFacet /0/@diagram/@links.14/@labels.2/@modelFacet /0/@diagram/@links.14/@labels.3/@modelFacet /0/@diagram/@childNodes.0/@labels.0/@modelFacet /0/@diagram/@childNodes.3/@labels.1/@modelFacet /0/@diagram/@childNodes.4/@labels.1/@modelFacet /0/@diagram/@childNodes.5/@labels.1/@modelFacet /0/@diagram/@childNodes.6/@labels.1/@modelFacet /0/@diagram/@childNodes.7/@labels.1/@modelFacet /0/@diagram/@childNodes.8/@labels.1/@modelFacet /0/@diagram/@childNodes.9/@labels.1/@modelFacet /0/@diagram/@childNodes.10/@labels.1/@modelFacet /0/@diagram/@childNodes.11/@labels.1/@modelFacet /0/@diagram/@childNodes.12/@labels.1/@modelFacet /0/@diagram/@childNodes.13/@labels.1/@modelFacet /0/@diagram/@childNodes.14/@labels.1/@modelFacet /0/@diagram/@childNodes.15/@labels.1/@modelFacet /0/@diagram/@childNodes.16/@labels.1/@modelFacet /0/@diagram/@childNodes.17/@labels.1/@modelFacet /0/@diagram/@childNodes.18/@labels.1/@modelFacet /0/@diagram/@childNodes.19/@labels.1/@modelFacet /0/@diagram/@childNodes.20/@labels.1/@modelFacet /0/@diagram/@childNodes.21/@labels.1/@modelFacet /0/@diagram/@childNodes.22/@labels.1/@modelFacet /0/@diagram/@childNodes.23/@labels.1/@modelFacet /0/@diagram/@childNodes.24/@labels.1/@modelFacet /0/@diagram/@childNodes.25/@labels.1/@modelFacet /0/@diagram/@childNodes.26/@labels.1/@modelFacet /0/@diagram/@childNodes.27/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.9/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.10/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.11/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.12/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.13/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.14/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.15/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.16/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.17/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.18/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.19/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.20/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.21/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.22/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.23/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.24/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.25/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.26/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.29/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.30/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.31/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.32/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.33/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.34/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.35/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.36/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.37/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.38/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.39/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.40/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.41/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.42/@labels.1/@modelFacet"/>

-      <implementations xsi:type="gmfgen:CustomParser" uses="/0/@diagram/@links.4/@labels.1/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.6/@labels.1/@modelFacet /0/@diagram/@links.7/@labels.1/@modelFacet /0/@diagram/@links.8/@labels.1/@modelFacet /0/@diagram/@links.9/@labels.1/@modelFacet /0/@diagram/@links.10/@labels.1/@modelFacet /0/@diagram/@links.11/@labels.1/@modelFacet /0/@diagram/@links.13/@labels.1/@modelFacet /0/@diagram/@links.15/@labels.0/@modelFacet /0/@diagram/@links.14/@labels.0/@modelFacet /0/@diagram/@links.12/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.28/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.27/@labels.1/@modelFacet /0/@diagram/@childNodes.1/@labels.1/@modelFacet /0/@diagram/@links.19/@labels.1/@modelFacet /0/@diagram/@childNodes.2/@labels.1/@modelFacet" qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser"/>

-      <implementations xsi:type="gmfgen:CustomParser" uses="/0/@diagram/@links.12/@labels.0/@modelFacet" qualifiedName="org.eclipse.papyrus.uml.diagram.composite.custom.parsers.RoleBindingRoleNameParser"/>

-      <implementations xsi:type="gmfgen:CustomParser" uses="/0/@diagram/@topLevelNodes.43/@labels.0/@modelFacet /0/@diagram/@childNodes.28/@labels.0/@modelFacet" qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.CommentParser"/>

-      <implementations xsi:type="gmfgen:CustomParser" uses="/0/@diagram/@topLevelNodes.44/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.45/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.46/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.47/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.48/@labels.1/@modelFacet /0/@diagram/@childNodes.29/@labels.1/@modelFacet /0/@diagram/@childNodes.30/@labels.1/@modelFacet /0/@diagram/@childNodes.31/@labels.1/@modelFacet /0/@diagram/@childNodes.33/@labels.1/@modelFacet /0/@diagram/@childNodes.32/@labels.1/@modelFacet" qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser"/>

-    </labelParsers>

-    <contextMenus context="/0/@diagram">

-      <items xsi:type="gmfgen:LoadResourceAction"/>

-    </contextMenus>

-  </gmfgen:GenEditorGenerator>

-  <papyrusgmfgenextension:PapyrusExtensionRootNode comment="Papyrus specific extension for GMFGen">

-    <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="Add super class to a selected set of generated EditParts" genView="/0/@diagram/@topLevelNodes.13 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.19 /0/@diagram/@topLevelNodes.20 /0/@diagram/@childNodes.12 /0/@diagram/@topLevelNodes.6 /0/@diagram/@childNodes.21 /0/@diagram/@topLevelNodes.15 /0/@diagram/@childNodes.20 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.18 /0/@diagram/@topLevelNodes.12 /0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.17 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.11 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@topLevelNodes.19 /0/@diagram/@childNodes.25" name="EP_NamedElement_NODE" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="Label in charge to display applied stereotypes on links" genView="/0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.9 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.13 /0/@diagram/@links.15 /0/@diagram/@links.14 /0/@diagram/@links.12 /0/@diagram/@links.19 /0/@diagram/@links.18 /0/@diagram/@links.3" name="EP_NamedElement_EDGE" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="Adds a superclass for DurationObservationEditPart, TimeObservationEditPart" genView="/0/@diagram/@topLevelNodes.28 /0/@diagram/@topLevelNodes.27" name="EP_Observation_NODE" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="Manages stereotype shown with External Label" genView="/0/@diagram/@topLevelNodes.28/@labels.1 /0/@diagram/@topLevelNodes.27/@labels.1 /0/@diagram/@childNodes.1/@labels.1" name="EP_Stereotypes_EXT_NODE" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="Add super class to a Comment edit parts" genView="/0/@diagram/@topLevelNodes.43 /0/@diagram/@childNodes.28" name="EP_Comment_NODE" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="Add super class to a Constraint edit parts" genView="/0/@diagram/@topLevelNodes.44 /0/@diagram/@topLevelNodes.45 /0/@diagram/@topLevelNodes.46 /0/@diagram/@topLevelNodes.47 /0/@diagram/@topLevelNodes.48 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33" name="EP_Constraint_NODE" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:SpecificLocator" comment="Affixed Port locator" classpath="org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator" genChildSideAffixedNode="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:SpecificLocatorExternalLabel" comment="External node label locator" classpath="org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator" genExternalNodeLabel="/0/@diagram/@topLevelNodes.27/@labels.1 /0/@diagram/@childNodes.1/@labels.1 /0/@diagram/@childNodes.2/@labels.1 /0/@diagram/@topLevelNodes.28/@labels.1"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:SpecificDiagramUpdater" comment="Property (Part) custom DiagramUpdater" classpath="org.eclipse.papyrus.uml.diagram.composite.custom.parts.PropertyDiagramUpdater" genNode="/0/@diagram/@childNodes.3"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:SpecificDiagramUpdater" comment="Property (Part) compartment custom DiagramUpdater" classpath="org.eclipse.papyrus.uml.diagram.composite.custom.parts.PropertyDiagramUpdater" genNode="/0/@diagram/@compartments.30"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:GenNodeConstraint" comment="Creation constraint for TopLevelNode in virtual canvas" genNode="/0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.10 /0/@diagram/@topLevelNodes.11 /0/@diagram/@topLevelNodes.12 /0/@diagram/@topLevelNodes.13 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.15 /0/@diagram/@topLevelNodes.16 /0/@diagram/@topLevelNodes.17 /0/@diagram/@topLevelNodes.18 /0/@diagram/@topLevelNodes.19 /0/@diagram/@topLevelNodes.20 /0/@diagram/@topLevelNodes.21 /0/@diagram/@topLevelNodes.22 /0/@diagram/@topLevelNodes.23 /0/@diagram/@topLevelNodes.24 /0/@diagram/@topLevelNodes.25 /0/@diagram/@topLevelNodes.26 /0/@diagram/@topLevelNodes.27 /0/@diagram/@topLevelNodes.28 /0/@diagram/@topLevelNodes.29 /0/@diagram/@topLevelNodes.30 /0/@diagram/@topLevelNodes.31 /0/@diagram/@topLevelNodes.32 /0/@diagram/@topLevelNodes.33 /0/@diagram/@topLevelNodes.34 /0/@diagram/@topLevelNodes.35 /0/@diagram/@topLevelNodes.36 /0/@diagram/@topLevelNodes.37 /0/@diagram/@topLevelNodes.38 /0/@diagram/@topLevelNodes.39 /0/@diagram/@topLevelNodes.40 /0/@diagram/@topLevelNodes.41 /0/@diagram/@topLevelNodes.42 /0/@diagram/@topLevelNodes.43 /0/@diagram/@topLevelNodes.44 /0/@diagram/@topLevelNodes.45 /0/@diagram/@topLevelNodes.46 /0/@diagram/@topLevelNodes.47 /0/@diagram/@topLevelNodes.48" genConstraint="/0/@expressionProviders/@providers.0/@expressions.11"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:AdditionalEditPartCandies" comment="Indicate specific BaseEditHelper in place of generated EditHelper" baseEditHelperPackage="org.eclipse.papyrus.uml.diagram.common.helper"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:EditPartUsingDeleteService" comment="The delete service is used on every TopNode Childnode and Link" name="Every TopNode ChildNode Link" genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.10 /0/@diagram/@topLevelNodes.11 /0/@diagram/@topLevelNodes.12 /0/@diagram/@topLevelNodes.13 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.15 /0/@diagram/@topLevelNodes.16 /0/@diagram/@topLevelNodes.17 /0/@diagram/@topLevelNodes.18 /0/@diagram/@topLevelNodes.19 /0/@diagram/@topLevelNodes.20 /0/@diagram/@topLevelNodes.21 /0/@diagram/@topLevelNodes.22 /0/@diagram/@topLevelNodes.23 /0/@diagram/@topLevelNodes.24 /0/@diagram/@topLevelNodes.25 /0/@diagram/@topLevelNodes.26 /0/@diagram/@topLevelNodes.27 /0/@diagram/@topLevelNodes.28 /0/@diagram/@topLevelNodes.29 /0/@diagram/@topLevelNodes.30 /0/@diagram/@topLevelNodes.31 /0/@diagram/@topLevelNodes.32 /0/@diagram/@topLevelNodes.33 /0/@diagram/@topLevelNodes.34 /0/@diagram/@topLevelNodes.35 /0/@diagram/@topLevelNodes.36 /0/@diagram/@topLevelNodes.37 /0/@diagram/@topLevelNodes.38 /0/@diagram/@topLevelNodes.39 /0/@diagram/@topLevelNodes.40 /0/@diagram/@topLevelNodes.41 /0/@diagram/@topLevelNodes.42 /0/@diagram/@topLevelNodes.43 /0/@diagram/@topLevelNodes.44 /0/@diagram/@topLevelNodes.45 /0/@diagram/@topLevelNodes.46 /0/@diagram/@topLevelNodes.47 /0/@diagram/@topLevelNodes.48 /0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.9 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.12 /0/@diagram/@links.13 /0/@diagram/@links.14 /0/@diagram/@links.15 /0/@diagram/@links.16 /0/@diagram/@links.17 /0/@diagram/@links.18 /0/@diagram/@links.19"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:EditPartUsingReorientService" comment="Use the edit service for reorient command (All DirectedRelationship)" name="DirectedRelationship" genView="/0/@diagram/@links.15 /0/@diagram/@links.19 /0/@diagram/@links.13 /0/@diagram/@links.11 /0/@diagram/@links.10 /0/@diagram/@links.9 /0/@diagram/@links.8 /0/@diagram/@links.7 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:EditPartUsingReorientService" comment="Use the edit service for reorient command (Connector)" name="Connector" genView="/0/@diagram/@links.14"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="this is an abstract class for BehaviorPortEditPart" genView="/0/@diagram/@childNodes.0" name="AbstractBehaviorPortEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.AbstractBehaviorPortEditPart"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="add superclass for floating Label" genView="/0/@diagram/@childNodes.1/@labels.0 /0/@diagram/@childNodes.0/@labels.0 /0/@diagram/@childNodes.2/@labels.0 /0/@diagram/@childNodes.3/@labels.1 /0/@diagram/@childNodes.4/@labels.1 /0/@diagram/@childNodes.5/@labels.1 /0/@diagram/@childNodes.6/@labels.1 /0/@diagram/@childNodes.7/@labels.1 /0/@diagram/@childNodes.8/@labels.1 /0/@diagram/@childNodes.9/@labels.1 /0/@diagram/@childNodes.10/@labels.1 /0/@diagram/@childNodes.11/@labels.1 /0/@diagram/@childNodes.12/@labels.1 /0/@diagram/@childNodes.13/@labels.1 /0/@diagram/@childNodes.14/@labels.1 /0/@diagram/@childNodes.15/@labels.1 /0/@diagram/@childNodes.16/@labels.1 /0/@diagram/@childNodes.17/@labels.1 /0/@diagram/@childNodes.18/@labels.1 /0/@diagram/@childNodes.19/@labels.1 /0/@diagram/@childNodes.20/@labels.1 /0/@diagram/@childNodes.21/@labels.1 /0/@diagram/@childNodes.22/@labels.1 /0/@diagram/@childNodes.23/@labels.1 /0/@diagram/@childNodes.24/@labels.1 /0/@diagram/@childNodes.25/@labels.1 /0/@diagram/@childNodes.26/@labels.1 /0/@diagram/@childNodes.27/@labels.1 /0/@diagram/@topLevelNodes.0/@labels.1 /0/@diagram/@topLevelNodes.1/@labels.1 /0/@diagram/@topLevelNodes.2/@labels.1 /0/@diagram/@topLevelNodes.3/@labels.1 /0/@diagram/@topLevelNodes.4/@labels.1 /0/@diagram/@topLevelNodes.5/@labels.1 /0/@diagram/@topLevelNodes.6/@labels.1 /0/@diagram/@topLevelNodes.7/@labels.1 /0/@diagram/@topLevelNodes.8/@labels.1 /0/@diagram/@topLevelNodes.9/@labels.1 /0/@diagram/@topLevelNodes.10/@labels.1 /0/@diagram/@topLevelNodes.11/@labels.1 /0/@diagram/@topLevelNodes.12/@labels.1 /0/@diagram/@topLevelNodes.13/@labels.1 /0/@diagram/@topLevelNodes.14/@labels.1 /0/@diagram/@topLevelNodes.15/@labels.1 /0/@diagram/@topLevelNodes.16/@labels.1 /0/@diagram/@topLevelNodes.17/@labels.1 /0/@diagram/@topLevelNodes.18/@labels.1 /0/@diagram/@topLevelNodes.19/@labels.1 /0/@diagram/@topLevelNodes.20/@labels.1 /0/@diagram/@topLevelNodes.21/@labels.1 /0/@diagram/@topLevelNodes.22/@labels.1 /0/@diagram/@topLevelNodes.23/@labels.1 /0/@diagram/@topLevelNodes.24/@labels.1 /0/@diagram/@topLevelNodes.25/@labels.1 /0/@diagram/@topLevelNodes.26/@labels.1 /0/@diagram/@topLevelNodes.29/@labels.1 /0/@diagram/@topLevelNodes.30/@labels.1 /0/@diagram/@topLevelNodes.31/@labels.1 /0/@diagram/@topLevelNodes.32/@labels.1 /0/@diagram/@topLevelNodes.33/@labels.1 /0/@diagram/@topLevelNodes.34/@labels.1 /0/@diagram/@topLevelNodes.35/@labels.1 /0/@diagram/@topLevelNodes.36/@labels.1 /0/@diagram/@topLevelNodes.37/@labels.1 /0/@diagram/@topLevelNodes.38/@labels.1 /0/@diagram/@topLevelNodes.39/@labels.1 /0/@diagram/@topLevelNodes.40/@labels.1 /0/@diagram/@topLevelNodes.41/@labels.1 /0/@diagram/@topLevelNodes.42/@labels.1 /0/@diagram/@topLevelNodes.27/@labels.0 /0/@diagram/@topLevelNodes.28/@labels.0" name="FloatingLabelEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:SpecificLocatorExternalLabel" comment="Locator for external Floating label of RoundedCompartment EP" classpath="org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator" genExternalNodeLabel="/0/@diagram/@childNodes.1/@labels.0 /0/@diagram/@childNodes.2/@labels.0 /0/@diagram/@topLevelNodes.27/@labels.0 /0/@diagram/@topLevelNodes.28/@labels.0 /0/@diagram/@childNodes.0/@labels.0 /0/@diagram/@childNodes.3/@labels.1 /0/@diagram/@childNodes.4/@labels.1 /0/@diagram/@childNodes.5/@labels.1 /0/@diagram/@childNodes.6/@labels.1 /0/@diagram/@childNodes.7/@labels.1 /0/@diagram/@childNodes.8/@labels.1 /0/@diagram/@childNodes.9/@labels.1 /0/@diagram/@childNodes.10/@labels.1 /0/@diagram/@childNodes.11/@labels.1 /0/@diagram/@childNodes.12/@labels.1 /0/@diagram/@childNodes.13/@labels.1 /0/@diagram/@childNodes.14/@labels.1 /0/@diagram/@childNodes.15/@labels.1 /0/@diagram/@childNodes.16/@labels.1 /0/@diagram/@childNodes.17/@labels.1 /0/@diagram/@childNodes.18/@labels.1 /0/@diagram/@childNodes.19/@labels.1 /0/@diagram/@childNodes.20/@labels.1 /0/@diagram/@childNodes.21/@labels.1 /0/@diagram/@childNodes.22/@labels.1 /0/@diagram/@childNodes.23/@labels.1 /0/@diagram/@childNodes.24/@labels.1 /0/@diagram/@childNodes.25/@labels.1 /0/@diagram/@childNodes.26/@labels.1 /0/@diagram/@childNodes.27/@labels.1 /0/@diagram/@topLevelNodes.0/@labels.1 /0/@diagram/@topLevelNodes.1/@labels.1 /0/@diagram/@topLevelNodes.2/@labels.1 /0/@diagram/@topLevelNodes.3/@labels.1 /0/@diagram/@topLevelNodes.4/@labels.1 /0/@diagram/@topLevelNodes.5/@labels.1 /0/@diagram/@topLevelNodes.6/@labels.1 /0/@diagram/@topLevelNodes.7/@labels.1 /0/@diagram/@topLevelNodes.8/@labels.1 /0/@diagram/@topLevelNodes.9/@labels.1 /0/@diagram/@topLevelNodes.10/@labels.1 /0/@diagram/@topLevelNodes.11/@labels.1 /0/@diagram/@topLevelNodes.12/@labels.1 /0/@diagram/@topLevelNodes.13/@labels.1 /0/@diagram/@topLevelNodes.14/@labels.1 /0/@diagram/@topLevelNodes.15/@labels.1 /0/@diagram/@topLevelNodes.16/@labels.1 /0/@diagram/@topLevelNodes.17/@labels.1 /0/@diagram/@topLevelNodes.18/@labels.1 /0/@diagram/@topLevelNodes.19/@labels.1 /0/@diagram/@topLevelNodes.20/@labels.1 /0/@diagram/@topLevelNodes.21/@labels.1 /0/@diagram/@topLevelNodes.22/@labels.1 /0/@diagram/@topLevelNodes.23/@labels.1 /0/@diagram/@topLevelNodes.24/@labels.1 /0/@diagram/@topLevelNodes.25/@labels.1 /0/@diagram/@topLevelNodes.26/@labels.1 /0/@diagram/@topLevelNodes.29/@labels.1 /0/@diagram/@topLevelNodes.30/@labels.1 /0/@diagram/@topLevelNodes.31/@labels.1 /0/@diagram/@topLevelNodes.32/@labels.1 /0/@diagram/@topLevelNodes.33/@labels.1 /0/@diagram/@topLevelNodes.34/@labels.1 /0/@diagram/@topLevelNodes.35/@labels.1 /0/@diagram/@topLevelNodes.36/@labels.1 /0/@diagram/@topLevelNodes.37/@labels.1 /0/@diagram/@topLevelNodes.38/@labels.1 /0/@diagram/@topLevelNodes.39/@labels.1 /0/@diagram/@topLevelNodes.40/@labels.1 /0/@diagram/@topLevelNodes.41/@labels.1 /0/@diagram/@topLevelNodes.42/@labels.1"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" genView="/0/@diagram/@topLevelNodes.33 /0/@diagram/@topLevelNodes.32 /0/@diagram/@topLevelNodes.31 /0/@diagram/@topLevelNodes.30 /0/@diagram/@topLevelNodes.29 /0/@diagram/@topLevelNodes.34 /0/@diagram/@topLevelNodes.35 /0/@diagram/@topLevelNodes.36 /0/@diagram/@topLevelNodes.37 /0/@diagram/@topLevelNodes.38 /0/@diagram/@topLevelNodes.39 /0/@diagram/@topLevelNodes.40 /0/@diagram/@topLevelNodes.41 /0/@diagram/@topLevelNodes.42 /0/@diagram/@childNodes.23 /0/@diagram/@topLevelNodes.17 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.27 /0/@diagram/@topLevelNodes.21 /0/@diagram/@topLevelNodes.22 /0/@diagram/@topLevelNodes.23 /0/@diagram/@topLevelNodes.24 /0/@diagram/@topLevelNodes.25 /0/@diagram/@topLevelNodes.26" name="RoundedCompartmentEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart"/>

-    <extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView" comment="extend view for affixed node" genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" name="RoundedBorderNamedElementEditPart" superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedBorderNamedElementEditPart"/>

-  </papyrusgmfgenextension:PapyrusExtensionRootNode>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"

+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel"

+	xmlns:papyrusgmfgenextension="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension">

+	<gmfgen:GenEditorGenerator packageNamePrefix="org.eclipse.papyrus.uml.diagram.composite"

+		modelID="CompositeStructure" diagramFileExtension="uml_csd"

+		domainFileExtension="uml" dynamicTemplates="true"

+		templateDirectory="/org.eclipse.papyrus.def/xtend/"

+		copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation">

+		<diagram visualID="1000" editPartClassName="CompositeStructureDiagramEditPart"

+			itemSemanticEditPolicyClassName="CompositeStructureDiagramItemSemanticEditPolicy"

+			canonicalEditPolicyClassName="CompositeStructureDiagramCanonicalEditPolicy"

+			iconProviderPriority="Low" baseEditHelperClassName="UMLBaseEditHelper"

+			creationWizardIconPath="icons/obj16/Diagram_CompositeStructure.gif"

+			validationProviderPriority="Low" validationEnabled="true"

+			validationDecorators="true" liveValidationUIFeedback="true"

+			synchronized="false">

+			<diagramRunTimeClass

+				href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram" />

+			<elementType xsi:type="gmfgen:MetamodelType" displayName="CompositeStructureDiagram"

+				definedExternally="true" editHelperClassName="PackageEditHelper" />

+			<viewmap xsi:type="gmfgen:FigureViewmap"

+				figureQualifiedClassName="org.eclipse.draw2d.FreeformLayer" />

+			<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+				editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+			<behaviour xsi:type="gmfgen:CustomBehaviour"

+				key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+				editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+			<domainDiagramElement

+				href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package" />

+			<childNodes visualID="3121" editPartClassName="BehaviorPortEditPart"

+				itemSemanticEditPolicyClassName="BehaviorPortItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="BehaviorPortCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="BehaviorPortGraphicalNodeEditPolicy"

+				createCommandClassName="BehaviorPortCreateCommand" containers="/0/@diagram/@compartments.16">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:NotationType"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorSymbolEditPolicy.BEHAVIOR_SYMBOL"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorSymbolEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoConnectableEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6053"

+					editPartClassName="BehaviorPortFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="NodeFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes xsi:type="gmfgen:GenChildSideAffixedNode"

+				visualID="3069" editPartClassName="PortEditPart"

+				itemSemanticEditPolicyClassName="PortItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="PortCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="PortGraphicalNodeEditPolicy"

+				createCommandClassName="PortCreateCommand"

+				containers="/0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.6">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="PortEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.PortFigure">

+					<attributes xsi:type="gmfgen:DefaultSizeAttributes"

+						width="20" height="20" />

+				</viewmap>

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorPortEditPolicy.BEHAVIOR_PORT"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorPortEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Port" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.1/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property/aggregation" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="5125"

+					editPartClassName="PortNameEditPart"

+					itemSemanticEditPolicyClassName="PortNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25"

+							y="3" />

+					</viewmap>

+					<behaviour xsi:type="gmfgen:CustomBehaviour"

+						key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL"

+						editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPortLabelEditPolicy" />

+					<behaviour xsi:type="gmfgen:CustomBehaviour"

+						key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy.LABEL_ALIGNMENT_KEY"

+						editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6029"

+					editPartClassName="PortAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="PortAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25"

+							y="-10" />

+					</viewmap>

+					<behaviour xsi:type="gmfgen:CustomBehaviour"

+						key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+						editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes xsi:type="gmfgen:GenChildSideAffixedNode"

+				visualID="3088" editPartClassName="ParameterEditPart"

+				itemSemanticEditPolicyClassName="ParameterItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ParameterCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="ParameterGraphicalNodeEditPolicy"

+				createCommandClassName="ParameterCreateCommand"

+				containers="/0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"

+					displayName="Parameter" definedExternally="true"

+					editHelperClassName="ParameterEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ParameterFigure">

+					<attributes xsi:type="gmfgen:DefaultSizeAttributes"

+						width="20" height="20" />

+				</viewmap>

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ParameterLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Parameter" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Behavior/ownedParameter" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Behavior/ownedParameter" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6033"

+					editPartClassName="ParameterNameEditPart"

+					itemSemanticEditPolicyClassName="ParameterNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25"

+							y="3" />

+					</viewmap>

+					<behaviour xsi:type="gmfgen:CustomBehaviour"

+						key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+						editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ParameterLabelEditPolicy" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6034"

+					editPartClassName="ParameterAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="ParameterAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25"

+							y="-10" />

+					</viewmap>

+					<behaviour xsi:type="gmfgen:CustomBehaviour"

+						key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+						editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3070" editPartClassName="PropertyPartEditPartCN"

+				itemSemanticEditPolicyClassName="PropertyPartItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="PropertyPartCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.30"

+				graphicalNodeEditPolicyClassName="PropertyPartGraphicalNodeEditPolicyCN"

+				createCommandClassName="PropertyPartCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29 /0/@diagram/@compartments.30">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.PropertyPartFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PropertyLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.2">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5126" editPartClassName="PropertyPartNameEditPartCN"

+					itemSemanticEditPolicyClassName="PropertyPartNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<behaviour xsi:type="gmfgen:CustomBehaviour"

+						key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL"

+						editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPropertyLabelEditPolicy" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6054"

+					editPartClassName="PropertyPartFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="PropertyFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3115" editPartClassName="CollaborationRoleEditPartCN"

+				itemSemanticEditPolicyClassName="CollaborationRoleItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="CollaborationRoleCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="CollaborationRoleGraphicalNodeEditPolicyCN"

+				createCommandClassName="CollaborationRoleCreateCommandCN"

+				containers="/0/@diagram/@compartments.17 /0/@diagram/@compartments.29">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.CollaborationRole_3115"

+					displayName="CollaborationRole" definedExternally="true"

+					editHelperClassName="CollaborationRoleEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationRoleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationRoleItemSemanticEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ConnectableElement" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/role" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/role" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5198" editPartClassName="CollaborationRoleNameEditPartCN"

+					itemSemanticEditPolicyClassName="CollaborationRoleNameItemSemanticEditPolicyCN"

+					readOnly="true" elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}"

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6055"

+					editPartClassName="CollaborationRoleFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="ConnectableElementFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3071" editPartClassName="CollaborationUseEditPartCN"

+				itemSemanticEditPolicyClassName="CollaborationUseItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="CollaborationUseCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="CollaborationUseGraphicalNodeEditPolicyCN"

+				createCommandClassName="CollaborationUseCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="CollaborationUseEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CollaborationUse" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/collaborationUse" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/collaborationUse" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5127" editPartClassName="CollaborationUseNameEditPart"

+					itemSemanticEditPolicyClassName="CollaborationUseNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<behaviour xsi:type="gmfgen:CustomBehaviour"

+						key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+						editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationUseLabelEditPolicy" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6056"

+					editPartClassName="CollaborationUseFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="CollaborationUseFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3072" editPartClassName="ActivityCompositeEditPartCN"

+				itemSemanticEditPolicyClassName="ActivityCompositeItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="ActivityCompositeCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+				compartments="/0/@diagram/@compartments.6"

+				graphicalNodeEditPolicyClassName="ActivityCompositeGraphicalNodeEditPolicyCN"

+				createCommandClassName="ActivityCompositeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.0/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5128" editPartClassName="ActivityCompositeNameEditPartCN"

+					itemSemanticEditPolicyClassName="ActivityCompositeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6057"

+					editPartClassName="ActivityCompositeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="ActivityFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3073" editPartClassName="InteractionCompositeEditPartCN"

+				itemSemanticEditPolicyClassName="InteractionCompositeItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="InteractionCompositeCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+				compartments="/0/@diagram/@compartments.7"

+				graphicalNodeEditPolicyClassName="InteractionCompositeGraphicalNodeEditPolicyCN"

+				createCommandClassName="InteractionCompositeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.1/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5129" editPartClassName="InteractionCompositeNameEditPartCN"

+					itemSemanticEditPolicyClassName="InteractionCompositeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6058"

+					editPartClassName="InteractionCompositeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="InteractionFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3074"

+				editPartClassName="ProtocolStateMachineCompositeEditPartCN"

+				itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="ProtocolStateMachineCompositeCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+				compartments="/0/@diagram/@compartments.8"

+				graphicalNodeEditPolicyClassName="ProtocolStateMachineCompositeGraphicalNodeEditPolicyCN"

+				createCommandClassName="ProtocolStateMachineCompositeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.2/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ProtocolStateMachine" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5130"

+					editPartClassName="ProtocolStateMachineCompositeNameEditPartCN"

+					itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6059"

+					editPartClassName="ProtocolStateMachineCompositeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="ProtocolStateMachineFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3075" editPartClassName="StateMachineCompositeEditPartCN"

+				itemSemanticEditPolicyClassName="StateMachineCompositeItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="StateMachineCompositeCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+				compartments="/0/@diagram/@compartments.9"

+				graphicalNodeEditPolicyClassName="StateMachineCompositeGraphicalNodeEditPolicyCN"

+				createCommandClassName="StateMachineCompositeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.3/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StateMachine" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5131" editPartClassName="StateMachineCompositeNameEditPartCN"

+					itemSemanticEditPolicyClassName="StateMachineCompositeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6060"

+					editPartClassName="StateMachineCompositeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="StateMachineFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3076" editPartClassName="FunctionBehaviorCompositeEditPartCN"

+				itemSemanticEditPolicyClassName="FunctionBehaviorCompositeItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="FunctionBehaviorCompositeCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+				compartments="/0/@diagram/@compartments.10"

+				graphicalNodeEditPolicyClassName="FunctionBehaviorCompositeGraphicalNodeEditPolicyCN"

+				createCommandClassName="FunctionBehaviorCompositeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.4/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/FunctionBehavior" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5132" editPartClassName="FunctionBehaviorCompositeNameEditPartCN"

+					itemSemanticEditPolicyClassName="FunctionBehaviorCompositeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6061"

+					editPartClassName="FunctionBehaviorCompositeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="FunctionBehaviorFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3077" editPartClassName="OpaqueBehaviorCompositeEditPartCN"

+				itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="OpaqueBehaviorCompositeCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+				compartments="/0/@diagram/@compartments.11"

+				graphicalNodeEditPolicyClassName="OpaqueBehaviorCompositeGraphicalNodeEditPolicyCN"

+				createCommandClassName="OpaqueBehaviorCompositeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.5/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/OpaqueBehavior" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5133" editPartClassName="OpaqueBehaviorCompositeNameEditPartCN"

+					itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6062"

+					editPartClassName="OpaqueBehaviorCompositeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="OpaqueBehaviorFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3081" editPartClassName="ComponentCompositeEditPartCN"

+				itemSemanticEditPolicyClassName="ComponentCompositeItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="ComponentCompositeCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.12"

+				graphicalNodeEditPolicyClassName="ComponentCompositeGraphicalNodeEditPolicyCN"

+				createCommandClassName="ComponentCompositeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.6/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5137" editPartClassName="ComponentCompositeNameEditPartCN"

+					itemSemanticEditPolicyClassName="ComponentCompositeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6063"

+					editPartClassName="ComponentCompositeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="ComponentFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3082" editPartClassName="DeviceCompositeEditPartCN"

+				itemSemanticEditPolicyClassName="DeviceCompositeItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="DeviceCompositeCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.13"

+				graphicalNodeEditPolicyClassName="DeviceCompositeGraphicalNodeEditPolicyCN"

+				createCommandClassName="DeviceCompositeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.7/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Device" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5138" editPartClassName="DeviceCompositeNameEditPartCN"

+					itemSemanticEditPolicyClassName="DeviceCompositeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6064"

+					editPartClassName="DeviceCompositeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="DeviceFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3083"

+				editPartClassName="ExecutionEnvironmentCompositeEditPartCN"

+				itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.14"

+				graphicalNodeEditPolicyClassName="ExecutionEnvironmentCompositeGraphicalNodeEditPolicyCN"

+				createCommandClassName="ExecutionEnvironmentCompositeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.8/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ExecutionEnvironment" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5139"

+					editPartClassName="ExecutionEnvironmentCompositeNameEditPartCN"

+					itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6065"

+					editPartClassName="ExecutionEnvironmentCompositeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="ExecutionEnvironmentFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3084" editPartClassName="NodeCompositeEditPartCN"

+				itemSemanticEditPolicyClassName="NodeCompositeItemSemanticEditPolicycN"

+				canonicalEditPolicyClassName="NodeCompositeCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.15"

+				graphicalNodeEditPolicyClassName="NodeCompositeGraphicalNodeEditPolicyCN"

+				createCommandClassName="NodeCompositeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.9/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Node" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5140" editPartClassName="NodeCompositeNameEditPartCN"

+					itemSemanticEditPolicyClassName="NodeCompositeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6066"

+					editPartClassName="NodeCompositeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="NodeFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3085" editPartClassName="ClassCompositeEditPartCN"

+				itemSemanticEditPolicyClassName="ClassCompositeItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="ClassCompositeCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.16"

+				graphicalNodeEditPolicyClassName="ClassCompositeGraphicalNodeEditPolicyCN"

+				createCommandClassName="ClassCompositeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.10/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5155" editPartClassName="ClassCompositeNameEditPartCN"

+					itemSemanticEditPolicyClassName="ClassCompositeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6067"

+					editPartClassName="ClassCompositeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="ClassFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3086" editPartClassName="CollaborationCompositeEditPartCN"

+				itemSemanticEditPolicyClassName="CollaborationCompositeItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="CollaborationCompositeCanonicalEditPolicyCN"

+				compartments="/0/@diagram/@compartments.17"

+				graphicalNodeEditPolicyClassName="CollaborationCompositeGraphicalNodeEditPolicyCN"

+				createCommandClassName="CollaborationCompositeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="CollaborationEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Collaboration" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5141" editPartClassName="CollaborationCompositeNameEditPartCN"

+					itemSemanticEditPolicyClassName="CollaborationCompositeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6068"

+					editPartClassName="CollaborationCompositeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="CollaborationFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3087" editPartClassName="InterfaceEditPartCN"

+				itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="InterfaceCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicyCN"

+				createCommandClassName="InterfaceCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="InterfaceEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5154" editPartClassName="InterfaceNameEditPartCN"

+					itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6069"

+					editPartClassName="InterfaceFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="InterfaceFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3078" editPartClassName="PrimitiveTypeEditPartCN"

+				itemSemanticEditPolicyClassName="PrimitiveTypeItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="PrimitiveTypeCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="PrimitiveTypeGraphicalNodeEditPolicyCN"

+				createCommandClassName="PrimitiveTypeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.13/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/PrimitiveType" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5134" editPartClassName="PrimitiveTypeNameEditPartCN"

+					itemSemanticEditPolicyClassName="PrimitiveTypeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6070"

+					editPartClassName="PrimitiveTypeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="PrimitiveTypeFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3079" editPartClassName="EnumerationEditPartCN"

+				itemSemanticEditPolicyClassName="EnumerationItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="EnumerationCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.36" compartments="/0/@diagram/@compartments.5"

+				graphicalNodeEditPolicyClassName="EnumerationGraphicalNodeEditPolicyCN"

+				createCommandClassName="EnumerationCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.14/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5135" editPartClassName="EnumerationNameEditPartCN"

+					itemSemanticEditPolicyClassName="EnumerationNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6071"

+					editPartClassName="EnumerationFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="EnumerationFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3080" editPartClassName="DataTypeEditPartCN"

+				itemSemanticEditPolicyClassName="DataTypeItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="DataTypeCanonicalEditPolicyCN"

+				compartments="/0/@diagram/@compartments.2 /0/@diagram/@compartments.3"

+				graphicalNodeEditPolicyClassName="DataTypeGraphicalNodeEditPolicyCN"

+				createCommandClassName="DataTypeCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@topLevelNodes.15/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DataType" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5136" editPartClassName="DataTypeNameEditPartCN"

+					itemSemanticEditPolicyClassName="DataTypeNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6072"

+					editPartClassName="DataTypeFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="DataTypeFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3091" editPartClassName="ActorEditPartCN"

+				itemSemanticEditPolicyClassName="ActorItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="ActorCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="ActorGraphicalNodeEditPolicyCN"

+				createCommandClassName="ActorCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="ActorEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5144" editPartClassName="ActorNameEditPartCN"

+					itemSemanticEditPolicyClassName="ActorNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6073"

+					editPartClassName="ActorFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="ActorFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3092" editPartClassName="DeploymentSpecificationEditPartCN"

+				itemSemanticEditPolicyClassName="DeploymentSpecificationItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="DeploymentSpecificationCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="DeploymentSpecificationGraphicalNodeEditPolicyCN"

+				createCommandClassName="DeploymentSpecificationCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="DeploymentSpecificationEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DeploymentSpecification" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5145" editPartClassName="DeploymentSpecificationNameEditPartCN"

+					itemSemanticEditPolicyClassName="DeploymentSpecificationNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6074"

+					editPartClassName="DeploymentSpecificationFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="DeploymentSpecificationFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3093" editPartClassName="ArtifactEditPartCN"

+				itemSemanticEditPolicyClassName="ArtifactItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="ArtifactCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="ArtifactGraphicalNodeEditPolicyCN"

+				createCommandClassName="ArtifactCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="ArtifactEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Artifact" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5146" editPartClassName="ArtifactNameEditPartCN"

+					itemSemanticEditPolicyClassName="ArtifactNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6075"

+					editPartClassName="ArtifactFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="ArtifactFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3094" editPartClassName="InformationItemEditPartCN"

+				itemSemanticEditPolicyClassName="InformationItemItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="InformationItemCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="InformationItemGraphicalNodeEditPolicyCN"

+				createCommandClassName="InformationItemCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="InformationItemEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure">

+					<attributes xsi:type="gmfgen:DefaultSizeAttributes"

+						width="80" height="40" />

+				</viewmap>

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationItem" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.7">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/isAbstract" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5147" editPartClassName="InformationItemNameEditPartCN"

+					itemSemanticEditPolicyClassName="InformationItemNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6076"

+					editPartClassName="InformationItemFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="InformationItemFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3095" editPartClassName="SignalEditPartCN"

+				itemSemanticEditPolicyClassName="SignalItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="SignalCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="SignalGraphicalNodeEditPolicyCN"

+				createCommandClassName="SignalCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="SignalEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Signal" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5148" editPartClassName="SignalNameEditPartCN"

+					itemSemanticEditPolicyClassName="SignalNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6077"

+					editPartClassName="SignalFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="SignalFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3096" editPartClassName="UseCaseEditPartCN"

+				itemSemanticEditPolicyClassName="UseCaseItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="UseCaseCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="UseCaseGraphicalNodeEditPolicyCN"

+				createCommandClassName="UseCaseCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="UseCaseEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/UseCase" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5149" editPartClassName="UseCaseNameEditPartCN"

+					itemSemanticEditPolicyClassName="UseCaseNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6078"

+					editPartClassName="UseCaseFloatingLabelEditPartCN"

+					itemSemanticEditPolicyClassName="UseCaseFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3097" editPartClassName="CommentEditPartCN"

+				itemSemanticEditPolicyClassName="CommentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="CommentCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="CommentGraphicalNodeEditPolicyCN"

+				createCommandClassName="CommentCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29 /0/@diagram/@compartments.30">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					displayName="Comment" definedExternally="true" editHelperClassName="CommentEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusReflowableShapeEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.12">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5150" editPartClassName="CommentBodyEditPartCN"

+					itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicyCN">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getCornerBentFigure"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.3">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3116" editPartClassName="DurationConstraintEditPartCN"

+				itemSemanticEditPolicyClassName="DurationConstraintItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="DurationConstraintCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="DurationConstraintGraphicalNodeEditPolicyCN"

+				createCommandClassName="DurationConstraintCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationConstraint" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.15">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="6040" editPartClassName="DurationConstraintNameEditPartCN"

+					itemSemanticEditPolicyClassName="DurationConstraintNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6041" editPartClassName="DurationConstraintSpecificationEditPartCN"

+					itemSemanticEditPolicyClassName="DurationConstraintSpecificationItemSemanticEditPolicyCN">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getConstraintFigure"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.4">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						<editableMetaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3117" editPartClassName="TimeConstraintEditPartCN"

+				itemSemanticEditPolicyClassName="TimeConstraintItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="TimeConstraintCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="TimeConstraintGraphicalNodeEditPolicyCN"

+				createCommandClassName="TimeConstraintCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeConstraint" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.16">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="6042" editPartClassName="TimeConstraintNameEditPartCN"

+					itemSemanticEditPolicyClassName="TimeConstraintNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6043" editPartClassName="TimeConstraintSpecificationEditPartCN"

+					itemSemanticEditPolicyClassName="TimeConstraintSpecificationItemSemanticEditPolicyCN">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getConstraintFigure"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.4">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						<editableMetaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3118" editPartClassName="IntervalConstraintEditPartCN"

+				itemSemanticEditPolicyClassName="IntervalConstraintItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="IntervalConstraintCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="IntervalConstraintGraphicalNodeEditPolicyCN"

+				createCommandClassName="IntervalConstraintCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/IntervalConstraint" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.14">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="6044" editPartClassName="IntervalConstraintNameEditPartCN"

+					itemSemanticEditPolicyClassName="IntervalConstraintNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6045" editPartClassName="IntervalConstraintSpecificationEditPartCN"

+					itemSemanticEditPolicyClassName="IntervalConstraintSpecificationItemSemanticEditPolicyCN">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getConstraintFigure"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.4">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						<editableMetaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3119" editPartClassName="InteractionConstraintEditPartCN"

+				itemSemanticEditPolicyClassName="InteractionConstraintItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="InteractionConstraintCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="InteractionConstraintGraphicalNodeEditPolicyCN"

+				createCommandClassName="InteractionConstraintCreateCommandCN"

+				containers="/0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.28 /0/@diagram/@compartments.29">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionConstraint" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.13">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="6046" editPartClassName="InteractionConstraintNameEditPartCN"

+					itemSemanticEditPolicyClassName="InteractionConstraintNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6047"

+					editPartClassName="InteractionConstraintSpecificationEditPartCN"

+					itemSemanticEditPolicyClassName="InteractionConstraintSpecificationItemSemanticEditPolicyCN">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getConstraintFigure"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.4">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						<editableMetaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes visualID="3120" editPartClassName="ConstraintEditPartCN"

+				itemSemanticEditPolicyClassName="ConstraintItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="ConstraintCanonicalEditPolicyCN"

+				graphicalNodeEditPolicyClassName="ConstraintGraphicalNodeEditPolicyCN"

+				createCommandClassName="ConstraintCreateCommandCN"

+				containers="/0/@diagram/@compartments.28 /0/@diagram/@compartments.6 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.11 /0/@diagram/@compartments.12 /0/@diagram/@compartments.13 /0/@diagram/@compartments.14 /0/@diagram/@compartments.15 /0/@diagram/@compartments.16 /0/@diagram/@compartments.17 /0/@diagram/@compartments.18 /0/@diagram/@compartments.19 /0/@diagram/@compartments.20 /0/@diagram/@compartments.21 /0/@diagram/@compartments.22 /0/@diagram/@compartments.23 /0/@diagram/@compartments.24 /0/@diagram/@compartments.25 /0/@diagram/@compartments.26 /0/@diagram/@compartments.27 /0/@diagram/@compartments.29">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.13">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="6048" editPartClassName="ConstraintNameEditPartCN"

+					itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicyCN"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6049" editPartClassName="ConstraintSpecificationEditPartCN"

+					itemSemanticEditPolicyClassName="ConstraintSpecificationItemSemanticEditPolicyCN">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getConstraintFigure"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.4">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						<editableMetaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+					</modelFacet>

+				</labels>

+			</childNodes>

+			<childNodes xsi:type="gmfgen:GenChildLabelNode" visualID="3101"

+				editPartClassName="PropertyEditPartCLN"

+				itemSemanticEditPolicyClassName="PropertyItemSemanticEditPolicyCLN"

+				canonicalEditPolicyClassName="PropertyCanonicalEditPolicyCLN"

+				graphicalNodeEditPolicyClassName="PropertyGraphicalNodeEditPolicyCLN"

+				createCommandClassName="PropertyCreateCommandCLN"

+				containers="/0/@diagram/@compartments.2 /0/@diagram/@compartments.0"

+				labelElementIcon="true">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labelModelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+					parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+					editorPattern="{0}" editPattern="{0}">

+					<metaFeatures

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+				</labelModelFacet>

+			</childNodes>

+			<childNodes xsi:type="gmfgen:GenChildLabelNode" visualID="3102"

+				editPartClassName="OperationEditPartCLN"

+				itemSemanticEditPolicyClassName="OperationItemSemanticEditPolicyCLN"

+				canonicalEditPolicyClassName="OperationCanonicalEditPolicyCLN"

+				graphicalNodeEditPolicyClassName="OperationGraphicalNodeEditPolicyCLN"

+				createCommandClassName="OperationCreateCommandCLN"

+				containers="/0/@diagram/@compartments.3 /0/@diagram/@compartments.1"

+				labelElementIcon="true">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Operation" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/ownedOperation" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/ownedOperation" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labelModelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+					parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+					editorPattern="{0}" editPattern="{0}">

+					<metaFeatures

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+				</labelModelFacet>

+			</childNodes>

+			<childNodes xsi:type="gmfgen:GenChildLabelNode" visualID="3066"

+				editPartClassName="EnumerationLiteralEditPartCLN"

+				itemSemanticEditPolicyClassName="EnumerationLiteralItemSemanticEditPolicyCLN"

+				canonicalEditPolicyClassName="EnumerationLiteralCanonicalEditPolicyCLN"

+				graphicalNodeEditPolicyClassName="EnumerationLiteralGraphicalNodeEditPolicyCLN"

+				createCommandClassName="EnumerationLiteralCreateCommandCLN"

+				containers="/0/@diagram/@compartments.5 /0/@diagram/@compartments.4 /0/@diagram/@topLevelNodes.14 /0/@diagram/@childNodes.20"

+				labelElementIcon="true">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="EnumerationLiteralEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/EnumerationLiteral" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration/ownedLiteral" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration/ownedLiteral" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labelModelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+					parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+					editorPattern="{0}" editPattern="{0}">

+					<metaFeatures

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+				</labelModelFacet>

+			</childNodes>

+			<topLevelNodes visualID="2060" editPartClassName="ActivityCompositeEditPart"

+				itemSemanticEditPolicyClassName="ActivityCompositeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ActivityCompositeCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+				compartments="/0/@diagram/@compartments.18"

+				graphicalNodeEditPolicyClassName="ActivityCompositeGraphicalNodeEditPolicy"

+				createCommandClassName="ActivityCompositeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="ActivityEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5112" editPartClassName="ActivityCompositeNameEditPart"

+					itemSemanticEditPolicyClassName="ActivityCompositeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6079"

+					editPartClassName="ActivityCompositeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="ActivityFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2061" editPartClassName="InteractionCompositeEditPart"

+				itemSemanticEditPolicyClassName="InteractionCompositeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="InteractionCompositeCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+				compartments="/0/@diagram/@compartments.19"

+				graphicalNodeEditPolicyClassName="InteractionCompositeGraphicalNodeEditPolicy"

+				createCommandClassName="InteractionCompositeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="InteractionEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5113" editPartClassName="InteractionCompositeNameEditPart"

+					itemSemanticEditPolicyClassName="InteractionCompositeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6080"

+					editPartClassName="InteractionCompositeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="InteractionFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2062"

+				editPartClassName="ProtocolStateMachineCompositeEditPart"

+				itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ProtocolStateMachineCompositeCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+				compartments="/0/@diagram/@compartments.20"

+				graphicalNodeEditPolicyClassName="ProtocolStateMachineCompositeGraphicalNodeEditPolicy"

+				createCommandClassName="ProtocolStateMachineCompositeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="ProtocolStateMachineEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ProtocolStateMachine" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5114" editPartClassName="ProtocolStateMachineCompositeNameEditPart"

+					itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6081"

+					editPartClassName="ProtocolStateMachineCompositeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="ProtocolStateMachineFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2063" editPartClassName="StateMachineCompositeEditPart"

+				itemSemanticEditPolicyClassName="StateMachineCompositeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="StateMachineCompositeCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+				compartments="/0/@diagram/@compartments.21"

+				graphicalNodeEditPolicyClassName="StateMachineCompositeGraphicalNodeEditPolicy"

+				createCommandClassName="StateMachineCompositeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="StateMachineEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StateMachine" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5115" editPartClassName="StateMachineCompositeNameEditPart"

+					itemSemanticEditPolicyClassName="StateMachineCompositeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6082"

+					editPartClassName="StateMachineCompositeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="StateMachineFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2064"

+				editPartClassName="FunctionBehaviorCompositeEditPart"

+				itemSemanticEditPolicyClassName="FunctionBehaviorCompositeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="FunctionBehaviorCompositeCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+				compartments="/0/@diagram/@compartments.22"

+				graphicalNodeEditPolicyClassName="FunctionBehaviorCompositeGraphicalNodeEditPolicy"

+				createCommandClassName="FunctionBehaviorCompositeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="FunctionBehaviorEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/FunctionBehavior" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5116" editPartClassName="FunctionBehaviorCompositeNameEditPart"

+					itemSemanticEditPolicyClassName="FunctionBehaviorCompositeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6083"

+					editPartClassName="FunctionBehaviorCompositeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="FunctionBehaviorFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2065"

+				editPartClassName="OpaqueBehaviorCompositeEditPart"

+				itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="OpaqueBehaviorCompositeCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+				compartments="/0/@diagram/@compartments.23"

+				graphicalNodeEditPolicyClassName="OpaqueBehaviorCompositeGraphicalNodeEditPolicy"

+				createCommandClassName="OpaqueBehaviorCompositeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="OpaqueBehaviorEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/OpaqueBehavior" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5117" editPartClassName="OpaqueBehaviorCompositeNameEditPart"

+					itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6084"

+					editPartClassName="OpaqueBehaviorCompositeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="OpaqueBehaviorFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2069" editPartClassName="ComponentCompositeEditPart"

+				itemSemanticEditPolicyClassName="ComponentCompositeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ComponentCompositeCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.24"

+				graphicalNodeEditPolicyClassName="ComponentCompositeGraphicalNodeEditPolicy"

+				createCommandClassName="ComponentCompositeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="ComponentEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5121" editPartClassName="ComponentCompositeNameEditPart"

+					itemSemanticEditPolicyClassName="ComponentCompositeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6085"

+					editPartClassName="ComponentCompositeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="ComponentFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2070" editPartClassName="DeviceCompositeEditPart"

+				itemSemanticEditPolicyClassName="DeviceCompositeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="DeviceCompositeCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.25"

+				graphicalNodeEditPolicyClassName="DeviceCompositeGraphicalNodeEditPolicy"

+				createCommandClassName="DeviceCompositeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="DeviceEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Device" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5122" editPartClassName="DeviceCompositeNameEditPart"

+					itemSemanticEditPolicyClassName="DeviceCompositeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6086"

+					editPartClassName="DeviceCompositeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="DeviceFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2071"

+				editPartClassName="ExecutionEnvironmentCompositeEditPart"

+				itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.26"

+				graphicalNodeEditPolicyClassName="ExecutionEnvironmentCompositeGraphicalNodeEditPolicy"

+				createCommandClassName="ExecutionEnvironmentCompositeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="ExecutionEnvironmentEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ExecutionEnvironment" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5123" editPartClassName="ExecutionEnvironmentCompositeNameEditPart"

+					itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6087"

+					editPartClassName="ExecutionEnvironmentCompositeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="ExecutionEnvironmentFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2072" editPartClassName="NodeCompositeEditPart"

+				itemSemanticEditPolicyClassName="NodeCompositeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="NodeCompositeCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.27"

+				graphicalNodeEditPolicyClassName="NodeCompositeGraphicalNodeEditPolicy"

+				createCommandClassName="NodeCompositeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="NodeEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Node" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5124" editPartClassName="NodeCompositeNameEditPart"

+					itemSemanticEditPolicyClassName="NodeCompositeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6088"

+					editPartClassName="NodeCompositeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="NodeFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2073" editPartClassName="ClassCompositeEditPart"

+				itemSemanticEditPolicyClassName="ClassCompositeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ClassCompositeCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.1" compartments="/0/@diagram/@compartments.28"

+				graphicalNodeEditPolicyClassName="ClassCompositeGraphicalNodeEditPolicy"

+				createCommandClassName="ClassCompositeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="ClassEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5156" editPartClassName="ClassCompositeNameEditPart"

+					itemSemanticEditPolicyClassName="ClassCompositeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6089"

+					editPartClassName="ClassCompositeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="ClassFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2075"

+				editPartClassName="CollaborationCompositeEditPart"

+				itemSemanticEditPolicyClassName="CollaborationCompositeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="CollaborationCompositeCanonicalEditPolicy"

+				compartments="/0/@diagram/@compartments.29"

+				graphicalNodeEditPolicyClassName="CollaborationCompositeGraphicalNodeEditPolicy"

+				createCommandClassName="CollaborationCompositeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@childNodes.17/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Collaboration" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5158" editPartClassName="CollaborationCompositeNameEditPart"

+					itemSemanticEditPolicyClassName="CollaborationCompositeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6090"

+					editPartClassName="CollaborationCompositeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="CollaborationFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2076" editPartClassName="InterfaceEditPart"

+				itemSemanticEditPolicyClassName="InterfaceItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="InterfaceCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="InterfaceGraphicalNodeEditPolicy"

+				createCommandClassName="InterfaceCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@childNodes.18/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interface" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5159" editPartClassName="InterfaceNameEditPart"

+					itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6091"

+					editPartClassName="InterfaceFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="InterfaceFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2066" editPartClassName="PrimitiveTypeEditPart"

+				itemSemanticEditPolicyClassName="PrimitiveTypeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="PrimitiveTypeCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="PrimitiveTypeGraphicalNodeEditPolicy"

+				createCommandClassName="PrimitiveTypeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="PrimitiveTypeEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/PrimitiveType" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5118" editPartClassName="PrimitiveTypeNameEditPart"

+					itemSemanticEditPolicyClassName="PrimitiveTypeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6092"

+					editPartClassName="PrimitiveTypeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="PrimitiveTypeFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2067" editPartClassName="EnumerationEditPart"

+				itemSemanticEditPolicyClassName="EnumerationItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="EnumerationCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.36" compartments="/0/@diagram/@compartments.4"

+				graphicalNodeEditPolicyClassName="EnumerationGraphicalNodeEditPolicy"

+				createCommandClassName="EnumerationCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="EnumerationEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Enumeration" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5119" editPartClassName="EnumerationNameEditPart"

+					itemSemanticEditPolicyClassName="EnumerationNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6093"

+					editPartClassName="EnumerationFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="EnumerationFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2068" editPartClassName="DataTypeEditPart"

+				itemSemanticEditPolicyClassName="DataTypeItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="DataTypeCanonicalEditPolicy"

+				compartments="/0/@diagram/@compartments.0 /0/@diagram/@compartments.1"

+				graphicalNodeEditPolicyClassName="DataTypeGraphicalNodeEditPolicy"

+				createCommandClassName="DataTypeCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="DataTypeEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DataType" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5120" editPartClassName="DataTypeNameEditPart"

+					itemSemanticEditPolicyClassName="DataTypeNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6094"

+					editPartClassName="DataTypeFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="DataTypeFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2077" editPartClassName="ActorEditPart"

+				itemSemanticEditPolicyClassName="ActorItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ActorCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="ActorGraphicalNodeEditPolicy"

+				createCommandClassName="ActorCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@childNodes.22/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Actor" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5160" editPartClassName="ActorNameEditPart"

+					itemSemanticEditPolicyClassName="ActorNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6095"

+					editPartClassName="ActorFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="ActorFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2078"

+				editPartClassName="DeploymentSpecificationEditPart"

+				itemSemanticEditPolicyClassName="DeploymentSpecificationItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="DeploymentSpecificationCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="DeploymentSpecificationGraphicalNodeEditPolicy"

+				createCommandClassName="DeploymentSpecificationCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@childNodes.23/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DeploymentSpecification" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5161" editPartClassName="DeploymentSpecificationNameEditPart"

+					itemSemanticEditPolicyClassName="DeploymentSpecificationNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6096"

+					editPartClassName="DeploymentSpecificationFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="DeploymentSpecificationFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2079" editPartClassName="ArtifactEditPart"

+				itemSemanticEditPolicyClassName="ArtifactItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ArtifactCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="ArtifactGraphicalNodeEditPolicy"

+				createCommandClassName="ArtifactCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@childNodes.24/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Artifact" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5162" editPartClassName="ArtifactNameEditPart"

+					itemSemanticEditPolicyClassName="ArtifactNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6097"

+					editPartClassName="ArtifactFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="ArtifactFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2080" editPartClassName="InformationItemEditPart"

+				itemSemanticEditPolicyClassName="InformationItemItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="InformationItemCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="InformationItemGraphicalNodeEditPolicy"

+				createCommandClassName="InformationItemCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@childNodes.25/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure">

+					<attributes xsi:type="gmfgen:DefaultSizeAttributes"

+						width="80" height="40" />

+				</viewmap>

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationItem" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.7">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/isAbstract" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5163" editPartClassName="InformationItemNameEditPart"

+					itemSemanticEditPolicyClassName="InformationItemNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6098"

+					editPartClassName="InformationItemFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="InformationItemFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2081" editPartClassName="SignalEditPart"

+				itemSemanticEditPolicyClassName="SignalItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="SignalCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="SignalGraphicalNodeEditPolicy"

+				createCommandClassName="SignalCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@childNodes.26/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Signal" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5164" editPartClassName="SignalNameEditPart"

+					itemSemanticEditPolicyClassName="SignalNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6099"

+					editPartClassName="SignalFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="SignalFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2082" editPartClassName="UseCaseEditPart"

+				itemSemanticEditPolicyClassName="UseCaseItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="UseCaseCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="UseCaseGraphicalNodeEditPolicy"

+				createCommandClassName="UseCaseCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@childNodes.27/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/UseCase" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5165" editPartClassName="UseCaseNameEditPart"

+					itemSemanticEditPolicyClassName="UseCaseNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6100"

+					editPartClassName="UseCaseFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="UseCaseFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2083" editPartClassName="SignalEventEditPart"

+				itemSemanticEditPolicyClassName="SignalEventItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="SignalEventCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="SignalEventGraphicalNodeEditPolicy"

+				createCommandClassName="SignalEventCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="SignalEventEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/SignalEvent" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5166" editPartClassName="SignalEventNameEditPart"

+					itemSemanticEditPolicyClassName="SignalEventNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6101"

+					editPartClassName="SignalEventFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="SignalEventFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2084" editPartClassName="CallEventEditPart"

+				itemSemanticEditPolicyClassName="CallEventItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="CallEventCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="CallEventGraphicalNodeEditPolicy"

+				createCommandClassName="CallEventCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="CallEventEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CallEvent" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5167" editPartClassName="CallEventNameEditPart"

+					itemSemanticEditPolicyClassName="CallEventNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6102"

+					editPartClassName="CallEventFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="CallEventFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2085" editPartClassName="AnyReceiveEventEditPart"

+				itemSemanticEditPolicyClassName="AnyReceiveEventItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="AnyReceiveEventCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="AnyReceiveEventGraphicalNodeEditPolicy"

+				createCommandClassName="AnyReceiveEventCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="AnyReceiveEventEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/AnyReceiveEvent" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5168" editPartClassName="AnyReceiveEventNameEditPart"

+					itemSemanticEditPolicyClassName="AnyReceiveEventNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6103"

+					editPartClassName="AnyReceiveEventFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="AnyReceiveEventFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2088" editPartClassName="ChangeEventEditPart"

+				itemSemanticEditPolicyClassName="ChangeEventItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ChangeEventCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="ChangeEventGraphicalNodeEditPolicy"

+				createCommandClassName="ChangeEventCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="ChangeEventEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ChangeEvent" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5171" editPartClassName="ChangeEventNameEditPart"

+					itemSemanticEditPolicyClassName="ChangeEventNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6104"

+					editPartClassName="ChangeEventFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="ChangeEventFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2089" editPartClassName="TimeEventEditPart"

+				itemSemanticEditPolicyClassName="TimeEventItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="TimeEventCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="TimeEventGraphicalNodeEditPolicy"

+				createCommandClassName="TimeEventCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="TimeEventEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeEvent" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5172" editPartClassName="TimeEventNameEditPart"

+					itemSemanticEditPolicyClassName="TimeEventNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6105"

+					editPartClassName="TimeEventFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="TimeEventFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2093" editPartClassName="DurationObservationEditPart"

+				itemSemanticEditPolicyClassName="DurationObservationItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="DurationObservationCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="DurationObservationGraphicalNodeEditPolicy"

+				createCommandClassName="DurationObservationCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="DurationObservationEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure">

+					<attributes xsi:type="gmfgen:DefaultSizeAttributes"

+						width="20" height="20" />

+				</viewmap>

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="5151"

+					editPartClassName="DurationObservationNameEditPart"

+					itemSemanticEditPolicyClassName="DurationObservationNameItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25"

+							y="3" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="5152"

+					editPartClassName="DurationObservationStereotypeLabelEditPart"

+					itemSemanticEditPolicyClassName="DurationObservationStereotypeLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25"

+							y="-10" />

+					</viewmap>

+					<behaviour xsi:type="gmfgen:CustomBehaviour"

+						key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+						editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2094" editPartClassName="TimeObservationEditPart"

+				itemSemanticEditPolicyClassName="TimeObservationItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="TimeObservationCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="TimeObservationGraphicalNodeEditPolicy"

+				createCommandClassName="TimeObservationCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="TimeObservationEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure">

+					<attributes xsi:type="gmfgen:DefaultSizeAttributes"

+						width="20" height="20" />

+				</viewmap>

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeObservation" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="5142"

+					editPartClassName="TimeObservationNameEditPart"

+					itemSemanticEditPolicyClassName="TimeObservationNameItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25"

+							y="3" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="5143"

+					editPartClassName="TimeObservationStereotypeLabelEditPart"

+					itemSemanticEditPolicyClassName="TimeObservationStereotypeLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" x="25"

+							y="-10" />

+					</viewmap>

+					<behaviour xsi:type="gmfgen:CustomBehaviour"

+						key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+						editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2095" editPartClassName="LiteralBooleanEditPart"

+				itemSemanticEditPolicyClassName="LiteralBooleanItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="LiteralBooleanCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="LiteralBooleanGraphicalNodeEditPolicy"

+				createCommandClassName="LiteralBooleanCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="LiteralBooleanEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralBoolean" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5178" editPartClassName="LiteralBooleanNameEditPart"

+					itemSemanticEditPolicyClassName="LiteralBooleanNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6106"

+					editPartClassName="LiteralBooleanFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="LiteralBooleanFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2096" editPartClassName="LiteralIntegerEditPart"

+				itemSemanticEditPolicyClassName="LiteralIntegerItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="LiteralIntegerCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="LiteralIntegerGraphicalNodeEditPolicy"

+				createCommandClassName="LiteralIntegerCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="LiteralIntegerEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralInteger" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5179" editPartClassName="LiteralIntegerNameEditPart"

+					itemSemanticEditPolicyClassName="LiteralIntegerNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6107"

+					editPartClassName="LiteralIntegerFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="LiteralIntegerFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2097" editPartClassName="LiteralNullEditPart"

+				itemSemanticEditPolicyClassName="LiteralNullItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="LiteralNullCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="LiteralNullGraphicalNodeEditPolicy"

+				createCommandClassName="LiteralNullCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="LiteralNullEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralNull" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5180" editPartClassName="LiteralNullNameEditPart"

+					itemSemanticEditPolicyClassName="LiteralNullNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6108"

+					editPartClassName="LiteralNullFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="LiteralNullFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2098" editPartClassName="LiteralStringEditPart"

+				itemSemanticEditPolicyClassName="LiteralStringItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="LiteralStringCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="LiteralStringGraphicalNodeEditPolicy"

+				createCommandClassName="LiteralStringCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="LiteralStringEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralString" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5181" editPartClassName="LiteralStringNameEditPart"

+					itemSemanticEditPolicyClassName="LiteralStringNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6109"

+					editPartClassName="LiteralStringFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="LiteralStringFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2099"

+				editPartClassName="LiteralUnlimitedNaturalEditPart"

+				itemSemanticEditPolicyClassName="LiteralUnlimitedNaturalItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="LiteralUnlimitedNaturalCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="LiteralUnlimitedNaturalGraphicalNodeEditPolicy"

+				createCommandClassName="LiteralUnlimitedNaturalCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="LiteralUnlimitedNaturalEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralUnlimitedNatural" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5182" editPartClassName="LiteralUnlimitedNaturalNameEditPart"

+					itemSemanticEditPolicyClassName="LiteralUnlimitedNaturalNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6110"

+					editPartClassName="LiteralUnlimitedNaturalFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="LiteralUnlimitedNaturalFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2100" editPartClassName="StringExpressionEditPart"

+				itemSemanticEditPolicyClassName="StringExpressionItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="StringExpressionCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="StringExpressionGraphicalNodeEditPolicy"

+				createCommandClassName="StringExpressionCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="StringExpressionEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StringExpression" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5183" editPartClassName="StringExpressionNameEditPart"

+					itemSemanticEditPolicyClassName="StringExpressionNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6111"

+					editPartClassName="StringExpressionFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="StringExpressionFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2101" editPartClassName="OpaqueExpressionEditPart"

+				itemSemanticEditPolicyClassName="OpaqueExpressionItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="OpaqueExpressionCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="OpaqueExpressionGraphicalNodeEditPolicy"

+				createCommandClassName="OpaqueExpressionCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="OpaqueExpressionEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/OpaqueExpression" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5184" editPartClassName="OpaqueExpressionNameEditPart"

+					itemSemanticEditPolicyClassName="OpaqueExpressionNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6112"

+					editPartClassName="OpaqueExpressionFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="OpaqueExpressionFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2102" editPartClassName="TimeExpressionEditPart"

+				itemSemanticEditPolicyClassName="TimeExpressionItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="TimeExpressionCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="TimeExpressionGraphicalNodeEditPolicy"

+				createCommandClassName="TimeExpressionCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="TimeExpressionEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeExpression" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5185" editPartClassName="TimeExpressionNameEditPart"

+					itemSemanticEditPolicyClassName="TimeExpressionNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6113"

+					editPartClassName="TimeExpressionFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="TimeExpressionFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2103" editPartClassName="ExpressionEditPart"

+				itemSemanticEditPolicyClassName="ExpressionItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ExpressionCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="ExpressionGraphicalNodeEditPolicy"

+				createCommandClassName="ExpressionCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="ExpressionEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Expression" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5186" editPartClassName="ExpressionNameEditPart"

+					itemSemanticEditPolicyClassName="ExpressionNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6114"

+					editPartClassName="ExpressionFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="ExpressionFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2104" editPartClassName="DurationEditPart"

+				itemSemanticEditPolicyClassName="DurationItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="DurationCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="DurationGraphicalNodeEditPolicy"

+				createCommandClassName="DurationCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="DurationEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Duration" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5187" editPartClassName="DurationNameEditPart"

+					itemSemanticEditPolicyClassName="DurationNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6115"

+					editPartClassName="DurationFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="DurationFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2105" editPartClassName="TimeIntervalEditPart"

+				itemSemanticEditPolicyClassName="TimeIntervalItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="TimeIntervalCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="TimeIntervalGraphicalNodeEditPolicy"

+				createCommandClassName="TimeIntervalCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="TimeIntervalEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeInterval" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5188" editPartClassName="TimeIntervalNameEditPart"

+					itemSemanticEditPolicyClassName="TimeIntervalNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6116"

+					editPartClassName="TimeIntervalFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="TimeIntervalFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2106" editPartClassName="DurationIntervalEditPart"

+				itemSemanticEditPolicyClassName="DurationIntervalItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="DurationIntervalCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="DurationIntervalGraphicalNodeEditPolicy"

+				createCommandClassName="DurationIntervalCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="DurationIntervalEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationInterval" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5189" editPartClassName="DurationIntervalNameEditPart"

+					itemSemanticEditPolicyClassName="DurationIntervalNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6117"

+					editPartClassName="DurationIntervalFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="DurationIntervalFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2107" editPartClassName="IntervalEditPart"

+				itemSemanticEditPolicyClassName="IntervalItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="IntervalCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="IntervalGraphicalNodeEditPolicy"

+				createCommandClassName="IntervalCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="IntervalEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interval" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5190" editPartClassName="IntervalNameEditPart"

+					itemSemanticEditPolicyClassName="IntervalNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6118"

+					editPartClassName="IntervalFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="IntervalFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2108" editPartClassName="InstanceValueEditPart"

+				itemSemanticEditPolicyClassName="InstanceValueItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="InstanceValueCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="InstanceValueGraphicalNodeEditPolicy"

+				createCommandClassName="InstanceValueCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="InstanceValueEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InstanceValue" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5191" editPartClassName="InstanceValueNameEditPart"

+					itemSemanticEditPolicyClassName="InstanceValueNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  "

+						editorPattern="{0}" editPattern="{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="6119"

+					editPartClassName="InstanceValueFloatingLabelEditPart"

+					itemSemanticEditPolicyClassName="InstanceValueFloatingLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:FigureViewmap"

+						figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2109" editPartClassName="CommentEditPart"

+				itemSemanticEditPolicyClassName="CommentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="CommentCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="CommentGraphicalNodeEditPolicy"

+				createCommandClassName="CommentCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" metamodelType="/0/@diagram/@childNodes.28/@elementType" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusReflowableShapeEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.12">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5192" editPartClassName="CommentBodyEditPart"

+					itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getCornerBentFigure"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.3">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2110" editPartClassName="DurationConstraintEditPart"

+				itemSemanticEditPolicyClassName="DurationConstraintItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="DurationConstraintCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="DurationConstraintGraphicalNodeEditPolicy"

+				createCommandClassName="DurationConstraintCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationConstraint" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.15">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5193" editPartClassName="DurationConstraintNameEditPart"

+					itemSemanticEditPolicyClassName="DurationConstraintNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6035" editPartClassName="DurationConstraintSpecificationEditPart"

+					itemSemanticEditPolicyClassName="DurationConstraintSpecificationItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getConstraintFigure"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.4">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						<editableMetaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2111" editPartClassName="TimeConstraintEditPart"

+				itemSemanticEditPolicyClassName="TimeConstraintItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="TimeConstraintCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="TimeConstraintGraphicalNodeEditPolicy"

+				createCommandClassName="TimeConstraintCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="TimeConstraintEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeConstraint" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.16">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5194" editPartClassName="TimeConstraintNameEditPart"

+					itemSemanticEditPolicyClassName="TimeConstraintNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6036" editPartClassName="TimeConstraintSpecificationEditPart"

+					itemSemanticEditPolicyClassName="TimeConstraintSpecificationItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getConstraintFigure"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.4">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						<editableMetaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2112" editPartClassName="IntervalConstraintEditPart"

+				itemSemanticEditPolicyClassName="IntervalConstraintItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="IntervalConstraintCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="IntervalConstraintGraphicalNodeEditPolicy"

+				createCommandClassName="IntervalConstraintCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="IntervalConstraintEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/IntervalConstraint" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.14">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5195" editPartClassName="IntervalConstraintNameEditPart"

+					itemSemanticEditPolicyClassName="IntervalConstraintNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6037" editPartClassName="IntervalConstraintSpecificationEditPart"

+					itemSemanticEditPolicyClassName="IntervalConstraintSpecificationItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getConstraintFigure"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.4">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						<editableMetaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2113" editPartClassName="InteractionConstraintEditPart"

+				itemSemanticEditPolicyClassName="InteractionConstraintItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="InteractionConstraintCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="InteractionConstraintGraphicalNodeEditPolicy"

+				createCommandClassName="InteractionConstraintCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="InteractionConstraintEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionConstraint" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.13">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5196" editPartClassName="InteractionConstraintNameEditPart"

+					itemSemanticEditPolicyClassName="InteractionConstraintNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6038" editPartClassName="InteractionConstraintSpecificationEditPart"

+					itemSemanticEditPolicyClassName="InteractionConstraintSpecificationItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getConstraintFigure"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.4">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						<editableMetaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<topLevelNodes visualID="2114" editPartClassName="ConstraintEditPart"

+				itemSemanticEditPolicyClassName="ConstraintItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ConstraintCanonicalEditPolicy"

+				graphicalNodeEditPolicyClassName="ConstraintGraphicalNodeEditPolicy"

+				createCommandClassName="ConstraintCreateCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="ConstraintEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy" />

+				<modelFacet>

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.13">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						</initializers>

+					</modelElementInitializer>

+				</modelFacet>

+				<labels visualID="5197" editPartClassName="ConstraintNameEditPart"

+					itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6039" editPartClassName="ConstraintSpecificationEditPart"

+					itemSemanticEditPolicyClassName="ConstraintSpecificationItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getConstraintFigure"

+						figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure" />

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.4">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+						<editableMetaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification" />

+					</modelFacet>

+				</labels>

+			</topLevelNodes>

+			<links visualID="4022" editPartClassName="BehaviorPortLinkEditPart"

+				itemSemanticEditPolicyClassName="BehaviorPortLinkItemSemanticEditPolicy"

+				createCommandClassName="BehaviorPortLinkCreateCommand"

+				reorientCommandClassName="BehaviorPortLinkReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:NotationType"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoConnectableEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.COMPONENT_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoDeleteFromDiagramEditPolicy" />

+			</links>

+			<links visualID="4001" editPartClassName="LinkDescriptorEditPart"

+				itemSemanticEditPolicyClassName="LinkDescriptorItemSemanticEditPolicy"

+				createCommandClassName="LinkDescriptorCreateCommand"

+				reorientCommandClassName="LinkDescriptorReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:NotationType"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure" />

+			</links>

+			<links visualID="4002" editPartClassName="CommentAnnotatedElementEditPart"

+				itemSemanticEditPolicyClassName="CommentAnnotatedElementItemSemanticEditPolicy"

+				createCommandClassName="CommentAnnotatedElementCreateCommand"

+				reorientCommandClassName="CommentAnnotatedElementReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					displayName="CommentAnnotatedElement" definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure" />

+				<modelFacet xsi:type="gmfgen:FeatureLinkModelFacet">

+					<metaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/annotatedElement" />

+				</modelFacet>

+			</links>

+			<links visualID="4003" editPartClassName="ConstraintConstrainedElementEditPart"

+				itemSemanticEditPolicyClassName="ConstraintConstrainedElementItemSemanticEditPolicy"

+				createCommandClassName="ConstraintConstrainedElementCreateCommand"

+				reorientCommandClassName="ConstraintConstrainedElementReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					displayName="ConstraintConstrainedElement" definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure" />

+				<modelFacet xsi:type="gmfgen:FeatureLinkModelFacet">

+					<metaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/constrainedElement" />

+				</modelFacet>

+			</links>

+			<links visualID="4004" editPartClassName="ComponentRealizationEditPart"

+				itemSemanticEditPolicyClassName="ComponentRealizationItemSemanticEditPolicy"

+				createCommandClassName="ComponentRealizationCreateCommand"

+				reorientCommandClassName="ComponentRealizationReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="ComponentRealizationEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy" />

+				<modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ComponentRealization" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+					<sourceMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client" />

+					<targetMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier" />

+				</modelFacet>

+				<labels visualID="6001" editPartClassName="ComponentRealizationNameEditPart"

+					itemSemanticEditPolicyClassName="ComponentRealizationNameItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6015"

+					editPartClassName="ComponentRealizationAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="ComponentRealizationAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getAppliedStereotypeLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</links>

+			<links visualID="4005" editPartClassName="InterfaceRealizationEditPart"

+				itemSemanticEditPolicyClassName="InterfaceRealizationItemSemanticEditPolicy"

+				createCommandClassName="InterfaceRealizationCreateCommand"

+				reorientCommandClassName="InterfaceRealizationReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="InterfaceRealizationEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy" />

+				<modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InterfaceRealization" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+					<sourceMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client" />

+					<targetMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier" />

+				</modelFacet>

+				<labels visualID="6002" editPartClassName="InterfaceRealizationNameEditPart"

+					itemSemanticEditPolicyClassName="InterfaceRealizationNameItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6016"

+					editPartClassName="InterfaceRealizationAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="InterfaceRealizationAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getAppliedStereotypeLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</links>

+			<links visualID="4011" editPartClassName="SubstitutionEditPart"

+				itemSemanticEditPolicyClassName="SubstitutionItemSemanticEditPolicy"

+				createCommandClassName="SubstitutionCreateCommand"

+				reorientCommandClassName="SubstitutionReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="SubstitutionEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeSubstitutionLabelDisplayEditPolicy" />

+				<modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Substitution" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+					<sourceMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client" />

+					<targetMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier" />

+				</modelFacet>

+				<labels visualID="6003" editPartClassName="SubstitutionNameEditPart"

+					itemSemanticEditPolicyClassName="SubstitutionNameItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6017" editPartClassName="SubstitutionAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="SubstitutionAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getAppliedStereotypeLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</links>

+			<links visualID="4006" editPartClassName="RealizationEditPart"

+				itemSemanticEditPolicyClassName="RealizationItemSemanticEditPolicy"

+				createCommandClassName="RealizationCreateCommand"

+				reorientCommandClassName="RealizationReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="RealizationEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy" />

+				<modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Realization" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+					<sourceMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client" />

+					<targetMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier" />

+				</modelFacet>

+				<labels visualID="6004" editPartClassName="RealizationNameEditPart"

+					itemSemanticEditPolicyClassName="RealizationNameItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6018" editPartClassName="RealizationAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="RealizationAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getAppliedStereotypeLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</links>

+			<links visualID="4012" editPartClassName="ManifestationEditPart"

+				itemSemanticEditPolicyClassName="ManifestationItemSemanticEditPolicy"

+				createCommandClassName="ManifestationCreateCommand"

+				reorientCommandClassName="ManifestationReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="ManifestationEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeManifestationLabelDisplayEditPolicy" />

+				<modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Manifestation" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+					<sourceMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client" />

+					<targetMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier" />

+				</modelFacet>

+				<labels visualID="6005" editPartClassName="ManifestationNameEditPart"

+					itemSemanticEditPolicyClassName="ManifestationNameItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6019" editPartClassName="ManifestationAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="ManifestationAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getAppliedStereotypeLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</links>

+			<links visualID="4007" editPartClassName="AbstractionEditPart"

+				itemSemanticEditPolicyClassName="AbstractionItemSemanticEditPolicy"

+				createCommandClassName="AbstractionCreateCommand"

+				reorientCommandClassName="AbstractionReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="AbstractionEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy" />

+				<modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Abstraction" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+					<sourceMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client" />

+					<targetMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier" />

+				</modelFacet>

+				<labels visualID="6006" editPartClassName="AbstractionNameEditPart"

+					itemSemanticEditPolicyClassName="AbstractionNameItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6020" editPartClassName="AbstractionAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="AbstractionAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getAppliedStereotypeLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</links>

+			<links visualID="4008" editPartClassName="UsageEditPart"

+				itemSemanticEditPolicyClassName="UsageItemSemanticEditPolicy"

+				createCommandClassName="UsageCreateCommand"

+				reorientCommandClassName="UsageReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="UsageEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy" />

+				<modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Usage" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+					<sourceMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client" />

+					<targetMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier" />

+				</modelFacet>

+				<labels visualID="6007" editPartClassName="UsageNameEditPart"

+					itemSemanticEditPolicyClassName="UsageNameItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6021" editPartClassName="UsageAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="UsageAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getAppliedStereotypeLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</links>

+			<links visualID="4009" editPartClassName="DeploymentEditPart"

+				itemSemanticEditPolicyClassName="DeploymentItemSemanticEditPolicy"

+				createCommandClassName="DeploymentCreateCommand"

+				reorientCommandClassName="DeploymentReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="DeploymentEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeDeploymentLabelDisplayEditPolicy" />

+				<modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Deployment" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+					<sourceMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client" />

+					<targetMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier" />

+				</modelFacet>

+				<labels visualID="6008" editPartClassName="DeploymentNameEditPart"

+					itemSemanticEditPolicyClassName="DeploymentNameItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6022" editPartClassName="DeploymentAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="DeploymentAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getAppliedStereotypeLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</links>

+			<links visualID="4017" editPartClassName="RoleBindingEditPart"

+				itemSemanticEditPolicyClassName="RoleBindingItemSemanticEditPolicy"

+				sourceReorientingAllowed="false" createCommandClassName="RoleBindingCreateCommand"

+				reorientCommandClassName="RoleBindingReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"

+					displayName="RoleBinding" definedExternally="true"

+					editHelperClassName="RoleBindingEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.RoleBindingFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy" />

+				<modelFacet xsi:type="gmfgen:TypeLinkModelFacet"

+					modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.4">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<sourceMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client" />

+					<targetMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier" />

+				</modelFacet>

+				<labels visualID="6027" editPartClassName="RoleBindingRoleNameEditPart"

+					itemSemanticEditPolicyClassName="RoleBindingRoleNameItemSemanticEditPolicy"

+					readOnly="true" alignment="SOURCE">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getRoleLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="20" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.2">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6028" editPartClassName="RoleBindingAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="RoleBindingAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getAppliedStereotypeLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<creationConstraints

+					sourceEnd="/0/@expressionProviders/@providers.0/@expressions.5"

+					targetEnd="/0/@expressionProviders/@providers.0/@expressions.6" />

+			</links>

+			<links visualID="4010" editPartClassName="DependencyEditPart"

+				itemSemanticEditPolicyClassName="DependencyItemSemanticEditPolicy"

+				createCommandClassName="DependencyCreateCommand"

+				reorientCommandClassName="DependencyReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="DependencyEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy" />

+				<modelFacet xsi:type="gmfgen:TypeLinkModelFacet"

+					modelElementSelector="/0/@expressionProviders/@providers.0/@expressions.3">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+					<sourceMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/client" />

+					<targetMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier" />

+				</modelFacet>

+				<labels visualID="6009" editPartClassName="DependencyNameEditPart"

+					itemSemanticEditPolicyClassName="DependencyNameItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6023" editPartClassName="DependencyAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="DependencyAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getAppliedStereotypeLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</links>

+			<links visualID="4013" editPartClassName="ConnectorEditPart"

+				itemSemanticEditPolicyClassName="ConnectorItemSemanticEditPolicy"

+				createCommandClassName="ConnectorCreateCommand"

+				reorientCommandClassName="ConnectorReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="ConnectorEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.ConnectorFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy" />

+				<modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedConnector" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedConnector" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+					<sourceMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end" />

+					<targetMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end" />

+				</modelFacet>

+				<labels visualID="6025" editPartClassName="ConnectorAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="ConnectorAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getAppliedStereotypeLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6050" editPartClassName="ConnectorNameEditPart"

+					itemSemanticEditPolicyClassName="ConnectorNameItemSemanticEditPolicy"

+					elementIcon="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getNameLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="-20" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern=""

+						editorPattern="" editPattern="">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6051" editPartClassName="ConnectorMultiplicitySourceEditPart"

+					itemSemanticEditPolicyClassName="ConnectorMultiplicitySourceItemSemanticEditPolicy"

+					readOnly="true" alignment="SOURCE">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getMultiplicitySourceLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="20" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="sourceMul{0}"

+						editorPattern="sourceMul{0}" editPattern="sourceMul{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<labels visualID="6052" editPartClassName="ConnectorMultiplicityTargetEditPart"

+					itemSemanticEditPolicyClassName="ConnectorMultiplicityTargetItemSemanticEditPolicy"

+					readOnly="true" alignment="TARGET">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getMultiplicityTargetLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="20" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.0" viewPattern="targetMul{0}"

+						editorPattern="targetMul{0}" editPattern="targetMul{0}">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+			</links>

+			<links visualID="4015" editPartClassName="GeneralizationEditPart"

+				itemSemanticEditPolicyClassName="GeneralizationItemSemanticEditPolicy"

+				createCommandClassName="GeneralizationCreateCommand"

+				reorientCommandClassName="GeneralizationReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" editHelperClassName="GeneralizationEditHelper" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy" />

+				<modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/generalization" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Classifier/generalization" />

+					<sourceMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/specific" />

+					<targetMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/general" />

+				</modelFacet>

+				<labels visualID="6024" editPartClassName="GeneralizationAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="GeneralizationAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getAppliedStereotypeLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="60" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Generalization/isSubstitutable" />

+					</modelFacet>

+				</labels>

+			</links>

+			<links visualID="4018" editPartClassName="TimeObservationEventEditPart"

+				itemSemanticEditPolicyClassName="TimeObservationEventSemanticEditPolicy"

+				createCommandClassName="TimeObservationEventCreateCommand"

+				reorientCommandClassName="TimeObservationEventReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					displayName="TimeObservationEvent" definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure" />

+				<modelFacet xsi:type="gmfgen:FeatureLinkModelFacet">

+					<metaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeObservation/event" />

+				</modelFacet>

+			</links>

+			<links visualID="4019" editPartClassName="DurationObservationEventEditPart"

+				itemSemanticEditPolicyClassName="DurationObservationEventItemSemanticEditPolicy"

+				createCommandClassName="DurationObservationEventCreateCommand"

+				reorientCommandClassName="DurationObservationEventReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					displayName="DurationObservationEvent" definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure" />

+				<modelFacet xsi:type="gmfgen:FeatureLinkModelFacet">

+					<metaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation/event" />

+				</modelFacet>

+			</links>

+			<links visualID="4020" editPartClassName="RepresentationEditPart"

+				itemSemanticEditPolicyClassName="RepresentationItemSemanticEditPolicy"

+				createCommandClassName="RepresentationCreateCommand"

+				reorientCommandClassName="RepresentationReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:SpecializationType"

+					uniqueIdentifier="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.RepresentationFigure">

+					<attributes xsi:type="gmfgen:ColorAttributes"

+						foregroundColor="black" />

+				</viewmap>

+				<modelFacet xsi:type="gmfgen:FeatureLinkModelFacet">

+					<metaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationItem/represented" />

+				</modelFacet>

+				<labels visualID="6030" editPartClassName="RepresentationTagLabelEditPart"

+					itemSemanticEditPolicyClassName="RepresentationTagLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getTagLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="15" />

+					</viewmap>

+				</labels>

+				<creationConstraints

+					targetEnd="/0/@expressionProviders/@providers.0/@expressions.8" />

+			</links>

+			<links visualID="4021" editPartClassName="InformationFlowEditPart"

+				itemSemanticEditPolicyClassName="InformationFlowItemSemanticEditPolicy"

+				createCommandClassName="InformationFlowCreateCommand"

+				reorientCommandClassName="InformationFlowReorientCommand">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge" />

+				<elementType xsi:type="gmfgen:MetamodelType"

+					definedExternally="true" />

+				<viewmap xsi:type="gmfgen:FigureViewmap"

+					figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationFlowFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeInformationFlowLabelDisplayEditPolicy" />

+				<modelFacet xsi:type="gmfgen:TypeLinkModelFacet">

+					<metaClass

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationFlow" />

+					<containmentMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<childMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement" />

+					<modelElementInitializer xsi:type="gmfgen:GenFeatureSeqInitializer">

+						<initializers xsi:type="gmfgen:GenFeatureValueSpec"

+							value="/0/@expressionProviders/@providers.0/@expressions.0">

+							<feature

+								href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+						</initializers>

+					</modelElementInitializer>

+					<sourceMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationFlow/informationSource" />

+					<targetMetaFeature

+						href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InformationFlow/informationTarget" />

+				</modelFacet>

+				<labels visualID="6031" editPartClassName="InformationFlowConveyedLabelEditPart"

+					itemSemanticEditPolicyClassName="InformationFlowConveyedLabelItemSemanticEditPolicy">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getConveyedLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="30" />

+					</viewmap>

+					<behaviour xsi:type="gmfgen:CustomBehaviour"

+						key="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.AbstractCustomLabelEditPolicy.SPECIFIC_NAME_LABEL_POLICY"

+						editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.InformationFlowCustomLabelEditPolicy" />

+				</labels>

+				<labels visualID="6032" editPartClassName="InformationFlowAppliedStereotypeEditPart"

+					itemSemanticEditPolicyClassName="InformationFlowAppliedStereotypeItemSemanticEditPolicy"

+					readOnly="true">

+					<diagramRunTimeClass

+						href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+					<viewmap xsi:type="gmfgen:ParentAssignedViewmap"

+						getterName="getAppliedStereotypeLabel"

+						figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+						<attributes xsi:type="gmfgen:LabelOffsetAttributes" y="15" />

+					</viewmap>

+					<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"

+						parser="/0/@labelParsers/@implementations.1" viewPattern="&lt;&lt;{0}>>"

+						editorPattern="&lt;&lt;{0}>>" editPattern="&lt;&lt;{0}>>">

+						<metaFeatures

+							href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name" />

+					</modelFacet>

+				</labels>

+				<creationConstraints

+					sourceEnd="/0/@expressionProviders/@providers.0/@expressions.9"

+					targetEnd="/0/@expressionProviders/@providers.0/@expressions.10" />

+			</links>

+			<compartments visualID="7033"

+				editPartClassName="DataTypeAttributeCompartmentEditPart"

+				itemSemanticEditPolicyClassName="DataTypeAttributeCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="DataTypeAttributeCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.34" title="attributes"

+				node="/0/@diagram/@topLevelNodes.15">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAttributeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7034"

+				editPartClassName="DataTypeOperationCompartmentEditPart"

+				itemSemanticEditPolicyClassName="DataTypeOperationCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="DataTypeOperationCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.35" title="operations"

+				node="/0/@diagram/@topLevelNodes.15">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getOperationCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7036"

+				editPartClassName="DataTypeAttributeCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="DataTypeAttributeCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="DataTypeAttributeCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.34" title="attributes"

+				node="/0/@diagram/@childNodes.21">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getAttributeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7037"

+				editPartClassName="DataTypeOperationCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="DataTypeOperationCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="DataTypeOperationCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.35" title="operations"

+				node="/0/@diagram/@childNodes.21">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getOperationCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7048"

+				editPartClassName="EnumerationEnumerationLiteralCompartmentEditPart"

+				itemSemanticEditPolicyClassName="EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.36" title="literals"

+				node="/0/@diagram/@topLevelNodes.14">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getEnumerationLiteralCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7049"

+				editPartClassName="EnumerationEnumerationLiteralCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.36" title="literals"

+				node="/0/@diagram/@childNodes.20">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getEnumerationLiteralCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7050"

+				editPartClassName="ActivityCompositeCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="ActivityCompositeCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="ActivityCompositeCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@childNodes.6"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7051"

+				editPartClassName="InteractionCompositeCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="InteractionCompositeCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="InteractionCompositeCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@childNodes.7"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7052"

+				editPartClassName="ProtocolStateMachineCompositeCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="ProtocolStateMachineCompositeCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@childNodes.8"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7053"

+				editPartClassName="StateMachineCompositeCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="StateMachineCompositeCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="StateMachineCompositeCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@childNodes.9"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7054"

+				editPartClassName="FunctionBehaviorCompositeCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="FunctionBehaviorCompositeCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@childNodes.10"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7055"

+				editPartClassName="OpaqueBehaviorCompositeCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="OpaqueBehaviorCompositeCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@childNodes.11"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7056"

+				editPartClassName="ComponentCompositeCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@childNodes.12"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7057"

+				editPartClassName="DeviceCompositeCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="DeviceCompositeCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="DeviceCompositeCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@childNodes.13"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7058"

+				editPartClassName="ExecutionEnvironmentCompositeCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@childNodes.14"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7059"

+				editPartClassName="NodeCompositeCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="NodeCompositeCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="NodeCompositeCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@childNodes.15"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7060"

+				editPartClassName="ClassCompositeCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="ClassCompositeCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="ClassCompositeCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.0"

+				title="internal structure" node="/0/@diagram/@childNodes.16"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7061"

+				editPartClassName="CollaborationCompositeCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="CollaborationCompositeCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="CollaborationCompositeCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@childNodes.17"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7063"

+				editPartClassName="ActivityCompositeCompartmentEditPart"

+				itemSemanticEditPolicyClassName="ActivityCompositeCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ActivityCompositeCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@topLevelNodes.0"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7064"

+				editPartClassName="InteractionCompositeCompartmentEditPart"

+				itemSemanticEditPolicyClassName="InteractionCompositeCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="InteractionCompositeCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@topLevelNodes.1"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7065"

+				editPartClassName="ProtocolStateMachineCompositeCompartmentEditPart"

+				itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ProtocolStateMachineCompositeCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@topLevelNodes.2"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7066"

+				editPartClassName="StateMachineCompositeCompartmentEditPart"

+				itemSemanticEditPolicyClassName="StateMachineCompositeCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="StateMachineCompositeCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@topLevelNodes.3"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7067"

+				editPartClassName="FunctionBehaviorCompositeCompartmentEditPart"

+				itemSemanticEditPolicyClassName="FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="FunctionBehaviorCompositeCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@topLevelNodes.4"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7068"

+				editPartClassName="OpaqueBehaviorCompositeCompartmentEditPart"

+				itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="OpaqueBehaviorCompositeCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@topLevelNodes.5"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7069"

+				editPartClassName="ComponentCompositeCompartmentEditPart"

+				itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@topLevelNodes.6"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7070"

+				editPartClassName="DeviceCompositeCompartmentEditPart"

+				itemSemanticEditPolicyClassName="DeviceCompositeCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="DeviceCompositeCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@topLevelNodes.7"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7071"

+				editPartClassName="ExecutionEnvironmentCompositeCompartmentEditPart"

+				itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ExecutionEnvironmentCompositeCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@topLevelNodes.8"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7072"

+				editPartClassName="NodeCompositeCompartmentEditPart"

+				itemSemanticEditPolicyClassName="NodeCompositeCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="NodeCompositeCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@topLevelNodes.9"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7073"

+				editPartClassName="ClassCompositeCompartmentEditPart"

+				itemSemanticEditPolicyClassName="ClassCompositeCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="ClassCompositeCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.33 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32"

+				title="internal structure" node="/0/@diagram/@topLevelNodes.10"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7075"

+				editPartClassName="CollaborationCompositeCompartmentEditPart"

+				itemSemanticEditPolicyClassName="CollaborationCompositeCompartmentItemSemanticEditPolicy"

+				canonicalEditPolicyClassName="CollaborationCompositeCompartmentCanonicalEditPolicy"

+				childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+				title="internal structure" node="/0/@diagram/@topLevelNodes.11"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<compartments visualID="7077"

+				editPartClassName="PropertyPartCompartmentEditPartCN"

+				itemSemanticEditPolicyClassName="PropertyPartCompartmentItemSemanticEditPolicyCN"

+				canonicalEditPolicyClassName="PropertyPartCompartmentCanonicalEditPolicyCN"

+				childNodes="/0/@diagram/@childNodes.3 /0/@diagram/@childNodes.28"

+				title="internal structure" node="/0/@diagram/@childNodes.3"

+				listLayout="false">

+				<diagramRunTimeClass

+					href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node" />

+				<viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCompositeCompartmentFigure"

+					figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour" key="&quot;REMOVE_ORPHAN_VIEW&quot;"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy" />

+				<behaviour xsi:type="gmfgen:CustomBehaviour"

+					key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY"

+					editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy" />

+			</compartments>

+			<palette>

+				<groups title="Nodes" description="Nodes"

+					largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+					smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+					createMethodName="createNodesGroup" id="&quot;composite.group.nodes&quot;">

+					<entries xsi:type="gmfgen:ToolEntry" title="Class"

+						description="Create new Class"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"

+						createMethodName="createClassCreationTool" id="&quot;composite.tool.class&quot;"

+						genNodes="/0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.16" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Property"

+						description="Create new Property"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

+						createMethodName="createPropertyCreationTool" id="&quot;composite.tool.property&quot;"

+						genNodes="/0/@diagram/@childNodes.3" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Port"

+						description="Create new Port"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"

+						createMethodName="createPortCreationTool" id="&quot;composite.tool.port&quot;"

+						genNodes="/0/@diagram/@childNodes.1" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Collaboration"

+						description="Create new Collaboration"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"

+						createMethodName="createCollaborationCreationTool" id="&quot;composite.tool.collaboration&quot;"

+						genNodes="/0/@diagram/@childNodes.17 /0/@diagram/@topLevelNodes.11" />

+					<entries xsi:type="gmfgen:ToolEntry" title="CollaborationRole"

+						description="Create new CollaborationRole" largeIconPath="icons/obj16/CollaborationRole.gif"

+						smallIconPath="icons/obj16/CollaborationRole.gif"

+						createMethodName="createCollaborationRoleCreationTool" id="&quot;composite.tool.collaborationrole&quot;"

+						genNodes="/0/@diagram/@childNodes.4" />

+					<entries xsi:type="gmfgen:ToolEntry" title="CollaborationUse"

+						description="Create new CollaborationUse"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif"

+						createMethodName="createCollaborationUseCreationTool" id="&quot;composite.tool.collaborationuse&quot;"

+						genNodes="/0/@diagram/@childNodes.5" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Comment"

+						description="Create new Comment"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

+						createMethodName="createCommentCreationTool" id="&quot;composite.tool.comment&quot;"

+						genNodes="/0/@diagram/@childNodes.28 /0/@diagram/@topLevelNodes.43" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Constraint"

+						description="Create new Constraint"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

+						createMethodName="createConstraintCreationTool" id="&quot;composite.tool.constraint&quot;"

+						genNodes="/0/@diagram/@topLevelNodes.48 /0/@diagram/@childNodes.33" />

+					<entries xsi:type="gmfgen:ToolEntry" title="TimeObservation"

+						description="Create new TimeObservation"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"

+						createMethodName="createTimeObservationCreationTool" id="&quot;composite.tool.timeobservation&quot;"

+						genNodes="/0/@diagram/@topLevelNodes.28" />

+					<entries xsi:type="gmfgen:ToolEntry" title="DurationObservation"

+						description="Create new DurationObservation"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"

+						createMethodName="createDurationObservationCreationTool" id="&quot;composite.tool.durationobservation&quot;"

+						genNodes="/0/@diagram/@topLevelNodes.27" />

+					<entries xsi:type="gmfgen:ToolEntry" title="InformationItem"

+						description="Create new InformationItem"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"

+						createMethodName="createInformationItemCreationTool" id="&quot;composite.tool.informationitem&quot;"

+						genNodes="/0/@diagram/@childNodes.25 /0/@diagram/@topLevelNodes.19" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Parameter"

+						description="Create new Parameter"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif"

+						createMethodName="createParameterCreationTool" id="&quot;composite.tool.parameter&quot;"

+						genNodes="/0/@diagram/@childNodes.2" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Activity"

+						description="Create new Activity"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"

+						createMethodName="createActivityCreationTool" id="&quot;composite.tool.activity&quot;"

+						genNodes="/0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.0" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Interaction"

+						description="Create new Interaction"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"

+						createMethodName="createInteractionCreationTool" id="&quot;composite.tool.interaction&quot;"

+						genNodes="/0/@diagram/@childNodes.7 /0/@diagram/@topLevelNodes.1" />

+					<entries xsi:type="gmfgen:ToolEntry" title="ProtocolStateMachine"

+						description="Create new ProtocolStateMachine"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif"

+						createMethodName="createProtocolStateMachineCreationTool" id="&quot;composite.tool.protocolstatemachine&quot;"

+						genNodes="/0/@diagram/@childNodes.8 /0/@diagram/@topLevelNodes.2" />

+					<entries xsi:type="gmfgen:ToolEntry" title="StateMachine"

+						description="Create new StateMachine"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"

+						createMethodName="createStateMachineCreationTool" id="&quot;composite.tool.statemachine&quot;"

+						genNodes="/0/@diagram/@childNodes.9 /0/@diagram/@topLevelNodes.3" />

+					<entries xsi:type="gmfgen:ToolEntry" title="FunctionBehavior"

+						description="Create new FunctionBehavior"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif"

+						createMethodName="createFunctionBehaviorCreationTool" id="&quot;composite.tool.functionbehavior&quot;"

+						genNodes="/0/@diagram/@childNodes.10 /0/@diagram/@topLevelNodes.4" />

+					<entries xsi:type="gmfgen:ToolEntry" title="OpaqueBehavior"

+						description="Create new OpaqueBehavior"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif"

+						createMethodName="createOpaqueBehaviorCreationTool" id="&quot;composite.tool.opaquebehavior&quot;"

+						genNodes="/0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.5" />

+					<entries xsi:type="gmfgen:ToolEntry" title="StringExpression"

+						description="Create new StringExpression"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StringExpression.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StringExpression.gif"

+						createMethodName="createStringExpressionCreationTool" id="&quot;composite.tool.stringExpression&quot;"

+						genNodes="/0/@diagram/@topLevelNodes.34" />

+				</groups>

+				<groups title="Edges" description="Edges"

+					largeIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+					smallIconPath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+					createMethodName="createEdgesGroup" id="&quot;composite.group.edges&quot;">

+					<entries xsi:type="gmfgen:ToolEntry" title="Link"

+						description="Create new Link (Comment / Constraint)"

+						largeIconPath="icons/obj16/Link.gif" smallIconPath="icons/obj16/Link.gif"

+						createMethodName="createLinkCreationTool" id="&quot;composite.tool.link&quot;"

+						genLinks="/0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.16 /0/@diagram/@links.17" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Connector"

+						description="Create new Connector"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

+						createMethodName="createConnectorCreationTool" id="&quot;composite.tool.connector&quot;"

+						genLinks="/0/@diagram/@links.14" />

+					<entries xsi:type="gmfgen:ToolEntry" title="RoleBinding"

+						description="Create new RoleBinding" largeIconPath="icons/obj16/CollaborationRoleBinding.gif"

+						smallIconPath="icons/obj16/CollaborationRoleBinding.gif"

+						createMethodName="createRoleBindingCreationTool" id="&quot;composite.tool.rolebinding&quot;"

+						genLinks="/0/@diagram/@links.12" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Generalization"

+						description="Create new Generalization"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

+						createMethodName="createGeneralizationCreationTool" id="&quot;composite.tool.generalization&quot;"

+						genLinks="/0/@diagram/@links.15" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Realization"

+						description="Create new Realization"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"

+						createMethodName="createRealizationCreationTool" id="&quot;composite.tool.realization&quot;"

+						genLinks="/0/@diagram/@links.7" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Substitution"

+						description="Create new Substitution"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"

+						createMethodName="createSubstitutionCreationTool" id="&quot;composite.tool.substitution&quot;"

+						genLinks="/0/@diagram/@links.6" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Abstraction"

+						description="Create new Abstraction"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

+						createMethodName="createAbstractionCreationTool" id="&quot;composite.tool.abstraction&quot;"

+						genLinks="/0/@diagram/@links.9" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Usage"

+						description="Create new Usage"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

+						createMethodName="createUsageCreationTool" id="&quot;composite.tool.usage&quot;"

+						genLinks="/0/@diagram/@links.10" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Dependency"

+						description="Create new Dependency"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+						createMethodName="createDependencyCreationTool" id="&quot;composite.tool.dependency&quot;"

+						genLinks="/0/@diagram/@links.13" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Representation"

+						description="Create new representation for an InformationItem"

+						largeIconPath="icons/obj16/Representation.gif" smallIconPath="icons/obj16/Representation.gif"

+						createMethodName="createRepresentationCreationTool" id="&quot;composite.tool.representation&quot;"

+						genLinks="/0/@diagram/@links.18" />

+					<entries xsi:type="gmfgen:ToolEntry" title="InformationFlow"

+						description="Create new InformationFlow"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"

+						createMethodName="createInformationFlowCreationTool" id="&quot;composite.tool.informationflow&quot;"

+						genLinks="/0/@diagram/@links.19" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Manifestation"

+						description="Create new Manifestation"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif"

+						createMethodName="createManifestationCreationTool" id="&quot;composite.tool.manifestation&quot;"

+						genLinks="/0/@diagram/@links.8" />

+					<entries xsi:type="gmfgen:ToolEntry" title="Deployment"

+						description="Create new Deployment"

+						largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Deployment.gif"

+						smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Deployment.gif"

+						createMethodName="createDeploymentCreationTool" id="&quot;composite.tool.deployment&quot;"

+						genLinks="/0/@diagram/@links.11" />

+				</groups>

+			</palette>

+			<preferencePages xsi:type="gmfgen:GenStandardPreferencePage"

+				iD="org.eclipse.uml2.uml.diagram.general" name="UML Diagram">

+				<children xsi:type="gmfgen:GenStandardPreferencePage"

+					iD="org.eclipse.uml2.uml.diagram.appearance" name="Appearance"

+					kind="Appearance" />

+				<children xsi:type="gmfgen:GenStandardPreferencePage"

+					iD="org.eclipse.uml2.uml.diagram.connections" name="Connections"

+					kind="Connections" />

+				<children xsi:type="gmfgen:GenStandardPreferencePage" iD="org.eclipse.uml2.uml.diagram.printing"

+					name="Printing" kind="Printing" />

+				<children xsi:type="gmfgen:GenStandardPreferencePage"

+					iD="org.eclipse.uml2.uml.diagram.rulersAndGrid" name="Rulers And Grid"

+					kind="RulersAndGrid" />

+			</preferencePages>

+		</diagram>

+		<plugin iD="org.eclipse.papyrus.uml.diagram.composite" name="Papyrus Composite Structure Diagram "

+			provider="Eclipse Modeling Project" version="1.1.0.qualifier">

+			<requiredPlugins>org.eclipse.draw2d</requiredPlugins>

+			<requiredPlugins>org.eclipse.gmf.runtime.draw2d.ui</requiredPlugins>

+		</plugin>

+		<editor />

+		<diagramUpdater nodeDescriptorClassName="UMLNodeDescriptor" />

+		<propertySheet>

+			<tabs xsi:type="gmfgen:GenStandardPropertyTab" iD="appearance" />

+			<tabs xsi:type="gmfgen:GenStandardPropertyTab" iD="diagram" />

+			<tabs xsi:type="gmfgen:GenCustomPropertyTab" iD="domain" label="Core">

+				<filter xsi:type="gmfgen:TypeTabFilter">

+					<types>org.eclipse.gmf.runtime.notation.View</types>

+					<types>org.eclipse.gef.EditPart</types>

+					<generatedTypes>abstractNavigatorItem</generatedTypes>

+				</filter>

+			</tabs>

+		</propertySheet>

+		<domainGenModel

+			href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#/" />

+		<expressionProviders>

+			<providers xsi:type="gmfgen:GenJavaExpressionProvider"

+				injectExpressionBody="true">

+				<expressions

+					body="return org.eclipse.papyrus.uml.tools.utils.NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());" />

+				<expressions body="return it.getBody();" />

+				<expressions xsi:type="gmfgen:GenConstraint"

+					body="// Property / CollaborationRole constraint&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;// Restriction for the case where domainElement owner is a Collaboration&#xD;&#xA;&#x9;&#x9;// If the domainElement is not referenced as one of its owner role&#xD;&#xA;&#x9;&#x9;// then it should be considered as a Property creation on Collaboration,&#xD;&#xA;&#x9;&#x9;// else the test should return false and be considered as a representation of&#xD;&#xA;&#x9;&#x9;// a collaboration role (ConnectableElement).&#xD;&#xA;&#x9;&#x9;if (containerView.getElement() instanceof org.eclipse.uml2.uml.Collaboration) {&#xD;&#xA;&#x9;&#x9;&#x9;org.eclipse.uml2.uml.Collaboration graphicalParent = (org.eclipse.uml2.uml.Collaboration) containerView.getElement();&#xD;&#xA;&#x9;&#x9;&#x9;if (graphicalParent.getCollaborationRoles().contains(domainElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;// General case : no restriction&#xD;&#xA;&#x9;&#x9;return true;" />

+				<expressions xsi:type="gmfgen:GenConstraint"

+					body="// Test if the dependency is not a RoleBinding&#xD;&#xA;&#x9;&#x9;if (domainElement.getOwner() instanceof org.eclipse.uml2.uml.CollaborationUse) {&#xD;&#xA;&#x9;&#x9;&#x9;org.eclipse.uml2.uml.CollaborationUse owner = (org.eclipse.uml2.uml.CollaborationUse) domainElement.getOwner();&#xD;&#xA;&#x9;&#x9;&#x9;if (owner.getRoleBindings().contains(domainElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;return true;" />

+				<expressions xsi:type="gmfgen:GenConstraint"

+					body="// Test if the dependency is a RoleBinding&#xD;&#xA;&#x9;&#x9;if (domainElement.getOwner() instanceof org.eclipse.uml2.uml.CollaborationUse) {&#xD;&#xA;&#x9;&#x9;&#x9;org.eclipse.uml2.uml.CollaborationUse owner = (org.eclipse.uml2.uml.CollaborationUse) domainElement.getOwner();&#xD;&#xA;&#x9;&#x9;&#x9;if (owner.getRoleBindings().contains(domainElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;return true;&#xD;&#xA;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;return false;" />

+				<expressions xsi:type="gmfgen:GenConstraint"

+					body="// RoleBinding source constraint&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((source != null) &amp;&amp; !(source instanceof org.eclipse.uml2.uml.CollaborationUse)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;// RoleBinding source has a type&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((source != null) &amp;&amp; (((org.eclipse.uml2.uml.CollaborationUse) source).getType() == null)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}" />

+				<expressions xsi:type="gmfgen:GenConstraint"

+					body="// RoleBinding target constraint&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((target != null) &amp;&amp; !(target instanceof org.eclipse.uml2.uml.ConnectableElement)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;// RoleBinding source and target have the same semantic parent&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if ((source != null) &amp;&amp; (target != null) &amp;&amp; (source.getOwner() != target.getOwner())) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}" />

+				<expressions body="// InformationItem is Abstract&#xD;&#xA;return true;" />

+				<expressions xsi:type="gmfgen:GenConstraint"

+					body="// Represented InformationItem Target&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if (target != null) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (!((target instanceof org.eclipse.uml2.uml.Class)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Interface)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.InformationItem)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Signal) || &#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;(target instanceof org.eclipse.uml2.uml.Component))) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}" />

+				<expressions xsi:type="gmfgen:GenConstraint"

+					body="//Information Flow source constraint&#xD;&#xA;if (source != null) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (!((source instanceof org.eclipse.uml2.uml.Actor)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Node)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.UseCase)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Artifact)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Class)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Component)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Port)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Property)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Interface)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.Package)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.ActivityNode)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (source instanceof org.eclipse.uml2.uml.ActivityPartition) || (source instanceof org.eclipse.uml2.uml.InstanceSpecification))) {&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (source instanceof org.eclipse.uml2.uml.InstanceSpecification) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;org.eclipse.emf.common.util.EList&lt; org.eclipse.uml2.uml.Classifier> classes = ((org.eclipse.uml2.uml.InstanceSpecification) source).getClassifiers();&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;for (int i = 0; i &lt; classes.size(); i++) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;if (classes.get(i) instanceof org.eclipse.uml2.uml.Relationship) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}" />

+				<expressions xsi:type="gmfgen:GenConstraint"

+					body="//Information Flow target constraint&#xD;&#xA;if (target != null) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (!((target instanceof org.eclipse.uml2.uml.Actor)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Node)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.UseCase)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Artifact)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Class)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Component)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Port)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Property)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Interface)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.Package)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.ActivityNode)&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;|| (target instanceof org.eclipse.uml2.uml.ActivityPartition) || (target instanceof org.eclipse.uml2.uml.InstanceSpecification))) {&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if (target instanceof org.eclipse.uml2.uml.InstanceSpecification) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;org.eclipse.emf.common.util.EList&lt; org.eclipse.uml2.uml.Classifier> classes = ((org.eclipse.uml2.uml.InstanceSpecification) target).getClassifiers();&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;for (int i = 0; i &lt; classes.size(); i++) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;if (classes.get(i) instanceof org.eclipse.uml2.uml.Relationship) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}" />

+				<expressions xsi:type="gmfgen:GenConstraint"

+					body="// Creation constraint for TopLevelNodes&#xD;&#xA;&#x9;if(! (getElementToEdit() instanceof org.eclipse.uml2.uml.Package)) {&#xD;&#xA;&#x9;&#x9;return false;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;return true;" />

+				<expressions body="// Comment body init&#xD;&#xA;return &quot;&quot;;" />

+				<expressions

+					body="// Constraint specification init&#xD;&#xA;org.eclipse.uml2.uml.LiteralString value = org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createLiteralString();&#xD;&#xA;value.setValue(&quot;&quot;);&#xD;&#xA;return value;" />

+				<expressions

+					body="// IntervalConstraint specification init&#xD;&#xA;org.eclipse.uml2.uml.Interval value = org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createInterval();&#xD;&#xA;return value;" />

+				<expressions

+					body="// DurationConstraint specification init&#xD;&#xA;org.eclipse.uml2.uml.DurationInterval value = org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createDurationInterval();&#xD;&#xA;return value;" />

+				<expressions

+					body="// TimeConstraint specification init&#xD;&#xA;org.eclipse.uml2.uml.TimeInterval value = org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createTimeInterval();&#xD;&#xA;return value;" />

+

+			</providers>

+			<providers xsi:type="gmfgen:GenLiteralExpressionProvider">

+				<expressions

+					body="org.eclipse.uml2.uml.AggregationKind.COMPOSITE_LITERAL" />

+			</providers>

+		</expressionProviders>

+		<labelParsers extensibleViaService="true">

+			<implementations xsi:type="gmfgen:PredefinedParser"

+				uses="/0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.13/@labels.0/@modelFacet /0/@diagram/@childNodes.36/@labelModelFacet /0/@diagram/@topLevelNodes.14/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.15/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labels.0/@modelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labels.0/@modelFacet /0/@diagram/@childNodes.9/@labels.0/@modelFacet /0/@diagram/@childNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.19/@labels.0/@modelFacet /0/@diagram/@childNodes.20/@labels.0/@modelFacet /0/@diagram/@childNodes.21/@labels.0/@modelFacet /0/@diagram/@childNodes.12/@labels.0/@modelFacet /0/@diagram/@childNodes.13/@labels.0/@modelFacet /0/@diagram/@childNodes.14/@labels.0/@modelFacet /0/@diagram/@childNodes.15/@labels.0/@modelFacet /0/@diagram/@childNodes.17/@labels.0/@modelFacet /0/@diagram/@childNodes.22/@labels.0/@modelFacet /0/@diagram/@childNodes.23/@labels.0/@modelFacet /0/@diagram/@childNodes.24/@labels.0/@modelFacet /0/@diagram/@childNodes.25/@labels.0/@modelFacet /0/@diagram/@childNodes.26/@labels.0/@modelFacet /0/@diagram/@childNodes.27/@labels.0/@modelFacet /0/@diagram/@childNodes.18/@labels.0/@modelFacet /0/@diagram/@childNodes.16/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.10/@labels.0/@modelFacet /0/@diagram/@childNodes.34/@labelModelFacet /0/@diagram/@childNodes.35/@labelModelFacet /0/@diagram/@topLevelNodes.11/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.12/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.16/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.17/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.18/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.19/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.20/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.21/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.22/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.23/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.24/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.25/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.26/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.29/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.30/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.31/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.32/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.33/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.34/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.35/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.36/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.37/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.38/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.39/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.40/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.41/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.42/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.44/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.45/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.46/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.47/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.48/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.6/@labels.0/@modelFacet /0/@diagram/@links.7/@labels.0/@modelFacet /0/@diagram/@links.8/@labels.0/@modelFacet /0/@diagram/@links.9/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@links.11/@labels.0/@modelFacet /0/@diagram/@links.13/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.28/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.27/@labels.0/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.29/@labels.0/@modelFacet /0/@diagram/@childNodes.30/@labels.0/@modelFacet /0/@diagram/@childNodes.31/@labels.0/@modelFacet /0/@diagram/@childNodes.33/@labels.0/@modelFacet /0/@diagram/@childNodes.32/@labels.0/@modelFacet /0/@diagram/@links.14/@labels.1/@modelFacet /0/@diagram/@links.14/@labels.2/@modelFacet /0/@diagram/@links.14/@labels.3/@modelFacet /0/@diagram/@childNodes.0/@labels.0/@modelFacet /0/@diagram/@childNodes.3/@labels.1/@modelFacet /0/@diagram/@childNodes.4/@labels.1/@modelFacet /0/@diagram/@childNodes.5/@labels.1/@modelFacet /0/@diagram/@childNodes.6/@labels.1/@modelFacet /0/@diagram/@childNodes.7/@labels.1/@modelFacet /0/@diagram/@childNodes.8/@labels.1/@modelFacet /0/@diagram/@childNodes.9/@labels.1/@modelFacet /0/@diagram/@childNodes.10/@labels.1/@modelFacet /0/@diagram/@childNodes.11/@labels.1/@modelFacet /0/@diagram/@childNodes.12/@labels.1/@modelFacet /0/@diagram/@childNodes.13/@labels.1/@modelFacet /0/@diagram/@childNodes.14/@labels.1/@modelFacet /0/@diagram/@childNodes.15/@labels.1/@modelFacet /0/@diagram/@childNodes.16/@labels.1/@modelFacet /0/@diagram/@childNodes.17/@labels.1/@modelFacet /0/@diagram/@childNodes.18/@labels.1/@modelFacet /0/@diagram/@childNodes.19/@labels.1/@modelFacet /0/@diagram/@childNodes.20/@labels.1/@modelFacet /0/@diagram/@childNodes.21/@labels.1/@modelFacet /0/@diagram/@childNodes.22/@labels.1/@modelFacet /0/@diagram/@childNodes.23/@labels.1/@modelFacet /0/@diagram/@childNodes.24/@labels.1/@modelFacet /0/@diagram/@childNodes.25/@labels.1/@modelFacet /0/@diagram/@childNodes.26/@labels.1/@modelFacet /0/@diagram/@childNodes.27/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.5/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.9/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.10/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.11/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.12/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.13/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.14/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.15/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.16/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.17/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.18/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.19/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.20/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.21/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.22/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.23/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.24/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.25/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.26/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.29/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.30/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.31/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.32/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.33/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.34/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.35/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.36/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.37/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.38/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.39/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.40/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.41/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.42/@labels.1/@modelFacet" />

+			<implementations xsi:type="gmfgen:CustomParser"

+				uses="/0/@diagram/@links.4/@labels.1/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.6/@labels.1/@modelFacet /0/@diagram/@links.7/@labels.1/@modelFacet /0/@diagram/@links.8/@labels.1/@modelFacet /0/@diagram/@links.9/@labels.1/@modelFacet /0/@diagram/@links.10/@labels.1/@modelFacet /0/@diagram/@links.11/@labels.1/@modelFacet /0/@diagram/@links.13/@labels.1/@modelFacet /0/@diagram/@links.15/@labels.0/@modelFacet /0/@diagram/@links.14/@labels.0/@modelFacet /0/@diagram/@links.12/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.28/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.27/@labels.1/@modelFacet /0/@diagram/@childNodes.1/@labels.1/@modelFacet /0/@diagram/@links.19/@labels.1/@modelFacet /0/@diagram/@childNodes.2/@labels.1/@modelFacet"

+				qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser" />

+			<implementations xsi:type="gmfgen:CustomParser"

+				uses="/0/@diagram/@links.12/@labels.0/@modelFacet"

+				qualifiedName="org.eclipse.papyrus.uml.diagram.composite.custom.parsers.RoleBindingRoleNameParser" />

+			<implementations xsi:type="gmfgen:CustomParser"

+				uses="/0/@diagram/@topLevelNodes.43/@labels.0/@modelFacet /0/@diagram/@childNodes.28/@labels.0/@modelFacet"

+				qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.CommentParser" />

+			<implementations xsi:type="gmfgen:CustomParser"

+				uses="/0/@diagram/@topLevelNodes.44/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.45/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.46/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.47/@labels.1/@modelFacet /0/@diagram/@topLevelNodes.48/@labels.1/@modelFacet /0/@diagram/@childNodes.29/@labels.1/@modelFacet /0/@diagram/@childNodes.30/@labels.1/@modelFacet /0/@diagram/@childNodes.31/@labels.1/@modelFacet /0/@diagram/@childNodes.33/@labels.1/@modelFacet /0/@diagram/@childNodes.32/@labels.1/@modelFacet"

+				qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser" />

+		</labelParsers>

+		<contextMenus context="/0/@diagram">

+			<items xsi:type="gmfgen:LoadResourceAction" />

+		</contextMenus>

+	</gmfgen:GenEditorGenerator>

+	<papyrusgmfgenextension:PapyrusExtensionRootNode

+		comment="Papyrus specific extension for GMFGen">

+		<extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView"

+			comment="Add super class to a selected set of generated EditParts"

+			genView="/0/@diagram/@topLevelNodes.13 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.19 /0/@diagram/@topLevelNodes.20 /0/@diagram/@childNodes.12 /0/@diagram/@topLevelNodes.6 /0/@diagram/@childNodes.21 /0/@diagram/@topLevelNodes.15 /0/@diagram/@childNodes.20 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.10 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.18 /0/@diagram/@topLevelNodes.12 /0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.0 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.17 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.11 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@topLevelNodes.19 /0/@diagram/@childNodes.25"

+			name="EP_NamedElement_NODE"

+			superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView"

+			comment="Label in charge to display applied stereotypes on links"

+			genView="/0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.9 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.13 /0/@diagram/@links.15 /0/@diagram/@links.14 /0/@diagram/@links.12 /0/@diagram/@links.19 /0/@diagram/@links.18 /0/@diagram/@links.3"

+			name="EP_NamedElement_EDGE"

+			superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView"

+			comment="Adds a superclass for DurationObservationEditPart, TimeObservationEditPart"

+			genView="/0/@diagram/@topLevelNodes.28 /0/@diagram/@topLevelNodes.27"

+			name="EP_Observation_NODE"

+			superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView"

+			comment="Manages stereotype shown with External Label"

+			genView="/0/@diagram/@topLevelNodes.28/@labels.1 /0/@diagram/@topLevelNodes.27/@labels.1 /0/@diagram/@childNodes.1/@labels.1"

+			name="EP_Stereotypes_EXT_NODE"

+			superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView"

+			comment="Add super class to a Comment edit parts" genView="/0/@diagram/@topLevelNodes.43 /0/@diagram/@childNodes.28"

+			name="EP_Comment_NODE"

+			superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView"

+			comment="Add super class to a Constraint edit parts"

+			genView="/0/@diagram/@topLevelNodes.44 /0/@diagram/@topLevelNodes.45 /0/@diagram/@topLevelNodes.46 /0/@diagram/@topLevelNodes.47 /0/@diagram/@topLevelNodes.48 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33"

+			name="EP_Constraint_NODE"

+			superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:SpecificLocator"

+			comment="Affixed Port locator"

+			classpath="org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator"

+			genChildSideAffixedNode="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:SpecificLocatorExternalLabel"

+			comment="External node label locator"

+			classpath="org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator"

+			genExternalNodeLabel="/0/@diagram/@topLevelNodes.27/@labels.1 /0/@diagram/@childNodes.1/@labels.1 /0/@diagram/@childNodes.2/@labels.1 /0/@diagram/@topLevelNodes.28/@labels.1" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:SpecificDiagramUpdater"

+			comment="Property (Part) custom DiagramUpdater"

+			classpath="org.eclipse.papyrus.uml.diagram.composite.custom.parts.PropertyDiagramUpdater"

+			genNode="/0/@diagram/@childNodes.3" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:SpecificDiagramUpdater"

+			comment="Property (Part) compartment custom DiagramUpdater"

+			classpath="org.eclipse.papyrus.uml.diagram.composite.custom.parts.PropertyDiagramUpdater"

+			genNode="/0/@diagram/@compartments.30" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:GenNodeConstraint"

+			comment="Creation constraint for TopLevelNode in virtual canvas"

+			genNode="/0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.10 /0/@diagram/@topLevelNodes.11 /0/@diagram/@topLevelNodes.12 /0/@diagram/@topLevelNodes.13 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.15 /0/@diagram/@topLevelNodes.16 /0/@diagram/@topLevelNodes.17 /0/@diagram/@topLevelNodes.18 /0/@diagram/@topLevelNodes.19 /0/@diagram/@topLevelNodes.20 /0/@diagram/@topLevelNodes.21 /0/@diagram/@topLevelNodes.22 /0/@diagram/@topLevelNodes.23 /0/@diagram/@topLevelNodes.24 /0/@diagram/@topLevelNodes.25 /0/@diagram/@topLevelNodes.26 /0/@diagram/@topLevelNodes.27 /0/@diagram/@topLevelNodes.28 /0/@diagram/@topLevelNodes.29 /0/@diagram/@topLevelNodes.30 /0/@diagram/@topLevelNodes.31 /0/@diagram/@topLevelNodes.32 /0/@diagram/@topLevelNodes.33 /0/@diagram/@topLevelNodes.34 /0/@diagram/@topLevelNodes.35 /0/@diagram/@topLevelNodes.36 /0/@diagram/@topLevelNodes.37 /0/@diagram/@topLevelNodes.38 /0/@diagram/@topLevelNodes.39 /0/@diagram/@topLevelNodes.40 /0/@diagram/@topLevelNodes.41 /0/@diagram/@topLevelNodes.42 /0/@diagram/@topLevelNodes.43 /0/@diagram/@topLevelNodes.44 /0/@diagram/@topLevelNodes.45 /0/@diagram/@topLevelNodes.46 /0/@diagram/@topLevelNodes.47 /0/@diagram/@topLevelNodes.48"

+			genConstraint="/0/@expressionProviders/@providers.0/@expressions.11" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:AdditionalEditPartCandies"

+			comment="Indicate specific BaseEditHelper in place of generated EditHelper"

+			baseEditHelperPackage="org.eclipse.papyrus.uml.diagram.common.helper" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:EditPartUsingDeleteService"

+			comment="The delete service is used on every TopNode Childnode and Link"

+			name="Every TopNode ChildNode Link"

+			genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@childNodes.8 /0/@diagram/@childNodes.9 /0/@diagram/@childNodes.10 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.12 /0/@diagram/@childNodes.13 /0/@diagram/@childNodes.14 /0/@diagram/@childNodes.15 /0/@diagram/@childNodes.16 /0/@diagram/@childNodes.17 /0/@diagram/@childNodes.18 /0/@diagram/@childNodes.19 /0/@diagram/@childNodes.20 /0/@diagram/@childNodes.21 /0/@diagram/@childNodes.22 /0/@diagram/@childNodes.23 /0/@diagram/@childNodes.24 /0/@diagram/@childNodes.25 /0/@diagram/@childNodes.26 /0/@diagram/@childNodes.27 /0/@diagram/@childNodes.28 /0/@diagram/@childNodes.29 /0/@diagram/@childNodes.30 /0/@diagram/@childNodes.31 /0/@diagram/@childNodes.32 /0/@diagram/@childNodes.33 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.2 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.4 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@topLevelNodes.7 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.9 /0/@diagram/@topLevelNodes.10 /0/@diagram/@topLevelNodes.11 /0/@diagram/@topLevelNodes.12 /0/@diagram/@topLevelNodes.13 /0/@diagram/@topLevelNodes.14 /0/@diagram/@topLevelNodes.15 /0/@diagram/@topLevelNodes.16 /0/@diagram/@topLevelNodes.17 /0/@diagram/@topLevelNodes.18 /0/@diagram/@topLevelNodes.19 /0/@diagram/@topLevelNodes.20 /0/@diagram/@topLevelNodes.21 /0/@diagram/@topLevelNodes.22 /0/@diagram/@topLevelNodes.23 /0/@diagram/@topLevelNodes.24 /0/@diagram/@topLevelNodes.25 /0/@diagram/@topLevelNodes.26 /0/@diagram/@topLevelNodes.27 /0/@diagram/@topLevelNodes.28 /0/@diagram/@topLevelNodes.29 /0/@diagram/@topLevelNodes.30 /0/@diagram/@topLevelNodes.31 /0/@diagram/@topLevelNodes.32 /0/@diagram/@topLevelNodes.33 /0/@diagram/@topLevelNodes.34 /0/@diagram/@topLevelNodes.35 /0/@diagram/@topLevelNodes.36 /0/@diagram/@topLevelNodes.37 /0/@diagram/@topLevelNodes.38 /0/@diagram/@topLevelNodes.39 /0/@diagram/@topLevelNodes.40 /0/@diagram/@topLevelNodes.41 /0/@diagram/@topLevelNodes.42 /0/@diagram/@topLevelNodes.43 /0/@diagram/@topLevelNodes.44 /0/@diagram/@topLevelNodes.45 /0/@diagram/@topLevelNodes.46 /0/@diagram/@topLevelNodes.47 /0/@diagram/@topLevelNodes.48 /0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.7 /0/@diagram/@links.8 /0/@diagram/@links.9 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.12 /0/@diagram/@links.13 /0/@diagram/@links.14 /0/@diagram/@links.15 /0/@diagram/@links.16 /0/@diagram/@links.17 /0/@diagram/@links.18 /0/@diagram/@links.19" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:EditPartUsingReorientService"

+			comment="Use the edit service for reorient command (All DirectedRelationship)"

+			name="DirectedRelationship"

+			genView="/0/@diagram/@links.15 /0/@diagram/@links.19 /0/@diagram/@links.13 /0/@diagram/@links.11 /0/@diagram/@links.10 /0/@diagram/@links.9 /0/@diagram/@links.8 /0/@diagram/@links.7 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:EditPartUsingReorientService"

+			comment="Use the edit service for reorient command (Connector)" name="Connector"

+			genView="/0/@diagram/@links.14" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView"

+			comment="this is an abstract class for BehaviorPortEditPart" genView="/0/@diagram/@childNodes.0"

+			name="AbstractBehaviorPortEditPart"

+			superOwnedEditPart="org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.AbstractBehaviorPortEditPart" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView"

+			comment="add superclass for floating Label"

+			genView="/0/@diagram/@childNodes.1/@labels.0 /0/@diagram/@childNodes.0/@labels.0 /0/@diagram/@childNodes.2/@labels.0 /0/@diagram/@childNodes.3/@labels.1 /0/@diagram/@childNodes.4/@labels.1 /0/@diagram/@childNodes.5/@labels.1 /0/@diagram/@childNodes.6/@labels.1 /0/@diagram/@childNodes.7/@labels.1 /0/@diagram/@childNodes.8/@labels.1 /0/@diagram/@childNodes.9/@labels.1 /0/@diagram/@childNodes.10/@labels.1 /0/@diagram/@childNodes.11/@labels.1 /0/@diagram/@childNodes.12/@labels.1 /0/@diagram/@childNodes.13/@labels.1 /0/@diagram/@childNodes.14/@labels.1 /0/@diagram/@childNodes.15/@labels.1 /0/@diagram/@childNodes.16/@labels.1 /0/@diagram/@childNodes.17/@labels.1 /0/@diagram/@childNodes.18/@labels.1 /0/@diagram/@childNodes.19/@labels.1 /0/@diagram/@childNodes.20/@labels.1 /0/@diagram/@childNodes.21/@labels.1 /0/@diagram/@childNodes.22/@labels.1 /0/@diagram/@childNodes.23/@labels.1 /0/@diagram/@childNodes.24/@labels.1 /0/@diagram/@childNodes.25/@labels.1 /0/@diagram/@childNodes.26/@labels.1 /0/@diagram/@childNodes.27/@labels.1 /0/@diagram/@topLevelNodes.0/@labels.1 /0/@diagram/@topLevelNodes.1/@labels.1 /0/@diagram/@topLevelNodes.2/@labels.1 /0/@diagram/@topLevelNodes.3/@labels.1 /0/@diagram/@topLevelNodes.4/@labels.1 /0/@diagram/@topLevelNodes.5/@labels.1 /0/@diagram/@topLevelNodes.6/@labels.1 /0/@diagram/@topLevelNodes.7/@labels.1 /0/@diagram/@topLevelNodes.8/@labels.1 /0/@diagram/@topLevelNodes.9/@labels.1 /0/@diagram/@topLevelNodes.10/@labels.1 /0/@diagram/@topLevelNodes.11/@labels.1 /0/@diagram/@topLevelNodes.12/@labels.1 /0/@diagram/@topLevelNodes.13/@labels.1 /0/@diagram/@topLevelNodes.14/@labels.1 /0/@diagram/@topLevelNodes.15/@labels.1 /0/@diagram/@topLevelNodes.16/@labels.1 /0/@diagram/@topLevelNodes.17/@labels.1 /0/@diagram/@topLevelNodes.18/@labels.1 /0/@diagram/@topLevelNodes.19/@labels.1 /0/@diagram/@topLevelNodes.20/@labels.1 /0/@diagram/@topLevelNodes.21/@labels.1 /0/@diagram/@topLevelNodes.22/@labels.1 /0/@diagram/@topLevelNodes.23/@labels.1 /0/@diagram/@topLevelNodes.24/@labels.1 /0/@diagram/@topLevelNodes.25/@labels.1 /0/@diagram/@topLevelNodes.26/@labels.1 /0/@diagram/@topLevelNodes.29/@labels.1 /0/@diagram/@topLevelNodes.30/@labels.1 /0/@diagram/@topLevelNodes.31/@labels.1 /0/@diagram/@topLevelNodes.32/@labels.1 /0/@diagram/@topLevelNodes.33/@labels.1 /0/@diagram/@topLevelNodes.34/@labels.1 /0/@diagram/@topLevelNodes.35/@labels.1 /0/@diagram/@topLevelNodes.36/@labels.1 /0/@diagram/@topLevelNodes.37/@labels.1 /0/@diagram/@topLevelNodes.38/@labels.1 /0/@diagram/@topLevelNodes.39/@labels.1 /0/@diagram/@topLevelNodes.40/@labels.1 /0/@diagram/@topLevelNodes.41/@labels.1 /0/@diagram/@topLevelNodes.42/@labels.1 /0/@diagram/@topLevelNodes.27/@labels.0 /0/@diagram/@topLevelNodes.28/@labels.0"

+			name="FloatingLabelEditPart"

+			superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:SpecificLocatorExternalLabel"

+			comment="Locator for external Floating label of RoundedCompartment EP"

+			classpath="org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator"

+			genExternalNodeLabel="/0/@diagram/@childNodes.1/@labels.0 /0/@diagram/@childNodes.2/@labels.0 /0/@diagram/@topLevelNodes.27/@labels.0 /0/@diagram/@topLevelNodes.28/@labels.0 /0/@diagram/@childNodes.0/@labels.0 /0/@diagram/@childNodes.3/@labels.1 /0/@diagram/@childNodes.4/@labels.1 /0/@diagram/@childNodes.5/@labels.1 /0/@diagram/@childNodes.6/@labels.1 /0/@diagram/@childNodes.7/@labels.1 /0/@diagram/@childNodes.8/@labels.1 /0/@diagram/@childNodes.9/@labels.1 /0/@diagram/@childNodes.10/@labels.1 /0/@diagram/@childNodes.11/@labels.1 /0/@diagram/@childNodes.12/@labels.1 /0/@diagram/@childNodes.13/@labels.1 /0/@diagram/@childNodes.14/@labels.1 /0/@diagram/@childNodes.15/@labels.1 /0/@diagram/@childNodes.16/@labels.1 /0/@diagram/@childNodes.17/@labels.1 /0/@diagram/@childNodes.18/@labels.1 /0/@diagram/@childNodes.19/@labels.1 /0/@diagram/@childNodes.20/@labels.1 /0/@diagram/@childNodes.21/@labels.1 /0/@diagram/@childNodes.22/@labels.1 /0/@diagram/@childNodes.23/@labels.1 /0/@diagram/@childNodes.24/@labels.1 /0/@diagram/@childNodes.25/@labels.1 /0/@diagram/@childNodes.26/@labels.1 /0/@diagram/@childNodes.27/@labels.1 /0/@diagram/@topLevelNodes.0/@labels.1 /0/@diagram/@topLevelNodes.1/@labels.1 /0/@diagram/@topLevelNodes.2/@labels.1 /0/@diagram/@topLevelNodes.3/@labels.1 /0/@diagram/@topLevelNodes.4/@labels.1 /0/@diagram/@topLevelNodes.5/@labels.1 /0/@diagram/@topLevelNodes.6/@labels.1 /0/@diagram/@topLevelNodes.7/@labels.1 /0/@diagram/@topLevelNodes.8/@labels.1 /0/@diagram/@topLevelNodes.9/@labels.1 /0/@diagram/@topLevelNodes.10/@labels.1 /0/@diagram/@topLevelNodes.11/@labels.1 /0/@diagram/@topLevelNodes.12/@labels.1 /0/@diagram/@topLevelNodes.13/@labels.1 /0/@diagram/@topLevelNodes.14/@labels.1 /0/@diagram/@topLevelNodes.15/@labels.1 /0/@diagram/@topLevelNodes.16/@labels.1 /0/@diagram/@topLevelNodes.17/@labels.1 /0/@diagram/@topLevelNodes.18/@labels.1 /0/@diagram/@topLevelNodes.19/@labels.1 /0/@diagram/@topLevelNodes.20/@labels.1 /0/@diagram/@topLevelNodes.21/@labels.1 /0/@diagram/@topLevelNodes.22/@labels.1 /0/@diagram/@topLevelNodes.23/@labels.1 /0/@diagram/@topLevelNodes.24/@labels.1 /0/@diagram/@topLevelNodes.25/@labels.1 /0/@diagram/@topLevelNodes.26/@labels.1 /0/@diagram/@topLevelNodes.29/@labels.1 /0/@diagram/@topLevelNodes.30/@labels.1 /0/@diagram/@topLevelNodes.31/@labels.1 /0/@diagram/@topLevelNodes.32/@labels.1 /0/@diagram/@topLevelNodes.33/@labels.1 /0/@diagram/@topLevelNodes.34/@labels.1 /0/@diagram/@topLevelNodes.35/@labels.1 /0/@diagram/@topLevelNodes.36/@labels.1 /0/@diagram/@topLevelNodes.37/@labels.1 /0/@diagram/@topLevelNodes.38/@labels.1 /0/@diagram/@topLevelNodes.39/@labels.1 /0/@diagram/@topLevelNodes.40/@labels.1 /0/@diagram/@topLevelNodes.41/@labels.1 /0/@diagram/@topLevelNodes.42/@labels.1" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView"

+			genView="/0/@diagram/@topLevelNodes.33 /0/@diagram/@topLevelNodes.32 /0/@diagram/@topLevelNodes.31 /0/@diagram/@topLevelNodes.30 /0/@diagram/@topLevelNodes.29 /0/@diagram/@topLevelNodes.34 /0/@diagram/@topLevelNodes.35 /0/@diagram/@topLevelNodes.36 /0/@diagram/@topLevelNodes.37 /0/@diagram/@topLevelNodes.38 /0/@diagram/@topLevelNodes.39 /0/@diagram/@topLevelNodes.40 /0/@diagram/@topLevelNodes.41 /0/@diagram/@topLevelNodes.42 /0/@diagram/@childNodes.23 /0/@diagram/@topLevelNodes.17 /0/@diagram/@childNodes.3 /0/@diagram/@childNodes.27 /0/@diagram/@topLevelNodes.21 /0/@diagram/@topLevelNodes.22 /0/@diagram/@topLevelNodes.23 /0/@diagram/@topLevelNodes.24 /0/@diagram/@topLevelNodes.25 /0/@diagram/@topLevelNodes.26"

+			name="RoundedCompartmentEditPart"

+			superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart" />

+		<extensionNodes xsi:type="papyrusgmfgenextension:ExtendedGenView"

+			comment="extend view for affixed node" genView="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.2"

+			name="RoundedBorderNamedElementEditPart"

+			superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedBorderNamedElementEditPart" />

+	</papyrusgmfgenextension:PapyrusExtensionRootNode>

 </xmi:XMI>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
index 8ee35f253c1..c6e38e5f79c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
@@ -15,22 +15,22 @@
 -->
 <plugin>
 
-   <extension point="org.eclipse.ui.contexts" id="ui-context">
-				      <?gmfgen generated="true"?>
-				      <context
-				         description="%context.description"
-				         id="org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext"
-				         name="%context.name"
-				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
-				      </context>
-				   </extension>
+   <extension point="org.eclipse.ui.contexts" id="ui-context">

+				      <?gmfgen generated="true"?>

+				      <context

+				         description="%context.description"

+				         id="org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext"

+				         name="%context.name"

+				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">

+				      </context>

+				   </extension>

       	
 
 
-   <extension point="org.eclipse.core.runtime.preferences" id="prefs">
-      <?gmfgen generated="true"?>
-      <initializer class="org.eclipse.papyrus.uml.diagram.composite.preferences.DiagramPreferenceInitializer"/>
-   </extension>
+   <extension point="org.eclipse.core.runtime.preferences" id="prefs">

+      <?gmfgen generated="true"?>

+      <initializer class="org.eclipse.papyrus.uml.diagram.composite.preferences.DiagramPreferenceInitializer"/>

+   </extension>

 
    <extension point="org.eclipse.ui.preferencePages" id="prefpages">
       <?gmfgen generated="false"?>
@@ -57,77 +57,77 @@
 
    </extension>
 
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
-      <?gmfgen generated="true"?>
-      <propertyContributor
-            contributorId="org.eclipse.papyrus.uml.diagram.composite"
-            labelProvider="org.eclipse.papyrus.uml.diagram.composite.sheet.UMLSheetLabelProvider">
-         <propertyCategory category="domain"/>
-         <propertyCategory category="visual"/>
-         <propertyCategory category="extra"/>
-      </propertyContributor>
-   </extension>
-
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
-      <?gmfgen generated="true"?>   
-      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.composite">
-         <propertyTab
-             category="visual"
-             id="property.tab.AppearancePropertySection"
-             label="%tab.appearance"/>
-          <propertyTab
-             category="visual"
-             id="property.tab.DiagramPropertySection"
-             label="%tab.diagram"/>
-          <propertyTab
-             category="domain"
-             id="property.tab.domain"
-             label="%tab.domain"/>
-      </propertyTabs>
-   </extension>
-
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
-      <?gmfgen generated="true"?>   
-      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.composite">
-         <propertySection id="property.section.ConnectorAppearancePropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
-            tab="property.tab.AppearancePropertySection">
-         </propertySection>
-         <propertySection id="property.section.ShapeColorAndFontPropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
-            tab="property.tab.AppearancePropertySection">
-         </propertySection> 
-         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
-            tab="property.tab.AppearancePropertySection">
-         </propertySection>     
-         <propertySection id="property.section.RulerGridPropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
-            tab="property.tab.DiagramPropertySection">
-         </propertySection>     
-         <propertySection
-            id="property.section.domain" 
-            tab="property.tab.domain"
-            class="org.eclipse.papyrus.uml.diagram.composite.sheet.UMLPropertySection">
-            <input type="org.eclipse.gmf.runtime.notation.View"/>
-            <input type="org.eclipse.gef.EditPart"/>
-         </propertySection>
-      </propertySections>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
-      <?gmfgen generated="true"?>
-      <viewProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLViewProvider">
-         <Priority name="Lowest"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="CompositeStructure"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2060,2061,2062,2063,2064,2065,2069,2070,2071,2072,2073,2075,2076,2066,2067,2068,2077,2078,2079,2080,2081,2082,2083,2084,2085,2088,2089,2093,2094,2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113,2114,3121,3069,3088,3070,3115,3071,3072,3073,3074,3075,3076,3077,3081,3082,3083,3084,3085,3086,3087,3078,3079,3080,3091,3092,3093,3094,3095,3096,3097,3116,3117,3118,3119,3120,3101,3102,3066"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4022,4001,4002,4003,4004,4005,4011,4006,4012,4007,4008,4009,4017,4010,4013,4015,4018,4019,4020,4021"/>
-      </viewProvider>
-   </extension>
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">

+      <?gmfgen generated="true"?>

+      <propertyContributor

+            contributorId="org.eclipse.papyrus.uml.diagram.composite"

+            labelProvider="org.eclipse.papyrus.uml.diagram.composite.sheet.UMLSheetLabelProvider">

+         <propertyCategory category="domain"/>

+         <propertyCategory category="visual"/>

+         <propertyCategory category="extra"/>

+      </propertyContributor>

+   </extension>

+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">

+      <?gmfgen generated="true"?>   

+      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.composite">

+         <propertyTab

+             category="visual"

+             id="property.tab.AppearancePropertySection"

+             label="%tab.appearance"/>

+          <propertyTab

+             category="visual"

+             id="property.tab.DiagramPropertySection"

+             label="%tab.diagram"/>

+          <propertyTab

+             category="domain"

+             id="property.tab.domain"

+             label="%tab.domain"/>

+      </propertyTabs>

+   </extension>

+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">

+      <?gmfgen generated="true"?>   

+      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.composite">

+         <propertySection id="property.section.ConnectorAppearancePropertySection" 

+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 

+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 

+            tab="property.tab.AppearancePropertySection">

+         </propertySection>

+         <propertySection id="property.section.ShapeColorAndFontPropertySection" 

+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 

+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 

+            tab="property.tab.AppearancePropertySection">

+         </propertySection> 

+         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 

+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 

+            tab="property.tab.AppearancePropertySection">

+         </propertySection>     

+         <propertySection id="property.section.RulerGridPropertySection" 

+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 

+            tab="property.tab.DiagramPropertySection">

+         </propertySection>     

+         <propertySection

+            id="property.section.domain" 

+            tab="property.tab.domain"

+            class="org.eclipse.papyrus.uml.diagram.composite.sheet.UMLPropertySection">

+            <input type="org.eclipse.gmf.runtime.notation.View"/>

+            <input type="org.eclipse.gef.EditPart"/>

+         </propertySection>

+      </propertySections>

+   </extension>

+
+   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

+      <?gmfgen generated="true"?>

+      <viewProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLViewProvider">

+         <Priority name="Lowest"/>

+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="CompositeStructure"/>

+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2060,2061,2062,2063,2064,2065,2069,2070,2071,2072,2073,2075,2076,2066,2067,2068,2077,2078,2079,2080,2081,2082,2083,2084,2085,2088,2089,2093,2094,2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113,2114,3121,3069,3088,3070,3115,3071,3072,3073,3074,3075,3076,3077,3081,3082,3083,3084,3085,3086,3087,3078,3079,3080,3091,3092,3093,3094,3095,3096,3097,3116,3117,3118,3119,3120,3101,3102,3066"/>

+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4022,4001,4002,4003,4004,4005,4011,4006,4012,4007,4008,4009,4017,4010,4013,4015,4018,4019,4020,4021"/>

+      </viewProvider>

+   </extension>

 
    <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
       <?gmfgen generated="false"?>
@@ -153,1153 +153,21 @@
    </extension>
 
    
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
-      <?gmfgen generated="true"?>
-      <IconProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLIconProvider">
-         <Priority name="Low"/>
-      </IconProvider>
-   </extension>
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

+      <?gmfgen generated="true"?>

+      <IconProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLIconProvider">

+         <Priority name="Low"/>

+      </IconProvider>

+   </extension>

 
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
-      <?gmfgen generated="true"?>
-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider">
-         <Priority name="Lowest"/>
-      </ParserProvider>
-   </extension>
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

+      <?gmfgen generated="true"?>

+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider">

+         <Priority name="Lowest"/>

+      </ParserProvider>

+   </extension>

 
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
-      <?gmfgen generated="true"?>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Package_1000"
-               name="%metatype.name.Package_1000"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Package"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PackageEditHelper">
-            <param name="semanticHint" value="1000"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"
-               name="%metatype.name.Activity_2060"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Activity"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ActivityEditHelper">
-            <param name="semanticHint" value="2060"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"
-               name="%metatype.name.Interaction_2061"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Interaction"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InteractionEditHelper">
-            <param name="semanticHint" value="2061"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"
-               name="%metatype.name.ProtocolStateMachine_2062"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ProtocolStateMachine"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ProtocolStateMachineEditHelper">
-            <param name="semanticHint" value="2062"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"
-               name="%metatype.name.StateMachine_2063"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="StateMachine"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.StateMachineEditHelper">
-            <param name="semanticHint" value="2063"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"
-               name="%metatype.name.FunctionBehavior_2064"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="FunctionBehavior"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.FunctionBehaviorEditHelper">
-            <param name="semanticHint" value="2064"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"
-               name="%metatype.name.OpaqueBehavior_2065"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="OpaqueBehavior"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.OpaqueBehaviorEditHelper">
-            <param name="semanticHint" value="2065"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Component_2069"
-               name="%metatype.name.Component_2069"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Component"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ComponentEditHelper">
-            <param name="semanticHint" value="2069"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Device_2070"
-               name="%metatype.name.Device_2070"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Device"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeviceEditHelper">
-            <param name="semanticHint" value="2070"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"
-               name="%metatype.name.ExecutionEnvironment_2071"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ExecutionEnvironment"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ExecutionEnvironmentEditHelper">
-            <param name="semanticHint" value="2071"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Node_2072"
-               name="%metatype.name.Node_2072"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Node"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.NodeEditHelper">
-            <param name="semanticHint" value="2072"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Class_2073"
-               name="%metatype.name.Class_2073"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Class"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ClassEditHelper">
-            <param name="semanticHint" value="2073"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"
-               name="%metatype.name.Collaboration_2075"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"/>
-            <param name="semanticHint" value="2075"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Interface_2076"
-               name="%metatype.name.Interface_2076"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"/>
-            <param name="semanticHint" value="2076"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"
-               name="%metatype.name.PrimitiveType_2066"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="PrimitiveType"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PrimitiveTypeEditHelper">
-            <param name="semanticHint" value="2066"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"
-               name="%metatype.name.Enumeration_2067"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Enumeration"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.EnumerationEditHelper">
-            <param name="semanticHint" value="2067"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"
-               name="%metatype.name.DataType_2068"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="DataType"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DataTypeEditHelper">
-            <param name="semanticHint" value="2068"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Actor_2077"
-               name="%metatype.name.Actor_2077"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"/>
-            <param name="semanticHint" value="2077"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"
-               name="%metatype.name.DeploymentSpecification_2078"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"/>
-            <param name="semanticHint" value="2078"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"
-               name="%metatype.name.Artifact_2079"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"/>
-            <param name="semanticHint" value="2079"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"
-               name="%metatype.name.InformationItem_2080"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"/>
-            <param name="semanticHint" value="2080"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Signal_2081"
-               name="%metatype.name.Signal_2081"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"/>
-            <param name="semanticHint" value="2081"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"
-               name="%metatype.name.UseCase_2082"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"/>
-            <param name="semanticHint" value="2082"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"
-               name="%metatype.name.SignalEvent_2083"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="SignalEvent"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SignalEventEditHelper">
-            <param name="semanticHint" value="2083"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"
-               name="%metatype.name.CallEvent_2084"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="CallEvent"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CallEventEditHelper">
-            <param name="semanticHint" value="2084"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"
-               name="%metatype.name.AnyReceiveEvent_2085"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="AnyReceiveEvent"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.AnyReceiveEventEditHelper">
-            <param name="semanticHint" value="2085"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"
-               name="%metatype.name.ChangeEvent_2088"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ChangeEvent"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ChangeEventEditHelper">
-            <param name="semanticHint" value="2088"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"
-               name="%metatype.name.TimeEvent_2089"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="TimeEvent"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeEventEditHelper">
-            <param name="semanticHint" value="2089"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"
-               name="%metatype.name.DurationObservation_2093"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="DurationObservation"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationObservationEditHelper">
-            <param name="semanticHint" value="2093"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"
-               name="%metatype.name.TimeObservation_2094"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="TimeObservation"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeObservationEditHelper">
-            <param name="semanticHint" value="2094"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"
-               name="%metatype.name.LiteralBoolean_2095"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="LiteralBoolean"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralBooleanEditHelper">
-            <param name="semanticHint" value="2095"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"
-               name="%metatype.name.LiteralInteger_2096"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="LiteralInteger"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralIntegerEditHelper">
-            <param name="semanticHint" value="2096"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"
-               name="%metatype.name.LiteralNull_2097"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="LiteralNull"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralNullEditHelper">
-            <param name="semanticHint" value="2097"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"
-               name="%metatype.name.LiteralString_2098"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="LiteralString"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralStringEditHelper">
-            <param name="semanticHint" value="2098"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"
-               name="%metatype.name.LiteralUnlimitedNatural_2099"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="LiteralUnlimitedNatural"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralUnlimitedNaturalEditHelper">
-            <param name="semanticHint" value="2099"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"
-               name="%metatype.name.StringExpression_2100"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="StringExpression"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.StringExpressionEditHelper">
-            <param name="semanticHint" value="2100"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"
-               name="%metatype.name.OpaqueExpression_2101"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="OpaqueExpression"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.OpaqueExpressionEditHelper">
-            <param name="semanticHint" value="2101"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"
-               name="%metatype.name.TimeExpression_2102"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="TimeExpression"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeExpressionEditHelper">
-            <param name="semanticHint" value="2102"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Expression_2103"
-               name="%metatype.name.Expression_2103"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Expression"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ExpressionEditHelper">
-            <param name="semanticHint" value="2103"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Duration_2104"
-               name="%metatype.name.Duration_2104"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Duration"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationEditHelper">
-            <param name="semanticHint" value="2104"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"
-               name="%metatype.name.TimeInterval_2105"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="TimeInterval"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeIntervalEditHelper">
-            <param name="semanticHint" value="2105"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"
-               name="%metatype.name.DurationInterval_2106"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="DurationInterval"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationIntervalEditHelper">
-            <param name="semanticHint" value="2106"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Interval_2107"
-               name="%metatype.name.Interval_2107"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Interval"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.IntervalEditHelper">
-            <param name="semanticHint" value="2107"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"
-               name="%metatype.name.InstanceValue_2108"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="InstanceValue"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InstanceValueEditHelper">
-            <param name="semanticHint" value="2108"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"
-               name="%metatype.name.Comment_2109"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"/>
-            <param name="semanticHint" value="2109"/>
-         </specializationType>
-      </metamodel>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"
-               name="%metatype.name.DurationConstraint_2110"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="2110"/>
-         </specializationType>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"
-               name="%metatype.name.TimeConstraint_2111"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="TimeConstraint"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeConstraintEditHelper">
-            <param name="semanticHint" value="2111"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"
-               name="%metatype.name.IntervalConstraint_2112"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="IntervalConstraint"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.IntervalConstraintEditHelper">
-            <param name="semanticHint" value="2112"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"
-               name="%metatype.name.InteractionConstraint_2113"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="InteractionConstraint"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InteractionConstraintEditHelper">
-            <param name="semanticHint" value="2113"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"
-               name="%metatype.name.Constraint_2114"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Constraint"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ConstraintEditHelper">
-            <param name="semanticHint" value="2114"/>
-         </metamodelType>
-      </metamodel>
-      <specializationType
-            id="org.eclipse.papyrus.uml.diagram.composite.Node_3121"
-            name="%metatype.name.Node_3121"
-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-         <param name="semanticHint" value="3121"/>
-      </specializationType>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Port_3069"
-               name="%metatype.name.Port_3069"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Port"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PortEditHelper">
-            <param name="semanticHint" value="3069"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"
-               name="%metatype.name.Parameter_3088"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Parameter"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ParameterEditHelper">
-            <param name="semanticHint" value="3088"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Property_3070"
-               name="%metatype.name.Property_3070"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Property"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PropertyEditHelper">
-            <param name="semanticHint" value="3070"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"
-               name="%metatype.name.ConnectableElement_3115"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ConnectableElement"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationRoleEditHelper">
-            <param name="semanticHint" value="3115"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"
-               name="%metatype.name.CollaborationUse_3071"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="CollaborationUse"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationUseEditHelper">
-            <param name="semanticHint" value="3071"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Activity_3072"
-               name="%metatype.name.Activity_3072"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"/>
-            <param name="semanticHint" value="3072"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"
-               name="%metatype.name.Interaction_3073"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"/>
-            <param name="semanticHint" value="3073"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"
-               name="%metatype.name.ProtocolStateMachine_3074"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"/>
-            <param name="semanticHint" value="3074"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"
-               name="%metatype.name.StateMachine_3075"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"/>
-            <param name="semanticHint" value="3075"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"
-               name="%metatype.name.FunctionBehavior_3076"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"/>
-            <param name="semanticHint" value="3076"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"
-               name="%metatype.name.OpaqueBehavior_3077"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"/>
-            <param name="semanticHint" value="3077"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Component_3081"
-               name="%metatype.name.Component_3081"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Component_2069"/>
-            <param name="semanticHint" value="3081"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Device_3082"
-               name="%metatype.name.Device_3082"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Device_2070"/>
-            <param name="semanticHint" value="3082"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"
-               name="%metatype.name.ExecutionEnvironment_3083"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"/>
-            <param name="semanticHint" value="3083"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Node_3084"
-               name="%metatype.name.Node_3084"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Node_2072"/>
-            <param name="semanticHint" value="3084"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Class_3085"
-               name="%metatype.name.Class_3085"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Class_2073"/>
-            <param name="semanticHint" value="3085"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"
-               name="%metatype.name.Collaboration_3086"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Collaboration"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationEditHelper">
-            <param name="semanticHint" value="3086"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"
-               name="%metatype.name.Interface_3087"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Interface"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InterfaceEditHelper">
-            <param name="semanticHint" value="3087"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"
-               name="%metatype.name.PrimitiveType_3078"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"/>
-            <param name="semanticHint" value="3078"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"
-               name="%metatype.name.Enumeration_3079"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"/>
-            <param name="semanticHint" value="3079"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.DataType_3080"
-               name="%metatype.name.DataType_3080"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"/>
-            <param name="semanticHint" value="3080"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"
-               name="%metatype.name.Actor_3091"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Actor"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ActorEditHelper">
-            <param name="semanticHint" value="3091"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"
-               name="%metatype.name.DeploymentSpecification_3092"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="DeploymentSpecification"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeploymentSpecificationEditHelper">
-            <param name="semanticHint" value="3092"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"
-               name="%metatype.name.Artifact_3093"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Artifact"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ArtifactEditHelper">
-            <param name="semanticHint" value="3093"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"
-               name="%metatype.name.InformationItem_3094"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="InformationItem"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InformationItemEditHelper">
-            <param name="semanticHint" value="3094"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"
-               name="%metatype.name.Signal_3095"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Signal"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SignalEditHelper">
-            <param name="semanticHint" value="3095"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"
-               name="%metatype.name.UseCase_3096"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="UseCase"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.UseCaseEditHelper">
-            <param name="semanticHint" value="3096"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"
-               name="%metatype.name.Comment_3097"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Comment"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CommentEditHelper">
-            <param name="semanticHint" value="3097"/>
-         </metamodelType>
-      </metamodel>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"
-               name="%metatype.name.DurationConstraint_3116"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3116"/>
-         </specializationType>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"
-               name="%metatype.name.TimeConstraint_3117"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3117"/>
-         </specializationType>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"
-               name="%metatype.name.IntervalConstraint_3118"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3118"/>
-         </specializationType>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"
-               name="%metatype.name.InteractionConstraint_3119"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3119"/>
-         </specializationType>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"
-               name="%metatype.name.Constraint_3120"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3120"/>
-         </specializationType>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Property_3101"
-               name="%metatype.name.Property_3101"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3101"/>
-         </specializationType>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Operation_3102"
-               name="%metatype.name.Operation_3102"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3102"/>
-         </specializationType>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"
-               name="%metatype.name.EnumerationLiteral_3066"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="EnumerationLiteral"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.EnumerationLiteralEditHelper">
-            <param name="semanticHint" value="3066"/>
-         </metamodelType>
-      </metamodel>
-      <specializationType
-            id="org.eclipse.papyrus.uml.diagram.composite.Link_4022"
-            name="%metatype.name.Link_4022"
-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-         <param name="semanticHint" value="4022"/>
-      </specializationType>
-      <specializationType
-            id="org.eclipse.papyrus.uml.diagram.composite.Link_4001"
-            name="%metatype.name.Link_4001"
-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-         <param name="semanticHint" value="4001"/>
-      </specializationType>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"
-               name="%metatype.name.CommentAnnotatedElement_4002"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="4002"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"
-               name="%metatype.name.ConstraintConstrainedElement_4003"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="4003"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"
-               name="%metatype.name.ComponentRealization_4004"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ComponentRealization"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ComponentRealizationEditHelper">
-            <param name="semanticHint" value="4004"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"
-               name="%metatype.name.InterfaceRealization_4005"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="InterfaceRealization"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InterfaceRealizationEditHelper">
-            <param name="semanticHint" value="4005"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"
-               name="%metatype.name.Substitution_4011"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Substitution"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SubstitutionEditHelper">
-            <param name="semanticHint" value="4011"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Realization_4006"
-               name="%metatype.name.Realization_4006"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Realization"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.RealizationEditHelper">
-            <param name="semanticHint" value="4006"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"
-               name="%metatype.name.Manifestation_4012"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Manifestation"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ManifestationEditHelper">
-            <param name="semanticHint" value="4012"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"
-               name="%metatype.name.Abstraction_4007"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Abstraction"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.AbstractionEditHelper">
-            <param name="semanticHint" value="4007"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Usage_4008"
-               name="%metatype.name.Usage_4008"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Usage"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.UsageEditHelper">
-            <param name="semanticHint" value="4008"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"
-               name="%metatype.name.Deployment_4009"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Deployment"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeploymentEditHelper">
-            <param name="semanticHint" value="4009"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"
-               name="%metatype.name.Dependency_4017"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Dependency"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.RoleBindingEditHelper">
-            <param name="semanticHint" value="4017"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"
-               name="%metatype.name.Dependency_4010"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Dependency"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DependencyEditHelper">
-            <param name="semanticHint" value="4010"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Connector_4013"
-               name="%metatype.name.Connector_4013"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Connector"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ConnectorEditHelper">
-            <param name="semanticHint" value="4013"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"
-               name="%metatype.name.Generalization_4015"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Generalization"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.GeneralizationEditHelper">
-            <param name="semanticHint" value="4015"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"
-               name="%metatype.name.TimeObservationEvent_4018"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="4018"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"
-               name="%metatype.name.DurationObservationEvent_4019"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="4019"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"
-               name="%metatype.name.InformationItemRepresented_4020"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="4020"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"
-               name="%metatype.name.InformationFlow_4021"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="InformationFlow"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InformationFlowEditHelper">
-            <param name="semanticHint" value="4021"/>
-         </metamodelType>
-      </metamodel>
-   </extension>
 
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
-      <?gmfgen generated="true"?>
-      <clientContext id="org.eclipse.papyrus.uml.diagram.composite.TypeContext">
-         <enablement>
-            <test
-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
-               value="org.eclipse.papyrus.uml.diagram.composite.EditingDomain"/>
-         </enablement>
-      </clientContext> 
-      <binding context="org.eclipse.papyrus.uml.diagram.composite.TypeContext">
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Package_1000"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Component_2069"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Device_2070"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_2072"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Class_2073"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interface_2076"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Actor_2077"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Signal_2081"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Expression_2103"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Duration_2104"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interval_2107"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_3121"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Port_3069"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Property_3070"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Activity_3072"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Component_3081"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Device_3082"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_3084"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Class_3085"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DataType_3080"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Property_3101"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Operation_3102"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Link_4022"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Link_4001"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Realization_4006"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Usage_4008"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Connector_4013"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"/>
-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-      </binding>
-   </extension>
 	   
 	   
 	   
@@ -1331,38 +199,38 @@
             id="org.eclipse.papyrus.uml.diagram.composite.createCompositeDiagram"
             name="Create a new Composite Structure Diagram">
       </command>
-   </extension><extension point="org.eclipse.ui.menus" id="context-menus">
-      <?gmfgen generated="true"?>
-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
-      </menuContribution>
-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
-      </menuContribution -->
-      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
-         <command commandId="org.eclipse.papyrus.uml.diagram.composite.LoadResourceAction">
-            <visibleWhen>
-               <and>
-                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"/></with>
-                  <with variable="selection"><iterate ifEmpty="false"> 
-                     <instanceof value="org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart"/>
-                  </iterate></with>
-               </and>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-
-<extension point="org.eclipse.ui.commands" id="menu-commands">
-      <?gmfgen generated="true"?>
-      <category id="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
-      <command id="org.eclipse.papyrus.uml.diagram.composite.LoadResourceAction"
-         name="Load Resource"
-         categoryId="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"
-         defaultHandler="org.eclipse.papyrus.uml.diagram.composite.part.LoadResourceAction"/>
-   </extension>
-
-<extension point="org.eclipse.ui.handlers" id="menu-handlers">
-      <?gmfgen generated="true"?>
-   </extension>
+   </extension><extension point="org.eclipse.ui.menus" id="context-menus">

+      <?gmfgen generated="true"?>

+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">

+      </menuContribution>

+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">

+      </menuContribution -->

+      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">

+         <command commandId="org.eclipse.papyrus.uml.diagram.composite.LoadResourceAction">

+            <visibleWhen>

+               <and>

+                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"/></with>

+                  <with variable="selection"><iterate ifEmpty="false"> 

+                     <instanceof value="org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart"/>

+                  </iterate></with>

+               </and>

+            </visibleWhen>

+         </command>

+      </menuContribution>

+   </extension>

+
+<extension point="org.eclipse.ui.commands" id="menu-commands">

+      <?gmfgen generated="true"?>

+      <category id="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>

+      <command id="org.eclipse.papyrus.uml.diagram.composite.LoadResourceAction"

+         name="Load Resource"

+         categoryId="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"

+         defaultHandler="org.eclipse.papyrus.uml.diagram.composite.part.LoadResourceAction"/>

+   </extension>

+
+<extension point="org.eclipse.ui.handlers" id="menu-handlers">

+      <?gmfgen generated="true"?>

+   </extension>

 
 
 <extension
@@ -1376,65 +244,31 @@
    </command>
 </extension>
 
-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
-				      <?gmfgen generated="true"?>
-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLMarkerNavigationProvider">
-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.composite.diagnostic"/>
-				         <Priority name="Lowest"/>
-				      </MarkerNavigationProvider>
-				   </extension>
-
-<extension id="diagnostic" name="Papyrus Composite Structure Diagram  problems" point="org.eclipse.core.resources.markers">
-				      <?gmfgen generated="true"?>
-				      <super type="org.eclipse.core.resources.problemmarker"/>
-				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
-				      <persistent value="true"/>
-				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
-				      <?gmfgen generated="true"?>
-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLValidationDecoratorProvider">
-				         <Priority name="Lowest"/>
-				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
-				         <context decoratorTargets="PRIMARY_VIEW"/>
-				      </decoratorProvider>
-				   </extension>
+<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

+				      <?gmfgen generated="true"?>

+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLMarkerNavigationProvider">

+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.composite.diagnostic"/>

+				         <Priority name="Lowest"/>

+				      </MarkerNavigationProvider>

+				   </extension>

+
+<extension id="diagnostic" name="Papyrus Composite Structure Diagram  problems" point="org.eclipse.core.resources.markers">

+				      <?gmfgen generated="true"?>

+				      <super type="org.eclipse.core.resources.problemmarker"/>

+				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

+				      <persistent value="true"/>

+				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

+				      <?gmfgen generated="true"?>

+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLValidationDecoratorProvider">

+				         <Priority name="Lowest"/>

+				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

+				         <context decoratorTargets="PRIMARY_VIEW"/>

+				      </decoratorProvider>

+				   </extension>

    
 <!-- Diagram specific advices -->
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-
-	<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
-
-	<!-- Generalizarion specific advices (remove inconsistent views when a Generalization is deleted -->		
-	<adviceBinding id="org.eclipse.papyrus.uml.diagram.composite.GeneralizationHelperAdvice"
-		class="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.GeneralizationHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.uml.Generalization">
-	</adviceBinding>
-
-	<!-- Property specific advices (remove inconsistent views when a Property type is set -->		
-	<adviceBinding id="org.eclipse.papyrus.uml.diagram.composite.PropertyHelperAdvice"
-		class="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.PropertyHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.uml.Property">
-	</adviceBinding>
-		
-	<!-- Collaboration specific advices (remove inconsistent views when a CollaborationRole is removed -->		
-	<adviceBinding id="org.eclipse.papyrus.uml.diagram.composite.CollaborationHelperAdvice"
-		class="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.CollaborationHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.uml.Collaboration">
-	</adviceBinding>
-			
-	</metamodel>
-</extension>
 	
 <!-- UML ElementType bindings to Papyrus shared IClientContext -->
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-
-	<!-- Bindings declaration to shared IClientContext -->
-	<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">	
-		<elementType ref="org.eclipse.papyrus.uml.diagram.composite.GeneralizationHelperAdvice"/>
-		<elementType ref="org.eclipse.papyrus.uml.diagram.composite.PropertyHelperAdvice"/>		
-		<elementType ref="org.eclipse.papyrus.uml.diagram.composite.CollaborationHelperAdvice"/>			
-	</binding>
-		
-</extension>
 
 <extension
       point="org.eclipse.ui.services">
@@ -1547,475 +381,517 @@
 
 
 
-<extension
-			id="Papyrus Composite Structure Diagram .palettedefinition"
-			name="Papyrus Composite Structure Diagram  Predefined Entries"
-			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
-			
-			<?gmfgen generated="true"?>	
-			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-				<Priority name="Lowest"/>
-				   		<contribution
-				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.composite.part.UMLPaletteFactory">
-				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
-				
-				<entry
-				      defineOnly="true"
-				      description="Create new Class"
-				      id="composite.tool.class"
-				      kind="tool"
-				      label="Class"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Property"
-				      id="composite.tool.property"
-				      kind="tool"
-				      label="Property"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Port"
-				      id="composite.tool.port"
-				      kind="tool"
-				      label="Port"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Collaboration"
-				      id="composite.tool.collaboration"
-				      kind="tool"
-				      label="Collaboration"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new CollaborationRole"
-				      id="composite.tool.collaborationrole"
-				      kind="tool"
-				      label="CollaborationRole"
-				      large_icon="icons/obj16/CollaborationRole.gif"
-				      path=""
-				      small_icon="icons/obj16/CollaborationRole.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new CollaborationUse"
-				      id="composite.tool.collaborationuse"
-				      kind="tool"
-				      label="CollaborationUse"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Comment"
-				      id="composite.tool.comment"
-				      kind="tool"
-				      label="Comment"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Constraint"
-				      id="composite.tool.constraint"
-				      kind="tool"
-				      label="Constraint"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new TimeObservation"
-				      id="composite.tool.timeobservation"
-				      kind="tool"
-				      label="TimeObservation"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new DurationObservation"
-				      id="composite.tool.durationobservation"
-				      kind="tool"
-				      label="DurationObservation"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new InformationItem"
-				      id="composite.tool.informationitem"
-				      kind="tool"
-				      label="InformationItem"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Parameter"
-				      id="composite.tool.parameter"
-				      kind="tool"
-				      label="Parameter"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Activity"
-				      id="composite.tool.activity"
-				      kind="tool"
-				      label="Activity"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Interaction"
-				      id="composite.tool.interaction"
-				      kind="tool"
-				      label="Interaction"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new ProtocolStateMachine"
-				      id="composite.tool.protocolstatemachine"
-				      kind="tool"
-				      label="ProtocolStateMachine"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new StateMachine"
-				      id="composite.tool.statemachine"
-				      kind="tool"
-				      label="StateMachine"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new FunctionBehavior"
-				      id="composite.tool.functionbehavior"
-				      kind="tool"
-				      label="FunctionBehavior"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new OpaqueBehavior"
-				      id="composite.tool.opaquebehavior"
-				      kind="tool"
-				      label="OpaqueBehavior"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Link (Comment / Constraint)"
-				      id="composite.tool.link"
-				      kind="tool"
-				      label="Link"
-				      large_icon="icons/obj16/Link.gif"
-				      path=""
-				      small_icon="icons/obj16/Link.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Connector"
-				      id="composite.tool.connector"
-				      kind="tool"
-				      label="Connector"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new RoleBinding"
-				      id="composite.tool.rolebinding"
-				      kind="tool"
-				      label="RoleBinding"
-				      large_icon="icons/obj16/CollaborationRoleBinding.gif"
-				      path=""
-				      small_icon="icons/obj16/CollaborationRoleBinding.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Generalization"
-				      id="composite.tool.generalization"
-				      kind="tool"
-				      label="Generalization"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Realization"
-				      id="composite.tool.realization"
-				      kind="tool"
-				      label="Realization"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Substitution"
-				      id="composite.tool.substitution"
-				      kind="tool"
-				      label="Substitution"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Abstraction"
-				      id="composite.tool.abstraction"
-				      kind="tool"
-				      label="Abstraction"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Usage"
-				      id="composite.tool.usage"
-				      kind="tool"
-				      label="Usage"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Dependency"
-				      id="composite.tool.dependency"
-				      kind="tool"
-				      label="Dependency"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new representation for an InformationItem"
-				      id="composite.tool.representation"
-				      kind="tool"
-				      label="Representation"
-				      large_icon="icons/obj16/Representation.gif"
-				      path=""
-				      small_icon="icons/obj16/Representation.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new InformationFlow"
-				      id="composite.tool.informationflow"
-				      kind="tool"
-				      label="InformationFlow"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif">
-					</entry>
-				
-				</contribution>
-			</paletteProvider>	
-				
-		</extension>
-
-<extension
-	id="Papyrus Composite Structure Diagram .standard"
-	name="Papyrus Composite Structure Diagram  Standard Palette"
-	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
-	
-	<?gmfgen generated="true"?>	
-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-		<Priority name="Low"/>
-		   		<contribution
-		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.composite.part.UMLPaletteFactory">
-		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
-		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
-		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
-		
-		<entry
-		      description="Nodes"
-		      id="composite.group.nodes"
-		      kind="drawer"
-		      label="Nodes"
-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-		      path="/"
-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-		   <expand
-		         force="true">
-		   </expand>
-		</entry>
-		<predefinedEntry
-		        id="composite.tool.class"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.property"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.port"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.collaboration"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.collaborationrole"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.collaborationuse"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.comment"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.constraint"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.timeobservation"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.durationobservation"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.informationitem"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.parameter"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.activity"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.interaction"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.protocolstatemachine"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.statemachine"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.functionbehavior"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.opaquebehavior"
-				path="/composite.group.nodes">
-		  </predefinedEntry>
-		<entry
-		      description="Edges"
-		      id="composite.group.edges"
-		      kind="drawer"
-		      label="Edges"
-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-		      path="/"
-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-		   <expand
-		         force="true">
-		   </expand>
-		</entry>
-		<predefinedEntry
-		        id="composite.tool.link"
-				path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.connector"
-				path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.rolebinding"
-				path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.generalization"
-				path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.realization"
-				path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.substitution"
-				path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.abstraction"
-				path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.usage"
-				path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.dependency"
-				path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.representation"
-				path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.informationflow"
-				path="/composite.group.edges">
-		  </predefinedEntry>
-		</contribution>
-		<editor id="org.eclipse.papyrus.uml.diagram.composite"/>
-	</paletteProvider>	
-		
-</extension>
+<extension

+			id="Papyrus Composite Structure Diagram .palettedefinition"

+			name="Papyrus Composite Structure Diagram  Predefined Entries"

+			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 

+			

+			<?gmfgen generated="true"?>	

+			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

+				<Priority name="Lowest"/>

+				   		<contribution

+				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.composite.part.UMLPaletteFactory">

+				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

+				

+				<entry

+				      defineOnly="true"

+				      description="Create new Class"

+				      id="composite.tool.class"

+				      kind="tool"

+				      label="Class"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Property"

+				      id="composite.tool.property"

+				      kind="tool"

+				      label="Property"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Port"

+				      id="composite.tool.port"

+				      kind="tool"

+				      label="Port"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Collaboration"

+				      id="composite.tool.collaboration"

+				      kind="tool"

+				      label="Collaboration"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new CollaborationRole"

+				      id="composite.tool.collaborationrole"

+				      kind="tool"

+				      label="CollaborationRole"

+				      large_icon="icons/obj16/CollaborationRole.gif"

+				      path=""

+				      small_icon="icons/obj16/CollaborationRole.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new CollaborationUse"

+				      id="composite.tool.collaborationuse"

+				      kind="tool"

+				      label="CollaborationUse"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Comment"

+				      id="composite.tool.comment"

+				      kind="tool"

+				      label="Comment"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Constraint"

+				      id="composite.tool.constraint"

+				      kind="tool"

+				      label="Constraint"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new TimeObservation"

+				      id="composite.tool.timeobservation"

+				      kind="tool"

+				      label="TimeObservation"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new DurationObservation"

+				      id="composite.tool.durationobservation"

+				      kind="tool"

+				      label="DurationObservation"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new InformationItem"

+				      id="composite.tool.informationitem"

+				      kind="tool"

+				      label="InformationItem"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Parameter"

+				      id="composite.tool.parameter"

+				      kind="tool"

+				      label="Parameter"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Activity"

+				      id="composite.tool.activity"

+				      kind="tool"

+				      label="Activity"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Interaction"

+				      id="composite.tool.interaction"

+				      kind="tool"

+				      label="Interaction"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new ProtocolStateMachine"

+				      id="composite.tool.protocolstatemachine"

+				      kind="tool"

+				      label="ProtocolStateMachine"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new StateMachine"

+				      id="composite.tool.statemachine"

+				      kind="tool"

+				      label="StateMachine"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new FunctionBehavior"

+				      id="composite.tool.functionbehavior"

+				      kind="tool"

+				      label="FunctionBehavior"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new OpaqueBehavior"

+				      id="composite.tool.opaquebehavior"

+				      kind="tool"

+				      label="OpaqueBehavior"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new StringExpression"

+				      id="composite.tool.stringExpression"

+				      kind="tool"

+				      label="StringExpression"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StringExpression.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StringExpression.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Link (Comment / Constraint)"

+				      id="composite.tool.link"

+				      kind="tool"

+				      label="Link"

+				      large_icon="icons/obj16/Link.gif"

+				      path=""

+				      small_icon="icons/obj16/Link.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Connector"

+				      id="composite.tool.connector"

+				      kind="tool"

+				      label="Connector"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new RoleBinding"

+				      id="composite.tool.rolebinding"

+				      kind="tool"

+				      label="RoleBinding"

+				      large_icon="icons/obj16/CollaborationRoleBinding.gif"

+				      path=""

+				      small_icon="icons/obj16/CollaborationRoleBinding.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Generalization"

+				      id="composite.tool.generalization"

+				      kind="tool"

+				      label="Generalization"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Realization"

+				      id="composite.tool.realization"

+				      kind="tool"

+				      label="Realization"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Substitution"

+				      id="composite.tool.substitution"

+				      kind="tool"

+				      label="Substitution"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Abstraction"

+				      id="composite.tool.abstraction"

+				      kind="tool"

+				      label="Abstraction"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Usage"

+				      id="composite.tool.usage"

+				      kind="tool"

+				      label="Usage"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Dependency"

+				      id="composite.tool.dependency"

+				      kind="tool"

+				      label="Dependency"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new representation for an InformationItem"

+				      id="composite.tool.representation"

+				      kind="tool"

+				      label="Representation"

+				      large_icon="icons/obj16/Representation.gif"

+				      path=""

+				      small_icon="icons/obj16/Representation.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new InformationFlow"

+				      id="composite.tool.informationflow"

+				      kind="tool"

+				      label="InformationFlow"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Manifestation"

+				      id="composite.tool.manifestation"

+				      kind="tool"

+				      label="Manifestation"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Deployment"

+				      id="composite.tool.deployment"

+				      kind="tool"

+				      label="Deployment"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Deployment.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Deployment.gif">

+					</entry>

+				

+				</contribution>

+			</paletteProvider>	

+				

+		</extension>

+
+<extension

+	id="Papyrus Composite Structure Diagram .standard"

+	name="Papyrus Composite Structure Diagram  Standard Palette"

+	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 

+	

+	<?gmfgen generated="true"?>	

+	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

+		<Priority name="Low"/>

+		   		<contribution

+		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.composite.part.UMLPaletteFactory">

+		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

+		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

+		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

+		

+		<entry

+		      description="Nodes"

+		      id="composite.group.nodes"

+		      kind="drawer"

+		      label="Nodes"

+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+		      path="/"

+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

+		   <expand

+		         force="true">

+		   </expand>

+		</entry>

+		<predefinedEntry

+		        id="composite.tool.class"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.property"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.port"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.collaboration"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.collaborationrole"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.collaborationuse"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.comment"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.constraint"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.timeobservation"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.durationobservation"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.informationitem"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.parameter"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.activity"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.interaction"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.protocolstatemachine"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.statemachine"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.functionbehavior"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.opaquebehavior"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.stringExpression"

+				path="/composite.group.nodes">

+		  </predefinedEntry>

+		<entry

+		      description="Edges"

+		      id="composite.group.edges"

+		      kind="drawer"

+		      label="Edges"

+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+		      path="/"

+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

+		   <expand

+		         force="true">

+		   </expand>

+		</entry>

+		<predefinedEntry

+		        id="composite.tool.link"

+				path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.connector"

+				path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.rolebinding"

+				path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.generalization"

+				path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.realization"

+				path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.substitution"

+				path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.abstraction"

+				path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.usage"

+				path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.dependency"

+				path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.representation"

+				path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.informationflow"

+				path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.manifestation"

+				path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.deployment"

+				path="/composite.group.edges">

+		  </predefinedEntry>

+		</contribution>

+		<editor id="org.eclipse.papyrus.uml.diagram.composite"/>

+	</paletteProvider>	

+		

+</extension>

 
 <extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
 		<diagramMappings diagramID="CompositeStructure">
@@ -2366,5 +1242,146 @@
          getSemanticChildren="org.eclipse.papyrus.uml.diagram.composite.SynchroSemanticForPopertyPartCompartment">
    </semanticChild>
 </extension>
+<extension
+      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+   <elementTypeSet
+         id="org.eclipse.papyrus.uml.diagram.composite.elementTypeSet"
+         path="model/compositediagram.elementtypesconfigurations">
+   </elementTypeSet>
+</extension>
+<extension
+      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+   <elementTypeSet
+         id="org.eclipse.papyrus.uml.diagram.composite.elementTypeSetNotation"
+         path="model/compositediagram-notation.elementtypesconfigurations">
+   </elementTypeSet>
+</extension>

+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">

+      <?gmfgen generated="true"?>

+   </extension>

+

+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">

+      <?gmfgen generated="true"?>

+      <clientContext id="org.eclipse.papyrus.uml.diagram.composite.TypeContext">

+         <enablement>

+            <test

+               property="org.eclipse.gmf.runtime.emf.core.editingDomain"

+               value="org.eclipse.papyrus.uml.diagram.composite.EditingDomain"/>

+         </enablement>

+      </clientContext> 

+      <binding context="org.eclipse.papyrus.uml.diagram.composite.TypeContext">

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Package_1000"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Component_2069"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Device_2070"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_2072"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Class_2073"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interface_2076"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Actor_2077"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Signal_2081"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Expression_2103"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Duration_2104"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interval_2107"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_3121"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Port_3069"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Property_3070"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CollaborationRole_3115"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Activity_3072"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Component_3081"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Device_3082"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_3084"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Class_3085"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DataType_3080"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Property_3101"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Operation_3102"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Link_4022"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Link_4001"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Realization_4006"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Usage_4008"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Connector_4013"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"/>

+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

+      </binding>

+   </extension>

+

+

+

 
 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/SynchroSemanticForPopertyPartCompartment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/SynchroSemanticForPopertyPartCompartment.java
deleted file mode 100644
index 58d47ff856a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/SynchroSemanticForPopertyPartCompartment.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.composite;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.uml.diagram.synchronizeview.customization.ISynchroSemanticChild;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * This class is used to precise semantic element that could be displayed in compartment of parts

- */

-public class SynchroSemanticForPopertyPartCompartment implements ISynchroSemanticChild {

-

-	public SynchroSemanticForPopertyPartCompartment() {

-	}

-

-	@Override

-	public List<EObject> getSynchroSemanticChild(EObject semanticFromEditPart) {

-		ArrayList<EObject> result = new ArrayList<EObject>();

-		if (semanticFromEditPart instanceof Property) {

-			if (((Property) semanticFromEditPart).getType() != null) {

-				result.addAll(((Property) semanticFromEditPart).getType().getOwnedElements());

-			}

-		}

-		return result;

-	}

-

-	@Override

-	public EObject getSemanticEObjectToListen(EObject semanticFromEditPart) {

-		if (semanticFromEditPart instanceof Property) {

-			if (((Property) semanticFromEditPart).getType() != null) {

-				return ((Property) semanticFromEditPart).getType();

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionCreateCommand.java
deleted file mode 100644
index 6a2e59aed74..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionCreateCommand.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Abstraction;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class AbstractionCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public AbstractionCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateAbstraction_4007(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		Abstraction newElement = UMLFactory.eINSTANCE.createAbstraction();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Abstraction_4007(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Abstraction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionReorientCommand.java
deleted file mode 100644
index 99b647ff319..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Abstraction;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class AbstractionReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public AbstractionReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Abstraction) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAbstraction_4007(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAbstraction_4007(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Abstraction getLink() {

-		return (Abstraction) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommand.java
deleted file mode 100644
index 7acdcaa1b0f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ActivityCompositeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ActivityCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActivity());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Activity newElement = UMLFactory.eINSTANCE.createActivity();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Activity_2060(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Activity newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommandCN.java
deleted file mode 100644
index 38d2f2978b6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ActivityCompositeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ActivityCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActivity());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Activity newElement = UMLFactory.eINSTANCE.createActivity();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Activity_3072(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Activity newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommand.java
deleted file mode 100644
index fa759fb9fb2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Actor;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ActorCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ActorCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActor());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Actor newElement = UMLFactory.eINSTANCE.createActor();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Actor_2077(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Actor newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommandCN.java
deleted file mode 100644
index 45cc0b38e79..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Actor;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ActorCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ActorCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActor());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Actor newElement = UMLFactory.eINSTANCE.createActor();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Actor_3091(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Actor newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AnyReceiveEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AnyReceiveEventCreateCommand.java
deleted file mode 100644
index 744f0df133d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AnyReceiveEventCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.AnyReceiveEvent;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class AnyReceiveEventCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public AnyReceiveEventCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getAnyReceiveEvent());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		AnyReceiveEvent newElement = UMLFactory.eINSTANCE.createAnyReceiveEvent();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_AnyReceiveEvent_2085(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(AnyReceiveEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommand.java
deleted file mode 100644
index eab8c17ca12..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Artifact;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ArtifactCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ArtifactCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getArtifact());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Artifact newElement = UMLFactory.eINSTANCE.createArtifact();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Artifact_2079(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Artifact newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommandCN.java
deleted file mode 100644
index f0e6aef09c6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Artifact;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ArtifactCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ArtifactCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getArtifact());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Artifact newElement = UMLFactory.eINSTANCE.createArtifact();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Artifact_3093(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Artifact newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CallEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CallEventCreateCommand.java
deleted file mode 100644
index 89ffdf5327a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CallEventCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.CallEvent;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CallEventCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public CallEventCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCallEvent());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		CallEvent newElement = UMLFactory.eINSTANCE.createCallEvent();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_CallEvent_2084(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(CallEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ChangeEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ChangeEventCreateCommand.java
deleted file mode 100644
index dc6aa627b43..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ChangeEventCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.ChangeEvent;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ChangeEventCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ChangeEventCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getChangeEvent());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		ChangeEvent newElement = UMLFactory.eINSTANCE.createChangeEvent();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_ChangeEvent_2088(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ChangeEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommand.java
deleted file mode 100644
index 12515f98ed9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ClassCompositeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ClassCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getClass_());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Class newElement = UMLFactory.eINSTANCE.createClass();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Class_2073(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Class newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommandCN.java
deleted file mode 100644
index f4a5d611029..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommandCN.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ClassCompositeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ClassCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getClass_());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Class newElement = UMLFactory.eINSTANCE.createClass();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Class_3085(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Class newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommand.java
deleted file mode 100644
index 2fbf21854a5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Collaboration;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CollaborationCompositeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public CollaborationCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCollaboration());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Collaboration newElement = UMLFactory.eINSTANCE.createCollaboration();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Collaboration_2075(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Collaboration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommandCN.java
deleted file mode 100644
index fc26763c477..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Collaboration;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CollaborationCompositeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public CollaborationCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCollaboration());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Collaboration newElement = UMLFactory.eINSTANCE.createCollaboration();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Collaboration_3086(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Collaboration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationRoleCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationRoleCreateCommandCN.java
deleted file mode 100644
index 558672375e4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationRoleCreateCommandCN.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.ConnectableElement;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CollaborationRoleCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public CollaborationRoleCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConnectableElement());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		throw new UnsupportedOperationException("Unimplemented operation (abstract domain element).");

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ConnectableElement newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationUseCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationUseCreateCommandCN.java
deleted file mode 100644
index 98b8e511f26..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationUseCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.CollaborationUse;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CollaborationUseCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public CollaborationUseCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCollaborationUse());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		CollaborationUse newElement = UMLFactory.eINSTANCE.createCollaborationUse();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Classifier qualifiedTarget = (Classifier) target;

-				qualifiedTarget.getCollaborationUses()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_CollaborationUse_3071(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(CollaborationUse newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementCreateCommand.java
deleted file mode 100644
index ebd0745e2e0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementCreateCommand.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * @generated

- */

-public class CommentAnnotatedElementCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public CommentAnnotatedElementCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof Comment) {

-			return false;

-		}

-		if (target != null && false == target instanceof Element) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateCommentAnnotatedElement_4002(getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		if (getSource() != null && getTarget() != null) {

-			getSource().getAnnotatedElements()

-					.add(getTarget());

-		}

-		return CommandResult.newOKCommandResult();

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Comment getSource() {

-		return (Comment) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Element getTarget() {

-		return (Element) target;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementReorientCommand.java
deleted file mode 100644
index 8536d42b66e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementReorientCommand.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * @generated

- */

-public class CommentAnnotatedElementReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject referenceOwner;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public CommentAnnotatedElementReorientCommand(ReorientReferenceRelationshipRequest request) {

-		super(request.getLabel(), null, request);

-		reorientDirection = request.getDirection();

-		referenceOwner = request.getReferenceOwner();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == referenceOwner instanceof Comment) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof Element && newEnd instanceof Comment)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistCommentAnnotatedElement_4002(getNewSource(), getOldTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Element && newEnd instanceof Element)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistCommentAnnotatedElement_4002(getOldSource(), getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getOldSource().getAnnotatedElements()

-				.remove(getOldTarget());

-		getNewSource().getAnnotatedElements()

-				.add(getOldTarget());

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getOldSource().getAnnotatedElements()

-				.remove(getOldTarget());

-		getOldSource().getAnnotatedElements()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Comment getOldSource() {

-		return (Comment) referenceOwner;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Comment getNewSource() {

-		return (Comment) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Element getOldTarget() {

-		return (Element) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Element getNewTarget() {

-		return (Element) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommand.java
deleted file mode 100644
index 066e2ff7af1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CommentCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public CommentCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Comment newElement = UMLFactory.eINSTANCE.createComment();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Element qualifiedTarget = (Element) target;

-				qualifiedTarget.getOwnedComments()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Comment_2109(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Comment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommandCN.java
deleted file mode 100644
index 4b92696a8ab..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CommentCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public CommentCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Comment newElement = UMLFactory.eINSTANCE.createComment();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Element qualifiedTarget = (Element) target;

-				qualifiedTarget.getOwnedComments()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Comment_3097(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Comment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommand.java
deleted file mode 100644
index 0e0fb5cfe55..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Component;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentCompositeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ComponentCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComponent());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Component newElement = UMLFactory.eINSTANCE.createComponent();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Component_2069(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Component newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommandCN.java
deleted file mode 100644
index a4f390fe7d2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Component;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ComponentCompositeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ComponentCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComponent());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Component newElement = UMLFactory.eINSTANCE.createComponent();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Component_3081(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Component newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationCreateCommand.java
deleted file mode 100644
index fcdd6f82dc3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationCreateCommand.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.ComponentRealization;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class ComponentRealizationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public ComponentRealizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateComponentRealization_4004(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		ComponentRealization newElement = UMLFactory.eINSTANCE.createComponentRealization();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_ComponentRealization_4004(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ComponentRealization newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationReorientCommand.java
deleted file mode 100644
index cd3d91572b1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.ComponentRealization;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class ComponentRealizationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public ComponentRealizationReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof ComponentRealization) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistComponentRealization_4004(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistComponentRealization_4004(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ComponentRealization getLink() {

-		return (ComponentRealization) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorCreateCommand.java
deleted file mode 100644
index ed920fd120f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorCreateCommand.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Connector;

-import org.eclipse.uml2.uml.ConnectorEnd;

-import org.eclipse.uml2.uml.StructuredClassifier;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class ConnectorCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected StructuredClassifier container;

-

-	/**

-	 * @generated

-	 */

-	public ConnectorCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof ConnectorEnd) {

-			return false;

-		}

-		if (target != null && false == target instanceof ConnectorEnd) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateConnector_4013(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		Connector newElement = UMLFactory.eINSTANCE.createConnector();

-		getContainer().getOwnedConnectors()

-				.add(newElement);

-		newElement.getEnds()

-				.add(getSource());

-		newElement.getEnds()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Connector_4013(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Connector newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ConnectorEnd getSource() {

-		return (ConnectorEnd) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ConnectorEnd getTarget() {

-		return (ConnectorEnd) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public StructuredClassifier getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected StructuredClassifier deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof StructuredClassifier) {

-				return (StructuredClassifier) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorReorientCommand.java
deleted file mode 100644
index f5497572f48..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Connector;

-import org.eclipse.uml2.uml.ConnectorEnd;

-import org.eclipse.uml2.uml.StructuredClassifier;

-

-/**

- * @generated

- */

-public class ConnectorReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public ConnectorReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Connector) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {

-			return false;

-		}

-		if (getLink().getEnds()

-				.size() != 1) {

-			return false;

-		}

-		ConnectorEnd target = getLink().getEnds()

-				.get(0);

-		if (!(getLink().eContainer() instanceof StructuredClassifier)) {

-			return false;

-		}

-		StructuredClassifier container = (StructuredClassifier) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConnector_4013(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {

-			return false;

-		}

-		if (getLink().getEnds()

-				.size() != 1) {

-			return false;

-		}

-		ConnectorEnd source = getLink().getEnds()

-				.get(0);

-		if (!(getLink().eContainer() instanceof StructuredClassifier)) {

-			return false;

-		}

-		StructuredClassifier container = (StructuredClassifier) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConnector_4013(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getEnds()

-				.remove(getOldSource());

-		getLink().getEnds()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getEnds()

-				.remove(getOldTarget());

-		getLink().getEnds()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Connector getLink() {

-		return (Connector) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ConnectorEnd getOldSource() {

-		return (ConnectorEnd) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ConnectorEnd getNewSource() {

-		return (ConnectorEnd) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ConnectorEnd getOldTarget() {

-		return (ConnectorEnd) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ConnectorEnd getNewTarget() {

-		return (ConnectorEnd) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementCreateCommand.java
deleted file mode 100644
index a391f9cf5ee..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementCreateCommand.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * @generated

- */

-public class ConstraintConstrainedElementCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public ConstraintConstrainedElementCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof Constraint) {

-			return false;

-		}

-		if (target != null && false == target instanceof Element) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateConstraintConstrainedElement_4003(getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		if (getSource() != null && getTarget() != null) {

-			getSource().getConstrainedElements()

-					.add(getTarget());

-		}

-		return CommandResult.newOKCommandResult();

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Constraint getSource() {

-		return (Constraint) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Element getTarget() {

-		return (Element) target;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementReorientCommand.java
deleted file mode 100644
index 8f64ecdfdab..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementReorientCommand.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * @generated

- */

-public class ConstraintConstrainedElementReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject referenceOwner;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public ConstraintConstrainedElementReorientCommand(ReorientReferenceRelationshipRequest request) {

-		super(request.getLabel(), null, request);

-		reorientDirection = request.getDirection();

-		referenceOwner = request.getReferenceOwner();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == referenceOwner instanceof Constraint) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof Element && newEnd instanceof Constraint)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConstraintConstrainedElement_4003(getNewSource(), getOldTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Element && newEnd instanceof Element)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConstraintConstrainedElement_4003(getOldSource(), getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getOldSource().getConstrainedElements()

-				.remove(getOldTarget());

-		getNewSource().getConstrainedElements()

-				.add(getOldTarget());

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getOldSource().getConstrainedElements()

-				.remove(getOldTarget());

-		getOldSource().getConstrainedElements()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Constraint getOldSource() {

-		return (Constraint) referenceOwner;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Constraint getNewSource() {

-		return (Constraint) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Element getOldTarget() {

-		return (Element) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Element getNewTarget() {

-		return (Element) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommand.java
deleted file mode 100644
index 7fd1b8e43b8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ConstraintCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Constraint_2114(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Constraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommandCN.java
deleted file mode 100644
index e383b0f8e5a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ConstraintCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Constraint_3120(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Constraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommand.java
deleted file mode 100644
index 87d453990af..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DataTypeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DataTypeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDataType());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		DataType newElement = UMLFactory.eINSTANCE.createDataType();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_DataType_2068(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DataType newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommandCN.java
deleted file mode 100644
index 6f21fee4684..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DataTypeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DataTypeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDataType());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		DataType newElement = UMLFactory.eINSTANCE.createDataType();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_DataType_3080(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DataType newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyCreateCommand.java
deleted file mode 100644
index 12b31d4965f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyCreateCommand.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class DependencyCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public DependencyCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDependency_4010(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		Dependency newElement = UMLFactory.eINSTANCE.createDependency();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Dependency_4010(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Dependency newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyReorientCommand.java
deleted file mode 100644
index 282c09d3662..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class DependencyReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public DependencyReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Dependency) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4010(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4010(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Dependency getLink() {

-		return (Dependency) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentCreateCommand.java
deleted file mode 100644
index 0a48fe3ab5b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentCreateCommand.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Deployment;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class DeploymentCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public DeploymentCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDeployment_4009(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		Deployment newElement = UMLFactory.eINSTANCE.createDeployment();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Deployment_4009(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Deployment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentReorientCommand.java
deleted file mode 100644
index ba38f943933..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Deployment;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class DeploymentReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public DeploymentReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Deployment) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDeployment_4009(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDeployment_4009(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Deployment getLink() {

-		return (Deployment) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommand.java
deleted file mode 100644
index 6e79dcfc56a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DeploymentSpecification;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DeploymentSpecificationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DeploymentSpecificationCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDeploymentSpecification());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		DeploymentSpecification newElement = UMLFactory.eINSTANCE.createDeploymentSpecification();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_DeploymentSpecification_2078(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DeploymentSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommandCN.java
deleted file mode 100644
index 8a0295c4f3a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.DeploymentSpecification;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DeploymentSpecificationCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DeploymentSpecificationCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDeploymentSpecification());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		DeploymentSpecification newElement = UMLFactory.eINSTANCE.createDeploymentSpecification();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_DeploymentSpecification_3092(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DeploymentSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommand.java
deleted file mode 100644
index 40d61ad5677..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Device;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DeviceCompositeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DeviceCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDevice());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Device newElement = UMLFactory.eINSTANCE.createDevice();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Device_2070(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Device newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommandCN.java
deleted file mode 100644
index 83b1bbc22e8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Device;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DeviceCompositeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DeviceCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDevice());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Device newElement = UMLFactory.eINSTANCE.createDevice();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Device_3082(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Device newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommand.java
deleted file mode 100644
index a1a169168f7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DurationConstraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DurationConstraintCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DurationConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_DurationConstraint_2110(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DurationConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommandCN.java
deleted file mode 100644
index f2a7d6bdcf8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DurationConstraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DurationConstraintCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DurationConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_DurationConstraint_3116(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DurationConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationCreateCommand.java
deleted file mode 100644
index 3bb0f8740f4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Duration;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DurationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DurationCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDuration());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Duration newElement = UMLFactory.eINSTANCE.createDuration();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Duration_2104(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Duration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationIntervalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationIntervalCreateCommand.java
deleted file mode 100644
index 115201adef6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationIntervalCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DurationInterval;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DurationIntervalCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DurationIntervalCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationInterval());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		DurationInterval newElement = UMLFactory.eINSTANCE.createDurationInterval();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_DurationInterval_2106(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DurationInterval newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationCreateCommand.java
deleted file mode 100644
index fb223bfe34c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DurationObservation;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DurationObservationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DurationObservationCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationObservation());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		DurationObservation newElement = UMLFactory.eINSTANCE.createDurationObservation();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_DurationObservation_2093(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DurationObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventCreateCommand.java
deleted file mode 100644
index 947170acb69..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventCreateCommand.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.DurationObservation;

-import org.eclipse.uml2.uml.NamedElement;

-

-/**

- * @generated

- */

-public class DurationObservationEventCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public DurationObservationEventCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof DurationObservation) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDurationObservationEvent_4019(getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		if (getSource() != null && getTarget() != null) {

-			getSource().getEvents()

-					.add(getTarget());

-		}

-		return CommandResult.newOKCommandResult();

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DurationObservation getSource() {

-		return (DurationObservation) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventReorientCommand.java
deleted file mode 100644
index 55f88c9f503..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventReorientCommand.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.DurationObservation;

-import org.eclipse.uml2.uml.NamedElement;

-

-/**

- * @generated

- */

-public class DurationObservationEventReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject referenceOwner;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public DurationObservationEventReorientCommand(ReorientReferenceRelationshipRequest request) {

-		super(request.getLabel(), null, request);

-		reorientDirection = request.getDirection();

-		referenceOwner = request.getReferenceOwner();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == referenceOwner instanceof DurationObservation) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof DurationObservation)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDurationObservationEvent_4019(getNewSource(), getOldTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDurationObservationEvent_4019(getOldSource(), getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getOldSource().getEvents()

-				.remove(getOldTarget());

-		getNewSource().getEvents()

-				.add(getOldTarget());

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getOldSource().getEvents()

-				.remove(getOldTarget());

-		getOldSource().getEvents()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DurationObservation getOldSource() {

-		return (DurationObservation) referenceOwner;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DurationObservation getNewSource() {

-		return (DurationObservation) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommand.java
deleted file mode 100644
index 456d271a7e4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class EnumerationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public EnumerationCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getEnumeration());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Enumeration newElement = UMLFactory.eINSTANCE.createEnumeration();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Enumeration_2067(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Enumeration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommandCN.java
deleted file mode 100644
index 709315b1f60..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class EnumerationCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public EnumerationCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getEnumeration());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Enumeration newElement = UMLFactory.eINSTANCE.createEnumeration();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Enumeration_3079(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Enumeration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationLiteralCreateCommandCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationLiteralCreateCommandCLN.java
deleted file mode 100644
index e70a0ca036b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationLiteralCreateCommandCLN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class EnumerationLiteralCreateCommandCLN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public EnumerationLiteralCreateCommandCLN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getEnumerationLiteral());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		EnumerationLiteral newElement = UMLFactory.eINSTANCE.createEnumerationLiteral();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Enumeration qualifiedTarget = (Enumeration) target;

-				qualifiedTarget.getOwnedLiterals()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_EnumerationLiteral_3066(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(EnumerationLiteral newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommand.java
deleted file mode 100644
index 934c8511c1b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.ExecutionEnvironment;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ExecutionEnvironmentCompositeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ExecutionEnvironmentCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getExecutionEnvironment());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		ExecutionEnvironment newElement = UMLFactory.eINSTANCE.createExecutionEnvironment();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_ExecutionEnvironment_2071(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ExecutionEnvironment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommandCN.java
deleted file mode 100644
index 72509273344..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.ExecutionEnvironment;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ExecutionEnvironmentCompositeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ExecutionEnvironmentCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getExecutionEnvironment());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		ExecutionEnvironment newElement = UMLFactory.eINSTANCE.createExecutionEnvironment();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_ExecutionEnvironment_3083(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ExecutionEnvironment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExpressionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExpressionCreateCommand.java
deleted file mode 100644
index d12098fcfab..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExpressionCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Expression;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ExpressionCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ExpressionCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getExpression());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Expression newElement = UMLFactory.eINSTANCE.createExpression();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Expression_2103(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Expression newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommand.java
deleted file mode 100644
index 199596d7dd2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.FunctionBehavior;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class FunctionBehaviorCompositeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public FunctionBehaviorCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getFunctionBehavior());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		FunctionBehavior newElement = UMLFactory.eINSTANCE.createFunctionBehavior();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_FunctionBehavior_2064(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(FunctionBehavior newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommandCN.java
deleted file mode 100644
index ef708e95865..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.FunctionBehavior;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class FunctionBehaviorCompositeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public FunctionBehaviorCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getFunctionBehavior());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		FunctionBehavior newElement = UMLFactory.eINSTANCE.createFunctionBehavior();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_FunctionBehavior_3076(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(FunctionBehavior newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationCreateCommand.java
deleted file mode 100644
index 8bcc9233b21..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationCreateCommand.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Generalization;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class GeneralizationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Classifier container;

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof Classifier) {

-			return false;

-		}

-		if (target != null && false == target instanceof Classifier) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateGeneralization_4015(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		Generalization newElement = UMLFactory.eINSTANCE.createGeneralization();

-		getContainer().getGeneralizations()

-				.add(newElement);

-		newElement.setSpecific(

-				getSource()

-				);

-		newElement.setGeneral(

-				getTarget()

-				);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Generalization newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getSource() {

-		return (Classifier) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getTarget() {

-		return (Classifier) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Classifier getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Classifier deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof Classifier) {

-				return (Classifier) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationReorientCommand.java
deleted file mode 100644
index 44007bb86ac..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationReorientCommand.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Generalization;

-

-/**

- * @generated

- */

-public class GeneralizationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Generalization) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof Classifier && newEnd instanceof Classifier)) {

-			return false;

-		}

-		Classifier target = getLink().getGeneral();

-		if (!(getLink().eContainer() instanceof Classifier)) {

-			return false;

-		}

-		Classifier container = (Classifier) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistGeneralization_4015(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Classifier && newEnd instanceof Classifier)) {

-			return false;

-		}

-		Classifier source = getLink().getSpecific();

-		if (!(getLink().eContainer() instanceof Classifier)) {

-			return false;

-		}

-		Classifier container = (Classifier) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistGeneralization_4015(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().setSpecific(

-				getNewSource()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().setGeneral(

-				getNewTarget()

-				);

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Generalization getLink() {

-		return (Generalization) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getOldSource() {

-		return (Classifier) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getNewSource() {

-		return (Classifier) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getOldTarget() {

-		return (Classifier) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getNewTarget() {

-		return (Classifier) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowCreateCommand.java
deleted file mode 100644
index d240f2b22e0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowCreateCommand.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.InformationFlow;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class InformationFlowCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public InformationFlowCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateInformationFlow_4021(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		InformationFlow newElement = UMLFactory.eINSTANCE.createInformationFlow();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getInformationSources()

-				.add(getSource());

-		newElement.getInformationTargets()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_InformationFlow_4021(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(InformationFlow newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowReorientCommand.java
deleted file mode 100644
index 51daa602f5c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.InformationFlow;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class InformationFlowReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public InformationFlowReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof InformationFlow) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getInformationTargets()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getInformationTargets()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInformationFlow_4021(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getInformationSources()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getInformationSources()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInformationFlow_4021(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getInformationSources()

-				.remove(getOldSource());

-		getLink().getInformationSources()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getInformationTargets()

-				.remove(getOldTarget());

-		getLink().getInformationTargets()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected InformationFlow getLink() {

-		return (InformationFlow) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommand.java
deleted file mode 100644
index 05c80ab5420..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.InformationItem;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InformationItemCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InformationItemCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInformationItem());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		InformationItem newElement = UMLFactory.eINSTANCE.createInformationItem();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_InformationItem_2080(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(InformationItem newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommandCN.java
deleted file mode 100644
index 8d304df6c33..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.InformationItem;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InformationItemCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InformationItemCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInformationItem());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		InformationItem newElement = UMLFactory.eINSTANCE.createInformationItem();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_InformationItem_3094(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(InformationItem newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InstanceValueCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InstanceValueCreateCommand.java
deleted file mode 100644
index 1b299639e92..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InstanceValueCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.InstanceValue;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InstanceValueCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InstanceValueCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInstanceValue());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		InstanceValue newElement = UMLFactory.eINSTANCE.createInstanceValue();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_InstanceValue_2108(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(InstanceValue newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommand.java
deleted file mode 100644
index 7dc89ba9adf..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InteractionCompositeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InteractionCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Interaction_2061(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Interaction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommandCN.java
deleted file mode 100644
index f78e10a932a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InteractionCompositeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InteractionCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Interaction_3073(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Interaction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommand.java
deleted file mode 100644
index d2055558e88..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.InteractionConstraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InteractionConstraintCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InteractionConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteractionConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		InteractionConstraint newElement = UMLFactory.eINSTANCE.createInteractionConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_InteractionConstraint_2113(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(InteractionConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommandCN.java
deleted file mode 100644
index 331473fee5a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.InteractionConstraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InteractionConstraintCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InteractionConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteractionConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		InteractionConstraint newElement = UMLFactory.eINSTANCE.createInteractionConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_InteractionConstraint_3119(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(InteractionConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommand.java
deleted file mode 100644
index 8c6e483e5c4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterface());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Interface newElement = UMLFactory.eINSTANCE.createInterface();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Interface_2076(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Interface newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommandCN.java
deleted file mode 100644
index cfba0a72601..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InterfaceCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterface());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Interface newElement = UMLFactory.eINSTANCE.createInterface();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Interface_3087(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Interface newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationCreateCommand.java
deleted file mode 100644
index 1af9688ffde..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationCreateCommand.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.InterfaceRealization;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class InterfaceRealizationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceRealizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateInterfaceRealization_4005(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		InterfaceRealization newElement = UMLFactory.eINSTANCE.createInterfaceRealization();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_InterfaceRealization_4005(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(InterfaceRealization newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationReorientCommand.java
deleted file mode 100644
index 852fc87de2d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.InterfaceRealization;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class InterfaceRealizationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public InterfaceRealizationReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof InterfaceRealization) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInterfaceRealization_4005(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInterfaceRealization_4005(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected InterfaceRealization getLink() {

-		return (InterfaceRealization) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommand.java
deleted file mode 100644
index 0a96e29024c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.IntervalConstraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class IntervalConstraintCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public IntervalConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getIntervalConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		IntervalConstraint newElement = UMLFactory.eINSTANCE.createIntervalConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_IntervalConstraint_2112(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(IntervalConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommandCN.java
deleted file mode 100644
index 3a4397ff2ad..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.IntervalConstraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class IntervalConstraintCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public IntervalConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getIntervalConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		IntervalConstraint newElement = UMLFactory.eINSTANCE.createIntervalConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_IntervalConstraint_3118(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(IntervalConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalCreateCommand.java
deleted file mode 100644
index f884b2e087b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interval;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class IntervalCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public IntervalCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterval());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Interval newElement = UMLFactory.eINSTANCE.createInterval();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Interval_2107(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Interval newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralBooleanCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralBooleanCreateCommand.java
deleted file mode 100644
index 946acc207de..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralBooleanCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.LiteralBoolean;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class LiteralBooleanCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public LiteralBooleanCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralBoolean());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		LiteralBoolean newElement = UMLFactory.eINSTANCE.createLiteralBoolean();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_LiteralBoolean_2095(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(LiteralBoolean newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralIntegerCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralIntegerCreateCommand.java
deleted file mode 100644
index cc7643119d0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralIntegerCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.LiteralInteger;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class LiteralIntegerCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public LiteralIntegerCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralInteger());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		LiteralInteger newElement = UMLFactory.eINSTANCE.createLiteralInteger();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_LiteralInteger_2096(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(LiteralInteger newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralNullCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralNullCreateCommand.java
deleted file mode 100644
index a66350229c6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralNullCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.LiteralNull;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class LiteralNullCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public LiteralNullCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralNull());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		LiteralNull newElement = UMLFactory.eINSTANCE.createLiteralNull();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_LiteralNull_2097(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(LiteralNull newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralStringCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralStringCreateCommand.java
deleted file mode 100644
index 21aa00c12bc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralStringCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.LiteralString;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class LiteralStringCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public LiteralStringCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralString());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		LiteralString newElement = UMLFactory.eINSTANCE.createLiteralString();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_LiteralString_2098(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(LiteralString newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralUnlimitedNaturalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralUnlimitedNaturalCreateCommand.java
deleted file mode 100644
index d0ad24c4a58..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralUnlimitedNaturalCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.LiteralUnlimitedNatural;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class LiteralUnlimitedNaturalCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public LiteralUnlimitedNaturalCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralUnlimitedNatural());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		LiteralUnlimitedNatural newElement = UMLFactory.eINSTANCE.createLiteralUnlimitedNatural();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_LiteralUnlimitedNatural_2099(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(LiteralUnlimitedNatural newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationCreateCommand.java
deleted file mode 100644
index 98e8b232ee0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationCreateCommand.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Manifestation;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class ManifestationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public ManifestationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateManifestation_4012(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		Manifestation newElement = UMLFactory.eINSTANCE.createManifestation();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Manifestation_4012(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Manifestation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationReorientCommand.java
deleted file mode 100644
index 29fb1d7f210..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Manifestation;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class ManifestationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public ManifestationReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Manifestation) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistManifestation_4012(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistManifestation_4012(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Manifestation getLink() {

-		return (Manifestation) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommand.java
deleted file mode 100644
index f2e43b0beab..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Node;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class NodeCompositeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NodeCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getNode());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Node newElement = UMLFactory.eINSTANCE.createNode();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Node_2072(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Node newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommandCN.java
deleted file mode 100644
index ef976cf2997..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Node;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class NodeCompositeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public NodeCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getNode());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Node newElement = UMLFactory.eINSTANCE.createNode();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Node_3084(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Node newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommand.java
deleted file mode 100644
index 54c71ba5575..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.OpaqueBehavior;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class OpaqueBehaviorCompositeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public OpaqueBehaviorCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOpaqueBehavior());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		OpaqueBehavior newElement = UMLFactory.eINSTANCE.createOpaqueBehavior();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_OpaqueBehavior_2065(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(OpaqueBehavior newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommandCN.java
deleted file mode 100644
index b5d9afbcba5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.OpaqueBehavior;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class OpaqueBehaviorCompositeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public OpaqueBehaviorCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOpaqueBehavior());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		OpaqueBehavior newElement = UMLFactory.eINSTANCE.createOpaqueBehavior();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_OpaqueBehavior_3077(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(OpaqueBehavior newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueExpressionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueExpressionCreateCommand.java
deleted file mode 100644
index 3e110d866a4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueExpressionCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.OpaqueExpression;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class OpaqueExpressionCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public OpaqueExpressionCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOpaqueExpression());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		OpaqueExpression newElement = UMLFactory.eINSTANCE.createOpaqueExpression();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_OpaqueExpression_2101(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(OpaqueExpression newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OperationCreateCommandCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OperationCreateCommandCLN.java
deleted file mode 100644
index 77db9b80e22..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OperationCreateCommandCLN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class OperationCreateCommandCLN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public OperationCreateCommandCLN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOperation());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Operation newElement = UMLFactory.eINSTANCE.createOperation();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getOwnedOperations()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Operation_3102(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Operation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ParameterCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ParameterCreateCommand.java
deleted file mode 100644
index 4537d7e4dfb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ParameterCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Behavior;

-import org.eclipse.uml2.uml.Parameter;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ParameterCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ParameterCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getParameter());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Parameter newElement = UMLFactory.eINSTANCE.createParameter();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Behavior qualifiedTarget = (Behavior) target;

-				qualifiedTarget.getOwnedParameters()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Parameter_3088(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Parameter newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PortCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PortCreateCommand.java
deleted file mode 100644
index 02c4585de94..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PortCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.StructuredClassifier;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PortCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PortCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPort());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Port newElement = UMLFactory.eINSTANCE.createPort();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;

-				qualifiedTarget.getOwnedAttributes()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Port_3069(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Port newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommand.java
deleted file mode 100644
index 72ee3289231..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PrimitiveTypeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPrimitiveType());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		PrimitiveType newElement = UMLFactory.eINSTANCE.createPrimitiveType();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_PrimitiveType_2066(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(PrimitiveType newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommandCN.java
deleted file mode 100644
index a3ae7900d4d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PrimitiveTypeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPrimitiveType());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		PrimitiveType newElement = UMLFactory.eINSTANCE.createPrimitiveType();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_PrimitiveType_3078(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(PrimitiveType newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyCreateCommandCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyCreateCommandCLN.java
deleted file mode 100644
index e3838a8e81f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyCreateCommandCLN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.StructuredClassifier;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PropertyCreateCommandCLN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PropertyCreateCommandCLN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProperty());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Property newElement = UMLFactory.eINSTANCE.createProperty();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;

-				qualifiedTarget.getOwnedAttributes()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Property_3101(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Property newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyPartCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyPartCreateCommandCN.java
deleted file mode 100644
index 6e46c365cd4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyPartCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.StructuredClassifier;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PropertyPartCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PropertyPartCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProperty());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Property newElement = UMLFactory.eINSTANCE.createProperty();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;

-				qualifiedTarget.getOwnedAttributes()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Property_3070(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Property newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommand.java
deleted file mode 100644
index 76ff439b104..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.ProtocolStateMachine;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ProtocolStateMachineCompositeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ProtocolStateMachineCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProtocolStateMachine());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		ProtocolStateMachine newElement = UMLFactory.eINSTANCE.createProtocolStateMachine();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_ProtocolStateMachine_2062(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ProtocolStateMachine newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommandCN.java
deleted file mode 100644
index d25cb7d359b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.ProtocolStateMachine;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ProtocolStateMachineCompositeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ProtocolStateMachineCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProtocolStateMachine());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		ProtocolStateMachine newElement = UMLFactory.eINSTANCE.createProtocolStateMachine();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_ProtocolStateMachine_3074(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ProtocolStateMachine newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationCreateCommand.java
deleted file mode 100644
index 1cb52273fae..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationCreateCommand.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Realization;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class RealizationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public RealizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateRealization_4006(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		Realization newElement = UMLFactory.eINSTANCE.createRealization();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Realization_4006(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Realization newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationReorientCommand.java
deleted file mode 100644
index d5d442ff3ac..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Realization;

-

-/**

- * @generated

- */

-public class RealizationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public RealizationReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Realization) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistRealization_4006(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistRealization_4006(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Realization getLink() {

-		return (Realization) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationCreateCommand.java
deleted file mode 100644
index 936ca225258..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationCreateCommand.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.InformationItem;

-

-/**

- * @generated

- */

-public class RepresentationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public RepresentationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof InformationItem) {

-			return false;

-		}

-		if (target != null && false == target instanceof Classifier) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateInformationItemRepresented_4020(getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		if (getSource() != null && getTarget() != null) {

-			getSource().getRepresenteds()

-					.add(getTarget());

-		}

-		return CommandResult.newOKCommandResult();

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected InformationItem getSource() {

-		return (InformationItem) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getTarget() {

-		return (Classifier) target;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationReorientCommand.java
deleted file mode 100644
index 472cb220d9e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationReorientCommand.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.InformationItem;

-

-/**

- * @generated

- */

-public class RepresentationReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject referenceOwner;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public RepresentationReorientCommand(ReorientReferenceRelationshipRequest request) {

-		super(request.getLabel(), null, request);

-		reorientDirection = request.getDirection();

-		referenceOwner = request.getReferenceOwner();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == referenceOwner instanceof InformationItem) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof Classifier && newEnd instanceof InformationItem)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInformationItemRepresented_4020(getNewSource(), getOldTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof Classifier && newEnd instanceof Classifier)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInformationItemRepresented_4020(getOldSource(), getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getOldSource().getRepresenteds()

-				.remove(getOldTarget());

-		getNewSource().getRepresenteds()

-				.add(getOldTarget());

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getOldSource().getRepresenteds()

-				.remove(getOldTarget());

-		getOldSource().getRepresenteds()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected InformationItem getOldSource() {

-		return (InformationItem) referenceOwner;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected InformationItem getNewSource() {

-		return (InformationItem) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getOldTarget() {

-		return (Classifier) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Classifier getNewTarget() {

-		return (Classifier) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingCreateCommand.java
deleted file mode 100644
index c5b2dae8681..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingCreateCommand.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class RoleBindingCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public RoleBindingCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDependency_4017(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		Dependency newElement = UMLFactory.eINSTANCE.createDependency();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Dependency newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingReorientCommand.java
deleted file mode 100644
index 87712830b9c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-

-/**

- * @generated

- */

-public class RoleBindingReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public RoleBindingReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Dependency) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4017(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4017(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Dependency getLink() {

-		return (Dependency) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommand.java
deleted file mode 100644
index ee7c76ed3ac..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Signal;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class SignalCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public SignalCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getSignal());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Signal newElement = UMLFactory.eINSTANCE.createSignal();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Signal_2081(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Signal newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommandCN.java
deleted file mode 100644
index a0e302f68ec..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Signal;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class SignalCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public SignalCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getSignal());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Signal newElement = UMLFactory.eINSTANCE.createSignal();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Signal_3095(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Signal newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalEventCreateCommand.java
deleted file mode 100644
index 571edaffbc2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalEventCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.SignalEvent;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class SignalEventCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public SignalEventCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getSignalEvent());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		SignalEvent newElement = UMLFactory.eINSTANCE.createSignalEvent();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_SignalEvent_2083(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(SignalEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommand.java
deleted file mode 100644
index cced801abc4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.StateMachine;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class StateMachineCompositeCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public StateMachineCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateMachine());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		StateMachine newElement = UMLFactory.eINSTANCE.createStateMachine();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_StateMachine_2063(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(StateMachine newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommandCN.java
deleted file mode 100644
index dc54122595c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.StateMachine;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class StateMachineCompositeCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public StateMachineCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateMachine());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		StateMachine newElement = UMLFactory.eINSTANCE.createStateMachine();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_StateMachine_3075(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(StateMachine newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StringExpressionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StringExpressionCreateCommand.java
deleted file mode 100644
index f4a022d5331..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StringExpressionCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.StringExpression;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class StringExpressionCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public StringExpressionCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStringExpression());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		StringExpression newElement = UMLFactory.eINSTANCE.createStringExpression();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_StringExpression_2100(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(StringExpression newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionCreateCommand.java
deleted file mode 100644
index be362d2c41a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionCreateCommand.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Substitution;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * @generated

- */

-public class SubstitutionCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public SubstitutionCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateSubstitution_4011(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		Substitution newElement = UMLFactory.eINSTANCE.createSubstitution();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Substitution_4011(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Substitution newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionReorientCommand.java
deleted file mode 100644
index b4e349534b3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Substitution;

-

-/**

- * @generated

- */

-public class SubstitutionReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public SubstitutionReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Substitution) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistSubstitution_4011(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistSubstitution_4011(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Substitution getLink() {

-		return (Substitution) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommand.java
deleted file mode 100644
index b5fe60584a0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.TimeConstraint;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TimeConstraintCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public TimeConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		TimeConstraint newElement = UMLFactory.eINSTANCE.createTimeConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_TimeConstraint_2111(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TimeConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommandCN.java
deleted file mode 100644
index 12042a8b2f9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.TimeConstraint;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TimeConstraintCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public TimeConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		TimeConstraint newElement = UMLFactory.eINSTANCE.createTimeConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_TimeConstraint_3117(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TimeConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeEventCreateCommand.java
deleted file mode 100644
index 9e92b0d7f9a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeEventCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.TimeEvent;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TimeEventCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public TimeEventCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeEvent());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		TimeEvent newElement = UMLFactory.eINSTANCE.createTimeEvent();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_TimeEvent_2089(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TimeEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeExpressionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeExpressionCreateCommand.java
deleted file mode 100644
index fcec1bb3586..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeExpressionCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.TimeExpression;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TimeExpressionCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public TimeExpressionCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeExpression());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		TimeExpression newElement = UMLFactory.eINSTANCE.createTimeExpression();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_TimeExpression_2102(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TimeExpression newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeIntervalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeIntervalCreateCommand.java
deleted file mode 100644
index 93c8a48f4b7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeIntervalCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.TimeInterval;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TimeIntervalCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public TimeIntervalCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeInterval());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		TimeInterval newElement = UMLFactory.eINSTANCE.createTimeInterval();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_TimeInterval_2105(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TimeInterval newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationCreateCommand.java
deleted file mode 100644
index e62dce4fdb0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.TimeObservation;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TimeObservationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public TimeObservationCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeObservation());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		TimeObservation newElement = UMLFactory.eINSTANCE.createTimeObservation();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_TimeObservation_2094(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TimeObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventCreateCommand.java
deleted file mode 100644
index 682d3a59270..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventCreateCommand.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.TimeObservation;

-

-/**

- * @generated

- */

-public class TimeObservationEventCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	public TimeObservationEventCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof TimeObservation) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateTimeObservationEvent_4018(getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		if (getSource() != null && getTarget() != null) {

-			getSource().setEvent(

-					getTarget()

-					);

-		}

-		return CommandResult.newOKCommandResult();

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected TimeObservation getSource() {

-		return (TimeObservation) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventReorientCommand.java
deleted file mode 100644
index c480680ed97..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventReorientCommand.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.TimeObservation;

-

-/**

- * @generated

- */

-public class TimeObservationEventReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject referenceOwner;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public TimeObservationEventReorientCommand(ReorientReferenceRelationshipRequest request) {

-		super(request.getLabel(), null, request);

-		reorientDirection = request.getDirection();

-		referenceOwner = request.getReferenceOwner();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == referenceOwner instanceof TimeObservation) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof TimeObservation)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistTimeObservationEvent_4018(getNewSource(), getOldTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistTimeObservationEvent_4018(getOldSource(), getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getOldSource().setEvent(

-				null

-				);

-		getNewSource().setEvent(

-				getOldTarget()

-				);

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getOldSource().setEvent(

-				getNewTarget()

-				);

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected TimeObservation getOldSource() {

-		return (TimeObservation) referenceOwner;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected TimeObservation getNewSource() {

-		return (TimeObservation) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageCreateCommand.java
deleted file mode 100644
index 7e56f7a594b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageCreateCommand.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.Usage;

-

-/**

- * @generated

- */

-public class UsageCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	protected final EObject source;

-

-	/**

-	 * @generated

-	 */

-	protected final EObject target;

-

-	/**

-	 * @generated

-	 */

-	protected Package container;

-

-	/**

-	 * @generated

-	 */

-	public UsageCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

-		super(request.getLabel(), null, request);

-		this.source = source;

-		this.target = target;

-		container = deduceContainer(source, target);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && false == source instanceof NamedElement) {

-			return false;

-		}

-		if (target != null && false == target instanceof NamedElement) {

-			return false;

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		// target may be null here but it's possible to check constraint

-		if (getContainer() == null) {

-			return false;

-		}

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateUsage_4008(getContainer(), getSource(), getTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-

-		Usage newElement = UMLFactory.eINSTANCE.createUsage();

-		getContainer().getPackagedElements()

-				.add(newElement);

-		newElement.getClients()

-				.add(getSource());

-		newElement.getSuppliers()

-				.add(getTarget());

-		ElementInitializers.getInstance().init_Usage_4008(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Usage newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setElementToEdit(EObject element) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getSource() {

-		return (NamedElement) source;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getTarget() {

-		return (NamedElement) target;

-	}

-

-	/**

-	 * @generated

-	 */

-	public Package getContainer() {

-		return container;

-	}

-

-	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

-	 *

-	 * @generated

-	 */

-	protected Package deduceContainer(EObject source, EObject target) {

-		// Find container element for the new link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				return (Package) element;

-			}

-		}

-		return null;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageReorientCommand.java
deleted file mode 100644
index 74cfc0b67d8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageReorientCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Usage;

-

-/**

- * @generated

- */

-public class UsageReorientCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private final int reorientDirection;

-

-	/**

-	 * @generated

-	 */

-	private final EObject oldEnd;

-

-	/**

-	 * @generated

-	 */

-	private final EObject newEnd;

-

-	/**

-	 * @generated

-	 */

-	public UsageReorientCommand(ReorientRelationshipRequest request) {

-		super(request.getLabel(), request.getRelationship(), request);

-		reorientDirection = request.getDirection();

-		oldEnd = request.getOldRelationshipEnd();

-		newEnd = request.getNewRelationshipEnd();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		if (false == getElementToEdit() instanceof Usage) {

-			return false;

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return canReorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return canReorientTarget();

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientSource() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getSuppliers()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement target = getLink().getSuppliers()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistUsage_4008(container, getLink(), getNewSource(), target);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean canReorientTarget() {

-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

-			return false;

-		}

-		if (getLink().getClients()

-				.size() != 1) {

-			return false;

-		}

-		NamedElement source = getLink().getClients()

-				.get(0);

-		if (!(getLink().eContainer() instanceof Package)) {

-			return false;

-		}

-		Package container = (Package) getLink().eContainer();

-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistUsage_4008(container, getLink(), source, getNewTarget());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients()

-				.remove(getOldSource());

-		getLink().getClients()

-				.add(getNewSource());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers()

-				.remove(getOldTarget());

-		getLink().getSuppliers()

-				.add(getNewTarget());

-		return CommandResult.newOKCommandResult(getLink());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Usage getLink() {

-		return (Usage) getElementToEdit();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldSource() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewSource() {

-		return (NamedElement) newEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getOldTarget() {

-		return (NamedElement) oldEnd;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected NamedElement getNewTarget() {

-		return (NamedElement) newEnd;

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommand.java
deleted file mode 100644
index d700030932c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.UseCase;

-

-/**

- * @generated

- */

-public class UseCaseCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public UseCaseCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getUseCase());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		UseCase newElement = UMLFactory.eINSTANCE.createUseCase();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_UseCase_2082(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(UseCase newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommandCN.java
deleted file mode 100644
index 265c7762378..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommandCN.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.UseCase;

-

-/**

- * @generated

- */

-public class UseCaseCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public UseCaseCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getUseCase());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		UseCase newElement = UMLFactory.eINSTANCE.createUseCase();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_UseCase_3096(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(UseCase newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AbstractionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AbstractionEditHelper.java
deleted file mode 100644
index 78a13350a5f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AbstractionEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class AbstractionEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActivityEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActivityEditHelper.java
deleted file mode 100644
index e04a157b3fa..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActivityEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ActivityEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActorEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActorEditHelper.java
deleted file mode 100644
index 66cb3d573e4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActorEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ActorEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AnyReceiveEventEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AnyReceiveEventEditHelper.java
deleted file mode 100644
index e75db9762ce..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AnyReceiveEventEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class AnyReceiveEventEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ArtifactEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ArtifactEditHelper.java
deleted file mode 100644
index 6b229b2bc54..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ArtifactEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ArtifactEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CallEventEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CallEventEditHelper.java
deleted file mode 100644
index beef4985dde..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CallEventEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class CallEventEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ChangeEventEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ChangeEventEditHelper.java
deleted file mode 100644
index 6bfe78826f7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ChangeEventEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ChangeEventEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ClassEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ClassEditHelper.java
deleted file mode 100644
index ba987b3ad90..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ClassEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ClassEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationEditHelper.java
deleted file mode 100644
index 86428b21f1d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class CollaborationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationRoleEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationRoleEditHelper.java
deleted file mode 100644
index 1e6fca4f221..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationRoleEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class CollaborationRoleEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationUseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationUseEditHelper.java
deleted file mode 100644
index 01656a5557a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationUseEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class CollaborationUseEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CommentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CommentEditHelper.java
deleted file mode 100644
index 9283a2c8f01..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CommentEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class CommentEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentEditHelper.java
deleted file mode 100644
index ab6879385de..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ComponentEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentRealizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentRealizationEditHelper.java
deleted file mode 100644
index 8802044b642..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentRealizationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ComponentRealizationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConnectorEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConnectorEditHelper.java
deleted file mode 100644
index 3a65ce555a7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConnectorEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ConnectorEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConstraintEditHelper.java
deleted file mode 100644
index b175a718166..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConstraintEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ConstraintEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DataTypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DataTypeEditHelper.java
deleted file mode 100644
index 330c879c68a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DataTypeEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class DataTypeEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DependencyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DependencyEditHelper.java
deleted file mode 100644
index c4ecb65d20c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DependencyEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class DependencyEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentEditHelper.java
deleted file mode 100644
index 1e9248a78d8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class DeploymentEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentSpecificationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentSpecificationEditHelper.java
deleted file mode 100644
index 57b91e698de..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentSpecificationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class DeploymentSpecificationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeviceEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeviceEditHelper.java
deleted file mode 100644
index 4ba2dde52e7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeviceEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class DeviceEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationEditHelper.java
deleted file mode 100644
index 4ab4f01d676..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class DurationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationIntervalEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationIntervalEditHelper.java
deleted file mode 100644
index a9a3f1ac1df..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationIntervalEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class DurationIntervalEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationObservationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationObservationEditHelper.java
deleted file mode 100644
index 00e3f688a93..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationObservationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class DurationObservationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationEditHelper.java
deleted file mode 100644
index 19c1b80bede..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class EnumerationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationLiteralEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationLiteralEditHelper.java
deleted file mode 100644
index 60643ee8ba2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationLiteralEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class EnumerationLiteralEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExecutionEnvironmentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExecutionEnvironmentEditHelper.java
deleted file mode 100644
index 34b8d36404b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExecutionEnvironmentEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ExecutionEnvironmentEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExpressionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExpressionEditHelper.java
deleted file mode 100644
index cec2933aa48..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExpressionEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ExpressionEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/FunctionBehaviorEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/FunctionBehaviorEditHelper.java
deleted file mode 100644
index 91ae9c98fba..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/FunctionBehaviorEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class FunctionBehaviorEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/GeneralizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/GeneralizationEditHelper.java
deleted file mode 100644
index 07c7e73edbe..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/GeneralizationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class GeneralizationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationFlowEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationFlowEditHelper.java
deleted file mode 100644
index 08e5a0f1800..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationFlowEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class InformationFlowEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationItemEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationItemEditHelper.java
deleted file mode 100644
index 88223d2c0df..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationItemEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class InformationItemEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InstanceValueEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InstanceValueEditHelper.java
deleted file mode 100644
index 8b55481ff1a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InstanceValueEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class InstanceValueEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionConstraintEditHelper.java
deleted file mode 100644
index 497efb2961f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionConstraintEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class InteractionConstraintEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionEditHelper.java
deleted file mode 100644
index 179b9c189b3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class InteractionEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceEditHelper.java
deleted file mode 100644
index 55d6c6596e6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class InterfaceEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceRealizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceRealizationEditHelper.java
deleted file mode 100644
index 30cf0d7029c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceRealizationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class InterfaceRealizationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalConstraintEditHelper.java
deleted file mode 100644
index e4930240dc5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalConstraintEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class IntervalConstraintEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalEditHelper.java
deleted file mode 100644
index a4e15dc16e8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class IntervalEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralBooleanEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralBooleanEditHelper.java
deleted file mode 100644
index 7d555f941e5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralBooleanEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class LiteralBooleanEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralIntegerEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralIntegerEditHelper.java
deleted file mode 100644
index bbaeaeea541..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralIntegerEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class LiteralIntegerEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralNullEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralNullEditHelper.java
deleted file mode 100644
index 0440a92ffb5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralNullEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class LiteralNullEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralStringEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralStringEditHelper.java
deleted file mode 100644
index 322ac9f2c67..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralStringEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class LiteralStringEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralUnlimitedNaturalEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralUnlimitedNaturalEditHelper.java
deleted file mode 100644
index 11ba67dd843..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralUnlimitedNaturalEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class LiteralUnlimitedNaturalEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ManifestationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ManifestationEditHelper.java
deleted file mode 100644
index 84e9cdb55fb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ManifestationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ManifestationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/NodeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/NodeEditHelper.java
deleted file mode 100644
index c8b6e3d1695..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/NodeEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class NodeEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueBehaviorEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueBehaviorEditHelper.java
deleted file mode 100644
index 5aa254ecf6b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueBehaviorEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class OpaqueBehaviorEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueExpressionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueExpressionEditHelper.java
deleted file mode 100644
index 4ebcdbf046f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueExpressionEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class OpaqueExpressionEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PackageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PackageEditHelper.java
deleted file mode 100644
index cc25adb2765..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PackageEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class PackageEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ParameterEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ParameterEditHelper.java
deleted file mode 100644
index d989aefc15e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ParameterEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ParameterEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PortEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PortEditHelper.java
deleted file mode 100644
index 81e03ba9dea..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PortEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class PortEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PrimitiveTypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PrimitiveTypeEditHelper.java
deleted file mode 100644
index cd86a4b3c96..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PrimitiveTypeEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class PrimitiveTypeEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PropertyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PropertyEditHelper.java
deleted file mode 100644
index 866d84f30c1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PropertyEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class PropertyEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ProtocolStateMachineEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ProtocolStateMachineEditHelper.java
deleted file mode 100644
index 673a7cd113b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ProtocolStateMachineEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class ProtocolStateMachineEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RealizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RealizationEditHelper.java
deleted file mode 100644
index 5ba13dc97bc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RealizationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class RealizationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RoleBindingEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RoleBindingEditHelper.java
deleted file mode 100644
index d80caf99d0b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RoleBindingEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class RoleBindingEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEditHelper.java
deleted file mode 100644
index 2165f553165..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class SignalEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEventEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEventEditHelper.java
deleted file mode 100644
index ad38d247472..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEventEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class SignalEventEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StateMachineEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StateMachineEditHelper.java
deleted file mode 100644
index 70debb10e2e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StateMachineEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class StateMachineEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StringExpressionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StringExpressionEditHelper.java
deleted file mode 100644
index e8798f0900a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StringExpressionEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class StringExpressionEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SubstitutionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SubstitutionEditHelper.java
deleted file mode 100644
index 964f45fd0ac..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SubstitutionEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class SubstitutionEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeConstraintEditHelper.java
deleted file mode 100644
index fc5cd5a9e68..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeConstraintEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class TimeConstraintEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeEventEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeEventEditHelper.java
deleted file mode 100644
index 90f87c7a3b0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeEventEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class TimeEventEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeExpressionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeExpressionEditHelper.java
deleted file mode 100644
index 9b4d53b6feb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeExpressionEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class TimeExpressionEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeIntervalEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeIntervalEditHelper.java
deleted file mode 100644
index 5a41ab82d3a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeIntervalEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class TimeIntervalEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeObservationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeObservationEditHelper.java
deleted file mode 100644
index 9a8b166e5e3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeObservationEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class TimeObservationEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UMLBaseEditHelper.java
index 2e86ffe2c22..3c82d3d91cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UMLBaseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UMLBaseEditHelper.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UsageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UsageEditHelper.java
deleted file mode 100644
index 49d0f3d002f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UsageEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class UsageEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UseCaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UseCaseEditHelper.java
deleted file mode 100644
index 99c37e43334..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UseCaseEditHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

-

-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

-

-/**

- * @generated

- */

-public class UseCaseEditHelper extends UMLBaseEditHelper {

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
index 314618e9f0e..368289877e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java
index 20d891e96ab..42ca1df8646 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,11 +16,11 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.AbstractionItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -42,24 +42,21 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AbstractionItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeAbstractionLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeAbstractionLabelDisplayEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AbstractionNameEditPart) {

-			((AbstractionNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof AbstractionNameEditPart) {

+			((AbstractionNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

-		if (childEditPart instanceof AbstractionAppliedStereotypeEditPart) {

-			((AbstractionAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+		if(childEditPart instanceof AbstractionAppliedStereotypeEditPart) {

+			((AbstractionAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

@@ -67,9 +64,8 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -79,10 +75,10 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AbstractionNameEditPart) {

+		if(childEditPart instanceof AbstractionNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof AbstractionAppliedStereotypeEditPart) {

+		if(childEditPart instanceof AbstractionAppliedStereotypeEditPart) {

 			return true;

 		}

 		return false;

@@ -91,9 +87,8 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -101,13 +96,12 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new DashedEdgeFigure();

 	}

@@ -115,8 +109,7 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public DashedEdgeFigure getPrimaryShape() {

-		return (DashedEdgeFigure) getFigure();

+		return (DashedEdgeFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
index ea2e4760660..0fa09699379 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,31 +619,30 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -701,7 +650,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -711,13 +660,12 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -727,25 +675,20 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -755,13 +698,12 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -777,45 +719,38 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
index b5e13523e32..988b45970a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActivityCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ActivityCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7063;
-
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ActivityCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7063;

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ActivityCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
index e38081494d4..077dc9c11fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActivityCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ActivityCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7050;
-
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ActivityCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7050;

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ActivityCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
index 4afa7a0c9f9..c68c3bf46c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActivityCompositeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,25 +119,24 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ActivityCompositeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 				case ParameterEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -155,84 +156,67 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ActivityCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ActivityCompositeFigure getPrimaryShape() {

-		return (ActivityCompositeFigure) primaryShape;

+		return (ActivityCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ActivityCompositeNameEditPart) {

-			((ActivityCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ActivityCompositeNameEditPart) {

+			((ActivityCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof ActivityCompositeCompartmentEditPart) {

+		if(childEditPart instanceof ActivityCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((ActivityCompositeCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ActivityCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof ParameterEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -240,20 +224,20 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ActivityCompositeNameEditPart) {

+		if(childEditPart instanceof ActivityCompositeNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof ActivityCompositeCompartmentEditPart) {

+		if(childEditPart instanceof ActivityCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((ActivityCompositeCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((ActivityCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof ParameterEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -262,9 +246,8 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -273,9 +256,8 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -284,12 +266,11 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof ActivityCompositeCompartmentEditPart) {

+		if(editPart instanceof ActivityCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -298,21 +279,15 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ActivityCompositeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof ActivityCompositeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -320,29 +295,24 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -353,9 +323,8 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -364,9 +333,8 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -374,7 +342,6 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -382,17 +349,15 @@ public class ActivityCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityCompositeNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
index a6559d9f790..ae4e60eb6d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActivityCompositeItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,25 +119,24 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ActivityCompositeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 				case ParameterEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -155,84 +156,67 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ActivityCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ActivityCompositeFigure getPrimaryShape() {

-		return (ActivityCompositeFigure) primaryShape;

+		return (ActivityCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ActivityCompositeNameEditPartCN) {

-			((ActivityCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ActivityCompositeNameEditPartCN) {

+			((ActivityCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof ActivityCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof ActivityCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((ActivityCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ActivityCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof ParameterEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -240,20 +224,20 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ActivityCompositeNameEditPartCN) {

+		if(childEditPart instanceof ActivityCompositeNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof ActivityCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof ActivityCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((ActivityCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((ActivityCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof ParameterEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -262,9 +246,8 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -273,9 +256,8 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -284,12 +266,11 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof ActivityCompositeCompartmentEditPartCN) {

+		if(editPart instanceof ActivityCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -298,21 +279,15 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ActivityCompositeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof ActivityCompositeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -320,29 +295,24 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -353,9 +323,8 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -364,9 +333,8 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -374,7 +342,6 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -382,17 +349,15 @@ public class ActivityCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityCompositeNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPart.java
index e4cd2e78044..22076b20d06 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Activity_2060, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ActivityCompositeFloatingLabelEditPart extends FloatingLabelEditPar
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPartCN.java
index f44da5f3778..2a2b6e3b287 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Activity_3072, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ActivityCompositeFloatingLabelEditPartCN extends FloatingLabelEditP
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java
index 1ee60ee95bc..baadee471b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Activity_2060, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java
index dd942996947..e61f22cba06 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Activity_3072, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
index 42ae9548ad5..fdf978b8ea0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -33,6 +33,8 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -42,8 +44,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActorItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -77,14 +77,13 @@ public class ActorEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActorItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

@@ -98,22 +97,21 @@ public class ActorEditPart extends NodeEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ActorFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -135,31 +133,26 @@ public class ActorEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ActorNameEditPart) {

-			((ActorNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ActorNameEditPart) {

+			((ActorNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -167,7 +160,7 @@ public class ActorEditPart extends NodeEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ActorNameEditPart) {

+		if(childEditPart instanceof ActorNameEditPart) {

 			return true;

 		}

 		return false;

@@ -176,9 +169,8 @@ public class ActorEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -187,9 +179,8 @@ public class ActorEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -198,9 +189,8 @@ public class ActorEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -209,21 +199,15 @@ public class ActorEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ActorFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof ActorFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -231,29 +215,24 @@ public class ActorEditPart extends NodeEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -264,9 +243,8 @@ public class ActorEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -275,9 +253,8 @@ public class ActorEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -285,7 +262,6 @@ public class ActorEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -293,17 +269,15 @@ public class ActorEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActorNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
index 7d1f5c3a79c..8cb8730b00e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -33,6 +33,8 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -42,8 +44,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActorItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -77,14 +77,13 @@ public class ActorEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActorItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

@@ -98,22 +97,21 @@ public class ActorEditPartCN extends NodeEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ActorFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -135,31 +133,26 @@ public class ActorEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ActorNameEditPartCN) {

-			((ActorNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ActorNameEditPartCN) {

+			((ActorNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -167,7 +160,7 @@ public class ActorEditPartCN extends NodeEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ActorNameEditPartCN) {

+		if(childEditPart instanceof ActorNameEditPartCN) {

 			return true;

 		}

 		return false;

@@ -176,9 +169,8 @@ public class ActorEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -187,9 +179,8 @@ public class ActorEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -198,9 +189,8 @@ public class ActorEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -209,21 +199,15 @@ public class ActorEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ActorFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof ActorFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -231,29 +215,24 @@ public class ActorEditPartCN extends NodeEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -264,9 +243,8 @@ public class ActorEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -275,9 +253,8 @@ public class ActorEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -285,7 +262,6 @@ public class ActorEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -293,17 +269,15 @@ public class ActorEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActorNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPart.java
index f48315b4107..f25610f115a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ActorFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ActorFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2077, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActorFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ActorFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPartCN.java
index e418c8c6ce8..54d7328a01b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3091, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActorFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ActorFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java
index 3709db6bd9d..944687f095a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2077, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActorNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java
index 8cbcce3439e..7e9be3435d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3091, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActorNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
index c2c5febfe63..87a66a659d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.AnyReceiveEventItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AnyReceiveEventItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case AnyReceiveEventFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AnyReceiveEventNameEditPart) {

-			((AnyReceiveEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof AnyReceiveEventNameEditPart) {

+			((AnyReceiveEventNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof AnyReceiveEventNameEditPart) {

+		if(childEditPart instanceof AnyReceiveEventNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof AnyReceiveEventFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof AnyReceiveEventFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class AnyReceiveEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(AnyReceiveEventNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventFloatingLabelEditPart.java
index 6085d59ef36..03742612589 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.AnyReceiveEvent_2085, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AnyReceiveEventFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class AnyReceiveEventFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java
index 2e18338d8ac..ba96c17fffb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.AnyReceiveEvent_2085, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AnyReceiveEventNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
index 9189f903456..404a439ada2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -33,6 +33,8 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -42,8 +44,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ArtifactItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -77,14 +77,13 @@ public class ArtifactEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ArtifactItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

@@ -98,22 +97,21 @@ public class ArtifactEditPart extends NodeEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ArtifactFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -135,31 +133,26 @@ public class ArtifactEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ArtifactNameEditPart) {

-			((ArtifactNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ArtifactNameEditPart) {

+			((ArtifactNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -167,7 +160,7 @@ public class ArtifactEditPart extends NodeEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ArtifactNameEditPart) {

+		if(childEditPart instanceof ArtifactNameEditPart) {

 			return true;

 		}

 		return false;

@@ -176,9 +169,8 @@ public class ArtifactEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -187,9 +179,8 @@ public class ArtifactEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -198,9 +189,8 @@ public class ArtifactEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -209,21 +199,15 @@ public class ArtifactEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ArtifactFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof ArtifactFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -231,29 +215,24 @@ public class ArtifactEditPart extends NodeEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -264,9 +243,8 @@ public class ArtifactEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -275,9 +253,8 @@ public class ArtifactEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -285,7 +262,6 @@ public class ArtifactEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -293,17 +269,15 @@ public class ArtifactEditPart extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ArtifactNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
index 994c7d2c512..c25b4f51cb4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -33,6 +33,8 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -42,8 +44,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ArtifactItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -77,14 +77,13 @@ public class ArtifactEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ArtifactItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

@@ -98,22 +97,21 @@ public class ArtifactEditPartCN extends NodeEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ArtifactFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -135,31 +133,26 @@ public class ArtifactEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ArtifactNameEditPartCN) {

-			((ArtifactNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ArtifactNameEditPartCN) {

+			((ArtifactNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -167,7 +160,7 @@ public class ArtifactEditPartCN extends NodeEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ArtifactNameEditPartCN) {

+		if(childEditPart instanceof ArtifactNameEditPartCN) {

 			return true;

 		}

 		return false;

@@ -176,9 +169,8 @@ public class ArtifactEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -187,9 +179,8 @@ public class ArtifactEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -198,9 +189,8 @@ public class ArtifactEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -209,21 +199,15 @@ public class ArtifactEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ArtifactFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof ArtifactFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -231,29 +215,24 @@ public class ArtifactEditPartCN extends NodeEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -264,9 +243,8 @@ public class ArtifactEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -275,9 +253,8 @@ public class ArtifactEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -285,7 +262,6 @@ public class ArtifactEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -293,17 +269,15 @@ public class ArtifactEditPartCN extends NodeEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ArtifactNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPart.java
index 477db2c8da1..a3878f3eb1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Artifact_2079, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ArtifactFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ArtifactFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPartCN.java
index d36294e2dab..ce3d6a4061e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Artifact_3093, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ArtifactFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ArtifactFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java
index 3fc78bb7c72..b54edeb3068 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Artifact_2079, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ArtifactNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java
index fd7adc4f495..71cccffc027 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Artifact_3093, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ArtifactNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
index 8c97c20a028..8945223aa4f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -33,6 +33,7 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -75,10 +76,10 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(BehaviorSymbolEditPolicy.BEHAVIOR_SYMBOL, new BehaviorSymbolEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new NoConnectableEditPolicy());

@@ -95,22 +96,21 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case BehaviorPortFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -130,65 +130,53 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusRoundedNodeFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof BehaviorPortFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof BehaviorPortFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -196,27 +184,22 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		return nodeShape; // use nodeShape itself as contentPane

 	}

@@ -224,9 +207,8 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -235,9 +217,8 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -245,7 +226,6 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -253,17 +233,15 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(BehaviorPortFloatingLabelEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortFloatingLabelEditPart.java
index bd3a201c406..7fc63f8211b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,10 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class BehaviorPortFloatingLabelEditPart extends

-		FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class BehaviorPortFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -116,19 +113,15 @@ public class BehaviorPortFloatingLabelEditPart extends
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -146,7 +139,6 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -157,12 +149,11 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -170,26 +161,24 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -197,12 +186,12 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -210,12 +199,12 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -223,20 +212,19 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -247,7 +235,6 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -255,7 +242,6 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -287,12 +273,10 @@ public class BehaviorPortFloatingLabelEditPart extends
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -301,30 +285,26 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -337,31 +317,27 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -371,9 +347,8 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -382,7 +357,6 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -390,9 +364,8 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Node_3121, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.BehaviorPortFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -402,10 +375,8 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -434,8 +405,8 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -443,8 +414,8 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -453,56 +424,47 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -524,15 +486,14 @@ public class BehaviorPortFloatingLabelEditPart extends
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -546,7 +507,6 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -561,27 +521,26 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -589,18 +548,15 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -609,27 +565,19 @@ public class BehaviorPortFloatingLabelEditPart extends
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -637,7 +585,6 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -645,13 +592,12 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -661,10 +607,9 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -675,9 +620,8 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -698,31 +642,30 @@ public class BehaviorPortFloatingLabelEditPart extends
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -730,7 +673,7 @@ public class BehaviorPortFloatingLabelEditPart extends
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -740,13 +683,12 @@ public class BehaviorPortFloatingLabelEditPart extends
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -756,25 +698,20 @@ public class BehaviorPortFloatingLabelEditPart extends
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -784,13 +721,12 @@ public class BehaviorPortFloatingLabelEditPart extends
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -803,35 +739,29 @@ public class BehaviorPortFloatingLabelEditPart extends
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -844,7 +774,6 @@ public class BehaviorPortFloatingLabelEditPart extends
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -857,5 +786,4 @@ public class BehaviorPortFloatingLabelEditPart extends
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortLinkEditPart.java
index f1a2b7ba610..d84d1ba272a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortLinkEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -42,7 +42,6 @@ public class BehaviorPortLinkEditPart extends ConnectionEditPart implements ITre
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());

@@ -53,13 +52,12 @@ public class BehaviorPortLinkEditPart extends ConnectionEditPart implements ITre
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new PolylineConnectionEx();

 	}

@@ -67,8 +65,7 @@ public class BehaviorPortLinkEditPart extends ConnectionEditPart implements ITre
 	/**

 	 * @generated

 	 */

-	@Override

 	public PolylineConnectionEx getPrimaryShape() {

-		return (PolylineConnectionEx) getFigure();

+		return (PolylineConnectionEx)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
index a02cb1e3df7..840a1237eb0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CallEventItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CallEventItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case CallEventFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CallEventNameEditPart) {

-			((CallEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof CallEventNameEditPart) {

+			((CallEventNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CallEventNameEditPart) {

+		if(childEditPart instanceof CallEventNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof CallEventFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof CallEventFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class CallEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CallEventNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventFloatingLabelEditPart.java
index 72381108684..ff3d6ce52a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.CallEvent_2084, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CallEventFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class CallEventFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java
index 2051a2502ff..99cb6b6d694 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.CallEvent_2084, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CallEventNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
index 2501590c124..79d8872f5cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ChangeEventItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ChangeEventItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ChangeEventFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ChangeEventNameEditPart) {

-			((ChangeEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ChangeEventNameEditPart) {

+			((ChangeEventNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ChangeEventNameEditPart) {

+		if(childEditPart instanceof ChangeEventNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ChangeEventFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof ChangeEventFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class ChangeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ChangeEventNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventFloatingLabelEditPart.java
index 844926f4cd2..13d4cc36334 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ChangeEvent_2088, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ChangeEventFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ChangeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java
index d3754f415c8..850552f72b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ChangeEvent_2088, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ChangeEventNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
index b5585d31bf8..ca17558ce14 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ClassCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ClassCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7073;
-
-	/**
-	 * @generated
-	 */
-	public ClassCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ClassCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ClassCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7073;

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ClassCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
index 2be16f527b2..8b6d862177d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ClassCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ClassCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7060;
-
-	/**
-	 * @generated
-	 */
-	public ClassCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ClassCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ClassCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7060;

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ClassCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
index 0c75a5e5b47..656e97ba852 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,17 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ClassCompositeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -90,17 +91,16 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

 		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

@@ -119,24 +119,23 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ClassCompositeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -156,74 +155,61 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ClassCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ClassCompositeFigure getPrimaryShape() {

-		return (ClassCompositeFigure) primaryShape;

+		return (ClassCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ClassCompositeNameEditPart) {

-			((ClassCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ClassCompositeNameEditPart) {

+			((ClassCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof ClassCompositeCompartmentEditPart) {

+		if(childEditPart instanceof ClassCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((ClassCompositeCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ClassCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -231,16 +217,16 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ClassCompositeNameEditPart) {

+		if(childEditPart instanceof ClassCompositeNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof ClassCompositeCompartmentEditPart) {

+		if(childEditPart instanceof ClassCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((ClassCompositeCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((ClassCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -249,9 +235,8 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -260,9 +245,8 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -271,12 +255,11 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof ClassCompositeCompartmentEditPart) {

+		if(editPart instanceof ClassCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -285,21 +268,15 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ClassCompositeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof ClassCompositeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -307,29 +284,24 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -340,9 +312,8 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -351,9 +322,8 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -361,7 +331,6 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -369,17 +338,15 @@ public class ClassCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassCompositeNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
index f3fda4b3a78..b886905e937 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,17 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ClassCompositeItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -90,17 +91,16 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

 		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

@@ -119,24 +119,23 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ClassCompositeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -156,74 +155,61 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ClassCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ClassCompositeFigure getPrimaryShape() {

-		return (ClassCompositeFigure) primaryShape;

+		return (ClassCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ClassCompositeNameEditPartCN) {

-			((ClassCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ClassCompositeNameEditPartCN) {

+			((ClassCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof ClassCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof ClassCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((ClassCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ClassCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -231,16 +217,16 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ClassCompositeNameEditPartCN) {

+		if(childEditPart instanceof ClassCompositeNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof ClassCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof ClassCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((ClassCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((ClassCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -249,9 +235,8 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -260,9 +245,8 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -271,12 +255,11 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof ClassCompositeCompartmentEditPartCN) {

+		if(editPart instanceof ClassCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -285,21 +268,15 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ClassCompositeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof ClassCompositeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -307,29 +284,24 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -340,9 +312,8 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -351,9 +322,8 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -361,7 +331,6 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -369,17 +338,15 @@ public class ClassCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassCompositeNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPart.java
index 167de32b53d..5a393e0e450 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Class_2073, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ClassCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPartCN.java
index 0b2c7535aaa..c139b4ffa25 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3085, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ClassCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java
index bda42c7f20a..3417204858a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Class_2073, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java
index 7ac79c04068..c505e499c38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3085, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
index 01a1065be28..fabce9c38d7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
@@ -1,140 +1,125 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class CollaborationCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7075;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.CollaborationCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomCollaborationCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7075;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CollaborationCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
index aaf8de737af..a423e64ab49 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
@@ -1,140 +1,125 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class CollaborationCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7061;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.CollaborationCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomCollaborationCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7061;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CollaborationCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
index b0934f52b86..70d560216bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -48,7 +50,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEd
 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationCompositeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -82,10 +83,10 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -105,22 +106,21 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case CollaborationCompositeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -140,64 +140,55 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new CollaborationCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public CollaborationCompositeFigure getPrimaryShape() {

-		return (CollaborationCompositeFigure) primaryShape;

+		return (CollaborationCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CollaborationCompositeNameEditPart) {

-			((CollaborationCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof CollaborationCompositeNameEditPart) {

+			((CollaborationCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof CollaborationCompositeCompartmentEditPart) {

+		if(childEditPart instanceof CollaborationCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((CollaborationCompositeCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CollaborationCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

 		return false;

 	}

 

@@ -205,12 +196,12 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CollaborationCompositeNameEditPart) {

+		if(childEditPart instanceof CollaborationCompositeNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof CollaborationCompositeCompartmentEditPart) {

+		if(childEditPart instanceof CollaborationCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((CollaborationCompositeCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((CollaborationCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -219,9 +210,8 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -230,9 +220,8 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -241,12 +230,11 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof CollaborationCompositeCompartmentEditPart) {

+		if(editPart instanceof CollaborationCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -255,21 +243,15 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof CollaborationCompositeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof CollaborationCompositeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -277,29 +259,24 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -310,9 +287,8 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -321,9 +297,8 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -331,7 +306,6 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -339,17 +313,15 @@ public class CollaborationCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
index d0b54685684..00d12c1a205 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -48,7 +50,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEd
 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationCompositeItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -82,10 +83,10 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -105,22 +106,21 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case CollaborationCompositeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -140,64 +140,55 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new CollaborationCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public CollaborationCompositeFigure getPrimaryShape() {

-		return (CollaborationCompositeFigure) primaryShape;

+		return (CollaborationCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CollaborationCompositeNameEditPartCN) {

-			((CollaborationCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof CollaborationCompositeNameEditPartCN) {

+			((CollaborationCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof CollaborationCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof CollaborationCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((CollaborationCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CollaborationCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

 		return false;

 	}

 

@@ -205,12 +196,12 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CollaborationCompositeNameEditPartCN) {

+		if(childEditPart instanceof CollaborationCompositeNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof CollaborationCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof CollaborationCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((CollaborationCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((CollaborationCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -219,9 +210,8 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -230,9 +220,8 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -241,12 +230,11 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof CollaborationCompositeCompartmentEditPartCN) {

+		if(editPart instanceof CollaborationCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -255,21 +243,15 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof CollaborationCompositeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof CollaborationCompositeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -277,29 +259,24 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -310,9 +287,8 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -321,9 +297,8 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -331,7 +306,6 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -339,17 +313,15 @@ public class CollaborationCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPart.java
index 405d16c7ea3..3aa6055f464 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Collaboration_2075, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class CollaborationCompositeFloatingLabelEditPart extends FloatingLabelEd
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPartCN.java
index 88ffbfee5c3..5877fbb29fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Collaboration_3086, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class CollaborationCompositeFloatingLabelEditPartCN extends FloatingLabel
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java
index 30fdd5fcd98..3e651143555 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Collaboration_2075, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java
index ad25065c808..53d99354fb6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Collaboration_3086, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
index 98b10297c75..898e0ab7bc3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,9 +47,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationRoleItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationRoleFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationRoleItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -81,13 +81,12 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationRoleItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationRoleItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

@@ -103,22 +102,21 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case CollaborationRoleFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -138,57 +136,49 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new CollaborationRoleFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationRoleFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public CollaborationRoleFigure getPrimaryShape() {

-		return (CollaborationRoleFigure) primaryShape;

+		return (CollaborationRoleFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CollaborationRoleNameEditPartCN) {

-			((CollaborationRoleNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof CollaborationRoleNameEditPartCN) {

+			((CollaborationRoleNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -196,7 +186,7 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CollaborationRoleNameEditPartCN) {

+		if(childEditPart instanceof CollaborationRoleNameEditPartCN) {

 			return true;

 		}

 		return false;

@@ -205,9 +195,8 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -216,9 +205,8 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -227,9 +215,8 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -238,21 +225,15 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof CollaborationRoleFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof CollaborationRoleFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -260,29 +241,24 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -293,9 +269,8 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -304,9 +279,8 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -314,7 +288,6 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -322,17 +295,15 @@ public class CollaborationRoleEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationRoleNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleFloatingLabelEditPartCN.java
index 81bb8e9ec77..c8c298c4915 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ConnectableElement_3115, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationRoleFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class CollaborationRoleFloatingLabelEditPartCN extends FloatingLabelEditP
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java
index 00c1b71beeb..68370b3b871 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ConnectableElement_3115, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationRoleNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,7 +624,7 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -684,12 +635,12 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -697,7 +648,7 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -707,13 +658,12 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -723,25 +673,20 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -751,13 +696,12 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -773,7 +717,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -782,7 +725,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -791,39 +733,34 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -832,7 +769,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -846,7 +782,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -856,18 +791,15 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -875,6 +807,5 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
index b545cc2cfae..ffc531954c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,9 +47,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationUseItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationUseItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -81,12 +81,11 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationUseItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomCollaborationUseItemSemanticEditPolicyCN());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -103,22 +102,21 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case CollaborationUseFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -138,57 +136,49 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationUseFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CollaborationUseNameEditPart) {

-			((CollaborationUseNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof CollaborationUseNameEditPart) {

+			((CollaborationUseNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -196,7 +186,7 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CollaborationUseNameEditPart) {

+		if(childEditPart instanceof CollaborationUseNameEditPart) {

 			return true;

 		}

 		return false;

@@ -205,9 +195,8 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -216,9 +205,8 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -227,9 +215,8 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -238,21 +225,15 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof CollaborationUseFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof CollaborationUseFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -260,29 +241,24 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -293,9 +269,8 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -304,9 +279,8 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -314,7 +288,6 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -322,17 +295,15 @@ public class CollaborationUseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationUseNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseFloatingLabelEditPartCN.java
index c7b25d59da8..ca6dc0cedf1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.CollaborationUse_3071, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationUseFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class CollaborationUseFloatingLabelEditPartCN extends FloatingLabelEditPa
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java
index f4a23e201ea..ec40170e16e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -115,14 +115,12 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -137,7 +135,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -150,12 +147,12 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -163,12 +160,12 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -176,12 +173,12 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -189,20 +186,19 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -213,7 +209,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -221,7 +216,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -229,7 +223,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -246,12 +239,12 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -264,12 +257,10 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -278,30 +269,26 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -314,31 +301,27 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -348,9 +331,8 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -359,7 +341,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -367,9 +348,8 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.CollaborationUse_3071, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationUseNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -379,10 +359,8 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -411,8 +389,8 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -420,8 +398,8 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -430,56 +408,47 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -501,15 +470,14 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -523,7 +491,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -538,27 +505,26 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -566,18 +532,15 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -586,27 +549,19 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -614,7 +569,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -622,13 +576,12 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -638,10 +591,9 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -652,9 +604,8 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -675,31 +626,30 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -707,7 +657,7 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -717,13 +667,12 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -733,25 +682,20 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -761,13 +705,12 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -783,7 +726,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -792,7 +734,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -801,39 +742,34 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -842,7 +778,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -856,7 +791,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -866,18 +800,15 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -885,6 +816,5 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentAnnotatedElementEditPart.java
index d1e7de00270..e303ae9d5fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentAnnotatedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentAnnotatedElementEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,8 +16,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -39,21 +39,19 @@ public class CommentAnnotatedElementEditPart extends ConnectionEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CommentAnnotatedElementItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 	}

 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new SimpleDashedEdgeFigure();

 	}

@@ -61,8 +59,7 @@ public class CommentAnnotatedElementEditPart extends ConnectionEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public SimpleDashedEdgeFigure getPrimaryShape() {

-		return (SimpleDashedEdgeFigure) getFigure();

+		return (SimpleDashedEdgeFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java
index 617f4fc5861..daca4ac9b7f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -110,14 +110,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -132,7 +130,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -144,12 +141,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -157,12 +154,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -170,12 +167,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -183,20 +180,19 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -207,7 +203,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -215,7 +210,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -223,7 +217,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -248,12 +241,10 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -262,30 +253,26 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -298,31 +285,27 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -332,9 +315,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -343,7 +325,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -351,9 +332,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_2109, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentBodyEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -363,10 +343,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -395,8 +373,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -404,8 +382,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -414,56 +392,47 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -485,15 +454,14 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -507,7 +475,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -522,27 +489,26 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -550,18 +516,15 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -570,27 +533,19 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -598,7 +553,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,13 +560,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -622,10 +575,9 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -636,9 +588,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -659,31 +610,30 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -691,7 +641,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,13 +651,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -717,25 +666,20 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -745,13 +689,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -767,7 +710,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -776,7 +718,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -785,32 +726,27 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -823,7 +759,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -837,7 +772,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -847,18 +781,15 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -866,6 +797,5 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java
index 050cbfe9050..009560d2a76 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -110,14 +110,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -132,7 +130,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -144,12 +141,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -157,12 +154,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -170,12 +167,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -183,20 +180,19 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -207,7 +203,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -215,7 +210,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -223,7 +217,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -248,12 +241,10 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -262,30 +253,26 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -298,31 +285,27 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -332,9 +315,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -343,7 +325,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -351,9 +332,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_3097, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentBodyEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -363,10 +343,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -395,8 +373,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -404,8 +382,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -414,56 +392,47 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -485,15 +454,14 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -507,7 +475,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -522,27 +489,26 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -550,18 +516,15 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -570,27 +533,19 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -598,7 +553,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,13 +560,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -622,10 +575,9 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -636,9 +588,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -659,31 +610,30 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -691,7 +641,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,13 +651,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -717,25 +666,20 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -745,13 +689,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -767,7 +710,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -776,7 +718,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -785,32 +726,27 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -823,7 +759,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -837,7 +772,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -847,18 +781,15 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -866,6 +797,5 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
index 55c99314009..146d28169a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusReflowableShapeEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -33,7 +35,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CommentItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -67,10 +68,10 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CommentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusReflowableShapeEditPolicy());

@@ -87,7 +88,7 @@ public class CommentEditPart extends AbstractCommentEditPart {
 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -107,44 +108,36 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new HTMLCornerBentFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public HTMLCornerBentFigure getPrimaryShape() {

-		return (HTMLCornerBentFigure) primaryShape;

+		return (HTMLCornerBentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CommentBodyEditPart) {

-			((CommentBodyEditPart) childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());

+		if(childEditPart instanceof CommentBodyEditPart) {

+			((CommentBodyEditPart)childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -152,7 +145,7 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CommentBodyEditPart) {

+		if(childEditPart instanceof CommentBodyEditPart) {

 			return true;

 		}

 		return false;

@@ -161,9 +154,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -172,9 +164,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -183,15 +174,10 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -199,29 +185,24 @@ public class CommentEditPart extends AbstractCommentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -232,9 +213,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -243,9 +223,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -253,7 +232,6 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -261,17 +239,15 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
index 93db8edea89..82db32ee7aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusReflowableShapeEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -33,7 +35,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CommentItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -67,10 +68,10 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CommentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusReflowableShapeEditPolicy());

@@ -87,7 +88,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -107,44 +108,36 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new HTMLCornerBentFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public HTMLCornerBentFigure getPrimaryShape() {

-		return (HTMLCornerBentFigure) primaryShape;

+		return (HTMLCornerBentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CommentBodyEditPartCN) {

-			((CommentBodyEditPartCN) childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());

+		if(childEditPart instanceof CommentBodyEditPartCN) {

+			((CommentBodyEditPartCN)childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -152,7 +145,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof CommentBodyEditPartCN) {

+		if(childEditPart instanceof CommentBodyEditPartCN) {

 			return true;

 		}

 		return false;

@@ -161,9 +154,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -172,9 +164,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -183,15 +174,10 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -199,29 +185,24 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -232,9 +213,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -243,9 +223,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -253,7 +232,6 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -261,17 +239,15 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
index 6c92d1698bd..6b599675488 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ComponentCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7069;
-
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ComponentCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7069;

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ComponentCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
index a16dfbdeb38..d74de702aeb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ComponentCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7056;
-
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ComponentCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7056;

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ComponentCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
index 05ef6748b0f..b6645b03f6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,17 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentCompositeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -90,17 +91,16 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

 		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

@@ -119,24 +119,23 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ComponentCompositeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -156,74 +155,61 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ComponentCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ComponentCompositeFigure getPrimaryShape() {

-		return (ComponentCompositeFigure) primaryShape;

+		return (ComponentCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ComponentCompositeNameEditPart) {

-			((ComponentCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ComponentCompositeNameEditPart) {

+			((ComponentCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof ComponentCompositeCompartmentEditPart) {

+		if(childEditPart instanceof ComponentCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((ComponentCompositeCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ComponentCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -231,16 +217,16 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ComponentCompositeNameEditPart) {

+		if(childEditPart instanceof ComponentCompositeNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof ComponentCompositeCompartmentEditPart) {

+		if(childEditPart instanceof ComponentCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((ComponentCompositeCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((ComponentCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -249,9 +235,8 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -260,9 +245,8 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -271,12 +255,11 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof ComponentCompositeCompartmentEditPart) {

+		if(editPart instanceof ComponentCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -285,21 +268,15 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ComponentCompositeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof ComponentCompositeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -307,29 +284,24 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -340,9 +312,8 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -351,9 +322,8 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -361,7 +331,6 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -369,17 +338,15 @@ public class ComponentCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentCompositeNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
index 04bc91c8e70..d2e901d7588 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,17 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentCompositeItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -90,17 +91,16 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

 		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

@@ -119,24 +119,23 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ComponentCompositeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -156,74 +155,61 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ComponentCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ComponentCompositeFigure getPrimaryShape() {

-		return (ComponentCompositeFigure) primaryShape;

+		return (ComponentCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ComponentCompositeNameEditPartCN) {

-			((ComponentCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ComponentCompositeNameEditPartCN) {

+			((ComponentCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((ComponentCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ComponentCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -231,16 +217,16 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ComponentCompositeNameEditPartCN) {

+		if(childEditPart instanceof ComponentCompositeNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((ComponentCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((ComponentCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -249,9 +235,8 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -260,9 +245,8 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -271,12 +255,11 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof ComponentCompositeCompartmentEditPartCN) {

+		if(editPart instanceof ComponentCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -285,21 +268,15 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ComponentCompositeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof ComponentCompositeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -307,29 +284,24 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -340,9 +312,8 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -351,9 +322,8 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -361,7 +331,6 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -369,17 +338,15 @@ public class ComponentCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentCompositeNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPart.java
index 573b72c41f1..07de68922e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Component_2069, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ComponentCompositeFloatingLabelEditPart extends FloatingLabelEditPa
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPartCN.java
index 19e0c4ec51e..b6964bd3c1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Component_3081, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ComponentCompositeFloatingLabelEditPartCN extends FloatingLabelEdit
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java
index 5b6fff0423d..d4f38c620e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Component_2069, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java
index b2312f2e3dd..919fbd9c72a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Component_3081, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
index b4518782bde..4e5c68951d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ComponentRealization_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java
index 396e574cfc9..214b353d10b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,11 +16,10 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentRealizationItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -42,24 +41,21 @@ public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentRealizationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ComponentRealizationNameEditPart) {

-			((ComponentRealizationNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ComponentRealizationNameEditPart) {

+			((ComponentRealizationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

-		if (childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {

-			((ComponentRealizationAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+		if(childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {

+			((ComponentRealizationAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

@@ -67,9 +63,8 @@ public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -79,10 +74,10 @@ public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart impl
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ComponentRealizationNameEditPart) {

+		if(childEditPart instanceof ComponentRealizationNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {

+		if(childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {

 			return true;

 		}

 		return false;

@@ -91,9 +86,8 @@ public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -101,13 +95,12 @@ public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart impl
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new InterfaceRealizationFigure();

 	}

@@ -115,8 +108,7 @@ public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public InterfaceRealizationFigure getPrimaryShape() {

-		return (InterfaceRealizationFigure) getFigure();

+		return (InterfaceRealizationFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
index a3048c9bafc..576c63cda1d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ComponentRealization_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,31 +619,30 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -701,7 +650,7 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -711,13 +660,12 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -727,25 +675,20 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -755,13 +698,12 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -777,45 +719,38 @@ public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java
index 2f7c785bd7b..2cadc7118aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java
@@ -1,60 +1,57 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CompositeStructureDiagramItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class CompositeStructureDiagramEditPart extends PapyrusDiagramEditPart {
-
-	/**
-	 * @generated
-	 */
-	public final static String MODEL_ID = "CompositeStructure"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1000;
-
-	/**
-	 * @generated
-	 */
-	public CompositeStructureDiagramEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CompositeStructureDiagramItemSemanticEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+

+/**

+ * @generated

+ */

+public class CompositeStructureDiagramEditPart extends PapyrusDiagramEditPart {

+

+	/**

+	 * @generated

+	 */

+	public final static String MODEL_ID = "CompositeStructure"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 1000;

+

+	/**

+	 * @generated

+	 */

+	public CompositeStructureDiagramEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
index 476e300e169..0ff6fc8d143 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java
index e8061858d70..ede2e7d64f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,11 +16,10 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ConnectorFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ConnectorItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -42,32 +41,27 @@ public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITre
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConnectorItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ConnectorAppliedStereotypeEditPart) {

-			((ConnectorAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+		if(childEditPart instanceof ConnectorAppliedStereotypeEditPart) {

+			((ConnectorAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

-		if (childEditPart instanceof ConnectorNameEditPart) {

-			((ConnectorNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ConnectorNameEditPart) {

+			((ConnectorNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

-		if (childEditPart instanceof ConnectorMultiplicitySourceEditPart) {

-			((ConnectorMultiplicitySourceEditPart) childEditPart).setLabel(

-					getPrimaryShape().getMultiplicitySourceLabel());

+		if(childEditPart instanceof ConnectorMultiplicitySourceEditPart) {

+			((ConnectorMultiplicitySourceEditPart)childEditPart).setLabel(getPrimaryShape().getMultiplicitySourceLabel());

 		}

-		if (childEditPart instanceof ConnectorMultiplicityTargetEditPart) {

-			((ConnectorMultiplicityTargetEditPart) childEditPart).setLabel(

-					getPrimaryShape().getMultiplicityTargetLabel());

+		if(childEditPart instanceof ConnectorMultiplicityTargetEditPart) {

+			((ConnectorMultiplicityTargetEditPart)childEditPart).setLabel(getPrimaryShape().getMultiplicityTargetLabel());

 		}

 		return false;

 	}

@@ -75,9 +69,8 @@ public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITre
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -87,16 +80,16 @@ public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITre
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ConnectorAppliedStereotypeEditPart) {

+		if(childEditPart instanceof ConnectorAppliedStereotypeEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof ConnectorNameEditPart) {

+		if(childEditPart instanceof ConnectorNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof ConnectorMultiplicitySourceEditPart) {

+		if(childEditPart instanceof ConnectorMultiplicitySourceEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof ConnectorMultiplicityTargetEditPart) {

+		if(childEditPart instanceof ConnectorMultiplicityTargetEditPart) {

 			return true;

 		}

 		return false;

@@ -105,9 +98,8 @@ public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITre
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -115,13 +107,12 @@ public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITre
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new ConnectorFigure();

 	}

@@ -129,8 +120,7 @@ public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITre
 	/**

 	 * @generated

 	 */

-	@Override

 	public ConnectorFigure getPrimaryShape() {

-		return (ConnectorFigure) getFigure();

+		return (ConnectorFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
index 1b6808c2db6..c234f5b79e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.SOURCE;

 	}

@@ -161,12 +156,12 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicitySourceEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
index fe11bc39394..2f8e990a1e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.TARGET;

 	}

@@ -161,12 +156,12 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicityTargetEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
index 27497eaf4a0..68bf9fc3760 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -44,7 +44,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -116,14 +115,12 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -142,21 +139,19 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -165,12 +160,12 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -178,12 +173,12 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -191,12 +186,12 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -204,20 +199,19 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -228,7 +222,6 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -236,7 +229,6 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -244,7 +236,6 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -261,12 +252,12 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -279,12 +270,10 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -293,30 +282,26 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -329,31 +314,27 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -363,9 +344,8 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -374,7 +354,6 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -382,9 +361,8 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -394,10 +372,8 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -426,8 +402,8 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -435,8 +411,8 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -445,56 +421,47 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -516,15 +483,14 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -538,7 +504,6 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -553,20 +518,20 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -574,18 +539,15 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -594,27 +556,19 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -622,7 +576,6 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -630,13 +583,12 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -646,10 +598,9 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -660,9 +611,8 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -683,31 +633,30 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -715,7 +664,7 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -725,13 +674,12 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -741,25 +689,20 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -769,13 +712,12 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -791,39 +733,33 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -832,7 +768,6 @@ public class ConnectorNameEditPart extends PapyrusLabelEditPart implements IText
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintConstrainedElementEditPart.java
index f5020569a5f..5422ad520d7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintConstrainedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintConstrainedElementEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -15,9 +15,9 @@ import org.eclipse.draw2d.Connection;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -39,21 +39,19 @@ public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintConstrainedElementItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 	}

 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new SimpleDashedEdgeFigure();

 	}

@@ -61,8 +59,7 @@ public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public SimpleDashedEdgeFigure getPrimaryShape() {

-		return (SimpleDashedEdgeFigure) getFigure();

+		return (SimpleDashedEdgeFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
index 7dc64a55195..42849ee9134 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -32,7 +34,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPa
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ConstraintItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -66,10 +67,10 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -85,7 +86,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -105,48 +106,40 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ConstraintFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ConstraintFigure getPrimaryShape() {

-		return (ConstraintFigure) primaryShape;

+		return (ConstraintFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ConstraintNameEditPart) {

-			((ConstraintNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ConstraintNameEditPart) {

+			((ConstraintNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-		if (childEditPart instanceof ConstraintSpecificationEditPart) {

-			((ConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+		if(childEditPart instanceof ConstraintSpecificationEditPart) {

+			((ConstraintSpecificationEditPart)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -154,10 +147,10 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ConstraintNameEditPart) {

+		if(childEditPart instanceof ConstraintNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof ConstraintSpecificationEditPart) {

+		if(childEditPart instanceof ConstraintSpecificationEditPart) {

 			return true;

 		}

 		return false;

@@ -166,9 +159,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -177,9 +169,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -188,15 +179,10 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -204,29 +190,24 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -237,9 +218,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -248,9 +228,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -258,7 +237,6 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -266,17 +244,15 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
index 1ef2a70ad14..7a4b560e55f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -32,7 +34,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPa
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ConstraintItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -66,10 +67,10 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -85,7 +86,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -105,48 +106,40 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ConstraintFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ConstraintFigure getPrimaryShape() {

-		return (ConstraintFigure) primaryShape;

+		return (ConstraintFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ConstraintNameEditPartCN) {

-			((ConstraintNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ConstraintNameEditPartCN) {

+			((ConstraintNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-		if (childEditPart instanceof ConstraintSpecificationEditPartCN) {

-			((ConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+		if(childEditPart instanceof ConstraintSpecificationEditPartCN) {

+			((ConstraintSpecificationEditPartCN)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -154,10 +147,10 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ConstraintNameEditPartCN) {

+		if(childEditPart instanceof ConstraintNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof ConstraintSpecificationEditPartCN) {

+		if(childEditPart instanceof ConstraintSpecificationEditPartCN) {

 			return true;

 		}

 		return false;

@@ -166,9 +159,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -177,9 +169,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -188,15 +179,10 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -204,29 +190,24 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -237,9 +218,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -248,9 +228,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -258,7 +237,6 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -266,17 +244,15 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java
index 696976cf17d..319732df94e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_2114, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java
index 74e171e4519..480cad48a9e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3120, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java
index 5e393540b53..91ff0c6046a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -110,14 +110,12 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -132,7 +130,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -144,12 +141,12 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -157,12 +154,12 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -170,12 +167,12 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -183,20 +180,19 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -207,7 +203,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -215,7 +210,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -223,7 +217,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -248,12 +241,10 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -262,30 +253,26 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -298,31 +285,27 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -332,9 +315,8 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -343,7 +325,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -351,9 +332,8 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_2114, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -363,10 +343,8 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -395,8 +373,8 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -404,8 +382,8 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -414,56 +392,47 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -485,15 +454,14 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -507,7 +475,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -522,27 +489,26 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -550,18 +516,15 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -570,27 +533,19 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -598,7 +553,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,13 +560,12 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -622,10 +575,9 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -636,9 +588,8 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -659,31 +610,30 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -691,7 +641,7 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,13 +651,12 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -717,25 +666,20 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -745,13 +689,12 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -767,7 +710,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -776,7 +718,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -785,32 +726,27 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -823,7 +759,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -837,7 +772,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -847,18 +781,15 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -866,6 +797,5 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java
index 4d54d199555..88bb26ca9de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -110,14 +110,12 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -132,7 +130,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -144,12 +141,12 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -157,12 +154,12 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -170,12 +167,12 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -183,20 +180,19 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -207,7 +203,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -215,7 +210,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -223,7 +217,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -248,12 +241,10 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -262,30 +253,26 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -298,31 +285,27 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -332,9 +315,8 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -343,7 +325,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -351,9 +332,8 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3120, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -363,10 +343,8 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -395,8 +373,8 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -404,8 +382,8 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -414,56 +392,47 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -485,15 +454,14 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -507,7 +475,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -522,27 +489,26 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -550,18 +516,15 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -570,27 +533,19 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -598,7 +553,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,13 +560,12 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -622,10 +575,9 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -636,9 +588,8 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -659,31 +610,30 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -691,7 +641,7 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,13 +651,12 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -717,25 +666,20 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -745,13 +689,12 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -767,7 +710,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -776,7 +718,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -785,32 +726,27 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -823,7 +759,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -837,7 +772,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -847,18 +781,15 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -866,6 +797,5 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
index 0bf9568f58a..b006ba04b26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
@@ -1,144 +1,130 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class DataTypeAttributeCompartmentEditPart extends ListCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7033;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeAttributeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.DataTypeAttributeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeAttributeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class DataTypeAttributeCompartmentEditPart extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7033;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeAttributeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.DataTypeAttributeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
index c244544dff6..66ce054330c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
@@ -1,144 +1,130 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class DataTypeAttributeCompartmentEditPartCN extends ListCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7036;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeAttributeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.DataTypeAttributeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeAttributeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class DataTypeAttributeCompartmentEditPartCN extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7036;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeAttributeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.DataTypeAttributeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
index 417c4f7ca5a..9e454f9529c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -38,6 +38,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,13 +48,11 @@ import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNo
 import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

@@ -86,11 +87,11 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -109,22 +110,21 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case DataTypeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -144,71 +144,61 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new DataTypeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public DataTypeFigure getPrimaryShape() {

-		return (DataTypeFigure) primaryShape;

+		return (DataTypeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DataTypeNameEditPart) {

-			((DataTypeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof DataTypeNameEditPart) {

+			((DataTypeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof DataTypeAttributeCompartmentEditPart) {

+		if(childEditPart instanceof DataTypeAttributeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((DataTypeAttributeCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((DataTypeAttributeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

-		if (childEditPart instanceof DataTypeOperationCompartmentEditPart) {

+		if(childEditPart instanceof DataTypeOperationCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((DataTypeOperationCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((DataTypeOperationCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

 		return false;

 	}

 

@@ -216,17 +206,17 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DataTypeNameEditPart) {

+		if(childEditPart instanceof DataTypeNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof DataTypeAttributeCompartmentEditPart) {

+		if(childEditPart instanceof DataTypeAttributeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			pane.remove(((DataTypeAttributeCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((DataTypeAttributeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof DataTypeOperationCompartmentEditPart) {

+		if(childEditPart instanceof DataTypeOperationCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			pane.remove(((DataTypeOperationCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((DataTypeOperationCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -235,9 +225,8 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -246,9 +235,8 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -257,15 +245,14 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof DataTypeAttributeCompartmentEditPart) {

+		if(editPart instanceof DataTypeAttributeCompartmentEditPart) {

 			return getPrimaryShape().getAttributeCompartmentFigure();

 		}

-		if (editPart instanceof DataTypeOperationCompartmentEditPart) {

+		if(editPart instanceof DataTypeOperationCompartmentEditPart) {

 			return getPrimaryShape().getOperationCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -274,21 +261,15 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof DataTypeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof DataTypeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -296,29 +277,24 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -329,9 +305,8 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -340,9 +315,8 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -350,7 +324,6 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -358,17 +331,15 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeNameEditPart.VISUAL_ID));

 	}

@@ -376,15 +347,14 @@ public class DataTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

-		if (request instanceof CreateViewAndElementRequest) {

-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

-			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);

-			if (type == UMLElementTypes.Property_3101) {

+		if(request instanceof CreateViewAndElementRequest) {

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

+			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);

+			if(UMLElementTypes.isKindOf(type, UMLElementTypes.Property_3101)) {

 				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID));

 			}

-			if (type == UMLElementTypes.Operation_3102) {

+			if(UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_3102)) {

 				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID));

 			}

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
index 61ee23b44a0..0fca72d2ab5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -38,6 +38,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,13 +48,11 @@ import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNo
 import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

@@ -86,11 +87,11 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -109,22 +110,21 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case DataTypeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -144,71 +144,61 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new DataTypeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public DataTypeFigure getPrimaryShape() {

-		return (DataTypeFigure) primaryShape;

+		return (DataTypeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DataTypeNameEditPartCN) {

-			((DataTypeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof DataTypeNameEditPartCN) {

+			((DataTypeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) {

+		if(childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((DataTypeAttributeCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((DataTypeAttributeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

-		if (childEditPart instanceof DataTypeOperationCompartmentEditPartCN) {

+		if(childEditPart instanceof DataTypeOperationCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((DataTypeOperationCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((DataTypeOperationCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

 		return false;

 	}

 

@@ -216,17 +206,17 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DataTypeNameEditPartCN) {

+		if(childEditPart instanceof DataTypeNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) {

+		if(childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

-			pane.remove(((DataTypeAttributeCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((DataTypeAttributeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof DataTypeOperationCompartmentEditPartCN) {

+		if(childEditPart instanceof DataTypeOperationCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

-			pane.remove(((DataTypeOperationCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((DataTypeOperationCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -235,9 +225,8 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -246,9 +235,8 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -257,15 +245,14 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof DataTypeAttributeCompartmentEditPartCN) {

+		if(editPart instanceof DataTypeAttributeCompartmentEditPartCN) {

 			return getPrimaryShape().getAttributeCompartmentFigure();

 		}

-		if (editPart instanceof DataTypeOperationCompartmentEditPartCN) {

+		if(editPart instanceof DataTypeOperationCompartmentEditPartCN) {

 			return getPrimaryShape().getOperationCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -274,21 +261,15 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof DataTypeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof DataTypeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -296,29 +277,24 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -329,9 +305,8 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -340,9 +315,8 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -350,7 +324,6 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -358,17 +331,15 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeNameEditPartCN.VISUAL_ID));

 	}

@@ -376,15 +347,14 @@ public class DataTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

-		if (request instanceof CreateViewAndElementRequest) {

-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

-			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);

-			if (type == UMLElementTypes.Property_3101) {

+		if(request instanceof CreateViewAndElementRequest) {

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

+			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);

+			if(UMLElementTypes.isKindOf(type, UMLElementTypes.Property_3101)) {

 				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));

 			}

-			if (type == UMLElementTypes.Operation_3102) {

+			if(UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_3102)) {

 				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID));

 			}

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPart.java
index 3e2c1a0aef2..68cc11ef490 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_2068, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class DataTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPartCN.java
index 82e0d29ca9f..ddfdfff0607 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_3080, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class DataTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java
index 178f9fb4039..048617e9f4a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_2068, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java
index f138924131c..41ab119cdef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_3080, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
index cb15d07caf2..82e36445d4a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
@@ -1,144 +1,130 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class DataTypeOperationCompartmentEditPart extends ListCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7034;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeOperationCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.DataTypeOperationCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeOperationCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class DataTypeOperationCompartmentEditPart extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7034;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeOperationCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.DataTypeOperationCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
index 7785f10a085..8df78130fad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
@@ -1,144 +1,130 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class DataTypeOperationCompartmentEditPartCN extends ListCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7037;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeOperationCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.DataTypeOperationCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeOperationCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class DataTypeOperationCompartmentEditPartCN extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7037;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeOperationCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.DataTypeOperationCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
index 13dde21aa72..c157ceadc12 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java
index a20b3d3655e..eec3c958843 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,11 +16,10 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DependencyItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -42,24 +41,21 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DependencyItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DependencyNameEditPart) {

-			((DependencyNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof DependencyNameEditPart) {

+			((DependencyNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

-		if (childEditPart instanceof DependencyAppliedStereotypeEditPart) {

-			((DependencyAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+		if(childEditPart instanceof DependencyAppliedStereotypeEditPart) {

+			((DependencyAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

@@ -67,9 +63,8 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -79,10 +74,10 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DependencyNameEditPart) {

+		if(childEditPart instanceof DependencyNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof DependencyAppliedStereotypeEditPart) {

+		if(childEditPart instanceof DependencyAppliedStereotypeEditPart) {

 			return true;

 		}

 		return false;

@@ -91,9 +86,8 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -101,13 +95,12 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new DashedEdgeFigure();

 	}

@@ -115,8 +108,7 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	public DashedEdgeFigure getPrimaryShape() {

-		return (DashedEdgeFigure) getFigure();

+		return (DashedEdgeFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
index a07313f373a..0c78ba32efa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,31 +619,30 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -701,7 +650,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -711,13 +660,12 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -727,25 +675,20 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -755,13 +698,12 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -777,45 +719,38 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
index 8ea8dcc087a..187f81ad26c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Deployment_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java
index 157cbb1f240..a09d998ee4d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,11 +16,11 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeDeploymentLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeploymentItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -42,24 +42,21 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeploymentItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeDeploymentLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeDeploymentLabelDisplayEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DeploymentNameEditPart) {

-			((DeploymentNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof DeploymentNameEditPart) {

+			((DeploymentNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

-		if (childEditPart instanceof DeploymentAppliedStereotypeEditPart) {

-			((DeploymentAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+		if(childEditPart instanceof DeploymentAppliedStereotypeEditPart) {

+			((DeploymentAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

@@ -67,9 +64,8 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -79,10 +75,10 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITr
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DeploymentNameEditPart) {

+		if(childEditPart instanceof DeploymentNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof DeploymentAppliedStereotypeEditPart) {

+		if(childEditPart instanceof DeploymentAppliedStereotypeEditPart) {

 			return true;

 		}

 		return false;

@@ -91,9 +87,8 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -101,13 +96,12 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITr
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new DashedEdgeFigure();

 	}

@@ -115,8 +109,7 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITr
 	/**

 	 * @generated

 	 */

-	@Override

 	public DashedEdgeFigure getPrimaryShape() {

-		return (DashedEdgeFigure) getFigure();

+		return (DashedEdgeFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
index a3aa6fc3f37..4a560e257be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Deployment_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,31 +619,30 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -701,7 +650,7 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -711,13 +660,12 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -727,25 +675,20 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -755,13 +698,12 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -777,45 +719,38 @@ public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
index 0b5463c0fe9..f1aab6b79e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeploymentSpecificationItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeploymentSpecificationItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case DeploymentSpecificationFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DeploymentSpecificationNameEditPart) {

-			((DeploymentSpecificationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof DeploymentSpecificationNameEditPart) {

+			((DeploymentSpecificationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DeploymentSpecificationNameEditPart) {

+		if(childEditPart instanceof DeploymentSpecificationNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof DeploymentSpecificationFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof DeploymentSpecificationFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class DeploymentSpecificationEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
index 57bd8d511f7..162e3605a43 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeploymentSpecificationItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeploymentSpecificationItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case DeploymentSpecificationFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DeploymentSpecificationNameEditPartCN) {

-			((DeploymentSpecificationNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof DeploymentSpecificationNameEditPartCN) {

+			((DeploymentSpecificationNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DeploymentSpecificationNameEditPartCN) {

+		if(childEditPart instanceof DeploymentSpecificationNameEditPartCN) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof DeploymentSpecificationFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof DeploymentSpecificationFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class DeploymentSpecificationEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPart.java
index eda33a0119e..7326effe643 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DeploymentSpecification_2078, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class DeploymentSpecificationFloatingLabelEditPart extends FloatingLabelE
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPartCN.java
index bdd11e2b97d..d8ac3748a09 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DeploymentSpecification_3092, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class DeploymentSpecificationFloatingLabelEditPartCN extends FloatingLabe
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java
index 3a2a3fc58cd..281d86c9cf9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DeploymentSpecification_2078, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java
index 70a08172c8b..03292db5dcd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DeploymentSpecification_3092, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
index a8cd0079288..a62935a2c79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeviceCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class DeviceCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7070;
-
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.DeviceCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeviceCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7070;

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.DeviceCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
index 05616adfc59..7703616f1fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeviceCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class DeviceCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7057;
-
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.DeviceCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeviceCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7057;

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.DeviceCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
index 0f1c749db13..84d92be2be1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeviceCompositeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeviceCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,24 +119,23 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case DeviceCompositeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -154,74 +155,61 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new DeviceCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public DeviceCompositeFigure getPrimaryShape() {

-		return (DeviceCompositeFigure) primaryShape;

+		return (DeviceCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DeviceCompositeNameEditPart) {

-			((DeviceCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof DeviceCompositeNameEditPart) {

+			((DeviceCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof DeviceCompositeCompartmentEditPart) {

+		if(childEditPart instanceof DeviceCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((DeviceCompositeCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((DeviceCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -229,16 +217,16 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DeviceCompositeNameEditPart) {

+		if(childEditPart instanceof DeviceCompositeNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof DeviceCompositeCompartmentEditPart) {

+		if(childEditPart instanceof DeviceCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((DeviceCompositeCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((DeviceCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -247,9 +235,8 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -258,9 +245,8 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -269,12 +255,11 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof DeviceCompositeCompartmentEditPart) {

+		if(editPart instanceof DeviceCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -283,21 +268,15 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof DeviceCompositeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof DeviceCompositeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -305,29 +284,24 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -338,9 +312,8 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -349,9 +322,8 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -359,7 +331,6 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -367,17 +338,15 @@ public class DeviceCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceCompositeNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
index b5e3aae511d..f9fabc21038 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeviceCompositeItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeviceCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,24 +119,23 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case DeviceCompositeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -154,74 +155,61 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new DeviceCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public DeviceCompositeFigure getPrimaryShape() {

-		return (DeviceCompositeFigure) primaryShape;

+		return (DeviceCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DeviceCompositeNameEditPartCN) {

-			((DeviceCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof DeviceCompositeNameEditPartCN) {

+			((DeviceCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof DeviceCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof DeviceCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((DeviceCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((DeviceCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -229,16 +217,16 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DeviceCompositeNameEditPartCN) {

+		if(childEditPart instanceof DeviceCompositeNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof DeviceCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof DeviceCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((DeviceCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((DeviceCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -247,9 +235,8 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -258,9 +245,8 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -269,12 +255,11 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof DeviceCompositeCompartmentEditPartCN) {

+		if(editPart instanceof DeviceCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -283,21 +268,15 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof DeviceCompositeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof DeviceCompositeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -305,29 +284,24 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -338,9 +312,8 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -349,9 +322,8 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -359,7 +331,6 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -367,17 +338,15 @@ public class DeviceCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceCompositeNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPart.java
index cb2ca303fc6..cf2974a9aa0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Device_2070, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class DeviceCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPartCN.java
index 622e59a00ab..b60a71e2f5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Device_3082, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class DeviceCompositeFloatingLabelEditPartCN extends FloatingLabelEditPar
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java
index daadd40f3ee..a8931512428 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Device_2070, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java
index 5439c16058d..c7a8bae4a6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Device_3082, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
index b138bb51f75..feee70e0f18 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -32,7 +34,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPa
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationConstraintItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -66,10 +67,10 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationConstraintItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -85,7 +86,7 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -105,48 +106,40 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ConstraintFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ConstraintFigure getPrimaryShape() {

-		return (ConstraintFigure) primaryShape;

+		return (ConstraintFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DurationConstraintNameEditPart) {

-			((DurationConstraintNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof DurationConstraintNameEditPart) {

+			((DurationConstraintNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-		if (childEditPart instanceof DurationConstraintSpecificationEditPart) {

-			((DurationConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+		if(childEditPart instanceof DurationConstraintSpecificationEditPart) {

+			((DurationConstraintSpecificationEditPart)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -154,10 +147,10 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DurationConstraintNameEditPart) {

+		if(childEditPart instanceof DurationConstraintNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof DurationConstraintSpecificationEditPart) {

+		if(childEditPart instanceof DurationConstraintSpecificationEditPart) {

 			return true;

 		}

 		return false;

@@ -166,9 +159,8 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -177,9 +169,8 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -188,15 +179,10 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -204,29 +190,24 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -237,9 +218,8 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -248,9 +228,8 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -258,7 +237,6 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -266,17 +244,15 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationConstraintNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
index b47f86c8c0b..f335e059438 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -32,7 +34,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPa
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationConstraintItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -66,10 +67,10 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationConstraintItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -85,7 +86,7 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -105,48 +106,40 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ConstraintFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ConstraintFigure getPrimaryShape() {

-		return (ConstraintFigure) primaryShape;

+		return (ConstraintFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DurationConstraintNameEditPartCN) {

-			((DurationConstraintNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof DurationConstraintNameEditPartCN) {

+			((DurationConstraintNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-		if (childEditPart instanceof DurationConstraintSpecificationEditPartCN) {

-			((DurationConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+		if(childEditPart instanceof DurationConstraintSpecificationEditPartCN) {

+			((DurationConstraintSpecificationEditPartCN)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -154,10 +147,10 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DurationConstraintNameEditPartCN) {

+		if(childEditPart instanceof DurationConstraintNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof DurationConstraintSpecificationEditPartCN) {

+		if(childEditPart instanceof DurationConstraintSpecificationEditPartCN) {

 			return true;

 		}

 		return false;

@@ -166,9 +159,8 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -177,9 +169,8 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -188,15 +179,10 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -204,29 +190,24 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -237,9 +218,8 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -248,9 +228,8 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -258,7 +237,6 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -266,17 +244,15 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationConstraintNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java
index dfde29809e1..f9b3c827153 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_2110, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationConstraintNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java
index 1b59ba8c50d..78120417337 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3116, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationConstraintNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java
index fb596bc2a00..bff86286196 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -110,14 +110,12 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -132,7 +130,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -144,12 +141,12 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -157,12 +154,12 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -170,12 +167,12 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -183,20 +180,19 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -207,7 +203,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -215,7 +210,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -223,7 +217,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -248,12 +241,10 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -262,30 +253,26 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -298,31 +285,27 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -332,9 +315,8 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -343,7 +325,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -351,9 +332,8 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_2110, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationConstraintSpecificationEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -363,10 +343,8 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -395,8 +373,8 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -404,8 +382,8 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -414,56 +392,47 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -485,15 +454,14 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -507,7 +475,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -522,27 +489,26 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -550,18 +516,15 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -570,27 +533,19 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -598,7 +553,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,13 +560,12 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -622,10 +575,9 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -636,9 +588,8 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -659,31 +610,30 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -691,7 +641,7 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,13 +651,12 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -717,25 +666,20 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -745,13 +689,12 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -767,7 +710,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -776,7 +718,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -785,32 +726,27 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -823,7 +759,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -837,7 +772,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -847,18 +781,15 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -866,6 +797,5 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java
index 83238ad4931..3e8367b8974 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -110,14 +110,12 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -132,7 +130,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -144,12 +141,12 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -157,12 +154,12 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -170,12 +167,12 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -183,20 +180,19 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -207,7 +203,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -215,7 +210,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -223,7 +217,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -248,12 +241,10 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -262,30 +253,26 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -298,31 +285,27 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -332,9 +315,8 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -343,7 +325,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -351,9 +332,8 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3116, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationConstraintSpecificationEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -363,10 +343,8 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -395,8 +373,8 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -404,8 +382,8 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -414,56 +392,47 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -485,15 +454,14 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -507,7 +475,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -522,27 +489,26 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -550,18 +516,15 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -570,27 +533,19 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -598,7 +553,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,13 +560,12 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -622,10 +575,9 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -636,9 +588,8 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -659,31 +610,30 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -691,7 +641,7 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,13 +651,12 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -717,25 +666,20 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -745,13 +689,12 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -767,7 +710,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -776,7 +718,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -785,32 +726,27 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -823,7 +759,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -837,7 +772,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -847,18 +781,15 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -866,6 +797,5 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
index 0e88e957014..c76458a5f8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case DurationFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DurationNameEditPart) {

-			((DurationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof DurationNameEditPart) {

+			((DurationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DurationNameEditPart) {

+		if(childEditPart instanceof DurationNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof DurationFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof DurationFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class DurationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationFloatingLabelEditPart.java
index 8a215b40d8b..4c090f7724c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DurationFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class DurationFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Duration_2104, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class DurationFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
index a20c516d2a6..8c06fe463c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationIntervalItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationIntervalItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case DurationIntervalFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DurationIntervalNameEditPart) {

-			((DurationIntervalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof DurationIntervalNameEditPart) {

+			((DurationIntervalNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof DurationIntervalNameEditPart) {

+		if(childEditPart instanceof DurationIntervalNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof DurationIntervalFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof DurationIntervalFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class DurationIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationIntervalNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalFloatingLabelEditPart.java
index ed7084771c2..a03c9114764 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DurationInterval_2106, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationIntervalFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class DurationIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java
index 1897b014c5a..1e19ba1106e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DurationInterval_2106, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationIntervalNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java
index e1d877b34ba..e3bb6bcc5b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Duration_2104, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
index d5b7acca4eb..dfff017860a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -33,6 +33,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -46,7 +48,6 @@ import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocat
 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationObservationItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -80,10 +81,10 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationObservationItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -102,23 +103,22 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case DurationObservationNameEditPart.VISUAL_ID:

 				case DurationObservationStereotypeLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -138,68 +138,56 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.DurationObservationNodeFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof DurationObservationNameEditPart) {

+		if(borderItemEditPart instanceof DurationObservationNameEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else if (borderItemEditPart instanceof DurationObservationStereotypeLabelEditPart) {

+		} else if(borderItemEditPart instanceof DurationObservationStereotypeLabelEditPart) {

 			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(20, 20);

 		return result;

@@ -207,27 +195,22 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		return nodeShape; // use nodeShape itself as contentPane

 	}

@@ -235,9 +218,8 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -246,9 +228,8 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -256,7 +237,6 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -264,17 +244,15 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationObservationNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEventEditPart.java
index bac07202906..7e568b7f119 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEventEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,8 +16,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationObservationEventItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -39,21 +39,19 @@ public class DurationObservationEventEditPart extends ConnectionEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationObservationEventItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 	}

 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new SimpleDashedEdgeFigure();

 	}

@@ -61,8 +59,7 @@ public class DurationObservationEventEditPart extends ConnectionEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public SimpleDashedEdgeFigure getPrimaryShape() {

-		return (SimpleDashedEdgeFigure) getFigure();

+		return (SimpleDashedEdgeFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java
index aa04ba29fad..4bdf4b1e1e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -113,14 +113,12 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -141,7 +139,6 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -152,12 +149,11 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -165,12 +161,11 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

@@ -178,12 +173,12 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -191,12 +186,12 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -204,12 +199,12 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -217,20 +212,19 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -241,7 +235,6 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -249,7 +242,6 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -281,12 +273,10 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -295,30 +285,26 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -331,31 +317,27 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -365,9 +347,8 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -376,7 +357,6 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -384,9 +364,8 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_2093, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -396,10 +375,8 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -428,8 +405,8 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -437,8 +414,8 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -447,56 +424,47 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -518,15 +486,14 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -540,7 +507,6 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -555,27 +521,26 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -583,18 +548,15 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -603,27 +565,19 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -631,7 +585,6 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -639,13 +592,12 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -655,10 +607,9 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -669,9 +620,8 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -692,31 +642,30 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -724,7 +673,7 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -734,13 +683,12 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -750,25 +698,20 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -778,13 +721,12 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -800,31 +742,26 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -837,7 +774,6 @@ public class DurationObservationNameEditPart extends FloatingLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
index 418a8f27c9c..ee48473de1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -115,14 +115,12 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -143,7 +141,6 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -155,12 +152,11 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -168,12 +164,11 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

@@ -181,12 +176,12 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -194,12 +189,12 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -207,12 +202,12 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -220,20 +215,19 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -244,7 +238,6 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -252,7 +245,6 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -284,12 +276,10 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -298,30 +288,26 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -334,31 +320,27 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -368,9 +350,8 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -379,7 +360,6 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -387,9 +367,8 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_2093, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -399,10 +378,8 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -431,8 +408,8 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -440,8 +417,8 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -450,56 +427,47 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -521,15 +489,14 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -543,7 +510,6 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -558,27 +524,26 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -586,18 +551,15 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -606,27 +568,19 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -634,7 +588,6 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -642,13 +595,12 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -658,10 +610,9 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -672,9 +623,8 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -695,31 +645,30 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -727,7 +676,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -737,13 +686,12 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -753,25 +701,20 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -781,13 +724,12 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -803,31 +745,26 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -840,7 +777,6 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
index 01fc12f4395..5c277652fb9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -39,6 +39,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,13 +49,11 @@ import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNo
 import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

@@ -87,11 +88,11 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

@@ -111,22 +112,21 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case EnumerationFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -146,64 +146,55 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new EnumerationFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public EnumerationFigure getPrimaryShape() {

-		return (EnumerationFigure) primaryShape;

+		return (EnumerationFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof EnumerationNameEditPart) {

-			((EnumerationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof EnumerationNameEditPart) {

+			((EnumerationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {

+		if(childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((EnumerationEnumerationLiteralCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((EnumerationEnumerationLiteralCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

 		return false;

 	}

 

@@ -211,12 +202,12 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof EnumerationNameEditPart) {

+		if(childEditPart instanceof EnumerationNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {

+		if(childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();

-			pane.remove(((EnumerationEnumerationLiteralCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((EnumerationEnumerationLiteralCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -225,9 +216,8 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -236,9 +226,8 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -247,12 +236,11 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {

+		if(editPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {

 			return getPrimaryShape().getEnumerationLiteralCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -261,21 +249,15 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof EnumerationFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof EnumerationFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -283,29 +265,24 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -316,9 +293,8 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -327,9 +303,8 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -337,7 +312,6 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -345,17 +319,15 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationNameEditPart.VISUAL_ID));

 	}

@@ -363,12 +335,11 @@ public class EnumerationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

-		if (request instanceof CreateViewAndElementRequest) {

-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

-			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);

-			if (type == UMLElementTypes.EnumerationLiteral_3066) {

+		if(request instanceof CreateViewAndElementRequest) {

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

+			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);

+			if(UMLElementTypes.isKindOf(type, UMLElementTypes.EnumerationLiteral_3066)) {

 				return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID));

 			}

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
index 222755bd98c..7a9ca8f2bc9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -39,6 +39,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,13 +49,11 @@ import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNo
 import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Color;

@@ -87,11 +88,11 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

@@ -111,22 +112,21 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case EnumerationFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -146,64 +146,55 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new EnumerationFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public EnumerationFigure getPrimaryShape() {

-		return (EnumerationFigure) primaryShape;

+		return (EnumerationFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof EnumerationNameEditPartCN) {

-			((EnumerationNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof EnumerationNameEditPartCN) {

+			((EnumerationNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {

+		if(childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((EnumerationEnumerationLiteralCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((EnumerationEnumerationLiteralCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

 		return false;

 	}

 

@@ -211,12 +202,12 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof EnumerationNameEditPartCN) {

+		if(childEditPart instanceof EnumerationNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {

+		if(childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();

-			pane.remove(((EnumerationEnumerationLiteralCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((EnumerationEnumerationLiteralCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -225,9 +216,8 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -236,9 +226,8 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -247,12 +236,11 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {

+		if(editPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {

 			return getPrimaryShape().getEnumerationLiteralCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -261,21 +249,15 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof EnumerationFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof EnumerationFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -283,29 +265,24 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -316,9 +293,8 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -327,9 +303,8 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -337,7 +312,6 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -345,17 +319,15 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID));

 	}

@@ -363,12 +335,11 @@ public class EnumerationEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getTargetEditPart(Request request) {

-		if (request instanceof CreateViewAndElementRequest) {

-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

-			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);

-			if (type == UMLElementTypes.EnumerationLiteral_3066) {

+		if(request instanceof CreateViewAndElementRequest) {

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

+			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);

+			if(UMLElementTypes.isKindOf(type, UMLElementTypes.EnumerationLiteral_3066)) {

 				return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID));

 			}

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
index 8759caa8c35..a8c90563602 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
@@ -1,144 +1,130 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7048;
-
-	/**
-	 * @generated
-	 */
-	public EnumerationEnumerationLiteralCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.EnumerationEnumerationLiteralCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7048;

+

+	/**

+	 * @generated

+	 */

+	public EnumerationEnumerationLiteralCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.EnumerationEnumerationLiteralCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
index 99571146232..6a3e0bb3204 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
@@ -1,144 +1,130 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7049;
-
-	/**
-	 * @generated
-	 */
-	public EnumerationEnumerationLiteralCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.EnumerationEnumerationLiteralCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7049;

+

+	/**

+	 * @generated

+	 */

+	public EnumerationEnumerationLiteralCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.EnumerationEnumerationLiteralCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPart.java
index 776391a75da..1190510e97a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_2067, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class EnumerationFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPartCN.java
index dab5d5b9655..47040590599 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_3079, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class EnumerationFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java
index 12397bf54ee..47e5fc362d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -67,13 +67,13 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
 import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

 import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationLiteralItemSemanticEditPolicyCLN;

 import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextNonResizableEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

@@ -122,14 +122,12 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -144,9 +142,8 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public DragTracker getDragTracker(Request request) {

-		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {

+		if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) {

 			return null;

 		}

 		return new DragEditPartsTrackerEx(this);

@@ -155,10 +152,9 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationLiteralItemSemanticEditPolicyCLN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

 		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -168,12 +164,12 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -181,12 +177,12 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -194,12 +190,12 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -207,20 +203,19 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -231,7 +226,6 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -239,7 +233,6 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -247,7 +240,6 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -264,12 +256,12 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -282,12 +274,10 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -296,30 +286,26 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -332,31 +318,27 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -366,9 +348,8 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -377,7 +358,6 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -385,9 +365,8 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.EnumerationLiteral_3066, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationLiteralEditPartCLN.VISUAL_ID));

 		}

 		return parser;

@@ -397,10 +376,8 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -429,8 +406,8 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -438,8 +415,8 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -448,56 +425,47 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -519,15 +487,14 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -541,7 +508,6 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -556,27 +522,26 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -584,18 +549,15 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -604,27 +566,19 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -632,7 +586,6 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -640,13 +593,12 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -656,10 +608,9 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -670,9 +621,8 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -693,31 +643,30 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -725,7 +674,7 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -735,13 +684,12 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -751,25 +699,20 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -779,13 +722,12 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -801,7 +743,6 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -810,7 +751,6 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -819,41 +759,36 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

-		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

+		if(UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

 			refreshUnderline();

 		}

 		super.handleNotificationEvent(event);

@@ -862,7 +797,6 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java
index 6453fbeab9f..a4f778d9c3d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_2067, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java
index 235e5b5fc96..4d9ff0d61df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_3079, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
index ff41aced447..8be724d9497 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7071;
-
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ExecutionEnvironmentCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7071;

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ExecutionEnvironmentCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
index 91b8490225a..06f4cd2d20d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7058;
-
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ExecutionEnvironmentCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7058;

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ExecutionEnvironmentCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
index 402656d4f47..e61e0c09aee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExecutionEnvironmentCompositeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExecutionEnvironmentCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,24 +119,23 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ExecutionEnvironmentCompositeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -154,74 +155,61 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ExecutionEnvironmentCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ExecutionEnvironmentCompositeFigure getPrimaryShape() {

-		return (ExecutionEnvironmentCompositeFigure) primaryShape;

+		return (ExecutionEnvironmentCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ExecutionEnvironmentCompositeNameEditPart) {

-			((ExecutionEnvironmentCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ExecutionEnvironmentCompositeNameEditPart) {

+			((ExecutionEnvironmentCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {

+		if(childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((ExecutionEnvironmentCompositeCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ExecutionEnvironmentCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -229,16 +217,16 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ExecutionEnvironmentCompositeNameEditPart) {

+		if(childEditPart instanceof ExecutionEnvironmentCompositeNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {

+		if(childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((ExecutionEnvironmentCompositeCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((ExecutionEnvironmentCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -247,9 +235,8 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -258,9 +245,8 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -269,12 +255,11 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {

+		if(editPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -283,21 +268,15 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ExecutionEnvironmentCompositeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof ExecutionEnvironmentCompositeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -305,29 +284,24 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -338,9 +312,8 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -349,9 +322,8 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -359,7 +331,6 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -367,17 +338,15 @@ public class ExecutionEnvironmentCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
index 695a278fec3..c5ce2e85082 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExecutionEnvironmentCompositeItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExecutionEnvironmentCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,24 +119,23 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ExecutionEnvironmentCompositeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -154,74 +155,61 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ExecutionEnvironmentCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ExecutionEnvironmentCompositeFigure getPrimaryShape() {

-		return (ExecutionEnvironmentCompositeFigure) primaryShape;

+		return (ExecutionEnvironmentCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ExecutionEnvironmentCompositeNameEditPartCN) {

-			((ExecutionEnvironmentCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ExecutionEnvironmentCompositeNameEditPartCN) {

+			((ExecutionEnvironmentCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((ExecutionEnvironmentCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ExecutionEnvironmentCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -229,16 +217,16 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ExecutionEnvironmentCompositeNameEditPartCN) {

+		if(childEditPart instanceof ExecutionEnvironmentCompositeNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((ExecutionEnvironmentCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((ExecutionEnvironmentCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -247,9 +235,8 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -258,9 +245,8 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -269,12 +255,11 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {

+		if(editPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -283,21 +268,15 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ExecutionEnvironmentCompositeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof ExecutionEnvironmentCompositeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -305,29 +284,24 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -338,9 +312,8 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -349,9 +322,8 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -359,7 +331,6 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -367,17 +338,15 @@ public class ExecutionEnvironmentCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPart.java
index 73671566797..a70a5b82dd7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ExecutionEnvironment_2071, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPart extends Floating
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPartCN.java
index f361adf7931..cd3570904dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ExecutionEnvironment_3083, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ExecutionEnvironmentCompositeFloatingLabelEditPartCN extends Floati
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java
index 8343d1b343b..fd391c710d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ExecutionEnvironment_2071, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java
index 82b4d3edf02..11a20704afa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ExecutionEnvironment_3083, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
index 60ebb67f6db..054b7a8bdf6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExpressionItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExpressionItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ExpressionFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ExpressionNameEditPart) {

-			((ExpressionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ExpressionNameEditPart) {

+			((ExpressionNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ExpressionNameEditPart) {

+		if(childEditPart instanceof ExpressionNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ExpressionFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof ExpressionFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class ExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExpressionNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionFloatingLabelEditPart.java
index 4a39aa0dafc..f8bc91ccffc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Expression_2103, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExpressionFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java
index 55a4f5b96cb..8071116eed2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Expression_2103, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExpressionNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
index 30a87e2bbc9..af512ca6ad8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7067;
-
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.FunctionBehaviorCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7067;

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.FunctionBehaviorCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
index 34d975d7fe2..99bd045c5fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7054;
-
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.FunctionBehaviorCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7054;

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.FunctionBehaviorCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
index d09f575f3bb..78dfe7d23ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.FunctionBehaviorCompositeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FunctionBehaviorCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,25 +119,24 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case FunctionBehaviorCompositeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 				case ParameterEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -155,84 +156,67 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new FunctionBehaviorCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public FunctionBehaviorCompositeFigure getPrimaryShape() {

-		return (FunctionBehaviorCompositeFigure) primaryShape;

+		return (FunctionBehaviorCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof FunctionBehaviorCompositeNameEditPart) {

-			((FunctionBehaviorCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof FunctionBehaviorCompositeNameEditPart) {

+			((FunctionBehaviorCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {

+		if(childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((FunctionBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((FunctionBehaviorCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof ParameterEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -240,20 +224,20 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof FunctionBehaviorCompositeNameEditPart) {

+		if(childEditPart instanceof FunctionBehaviorCompositeNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {

+		if(childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((FunctionBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((FunctionBehaviorCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof ParameterEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -262,9 +246,8 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -273,9 +256,8 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -284,12 +266,11 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {

+		if(editPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -298,21 +279,15 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof FunctionBehaviorCompositeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof FunctionBehaviorCompositeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -320,29 +295,24 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -353,9 +323,8 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -364,9 +333,8 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -374,7 +342,6 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -382,17 +349,15 @@ public class FunctionBehaviorCompositeEditPart extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
index 4eb8462e899..e3a6316e192 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.FunctionBehaviorCompositeItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FunctionBehaviorCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,25 +119,24 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case FunctionBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 				case ParameterEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -155,84 +156,67 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new FunctionBehaviorCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public FunctionBehaviorCompositeFigure getPrimaryShape() {

-		return (FunctionBehaviorCompositeFigure) primaryShape;

+		return (FunctionBehaviorCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof FunctionBehaviorCompositeNameEditPartCN) {

-			((FunctionBehaviorCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof FunctionBehaviorCompositeNameEditPartCN) {

+			((FunctionBehaviorCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((FunctionBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((FunctionBehaviorCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof ParameterEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -240,20 +224,20 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof FunctionBehaviorCompositeNameEditPartCN) {

+		if(childEditPart instanceof FunctionBehaviorCompositeNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((FunctionBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((FunctionBehaviorCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof ParameterEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -262,9 +246,8 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -273,9 +256,8 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -284,12 +266,11 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {

+		if(editPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -298,21 +279,15 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof FunctionBehaviorCompositeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof FunctionBehaviorCompositeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -320,29 +295,24 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -353,9 +323,8 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -364,9 +333,8 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -374,7 +342,6 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -382,17 +349,15 @@ public class FunctionBehaviorCompositeEditPartCN extends RoundedCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPart.java
index 8b56ad279f1..9b6ab255e3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.FunctionBehavior_2064, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class FunctionBehaviorCompositeFloatingLabelEditPart extends FloatingLabe
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPartCN.java
index a899ca5c565..8ca943af557 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.FunctionBehavior_3076, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class FunctionBehaviorCompositeFloatingLabelEditPartCN extends FloatingLa
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java
index 09d1b43ae54..fa5c1a50102 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.FunctionBehavior_2064, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java
index 5ed8d5aa12e..136fce6bc5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.FunctionBehavior_3076, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
index 0d5c8ca7df1..7ba4d167a4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java
index a27cda73ddd..99ac9af0b96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,11 +16,10 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.GeneralizationItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -42,20 +41,18 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new GeneralizationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {

-			((GeneralizationAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+		if(childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {

+			((GeneralizationAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

@@ -63,9 +60,8 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -75,7 +71,7 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {

+		if(childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {

 			return true;

 		}

 		return false;

@@ -84,9 +80,8 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -94,13 +89,12 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new GeneralizationFigure();

 	}

@@ -108,8 +102,7 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public GeneralizationFigure getPrimaryShape() {

-		return (GeneralizationFigure) getFigure();

+		return (GeneralizationFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
index 96339fefc2c..62f74de8534 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InformationFlow_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
index 7bbb62176dd..9df63bab22e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -114,14 +113,12 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -140,22 +137,20 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-		installEditPolicy(AbstractCustomLabelEditPolicy.SPECIFIC_NAME_LABEL_POLICY, new InformationFlowCustomLabelEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

+		installEditPolicy(AbstractCustomLabelEditPolicy.SPECIFIC_NAME_LABEL_POLICY, new InformationFlowCustomLabelEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -164,12 +159,12 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -177,12 +172,12 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -190,12 +185,12 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -203,20 +198,19 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -227,7 +221,6 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -235,7 +228,6 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -243,7 +235,6 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -253,7 +244,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 */

 	protected EObject getParserElement() {

 		EObject element = resolveSemanticElement();

-		return element != null ? element : (View) getModel();

+		return element != null ? element : (View)getModel();

 	}

 

 	/**

@@ -269,12 +260,10 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -283,30 +272,26 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -319,31 +304,27 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -353,9 +334,8 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -364,7 +344,6 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -372,9 +351,8 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InformationFlow_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowConveyedLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -384,10 +362,8 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -416,8 +392,8 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -425,8 +401,8 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -435,56 +411,47 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -506,15 +473,14 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -528,7 +494,6 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -543,20 +508,20 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +529,15 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +546,19 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +566,6 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +573,12 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +588,9 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +601,8 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +623,30 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +654,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +664,12 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +679,20 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +702,12 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,45 +723,38 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java
index 4068d7dc1d8..18b932ca7b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,11 +16,11 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeInformationFlowLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationFlowFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InformationFlowItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -42,24 +42,21 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InformationFlowItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeInformationFlowLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeInformationFlowLabelDisplayEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InformationFlowConveyedLabelEditPart) {

-			((InformationFlowConveyedLabelEditPart) childEditPart).setLabel(

-					getPrimaryShape().getConveyedLabel());

+		if(childEditPart instanceof InformationFlowConveyedLabelEditPart) {

+			((InformationFlowConveyedLabelEditPart)childEditPart).setLabel(getPrimaryShape().getConveyedLabel());

 		}

-		if (childEditPart instanceof InformationFlowAppliedStereotypeEditPart) {

-			((InformationFlowAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+		if(childEditPart instanceof InformationFlowAppliedStereotypeEditPart) {

+			((InformationFlowAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

@@ -67,9 +64,8 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -79,10 +75,10 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InformationFlowConveyedLabelEditPart) {

+		if(childEditPart instanceof InformationFlowConveyedLabelEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof InformationFlowAppliedStereotypeEditPart) {

+		if(childEditPart instanceof InformationFlowAppliedStereotypeEditPart) {

 			return true;

 		}

 		return false;

@@ -91,9 +87,8 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -101,13 +96,12 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new InformationFlowFigure();

 	}

@@ -115,8 +109,7 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public InformationFlowFigure getPrimaryShape() {

-		return (InformationFlowFigure) getFigure();

+		return (InformationFlowFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
index de5d86e5ca6..85b490e260b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,7 +48,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayE
 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InformationItemItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -80,10 +81,10 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InformationItemItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -101,22 +102,21 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case InformationItemFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -136,57 +136,49 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new InformationItemFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public InformationItemFigure getPrimaryShape() {

-		return (InformationItemFigure) primaryShape;

+		return (InformationItemFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InformationItemNameEditPart) {

-			((InformationItemNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof InformationItemNameEditPart) {

+			((InformationItemNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -194,7 +186,7 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InformationItemNameEditPart) {

+		if(childEditPart instanceof InformationItemNameEditPart) {

 			return true;

 		}

 		return false;

@@ -203,9 +195,8 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -214,9 +205,8 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -225,9 +215,8 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -236,21 +225,15 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof InformationItemFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof InformationItemFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(80, 40);

 		return result;

@@ -258,29 +241,24 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -291,9 +269,8 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -302,9 +279,8 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -312,7 +288,6 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -320,17 +295,15 @@ public class InformationItemEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
index abda0ea7bc7..42a394721c1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,7 +48,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayE
 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InformationItemItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -80,10 +81,10 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InformationItemItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -101,22 +102,21 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case InformationItemFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -136,57 +136,49 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new InformationItemFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public InformationItemFigure getPrimaryShape() {

-		return (InformationItemFigure) primaryShape;

+		return (InformationItemFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InformationItemNameEditPartCN) {

-			((InformationItemNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof InformationItemNameEditPartCN) {

+			((InformationItemNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -194,7 +186,7 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InformationItemNameEditPartCN) {

+		if(childEditPart instanceof InformationItemNameEditPartCN) {

 			return true;

 		}

 		return false;

@@ -203,9 +195,8 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -214,9 +205,8 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -225,9 +215,8 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -236,21 +225,15 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof InformationItemFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof InformationItemFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(80, 40);

 		return result;

@@ -258,29 +241,24 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -291,9 +269,8 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -302,9 +279,8 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -312,7 +288,6 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -320,17 +295,15 @@ public class InformationItemEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPart.java
index c212912a368..039c5f60b38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InformationItem_2080, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class InformationItemFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPartCN.java
index a5b8dc28ff5..512f34892cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InformationItem_3094, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class InformationItemFloatingLabelEditPartCN extends FloatingLabelEditPar
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java
index 463023540cc..68563f6e4ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InformationItem_2080, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java
index 4fd5532d2ae..fb30fbfc9aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InformationItem_3094, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
index 0bd1843e65b..c46ff0e1336 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InstanceValueItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InstanceValueItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case InstanceValueFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InstanceValueNameEditPart) {

-			((InstanceValueNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof InstanceValueNameEditPart) {

+			((InstanceValueNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InstanceValueNameEditPart) {

+		if(childEditPart instanceof InstanceValueNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof InstanceValueFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof InstanceValueFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class InstanceValueEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceValueNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueFloatingLabelEditPart.java
index ec4ad5568a8..2eb6f64e024 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InstanceValue_2108, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InstanceValueFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class InstanceValueFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java
index 9f514d1784d..e01faea4134 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InstanceValue_2108, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InstanceValueNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
index 7c3a115bfd5..1094fd00b83 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class InteractionCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7064;
-
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.InteractionCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7064;

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.InteractionCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
index 79213406885..b28ce9c1824 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class InteractionCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7051;
-
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.InteractionCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7051;

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.InteractionCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
index 77c0814b083..aa7b41b7bfd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionCompositeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,25 +119,24 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case InteractionCompositeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 				case ParameterEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -155,84 +156,67 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new InteractionCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public InteractionCompositeFigure getPrimaryShape() {

-		return (InteractionCompositeFigure) primaryShape;

+		return (InteractionCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InteractionCompositeNameEditPart) {

-			((InteractionCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof InteractionCompositeNameEditPart) {

+			((InteractionCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof InteractionCompositeCompartmentEditPart) {

+		if(childEditPart instanceof InteractionCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((InteractionCompositeCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((InteractionCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof ParameterEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -240,20 +224,20 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InteractionCompositeNameEditPart) {

+		if(childEditPart instanceof InteractionCompositeNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof InteractionCompositeCompartmentEditPart) {

+		if(childEditPart instanceof InteractionCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((InteractionCompositeCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((InteractionCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof ParameterEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -262,9 +246,8 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -273,9 +256,8 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -284,12 +266,11 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof InteractionCompositeCompartmentEditPart) {

+		if(editPart instanceof InteractionCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -298,21 +279,15 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof InteractionCompositeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof InteractionCompositeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -320,29 +295,24 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -353,9 +323,8 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -364,9 +333,8 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -374,7 +342,6 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -382,17 +349,15 @@ public class InteractionCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionCompositeNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
index c4c1e923302..02ae2d5e1f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionCompositeItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,25 +119,24 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case InteractionCompositeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 				case ParameterEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -155,84 +156,67 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new InteractionCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public InteractionCompositeFigure getPrimaryShape() {

-		return (InteractionCompositeFigure) primaryShape;

+		return (InteractionCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InteractionCompositeNameEditPartCN) {

-			((InteractionCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof InteractionCompositeNameEditPartCN) {

+			((InteractionCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof InteractionCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof InteractionCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((InteractionCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((InteractionCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof ParameterEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -240,20 +224,20 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InteractionCompositeNameEditPartCN) {

+		if(childEditPart instanceof InteractionCompositeNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof InteractionCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof InteractionCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((InteractionCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((InteractionCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof ParameterEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -262,9 +246,8 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -273,9 +256,8 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -284,12 +266,11 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof InteractionCompositeCompartmentEditPartCN) {

+		if(editPart instanceof InteractionCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -298,21 +279,15 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof InteractionCompositeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof InteractionCompositeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -320,29 +295,24 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -353,9 +323,8 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -364,9 +333,8 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -374,7 +342,6 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -382,17 +349,15 @@ public class InteractionCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionCompositeNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPart.java
index 862b4ded18b..4c2b77fb5db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Interaction_2061, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class InteractionCompositeFloatingLabelEditPart extends FloatingLabelEdit
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPartCN.java
index 53dacc1e6b6..b9389b0bb1a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Interaction_3073, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class InteractionCompositeFloatingLabelEditPartCN extends FloatingLabelEd
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java
index a163b13a107..9eba8bb923e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Interaction_2061, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java
index 6c77a4029b0..b291e0a43f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Interaction_3073, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
index 5c6ba3b0df0..aee217157d1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -32,7 +34,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPa
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionConstraintItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -66,10 +67,10 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionConstraintItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -85,7 +86,7 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -105,48 +106,40 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ConstraintFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ConstraintFigure getPrimaryShape() {

-		return (ConstraintFigure) primaryShape;

+		return (ConstraintFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InteractionConstraintNameEditPart) {

-			((InteractionConstraintNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof InteractionConstraintNameEditPart) {

+			((InteractionConstraintNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-		if (childEditPart instanceof InteractionConstraintSpecificationEditPart) {

-			((InteractionConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+		if(childEditPart instanceof InteractionConstraintSpecificationEditPart) {

+			((InteractionConstraintSpecificationEditPart)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -154,10 +147,10 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InteractionConstraintNameEditPart) {

+		if(childEditPart instanceof InteractionConstraintNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof InteractionConstraintSpecificationEditPart) {

+		if(childEditPart instanceof InteractionConstraintSpecificationEditPart) {

 			return true;

 		}

 		return false;

@@ -166,9 +159,8 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -177,9 +169,8 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -188,15 +179,10 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -204,29 +190,24 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -237,9 +218,8 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -248,9 +228,8 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -258,7 +237,6 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -266,17 +244,15 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionConstraintNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
index 5ce2b772787..1e7c115b21f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -32,7 +34,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPa
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionConstraintItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -66,10 +67,10 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionConstraintItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -85,7 +86,7 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -105,48 +106,40 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ConstraintFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ConstraintFigure getPrimaryShape() {

-		return (ConstraintFigure) primaryShape;

+		return (ConstraintFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InteractionConstraintNameEditPartCN) {

-			((InteractionConstraintNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof InteractionConstraintNameEditPartCN) {

+			((InteractionConstraintNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-		if (childEditPart instanceof InteractionConstraintSpecificationEditPartCN) {

-			((InteractionConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+		if(childEditPart instanceof InteractionConstraintSpecificationEditPartCN) {

+			((InteractionConstraintSpecificationEditPartCN)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -154,10 +147,10 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InteractionConstraintNameEditPartCN) {

+		if(childEditPart instanceof InteractionConstraintNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof InteractionConstraintSpecificationEditPartCN) {

+		if(childEditPart instanceof InteractionConstraintSpecificationEditPartCN) {

 			return true;

 		}

 		return false;

@@ -166,9 +159,8 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -177,9 +169,8 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -188,15 +179,10 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -204,29 +190,24 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -237,9 +218,8 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -248,9 +228,8 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -258,7 +237,6 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -266,17 +244,15 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionConstraintNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java
index 360efa6f965..b86fb8c8225 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionConstraint_2113, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java
index 63c057247fd..2a59ef25d76 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionConstraint_3119, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java
index 8012ffbc3ce..dd65b8a490b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -110,14 +110,12 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -132,7 +130,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -144,12 +141,12 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -157,12 +154,12 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -170,12 +167,12 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -183,20 +180,19 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -207,7 +203,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -215,7 +210,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -223,7 +217,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -248,12 +241,10 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -262,30 +253,26 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -298,31 +285,27 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -332,9 +315,8 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -343,7 +325,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -351,9 +332,8 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionConstraint_2113, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintSpecificationEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -363,10 +343,8 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -395,8 +373,8 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -404,8 +382,8 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -414,56 +392,47 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -485,15 +454,14 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -507,7 +475,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -522,27 +489,26 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -550,18 +516,15 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -570,27 +533,19 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -598,7 +553,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,13 +560,12 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -622,10 +575,9 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -636,9 +588,8 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -659,31 +610,30 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -691,7 +641,7 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,13 +651,12 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -717,25 +666,20 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -745,13 +689,12 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -767,7 +710,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -776,7 +718,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -785,32 +726,27 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -823,7 +759,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -837,7 +772,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -847,18 +781,15 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -866,6 +797,5 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java
index 88c32582ab1..fcd2e4a08de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -110,14 +110,12 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -132,7 +130,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -144,12 +141,12 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -157,12 +154,12 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -170,12 +167,12 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -183,20 +180,19 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -207,7 +203,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -215,7 +210,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -223,7 +217,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -248,12 +241,10 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -262,30 +253,26 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -298,31 +285,27 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -332,9 +315,8 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -343,7 +325,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -351,9 +332,8 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionConstraint_3119, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintSpecificationEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -363,10 +343,8 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -395,8 +373,8 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -404,8 +382,8 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -414,56 +392,47 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -485,15 +454,14 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -507,7 +475,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -522,27 +489,26 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -550,18 +516,15 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -570,27 +533,19 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -598,7 +553,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,13 +560,12 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -622,10 +575,9 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -636,9 +588,8 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -659,31 +610,30 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -691,7 +641,7 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,13 +651,12 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -717,25 +666,20 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -745,13 +689,12 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -767,7 +710,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -776,7 +718,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -785,32 +726,27 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -823,7 +759,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -837,7 +772,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -847,18 +781,15 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -866,6 +797,5 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
index 37df6a9ae34..f75c5a8caa7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -47,7 +49,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierCon
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InterfaceItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -81,10 +82,10 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -103,22 +104,21 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case InterfaceFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -138,57 +138,49 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new InterfaceCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public InterfaceCompositeFigure getPrimaryShape() {

-		return (InterfaceCompositeFigure) primaryShape;

+		return (InterfaceCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InterfaceNameEditPart) {

-			((InterfaceNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof InterfaceNameEditPart) {

+			((InterfaceNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -196,7 +188,7 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InterfaceNameEditPart) {

+		if(childEditPart instanceof InterfaceNameEditPart) {

 			return true;

 		}

 		return false;

@@ -205,9 +197,8 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -216,9 +207,8 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -227,9 +217,8 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -238,21 +227,15 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof InterfaceFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof InterfaceFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -260,29 +243,24 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -293,9 +271,8 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -304,9 +281,8 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -314,7 +290,6 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -322,17 +297,15 @@ public class InterfaceEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
index 85eb6cd0e71..e56c97191b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -47,7 +49,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierCon
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InterfaceItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -81,10 +82,10 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -103,22 +104,21 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case InterfaceFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -138,57 +138,49 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new InterfaceCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public InterfaceCompositeFigure getPrimaryShape() {

-		return (InterfaceCompositeFigure) primaryShape;

+		return (InterfaceCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InterfaceNameEditPartCN) {

-			((InterfaceNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof InterfaceNameEditPartCN) {

+			((InterfaceNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -196,7 +188,7 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InterfaceNameEditPartCN) {

+		if(childEditPart instanceof InterfaceNameEditPartCN) {

 			return true;

 		}

 		return false;

@@ -205,9 +197,8 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -216,9 +207,8 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -227,9 +217,8 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -238,21 +227,15 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof InterfaceFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof InterfaceFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -260,29 +243,24 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -293,9 +271,8 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -304,9 +281,8 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -314,7 +290,6 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -322,17 +297,15 @@ public class InterfaceEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPart.java
index 5bc47c0ea87..95011c8ccc8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_2076, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class InterfaceFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPartCN.java
index 013bae3b94b..53321054ef8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_3087, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class InterfaceFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java
index 0e29b239a4f..7a1bbf9d535 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_2076, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java
index 651352d0b81..0c82419ae0a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_3087, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
index 859aad761c9..20d055006da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java
index 2f94e063bb6..fbea73149c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,11 +16,10 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InterfaceRealizationItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -42,24 +41,21 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceRealizationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InterfaceRealizationNameEditPart) {

-			((InterfaceRealizationNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof InterfaceRealizationNameEditPart) {

+			((InterfaceRealizationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

-		if (childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {

-			((InterfaceRealizationAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+		if(childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {

+			((InterfaceRealizationAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

@@ -67,9 +63,8 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -79,10 +74,10 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof InterfaceRealizationNameEditPart) {

+		if(childEditPart instanceof InterfaceRealizationNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {

+		if(childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {

 			return true;

 		}

 		return false;

@@ -91,9 +86,8 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -101,13 +95,12 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new InterfaceRealizationFigure();

 	}

@@ -115,8 +108,7 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public InterfaceRealizationFigure getPrimaryShape() {

-		return (InterfaceRealizationFigure) getFigure();

+		return (InterfaceRealizationFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
index 2353003d94d..dd01ca5ffa4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,31 +619,30 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -701,7 +650,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -711,13 +660,12 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -727,25 +675,20 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -755,13 +698,12 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -777,45 +719,38 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
index 67e7c7d0a6f..ad8972d909d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -32,7 +34,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPa
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.IntervalConstraintItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -66,10 +67,10 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new IntervalConstraintItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -85,7 +86,7 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -105,48 +106,40 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ConstraintFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ConstraintFigure getPrimaryShape() {

-		return (ConstraintFigure) primaryShape;

+		return (ConstraintFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof IntervalConstraintNameEditPart) {

-			((IntervalConstraintNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof IntervalConstraintNameEditPart) {

+			((IntervalConstraintNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-		if (childEditPart instanceof IntervalConstraintSpecificationEditPart) {

-			((IntervalConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+		if(childEditPart instanceof IntervalConstraintSpecificationEditPart) {

+			((IntervalConstraintSpecificationEditPart)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -154,10 +147,10 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof IntervalConstraintNameEditPart) {

+		if(childEditPart instanceof IntervalConstraintNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof IntervalConstraintSpecificationEditPart) {

+		if(childEditPart instanceof IntervalConstraintSpecificationEditPart) {

 			return true;

 		}

 		return false;

@@ -166,9 +159,8 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -177,9 +169,8 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -188,15 +179,10 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -204,29 +190,24 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -237,9 +218,8 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -248,9 +228,8 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -258,7 +237,6 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -266,17 +244,15 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(IntervalConstraintNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
index fbec9622474..1c53aba4464 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -32,7 +34,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPa
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.IntervalConstraintItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -66,10 +67,10 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new IntervalConstraintItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -85,7 +86,7 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -105,48 +106,40 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ConstraintFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ConstraintFigure getPrimaryShape() {

-		return (ConstraintFigure) primaryShape;

+		return (ConstraintFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof IntervalConstraintNameEditPartCN) {

-			((IntervalConstraintNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof IntervalConstraintNameEditPartCN) {

+			((IntervalConstraintNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-		if (childEditPart instanceof IntervalConstraintSpecificationEditPartCN) {

-			((IntervalConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+		if(childEditPart instanceof IntervalConstraintSpecificationEditPartCN) {

+			((IntervalConstraintSpecificationEditPartCN)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -154,10 +147,10 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof IntervalConstraintNameEditPartCN) {

+		if(childEditPart instanceof IntervalConstraintNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof IntervalConstraintSpecificationEditPartCN) {

+		if(childEditPart instanceof IntervalConstraintSpecificationEditPartCN) {

 			return true;

 		}

 		return false;

@@ -166,9 +159,8 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -177,9 +169,8 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -188,15 +179,10 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -204,29 +190,24 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -237,9 +218,8 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -248,9 +228,8 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -258,7 +237,6 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -266,17 +244,15 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(IntervalConstraintNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java
index 8369335930f..66220976e8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.IntervalConstraint_2112, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalConstraintNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java
index fcdb6fcf551..bcf69b2eb10 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.IntervalConstraint_3118, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalConstraintNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java
index a99fbaf297e..df4fc713d8b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -110,14 +110,12 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -132,7 +130,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -144,12 +141,12 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -157,12 +154,12 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -170,12 +167,12 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -183,20 +180,19 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -207,7 +203,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -215,7 +210,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -223,7 +217,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -248,12 +241,10 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -262,30 +253,26 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -298,31 +285,27 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -332,9 +315,8 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -343,7 +325,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -351,9 +332,8 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.IntervalConstraint_2112, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalConstraintSpecificationEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -363,10 +343,8 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -395,8 +373,8 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -404,8 +382,8 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -414,56 +392,47 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -485,15 +454,14 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -507,7 +475,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -522,27 +489,26 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -550,18 +516,15 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -570,27 +533,19 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -598,7 +553,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,13 +560,12 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -622,10 +575,9 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -636,9 +588,8 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -659,31 +610,30 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -691,7 +641,7 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,13 +651,12 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -717,25 +666,20 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -745,13 +689,12 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -767,7 +710,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -776,7 +718,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -785,32 +726,27 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -823,7 +759,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -837,7 +772,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -847,18 +781,15 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -866,6 +797,5 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java
index 7b571cc1e61..821db1170e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -110,14 +110,12 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -132,7 +130,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -144,12 +141,12 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -157,12 +154,12 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -170,12 +167,12 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -183,20 +180,19 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -207,7 +203,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -215,7 +210,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -223,7 +217,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -248,12 +241,10 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -262,30 +253,26 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -298,31 +285,27 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -332,9 +315,8 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -343,7 +325,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -351,9 +332,8 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.IntervalConstraint_3118, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalConstraintSpecificationEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -363,10 +343,8 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -395,8 +373,8 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -404,8 +382,8 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -414,56 +392,47 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -485,15 +454,14 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -507,7 +475,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -522,27 +489,26 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -550,18 +516,15 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -570,27 +533,19 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -598,7 +553,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,13 +560,12 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -622,10 +575,9 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -636,9 +588,8 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -659,31 +610,30 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -691,7 +641,7 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,13 +651,12 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -717,25 +666,20 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -745,13 +689,12 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -767,7 +710,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -776,7 +718,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -785,32 +726,27 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -823,7 +759,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -837,7 +772,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -847,18 +781,15 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -866,6 +797,5 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
index 477eec1e9e9..c034ad21d38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.IntervalItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new IntervalItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case IntervalFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof IntervalNameEditPart) {

-			((IntervalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof IntervalNameEditPart) {

+			((IntervalNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof IntervalNameEditPart) {

+		if(childEditPart instanceof IntervalNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof IntervalFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof IntervalFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class IntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(IntervalNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalFloatingLabelEditPart.java
index f59e0f08359..f870d40d8a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Interval_2107, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class IntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java
index baca353fad7..93873dc6303 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Interval_2107, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LinkDescriptorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LinkDescriptorEditPart.java
index d486d491097..efe52a9b810 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LinkDescriptorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LinkDescriptorEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -40,7 +40,6 @@ public class LinkDescriptorEditPart extends ConnectionEditPart implements ITreeB
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());

@@ -49,13 +48,12 @@ public class LinkDescriptorEditPart extends ConnectionEditPart implements ITreeB
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new SimpleDashedEdgeFigure();

 	}

@@ -63,8 +61,7 @@ public class LinkDescriptorEditPart extends ConnectionEditPart implements ITreeB
 	/**

 	 * @generated

 	 */

-	@Override

 	public SimpleDashedEdgeFigure getPrimaryShape() {

-		return (SimpleDashedEdgeFigure) getFigure();

+		return (SimpleDashedEdgeFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
index d94b8755944..670ce93a5dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralBooleanItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralBooleanItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case LiteralBooleanFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof LiteralBooleanNameEditPart) {

-			((LiteralBooleanNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof LiteralBooleanNameEditPart) {

+			((LiteralBooleanNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof LiteralBooleanNameEditPart) {

+		if(childEditPart instanceof LiteralBooleanNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof LiteralBooleanFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof LiteralBooleanFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class LiteralBooleanEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralBooleanNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanFloatingLabelEditPart.java
index 79bf741824b..9bdb2f51ab4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralBoolean_2095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralBooleanFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class LiteralBooleanFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java
index 4784c7dc024..613ee23fadd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralBoolean_2095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralBooleanNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
index ad5fb3f52bb..539b9e91241 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralIntegerItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralIntegerItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case LiteralIntegerFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof LiteralIntegerNameEditPart) {

-			((LiteralIntegerNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof LiteralIntegerNameEditPart) {

+			((LiteralIntegerNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof LiteralIntegerNameEditPart) {

+		if(childEditPart instanceof LiteralIntegerNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof LiteralIntegerFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof LiteralIntegerFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class LiteralIntegerEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralIntegerNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerFloatingLabelEditPart.java
index fe3c0f033f8..2a0530ffeaa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralInteger_2096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralIntegerFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class LiteralIntegerFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java
index fd9f805a3ce..09c63415420 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralInteger_2096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralIntegerNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
index 41f9dd82924..19d90ab50fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralNullItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralNullItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case LiteralNullFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof LiteralNullNameEditPart) {

-			((LiteralNullNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof LiteralNullNameEditPart) {

+			((LiteralNullNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof LiteralNullNameEditPart) {

+		if(childEditPart instanceof LiteralNullNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof LiteralNullFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof LiteralNullFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class LiteralNullEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralNullNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullFloatingLabelEditPart.java
index bcd84930e60..615b81ebe33 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralNull_2097, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralNullFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class LiteralNullFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java
index 57955df40f6..52e9174196d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralNull_2097, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralNullNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
index fc5d6f5d5a9..e9afae1e795 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralStringItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralStringItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case LiteralStringFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof LiteralStringNameEditPart) {

-			((LiteralStringNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof LiteralStringNameEditPart) {

+			((LiteralStringNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof LiteralStringNameEditPart) {

+		if(childEditPart instanceof LiteralStringNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof LiteralStringFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof LiteralStringFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class LiteralStringEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralStringNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringFloatingLabelEditPart.java
index 32c66f2a180..1f99c4c8f29 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralString_2098, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralStringFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class LiteralStringFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java
index fbf4f4be616..bc62dfd7176 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralString_2098, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralStringNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
index 6caf9e1511c..31f61f18025 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralUnlimitedNaturalItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralUnlimitedNaturalItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case LiteralUnlimitedNaturalFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof LiteralUnlimitedNaturalNameEditPart) {

-			((LiteralUnlimitedNaturalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof LiteralUnlimitedNaturalNameEditPart) {

+			((LiteralUnlimitedNaturalNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof LiteralUnlimitedNaturalNameEditPart) {

+		if(childEditPart instanceof LiteralUnlimitedNaturalNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof LiteralUnlimitedNaturalFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof LiteralUnlimitedNaturalFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class LiteralUnlimitedNaturalEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalFloatingLabelEditPart.java
index 1875fe2414a..c1e8dc728f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralUnlimitedNatural_2099, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralUnlimitedNaturalFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class LiteralUnlimitedNaturalFloatingLabelEditPart extends FloatingLabelE
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java
index 42ad4885d15..448dd7fd6d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralUnlimitedNatural_2099, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralUnlimitedNaturalNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
index 331e660a3a4..a550cd262e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Manifestation_4012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java
index 583776655ac..d5544171fbe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,11 +16,11 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeManifestationLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ManifestationItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -42,24 +42,21 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ManifestationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeManifestationLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeManifestationLabelDisplayEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ManifestationNameEditPart) {

-			((ManifestationNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ManifestationNameEditPart) {

+			((ManifestationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

-		if (childEditPart instanceof ManifestationAppliedStereotypeEditPart) {

-			((ManifestationAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+		if(childEditPart instanceof ManifestationAppliedStereotypeEditPart) {

+			((ManifestationAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

@@ -67,9 +64,8 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -79,10 +75,10 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart implements
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ManifestationNameEditPart) {

+		if(childEditPart instanceof ManifestationNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof ManifestationAppliedStereotypeEditPart) {

+		if(childEditPart instanceof ManifestationAppliedStereotypeEditPart) {

 			return true;

 		}

 		return false;

@@ -91,9 +87,8 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -101,13 +96,12 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart implements
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new DashedEdgeFigure();

 	}

@@ -115,8 +109,7 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public DashedEdgeFigure getPrimaryShape() {

-		return (DashedEdgeFigure) getFigure();

+		return (DashedEdgeFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
index a084683eb13..f1a3c1f81d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Manifestation_4012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,31 +619,30 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -701,7 +650,7 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -711,13 +660,12 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -727,25 +675,20 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -755,13 +698,12 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -777,45 +719,38 @@ public class ManifestationNameEditPart extends PapyrusLabelEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
index 7f54c652831..82d7eb9cf9b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.NodeCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class NodeCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7072;
-
-	/**
-	 * @generated
-	 */
-	public NodeCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.NodeCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new NodeCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class NodeCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7072;

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.NodeCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
index b14e7051cbd..5a7c74b08b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.NodeCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class NodeCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7059;
-
-	/**
-	 * @generated
-	 */
-	public NodeCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.NodeCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new NodeCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class NodeCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7059;

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.NodeCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
index 7d85b2a9959..1ad75271d65 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,17 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.NodeCompositeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -90,17 +91,16 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new NodeCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

 		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

@@ -119,24 +119,23 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case NodeCompositeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -156,74 +155,61 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new NodeCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public NodeCompositeFigure getPrimaryShape() {

-		return (NodeCompositeFigure) primaryShape;

+		return (NodeCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof NodeCompositeNameEditPart) {

-			((NodeCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof NodeCompositeNameEditPart) {

+			((NodeCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof NodeCompositeCompartmentEditPart) {

+		if(childEditPart instanceof NodeCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((NodeCompositeCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((NodeCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -231,16 +217,16 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof NodeCompositeNameEditPart) {

+		if(childEditPart instanceof NodeCompositeNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof NodeCompositeCompartmentEditPart) {

+		if(childEditPart instanceof NodeCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((NodeCompositeCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((NodeCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -249,9 +235,8 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -260,9 +245,8 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -271,12 +255,11 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof NodeCompositeCompartmentEditPart) {

+		if(editPart instanceof NodeCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -285,21 +268,15 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof NodeCompositeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof NodeCompositeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -307,29 +284,24 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -340,9 +312,8 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -351,9 +322,8 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -361,7 +331,6 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -369,17 +338,15 @@ public class NodeCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NodeCompositeNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
index c605b7b88ef..7253dd01bc2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,17 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.NodeCompositeItemSemanticEditPolicycN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -90,17 +91,16 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new NodeCompositeItemSemanticEditPolicycN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

 		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

@@ -119,24 +119,23 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case NodeCompositeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -156,74 +155,61 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new NodeCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public NodeCompositeFigure getPrimaryShape() {

-		return (NodeCompositeFigure) primaryShape;

+		return (NodeCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof NodeCompositeNameEditPartCN) {

-			((NodeCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof NodeCompositeNameEditPartCN) {

+			((NodeCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof NodeCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof NodeCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((NodeCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((NodeCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -231,16 +217,16 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof NodeCompositeNameEditPartCN) {

+		if(childEditPart instanceof NodeCompositeNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof NodeCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof NodeCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((NodeCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((NodeCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -249,9 +235,8 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -260,9 +245,8 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -271,12 +255,11 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof NodeCompositeCompartmentEditPartCN) {

+		if(editPart instanceof NodeCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -285,21 +268,15 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof NodeCompositeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof NodeCompositeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -307,29 +284,24 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -340,9 +312,8 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -351,9 +322,8 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -361,7 +331,6 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -369,17 +338,15 @@ public class NodeCompositeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NodeCompositeNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPart.java
index 1ac4a928684..80e73aa4fe1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Node_2072, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class NodeCompositeFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPartCN.java
index 00b39c94d3e..4cf0f2e2f5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Node_3084, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class NodeCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java
index 09228f47048..bb8154abfd7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Node_2072, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java
index 309b3e82698..55963748586 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Node_3084, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
index 0aa3cb66520..e955f8a7320 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7068;
-
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.OpaqueBehaviorCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7068;

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.OpaqueBehaviorCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
index fbda274a169..ef16ed4961e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7055;
-
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.OpaqueBehaviorCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7055;

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.OpaqueBehaviorCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
index 56a17850658..02fa8837cc2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueBehaviorCompositeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueBehaviorCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,25 +119,24 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case OpaqueBehaviorCompositeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 				case ParameterEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -155,84 +156,67 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new OpaqueBehaviorCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public OpaqueBehaviorCompositeFigure getPrimaryShape() {

-		return (OpaqueBehaviorCompositeFigure) primaryShape;

+		return (OpaqueBehaviorCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof OpaqueBehaviorCompositeNameEditPart) {

-			((OpaqueBehaviorCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof OpaqueBehaviorCompositeNameEditPart) {

+			((OpaqueBehaviorCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {

+		if(childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((OpaqueBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((OpaqueBehaviorCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof ParameterEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -240,20 +224,20 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof OpaqueBehaviorCompositeNameEditPart) {

+		if(childEditPart instanceof OpaqueBehaviorCompositeNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {

+		if(childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((OpaqueBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((OpaqueBehaviorCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof ParameterEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -262,9 +246,8 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -273,9 +256,8 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -284,12 +266,11 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {

+		if(editPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -298,21 +279,15 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof OpaqueBehaviorCompositeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof OpaqueBehaviorCompositeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -320,29 +295,24 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -353,9 +323,8 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -364,9 +333,8 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -374,7 +342,6 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -382,17 +349,15 @@ public class OpaqueBehaviorCompositeEditPart extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
index 7dda7f053fd..8cf2b700732 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueBehaviorCompositeItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueBehaviorCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,25 +119,24 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case OpaqueBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 				case ParameterEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -155,84 +156,67 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new OpaqueBehaviorCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public OpaqueBehaviorCompositeFigure getPrimaryShape() {

-		return (OpaqueBehaviorCompositeFigure) primaryShape;

+		return (OpaqueBehaviorCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof OpaqueBehaviorCompositeNameEditPartCN) {

-			((OpaqueBehaviorCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof OpaqueBehaviorCompositeNameEditPartCN) {

+			((OpaqueBehaviorCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((OpaqueBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((OpaqueBehaviorCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof ParameterEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -240,20 +224,20 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof OpaqueBehaviorCompositeNameEditPartCN) {

+		if(childEditPart instanceof OpaqueBehaviorCompositeNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((OpaqueBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((OpaqueBehaviorCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof ParameterEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -262,9 +246,8 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -273,9 +256,8 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -284,12 +266,11 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {

+		if(editPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -298,21 +279,15 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof OpaqueBehaviorCompositeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof OpaqueBehaviorCompositeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -320,29 +295,24 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -353,9 +323,8 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -364,9 +333,8 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -374,7 +342,6 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -382,17 +349,15 @@ public class OpaqueBehaviorCompositeEditPartCN extends RoundedCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPart.java
index 932e2f7befe..dfcecd22ccf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.OpaqueBehavior_2065, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPart extends FloatingLabelE
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPartCN.java
index d1460d85aa6..3936999ad37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.OpaqueBehavior_3077, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class OpaqueBehaviorCompositeFloatingLabelEditPartCN extends FloatingLabe
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java
index 0b1344d74b7..7a56e51fc38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.OpaqueBehavior_2065, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java
index c9fff882f9c..4cce76ac3ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.OpaqueBehavior_3077, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
index 4d6adf25890..8139a95121d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueExpressionItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueExpressionItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case OpaqueExpressionFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof OpaqueExpressionNameEditPart) {

-			((OpaqueExpressionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof OpaqueExpressionNameEditPart) {

+			((OpaqueExpressionNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof OpaqueExpressionNameEditPart) {

+		if(childEditPart instanceof OpaqueExpressionNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof OpaqueExpressionFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof OpaqueExpressionFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class OpaqueExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(OpaqueExpressionNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionFloatingLabelEditPart.java
index d080c008861..a262ccf271f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.OpaqueExpression_2101, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueExpressionFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class OpaqueExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java
index 886bdcc4dbe..27ebba2c963 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.OpaqueExpression_2101, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueExpressionNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java
index 514da82fe40..c24328c01c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -67,13 +67,13 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
 import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

 import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OperationItemSemanticEditPolicyCLN;

 import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextNonResizableEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

@@ -122,14 +122,12 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -144,9 +142,8 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	public DragTracker getDragTracker(Request request) {

-		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {

+		if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) {

 			return null;

 		}

 		return new DragEditPartsTrackerEx(this);

@@ -155,10 +152,9 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OperationItemSemanticEditPolicyCLN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

 		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -168,12 +164,12 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -181,12 +177,12 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -194,12 +190,12 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -207,20 +203,19 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -231,7 +226,6 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -239,7 +233,6 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -247,7 +240,6 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -264,12 +256,12 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -282,12 +274,10 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -296,30 +286,26 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -332,31 +318,27 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -366,9 +348,8 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -377,7 +358,6 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -385,9 +365,8 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3102, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OperationEditPartCLN.VISUAL_ID));

 		}

 		return parser;

@@ -397,10 +376,8 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -429,8 +406,8 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -438,8 +415,8 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -448,56 +425,47 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -519,15 +487,14 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -541,7 +508,6 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -556,27 +522,26 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -584,18 +549,15 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -604,27 +566,19 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -632,7 +586,6 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -640,13 +593,12 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -656,10 +608,9 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -670,9 +621,8 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -693,31 +643,30 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -725,7 +674,7 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -735,13 +684,12 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -751,25 +699,20 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -779,13 +722,12 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -801,7 +743,6 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -810,7 +751,6 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -819,41 +759,36 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

-		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

+		if(UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

 			refreshUnderline();

 		}

 		super.handleNotificationEvent(event);

@@ -862,7 +797,6 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java
index 360a5dd0d55..b25be49ec8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -115,14 +115,12 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -143,7 +141,6 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -155,12 +152,11 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -168,12 +164,11 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

@@ -181,12 +176,12 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -194,12 +189,12 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -207,12 +202,12 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -220,20 +215,19 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -244,7 +238,6 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -252,7 +245,6 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -284,12 +276,10 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -298,30 +288,26 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -334,31 +320,27 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -368,9 +350,8 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -379,7 +360,6 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -387,9 +367,8 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Parameter_3088, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -399,10 +378,8 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -431,8 +408,8 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -440,8 +417,8 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -450,56 +427,47 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -521,15 +489,14 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -543,7 +510,6 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -558,27 +524,26 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -586,18 +551,15 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -606,27 +568,19 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -634,7 +588,6 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -642,13 +595,12 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -658,10 +610,9 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -672,9 +623,8 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -695,7 +645,7 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -706,12 +656,12 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -719,7 +669,7 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -729,13 +679,12 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -745,25 +694,20 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -773,13 +717,12 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -795,31 +738,26 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -832,7 +770,6 @@ public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
index 7ea575490b7..edd7815adf5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -34,6 +34,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -44,11 +46,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPoli
 import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomParameterItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ParameterLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ParameterFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ParameterItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -82,14 +81,12 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ParameterItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParameterItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ParameterLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -107,23 +104,22 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ParameterNameEditPart.VISUAL_ID:

 				case ParameterAppliedStereotypeEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -143,27 +139,24 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

@@ -175,34 +168,27 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ParameterFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ParameterFigure getPrimaryShape() {

-		return (ParameterFigure) primaryShape;

+		return (ParameterFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ParameterNameEditPart) {

+		if(borderItemEditPart instanceof ParameterNameEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else if (borderItemEditPart instanceof ParameterAppliedStereotypeEditPart) {

+		} else if(borderItemEditPart instanceof ParameterAppliedStereotypeEditPart) {

 			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(20, 20);

 		return result;

@@ -210,13 +196,12 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		NodeFigure figure = createNodePlate();

 		figure.setLayoutManager(new StackLayout());

@@ -224,15 +209,12 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 		figure.add(shape);

 		contentPane = setupContentPane(shape);

 		return figure;

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

 	protected IFigure setupContentPane(IFigure nodeShape) {

@@ -242,9 +224,8 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -253,9 +234,8 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -263,7 +243,6 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -271,17 +250,15 @@ public class ParameterEditPart extends RoundedBorderNamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ParameterNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java
index e031e31f59b..79caf14478b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -115,14 +115,12 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -143,7 +141,6 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -155,12 +152,11 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -168,12 +164,11 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

@@ -181,12 +176,12 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -194,12 +189,12 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -207,12 +202,12 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -220,20 +215,19 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -244,7 +238,6 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -252,7 +245,6 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -276,12 +268,12 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -294,12 +286,10 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -308,30 +298,26 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -344,31 +330,27 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -378,9 +360,8 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -389,7 +370,6 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -397,9 +377,8 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Parameter_3088, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -409,10 +388,8 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -441,8 +418,8 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -450,8 +427,8 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -460,56 +437,47 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -531,15 +499,14 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -553,7 +520,6 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -568,27 +534,26 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -596,18 +561,15 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -616,27 +578,19 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -644,7 +598,6 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -652,13 +605,12 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -668,10 +620,9 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -682,9 +633,8 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -705,31 +655,30 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -737,7 +686,7 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -747,13 +696,12 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -763,25 +711,20 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -791,13 +734,12 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -813,31 +755,26 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -850,7 +787,6 @@ public class ParameterNameEditPart extends FloatingLabelEditPart implements ITex
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java
index 2deb75076a6..19233441687 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -115,14 +115,12 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -143,7 +141,6 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -155,12 +152,11 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -168,12 +164,11 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

@@ -181,12 +176,12 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -194,12 +189,12 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -207,12 +202,12 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -220,20 +215,19 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -244,7 +238,6 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -252,7 +245,6 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -284,12 +276,10 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -298,30 +288,26 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -334,31 +320,27 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -368,9 +350,8 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -379,7 +360,6 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -387,9 +367,8 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Port_3069, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -399,10 +378,8 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -431,8 +408,8 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -440,8 +417,8 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -450,56 +427,47 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -521,15 +489,14 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -543,7 +510,6 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -558,27 +524,26 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -586,18 +551,15 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -606,27 +568,19 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -634,7 +588,6 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -642,13 +595,12 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -658,10 +610,9 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -672,9 +623,8 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -695,7 +645,7 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -706,12 +656,12 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -719,7 +669,7 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -729,13 +679,12 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -745,25 +694,20 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -773,13 +717,12 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -795,31 +738,26 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -832,7 +770,6 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
index 3c535928dd0..14a7393ffb3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -34,6 +34,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

@@ -47,11 +49,8 @@ import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocat
 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorPortEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPortItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.PortFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PortItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -85,14 +84,12 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PortItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomPortItemSemanticEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PortLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -112,23 +109,22 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case PortNameEditPart.VISUAL_ID:

 				case PortAppliedStereotypeEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -148,27 +144,24 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

@@ -180,34 +173,27 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.PortFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public PortFigure getPrimaryShape() {

-		return (PortFigure) primaryShape;

+		return (PortFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof PortNameEditPart) {

+		if(borderItemEditPart instanceof PortNameEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else if (borderItemEditPart instanceof PortAppliedStereotypeEditPart) {

+		} else if(borderItemEditPart instanceof PortAppliedStereotypeEditPart) {

 			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(20, 20);

 		return result;

@@ -215,13 +201,12 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		NodeFigure figure = createNodePlate();

 		figure.setLayoutManager(new StackLayout());

@@ -229,15 +214,12 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 		figure.add(shape);

 		contentPane = setupContentPane(shape);

 		return figure;

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

 	protected IFigure setupContentPane(IFigure nodeShape) {

@@ -247,9 +229,8 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -258,9 +239,8 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -268,7 +248,6 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -276,17 +255,15 @@ public class PortEditPart extends RoundedBorderNamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PortNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
index 054bc09038e..f2795dbf5ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -117,14 +117,12 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -145,7 +143,6 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -158,12 +155,11 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -171,12 +167,11 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

@@ -184,12 +179,12 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -197,12 +192,12 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -210,12 +205,12 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -223,20 +218,19 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -247,7 +241,6 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -255,7 +248,6 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -279,12 +271,12 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -297,12 +289,10 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -311,30 +301,26 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -347,31 +333,27 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -381,9 +363,8 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -392,7 +373,6 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -400,9 +380,8 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Port_3069, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -412,10 +391,8 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -444,8 +421,8 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -453,8 +430,8 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -463,56 +440,47 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -534,15 +502,14 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -556,7 +523,6 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -571,27 +537,26 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -599,18 +564,15 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -619,27 +581,19 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -647,7 +601,6 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -655,13 +608,12 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -671,10 +623,9 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -685,9 +636,8 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -708,31 +658,30 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -740,7 +689,7 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -750,13 +699,12 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -766,25 +714,20 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -794,13 +737,12 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -816,31 +758,26 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -853,7 +790,6 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -866,4 +802,4 @@ public class PortNameEditPart extends FloatingLabelEditPart implements ITextAwar
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-}
\ No newline at end of file
+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
index d6bbc6fcb08..bea9aa25652 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -47,7 +49,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierCon
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PrimitiveTypeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -81,10 +82,10 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PrimitiveTypeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -103,22 +104,21 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case PrimitiveTypeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -138,57 +138,49 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new PrimitiveTypeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public PrimitiveTypeFigure getPrimaryShape() {

-		return (PrimitiveTypeFigure) primaryShape;

+		return (PrimitiveTypeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof PrimitiveTypeNameEditPart) {

-			((PrimitiveTypeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof PrimitiveTypeNameEditPart) {

+			((PrimitiveTypeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -196,7 +188,7 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof PrimitiveTypeNameEditPart) {

+		if(childEditPart instanceof PrimitiveTypeNameEditPart) {

 			return true;

 		}

 		return false;

@@ -205,9 +197,8 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -216,9 +207,8 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -227,9 +217,8 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -238,21 +227,15 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof PrimitiveTypeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof PrimitiveTypeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -260,29 +243,24 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -293,9 +271,8 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -304,9 +281,8 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -314,7 +290,6 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -322,17 +297,15 @@ public class PrimitiveTypeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
index 0f074116f98..910df2928ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -47,7 +49,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierCon
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PrimitiveTypeItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -81,10 +82,10 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PrimitiveTypeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -103,22 +104,21 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case PrimitiveTypeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -138,57 +138,49 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new PrimitiveTypeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public PrimitiveTypeFigure getPrimaryShape() {

-		return (PrimitiveTypeFigure) primaryShape;

+		return (PrimitiveTypeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof PrimitiveTypeNameEditPartCN) {

-			((PrimitiveTypeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof PrimitiveTypeNameEditPartCN) {

+			((PrimitiveTypeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -196,7 +188,7 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof PrimitiveTypeNameEditPartCN) {

+		if(childEditPart instanceof PrimitiveTypeNameEditPartCN) {

 			return true;

 		}

 		return false;

@@ -205,9 +197,8 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -216,9 +207,8 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -227,9 +217,8 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -238,21 +227,15 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof PrimitiveTypeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof PrimitiveTypeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -260,29 +243,24 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -293,9 +271,8 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -304,9 +281,8 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -314,7 +290,6 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -322,17 +297,15 @@ public class PrimitiveTypeEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPart.java
index 782ac3f1eb4..48103258b5d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_2066, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class PrimitiveTypeFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPartCN.java
index 8d5e2f38c3a..13bd772a68d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_3078, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class PrimitiveTypeFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java
index bb638bc6510..4d40bb19002 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_2066, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java
index 6d4dec4cffb..77b2d7bd21d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_3078, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java
index 68c77a46258..c37dbfdc968 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -67,13 +67,13 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
 import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

 import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PropertyItemSemanticEditPolicyCLN;

 import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextNonResizableEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

@@ -122,14 +122,12 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -144,9 +142,8 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	public DragTracker getDragTracker(Request request) {

-		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {

+		if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) {

 			return null;

 		}

 		return new DragEditPartsTrackerEx(this);

@@ -155,10 +152,9 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyItemSemanticEditPolicyCLN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

 		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -168,12 +164,12 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -181,12 +177,12 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -194,12 +190,12 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -207,20 +203,19 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -231,7 +226,6 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -239,7 +233,6 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -247,7 +240,6 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -264,12 +256,12 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -282,12 +274,10 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -296,30 +286,26 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -332,31 +318,27 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -366,9 +348,8 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -377,7 +358,6 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -385,9 +365,8 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3101, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyEditPartCLN.VISUAL_ID));

 		}

 		return parser;

@@ -397,10 +376,8 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -429,8 +406,8 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -438,8 +415,8 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -448,56 +425,47 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -519,15 +487,14 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -541,7 +508,6 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -556,27 +522,26 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -584,18 +549,15 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -604,27 +566,19 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -632,7 +586,6 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -640,13 +593,12 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -656,10 +608,9 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -670,9 +621,8 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -693,31 +643,30 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -725,7 +674,7 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -735,13 +684,12 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -751,25 +699,20 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -779,13 +722,12 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -801,7 +743,6 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -810,7 +751,6 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -819,41 +759,36 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

-		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

+		if(UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

 			refreshUnderline();

 		}

 		super.handleNotificationEvent(event);

@@ -862,7 +797,6 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
index e522f5da77d..5749bc794bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
@@ -1,142 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPropertyPartCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PropertyPartCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class PropertyPartCompartmentEditPartCN extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7077;
-
-	/**
-	 * @generated
-	 */
-	public PropertyPartCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.PropertyPartCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyPartCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomPropertyPartCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class PropertyPartCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7077;

+

+	/**

+	 * @generated

+	 */

+	public PropertyPartCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.PropertyPartCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
index e278b04af2d..fd159df8109 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

@@ -48,19 +51,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabe
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPropertyPartItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PropertyLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.PropertyPartFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PropertyPartItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -94,15 +93,13 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyPartItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomPropertyPartItemSemanticEditPolicyCN());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -126,24 +123,23 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case PropertyPartFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -163,74 +159,61 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new PropertyPartFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.PropertyPartFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public PropertyPartFigure getPrimaryShape() {

-		return (PropertyPartFigure) primaryShape;

+		return (PropertyPartFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof PropertyPartNameEditPartCN) {

-			((PropertyPartNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof PropertyPartNameEditPartCN) {

+			((PropertyPartNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof PropertyPartCompartmentEditPartCN) {

+		if(childEditPart instanceof PropertyPartCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((PropertyPartCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((PropertyPartCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -238,16 +221,16 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof PropertyPartNameEditPartCN) {

+		if(childEditPart instanceof PropertyPartNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof PropertyPartCompartmentEditPartCN) {

+		if(childEditPart instanceof PropertyPartCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((PropertyPartCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((PropertyPartCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -256,9 +239,8 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -267,9 +249,8 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -278,12 +259,11 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof PropertyPartCompartmentEditPartCN) {

+		if(editPart instanceof PropertyPartCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -292,21 +272,15 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof PropertyPartFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof PropertyPartFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -314,29 +288,24 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -347,9 +316,8 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -358,9 +326,8 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -368,7 +335,6 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -376,17 +342,15 @@ public class PropertyPartEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartFloatingLabelEditPartCN.java
index 56c58c826e4..34b2a36316c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3070, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class PropertyPartFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java
index 48fccdccda3..5463ff4eb5f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -115,14 +115,12 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -137,7 +135,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -150,12 +147,12 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -163,12 +160,12 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -176,12 +173,12 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -189,20 +186,19 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -213,7 +209,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -221,7 +216,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -229,7 +223,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -246,12 +239,12 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -264,12 +257,10 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -278,30 +269,26 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -314,31 +301,27 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -348,9 +331,8 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -359,7 +341,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -367,9 +348,8 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3070, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -379,10 +359,8 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -411,8 +389,8 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -420,8 +398,8 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -430,56 +408,47 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -501,15 +470,14 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -523,7 +491,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -538,27 +505,26 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -566,18 +532,15 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -586,27 +549,19 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -614,7 +569,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -622,13 +576,12 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -638,10 +591,9 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -652,9 +604,8 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -675,31 +626,30 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -707,7 +657,7 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -717,13 +667,12 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -733,25 +682,20 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -761,13 +705,12 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -783,7 +726,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -792,7 +734,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -801,39 +742,34 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -842,7 +778,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -856,7 +791,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -866,18 +800,15 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -885,6 +816,5 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
index b886c7e06ef..c2dcf23b175 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7065;
-
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ProtocolStateMachineCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7065;

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ProtocolStateMachineCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
index 89ee5a2769e..e61a526b954 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7052;
-
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.ProtocolStateMachineCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7052;

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ProtocolStateMachineCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
index 035478d66cb..c11c6fb3b63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ProtocolStateMachineCompositeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ProtocolStateMachineCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,25 +119,24 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ProtocolStateMachineCompositeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 				case ParameterEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -155,84 +156,67 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ProtocolStateMachineCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ProtocolStateMachineCompositeFigure getPrimaryShape() {

-		return (ProtocolStateMachineCompositeFigure) primaryShape;

+		return (ProtocolStateMachineCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ProtocolStateMachineCompositeNameEditPart) {

-			((ProtocolStateMachineCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ProtocolStateMachineCompositeNameEditPart) {

+			((ProtocolStateMachineCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {

+		if(childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((ProtocolStateMachineCompositeCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ProtocolStateMachineCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof ParameterEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -240,20 +224,20 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ProtocolStateMachineCompositeNameEditPart) {

+		if(childEditPart instanceof ProtocolStateMachineCompositeNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {

+		if(childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((ProtocolStateMachineCompositeCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((ProtocolStateMachineCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof ParameterEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -262,9 +246,8 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -273,9 +256,8 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -284,12 +266,11 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {

+		if(editPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -298,21 +279,15 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ProtocolStateMachineCompositeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof ProtocolStateMachineCompositeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -320,29 +295,24 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -353,9 +323,8 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -364,9 +333,8 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -374,7 +342,6 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -382,17 +349,15 @@ public class ProtocolStateMachineCompositeEditPart extends RoundedCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
index 980f2f4630d..d5408245aa0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ProtocolStateMachineCompositeItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ProtocolStateMachineCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,25 +119,24 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case ProtocolStateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 				case ParameterEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -155,84 +156,67 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ProtocolStateMachineCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ProtocolStateMachineCompositeFigure getPrimaryShape() {

-		return (ProtocolStateMachineCompositeFigure) primaryShape;

+		return (ProtocolStateMachineCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ProtocolStateMachineCompositeNameEditPartCN) {

-			((ProtocolStateMachineCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof ProtocolStateMachineCompositeNameEditPartCN) {

+			((ProtocolStateMachineCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((ProtocolStateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ProtocolStateMachineCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof ParameterEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -240,20 +224,20 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof ProtocolStateMachineCompositeNameEditPartCN) {

+		if(childEditPart instanceof ProtocolStateMachineCompositeNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((ProtocolStateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((ProtocolStateMachineCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof ParameterEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -262,9 +246,8 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -273,9 +256,8 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -284,12 +266,11 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {

+		if(editPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -298,21 +279,15 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof ProtocolStateMachineCompositeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof ProtocolStateMachineCompositeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -320,29 +295,24 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -353,9 +323,8 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -364,9 +333,8 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -374,7 +342,6 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -382,17 +349,15 @@ public class ProtocolStateMachineCompositeEditPartCN extends RoundedCompartmentE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPart.java
index 91bf7acf63f..7c4f2a660db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ProtocolStateMachineCompositeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ProtocolStateMachineCompositeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ProtocolStateMachine_2062, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPart extends Floating
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java
index a08e62330b3..5a37b319497 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ProtocolStateMachine_3074, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java
index 86dfbebcd4b..d308a227790 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ProtocolStateMachine_2062, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java
index c5a4ac5d422..ba2a680a928 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.ProtocolStateMachine_3074, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
index 59dd45d7474..4d03e34b9f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java
index 5e6588a9349..aa78cd42d51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,11 +16,10 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.RealizationItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -42,24 +41,21 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new RealizationItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof RealizationNameEditPart) {

-			((RealizationNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof RealizationNameEditPart) {

+			((RealizationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

-		if (childEditPart instanceof RealizationAppliedStereotypeEditPart) {

-			((RealizationAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+		if(childEditPart instanceof RealizationAppliedStereotypeEditPart) {

+			((RealizationAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

@@ -67,9 +63,8 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -79,10 +74,10 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart implements IT
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof RealizationNameEditPart) {

+		if(childEditPart instanceof RealizationNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof RealizationAppliedStereotypeEditPart) {

+		if(childEditPart instanceof RealizationAppliedStereotypeEditPart) {

 			return true;

 		}

 		return false;

@@ -91,9 +86,8 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -101,13 +95,12 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart implements IT
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new InterfaceRealizationFigure();

 	}

@@ -115,8 +108,7 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public InterfaceRealizationFigure getPrimaryShape() {

-		return (InterfaceRealizationFigure) getFigure();

+		return (InterfaceRealizationFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
index 4de8b2658cc..9f544526a18 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,31 +619,30 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -701,7 +650,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -711,13 +660,12 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -727,25 +675,20 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -755,13 +698,12 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -777,45 +719,38 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java
index e321f572bdd..18df6ec07e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,9 +16,9 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.RepresentationFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.RepresentationItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -40,19 +40,17 @@ public class RepresentationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new RepresentationItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof RepresentationTagLabelEditPart) {

-			((RepresentationTagLabelEditPart) childEditPart).setLabel(

-					getPrimaryShape().getTagLabel());

+		if(childEditPart instanceof RepresentationTagLabelEditPart) {

+			((RepresentationTagLabelEditPart)childEditPart).setLabel(getPrimaryShape().getTagLabel());

 		}

 		return false;

 	}

@@ -60,9 +58,8 @@ public class RepresentationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -72,7 +69,7 @@ public class RepresentationEditPart extends UMLConnectionNodeEditPart implements
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof RepresentationTagLabelEditPart) {

+		if(childEditPart instanceof RepresentationTagLabelEditPart) {

 			return true;

 		}

 		return false;

@@ -81,9 +78,8 @@ public class RepresentationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -91,13 +87,12 @@ public class RepresentationEditPart extends UMLConnectionNodeEditPart implements
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new RepresentationFigure();

 	}

@@ -105,8 +100,7 @@ public class RepresentationEditPart extends UMLConnectionNodeEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public RepresentationFigure getPrimaryShape() {

-		return (RepresentationFigure) getFigure();

+		return (RepresentationFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
index c37a7185782..119b153fa91 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -250,7 +241,7 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 */

 	protected EObject getParserElement() {

 		EObject element = resolveSemanticElement();

-		return element != null ? element : (View) getModel();

+		return element != null ? element : (View)getModel();

 	}

 

 	/**

@@ -266,12 +257,10 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -280,30 +269,26 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -316,31 +301,27 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -350,9 +331,8 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -361,7 +341,6 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -369,9 +348,8 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.InformationItemRepresented_4020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationTagLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -381,10 +359,8 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -413,8 +389,8 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -422,8 +398,8 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -432,56 +408,47 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -503,15 +470,14 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +491,6 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -540,20 +505,20 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -561,18 +526,15 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -581,27 +543,19 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -609,7 +563,6 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -617,13 +570,12 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -633,10 +585,9 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -647,9 +598,8 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -670,31 +620,30 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -702,7 +651,7 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -712,13 +661,12 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -728,25 +676,20 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -756,13 +699,12 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -778,45 +720,38 @@ public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
index c35980a3775..84fbed62809 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart i
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java
index af18eccd67e..5178360c170 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,11 +16,10 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.RoleBindingFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.RoleBindingItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -42,24 +41,21 @@ public class RoleBindingEditPart extends UMLConnectionNodeEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new RoleBindingItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof RoleBindingRoleNameEditPart) {

-			((RoleBindingRoleNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getRoleLabel());

+		if(childEditPart instanceof RoleBindingRoleNameEditPart) {

+			((RoleBindingRoleNameEditPart)childEditPart).setLabel(getPrimaryShape().getRoleLabel());

 		}

-		if (childEditPart instanceof RoleBindingAppliedStereotypeEditPart) {

-			((RoleBindingAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+		if(childEditPart instanceof RoleBindingAppliedStereotypeEditPart) {

+			((RoleBindingAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

@@ -67,9 +63,8 @@ public class RoleBindingEditPart extends UMLConnectionNodeEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -79,10 +74,10 @@ public class RoleBindingEditPart extends UMLConnectionNodeEditPart implements IT
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof RoleBindingRoleNameEditPart) {

+		if(childEditPart instanceof RoleBindingRoleNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof RoleBindingAppliedStereotypeEditPart) {

+		if(childEditPart instanceof RoleBindingAppliedStereotypeEditPart) {

 			return true;

 		}

 		return false;

@@ -91,9 +86,8 @@ public class RoleBindingEditPart extends UMLConnectionNodeEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -101,13 +95,12 @@ public class RoleBindingEditPart extends UMLConnectionNodeEditPart implements IT
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new RoleBindingFigure();

 	}

@@ -115,8 +108,7 @@ public class RoleBindingEditPart extends UMLConnectionNodeEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public RoleBindingFigure getPrimaryShape() {

-		return (RoleBindingFigure) getFigure();

+		return (RoleBindingFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
index c8dd82e4d41..67ddff682ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.SOURCE;

 	}

@@ -161,12 +156,12 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingRoleNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
index f2b050d3031..99651a410c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.SignalItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SignalItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case SignalFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new SignalFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public SignalFigure getPrimaryShape() {

-		return (SignalFigure) primaryShape;

+		return (SignalFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof SignalNameEditPart) {

-			((SignalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof SignalNameEditPart) {

+			((SignalNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof SignalNameEditPart) {

+		if(childEditPart instanceof SignalNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof SignalFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof SignalFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class SignalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
index 03056c39a41..2f7f7a3cc4d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.SignalItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SignalItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case SignalFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new SignalFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public SignalFigure getPrimaryShape() {

-		return (SignalFigure) primaryShape;

+		return (SignalFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof SignalNameEditPartCN) {

-			((SignalNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof SignalNameEditPartCN) {

+			((SignalNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof SignalNameEditPartCN) {

+		if(childEditPart instanceof SignalNameEditPartCN) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof SignalFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof SignalFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class SignalEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
index dc6e45ec246..561dc2268cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.SignalEventItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SignalEventItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case SignalEventFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof SignalEventNameEditPart) {

-			((SignalEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof SignalEventNameEditPart) {

+			((SignalEventNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof SignalEventNameEditPart) {

+		if(childEditPart instanceof SignalEventNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof SignalEventFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof SignalEventFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class SignalEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalEventNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventFloatingLabelEditPart.java
index a862b3c2104..b458f053f6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.SignalEvent_2083, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalEventFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class SignalEventFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java
index 9d2d63830f9..6398b440592 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.SignalEvent_2083, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalEventNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPart.java
index 4d6c11cc5c2..d1ab2ab679b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SignalFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class SignalFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Signal_2081, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class SignalFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPartCN.java
index 0152a035d2e..bbc74b2afef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Signal_3095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class SignalFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java
index e7a99e9b136..539c2321567 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Signal_2081, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java
index cbcce786eed..e802ff522a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Signal_3095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
index f7dc7f1ca9d..f3065586c6f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StateMachineCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class StateMachineCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7066;
-
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.StateMachineCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StateMachineCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7066;

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.StateMachineCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
index b62c81c75d6..a778e5140fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
@@ -1,140 +1,127 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StateMachineCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class StateMachineCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7053;
-
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getCompartmentName() {
-		return Messages.StateMachineCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StateMachineCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7053;

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.StateMachineCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
index 554a4659dad..cbb02c42048 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StateMachineCompositeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StateMachineCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,25 +119,24 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case StateMachineCompositeFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 				case ParameterEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -155,84 +156,67 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new StateMachineCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public StateMachineCompositeFigure getPrimaryShape() {

-		return (StateMachineCompositeFigure) primaryShape;

+		return (StateMachineCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof StateMachineCompositeNameEditPart) {

-			((StateMachineCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof StateMachineCompositeNameEditPart) {

+			((StateMachineCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof StateMachineCompositeCompartmentEditPart) {

+		if(childEditPart instanceof StateMachineCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((StateMachineCompositeCompartmentEditPart) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((StateMachineCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof ParameterEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -240,20 +224,20 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof StateMachineCompositeNameEditPart) {

+		if(childEditPart instanceof StateMachineCompositeNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof StateMachineCompositeCompartmentEditPart) {

+		if(childEditPart instanceof StateMachineCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((StateMachineCompositeCompartmentEditPart) childEditPart).getFigure());

+			pane.remove(((StateMachineCompositeCompartmentEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof ParameterEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -262,9 +246,8 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -273,9 +256,8 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -284,12 +266,11 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof StateMachineCompositeCompartmentEditPart) {

+		if(editPart instanceof StateMachineCompositeCompartmentEditPart) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -298,21 +279,15 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof StateMachineCompositeFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof StateMachineCompositeFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -320,29 +295,24 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -353,9 +323,8 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -364,9 +333,8 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -374,7 +342,6 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -382,17 +349,15 @@ public class StateMachineCompositeEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
index 89ea059cba5..4002f08e183 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -37,6 +37,9 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -46,16 +49,15 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentE
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StateMachineCompositeItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -89,11 +91,11 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StateMachineCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -117,25 +119,24 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case StateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				case PortEditPart.VISUAL_ID:

 				case ParameterEditPart.VISUAL_ID:

 					return new BorderItemResizableEditPolicy();

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -155,84 +156,67 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new StateMachineCompositeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public StateMachineCompositeFigure getPrimaryShape() {

-		return (StateMachineCompositeFigure) primaryShape;

+		return (StateMachineCompositeFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof StateMachineCompositeNameEditPartCN) {

-			((StateMachineCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof StateMachineCompositeNameEditPartCN) {

+			((StateMachineCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

-		if (childEditPart instanceof StateMachineCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof StateMachineCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

-			pane.add(((StateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((StateMachineCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof PortEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

-

-

-		// Papyrus Gencode :Affixed Port locator

-		if (childEditPart instanceof ParameterEditPart) {

-			IBorderItemLocator locator = new org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator(getMainFigure(), PositionConstants.NONE);

-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -240,20 +224,20 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof StateMachineCompositeNameEditPartCN) {

+		if(childEditPart instanceof StateMachineCompositeNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof StateMachineCompositeCompartmentEditPartCN) {

+		if(childEditPart instanceof StateMachineCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

-			pane.remove(((StateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());

+			pane.remove(((StateMachineCompositeCompartmentEditPartCN)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof PortEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

 			return true;

 		}

-		if (childEditPart instanceof ParameterEditPart) {

-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

 			return true;

 		}

 		return false;

@@ -262,9 +246,8 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -273,9 +256,8 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -284,12 +266,11 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof StateMachineCompositeCompartmentEditPartCN) {

+		if(editPart instanceof StateMachineCompositeCompartmentEditPartCN) {

 			return getPrimaryShape().getCompositeCompartmentFigure();

 		}

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -298,21 +279,15 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof StateMachineCompositeFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof StateMachineCompositeFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -320,29 +295,24 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -353,9 +323,8 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -364,9 +333,8 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -374,7 +342,6 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -382,17 +349,15 @@ public class StateMachineCompositeEditPartCN extends RoundedCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPart.java
index 3c05b845eb7..bd7813074b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.StateMachine_2063, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class StateMachineCompositeFloatingLabelEditPart extends FloatingLabelEdi
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPartCN.java
index 036d70b4eba..f740378a496 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.StateMachine_3075, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class StateMachineCompositeFloatingLabelEditPartCN extends FloatingLabelE
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java
index 0d33f03866a..1dc27b2db8b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.StateMachine_2063, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java
index 2d570561832..271528f2049 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.StateMachine_3075, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
index ce477d5ebae..0da8641bd3f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StringExpressionItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StringExpressionItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case StringExpressionFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof StringExpressionNameEditPart) {

-			((StringExpressionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof StringExpressionNameEditPart) {

+			((StringExpressionNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof StringExpressionNameEditPart) {

+		if(childEditPart instanceof StringExpressionNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof StringExpressionFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof StringExpressionFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class StringExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(StringExpressionNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionFloatingLabelEditPart.java
index aaaee6f2e1d..e27eb63fc3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.StringExpression_2100, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StringExpressionFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class StringExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java
index f1c09b50bea..2d88f840cad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.StringExpression_2100, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StringExpressionNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
index 85ff965bf5d..6c4ac751f72 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java
index 3b3eb5ca3ac..fa9fdc3f511 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,11 +16,11 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeSubstitutionLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.SubstitutionItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -42,24 +42,21 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SubstitutionItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeSubstitutionLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeSubstitutionLabelDisplayEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof SubstitutionNameEditPart) {

-			((SubstitutionNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof SubstitutionNameEditPart) {

+			((SubstitutionNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

-		if (childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {

-			((SubstitutionAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+		if(childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {

+			((SubstitutionAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

@@ -67,9 +64,8 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -79,10 +75,10 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof SubstitutionNameEditPart) {

+		if(childEditPart instanceof SubstitutionNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {

+		if(childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {

 			return true;

 		}

 		return false;

@@ -91,9 +87,8 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -101,13 +96,12 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new InterfaceRealizationFigure();

 	}

@@ -115,8 +109,7 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public InterfaceRealizationFigure getPrimaryShape() {

-		return (InterfaceRealizationFigure) getFigure();

+		return (InterfaceRealizationFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
index da4f5ca1020..30cf0d52233 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,31 +619,30 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -701,7 +650,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -711,13 +660,12 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -727,25 +675,20 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -755,13 +698,12 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -777,45 +719,38 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
index dfa568b1e7c..d0ca6611f14 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -32,7 +34,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPa
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeConstraintItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -66,10 +67,10 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeConstraintItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -85,7 +86,7 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -105,48 +106,40 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ConstraintFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ConstraintFigure getPrimaryShape() {

-		return (ConstraintFigure) primaryShape;

+		return (ConstraintFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof TimeConstraintNameEditPart) {

-			((TimeConstraintNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof TimeConstraintNameEditPart) {

+			((TimeConstraintNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-		if (childEditPart instanceof TimeConstraintSpecificationEditPart) {

-			((TimeConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+		if(childEditPart instanceof TimeConstraintSpecificationEditPart) {

+			((TimeConstraintSpecificationEditPart)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -154,10 +147,10 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof TimeConstraintNameEditPart) {

+		if(childEditPart instanceof TimeConstraintNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof TimeConstraintSpecificationEditPart) {

+		if(childEditPart instanceof TimeConstraintSpecificationEditPart) {

 			return true;

 		}

 		return false;

@@ -166,9 +159,8 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -177,9 +169,8 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -188,15 +179,10 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -204,29 +190,24 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -237,9 +218,8 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -248,9 +228,8 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -258,7 +237,6 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -266,17 +244,15 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeConstraintNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
index 2c919eafdfc..5f029b52644 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,6 +25,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -32,7 +34,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPa
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeConstraintItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -66,10 +67,10 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeConstraintItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

@@ -85,7 +86,7 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -105,48 +106,40 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new ConstraintFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public ConstraintFigure getPrimaryShape() {

-		return (ConstraintFigure) primaryShape;

+		return (ConstraintFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof TimeConstraintNameEditPartCN) {

-			((TimeConstraintNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof TimeConstraintNameEditPartCN) {

+			((TimeConstraintNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-		if (childEditPart instanceof TimeConstraintSpecificationEditPartCN) {

-			((TimeConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+		if(childEditPart instanceof TimeConstraintSpecificationEditPartCN) {

+			((TimeConstraintSpecificationEditPartCN)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -154,10 +147,10 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof TimeConstraintNameEditPartCN) {

+		if(childEditPart instanceof TimeConstraintNameEditPartCN) {

 			return true;

 		}

-		if (childEditPart instanceof TimeConstraintSpecificationEditPartCN) {

+		if(childEditPart instanceof TimeConstraintSpecificationEditPartCN) {

 			return true;

 		}

 		return false;

@@ -166,9 +159,8 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -177,9 +169,8 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -188,15 +179,10 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -204,29 +190,24 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -237,9 +218,8 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -248,9 +228,8 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -258,7 +237,6 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -266,17 +244,15 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeConstraintNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java
index 264548c5210..12c9ab6fae9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_2111, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeConstraintNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java
index ac128a3ec2a..1e444bb7807 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_3117, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeConstraintNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java
index cce51cdba5d..97798dc084f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -110,14 +110,12 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -132,7 +130,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -144,12 +141,12 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -157,12 +154,12 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -170,12 +167,12 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -183,20 +180,19 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -207,7 +203,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -215,7 +210,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -223,7 +217,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -248,12 +241,10 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -262,30 +253,26 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -298,31 +285,27 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -332,9 +315,8 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -343,7 +325,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -351,9 +332,8 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_2111, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeConstraintSpecificationEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -363,10 +343,8 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -395,8 +373,8 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -404,8 +382,8 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -414,56 +392,47 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -485,15 +454,14 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -507,7 +475,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -522,27 +489,26 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -550,18 +516,15 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -570,27 +533,19 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -598,7 +553,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,13 +560,12 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -622,10 +575,9 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -636,9 +588,8 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -659,31 +610,30 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -691,7 +641,7 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,13 +651,12 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -717,25 +666,20 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -745,13 +689,12 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -767,7 +710,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -776,7 +718,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -785,32 +726,27 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -823,7 +759,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -837,7 +772,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -847,18 +781,15 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -866,6 +797,5 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java
index 48e396e5bb1..228288410b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -110,14 +110,12 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -132,7 +130,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -144,12 +141,12 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -157,12 +154,12 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -170,12 +167,12 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -183,20 +180,19 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -207,7 +203,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -215,7 +210,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -223,7 +217,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -248,12 +241,10 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -262,30 +253,26 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -298,31 +285,27 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -332,9 +315,8 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -343,7 +325,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -351,9 +332,8 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_3117, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeConstraintSpecificationEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -363,10 +343,8 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -395,8 +373,8 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -404,8 +382,8 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -414,56 +392,47 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -485,15 +454,14 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -507,7 +475,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -522,27 +489,26 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -550,18 +516,15 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -570,27 +533,19 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -598,7 +553,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -606,13 +560,12 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -622,10 +575,9 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -636,9 +588,8 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -659,31 +610,30 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -691,7 +641,7 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -701,13 +651,12 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -717,25 +666,20 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -745,13 +689,12 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -767,7 +710,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -776,7 +718,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -785,32 +726,27 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -823,7 +759,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -837,7 +772,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -847,18 +781,15 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -866,6 +797,5 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
index c3bfde2be82..945a0061db8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeEventItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeEventItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case TimeEventFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof TimeEventNameEditPart) {

-			((TimeEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof TimeEventNameEditPart) {

+			((TimeEventNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof TimeEventNameEditPart) {

+		if(childEditPart instanceof TimeEventNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof TimeEventFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof TimeEventFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class TimeEventEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeEventNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventFloatingLabelEditPart.java
index 5ce60b15a6a..c4f6b931f62 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.TimeEvent_2089, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeEventFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class TimeEventFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java
index f293f9b45e3..49758dba712 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.TimeEvent_2089, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeEventNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
index cd18bcf1d7b..0965f5168e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeExpressionItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeExpressionItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case TimeExpressionFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof TimeExpressionNameEditPart) {

-			((TimeExpressionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof TimeExpressionNameEditPart) {

+			((TimeExpressionNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof TimeExpressionNameEditPart) {

+		if(childEditPart instanceof TimeExpressionNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof TimeExpressionFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof TimeExpressionFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class TimeExpressionEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeExpressionNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionFloatingLabelEditPart.java
index 798b00e68c3..cca428407b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.TimeExpression_2102, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeExpressionFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class TimeExpressionFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java
index e9a0e9ab0dc..03f1362e494 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.TimeExpression_2102, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeExpressionNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
index 36d0bf00cb5..1a3eff4c846 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,7 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeIntervalItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -79,10 +80,10 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeIntervalItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

@@ -99,22 +100,21 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case TimeIntervalFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -134,57 +134,49 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof TimeIntervalNameEditPart) {

-			((TimeIntervalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof TimeIntervalNameEditPart) {

+			((TimeIntervalNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -192,7 +184,7 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof TimeIntervalNameEditPart) {

+		if(childEditPart instanceof TimeIntervalNameEditPart) {

 			return true;

 		}

 		return false;

@@ -201,9 +193,8 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -212,9 +203,8 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -223,9 +213,8 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -234,21 +223,15 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof TimeIntervalFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof TimeIntervalFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -256,29 +239,24 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -289,9 +267,8 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -300,9 +277,8 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -310,7 +286,6 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -318,17 +293,15 @@ public class TimeIntervalEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeIntervalNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalFloatingLabelEditPart.java
index 75f22d22ace..6e598894712 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.TimeInterval_2105, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeIntervalFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class TimeIntervalFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java
index 1ce2c5d2092..eb99b0a3ee6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.TimeInterval_2105, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeIntervalNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
index 804b2f65e0d..2b081295761 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -33,6 +33,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

@@ -46,7 +48,6 @@ import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocat
 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeObservationItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -80,10 +81,10 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeObservationItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

@@ -102,23 +103,22 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case TimeObservationNameEditPart.VISUAL_ID:

 				case TimeObservationStereotypeLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -138,68 +138,56 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.TimeObservationNodeFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof TimeObservationNameEditPart) {

+		if(borderItemEditPart instanceof TimeObservationNameEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else if (borderItemEditPart instanceof TimeObservationStereotypeLabelEditPart) {

+		} else if(borderItemEditPart instanceof TimeObservationStereotypeLabelEditPart) {

 			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(20, 20);

 		return result;

@@ -207,27 +195,22 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		return nodeShape; // use nodeShape itself as contentPane

 	}

@@ -235,9 +218,8 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -246,9 +228,8 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -256,7 +237,6 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -264,17 +244,15 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeObservationNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEventEditPart.java
index 8b627154ed5..7627b168ab4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEventEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,8 +16,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeObservationEventSemanticEditPolicy;

 

 /**

  * @generated

@@ -39,21 +39,19 @@ public class TimeObservationEventEditPart extends ConnectionEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeObservationEventSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

 	}

 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new SimpleDashedEdgeFigure();

 	}

@@ -61,8 +59,7 @@ public class TimeObservationEventEditPart extends ConnectionEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public SimpleDashedEdgeFigure getPrimaryShape() {

-		return (SimpleDashedEdgeFigure) getFigure();

+		return (SimpleDashedEdgeFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java
index bb5b7c802e6..6f7154eb7d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -113,14 +113,12 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -141,7 +139,6 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -152,12 +149,11 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -165,12 +161,11 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

@@ -178,12 +173,12 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -191,12 +186,12 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -204,12 +199,12 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -217,20 +212,19 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -241,7 +235,6 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -249,7 +242,6 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -281,12 +273,10 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -295,30 +285,26 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -331,31 +317,27 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -365,9 +347,8 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -376,7 +357,6 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -384,9 +364,8 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_2094, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -396,10 +375,8 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -428,8 +405,8 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -437,8 +414,8 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -447,56 +424,47 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -518,15 +486,14 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -540,7 +507,6 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -555,27 +521,26 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -583,18 +548,15 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -603,27 +565,19 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -631,7 +585,6 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -639,13 +592,12 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -655,10 +607,9 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -669,9 +620,8 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -692,31 +642,30 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -724,7 +673,7 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -734,13 +683,12 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -750,25 +698,20 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -778,13 +721,12 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -800,31 +742,26 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -837,7 +774,6 @@ public class TimeObservationNameEditPart extends FloatingLabelEditPart implement
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
index 4aad0b96e44..c7230057fb0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -115,14 +115,12 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -143,7 +141,6 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -155,12 +152,11 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -168,12 +164,11 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

@@ -181,12 +176,12 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -194,12 +189,12 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -207,12 +202,12 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -220,20 +215,19 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -244,7 +238,6 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -252,7 +245,6 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -284,12 +276,10 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -298,30 +288,26 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -334,31 +320,27 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -368,9 +350,8 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -379,7 +360,6 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -387,9 +367,8 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_2094, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -399,10 +378,8 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -431,8 +408,8 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -440,8 +417,8 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -450,56 +427,47 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -521,15 +489,14 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -543,7 +510,6 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -558,27 +524,26 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -586,18 +551,15 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -606,27 +568,19 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -634,7 +588,6 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -642,13 +595,12 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -658,10 +610,9 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -672,9 +623,8 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -695,31 +645,30 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -727,7 +676,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -737,13 +686,12 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -753,25 +701,20 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -781,13 +724,12 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -803,31 +745,26 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -840,7 +777,6 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java
index 9304cb8c28e..01cd0d67399 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -33,1018 +33,668 @@ public class UMLEditPartFactory implements EditPartFactory {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart createEditPart(EditPart context, Object model) {

-		if (model instanceof View) {

-			View view = (View) model;

-			switch (UMLVisualIDRegistry.getVisualID(view)) {

-

+		if(model instanceof View) {

+			View view = (View)model;

+			switch(UMLVisualIDRegistry.getVisualID(view)) {

 			case CompositeStructureDiagramEditPart.VISUAL_ID:

 				return new CompositeStructureDiagramEditPart(view);

-

 			case ActivityCompositeEditPart.VISUAL_ID:

 				return new ActivityCompositeEditPart(view);

-

 			case ActivityCompositeNameEditPart.VISUAL_ID:

 				return new ActivityCompositeNameEditPart(view);

-

 			case ActivityCompositeFloatingLabelEditPart.VISUAL_ID:

 				return new ActivityCompositeFloatingLabelEditPart(view);

-

 			case InteractionCompositeEditPart.VISUAL_ID:

 				return new InteractionCompositeEditPart(view);

-

 			case InteractionCompositeNameEditPart.VISUAL_ID:

 				return new InteractionCompositeNameEditPart(view);

-

 			case InteractionCompositeFloatingLabelEditPart.VISUAL_ID:

 				return new InteractionCompositeFloatingLabelEditPart(view);

-

 			case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

 				return new ProtocolStateMachineCompositeEditPart(view);

-

 			case ProtocolStateMachineCompositeNameEditPart.VISUAL_ID:

 				return new ProtocolStateMachineCompositeNameEditPart(view);

-

 			case ProtocolStateMachineCompositeFloatingLabelEditPart.VISUAL_ID:

 				return new ProtocolStateMachineCompositeFloatingLabelEditPart(view);

-

 			case StateMachineCompositeEditPart.VISUAL_ID:

 				return new StateMachineCompositeEditPart(view);

-

 			case StateMachineCompositeNameEditPart.VISUAL_ID:

 				return new StateMachineCompositeNameEditPart(view);

-

 			case StateMachineCompositeFloatingLabelEditPart.VISUAL_ID:

 				return new StateMachineCompositeFloatingLabelEditPart(view);

-

 			case FunctionBehaviorCompositeEditPart.VISUAL_ID:

 				return new FunctionBehaviorCompositeEditPart(view);

-

 			case FunctionBehaviorCompositeNameEditPart.VISUAL_ID:

 				return new FunctionBehaviorCompositeNameEditPart(view);

-

 			case FunctionBehaviorCompositeFloatingLabelEditPart.VISUAL_ID:

 				return new FunctionBehaviorCompositeFloatingLabelEditPart(view);

-

 			case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

 				return new OpaqueBehaviorCompositeEditPart(view);

-

 			case OpaqueBehaviorCompositeNameEditPart.VISUAL_ID:

 				return new OpaqueBehaviorCompositeNameEditPart(view);

-

 			case OpaqueBehaviorCompositeFloatingLabelEditPart.VISUAL_ID:

 				return new OpaqueBehaviorCompositeFloatingLabelEditPart(view);

-

 			case ComponentCompositeEditPart.VISUAL_ID:

 				return new ComponentCompositeEditPart(view);

-

 			case ComponentCompositeNameEditPart.VISUAL_ID:

 				return new ComponentCompositeNameEditPart(view);

-

 			case ComponentCompositeFloatingLabelEditPart.VISUAL_ID:

 				return new ComponentCompositeFloatingLabelEditPart(view);

-

 			case DeviceCompositeEditPart.VISUAL_ID:

 				return new DeviceCompositeEditPart(view);

-

 			case DeviceCompositeNameEditPart.VISUAL_ID:

 				return new DeviceCompositeNameEditPart(view);

-

 			case DeviceCompositeFloatingLabelEditPart.VISUAL_ID:

 				return new DeviceCompositeFloatingLabelEditPart(view);

-

 			case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeEditPart(view);

-

 			case ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeNameEditPart(view);

-

 			case ExecutionEnvironmentCompositeFloatingLabelEditPart.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeFloatingLabelEditPart(view);

-

 			case NodeCompositeEditPart.VISUAL_ID:

 				return new NodeCompositeEditPart(view);

-

 			case NodeCompositeNameEditPart.VISUAL_ID:

 				return new NodeCompositeNameEditPart(view);

-

 			case NodeCompositeFloatingLabelEditPart.VISUAL_ID:

 				return new NodeCompositeFloatingLabelEditPart(view);

-

 			case ClassCompositeEditPart.VISUAL_ID:

 				return new ClassCompositeEditPart(view);

-

 			case ClassCompositeNameEditPart.VISUAL_ID:

 				return new ClassCompositeNameEditPart(view);

-

 			case ClassCompositeFloatingLabelEditPart.VISUAL_ID:

 				return new ClassCompositeFloatingLabelEditPart(view);

-

 			case CollaborationCompositeEditPart.VISUAL_ID:

 				return new CollaborationCompositeEditPart(view);

-

 			case CollaborationCompositeNameEditPart.VISUAL_ID:

 				return new CollaborationCompositeNameEditPart(view);

-

 			case CollaborationCompositeFloatingLabelEditPart.VISUAL_ID:

 				return new CollaborationCompositeFloatingLabelEditPart(view);

-

 			case InterfaceEditPart.VISUAL_ID:

 				return new InterfaceEditPart(view);

-

 			case InterfaceNameEditPart.VISUAL_ID:

 				return new InterfaceNameEditPart(view);

-

 			case InterfaceFloatingLabelEditPart.VISUAL_ID:

 				return new InterfaceFloatingLabelEditPart(view);

-

 			case PrimitiveTypeEditPart.VISUAL_ID:

 				return new PrimitiveTypeEditPart(view);

-

 			case PrimitiveTypeNameEditPart.VISUAL_ID:

 				return new PrimitiveTypeNameEditPart(view);

-

 			case PrimitiveTypeFloatingLabelEditPart.VISUAL_ID:

 				return new PrimitiveTypeFloatingLabelEditPart(view);

-

 			case EnumerationEditPart.VISUAL_ID:

 				return new EnumerationEditPart(view);

-

 			case EnumerationNameEditPart.VISUAL_ID:

 				return new EnumerationNameEditPart(view);

-

 			case EnumerationFloatingLabelEditPart.VISUAL_ID:

 				return new EnumerationFloatingLabelEditPart(view);

-

 			case DataTypeEditPart.VISUAL_ID:

 				return new DataTypeEditPart(view);

-

 			case DataTypeNameEditPart.VISUAL_ID:

 				return new DataTypeNameEditPart(view);

-

 			case DataTypeFloatingLabelEditPart.VISUAL_ID:

 				return new DataTypeFloatingLabelEditPart(view);

-

 			case ActorEditPart.VISUAL_ID:

 				return new ActorEditPart(view);

-

 			case ActorNameEditPart.VISUAL_ID:

 				return new ActorNameEditPart(view);

-

 			case ActorFloatingLabelEditPart.VISUAL_ID:

 				return new ActorFloatingLabelEditPart(view);

-

 			case DeploymentSpecificationEditPart.VISUAL_ID:

 				return new DeploymentSpecificationEditPart(view);

-

 			case DeploymentSpecificationNameEditPart.VISUAL_ID:

 				return new DeploymentSpecificationNameEditPart(view);

-

 			case DeploymentSpecificationFloatingLabelEditPart.VISUAL_ID:

 				return new DeploymentSpecificationFloatingLabelEditPart(view);

-

 			case ArtifactEditPart.VISUAL_ID:

 				return new ArtifactEditPart(view);

-

 			case ArtifactNameEditPart.VISUAL_ID:

 				return new ArtifactNameEditPart(view);

-

 			case ArtifactFloatingLabelEditPart.VISUAL_ID:

 				return new ArtifactFloatingLabelEditPart(view);

-

 			case InformationItemEditPart.VISUAL_ID:

 				return new InformationItemEditPart(view);

-

 			case InformationItemNameEditPart.VISUAL_ID:

 				return new InformationItemNameEditPart(view);

-

 			case InformationItemFloatingLabelEditPart.VISUAL_ID:

 				return new InformationItemFloatingLabelEditPart(view);

-

 			case SignalEditPart.VISUAL_ID:

 				return new SignalEditPart(view);

-

 			case SignalNameEditPart.VISUAL_ID:

 				return new SignalNameEditPart(view);

-

 			case SignalFloatingLabelEditPart.VISUAL_ID:

 				return new SignalFloatingLabelEditPart(view);

-

 			case UseCaseEditPart.VISUAL_ID:

 				return new UseCaseEditPart(view);

-

 			case UseCaseNameEditPart.VISUAL_ID:

 				return new UseCaseNameEditPart(view);

-

 			case UseCaseFloatingLabelEditPart.VISUAL_ID:

 				return new UseCaseFloatingLabelEditPart(view);

-

 			case SignalEventEditPart.VISUAL_ID:

 				return new SignalEventEditPart(view);

-

 			case SignalEventNameEditPart.VISUAL_ID:

 				return new SignalEventNameEditPart(view);

-

 			case SignalEventFloatingLabelEditPart.VISUAL_ID:

 				return new SignalEventFloatingLabelEditPart(view);

-

 			case CallEventEditPart.VISUAL_ID:

 				return new CallEventEditPart(view);

-

 			case CallEventNameEditPart.VISUAL_ID:

 				return new CallEventNameEditPart(view);

-

 			case CallEventFloatingLabelEditPart.VISUAL_ID:

 				return new CallEventFloatingLabelEditPart(view);

-

 			case AnyReceiveEventEditPart.VISUAL_ID:

 				return new AnyReceiveEventEditPart(view);

-

 			case AnyReceiveEventNameEditPart.VISUAL_ID:

 				return new AnyReceiveEventNameEditPart(view);

-

 			case AnyReceiveEventFloatingLabelEditPart.VISUAL_ID:

 				return new AnyReceiveEventFloatingLabelEditPart(view);

-

 			case ChangeEventEditPart.VISUAL_ID:

 				return new ChangeEventEditPart(view);

-

 			case ChangeEventNameEditPart.VISUAL_ID:

 				return new ChangeEventNameEditPart(view);

-

 			case ChangeEventFloatingLabelEditPart.VISUAL_ID:

 				return new ChangeEventFloatingLabelEditPart(view);

-

 			case TimeEventEditPart.VISUAL_ID:

 				return new TimeEventEditPart(view);

-

 			case TimeEventNameEditPart.VISUAL_ID:

 				return new TimeEventNameEditPart(view);

-

 			case TimeEventFloatingLabelEditPart.VISUAL_ID:

 				return new TimeEventFloatingLabelEditPart(view);

-

 			case DurationObservationEditPart.VISUAL_ID:

 				return new DurationObservationEditPart(view);

-

 			case DurationObservationNameEditPart.VISUAL_ID:

 				return new DurationObservationNameEditPart(view);

-

 			case DurationObservationStereotypeLabelEditPart.VISUAL_ID:

 				return new DurationObservationStereotypeLabelEditPart(view);

-

 			case TimeObservationEditPart.VISUAL_ID:

 				return new TimeObservationEditPart(view);

-

 			case TimeObservationNameEditPart.VISUAL_ID:

 				return new TimeObservationNameEditPart(view);

-

 			case TimeObservationStereotypeLabelEditPart.VISUAL_ID:

 				return new TimeObservationStereotypeLabelEditPart(view);

-

 			case LiteralBooleanEditPart.VISUAL_ID:

 				return new LiteralBooleanEditPart(view);

-

 			case LiteralBooleanNameEditPart.VISUAL_ID:

 				return new LiteralBooleanNameEditPart(view);

-

 			case LiteralBooleanFloatingLabelEditPart.VISUAL_ID:

 				return new LiteralBooleanFloatingLabelEditPart(view);

-

 			case LiteralIntegerEditPart.VISUAL_ID:

 				return new LiteralIntegerEditPart(view);

-

 			case LiteralIntegerNameEditPart.VISUAL_ID:

 				return new LiteralIntegerNameEditPart(view);

-

 			case LiteralIntegerFloatingLabelEditPart.VISUAL_ID:

 				return new LiteralIntegerFloatingLabelEditPart(view);

-

 			case LiteralNullEditPart.VISUAL_ID:

 				return new LiteralNullEditPart(view);

-

 			case LiteralNullNameEditPart.VISUAL_ID:

 				return new LiteralNullNameEditPart(view);

-

 			case LiteralNullFloatingLabelEditPart.VISUAL_ID:

 				return new LiteralNullFloatingLabelEditPart(view);

-

 			case LiteralStringEditPart.VISUAL_ID:

 				return new LiteralStringEditPart(view);

-

 			case LiteralStringNameEditPart.VISUAL_ID:

 				return new LiteralStringNameEditPart(view);

-

 			case LiteralStringFloatingLabelEditPart.VISUAL_ID:

 				return new LiteralStringFloatingLabelEditPart(view);

-

 			case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

 				return new LiteralUnlimitedNaturalEditPart(view);

-

 			case LiteralUnlimitedNaturalNameEditPart.VISUAL_ID:

 				return new LiteralUnlimitedNaturalNameEditPart(view);

-

 			case LiteralUnlimitedNaturalFloatingLabelEditPart.VISUAL_ID:

 				return new LiteralUnlimitedNaturalFloatingLabelEditPart(view);

-

 			case StringExpressionEditPart.VISUAL_ID:

 				return new StringExpressionEditPart(view);

-

 			case StringExpressionNameEditPart.VISUAL_ID:

 				return new StringExpressionNameEditPart(view);

-

 			case StringExpressionFloatingLabelEditPart.VISUAL_ID:

 				return new StringExpressionFloatingLabelEditPart(view);

-

 			case OpaqueExpressionEditPart.VISUAL_ID:

 				return new OpaqueExpressionEditPart(view);

-

 			case OpaqueExpressionNameEditPart.VISUAL_ID:

 				return new OpaqueExpressionNameEditPart(view);

-

 			case OpaqueExpressionFloatingLabelEditPart.VISUAL_ID:

 				return new OpaqueExpressionFloatingLabelEditPart(view);

-

 			case TimeExpressionEditPart.VISUAL_ID:

 				return new TimeExpressionEditPart(view);

-

 			case TimeExpressionNameEditPart.VISUAL_ID:

 				return new TimeExpressionNameEditPart(view);

-

 			case TimeExpressionFloatingLabelEditPart.VISUAL_ID:

 				return new TimeExpressionFloatingLabelEditPart(view);

-

 			case ExpressionEditPart.VISUAL_ID:

 				return new ExpressionEditPart(view);

-

 			case ExpressionNameEditPart.VISUAL_ID:

 				return new ExpressionNameEditPart(view);

-

 			case ExpressionFloatingLabelEditPart.VISUAL_ID:

 				return new ExpressionFloatingLabelEditPart(view);

-

 			case DurationEditPart.VISUAL_ID:

 				return new DurationEditPart(view);

-

 			case DurationNameEditPart.VISUAL_ID:

 				return new DurationNameEditPart(view);

-

 			case DurationFloatingLabelEditPart.VISUAL_ID:

 				return new DurationFloatingLabelEditPart(view);

-

 			case TimeIntervalEditPart.VISUAL_ID:

 				return new TimeIntervalEditPart(view);

-

 			case TimeIntervalNameEditPart.VISUAL_ID:

 				return new TimeIntervalNameEditPart(view);

-

 			case TimeIntervalFloatingLabelEditPart.VISUAL_ID:

 				return new TimeIntervalFloatingLabelEditPart(view);

-

 			case DurationIntervalEditPart.VISUAL_ID:

 				return new DurationIntervalEditPart(view);

-

 			case DurationIntervalNameEditPart.VISUAL_ID:

 				return new DurationIntervalNameEditPart(view);

-

 			case DurationIntervalFloatingLabelEditPart.VISUAL_ID:

 				return new DurationIntervalFloatingLabelEditPart(view);

-

 			case IntervalEditPart.VISUAL_ID:

 				return new IntervalEditPart(view);

-

 			case IntervalNameEditPart.VISUAL_ID:

 				return new IntervalNameEditPart(view);

-

 			case IntervalFloatingLabelEditPart.VISUAL_ID:

 				return new IntervalFloatingLabelEditPart(view);

-

 			case InstanceValueEditPart.VISUAL_ID:

 				return new InstanceValueEditPart(view);

-

 			case InstanceValueNameEditPart.VISUAL_ID:

 				return new InstanceValueNameEditPart(view);

-

 			case InstanceValueFloatingLabelEditPart.VISUAL_ID:

 				return new InstanceValueFloatingLabelEditPart(view);

-

 			case CommentEditPart.VISUAL_ID:

 				return new CommentEditPart(view);

-

 			case CommentBodyEditPart.VISUAL_ID:

 				return new CommentBodyEditPart(view);

-

 			case DurationConstraintEditPart.VISUAL_ID:

 				return new DurationConstraintEditPart(view);

-

 			case DurationConstraintNameEditPart.VISUAL_ID:

 				return new DurationConstraintNameEditPart(view);

-

 			case DurationConstraintSpecificationEditPart.VISUAL_ID:

 				return new DurationConstraintSpecificationEditPart(view);

-

 			case TimeConstraintEditPart.VISUAL_ID:

 				return new TimeConstraintEditPart(view);

-

 			case TimeConstraintNameEditPart.VISUAL_ID:

 				return new TimeConstraintNameEditPart(view);

-

 			case TimeConstraintSpecificationEditPart.VISUAL_ID:

 				return new TimeConstraintSpecificationEditPart(view);

-

 			case IntervalConstraintEditPart.VISUAL_ID:

 				return new IntervalConstraintEditPart(view);

-

 			case IntervalConstraintNameEditPart.VISUAL_ID:

 				return new IntervalConstraintNameEditPart(view);

-

 			case IntervalConstraintSpecificationEditPart.VISUAL_ID:

 				return new IntervalConstraintSpecificationEditPart(view);

-

 			case InteractionConstraintEditPart.VISUAL_ID:

 				return new InteractionConstraintEditPart(view);

-

 			case InteractionConstraintNameEditPart.VISUAL_ID:

 				return new InteractionConstraintNameEditPart(view);

-

 			case InteractionConstraintSpecificationEditPart.VISUAL_ID:

 				return new InteractionConstraintSpecificationEditPart(view);

-

 			case ConstraintEditPart.VISUAL_ID:

 				return new ConstraintEditPart(view);

-

 			case ConstraintNameEditPart.VISUAL_ID:

 				return new ConstraintNameEditPart(view);

-

 			case ConstraintSpecificationEditPart.VISUAL_ID:

 				return new ConstraintSpecificationEditPart(view);

-

 			case BehaviorPortEditPart.VISUAL_ID:

 				return new BehaviorPortEditPart(view);

-

 			case BehaviorPortFloatingLabelEditPart.VISUAL_ID:

 				return new BehaviorPortFloatingLabelEditPart(view);

-

 			case PortEditPart.VISUAL_ID:

 				return new PortEditPart(view);

-

 			case PortNameEditPart.VISUAL_ID:

 				return new PortNameEditPart(view);

-

 			case PortAppliedStereotypeEditPart.VISUAL_ID:

 				return new PortAppliedStereotypeEditPart(view);

-

 			case ParameterEditPart.VISUAL_ID:

 				return new ParameterEditPart(view);

-

 			case ParameterNameEditPart.VISUAL_ID:

 				return new ParameterNameEditPart(view);

-

 			case ParameterAppliedStereotypeEditPart.VISUAL_ID:

 				return new ParameterAppliedStereotypeEditPart(view);

-

 			case PropertyPartEditPartCN.VISUAL_ID:

 				return new PropertyPartEditPartCN(view);

-

 			case PropertyPartNameEditPartCN.VISUAL_ID:

 				return new PropertyPartNameEditPartCN(view);

-

 			case PropertyPartFloatingLabelEditPartCN.VISUAL_ID:

 				return new PropertyPartFloatingLabelEditPartCN(view);

-

 			case CollaborationRoleEditPartCN.VISUAL_ID:

 				return new CollaborationRoleEditPartCN(view);

-

 			case CollaborationRoleNameEditPartCN.VISUAL_ID:

 				return new CollaborationRoleNameEditPartCN(view);

-

 			case CollaborationRoleFloatingLabelEditPartCN.VISUAL_ID:

 				return new CollaborationRoleFloatingLabelEditPartCN(view);

-

 			case CollaborationUseEditPartCN.VISUAL_ID:

 				return new CollaborationUseEditPartCN(view);

-

 			case CollaborationUseNameEditPart.VISUAL_ID:

 				return new CollaborationUseNameEditPart(view);

-

 			case CollaborationUseFloatingLabelEditPartCN.VISUAL_ID:

 				return new CollaborationUseFloatingLabelEditPartCN(view);

-

 			case ActivityCompositeEditPartCN.VISUAL_ID:

 				return new ActivityCompositeEditPartCN(view);

-

 			case ActivityCompositeNameEditPartCN.VISUAL_ID:

 				return new ActivityCompositeNameEditPartCN(view);

-

 			case ActivityCompositeFloatingLabelEditPartCN.VISUAL_ID:

 				return new ActivityCompositeFloatingLabelEditPartCN(view);

-

 			case InteractionCompositeEditPartCN.VISUAL_ID:

 				return new InteractionCompositeEditPartCN(view);

-

 			case InteractionCompositeNameEditPartCN.VISUAL_ID:

 				return new InteractionCompositeNameEditPartCN(view);

-

 			case InteractionCompositeFloatingLabelEditPartCN.VISUAL_ID:

 				return new InteractionCompositeFloatingLabelEditPartCN(view);

-

 			case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

 				return new ProtocolStateMachineCompositeEditPartCN(view);

-

 			case ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID:

 				return new ProtocolStateMachineCompositeNameEditPartCN(view);

-

 			case ProtocolStateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID:

 				return new ProtocolStateMachineCompositeFloatingLabelEditPartCN(view);

-

 			case StateMachineCompositeEditPartCN.VISUAL_ID:

 				return new StateMachineCompositeEditPartCN(view);

-

 			case StateMachineCompositeNameEditPartCN.VISUAL_ID:

 				return new StateMachineCompositeNameEditPartCN(view);

-

 			case StateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID:

 				return new StateMachineCompositeFloatingLabelEditPartCN(view);

-

 			case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

 				return new FunctionBehaviorCompositeEditPartCN(view);

-

 			case FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID:

 				return new FunctionBehaviorCompositeNameEditPartCN(view);

-

 			case FunctionBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID:

 				return new FunctionBehaviorCompositeFloatingLabelEditPartCN(view);

-

 			case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

 				return new OpaqueBehaviorCompositeEditPartCN(view);

-

 			case OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID:

 				return new OpaqueBehaviorCompositeNameEditPartCN(view);

-

 			case OpaqueBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID:

 				return new OpaqueBehaviorCompositeFloatingLabelEditPartCN(view);

-

 			case ComponentCompositeEditPartCN.VISUAL_ID:

 				return new ComponentCompositeEditPartCN(view);

-

 			case ComponentCompositeNameEditPartCN.VISUAL_ID:

 				return new ComponentCompositeNameEditPartCN(view);

-

 			case ComponentCompositeFloatingLabelEditPartCN.VISUAL_ID:

 				return new ComponentCompositeFloatingLabelEditPartCN(view);

-

 			case DeviceCompositeEditPartCN.VISUAL_ID:

 				return new DeviceCompositeEditPartCN(view);

-

 			case DeviceCompositeNameEditPartCN.VISUAL_ID:

 				return new DeviceCompositeNameEditPartCN(view);

-

 			case DeviceCompositeFloatingLabelEditPartCN.VISUAL_ID:

 				return new DeviceCompositeFloatingLabelEditPartCN(view);

-

 			case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeEditPartCN(view);

-

 			case ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeNameEditPartCN(view);

-

 			case ExecutionEnvironmentCompositeFloatingLabelEditPartCN.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeFloatingLabelEditPartCN(view);

-

 			case NodeCompositeEditPartCN.VISUAL_ID:

 				return new NodeCompositeEditPartCN(view);

-

 			case NodeCompositeNameEditPartCN.VISUAL_ID:

 				return new NodeCompositeNameEditPartCN(view);

-

 			case NodeCompositeFloatingLabelEditPartCN.VISUAL_ID:

 				return new NodeCompositeFloatingLabelEditPartCN(view);

-

 			case ClassCompositeEditPartCN.VISUAL_ID:

 				return new ClassCompositeEditPartCN(view);

-

 			case ClassCompositeNameEditPartCN.VISUAL_ID:

 				return new ClassCompositeNameEditPartCN(view);

-

 			case ClassCompositeFloatingLabelEditPartCN.VISUAL_ID:

 				return new ClassCompositeFloatingLabelEditPartCN(view);

-

 			case CollaborationCompositeEditPartCN.VISUAL_ID:

 				return new CollaborationCompositeEditPartCN(view);

-

 			case CollaborationCompositeNameEditPartCN.VISUAL_ID:

 				return new CollaborationCompositeNameEditPartCN(view);

-

 			case CollaborationCompositeFloatingLabelEditPartCN.VISUAL_ID:

 				return new CollaborationCompositeFloatingLabelEditPartCN(view);

-

 			case InterfaceEditPartCN.VISUAL_ID:

 				return new InterfaceEditPartCN(view);

-

 			case InterfaceNameEditPartCN.VISUAL_ID:

 				return new InterfaceNameEditPartCN(view);

-

 			case InterfaceFloatingLabelEditPartCN.VISUAL_ID:

 				return new InterfaceFloatingLabelEditPartCN(view);

-

 			case PrimitiveTypeEditPartCN.VISUAL_ID:

 				return new PrimitiveTypeEditPartCN(view);

-

 			case PrimitiveTypeNameEditPartCN.VISUAL_ID:

 				return new PrimitiveTypeNameEditPartCN(view);

-

 			case PrimitiveTypeFloatingLabelEditPartCN.VISUAL_ID:

 				return new PrimitiveTypeFloatingLabelEditPartCN(view);

-

 			case EnumerationEditPartCN.VISUAL_ID:

 				return new EnumerationEditPartCN(view);

-

 			case EnumerationNameEditPartCN.VISUAL_ID:

 				return new EnumerationNameEditPartCN(view);

-

 			case EnumerationFloatingLabelEditPartCN.VISUAL_ID:

 				return new EnumerationFloatingLabelEditPartCN(view);

-

 			case DataTypeEditPartCN.VISUAL_ID:

 				return new DataTypeEditPartCN(view);

-

 			case DataTypeNameEditPartCN.VISUAL_ID:

 				return new DataTypeNameEditPartCN(view);

-

 			case DataTypeFloatingLabelEditPartCN.VISUAL_ID:

 				return new DataTypeFloatingLabelEditPartCN(view);

-

 			case ActorEditPartCN.VISUAL_ID:

 				return new ActorEditPartCN(view);

-

 			case ActorNameEditPartCN.VISUAL_ID:

 				return new ActorNameEditPartCN(view);

-

 			case ActorFloatingLabelEditPartCN.VISUAL_ID:

 				return new ActorFloatingLabelEditPartCN(view);

-

 			case DeploymentSpecificationEditPartCN.VISUAL_ID:

 				return new DeploymentSpecificationEditPartCN(view);

-

 			case DeploymentSpecificationNameEditPartCN.VISUAL_ID:

 				return new DeploymentSpecificationNameEditPartCN(view);

-

 			case DeploymentSpecificationFloatingLabelEditPartCN.VISUAL_ID:

 				return new DeploymentSpecificationFloatingLabelEditPartCN(view);

-

 			case ArtifactEditPartCN.VISUAL_ID:

 				return new ArtifactEditPartCN(view);

-

 			case ArtifactNameEditPartCN.VISUAL_ID:

 				return new ArtifactNameEditPartCN(view);

-

 			case ArtifactFloatingLabelEditPartCN.VISUAL_ID:

 				return new ArtifactFloatingLabelEditPartCN(view);

-

 			case InformationItemEditPartCN.VISUAL_ID:

 				return new InformationItemEditPartCN(view);

-

 			case InformationItemNameEditPartCN.VISUAL_ID:

 				return new InformationItemNameEditPartCN(view);

-

 			case InformationItemFloatingLabelEditPartCN.VISUAL_ID:

 				return new InformationItemFloatingLabelEditPartCN(view);

-

 			case SignalEditPartCN.VISUAL_ID:

 				return new SignalEditPartCN(view);

-

 			case SignalNameEditPartCN.VISUAL_ID:

 				return new SignalNameEditPartCN(view);

-

 			case SignalFloatingLabelEditPartCN.VISUAL_ID:

 				return new SignalFloatingLabelEditPartCN(view);

-

 			case UseCaseEditPartCN.VISUAL_ID:

 				return new UseCaseEditPartCN(view);

-

 			case UseCaseNameEditPartCN.VISUAL_ID:

 				return new UseCaseNameEditPartCN(view);

-

 			case UseCaseFloatingLabelEditPartCN.VISUAL_ID:

 				return new UseCaseFloatingLabelEditPartCN(view);

-

 			case CommentEditPartCN.VISUAL_ID:

 				return new CommentEditPartCN(view);

-

 			case CommentBodyEditPartCN.VISUAL_ID:

 				return new CommentBodyEditPartCN(view);

-

 			case DurationConstraintEditPartCN.VISUAL_ID:

 				return new DurationConstraintEditPartCN(view);

-

 			case DurationConstraintNameEditPartCN.VISUAL_ID:

 				return new DurationConstraintNameEditPartCN(view);

-

 			case DurationConstraintSpecificationEditPartCN.VISUAL_ID:

 				return new DurationConstraintSpecificationEditPartCN(view);

-

 			case TimeConstraintEditPartCN.VISUAL_ID:

 				return new TimeConstraintEditPartCN(view);

-

 			case TimeConstraintNameEditPartCN.VISUAL_ID:

 				return new TimeConstraintNameEditPartCN(view);

-

 			case TimeConstraintSpecificationEditPartCN.VISUAL_ID:

 				return new TimeConstraintSpecificationEditPartCN(view);

-

 			case IntervalConstraintEditPartCN.VISUAL_ID:

 				return new IntervalConstraintEditPartCN(view);

-

 			case IntervalConstraintNameEditPartCN.VISUAL_ID:

 				return new IntervalConstraintNameEditPartCN(view);

-

 			case IntervalConstraintSpecificationEditPartCN.VISUAL_ID:

 				return new IntervalConstraintSpecificationEditPartCN(view);

-

 			case InteractionConstraintEditPartCN.VISUAL_ID:

 				return new InteractionConstraintEditPartCN(view);

-

 			case InteractionConstraintNameEditPartCN.VISUAL_ID:

 				return new InteractionConstraintNameEditPartCN(view);

-

 			case InteractionConstraintSpecificationEditPartCN.VISUAL_ID:

 				return new InteractionConstraintSpecificationEditPartCN(view);

-

 			case ConstraintEditPartCN.VISUAL_ID:

 				return new ConstraintEditPartCN(view);

-

 			case ConstraintNameEditPartCN.VISUAL_ID:

 				return new ConstraintNameEditPartCN(view);

-

 			case ConstraintSpecificationEditPartCN.VISUAL_ID:

 				return new ConstraintSpecificationEditPartCN(view);

-

 			case PropertyEditPartCLN.VISUAL_ID:

 				return new PropertyEditPartCLN(view);

-

 			case OperationEditPartCLN.VISUAL_ID:

 				return new OperationEditPartCLN(view);

-

 			case EnumerationLiteralEditPartCLN.VISUAL_ID:

 				return new EnumerationLiteralEditPartCLN(view);

-

 			case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

 				return new DataTypeAttributeCompartmentEditPart(view);

-

 			case DataTypeOperationCompartmentEditPart.VISUAL_ID:

 				return new DataTypeOperationCompartmentEditPart(view);

-

 			case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

 				return new DataTypeAttributeCompartmentEditPartCN(view);

-

 			case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

 				return new DataTypeOperationCompartmentEditPartCN(view);

-

 			case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

 				return new EnumerationEnumerationLiteralCompartmentEditPart(view);

-

 			case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

 				return new EnumerationEnumerationLiteralCompartmentEditPartCN(view);

-

 			case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new ActivityCompositeCompartmentEditPartCN(view);

-

 			case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new InteractionCompositeCompartmentEditPartCN(view);

-

 			case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new ProtocolStateMachineCompositeCompartmentEditPartCN(view);

-

 			case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new StateMachineCompositeCompartmentEditPartCN(view);

-

 			case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new FunctionBehaviorCompositeCompartmentEditPartCN(view);

-

 			case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new OpaqueBehaviorCompositeCompartmentEditPartCN(view);

-

 			case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new ComponentCompositeCompartmentEditPartCN(view);

-

 			case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new DeviceCompositeCompartmentEditPartCN(view);

-

 			case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeCompartmentEditPartCN(view);

-

 			case NodeCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new NodeCompositeCompartmentEditPartCN(view);

-

 			case ClassCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new ClassCompositeCompartmentEditPartCN(view);

-

 			case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new CollaborationCompositeCompartmentEditPartCN(view);

-

 			case ActivityCompositeCompartmentEditPart.VISUAL_ID:

 				return new ActivityCompositeCompartmentEditPart(view);

-

 			case InteractionCompositeCompartmentEditPart.VISUAL_ID:

 				return new InteractionCompositeCompartmentEditPart(view);

-

 			case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:

 				return new ProtocolStateMachineCompositeCompartmentEditPart(view);

-

 			case StateMachineCompositeCompartmentEditPart.VISUAL_ID:

 				return new StateMachineCompositeCompartmentEditPart(view);

-

 			case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:

 				return new FunctionBehaviorCompositeCompartmentEditPart(view);

-

 			case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:

 				return new OpaqueBehaviorCompositeCompartmentEditPart(view);

-

 			case ComponentCompositeCompartmentEditPart.VISUAL_ID:

 				return new ComponentCompositeCompartmentEditPart(view);

-

 			case DeviceCompositeCompartmentEditPart.VISUAL_ID:

 				return new DeviceCompositeCompartmentEditPart(view);

-

 			case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeCompartmentEditPart(view);

-

 			case NodeCompositeCompartmentEditPart.VISUAL_ID:

 				return new NodeCompositeCompartmentEditPart(view);

-

 			case ClassCompositeCompartmentEditPart.VISUAL_ID:

 				return new ClassCompositeCompartmentEditPart(view);

-

 			case CollaborationCompositeCompartmentEditPart.VISUAL_ID:

 				return new CollaborationCompositeCompartmentEditPart(view);

-

 			case PropertyPartCompartmentEditPartCN.VISUAL_ID:

 				return new PropertyPartCompartmentEditPartCN(view);

-

 			case BehaviorPortLinkEditPart.VISUAL_ID:

 				return new BehaviorPortLinkEditPart(view);

-

-

 			case LinkDescriptorEditPart.VISUAL_ID:

 				return new LinkDescriptorEditPart(view);

-

-

 			case CommentAnnotatedElementEditPart.VISUAL_ID:

 				return new CommentAnnotatedElementEditPart(view);

-

-

 			case ConstraintConstrainedElementEditPart.VISUAL_ID:

 				return new ConstraintConstrainedElementEditPart(view);

-

-

 			case ComponentRealizationEditPart.VISUAL_ID:

 				return new ComponentRealizationEditPart(view);

-

 			case ComponentRealizationNameEditPart.VISUAL_ID:

 				return new ComponentRealizationNameEditPart(view);

-

 			case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:

 				return new ComponentRealizationAppliedStereotypeEditPart(view);

-

-

 			case InterfaceRealizationEditPart.VISUAL_ID:

 				return new InterfaceRealizationEditPart(view);

-

 			case InterfaceRealizationNameEditPart.VISUAL_ID:

 				return new InterfaceRealizationNameEditPart(view);

-

 			case InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID:

 				return new InterfaceRealizationAppliedStereotypeEditPart(view);

-

-

 			case SubstitutionEditPart.VISUAL_ID:

 				return new SubstitutionEditPart(view);

-

 			case SubstitutionNameEditPart.VISUAL_ID:

 				return new SubstitutionNameEditPart(view);

-

 			case SubstitutionAppliedStereotypeEditPart.VISUAL_ID:

 				return new SubstitutionAppliedStereotypeEditPart(view);

-

-

 			case RealizationEditPart.VISUAL_ID:

 				return new RealizationEditPart(view);

-

 			case RealizationNameEditPart.VISUAL_ID:

 				return new RealizationNameEditPart(view);

-

 			case RealizationAppliedStereotypeEditPart.VISUAL_ID:

 				return new RealizationAppliedStereotypeEditPart(view);

-

-

 			case ManifestationEditPart.VISUAL_ID:

 				return new ManifestationEditPart(view);

-

 			case ManifestationNameEditPart.VISUAL_ID:

 				return new ManifestationNameEditPart(view);

-

 			case ManifestationAppliedStereotypeEditPart.VISUAL_ID:

 				return new ManifestationAppliedStereotypeEditPart(view);

-

-

 			case AbstractionEditPart.VISUAL_ID:

 				return new AbstractionEditPart(view);

-

 			case AbstractionNameEditPart.VISUAL_ID:

 				return new AbstractionNameEditPart(view);

-

 			case AbstractionAppliedStereotypeEditPart.VISUAL_ID:

 				return new AbstractionAppliedStereotypeEditPart(view);

-

-

 			case UsageEditPart.VISUAL_ID:

 				return new UsageEditPart(view);

-

 			case UsageNameEditPart.VISUAL_ID:

 				return new UsageNameEditPart(view);

-

 			case UsageAppliedStereotypeEditPart.VISUAL_ID:

 				return new UsageAppliedStereotypeEditPart(view);

-

-

 			case DeploymentEditPart.VISUAL_ID:

 				return new DeploymentEditPart(view);

-

 			case DeploymentNameEditPart.VISUAL_ID:

 				return new DeploymentNameEditPart(view);

-

 			case DeploymentAppliedStereotypeEditPart.VISUAL_ID:

 				return new DeploymentAppliedStereotypeEditPart(view);

-

-

 			case RoleBindingEditPart.VISUAL_ID:

 				return new RoleBindingEditPart(view);

-

 			case RoleBindingRoleNameEditPart.VISUAL_ID:

 				return new RoleBindingRoleNameEditPart(view);

-

 			case RoleBindingAppliedStereotypeEditPart.VISUAL_ID:

 				return new RoleBindingAppliedStereotypeEditPart(view);

-

-

 			case DependencyEditPart.VISUAL_ID:

 				return new DependencyEditPart(view);

-

 			case DependencyNameEditPart.VISUAL_ID:

 				return new DependencyNameEditPart(view);

-

 			case DependencyAppliedStereotypeEditPart.VISUAL_ID:

 				return new DependencyAppliedStereotypeEditPart(view);

-

-

 			case ConnectorEditPart.VISUAL_ID:

 				return new ConnectorEditPart(view);

-

 			case ConnectorAppliedStereotypeEditPart.VISUAL_ID:

 				return new ConnectorAppliedStereotypeEditPart(view);

-

 			case ConnectorNameEditPart.VISUAL_ID:

 				return new ConnectorNameEditPart(view);

-

 			case ConnectorMultiplicitySourceEditPart.VISUAL_ID:

 				return new ConnectorMultiplicitySourceEditPart(view);

-

 			case ConnectorMultiplicityTargetEditPart.VISUAL_ID:

 				return new ConnectorMultiplicityTargetEditPart(view);

-

-

 			case GeneralizationEditPart.VISUAL_ID:

 				return new GeneralizationEditPart(view);

-

 			case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:

 				return new GeneralizationAppliedStereotypeEditPart(view);

-

-

 			case TimeObservationEventEditPart.VISUAL_ID:

 				return new TimeObservationEventEditPart(view);

-

-

 			case DurationObservationEventEditPart.VISUAL_ID:

 				return new DurationObservationEventEditPart(view);

-

-

 			case RepresentationEditPart.VISUAL_ID:

 				return new RepresentationEditPart(view);

-

 			case RepresentationTagLabelEditPart.VISUAL_ID:

 				return new RepresentationTagLabelEditPart(view);

-

-

 			case InformationFlowEditPart.VISUAL_ID:

 				return new InformationFlowEditPart(view);

-

 			case InformationFlowConveyedLabelEditPart.VISUAL_ID:

 				return new InformationFlowConveyedLabelEditPart(view);

-

 			case InformationFlowAppliedStereotypeEditPart.VISUAL_ID:

 				return new InformationFlowAppliedStereotypeEditPart(view);

-

 			}

 		}

 		return createUnrecognizedEditPart(context, model);

@@ -1062,13 +712,10 @@ public class UMLEditPartFactory implements EditPartFactory {
 	 * @generated

 	 */

 	public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) {

-		if (source.getFigure() instanceof IMultilineEditableFigure) {

-			return new MultilineCellEditorLocator(

-					(IMultilineEditableFigure) source.getFigure());

-		}

-		else {

+		if(source.getFigure() instanceof IMultilineEditableFigure) {

+			return new MultilineCellEditorLocator((IMultilineEditableFigure)source.getFigure());

+		} else {

 			return CellEditorLocatorAccess.INSTANCE.getTextCellEditorLocator(source);

-

 		}

 	}

 

@@ -1099,18 +746,16 @@ public class UMLEditPartFactory implements EditPartFactory {
 		/**

 		 * @generated

 		 */

-		@Override

 		public void relocate(CellEditor celleditor) {

-			Text text = (Text) celleditor.getControl();

+			Text text = (Text)celleditor.getControl();

 			Rectangle rect = getMultilineEditableFigure().getBounds().getCopy();

 			rect.x = getMultilineEditableFigure().getEditionLocation().x;

 			rect.y = getMultilineEditableFigure().getEditionLocation().y;

 			getMultilineEditableFigure().translateToAbsolute(rect);

-			if (getMultilineEditableFigure().getText().length() > 0) {

-				rect.setSize(new Dimension(text.computeSize(rect.width,

-						SWT.DEFAULT)));

+			if(getMultilineEditableFigure().getText().length() > 0) {

+				rect.setSize(new Dimension(text.computeSize(rect.width, SWT.DEFAULT)));

 			}

-			if (!rect.equals(new Rectangle(text.getBounds()))) {

+			if(!rect.equals(new Rectangle(text.getBounds()))) {

 				text.setBounds(rect.x, rect.y, rect.width, rect.height);

 			}

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
index c38a5337596..2750e6532a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageAppliedStereotypeEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,7 +619,7 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

@@ -680,12 +630,12 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -693,7 +643,7 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -703,13 +653,12 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -719,25 +668,20 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -747,13 +691,12 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -769,45 +712,38 @@ public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java
index 38d185f7f47..1355e9284ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -16,11 +16,11 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UsageItemSemanticEditPolicy;

 

 /**

  * @generated

@@ -42,24 +42,21 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new UsageItemSemanticEditPolicy());

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeUsageLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeUsageLabelDisplayEditPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof UsageNameEditPart) {

-			((UsageNameEditPart) childEditPart).setLabel(

-					getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof UsageNameEditPart) {

+			((UsageNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 		}

-		if (childEditPart instanceof UsageAppliedStereotypeEditPart) {

-			((UsageAppliedStereotypeEditPart) childEditPart).setLabel(

-					getPrimaryShape().getAppliedStereotypeLabel());

+		if(childEditPart instanceof UsageAppliedStereotypeEditPart) {

+			((UsageAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

@@ -67,9 +64,8 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -79,10 +75,10 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof UsageNameEditPart) {

+		if(childEditPart instanceof UsageNameEditPart) {

 			return true;

 		}

-		if (childEditPart instanceof UsageAppliedStereotypeEditPart) {

+		if(childEditPart instanceof UsageAppliedStereotypeEditPart) {

 			return true;

 		}

 		return false;

@@ -91,9 +87,8 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -101,13 +96,12 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected Connection createConnectionFigure() {

 		return new DashedEdgeFigure();

 	}

@@ -115,8 +109,7 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra
 	/**

 	 * @generated

 	 */

-	@Override

 	public DashedEdgeFigure getPrimaryShape() {

-		return (DashedEdgeFigure) getFigure();

+		return (DashedEdgeFigure)getFigure();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
index ccf42044f8c..f973846df27 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -43,7 +43,6 @@ import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.gmf.runtime.notation.FontStyle;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

@@ -112,14 +111,12 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -138,21 +135,19 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	}

 

 	/**

-	 * @generated

+	 * @generated Papyrus Generation

 	 */

 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

 		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public int getKeyPoint() {

 		return ConnectionLocator.MIDDLE;

 	}

@@ -161,12 +156,12 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -174,12 +169,12 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -187,12 +182,12 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -200,20 +195,19 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -224,7 +218,6 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -232,7 +225,6 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -240,7 +232,6 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -265,12 +256,10 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -279,30 +268,26 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -315,31 +300,27 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -349,9 +330,8 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -360,7 +340,6 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -368,9 +347,8 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -380,10 +358,8 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -412,8 +388,8 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -421,8 +397,8 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -431,56 +407,47 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -502,15 +469,14 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -524,7 +490,6 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -539,20 +504,20 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			setLabelTextHelper(getFigure(), getLabelText());

 			setLabelIconHelper(getFigure(), getLabelIcon());

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -560,18 +525,15 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -580,27 +542,19 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -608,7 +562,6 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -616,13 +569,12 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -632,10 +584,9 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -646,9 +597,8 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -669,31 +619,30 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -701,7 +650,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -711,13 +660,12 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -727,25 +675,20 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -755,13 +698,12 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -777,45 +719,38 @@ public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwar
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-

 		super.handleNotificationEvent(event);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
index de2f15ab8a8..4163b773046 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,8 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UseCaseItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -80,14 +80,13 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new UseCaseItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

@@ -101,22 +100,21 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case UseCaseFloatingLabelEditPart.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -136,57 +134,49 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof UseCaseNameEditPart) {

-			((UseCaseNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof UseCaseNameEditPart) {

+			((UseCaseNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -194,7 +184,7 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof UseCaseNameEditPart) {

+		if(childEditPart instanceof UseCaseNameEditPart) {

 			return true;

 		}

 		return false;

@@ -203,9 +193,8 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -214,9 +203,8 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -225,9 +213,8 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -236,21 +223,15 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof UseCaseFloatingLabelEditPart) {

+		if(borderItemEditPart instanceof UseCaseFloatingLabelEditPart) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -258,29 +239,24 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -291,9 +267,8 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -302,9 +277,8 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -312,7 +286,6 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -320,17 +293,15 @@ public class UseCaseEditPart extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseNameEditPart.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
index c4f62f22a87..9ec77c21ff1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,6 +35,8 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.GetChildLayoutEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.RoundedRectangleNodePlateFigure;

@@ -45,8 +47,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNode
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;

 import org.eclipse.papyrus.uml.diagram.common.locator.RoundedRectangleLabelPositionLocator;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UseCaseItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.swt.graphics.Color;

 

@@ -80,14 +80,13 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new UseCaseItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy());

 		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

@@ -101,22 +100,21 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 

 			@Override

 			protected EditPolicy createChildEditPolicy(EditPart child) {

-				View childView = (View) child.getModel();

-				switch (UMLVisualIDRegistry.getVisualID(childView)) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

 				case UseCaseFloatingLabelEditPartCN.VISUAL_ID:

 					return new BorderItemSelectionEditPolicy() {

 

 						@Override

 						protected List<?> createSelectionHandles() {

-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					}

-					;

+					};

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-				if (result == null) {

+				if(result == null) {

 					result = new NonResizableEditPolicy();

 				}

 				return result;

@@ -136,57 +134,49 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

+	 *Papyrus codeGen

+	 *@generated

 	 **/

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		/*

 		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

 		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

 		 */

-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

 			Object notifier = event.getNotifier();

-			List<?> modelChildren = ((View) getModel()).getChildren();

-			if (!(notifier instanceof Edge)) {

-				if (modelChildren.contains(event.getNotifier())) {

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

 					return;

 				}

 			}

 		}

 		super.handleNotificationEvent(event);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new RoundedCompartmentFigure();

 	}

 

 	/**

-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

-	 *

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure

 	 * @generated

 	 */

-	@Override

 	public RoundedCompartmentFigure getPrimaryShape() {

-		return (RoundedCompartmentFigure) primaryShape;

+		return (RoundedCompartmentFigure)primaryShape;

 	}

 

 	/**

 	 * @generated

 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof UseCaseNameEditPartCN) {

-			((UseCaseNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		if(childEditPart instanceof UseCaseNameEditPartCN) {

+			((UseCaseNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

-

-

 		return false;

 	}

 

@@ -194,7 +184,7 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 	 * @generated

 	 */

 	protected boolean removeFixedChild(EditPart childEditPart) {

-		if (childEditPart instanceof UseCaseNameEditPartCN) {

+		if(childEditPart instanceof UseCaseNameEditPartCN) {

 			return true;

 		}

 		return false;

@@ -203,9 +193,8 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

-		if (addFixedChild(childEditPart)) {

+		if(addFixedChild(childEditPart)) {

 			return;

 		}

 		super.addChildVisual(childEditPart, -1);

@@ -214,9 +203,8 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

-		if (removeFixedChild(childEditPart)) {

+		if(removeFixedChild(childEditPart)) {

 			return;

 		}

 		super.removeChildVisual(childEditPart);

@@ -225,9 +213,8 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

-		if (editPart instanceof IBorderItemEditPart) {

+		if(editPart instanceof IBorderItemEditPart) {

 			return getBorderedFigure().getBorderItemContainer();

 		}

 		return getContentPane();

@@ -236,21 +223,15 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

-		if (borderItemEditPart instanceof UseCaseFloatingLabelEditPartCN) {

+		if(borderItemEditPart instanceof UseCaseFloatingLabelEditPartCN) {

 			IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else

-		{

+		} else {

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

 

-	/**

-	 * @generated

-	 */

-	@Override

 	protected NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40);

 		return result;

@@ -258,29 +239,24 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

-

 	}

 

 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

-		if (nodeShape.getLayoutManager() == null) {

+		if(nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

 			layout.setSpacing(5);

 			nodeShape.setLayoutManager(layout);

@@ -291,9 +267,8 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

-		if (contentPane != null) {

+		if(contentPane != null) {

 			return contentPane;

 		}

 		return super.getContentPane();

@@ -302,9 +277,8 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

-		if (primaryShape != null) {

+		if(primaryShape != null) {

 			primaryShape.setForegroundColor(color);

 		}

 	}

@@ -312,7 +286,6 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -320,17 +293,15 @@ public class UseCaseEditPartCN extends RoundedCompartmentEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

-		if (primaryShape instanceof IPapyrusNodeFigure) {

-			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

+		if(primaryShape instanceof IPapyrusNodeFigure) {

+			((IPapyrusNodeFigure)primaryShape).setLineStyle(style);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseNameEditPartCN.VISUAL_ID));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPart.java
index 9bf2d31f84b..1346b487d84 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_2082, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseFloatingLabelEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class UseCaseFloatingLabelEditPart extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPartCN.java
index 001ee6978ba..4efca2bba6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseFloatingLabelEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -84,9 +84,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart

-		implements ITextAwareEditPart, IBorderItemEditPart

-{

+public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -115,19 +113,15 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 * 

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

-

-

 	/**

 	 * @generated

 	 */

@@ -145,7 +139,6 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

@@ -156,12 +149,11 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IBorderItemLocator getBorderItemLocator() {

 		IFigure parentFigure = getFigure().getParent();

-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

 			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

-			return (IBorderItemLocator) constraint;

+			return (IBorderItemLocator)constraint;

 		}

 		return null;

 	}

@@ -169,26 +161,24 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void refreshBounds() {

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

 		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

 	}

 

-

 	/**

 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -196,12 +186,12 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -209,12 +199,12 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -222,20 +212,19 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -246,7 +235,6 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -254,7 +242,6 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -286,12 +273,10 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -300,30 +285,26 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -336,31 +317,27 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -370,9 +347,8 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -381,7 +357,6 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -389,9 +364,8 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_3096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseFloatingLabelEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -401,10 +375,8 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -433,8 +405,8 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -442,8 +414,8 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -452,56 +424,47 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -523,15 +486,14 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +507,6 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -560,27 +521,26 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -588,18 +548,15 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -608,27 +565,19 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -636,7 +585,6 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -644,13 +592,12 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -660,10 +607,9 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -674,9 +620,8 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -697,31 +642,30 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -729,7 +673,7 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -739,13 +683,12 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Initializes the extended editor configuration

-	 * 

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -755,25 +698,20 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 	/**

 	 * Updates the preference configuration

-	 * 

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -783,13 +721,12 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -802,35 +739,29 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 		}

 	}

 

-

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

@@ -843,7 +774,6 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		IFigure label = createFigurePrim();

 		defaultText = getLabelTextHelper(label);

@@ -856,5 +786,4 @@ public class UseCaseFloatingLabelEditPartCN extends FloatingLabelEditPart
 	protected IFigure createFigurePrim() {

 		return new PapyrusWrappingLabel();

 	}

-

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java
index b3adde5c1ce..6adc88ca2c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_2082, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseNameEditPart.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java
index 0e7d8407e3e..4ab2069e098 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -114,14 +114,12 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

 	 * @generated

 	 */

 	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

 

 	/**

 	 * configuration from a registered edit dialog

-	 *

 	 * @generated

 	 */

 	protected IDirectEditorConfiguration configuration;

@@ -136,7 +134,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

@@ -148,12 +145,12 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

 		} else {

-			return ((Label) figure).getText();

+			return ((Label)figure).getText();

 		}

 	}

 

@@ -161,12 +158,12 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

 		} else {

-			((Label) figure).setText(text);

+			((Label)figure).setText(text);

 		}

 	}

 

@@ -174,12 +171,12 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

 		} else {

-			return ((Label) figure).getIcon();

+			return ((Label)figure).getIcon();

 		}

 	}

 

@@ -187,20 +184,19 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

 		} else {

-			((Label) figure).setIcon(icon);

+			((Label)figure).setIcon(icon);

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure

-			figure) {

+	public void setLabel(IFigure figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -211,7 +207,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> getModelChildren() {

 		return Collections.EMPTY_LIST;

 	}

@@ -219,7 +214,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

 		return null;

 	}

@@ -227,7 +221,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setParser(IParser parser) {

 		this.parser = parser;

 	}

@@ -244,12 +237,12 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected Image getLabelIcon() {

 		EObject parserElement = getParserElement();

-		if (parserElement == null) {

+		if(parserElement == null) {

 			return null;

 		}

 		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

 				return UMLElementTypes.getImage(parserElement.eClass());

 			}

 		}

@@ -262,12 +255,10 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	protected String getLabelText() {

 		String text = null;

 		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

 		}

-		if (text == null || text.length() == 0) {

+		if(text == null || text.length() == 0) {

 			text = defaultText;

 		}

 		return text;

@@ -276,30 +267,26 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setLabelText(String text) {

 		setLabelTextHelper(getFigure(), text);

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

 	}

 

 	/**

@@ -312,31 +299,27 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICellEditorValidator getEditTextValidator() {

 		return new ICellEditorValidator() {

 

 			@Override

 			public String isValid(final Object value) {

-				if (value instanceof String) {

+				if(value instanceof String) {

 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							@Override

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

-

 				// shouldn't get here

 				return null;

 			}

@@ -346,9 +329,8 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

+		if(getParserElement() == null || getParser() == null) {

 			return null;

 		}

 		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

@@ -357,7 +339,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public ParserOptions getParserOptions() {

 		return ParserOptions.NONE;

 	}

@@ -365,9 +346,8 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser() {

-		if (parser == null) {

+		if(parser == null) {

 			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_3096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

@@ -377,10 +357,8 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this,

-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-					UMLEditPartFactory.getTextCellEditorLocator(this)));

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -409,8 +387,8 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

 		}

 	}

 

@@ -418,8 +396,8 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

 		} else {

 			performDirectEdit();

 		}

@@ -428,56 +406,47 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performDirectEditRequest(Request request) {

-

 		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

-		switch (directEditionMode) {

+		switch(directEditionMode) {

 		case IDirectEdition.NO_DIRECT_EDITION:

 			// no direct edition mode => does nothing

 			return;

 		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

 			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

+			if(configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this,

-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

-						UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

 				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

 					initializeDirectEditManager(theRequest);

 					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

-							configuration);

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

+				if(Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

 

 						@Override

 						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -499,15 +468,14 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

+

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						}

-						else {

+						} else {

 							performDirectEdit();

 						}

 					}

@@ -521,7 +489,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshVisuals() {

 		super.refreshVisuals();

 		refreshLabel();

@@ -536,27 +503,26 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected void refreshLabel() {

 		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

+		if(maskLabelPolicy == null) {

 			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

 		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

+		if(maskLabelPolicy == null) {

+			View view = (View)getModel();

+			if(view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

+			} else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

 		}

 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

 		}

 		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

 		}

 	}

 

@@ -564,18 +530,15 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

 			}

 		}

 	}

@@ -584,27 +547,19 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -612,7 +567,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setFontColor(Color color) {

 		getFigure().setForegroundColor(color);

 	}

@@ -620,13 +574,12 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

+		if(getParser() instanceof ISemanticParser) {

 			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

 			}

 		} else {

 			super.addSemanticListeners();

@@ -636,10 +589,9 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

 				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

 			}

 		} else {

@@ -650,9 +602,8 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

+		if(accessibleEP == null) {

 			accessibleEP = new AccessibleGraphicalEditPart() {

 

 				@Override

@@ -673,31 +624,30 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Returns the kind of associated editor for direct edition.

-	 *

+	 * 

 	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

+		if(checkExtendedEditor()) {

 			initExtendedEditorConfiguration();

 			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

 		}

-		if (checkDefaultEdition()) {

+		if(checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

-

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

 	/**

 	 * Checks if an extended editor is present.

-	 *

+	 * 

 	 * @return <code>true</code> if an extended editor is present.

 	 * @generated

 	 */

 	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

+		if(resolveSemanticElement() != null) {

 			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

 		}

 		return false;

@@ -705,7 +655,7 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Checks if a default direct edition is available

-	 *

+	 * 

 	 * @return <code>true</code> if a default direct edition is available

 	 * @generated

 	 */

@@ -715,13 +665,12 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Initializes the extended editor configuration

-	 *

 	 * @generated

 	 */

 	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

+		if(configuration == null) {

 			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

+			if(languagePreferred != null && !languagePreferred.equals("")) {

 				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

 			} else {

 				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

@@ -731,25 +680,20 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 	/**

 	 * Updates the preference configuration

-	 *

 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

 	}

 

 	/**

 	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

+	 * @param theRequest the direct edit request that starts the direct edit system

 	 * @generated

 	 */

 	protected void performDefaultDirectEditorEdit(final Request theRequest) {

@@ -759,13 +703,12 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 

 				@Override

 				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

 							performDirectEdit(editRequest.getLocation());

 						} else {

 							performDirectEdit();

@@ -781,7 +724,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addNotationalListeners() {

 		super.addNotationalListeners();

 		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

@@ -790,7 +732,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeNotationalListeners() {

 		super.removeNotationalListeners();

 		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

@@ -799,39 +740,34 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void handleNotificationEvent(Notification event) {

 		refreshLabel();

 		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

 			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

 			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

+					if(resolveSemanticElement() != null) {

 						addSemanticListeners();

 					}

 					refreshLabel();

 				}

 			}

 		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

 			refreshLabel();

 		}

 		super.handleNotificationEvent(event);

@@ -840,7 +776,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createFigure() {

 		// Parent should assign one using setLabel() method

 		return null;

@@ -854,7 +789,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	@Override

 	public void activate() {

 		super.activate();

 		addOwnerElementListeners();

@@ -864,18 +798,15 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel()));

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

-

 	}

 

 	/**

@@ -883,6 +814,5 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
deleted file mode 100644
index a1f74af09f1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public AbstractionItemSemanticEditPolicy() {

-		super(UMLElementTypes.Abstraction_4007);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 218f280da00..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ActivityCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ActivityCompositeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Activity_2060);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 6cc93ec7fb2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ActivityCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ActivityCompositeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Activity_3072);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
deleted file mode 100644
index 4d5098a756d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ActivityCompositeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Activity_2060);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
deleted file mode 100644
index a0cb21891db..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ActivityCompositeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Activity_3072);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
deleted file mode 100644
index 6e044f7ad3f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ActorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ActorItemSemanticEditPolicy() {

-		super(UMLElementTypes.Actor_2077);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
deleted file mode 100644
index e81703b8e8c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ActorItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ActorItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Actor_3091);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
deleted file mode 100644
index ba875c684ce..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class AnyReceiveEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public AnyReceiveEventItemSemanticEditPolicy() {

-		super(UMLElementTypes.AnyReceiveEvent_2085);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
deleted file mode 100644
index 9eb014f2e9a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ArtifactItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ArtifactItemSemanticEditPolicy() {

-		super(UMLElementTypes.Artifact_2079);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
deleted file mode 100644
index a8fd0cf6f1e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ArtifactItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ArtifactItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Artifact_3093);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
deleted file mode 100644
index 8d5e691b375..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CallEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CallEventItemSemanticEditPolicy() {

-		super(UMLElementTypes.CallEvent_2084);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
deleted file mode 100644
index 2f6d53d4498..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ChangeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ChangeEventItemSemanticEditPolicy() {

-		super(UMLElementTypes.ChangeEvent_2088);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 6daa66b1def..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ClassCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ClassCompositeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Class_2073);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index c9234b8af0f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ClassCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ClassCompositeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Class_3085);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
deleted file mode 100644
index 4b411a7a4e7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ClassCompositeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Class_2073);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
deleted file mode 100644
index 8e506f2773b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ClassCompositeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Class_3085);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index f091717dab0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationRoleCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CollaborationCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CollaborationCompositeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Collaboration_2075);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ConnectableElement_3115 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationRoleCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index c6b5b8b7571..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationRoleCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CollaborationCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CollaborationCompositeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Collaboration_3086);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ConnectableElement_3115 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationRoleCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
deleted file mode 100644
index 4a8ac134619..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CollaborationCompositeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Collaboration_2075);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
deleted file mode 100644
index e095be4fa87..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CollaborationCompositeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Collaboration_3086);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
deleted file mode 100644
index 2db055fc00b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CollaborationRoleItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CollaborationRoleItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.ConnectableElement_3115);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
deleted file mode 100644
index 58e492b50af..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CollaborationUseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CollaborationUseItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.CollaborationUse_3071);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
deleted file mode 100644
index 1f5b330f9dc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CommentAnnotatedElementItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CommentAnnotatedElementItemSemanticEditPolicy() {

-		super(UMLElementTypes.CommentAnnotatedElement_4002);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return getGEFWrapper(new DestroyReferenceCommand(req));

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java
deleted file mode 100644
index ba20cb62b1c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CommentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CommentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Comment_2109);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java
deleted file mode 100644
index d80aaefa536..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CommentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CommentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Comment_3097);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index ce198b970eb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentCompositeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Component_2069);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index f93ae36737d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentCompositeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Component_3081);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
deleted file mode 100644
index fadbcc84156..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentCompositeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Component_2069);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
deleted file mode 100644
index 4751d50244b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentCompositeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Component_3081);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
deleted file mode 100644
index 961a0cca385..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ComponentRealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentRealizationItemSemanticEditPolicy() {

-		super(UMLElementTypes.ComponentRealization_4004);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CompositeStructureDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CompositeStructureDiagramItemSemanticEditPolicy.java
deleted file mode 100644
index 0f67056d5c4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CompositeStructureDiagramItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AnyReceiveEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CallEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ChangeEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationIntervalCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExpressionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InstanceValueCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralBooleanCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralIntegerCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralNullCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralStringCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralUnlimitedNaturalCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueExpressionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StringExpressionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeExpressionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeIntervalCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class CompositeStructureDiagramItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public CompositeStructureDiagramItemSemanticEditPolicy() {

-		super(UMLElementTypes.Package_1000);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Activity_2060 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_2061 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_2062 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_2063 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_2064 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_2065 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_2069 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_2070 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_2071 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_2072 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_2073 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_2075 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_2076 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_2066 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_2067 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_2068 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_2077 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_2078 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_2079 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_2080 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_2081 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_2082 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.SignalEvent_2083 == requestElementType) {

-

-			return getGEFWrapper(new SignalEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CallEvent_2084 == requestElementType) {

-

-			return getGEFWrapper(new CallEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.AnyReceiveEvent_2085 == requestElementType) {

-

-			return getGEFWrapper(new AnyReceiveEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ChangeEvent_2088 == requestElementType) {

-

-			return getGEFWrapper(new ChangeEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeEvent_2089 == requestElementType) {

-

-			return getGEFWrapper(new TimeEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationObservation_2093 == requestElementType) {

-

-			return getGEFWrapper(new DurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeObservation_2094 == requestElementType) {

-

-			return getGEFWrapper(new TimeObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.LiteralBoolean_2095 == requestElementType) {

-

-			return getGEFWrapper(new LiteralBooleanCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.LiteralInteger_2096 == requestElementType) {

-

-			return getGEFWrapper(new LiteralIntegerCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.LiteralNull_2097 == requestElementType) {

-

-			return getGEFWrapper(new LiteralNullCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.LiteralString_2098 == requestElementType) {

-

-			return getGEFWrapper(new LiteralStringCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.LiteralUnlimitedNatural_2099 == requestElementType) {

-

-			return getGEFWrapper(new LiteralUnlimitedNaturalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StringExpression_2100 == requestElementType) {

-

-			return getGEFWrapper(new StringExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueExpression_2101 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeExpression_2102 == requestElementType) {

-

-			return getGEFWrapper(new TimeExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Expression_2103 == requestElementType) {

-

-			return getGEFWrapper(new ExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Duration_2104 == requestElementType) {

-

-			return getGEFWrapper(new DurationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeInterval_2105 == requestElementType) {

-

-			return getGEFWrapper(new TimeIntervalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationInterval_2106 == requestElementType) {

-

-			return getGEFWrapper(new DurationIntervalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interval_2107 == requestElementType) {

-

-			return getGEFWrapper(new IntervalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InstanceValue_2108 == requestElementType) {

-

-			return getGEFWrapper(new InstanceValueCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_2109 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_2110 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_2111 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_2112 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_2113 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_2114 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDuplicateCommand(DuplicateElementsRequest req) {

-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();

-		return getGEFWrapper(new DuplicateAnythingCommand(editingDomain, req));

-	}

-

-	/**

-	 * @generated

-	 */

-	private static class DuplicateAnythingCommand extends DuplicateEObjectsCommand {

-

-		/**

-		 * @generated

-		 */

-		public DuplicateAnythingCommand(TransactionalEditingDomain editingDomain, DuplicateElementsRequest req) {

-			super(editingDomain, req.getLabel(), req.getElementsToBeDuplicated(), req.getAllDuplicatedElementsMap());

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
deleted file mode 100644
index 45b68a103e9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConnectorItemSemanticEditPolicy() {

-		super(UMLElementTypes.Connector_4013);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
deleted file mode 100644
index bf691e857ea..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConstraintConstrainedElementItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConstraintConstrainedElementItemSemanticEditPolicy() {

-		super(UMLElementTypes.ConstraintConstrainedElement_4003);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return getGEFWrapper(new DestroyReferenceCommand(req));

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
deleted file mode 100644
index 793df389d5a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConstraintItemSemanticEditPolicy() {

-		super(UMLElementTypes.Constraint_2114);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java
deleted file mode 100644
index cfcfc1ac3d0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ConstraintItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Constraint_3120);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 1d704ce680c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyCreateCommandCLN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DataTypeAttributeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DataTypeAttributeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.DataType_2068);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3101 == requestElementType) {

-

-			return getGEFWrapper(new PropertyCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index aea56fc5104..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyCreateCommandCLN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DataTypeAttributeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DataTypeAttributeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.DataType_3080);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3101 == requestElementType) {

-

-			return getGEFWrapper(new PropertyCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
deleted file mode 100644
index b9fe4f91522..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DataTypeItemSemanticEditPolicy() {

-		super(UMLElementTypes.DataType_2068);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
deleted file mode 100644
index 0cde33c1983..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DataTypeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.DataType_3080);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 38ea3576bdd..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OperationCreateCommandCLN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DataTypeOperationCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DataTypeOperationCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.DataType_2068);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Operation_3102 == requestElementType) {

-

-			return getGEFWrapper(new OperationCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 8ccd736ef10..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OperationCreateCommandCLN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DataTypeOperationCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DataTypeOperationCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.DataType_3080);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Operation_3102 == requestElementType) {

-

-			return getGEFWrapper(new OperationCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
deleted file mode 100644
index 9efd0af4fec..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DependencyItemSemanticEditPolicy() {

-		super(UMLElementTypes.Dependency_4010);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
deleted file mode 100644
index ea209bc542e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DeploymentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DeploymentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Deployment_4009);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
deleted file mode 100644
index cd9134150ad..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DeploymentSpecificationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DeploymentSpecificationItemSemanticEditPolicy() {

-		super(UMLElementTypes.DeploymentSpecification_2078);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
deleted file mode 100644
index e9469c2cdc2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DeploymentSpecificationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DeploymentSpecificationItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.DeploymentSpecification_3092);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 3bbd14149d4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DeviceCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DeviceCompositeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Device_2070);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 73ae475f316..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DeviceCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DeviceCompositeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Device_3082);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
deleted file mode 100644
index 977e07d2b06..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DeviceCompositeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Device_2070);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
deleted file mode 100644
index d989a12344d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DeviceCompositeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Device_3082);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
deleted file mode 100644
index 55b81015e6a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DurationConstraintItemSemanticEditPolicy() {

-		super(UMLElementTypes.DurationConstraint_2110);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
deleted file mode 100644
index 65fd781dcd7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DurationConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DurationConstraintItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.DurationConstraint_3116);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
deleted file mode 100644
index 7e458550ca7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DurationIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DurationIntervalItemSemanticEditPolicy() {

-		super(UMLElementTypes.DurationInterval_2106);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
deleted file mode 100644
index c7e859a1481..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DurationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DurationItemSemanticEditPolicy() {

-		super(UMLElementTypes.Duration_2104);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationEventItemSemanticEditPolicy.java
deleted file mode 100644
index c94397803e0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationEventItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DurationObservationEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DurationObservationEventItemSemanticEditPolicy() {

-		super(UMLElementTypes.DurationObservationEvent_4019);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return getGEFWrapper(new DestroyReferenceCommand(req));

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
deleted file mode 100644
index 50f68c6bae5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public DurationObservationItemSemanticEditPolicy() {

-		super(UMLElementTypes.DurationObservation_2093);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 3af384bc751..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationLiteralCreateCommandCLN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Enumeration_2067);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 87d8a386dac..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationLiteralCreateCommandCLN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Enumeration_3079);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
deleted file mode 100644
index c15406dd1bd..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationLiteralCreateCommandCLN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public EnumerationItemSemanticEditPolicy() {

-		super(UMLElementTypes.Enumeration_2067);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
deleted file mode 100644
index eda016478c3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationLiteralCreateCommandCLN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public EnumerationItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Enumeration_3079);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java
deleted file mode 100644
index 7a2b801a0a1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.DeleteCommand;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class EnumerationLiteralItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public EnumerationLiteralItemSemanticEditPolicyCLN() {

-		super(UMLElementTypes.EnumerationLiteral_3066);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		View view = (View) getHost().getModel();

-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(true);

-		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$

-		if (annotation == null) {

-			// there are indirectly referenced children, need extra commands: false

-			addDestroyShortcutsCommand(cmd, view);

-			// delete host element

-			List<EObject> todestroy = new ArrayList<EObject>();

-			todestroy.add(req.getElementToDestroy());

-			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

-		} else {

-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

-		}

-		return getGEFWrapper(cmd.reduce());

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index ef0f4110341..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.ExecutionEnvironment_2071);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index f5200c78f37..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.ExecutionEnvironment_3083);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
deleted file mode 100644
index 7c6e50c4532..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ExecutionEnvironmentCompositeItemSemanticEditPolicy() {

-		super(UMLElementTypes.ExecutionEnvironment_2071);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
deleted file mode 100644
index 70239dad3a3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ExecutionEnvironmentCompositeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.ExecutionEnvironment_3083);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
deleted file mode 100644
index b620dcf4491..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ExpressionItemSemanticEditPolicy() {

-		super(UMLElementTypes.Expression_2103);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 73774debdd3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.FunctionBehavior_2064);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 5b2f9836770..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.FunctionBehavior_3076);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
deleted file mode 100644
index 260484ded63..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public FunctionBehaviorCompositeItemSemanticEditPolicy() {

-		super(UMLElementTypes.FunctionBehavior_2064);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
deleted file mode 100644
index 37cc1b073b1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public FunctionBehaviorCompositeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.FunctionBehavior_3076);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java
deleted file mode 100644
index fab26252502..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class GeneralizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationItemSemanticEditPolicy() {

-		super(UMLElementTypes.Generalization_4015);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
deleted file mode 100644
index d00a68e831b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InformationFlowItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InformationFlowItemSemanticEditPolicy() {

-		super(UMLElementTypes.InformationFlow_4021);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
deleted file mode 100644
index 10743d3b28a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InformationItemItemSemanticEditPolicy() {

-		super(UMLElementTypes.InformationItem_2080);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
deleted file mode 100644
index 97df54b31e0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InformationItemItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.InformationItem_3094);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
deleted file mode 100644
index 37c31d8df79..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InstanceValueItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InstanceValueItemSemanticEditPolicy() {

-		super(UMLElementTypes.InstanceValue_2108);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 748f7d1a151..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InteractionCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InteractionCompositeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interaction_2061);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 0f0505efd2e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InteractionCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InteractionCompositeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Interaction_3073);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
deleted file mode 100644
index 26414aaf9a5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InteractionCompositeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interaction_2061);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
deleted file mode 100644
index 5389a9a1605..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InteractionCompositeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Interaction_3073);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
deleted file mode 100644
index 7c99bf0c802..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InteractionConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InteractionConstraintItemSemanticEditPolicy() {

-		super(UMLElementTypes.InteractionConstraint_2113);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java
deleted file mode 100644
index 8969fd16b3a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InteractionConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InteractionConstraintItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.InteractionConstraint_3119);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
deleted file mode 100644
index 6043fa19114..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interface_2076);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
deleted file mode 100644
index 4029f5395f9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Interface_3087);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
deleted file mode 100644
index 43c2fddb729..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public InterfaceRealizationItemSemanticEditPolicy() {

-		super(UMLElementTypes.InterfaceRealization_4005);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
deleted file mode 100644
index e31565888b8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class IntervalConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public IntervalConstraintItemSemanticEditPolicy() {

-		super(UMLElementTypes.IntervalConstraint_2112);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java
deleted file mode 100644
index 4b9c3cfe36e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class IntervalConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public IntervalConstraintItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.IntervalConstraint_3118);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
deleted file mode 100644
index 8ec14765e31..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class IntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public IntervalItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interval_2107);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
deleted file mode 100644
index ee59f3ad558..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class LiteralBooleanItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public LiteralBooleanItemSemanticEditPolicy() {

-		super(UMLElementTypes.LiteralBoolean_2095);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
deleted file mode 100644
index 7f02e426923..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class LiteralIntegerItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public LiteralIntegerItemSemanticEditPolicy() {

-		super(UMLElementTypes.LiteralInteger_2096);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
deleted file mode 100644
index 593f59ff2c9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class LiteralNullItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public LiteralNullItemSemanticEditPolicy() {

-		super(UMLElementTypes.LiteralNull_2097);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
deleted file mode 100644
index 1c569ce22a5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class LiteralStringItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public LiteralStringItemSemanticEditPolicy() {

-		super(UMLElementTypes.LiteralString_2098);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
deleted file mode 100644
index 6e8e1a529da..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class LiteralUnlimitedNaturalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public LiteralUnlimitedNaturalItemSemanticEditPolicy() {

-		super(UMLElementTypes.LiteralUnlimitedNatural_2099);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
deleted file mode 100644
index 16e7d51a3df..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ManifestationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ManifestationItemSemanticEditPolicy() {

-		super(UMLElementTypes.Manifestation_4012);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 3247d4e1153..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NodeCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NodeCompositeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.Node_2072);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 9a8e0d8f04b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NodeCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NodeCompositeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Node_3084);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
deleted file mode 100644
index bb90d998e45..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NodeCompositeItemSemanticEditPolicy() {

-		super(UMLElementTypes.Node_2072);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
deleted file mode 100644
index f7e27436bb5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public NodeCompositeItemSemanticEditPolicycN() {

-		super(UMLElementTypes.Node_3084);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 6c51310b916..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.OpaqueBehavior_2065);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 86fcd354594..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.OpaqueBehavior_3077);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
deleted file mode 100644
index 65b8b68028e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public OpaqueBehaviorCompositeItemSemanticEditPolicy() {

-		super(UMLElementTypes.OpaqueBehavior_2065);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
deleted file mode 100644
index fc1d5659a87..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public OpaqueBehaviorCompositeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.OpaqueBehavior_3077);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
deleted file mode 100644
index 7b0027ce18a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class OpaqueExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public OpaqueExpressionItemSemanticEditPolicy() {

-		super(UMLElementTypes.OpaqueExpression_2101);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java
deleted file mode 100644
index f05252f1043..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.DeleteCommand;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class OperationItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public OperationItemSemanticEditPolicyCLN() {

-		super(UMLElementTypes.Operation_3102);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		View view = (View) getHost().getModel();

-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(true);

-		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$

-		if (annotation == null) {

-			// there are indirectly referenced children, need extra commands: false

-			addDestroyShortcutsCommand(cmd, view);

-			// delete host element

-			List<EObject> todestroy = new ArrayList<EObject>();

-			todestroy.add(req.getElementToDestroy());

-			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

-		} else {

-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

-		}

-		return getGEFWrapper(cmd.reduce());

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java
deleted file mode 100644
index 9a4112d8b11..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ParameterItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ParameterItemSemanticEditPolicy() {

-		super(UMLElementTypes.Parameter_3088);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
deleted file mode 100644
index d4d5161a1c7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PortItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PortItemSemanticEditPolicy() {

-		super(UMLElementTypes.Port_3069);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
deleted file mode 100644
index beb518757fb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeItemSemanticEditPolicy() {

-		super(UMLElementTypes.PrimitiveType_2066);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
deleted file mode 100644
index ad7d05d3a8b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PrimitiveTypeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.PrimitiveType_3078);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java
deleted file mode 100644
index 89b162f6c56..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.DeleteCommand;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PropertyItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PropertyItemSemanticEditPolicyCLN() {

-		super(UMLElementTypes.Property_3101);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		View view = (View) getHost().getModel();

-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(true);

-		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$

-		if (annotation == null) {

-			// there are indirectly referenced children, need extra commands: false

-			addDestroyShortcutsCommand(cmd, view);

-			// delete host element

-			List<EObject> todestroy = new ArrayList<EObject>();

-			todestroy.add(req.getElementToDestroy());

-			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

-		} else {

-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

-		}

-		return getGEFWrapper(cmd.reduce());

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 86ad6230b36..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PropertyPartCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PropertyPartCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Property_3070);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
deleted file mode 100644
index 5044390e349..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public PropertyPartItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Property_3070);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 7835b637243..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.ProtocolStateMachine_2062);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 527b7287dcb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.ProtocolStateMachine_3074);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
deleted file mode 100644
index 88bab4a96d3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ProtocolStateMachineCompositeItemSemanticEditPolicy() {

-		super(UMLElementTypes.ProtocolStateMachine_2062);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
deleted file mode 100644
index fdb13982547..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ProtocolStateMachineCompositeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.ProtocolStateMachine_3074);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
deleted file mode 100644
index aab5a4c2340..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class RealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public RealizationItemSemanticEditPolicy() {

-		super(UMLElementTypes.Realization_4006);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RepresentationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RepresentationItemSemanticEditPolicy.java
deleted file mode 100644
index 6aaa69b44f2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RepresentationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class RepresentationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public RepresentationItemSemanticEditPolicy() {

-		super(UMLElementTypes.InformationItemRepresented_4020);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return getGEFWrapper(new DestroyReferenceCommand(req));

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
deleted file mode 100644
index f84f0066bae..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class RoleBindingItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public RoleBindingItemSemanticEditPolicy() {

-		super(UMLElementTypes.Dependency_4017);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
deleted file mode 100644
index 7638409250a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class SignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SignalEventItemSemanticEditPolicy() {

-		super(UMLElementTypes.SignalEvent_2083);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
deleted file mode 100644
index 4e51e8b4f51..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SignalItemSemanticEditPolicy() {

-		super(UMLElementTypes.Signal_2081);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
deleted file mode 100644
index d7c6aeb8a64..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SignalItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.Signal_3095);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicy.java
deleted file mode 100644
index 27690e5e2de..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class StateMachineCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public StateMachineCompositeCompartmentItemSemanticEditPolicy() {

-		super(UMLElementTypes.StateMachine_2063);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
deleted file mode 100644
index 5b2ff68d774..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class StateMachineCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public StateMachineCompositeCompartmentItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.StateMachine_3075);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Property_3070 == requestElementType) {

-

-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Activity_3072 == requestElementType) {

-

-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interaction_3073 == requestElementType) {

-

-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

-

-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

-

-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

-

-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

-

-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Component_3081 == requestElementType) {

-

-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Device_3082 == requestElementType) {

-

-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

-

-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Node_3084 == requestElementType) {

-

-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Class_3085 == requestElementType) {

-

-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

-

-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Interface_3087 == requestElementType) {

-

-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

-

-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

-

-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DataType_3080 == requestElementType) {

-

-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Actor_3091 == requestElementType) {

-

-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

-

-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Artifact_3093 == requestElementType) {

-

-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

-

-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Signal_3095 == requestElementType) {

-

-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.UseCase_3096 == requestElementType) {

-

-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Comment_3097 == requestElementType) {

-

-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

-

-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

-

-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

-

-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

-

-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Constraint_3120 == requestElementType) {

-

-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
deleted file mode 100644
index 0dca1a06f28..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public StateMachineCompositeItemSemanticEditPolicy() {

-		super(UMLElementTypes.StateMachine_2063);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
deleted file mode 100644
index 495f207f222..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public StateMachineCompositeItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.StateMachine_3075);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return super.getCreateCommand(req);

-		}

-

-

-		if (UMLElementTypes.Port_3069 == requestElementType) {

-

-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		if (UMLElementTypes.Parameter_3088 == requestElementType) {

-

-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

-

-		}

-		return super.getCreateCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
deleted file mode 100644
index 94c0f876d2f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class StringExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public StringExpressionItemSemanticEditPolicy() {

-		super(UMLElementTypes.StringExpression_2100);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
deleted file mode 100644
index 053440fb3ee..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SubstitutionItemSemanticEditPolicy() {

-		super(UMLElementTypes.Substitution_4011);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
deleted file mode 100644
index 42147d5d4fb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public TimeConstraintItemSemanticEditPolicy() {

-		super(UMLElementTypes.TimeConstraint_2111);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java
deleted file mode 100644
index e210897333d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class TimeConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public TimeConstraintItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.TimeConstraint_3117);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
deleted file mode 100644
index 9271b399fad..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class TimeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public TimeEventItemSemanticEditPolicy() {

-		super(UMLElementTypes.TimeEvent_2089);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
deleted file mode 100644
index d83390ac73c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class TimeExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public TimeExpressionItemSemanticEditPolicy() {

-		super(UMLElementTypes.TimeExpression_2102);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
deleted file mode 100644
index fcddee54f24..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class TimeIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public TimeIntervalItemSemanticEditPolicy() {

-		super(UMLElementTypes.TimeInterval_2105);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationEventSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationEventSemanticEditPolicy.java
deleted file mode 100644
index 6cd51c4fcde..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationEventSemanticEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class TimeObservationEventSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public TimeObservationEventSemanticEditPolicy() {

-		super(UMLElementTypes.TimeObservationEvent_4018);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return getGEFWrapper(new DestroyReferenceCommand(req));

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
deleted file mode 100644
index 66ab541585f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public TimeObservationItemSemanticEditPolicy() {

-		super(UMLElementTypes.TimeObservation_2094);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 1cb89f7f6b1..ee568a059c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -45,7 +45,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -98,14 +97,12 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 

 	/**

 	 * Extended request data key to hold editpart visual id.

-	 *

 	 * @generated

 	 */

 	public static final String VISUAL_ID_KEY = "visual_id"; //$NON-NLS-1$

 

 	/**

 	 * Extended request data key to hold the edge view during a reconnect request.

-	 *

 	 * @generated

 	 */

 	public static final String GRAPHICAL_RECONNECTED_EDGE = "graphical_edge"; //$NON-NLS-1$

@@ -129,18 +126,17 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	 * It is done in those cases when it's not possible to deduce diagram

 	 * element kind from domain element.

 	 * Add the reoriented view to the request extended data so that the view

-	 * currently edited can be distinguished from other views of the same element

-	 * and these latter possibly removed if they become inconsistent after reconnect

-	 *

+	 *  currently edited can be distinguished from other views of the same element

+	 *  and these latter possibly removed if they become inconsistent after reconnect

+	 * 

 	 * @generated

 	 */

-	@Override

 	@SuppressWarnings("unchecked")

 	public Command getCommand(Request request) {

-		if (request instanceof ReconnectRequest) {

-			Object view = ((ReconnectRequest) request).getConnectionEditPart().getModel();

-			if (view instanceof View) {

-				Integer id = new Integer(UMLVisualIDRegistry.getVisualID((View) view));

+		if(request instanceof ReconnectRequest) {

+			Object view = ((ReconnectRequest)request).getConnectionEditPart().getModel();

+			if(view instanceof View) {

+				Integer id = new Integer(UMLVisualIDRegistry.getVisualID((View)view));

 				request.getExtendedData().put(VISUAL_ID_KEY, id);

 				request.getExtendedData().put(GRAPHICAL_RECONNECTED_EDGE, view);

 			}

@@ -150,24 +146,22 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 

 	/**

 	 * Returns visual id from request parameters.

-	 *

 	 * @generated

 	 */

 	protected int getVisualID(IEditCommandRequest request) {

 		Object id = request.getParameter(VISUAL_ID_KEY);

-		return id instanceof Integer ? ((Integer) id).intValue() : -1;

+		return id instanceof Integer ? ((Integer)id).intValue() : -1;

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected Command getSemanticCommand(IEditCommandRequest request) {

 		IEditCommandRequest completedRequest = completeRequest(request);

 		Command semanticCommand = getSemanticCommandSwitch(completedRequest);

 		semanticCommand = getEditHelperCommand(completedRequest, semanticCommand);

-		if (completedRequest instanceof DestroyRequest) {

-			DestroyRequest destroyRequest = (DestroyRequest) completedRequest;

+		if(completedRequest instanceof DestroyRequest) {

+			DestroyRequest destroyRequest = (DestroyRequest)completedRequest;

 			return shouldProceed(destroyRequest) ? addDeleteViewCommand(semanticCommand, destroyRequest) : null;

 		}

 		return semanticCommand;

@@ -177,7 +171,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	 * @generated

 	 */

 	protected Command addDeleteViewCommand(Command mainCommand, DestroyRequest completedRequest) {

-		Command deleteViewCommand = getGEFWrapper(new DeleteCommand(getEditingDomain(), (View) getHost().getModel()));

+		Command deleteViewCommand = getGEFWrapper(new DeleteCommand(getEditingDomain(), (View)getHost().getModel()));

 		return mainCommand == null ? deleteViewCommand : mainCommand.chain(deleteViewCommand);

 	}

 

@@ -185,8 +179,8 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	 * @generated

 	 */

 	private Command getEditHelperCommand(IEditCommandRequest request, Command editPolicyCommand) {

-		if (editPolicyCommand != null) {

-			ICommand command = editPolicyCommand instanceof ICommandProxy ? ((ICommandProxy) editPolicyCommand).getICommand() : new CommandProxy(editPolicyCommand);

+		if(editPolicyCommand != null) {

+			ICommand command = editPolicyCommand instanceof ICommandProxy ? ((ICommandProxy)editPolicyCommand).getICommand() : new CommandProxy(editPolicyCommand);

 			request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, command);

 		}

 		IElementType requestContextElementType = getContextElementType(request);

@@ -194,8 +188,8 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		ICommand command = requestContextElementType.getEditCommand(request);

 		request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, null);

 		request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, null);

-		if (command != null) {

-			if (!(command instanceof CompositeTransactionalCommand)) {

+		if(command != null) {

+			if(!(command instanceof CompositeTransactionalCommand)) {

 				command = new CompositeTransactionalCommand(getEditingDomain(), command.getLabel()).compose(command);

 			}

 			return new ICommandProxy(command);

@@ -215,28 +209,28 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	 * @generated

 	 */

 	protected Command getSemanticCommandSwitch(IEditCommandRequest req) {

-		if (req instanceof CreateRelationshipRequest) {

-			return getCreateRelationshipCommand((CreateRelationshipRequest) req);

-		} else if (req instanceof CreateElementRequest) {

-			return getCreateCommand((CreateElementRequest) req);

-		} else if (req instanceof ConfigureRequest) {

-			return getConfigureCommand((ConfigureRequest) req);

-		} else if (req instanceof DestroyElementRequest) {

-			return getDestroyElementCommand((DestroyElementRequest) req);

-		} else if (req instanceof DestroyReferenceRequest) {

-			return getDestroyReferenceCommand((DestroyReferenceRequest) req);

-		} else if (req instanceof DuplicateElementsRequest) {

-			return getDuplicateCommand((DuplicateElementsRequest) req);

-		} else if (req instanceof GetEditContextRequest) {

-			return getEditContextCommand((GetEditContextRequest) req);

-		} else if (req instanceof MoveRequest) {

-			return getMoveCommand((MoveRequest) req);

-		} else if (req instanceof ReorientReferenceRelationshipRequest) {

-			return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) req);

-		} else if (req instanceof ReorientRelationshipRequest) {

-			return getReorientRelationshipCommand((ReorientRelationshipRequest) req);

-		} else if (req instanceof SetRequest) {

-			return getSetCommand((SetRequest) req);

+		if(req instanceof CreateRelationshipRequest) {

+			return getCreateRelationshipCommand((CreateRelationshipRequest)req);

+		} else if(req instanceof CreateElementRequest) {

+			return getCreateCommand((CreateElementRequest)req);

+		} else if(req instanceof ConfigureRequest) {

+			return getConfigureCommand((ConfigureRequest)req);

+		} else if(req instanceof DestroyElementRequest) {

+			return getDestroyElementCommand((DestroyElementRequest)req);

+		} else if(req instanceof DestroyReferenceRequest) {

+			return getDestroyReferenceCommand((DestroyReferenceRequest)req);

+		} else if(req instanceof DuplicateElementsRequest) {

+			return getDuplicateCommand((DuplicateElementsRequest)req);

+		} else if(req instanceof GetEditContextRequest) {

+			return getEditContextCommand((GetEditContextRequest)req);

+		} else if(req instanceof MoveRequest) {

+			return getMoveCommand((MoveRequest)req);

+		} else if(req instanceof ReorientReferenceRelationshipRequest) {

+			return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest)req);

+		} else if(req instanceof ReorientRelationshipRequest) {

+			return getReorientRelationshipCommand((ReorientRelationshipRequest)req);

+		} else if(req instanceof SetRequest) {

+			return getSetCommand((SetRequest)req);

 		}

 		return null;

 	}

@@ -260,12 +254,11 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	 */

 	protected Command getCreateCommand(CreateElementRequest req) {

 		IElementType requestElementType = req.getElementType();

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			// try to get a semantic create command from the extended type

+		if(requestElementType instanceof IElementType) {

 			IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(req.getContainer());

-			if (commandProvider != null) {

+			if(commandProvider != null) {

 				ICommand command = commandProvider.getEditCommand(req);

-				if (command != null && command.canExecute()) {

+				if(command != null && command.canExecute()) {

 					return new ICommandProxy(command);

 				}

 			}

@@ -277,9 +270,9 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	/**

 	 * @generated

 	 */

-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IExtendedHintedElementType requestElementType) {

+	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) {

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());

-		if (provider == null) {

+		if(provider == null) {

 			return UnexecutableCommand.INSTANCE;

 		}

 		// Retrieve create command from the Element Edit service

@@ -290,9 +283,9 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	/**

 	 * @generated

 	 */

-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request, IExtendedHintedElementType requestElementType) {

+	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request, IElementType requestElementType) {

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);

-		if (provider == null) {

+		if(provider == null) {

 			return UnexecutableCommand.INSTANCE;

 		}

 		// Retrieve create command from the Element Edit service

@@ -303,9 +296,9 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	/**

 	 * @generated

 	 */

-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request, IExtendedHintedElementType requestElementType) {

+	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request, IElementType requestElementType) {

 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);

-		if (provider == null) {

+		if(provider == null) {

 			return UnexecutableCommand.INSTANCE;

 		}

 		// Retrieve create command from the Element Edit service

@@ -354,11 +347,11 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	 */

 	protected Command getMoveCommand(MoveRequest req) {

 		EObject targetCEObject = req.getTargetContainer();

-		if (targetCEObject != null) {

+		if(targetCEObject != null) {

 			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetCEObject);

-			if (provider != null) {

+			if(provider != null) {

 				ICommand moveCommand = provider.getEditCommand(req);

-				if (moveCommand != null) {

+				if(moveCommand != null) {

 					return new ICommandProxy(moveCommand);

 				}

 			}

@@ -366,7 +359,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		} else {

 			return getGEFWrapper(new MoveElementsCommand(req));

 		}

-

 	}

 

 	/**

@@ -387,28 +379,26 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	 * @generated

 	 */

 	protected final Command getGEFWrapper(ICommand cmd) {

-		return new ICommandProxy(cmd);

+		return (cmd == null) ? UnexecutableCommand.INSTANCE : new ICommandProxy(cmd);

 	}

 

 	/**

 	 * Returns editing domain from the host edit part.

-	 *

 	 * @generated

 	 */

 	protected TransactionalEditingDomain getEditingDomain() {

-		return ((IGraphicalEditPart) getHost()).getEditingDomain();

+		return ((IGraphicalEditPart)getHost()).getEditingDomain();

 	}

 

 	/**

 	 * Clean all shortcuts to the host element from the same diagram

-	 *

 	 * @generated

 	 */

 	protected void addDestroyShortcutsCommand(ICompositeCommand cmd, View view) {

 		assert view.getEAnnotation("Shortcut") == null; //$NON-NLS-1$

-		for (Iterator<?> it = view.getDiagram().getChildren().iterator(); it.hasNext();) {

-			View nextView = (View) it.next();

-			if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$

+		for(Iterator<?> it = view.getDiagram().getChildren().iterator(); it.hasNext();) {

+			View nextView = (View)it.next();

+			if(nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$

 				continue;

 			}

 			cmd.add(new DeleteCommand(getEditingDomain(), nextView));

@@ -420,7 +410,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	 */

 	public static LinkConstraints getLinkConstraints() {

 		LinkConstraints cached = UMLDiagramEditorPlugin.getInstance().getLinkConstraints();

-		if (cached == null) {

+		if(cached == null) {

 			UMLDiagramEditorPlugin.getInstance().setLinkConstraints(cached = new LinkConstraints());

 		}

 		return cached;

@@ -455,182 +445,151 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		 * @generated

 		 */

 		public boolean canCreateCommentAnnotatedElement_4002(Comment source, Element target) {

-			if (source != null) {

-				if (source.getAnnotatedElements()

-						.contains(target)) {

+			if(source != null) {

+				if(source.getAnnotatedElements().contains(target)) {

 					return false;

 				}

 			}

-

-			return canExistCommentAnnotatedElement_4002(

-					source, target);

+			return canExistCommentAnnotatedElement_4002(source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateConstraintConstrainedElement_4003(Constraint source, Element target) {

-			if (source != null) {

-				if (source.getConstrainedElements()

-						.contains(target)) {

+			if(source != null) {

+				if(source.getConstrainedElements().contains(target)) {

 					return false;

 				}

 			}

-

-			return canExistConstraintConstrainedElement_4003(

-					source, target);

+			return canExistConstraintConstrainedElement_4003(source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateComponentRealization_4004(Package container, NamedElement source, NamedElement target) {

-			return canExistComponentRealization_4004(

-					container, null, source, target);

+			return canExistComponentRealization_4004(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateInterfaceRealization_4005(Package container, NamedElement source, NamedElement target) {

-			return canExistInterfaceRealization_4005(

-					container, null, source, target);

+			return canExistInterfaceRealization_4005(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateSubstitution_4011(Package container, NamedElement source, NamedElement target) {

-			return canExistSubstitution_4011(

-					container, null, source, target);

+			return canExistSubstitution_4011(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateRealization_4006(Package container, NamedElement source, NamedElement target) {

-			return canExistRealization_4006(

-					container, null, source, target);

+			return canExistRealization_4006(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateManifestation_4012(Package container, NamedElement source, NamedElement target) {

-			return canExistManifestation_4012(

-					container, null, source, target);

+			return canExistManifestation_4012(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateAbstraction_4007(Package container, NamedElement source, NamedElement target) {

-			return canExistAbstraction_4007(

-					container, null, source, target);

+			return canExistAbstraction_4007(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateUsage_4008(Package container, NamedElement source, NamedElement target) {

-			return canExistUsage_4008(

-					container, null, source, target);

+			return canExistUsage_4008(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateDeployment_4009(Package container, NamedElement source, NamedElement target) {

-			return canExistDeployment_4009(

-					container, null, source, target);

+			return canExistDeployment_4009(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateDependency_4017(Package container, NamedElement source, NamedElement target) {

-			return canExistDependency_4017(

-					container, null, source, target);

+			return canExistDependency_4017(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateDependency_4010(Package container, NamedElement source, NamedElement target) {

-			return canExistDependency_4010(

-					container, null, source, target);

+			return canExistDependency_4010(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateConnector_4013(StructuredClassifier container, ConnectorEnd source, ConnectorEnd target) {

-			return canExistConnector_4013(

-					container, null, source, target);

+			return canExistConnector_4013(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateGeneralization_4015(Classifier container, Classifier source, Classifier target) {

-			return canExistGeneralization_4015(

-					container, null, source, target);

+			return canExistGeneralization_4015(container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateTimeObservationEvent_4018(TimeObservation source, NamedElement target) {

-			if (source != null) {

-				if (source.getEvent()

-					!= null) {

+			if(source != null) {

+				if(source.getEvent() != null) {

 					return false;

 				}

 			}

-

-			return canExistTimeObservationEvent_4018(

-					source, target);

+			return canExistTimeObservationEvent_4018(source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateDurationObservationEvent_4019(DurationObservation source, NamedElement target) {

-			if (source != null) {

-				if (source.getEvents()

-						.size() >= 2

-						||

-						source.getEvents()

-								.contains(target)) {

+			if(source != null) {

+				if(source.getEvents().size() >= 2 || source.getEvents().contains(target)) {

 					return false;

 				}

 			}

-

-			return canExistDurationObservationEvent_4019(

-					source, target);

+			return canExistDurationObservationEvent_4019(source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateInformationItemRepresented_4020(InformationItem source, Classifier target) {

-			if (source != null) {

-				if (source.getRepresenteds()

-						.contains(target)) {

+			if(source != null) {

+				if(source.getRepresenteds().contains(target)) {

 					return false;

 				}

 			}

-

-			return canExistInformationItemRepresented_4020(

-					source, target);

+			return canExistInformationItemRepresented_4020(source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateInformationFlow_4021(Package container, NamedElement source, NamedElement target) {

-			return canExistInformationFlow_4021(

-					container, null, source, target);

+			return canExistInformationFlow_4021(container, null, source, target);

 		}

 

 		/**

@@ -723,19 +682,19 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		public boolean canExistDependency_4017(Package container, Dependency linkInstance, NamedElement source, NamedElement target) {

 			try {

 				// RoleBinding source constraint

-				if ((source != null) && !(source instanceof CollaborationUse)) {

+				if((source != null) && !(source instanceof CollaborationUse)) {

 					return false;

 				}

 				// RoleBinding source has a type

-				if ((source != null) && (((CollaborationUse) source).getType() == null)) {

+				if((source != null) && (((CollaborationUse)source).getType() == null)) {

 					return false;

 				}

 				// RoleBinding target constraint

-				if ((target != null) && !(target instanceof ConnectableElement)) {

+				if((target != null) && !(target instanceof ConnectableElement)) {

 					return false;

 				}

 				// RoleBinding source and target have the same semantic parent

-				if ((source != null) && (target != null) && (source.getOwner() != target.getOwner())) {

+				if((source != null) && (target != null) && (source.getOwner() != target.getOwner())) {

 					return false;

 				}

 				return true;

@@ -786,11 +745,8 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		public boolean canExistInformationItemRepresented_4020(InformationItem source, Classifier target) {

 			try {

 				// Represented InformationItem Target

-				if (target != null) {

-					if (!((target instanceof Class)

-							|| (target instanceof Interface)

-							|| (target instanceof InformationItem)

-							|| (target instanceof Signal) || (target instanceof Component))) {

+				if(target != null) {

+					if(!((target instanceof Class) || (target instanceof Interface) || (target instanceof InformationItem) || (target instanceof Signal) || (target instanceof Component))) {

 						return false;

 					}

 				}

@@ -806,55 +762,29 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		 */

 		public boolean canExistInformationFlow_4021(Package container, InformationFlow linkInstance, NamedElement source, NamedElement target) {

 			try {

-				// Information Flow source constraint

-				if (source != null) {

-					if (!((source instanceof Actor)

-							|| (source instanceof Node)

-							|| (source instanceof UseCase)

-							|| (source instanceof Artifact)

-							|| (source instanceof Class)

-							|| (source instanceof Component)

-							|| (source instanceof Port)

-							|| (source instanceof Property)

-							|| (source instanceof Interface)

-							|| (source instanceof Package)

-							|| (source instanceof ActivityNode)

-							|| (source instanceof ActivityPartition) || (source instanceof InstanceSpecification))) {

-

+				//Information Flow source constraint

+				if(source != null) {

+					if(!((source instanceof Actor) || (source instanceof Node) || (source instanceof UseCase) || (source instanceof Artifact) || (source instanceof Class) || (source instanceof Component) || (source instanceof Port) || (source instanceof Property) || (source instanceof Interface) || (source instanceof Package) || (source instanceof ActivityNode) || (source instanceof ActivityPartition) || (source instanceof InstanceSpecification))) {

 						return false;

-

 					}

-					if (source instanceof InstanceSpecification) {

-						EList<Classifier> classes = ((InstanceSpecification) source).getClassifiers();

-						for (int i = 0; i < classes.size(); i++) {

-							if (classes.get(i) instanceof Relationship) {

+					if(source instanceof InstanceSpecification) {

+						EList<Classifier> classes = ((InstanceSpecification)source).getClassifiers();

+						for(int i = 0; i < classes.size(); i++) {

+							if(classes.get(i) instanceof Relationship) {

 								return false;

 							}

 						}

 					}

 				}

-				// Information Flow target constraint

-				if (target != null) {

-					if (!((target instanceof Actor)

-							|| (target instanceof Node)

-							|| (target instanceof UseCase)

-							|| (target instanceof Artifact)

-							|| (target instanceof Class)

-							|| (target instanceof Component)

-							|| (target instanceof Port)

-							|| (target instanceof Property)

-							|| (target instanceof Interface)

-							|| (target instanceof Package)

-							|| (target instanceof ActivityNode)

-							|| (target instanceof ActivityPartition) || (target instanceof InstanceSpecification))) {

-

+				//Information Flow target constraint

+				if(target != null) {

+					if(!((target instanceof Actor) || (target instanceof Node) || (target instanceof UseCase) || (target instanceof Artifact) || (target instanceof Class) || (target instanceof Component) || (target instanceof Port) || (target instanceof Property) || (target instanceof Interface) || (target instanceof Package) || (target instanceof ActivityNode) || (target instanceof ActivityPartition) || (target instanceof InstanceSpecification))) {

 						return false;

-

 					}

-					if (target instanceof InstanceSpecification) {

-						EList<Classifier> classes = ((InstanceSpecification) target).getClassifiers();

-						for (int i = 0; i < classes.size(); i++) {

-							if (classes.get(i) instanceof Relationship) {

+					if(target instanceof InstanceSpecification) {

+						EList<Classifier> classes = ((InstanceSpecification)target).getClassifiers();

+						for(int i = 0; i < classes.size(); i++) {

+							if(classes.get(i) instanceof Relationship) {

 								return false;

 							}

 						}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextNonResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextNonResizableEditPolicy.java
index 630d22f7675..9f08f43c77d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextNonResizableEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextNonResizableEditPolicy.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -52,11 +52,10 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void showPrimarySelection() {

-		if (getHostFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getHostFigure()).setSelected(true);

-			((WrappingLabel) getHostFigure()).setFocus(true);

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setSelected(true);

+			((WrappingLabel)getHostFigure()).setFocus(true);

 		} else {

 			showSelection();

 			showFocus();

@@ -66,11 +65,10 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void showSelection() {

-		if (getHostFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getHostFigure()).setSelected(true);

-			((WrappingLabel) getHostFigure()).setFocus(false);

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setSelected(true);

+			((WrappingLabel)getHostFigure()).setFocus(false);

 		} else {

 			hideSelection();

 			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());

@@ -83,13 +81,12 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void hideSelection() {

-		if (getHostFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getHostFigure()).setSelected(false);

-			((WrappingLabel) getHostFigure()).setFocus(false);

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setSelected(false);

+			((WrappingLabel)getHostFigure()).setFocus(false);

 		} else {

-			if (selectionFeedbackFigure != null) {

+			if(selectionFeedbackFigure != null) {

 				removeFeedback(selectionFeedbackFigure);

 				getHostFigure().removeFigureListener(getHostPositionListener());

 				selectionFeedbackFigure = null;

@@ -101,10 +98,9 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void showFocus() {

-		if (getHostFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getHostFigure()).setFocus(true);

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setFocus(true);

 		} else {

 			hideFocus();

 			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());

@@ -115,12 +111,11 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void hideFocus() {

-		if (getHostFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getHostFigure()).setFocus(false);

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setFocus(false);

 		} else {

-			if (focusFeedbackFigure != null) {

+			if(focusFeedbackFigure != null) {

 				removeFeedback(focusFeedbackFigure);

 				focusFeedbackFigure = null;

 			}

@@ -132,8 +127,8 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	 */

 	protected Rectangle getFeedbackBounds() {

 		Rectangle bounds;

-		if (getHostFigure() instanceof Label) {

-			bounds = ((Label) getHostFigure()).getTextBounds();

+		if(getHostFigure() instanceof Label) {

+			bounds = ((Label)getHostFigure()).getTextBounds();

 			bounds.intersect(getHostFigure().getBounds());

 		} else {

 			bounds = getHostFigure().getBounds().getCopy();

@@ -147,7 +142,7 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	 * @generated

 	 */

 	protected IFigure createSelectionFeedbackFigure() {

-		if (getHostFigure() instanceof Label) {

+		if(getHostFigure() instanceof Label) {

 			Label feedbackFigure = new Label();

 			feedbackFigure.setOpaque(true);

 			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);

@@ -177,7 +172,7 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	 * @generated

 	 */

 	protected void updateLabel(Label target) {

-		Label source = (Label) getHostFigure();

+		Label source = (Label)getHostFigure();

 		target.setText(source.getText());

 		target.setTextAlignment(source.getTextAlignment());

 		target.setFont(source.getFont());

@@ -187,9 +182,9 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	 * @generated

 	 */

 	protected void refreshSelectionFeedback() {

-		if (selectionFeedbackFigure != null) {

-			if (selectionFeedbackFigure instanceof Label) {

-				updateLabel((Label) selectionFeedbackFigure);

+		if(selectionFeedbackFigure != null) {

+			if(selectionFeedbackFigure instanceof Label) {

+				updateLabel((Label)selectionFeedbackFigure);

 				selectionFeedbackFigure.setBounds(getFeedbackBounds());

 			} else {

 				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));

@@ -201,7 +196,7 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	 * @generated

 	 */

 	protected void refreshFocusFeedback() {

-		if (focusFeedbackFigure != null) {

+		if(focusFeedbackFigure != null) {

 			focusFeedbackFigure.setBounds(getFeedbackBounds());

 		}

 	}

@@ -219,8 +214,9 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	 * @generated

 	 */

 	private FigureListener getHostPositionListener() {

-		if (hostPositionListener == null) {

+		if(hostPositionListener == null) {

 			hostPositionListener = new FigureListener() {

+

 				@Override

 				public void figureMoved(IFigure source) {

 					refreshFeedback();

@@ -233,10 +229,8 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	/**

 	 * @generated

 	 */

-	@Override

 	protected List<?> createSelectionHandles() {

-		MoveHandle moveHandle =

-				new MoveHandle((GraphicalEditPart) getHost());

+		MoveHandle moveHandle = new MoveHandle((GraphicalEditPart)getHost());

 		moveHandle.setBorder(null);

 		moveHandle.setDragTracker(new DragEditPartsTrackerEx(getHost()));

 		return Collections.singletonList(moveHandle);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextSelectionEditPolicy.java
index dbe91ab6ed5..861ee3973bb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextSelectionEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextSelectionEditPolicy.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -46,11 +46,10 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void showPrimarySelection() {

-		if (getHostFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getHostFigure()).setSelected(true);

-			((WrappingLabel) getHostFigure()).setFocus(true);

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setSelected(true);

+			((WrappingLabel)getHostFigure()).setFocus(true);

 		} else {

 			showSelection();

 			showFocus();

@@ -60,11 +59,10 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void showSelection() {

-		if (getHostFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getHostFigure()).setSelected(true);

-			((WrappingLabel) getHostFigure()).setFocus(false);

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setSelected(true);

+			((WrappingLabel)getHostFigure()).setFocus(false);

 		} else {

 			hideSelection();

 			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());

@@ -77,13 +75,12 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void hideSelection() {

-		if (getHostFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getHostFigure()).setSelected(false);

-			((WrappingLabel) getHostFigure()).setFocus(false);

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setSelected(false);

+			((WrappingLabel)getHostFigure()).setFocus(false);

 		} else {

-			if (selectionFeedbackFigure != null) {

+			if(selectionFeedbackFigure != null) {

 				removeFeedback(selectionFeedbackFigure);

 				getHostFigure().removeFigureListener(getHostPositionListener());

 				selectionFeedbackFigure = null;

@@ -95,10 +92,9 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void showFocus() {

-		if (getHostFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getHostFigure()).setFocus(true);

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setFocus(true);

 		} else {

 			hideFocus();

 			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());

@@ -109,12 +105,11 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void hideFocus() {

-		if (getHostFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getHostFigure()).setFocus(false);

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setFocus(false);

 		} else {

-			if (focusFeedbackFigure != null) {

+			if(focusFeedbackFigure != null) {

 				removeFeedback(focusFeedbackFigure);

 				focusFeedbackFigure = null;

 			}

@@ -126,8 +121,8 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	 */

 	protected Rectangle getFeedbackBounds() {

 		Rectangle bounds;

-		if (getHostFigure() instanceof Label) {

-			bounds = ((Label) getHostFigure()).getTextBounds();

+		if(getHostFigure() instanceof Label) {

+			bounds = ((Label)getHostFigure()).getTextBounds();

 			bounds.intersect(getHostFigure().getBounds());

 		} else {

 			bounds = getHostFigure().getBounds().getCopy();

@@ -141,7 +136,7 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	 * @generated

 	 */

 	protected IFigure createSelectionFeedbackFigure() {

-		if (getHostFigure() instanceof Label) {

+		if(getHostFigure() instanceof Label) {

 			Label feedbackFigure = new Label();

 			feedbackFigure.setOpaque(true);

 			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);

@@ -171,7 +166,7 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	 * @generated

 	 */

 	protected void updateLabel(Label target) {

-		Label source = (Label) getHostFigure();

+		Label source = (Label)getHostFigure();

 		target.setText(source.getText());

 		target.setTextAlignment(source.getTextAlignment());

 		target.setFont(source.getFont());

@@ -181,9 +176,9 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	 * @generated

 	 */

 	protected void refreshSelectionFeedback() {

-		if (selectionFeedbackFigure != null) {

-			if (selectionFeedbackFigure instanceof Label) {

-				updateLabel((Label) selectionFeedbackFigure);

+		if(selectionFeedbackFigure != null) {

+			if(selectionFeedbackFigure instanceof Label) {

+				updateLabel((Label)selectionFeedbackFigure);

 				selectionFeedbackFigure.setBounds(getFeedbackBounds());

 			} else {

 				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));

@@ -195,7 +190,7 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	 * @generated

 	 */

 	protected void refreshFocusFeedback() {

-		if (focusFeedbackFigure != null) {

+		if(focusFeedbackFigure != null) {

 			focusFeedbackFigure.setBounds(getFeedbackBounds());

 		}

 	}

@@ -213,8 +208,9 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	 * @generated

 	 */

 	private FigureListener getHostPositionListener() {

-		if (hostPositionListener == null) {

+		if(hostPositionListener == null) {

 			hostPositionListener = new FigureListener() {

+

 				@Override

 				public void figureMoved(IFigure source) {

 					refreshFeedback();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
deleted file mode 100644
index 34bb3b98e9d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public UsageItemSemanticEditPolicy() {

-		super(UMLElementTypes.Usage_4008);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
deleted file mode 100644
index 9d4c993ce91..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class UseCaseItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public UseCaseItemSemanticEditPolicy() {

-		super(UMLElementTypes.UseCase_2082);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
deleted file mode 100644
index b62d9023cdd..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-

-/**

- * @generated

- */

-public class UseCaseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public UseCaseItemSemanticEditPolicyCN() {

-		super(UMLElementTypes.UseCase_3096);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if (provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-

-			if (deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			return null;

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType == null) {

-			return null;

-		}

-		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Substitution_4011 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Realization_4006 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RealizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new ManifestationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new AbstractionCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Usage_4008 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new UsageCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Deployment_4009 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DeploymentCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4017 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Dependency_4010 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DependencyCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Generalization_4015 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new RepresentationCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req,

-					req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case ComponentRealizationEditPart.VISUAL_ID:

-		case InterfaceRealizationEditPart.VISUAL_ID:

-		case SubstitutionEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case ManifestationEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case DeploymentEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case GeneralizationEditPart.VISUAL_ID:

-		case InformationFlowEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case RoleBindingEditPart.VISUAL_ID:

-			return getGEFWrapper(new RoleBindingReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch (getVisualID(req)) {

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case TimeObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

-		case DurationObservationEventEditPart.VISUAL_ID:

-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

-		case RepresentationEditPart.VISUAL_ID:

-			return getGEFWrapper(new RepresentationReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/AbstractParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/AbstractParser.java
index a625f09edb5..663b3700530 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/AbstractParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/AbstractParser.java
@@ -1 +1 @@
-// Since GMFT 3.1 we don't generate class AbstractParser into every diagram, instead extend org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser.

+//Since GMFT 3.1 we don't generate class AbstractParser into every diagram, instead extend org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java
index f0bcc52246c..40eafa33f56 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -74,10 +74,10 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	 * @generated

 	 */

 	protected String getDefaultPattern() {

-		if (defaultPattern == null) {

+		if(defaultPattern == null) {

 			StringBuffer sb = new StringBuffer();

-			for (int i = 0; i < features.length; i++) {

-				if (i > 0) {

+			for(int i = 0; i < features.length; i++) {

+				if(i > 0) {

 					sb.append(' ');

 				}

 				sb.append('{');

@@ -92,7 +92,6 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setViewPattern(String viewPattern) {

 		super.setViewPattern(viewPattern);

 		viewProcessor = null;

@@ -101,7 +100,6 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setEditorPattern(String editorPattern) {

 		super.setEditorPattern(editorPattern);

 		editorProcessor = null;

@@ -111,7 +109,7 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	 * @generated

 	 */

 	protected MessageFormat getViewProcessor() {

-		if (viewProcessor == null) {

+		if(viewProcessor == null) {

 			viewProcessor = new MessageFormat(getViewPattern() == null ? getDefaultPattern() : getViewPattern());

 		}

 		return viewProcessor;

@@ -121,7 +119,7 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	 * @generated

 	 */

 	protected MessageFormat getEditorProcessor() {

-		if (editorProcessor == null) {

+		if(editorProcessor == null) {

 			editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());

 		}

 		return editorProcessor;

@@ -131,10 +129,10 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	 * @generated

 	 */

 	protected String getDefaultEditablePattern() {

-		if (defaultEditablePattern == null) {

+		if(defaultEditablePattern == null) {

 			StringBuffer sb = new StringBuffer();

-			for (int i = 0; i < editableFeatures.length; i++) {

-				if (i > 0) {

+			for(int i = 0; i < editableFeatures.length; i++) {

+				if(i > 0) {

 					sb.append(' ');

 				}

 				sb.append('{');

@@ -149,7 +147,6 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setEditPattern(String editPattern) {

 		super.setEditPattern(editPattern);

 		editProcessor = null;

@@ -159,7 +156,7 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	 * @generated

 	 */

 	protected MessageFormat getEditProcessor() {

-		if (editProcessor == null) {

+		if(editProcessor == null) {

 			editProcessor = new MessageFormat(getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern());

 		}

 		return editProcessor;

@@ -168,26 +165,19 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getEditString(IAdaptable adapter, int flags) {

-		EObject element = (EObject) adapter.getAdapter(EObject.class);

+		EObject element = (EObject)adapter.getAdapter(EObject.class);

 		return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0)).toString();

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public IParserEditStatus isValidEditString(IAdaptable adapter, String editString) {

 		ParsePosition pos = new ParsePosition(0);

 		Object[] values = getEditProcessor().parse(editString, pos);

-		if (values == null) {

-			return new ParserEditStatus(

-					UMLDiagramEditorPlugin.ID,

-					IParserEditStatus.UNEDITABLE,

-					NLS.bind(

-							Messages.MessageFormatParser_InvalidInputError,

-							new Integer(pos.getErrorIndex())));

+		if(values == null) {

+			return new ParserEditStatus(UMLDiagramEditorPlugin.ID, IParserEditStatus.UNEDITABLE, NLS.bind(Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex())));

 		}

 		return validateNewValues(values);

 	}

@@ -195,7 +185,6 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	/**

 	 * @generated

 	 */

-	@Override

 	public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) {

 		Object[] values = getEditProcessor().parse(newString, new ParsePosition(0));

 		return getParseCommand(adapter, values, flags);

@@ -204,9 +193,8 @@ public class MessageFormatParser extends AbstractAttributeParser {
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getPrintString(IAdaptable adapter, int flags) {

-		EObject element = (EObject) adapter.getAdapter(EObject.class);

+		EObject element = (EObject)adapter.getAdapter(EObject.class);

 		return getViewProcessor().format(getValues(element), new StringBuffer(), new FieldPosition(0)).toString();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java
index 612f2ab8b67..4600dcb97ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -41,17 +41,14 @@ public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider
 	/**

 	 * @generated

 	 */

-	@Override

 	public void buildContextMenu(final IMenuManager menu) {

 		getViewer().flush();

 		try {

-			TransactionUtil.getEditingDomain(

-					(EObject) getViewer().getContents().getModel()).runExclusive(new Runnable() {

+			TransactionUtil.getEditingDomain((EObject)getViewer().getContents().getModel()).runExclusive(new Runnable() {

 

 				@Override

 				public void run() {

-					ContributionItemService.getInstance().contributeToPopupMenu(

-							DiagramEditorContextMenuProvider.this, part);

+					ContributionItemService.getInstance().contributeToPopupMenu(DiagramEditorContextMenuProvider.this, part);

 					menu.remove(ActionIds.ACTION_DELETE_FROM_MODEL);

 				}

 			});

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/LoadResourceAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/LoadResourceAction.java
index 43e07b3d105..1de441057e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/LoadResourceAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/LoadResourceAction.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -23,7 +23,6 @@ public class LoadResourceAction extends DefaultLoadResourceAction {
 	/**

 	 * @generated

 	 */

-	@Override

 	public Object execute(ExecutionEvent event) throws ExecutionException {

 		return super.execute(event);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java
index fca4190575b..caf7f75c56e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -454,6 +454,16 @@ public class Messages extends NLS {
 	/**

 	 * @generated

 	 */

+	public static String StringExpressionCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String StringExpressionCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

 	public static String LinkCreationTool_title;

 

 	/**

@@ -564,6 +574,26 @@ public class Messages extends NLS {
 	/**

 	 * @generated

 	 */

+	public static String ManifestationCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ManifestationCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String DeploymentCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String DeploymentCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

 	public static String DataTypeAttributeCompartmentEditPart_title;

 

 	/**

@@ -735,5 +765,5 @@ public class Messages extends NLS {
 	 * @generated

 	 */

 	public static String UMLModelingAssistantProviderMessage;

-	// TODO: put accessor fields manually

+	//TODO: put accessor fields manually	

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ModelElementSelectionPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ModelElementSelectionPage.java
index fd7ab40c090..8bd2c0f3525 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ModelElementSelectionPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ModelElementSelectionPage.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -15,7 +15,6 @@ import org.eclipse.gmf.tooling.runtime.part.DefaultModelElementSelectionPage;
 

 /**

  * Wizard page that allows to select element from model.

- *

  * @generated

  */

 public class ModelElementSelectionPage extends DefaultModelElementSelectionPage {

@@ -29,10 +28,8 @@ public class ModelElementSelectionPage extends DefaultModelElementSelectionPage
 

 	/**

 	 * Override to provide custom model element description.

-	 *

 	 * @generated

 	 */

-	@Override

 	protected String getSelectionTitle() {

 		return Messages.ModelElementSelectionPageMessage;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java
index ba503192262..aa0b7007e29 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -98,7 +98,6 @@ public class UMLCreationWizard extends Wizard implements INewWizard {
 	/**

 	 * @generated

 	 */

-	@Override

 	public void init(IWorkbench workbench, IStructuredSelection selection) {

 		this.workbench = workbench;

 		this.selection = selection;

@@ -110,22 +109,19 @@ public class UMLCreationWizard extends Wizard implements INewWizard {
 	/**

 	 * @generated

 	 */

-	@Override

 	public void addPages() {

 		diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), "uml_csd"); //$NON-NLS-1$ //$NON-NLS-2$

 		diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle);

 		diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription);

 		addPage(diagramModelFilePage);

-

 		domainModelFilePage = new UMLCreationWizardPage("DomainModelFile", getSelection(), "uml") { //$NON-NLS-1$ //$NON-NLS-2$

 

 			@Override

 			public void setVisible(boolean visible) {

-				if (visible) {

+				if(visible) {

 					String fileName = diagramModelFilePage.getFileName();

 					fileName = fileName.substring(0, fileName.length() - ".uml_csd".length()); //$NON-NLS-1$

-					setFileName(UMLDiagramEditorUtil.getUniqueFileName(

-							getContainerFullPath(), fileName, "uml")); //$NON-NLS-1$

+					setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), fileName, "uml")); //$NON-NLS-1$

 				}

 				super.setVisible(visible);

 			}

@@ -138,36 +134,28 @@ public class UMLCreationWizard extends Wizard implements INewWizard {
 	/**

 	 * @generated

 	 */

-	@Override

 	public boolean performFinish() {

-		IRunnableWithProgress op =

-				new WorkspaceModifyOperation(null) {

-

-					@Override

-					protected void execute(IProgressMonitor monitor)

-							throws CoreException, InterruptedException {

-						diagram = UMLDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(),

-								domainModelFilePage.getURI(),

-								monitor);

-						if (isOpenNewlyCreatedDiagramEditor() && diagram != null) {

-							try {

-								UMLDiagramEditorUtil.openDiagram(diagram);

-							} catch (PartInitException e) {

-								ErrorDialog.openError(getContainer().getShell(),

-										Messages.UMLCreationWizardOpenEditorError, null, e.getStatus());

-							}

-						}

+		IRunnableWithProgress op = new WorkspaceModifyOperation(null) {

+

+			@Override

+			protected void execute(IProgressMonitor monitor) throws CoreException, InterruptedException {

+				diagram = UMLDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(), domainModelFilePage.getURI(), monitor);

+				if(isOpenNewlyCreatedDiagramEditor() && diagram != null) {

+					try {

+						UMLDiagramEditorUtil.openDiagram(diagram);

+					} catch (PartInitException e) {

+						ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardOpenEditorError, null, e.getStatus());

 					}

-				};

+				}

+			}

+		};

 		try {

 			getContainer().run(false, true, op);

 		} catch (InterruptedException e) {

 			return false;

 		} catch (InvocationTargetException e) {

-			if (e.getTargetException() instanceof CoreException) {

-				ErrorDialog.openError(getContainer().getShell(),

-						Messages.UMLCreationWizardCreationError, null,

-						((CoreException) e.getTargetException()).getStatus());

+			if(e.getTargetException() instanceof CoreException) {

+				ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardCreationError, null, ((CoreException)e.getTargetException()).getStatus());

 			} else {

 				UMLDiagramEditorPlugin.getInstance().logError("Error creating diagram", e.getTargetException()); //$NON-NLS-1$

 			}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java
index b11f93abeee..8fc3cc6f01b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -39,7 +39,7 @@ public class UMLCreationWizardPage extends WizardNewFileCreationPage {
 

 	/**

 	 * Override to create files with this extension.

-	 *

+	 * 

 	 * @generated

 	 */

 	protected String getExtension() {

@@ -58,11 +58,11 @@ public class UMLCreationWizardPage extends WizardNewFileCreationPage {
 	 */

 	protected IPath getFilePath() {

 		IPath path = getContainerFullPath();

-		if (path == null) {

+		if(path == null) {

 			path = new Path(""); //$NON-NLS-1$

 		}

 		String fileName = getFileName();

-		if (fileName != null) {

+		if(fileName != null) {

 			path = path.append(fileName);

 		}

 		return path;

@@ -71,26 +71,22 @@ public class UMLCreationWizardPage extends WizardNewFileCreationPage {
 	/**

 	 * @generated

 	 */

-	@Override

 	public void createControl(Composite parent) {

 		super.createControl(parent);

-		setFileName(UMLDiagramEditorUtil.getUniqueFileName(

-				getContainerFullPath(), getFileName(), getExtension()));

+		setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), getFileName(), getExtension()));

 		setPageComplete(validatePage());

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected boolean validatePage() {

-		if (!super.validatePage()) {

+		if(!super.validatePage()) {

 			return false;

 		}

 		String extension = getExtension();

-		if (extension != null && !getFilePath().toString().endsWith("." + extension)) {

-			setErrorMessage(NLS.bind(

-					Messages.UMLCreationWizardPageExtensionError, extension));

+		if(extension != null && !getFilePath().toString().endsWith("." + extension)) {

+			setErrorMessage(NLS.bind(Messages.UMLCreationWizardPageExtensionError, extension));

 			return false;

 		}

 		return true;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramActionBarContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramActionBarContributor.java
index 4f8b2e286d0..e27930b693b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramActionBarContributor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramActionBarContributor.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -27,7 +27,6 @@ public class UMLDiagramActionBarContributor extends DiagramActionBarContributor
 	/**

 	 * @generated

 	 */

-	@Override

 	protected Class<UMLDiagramEditor> getEditorClass() {

 		return UMLDiagramEditor.class;

 	}

@@ -35,7 +34,6 @@ public class UMLDiagramActionBarContributor extends DiagramActionBarContributor
 	/**

 	 * @generated

 	 */

-	@Override

 	protected String getEditorId() {

 		return UMLDiagramEditor.ID;

 	}

@@ -43,7 +41,6 @@ public class UMLDiagramActionBarContributor extends DiagramActionBarContributor
 	/**

 	 * @generated

 	 */

-	@Override

 	public void init(IActionBars bars, IWorkbenchPage page) {

 		super.init(bars, page);

 		// print preview

@@ -52,7 +49,7 @@ public class UMLDiagramActionBarContributor extends DiagramActionBarContributor
 		fileMenu.remove("pageSetupAction"); //$NON-NLS-1$

 		IMenuManager editMenu = bars.getMenuManager().findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);

 		assert editMenu != null;

-		if (editMenu.find("validationGroup") == null) { //$NON-NLS-1$

+		if(editMenu.find("validationGroup") == null) { //$NON-NLS-1$

 			editMenu.add(new GroupMarker("validationGroup")); //$NON-NLS-1$

 		}

 		IAction validateAction = new ValidateAction(page);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java
index 850bc3ee5ce..50fe9dd3160 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -45,11 +45,11 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	public void initDiagramContent(Diagram diagram) {

-		if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(diagram.getType())) {

+		if(!CompositeStructureDiagramEditPart.MODEL_ID.equals(diagram.getType())) {

 			UMLDiagramEditorPlugin.getInstance().logError("Incorrect diagram passed as a parameter: " + diagram.getType());

 			return;

 		}

-		if (false == diagram.getElement() instanceof Package) {

+		if(false == diagram.getElement() instanceof Package) {

 			UMLDiagramEditorPlugin.getInstance().logError("Incorrect diagram element specified: " + diagram.getElement() + " instead of Package");

 			return;

 		}

@@ -61,10 +61,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createPackage_1000Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getPackage_1000SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getPackage_1000SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -73,12 +72,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createActivity_2060Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getActivity_2060OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getActivity_2060SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActivity_2060OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivity_2060SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createActivityInternalstructure_7063Children(getCompartment(view, ActivityCompositeCompartmentEditPart.VISUAL_ID));

 	}

@@ -88,12 +85,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInteraction_2061Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInteraction_2061OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getInteraction_2061SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteraction_2061OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteraction_2061SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createInteractionInternalstructure_7064Children(getCompartment(view, InteractionCompositeCompartmentEditPart.VISUAL_ID));

 	}

@@ -103,12 +98,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createProtocolStateMachine_2062Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getProtocolStateMachine_2062OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getProtocolStateMachine_2062SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_2062OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_2062SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createProtocolStateMachineInternalstructure_7065Children(getCompartment(view, ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID));

 	}

@@ -118,12 +111,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createStateMachine_2063Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getStateMachine_2063OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getStateMachine_2063SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStateMachine_2063OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachine_2063SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createStateMachineInternalstructure_7066Children(getCompartment(view, StateMachineCompositeCompartmentEditPart.VISUAL_ID));

 	}

@@ -133,12 +124,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createFunctionBehavior_2064Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getFunctionBehavior_2064OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getFunctionBehavior_2064SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getFunctionBehavior_2064OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getFunctionBehavior_2064SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createFunctionBehaviorInternalstructure_7067Children(getCompartment(view, FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID));

 	}

@@ -148,12 +137,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createOpaqueBehavior_2065Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getOpaqueBehavior_2065OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getOpaqueBehavior_2065SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_2065OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_2065SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createOpaqueBehaviorInternalstructure_7068Children(getCompartment(view, OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID));

 	}

@@ -163,12 +150,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createComponent_2069Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getComponent_2069OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getComponent_2069SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComponent_2069OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponent_2069SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createComponentInternalstructure_7069Children(getCompartment(view, ComponentCompositeCompartmentEditPart.VISUAL_ID));

 	}

@@ -178,12 +163,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDevice_2070Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDevice_2070OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getDevice_2070SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDevice_2070OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDevice_2070SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createDeviceInternalstructure_7070Children(getCompartment(view, DeviceCompositeCompartmentEditPart.VISUAL_ID));

 	}

@@ -193,12 +176,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createExecutionEnvironment_2071Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getExecutionEnvironment_2071OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getExecutionEnvironment_2071SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_2071OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_2071SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createExecutionEnvironmentInternalstructure_7071Children(getCompartment(view, ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID));

 	}

@@ -208,12 +189,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createNode_2072Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getNode_2072OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getNode_2072SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getNode_2072OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNode_2072SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createNodeInternalstructure_7072Children(getCompartment(view, NodeCompositeCompartmentEditPart.VISUAL_ID));

 	}

@@ -223,12 +202,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createClass_2073Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getClass_2073OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getClass_2073SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_2073OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClass_2073SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createClassInternalstructure_7073Children(getCompartment(view, ClassCompositeCompartmentEditPart.VISUAL_ID));

 	}

@@ -238,8 +215,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createCollaboration_2075Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getCollaboration_2075OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCollaboration_2075OutgoingLinks(view));

 		createCollaborationInternalstructure_7075Children(getCompartment(view, CollaborationCompositeCompartmentEditPart.VISUAL_ID));

 	}

 

@@ -248,8 +224,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInterface_2076Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInterface_2076OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterface_2076OutgoingLinks(view));

 	}

 

 	/**

@@ -257,8 +232,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createPrimitiveType_2066Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getPrimitiveType_2066OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_2066OutgoingLinks(view));

 	}

 

 	/**

@@ -266,12 +240,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createEnumeration_2067Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getEnumeration_2067OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getEnumeration_2067SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_2067OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumeration_2067SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createEnumerationLiterals_7048Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID));

 	}

@@ -281,8 +253,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDataType_2068Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDataType_2068OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_2068OutgoingLinks(view));

 		createDataTypeAttributes_7033Children(getCompartment(view, DataTypeAttributeCompartmentEditPart.VISUAL_ID));

 		createDataTypeOperations_7034Children(getCompartment(view, DataTypeOperationCompartmentEditPart.VISUAL_ID));

 	}

@@ -292,8 +263,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createActor_2077Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getActor_2077OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActor_2077OutgoingLinks(view));

 	}

 

 	/**

@@ -301,8 +271,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDeploymentSpecification_2078Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDeploymentSpecification_2078OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDeploymentSpecification_2078OutgoingLinks(view));

 	}

 

 	/**

@@ -310,8 +279,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createArtifact_2079Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getArtifact_2079OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getArtifact_2079OutgoingLinks(view));

 	}

 

 	/**

@@ -319,8 +287,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInformationItem_2080Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInformationItem_2080OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInformationItem_2080OutgoingLinks(view));

 	}

 

 	/**

@@ -328,8 +295,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createSignal_2081Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getSignal_2081OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSignal_2081OutgoingLinks(view));

 	}

 

 	/**

@@ -337,8 +303,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createUseCase_2082Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getUseCase_2082OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getUseCase_2082OutgoingLinks(view));

 	}

 

 	/**

@@ -346,8 +311,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createSignalEvent_2083Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getSignalEvent_2083OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSignalEvent_2083OutgoingLinks(view));

 	}

 

 	/**

@@ -355,8 +319,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createCallEvent_2084Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getCallEvent_2084OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCallEvent_2084OutgoingLinks(view));

 	}

 

 	/**

@@ -364,8 +327,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createAnyReceiveEvent_2085Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getAnyReceiveEvent_2085OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAnyReceiveEvent_2085OutgoingLinks(view));

 	}

 

 	/**

@@ -373,8 +335,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createChangeEvent_2088Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getChangeEvent_2088OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getChangeEvent_2088OutgoingLinks(view));

 	}

 

 	/**

@@ -382,8 +343,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeEvent_2089Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getTimeEvent_2089OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeEvent_2089OutgoingLinks(view));

 	}

 

 	/**

@@ -391,8 +351,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDurationObservation_2093Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDurationObservation_2093OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationObservation_2093OutgoingLinks(view));

 	}

 

 	/**

@@ -400,8 +359,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeObservation_2094Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getTimeObservation_2094OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeObservation_2094OutgoingLinks(view));

 	}

 

 	/**

@@ -409,8 +367,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralBoolean_2095Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getLiteralBoolean_2095OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralBoolean_2095OutgoingLinks(view));

 	}

 

 	/**

@@ -418,8 +375,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralInteger_2096Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getLiteralInteger_2096OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralInteger_2096OutgoingLinks(view));

 	}

 

 	/**

@@ -427,8 +383,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralNull_2097Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getLiteralNull_2097OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralNull_2097OutgoingLinks(view));

 	}

 

 	/**

@@ -436,8 +391,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralString_2098Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getLiteralString_2098OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralString_2098OutgoingLinks(view));

 	}

 

 	/**

@@ -445,8 +399,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralUnlimitedNatural_2099Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getLiteralUnlimitedNatural_2099OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralUnlimitedNatural_2099OutgoingLinks(view));

 	}

 

 	/**

@@ -454,8 +407,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createStringExpression_2100Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getStringExpression_2100OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStringExpression_2100OutgoingLinks(view));

 	}

 

 	/**

@@ -463,8 +415,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createOpaqueExpression_2101Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getOpaqueExpression_2101OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOpaqueExpression_2101OutgoingLinks(view));

 	}

 

 	/**

@@ -472,8 +423,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeExpression_2102Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getTimeExpression_2102OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeExpression_2102OutgoingLinks(view));

 	}

 

 	/**

@@ -481,8 +431,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createExpression_2103Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getExpression_2103OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExpression_2103OutgoingLinks(view));

 	}

 

 	/**

@@ -490,8 +439,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDuration_2104Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDuration_2104OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDuration_2104OutgoingLinks(view));

 	}

 

 	/**

@@ -499,8 +447,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeInterval_2105Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getTimeInterval_2105OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeInterval_2105OutgoingLinks(view));

 	}

 

 	/**

@@ -508,8 +455,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDurationInterval_2106Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDurationInterval_2106OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationInterval_2106OutgoingLinks(view));

 	}

 

 	/**

@@ -517,8 +463,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInterval_2107Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInterval_2107OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterval_2107OutgoingLinks(view));

 	}

 

 	/**

@@ -526,8 +471,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInstanceValue_2108Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInstanceValue_2108OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInstanceValue_2108OutgoingLinks(view));

 	}

 

 	/**

@@ -535,8 +479,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createComment_2109Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getComment_2109OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_2109OutgoingLinks(view));

 	}

 

 	/**

@@ -544,8 +487,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDurationConstraint_2110Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDurationConstraint_2110OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationConstraint_2110OutgoingLinks(view));

 	}

 

 	/**

@@ -553,8 +495,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeConstraint_2111Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getTimeConstraint_2111OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeConstraint_2111OutgoingLinks(view));

 	}

 

 	/**

@@ -562,8 +503,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createIntervalConstraint_2112Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getIntervalConstraint_2112OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getIntervalConstraint_2112OutgoingLinks(view));

 	}

 

 	/**

@@ -571,8 +511,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInteractionConstraint_2113Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInteractionConstraint_2113OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteractionConstraint_2113OutgoingLinks(view));

 	}

 

 	/**

@@ -580,8 +519,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createConstraint_2114Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getConstraint_2114OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_2114OutgoingLinks(view));

 	}

 

 	/**

@@ -589,8 +527,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createPort_3069Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getPort_3069OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPort_3069OutgoingLinks(view));

 	}

 

 	/**

@@ -598,8 +535,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createParameter_3088Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getParameter_3088OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getParameter_3088OutgoingLinks(view));

 	}

 

 	/**

@@ -607,12 +543,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createProperty_3070Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getProperty_3070OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getProperty_3070SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_3070OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProperty_3070SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createPropertyInternalstructure_7077Children(getCompartment(view, PropertyPartCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -622,8 +556,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createConnectableElement_3115Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getConnectableElement_3115OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConnectableElement_3115OutgoingLinks(view));

 	}

 

 	/**

@@ -631,8 +564,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createCollaborationUse_3071Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getCollaborationUse_3071OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCollaborationUse_3071OutgoingLinks(view));

 	}

 

 	/**

@@ -640,12 +572,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createActivity_3072Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getActivity_3072OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getActivity_3072SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActivity_3072OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivity_3072SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createActivityInternalstructure_7050Children(getCompartment(view, ActivityCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -655,12 +585,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInteraction_3073Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInteraction_3073OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getInteraction_3073SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteraction_3073OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteraction_3073SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createInteractionInternalstructure_7051Children(getCompartment(view, InteractionCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -670,12 +598,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createProtocolStateMachine_3074Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getProtocolStateMachine_3074OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getProtocolStateMachine_3074SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_3074OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_3074SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createProtocolStateMachineInternalstructure_7052Children(getCompartment(view, ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -685,12 +611,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createStateMachine_3075Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getStateMachine_3075OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getStateMachine_3075SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStateMachine_3075OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachine_3075SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createStateMachineInternalstructure_7053Children(getCompartment(view, StateMachineCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -700,12 +624,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createFunctionBehavior_3076Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getFunctionBehavior_3076OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getFunctionBehavior_3076SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getFunctionBehavior_3076OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getFunctionBehavior_3076SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createFunctionBehaviorInternalstructure_7054Children(getCompartment(view, FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -715,12 +637,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createOpaqueBehavior_3077Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getOpaqueBehavior_3077OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getOpaqueBehavior_3077SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_3077OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_3077SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createOpaqueBehaviorInternalstructure_7055Children(getCompartment(view, OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -730,12 +650,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createComponent_3081Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getComponent_3081OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getComponent_3081SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComponent_3081OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponent_3081SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createComponentInternalstructure_7056Children(getCompartment(view, ComponentCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -745,12 +663,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDevice_3082Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDevice_3082OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getDevice_3082SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDevice_3082OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDevice_3082SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createDeviceInternalstructure_7057Children(getCompartment(view, DeviceCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -760,12 +676,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createExecutionEnvironment_3083Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getExecutionEnvironment_3083OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getExecutionEnvironment_3083SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_3083OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_3083SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createExecutionEnvironmentInternalstructure_7058Children(getCompartment(view, ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -775,12 +689,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createNode_3084Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getNode_3084OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getNode_3084SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getNode_3084OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNode_3084SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createNodeInternalstructure_7059Children(getCompartment(view, NodeCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -790,12 +702,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createClass_3085Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getClass_3085OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getClass_3085SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_3085OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClass_3085SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createClassInternalstructure_7060Children(getCompartment(view, ClassCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -805,8 +715,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createCollaboration_3086Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getCollaboration_3086OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCollaboration_3086OutgoingLinks(view));

 		createCollaborationInternalstructure_7061Children(getCompartment(view, CollaborationCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

 

@@ -815,8 +724,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInterface_3087Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInterface_3087OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterface_3087OutgoingLinks(view));

 	}

 

 	/**

@@ -824,8 +732,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createPrimitiveType_3078Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getPrimitiveType_3078OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_3078OutgoingLinks(view));

 	}

 

 	/**

@@ -833,12 +740,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createEnumeration_3079Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getEnumeration_3079OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getEnumeration_3079SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_3079OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumeration_3079SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 		createEnumerationLiterals_7049Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -848,8 +753,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDataType_3080Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDataType_3080OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_3080OutgoingLinks(view));

 		createDataTypeAttributes_7036Children(getCompartment(view, DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));

 		createDataTypeOperations_7037Children(getCompartment(view, DataTypeOperationCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -859,8 +763,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createActor_3091Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getActor_3091OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActor_3091OutgoingLinks(view));

 	}

 

 	/**

@@ -868,8 +771,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDeploymentSpecification_3092Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDeploymentSpecification_3092OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDeploymentSpecification_3092OutgoingLinks(view));

 	}

 

 	/**

@@ -877,8 +779,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createArtifact_3093Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getArtifact_3093OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getArtifact_3093OutgoingLinks(view));

 	}

 

 	/**

@@ -886,8 +787,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInformationItem_3094Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInformationItem_3094OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInformationItem_3094OutgoingLinks(view));

 	}

 

 	/**

@@ -895,8 +795,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createSignal_3095Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getSignal_3095OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSignal_3095OutgoingLinks(view));

 	}

 

 	/**

@@ -904,8 +803,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createUseCase_3096Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getUseCase_3096OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getUseCase_3096OutgoingLinks(view));

 	}

 

 	/**

@@ -913,8 +811,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createComment_3097Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getComment_3097OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_3097OutgoingLinks(view));

 	}

 

 	/**

@@ -922,8 +819,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDurationConstraint_3116Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getDurationConstraint_3116OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationConstraint_3116OutgoingLinks(view));

 	}

 

 	/**

@@ -931,8 +827,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeConstraint_3117Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getTimeConstraint_3117OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeConstraint_3117OutgoingLinks(view));

 	}

 

 	/**

@@ -940,8 +835,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createIntervalConstraint_3118Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getIntervalConstraint_3118OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getIntervalConstraint_3118OutgoingLinks(view));

 	}

 

 	/**

@@ -949,8 +843,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInteractionConstraint_3119Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getInteractionConstraint_3119OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteractionConstraint_3119OutgoingLinks(view));

 	}

 

 	/**

@@ -958,8 +851,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createConstraint_3120Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getConstraint_3120OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_3120OutgoingLinks(view));

 	}

 

 	/**

@@ -967,8 +859,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createProperty_3101Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getProperty_3101OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_3101OutgoingLinks(view));

 	}

 

 	/**

@@ -976,8 +867,7 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createOperation_3102Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getOperation_3102OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOperation_3102OutgoingLinks(view));

 	}

 

 	/**

@@ -985,18 +875,16 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createEnumerationLiteral_3066Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-				.getEnumerationLiteral_3066OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumerationLiteral_3066OutgoingLinks(view));

 	}

 

 	/**

 	 * @generated

 	 */

 	private void createDataTypeAttributes_7033Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getDataTypeAttributes_7033SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeAttributes_7033SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1004,10 +892,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createDataTypeOperations_7034Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getDataTypeOperations_7034SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeOperations_7034SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1015,10 +902,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createDataTypeAttributes_7036Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getDataTypeAttributes_7036SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeAttributes_7036SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1026,10 +912,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createDataTypeOperations_7037Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getDataTypeOperations_7037SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeOperations_7037SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1037,10 +922,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createEnumerationLiterals_7048Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getEnumerationLiterals_7048SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumerationLiterals_7048SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1048,10 +932,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createEnumerationLiterals_7049Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getEnumerationLiterals_7049SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumerationLiterals_7049SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1059,10 +942,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createActivityInternalstructure_7050Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getActivityInternalstructure_7050SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivityInternalstructure_7050SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1070,10 +952,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createInteractionInternalstructure_7051Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getInteractionInternalstructure_7051SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteractionInternalstructure_7051SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1081,10 +962,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createProtocolStateMachineInternalstructure_7052Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getProtocolStateMachineInternalstructure_7052SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProtocolStateMachineInternalstructure_7052SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1092,10 +972,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createStateMachineInternalstructure_7053Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getStateMachineInternalstructure_7053SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachineInternalstructure_7053SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1103,10 +982,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createFunctionBehaviorInternalstructure_7054Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getFunctionBehaviorInternalstructure_7054SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getFunctionBehaviorInternalstructure_7054SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1114,10 +992,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createOpaqueBehaviorInternalstructure_7055Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getOpaqueBehaviorInternalstructure_7055SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehaviorInternalstructure_7055SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1125,10 +1002,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createComponentInternalstructure_7056Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getComponentInternalstructure_7056SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponentInternalstructure_7056SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1136,10 +1012,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createDeviceInternalstructure_7057Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getDeviceInternalstructure_7057SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDeviceInternalstructure_7057SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1147,10 +1022,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createExecutionEnvironmentInternalstructure_7058Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getExecutionEnvironmentInternalstructure_7058SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getExecutionEnvironmentInternalstructure_7058SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1158,10 +1032,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createNodeInternalstructure_7059Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getNodeInternalstructure_7059SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNodeInternalstructure_7059SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1169,10 +1042,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createClassInternalstructure_7060Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getClassInternalstructure_7060SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassInternalstructure_7060SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1180,10 +1052,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createCollaborationInternalstructure_7061Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getCollaborationInternalstructure_7061SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getCollaborationInternalstructure_7061SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1191,10 +1062,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createActivityInternalstructure_7063Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getActivityInternalstructure_7063SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivityInternalstructure_7063SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1202,10 +1072,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createInteractionInternalstructure_7064Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getInteractionInternalstructure_7064SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteractionInternalstructure_7064SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1213,10 +1082,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createProtocolStateMachineInternalstructure_7065Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getProtocolStateMachineInternalstructure_7065SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProtocolStateMachineInternalstructure_7065SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1224,10 +1092,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createStateMachineInternalstructure_7066Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getStateMachineInternalstructure_7066SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachineInternalstructure_7066SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1235,10 +1102,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createFunctionBehaviorInternalstructure_7067Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getFunctionBehaviorInternalstructure_7067SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getFunctionBehaviorInternalstructure_7067SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1246,10 +1112,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createOpaqueBehaviorInternalstructure_7068Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getOpaqueBehaviorInternalstructure_7068SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehaviorInternalstructure_7068SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1257,10 +1122,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createComponentInternalstructure_7069Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getComponentInternalstructure_7069SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponentInternalstructure_7069SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1268,10 +1132,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createDeviceInternalstructure_7070Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getDeviceInternalstructure_7070SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDeviceInternalstructure_7070SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1279,10 +1142,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createExecutionEnvironmentInternalstructure_7071Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getExecutionEnvironmentInternalstructure_7071SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getExecutionEnvironmentInternalstructure_7071SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1290,10 +1152,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createNodeInternalstructure_7072Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getNodeInternalstructure_7072SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNodeInternalstructure_7072SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1301,10 +1162,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createClassInternalstructure_7073Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getClassInternalstructure_7073SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassInternalstructure_7073SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1312,10 +1172,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createCollaborationInternalstructure_7075Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getCollaborationInternalstructure_7075SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getCollaborationInternalstructure_7075SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1323,10 +1182,9 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createPropertyInternalstructure_7077Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

-				.getPropertyInternalstructure_7077SemanticChildren(view);

-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

-			createNode(view, (UMLNodeDescriptor) it.next());

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getPropertyInternalstructure_7077SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

 		}

 	}

 

@@ -1336,7 +1194,7 @@ public class UMLDiagramContentInitializer {
 	private void createNode(View parentView, UMLNodeDescriptor nodeDescriptor) {

 		final String nodeType = UMLVisualIDRegistry.getType(nodeDescriptor.getVisualID());

 		Node node = ViewService.createNode(parentView, nodeDescriptor.getModelElement(), nodeType, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

-		switch (nodeDescriptor.getVisualID()) {

+		switch(nodeDescriptor.getVisualID()) {

 		case ActivityCompositeEditPart.VISUAL_ID:

 			createActivity_2060Children(node);

 			return;

@@ -1599,76 +1457,63 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createLinks(Diagram diagram) {

-		for (boolean continueLinkCreation = true; continueLinkCreation;) {

+		for(boolean continueLinkCreation = true; continueLinkCreation;) {

 			continueLinkCreation = false;

 			Collection additionalDescriptors = new LinkedList();

-			for (Iterator it = myLinkDescriptors.iterator(); it.hasNext();) {

-				UMLLinkDescriptor nextLinkDescriptor = (UMLLinkDescriptor) it.next();

-				if (!myDomain2NotationMap.containsKey(nextLinkDescriptor.getSource()) || !myDomain2NotationMap.containsKey(nextLinkDescriptor.getDestination())) {

+			for(Iterator it = myLinkDescriptors.iterator(); it.hasNext();) {

+				UMLLinkDescriptor nextLinkDescriptor = (UMLLinkDescriptor)it.next();

+				if(!myDomain2NotationMap.containsKey(nextLinkDescriptor.getSource()) || !myDomain2NotationMap.containsKey(nextLinkDescriptor.getDestination())) {

 					continue;

 				}

 				final String linkType = UMLVisualIDRegistry.getType(nextLinkDescriptor.getVisualID());

 				Edge edge = ViewService.getInstance().createEdge(nextLinkDescriptor.getSemanticAdapter(), diagram, linkType, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

-				if (edge != null) {

-					edge.setSource((View) myDomain2NotationMap.get(nextLinkDescriptor.getSource()));

-					edge.setTarget((View) myDomain2NotationMap.get(nextLinkDescriptor.getDestination()));

+				if(edge != null) {

+					edge.setSource((View)myDomain2NotationMap.get(nextLinkDescriptor.getSource()));

+					edge.setTarget((View)myDomain2NotationMap.get(nextLinkDescriptor.getDestination()));

 					it.remove();

-					if (nextLinkDescriptor.getModelElement() != null) {

+					if(nextLinkDescriptor.getModelElement() != null) {

 						myDomain2NotationMap.put(nextLinkDescriptor.getModelElement(), edge);

 					}

 					continueLinkCreation = true;

-					switch (nextLinkDescriptor.getVisualID()) {

+					switch(nextLinkDescriptor.getVisualID()) {

 					case ComponentRealizationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getComponentRealization_4004OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComponentRealization_4004OutgoingLinks(edge));

 						break;

 					case InterfaceRealizationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getInterfaceRealization_4005OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterfaceRealization_4005OutgoingLinks(edge));

 						break;

 					case SubstitutionEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getSubstitution_4011OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSubstitution_4011OutgoingLinks(edge));

 						break;

 					case RealizationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getRealization_4006OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getRealization_4006OutgoingLinks(edge));

 						break;

 					case ManifestationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getManifestation_4012OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getManifestation_4012OutgoingLinks(edge));

 						break;

 					case AbstractionEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getAbstraction_4007OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAbstraction_4007OutgoingLinks(edge));

 						break;

 					case UsageEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getUsage_4008OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getUsage_4008OutgoingLinks(edge));

 						break;

 					case DeploymentEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getDeployment_4009OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDeployment_4009OutgoingLinks(edge));

 						break;

 					case RoleBindingEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getDependency_4017OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_4017OutgoingLinks(edge));

 						break;

 					case DependencyEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getDependency_4010OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_4010OutgoingLinks(edge));

 						break;

 					case ConnectorEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getConnector_4013OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConnector_4013OutgoingLinks(edge));

 						break;

 					case GeneralizationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getGeneralization_4015OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getGeneralization_4015OutgoingLinks(edge));

 						break;

 					case InformationFlowEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

-								.getInformationFlow_4021OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInformationFlow_4021OutgoingLinks(edge));

 						break;

 					}

 				}

@@ -1682,10 +1527,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private Node getCompartment(View node, int visualID) {

 		String type = UMLVisualIDRegistry.getType(visualID);

-		for (Iterator it = node.getChildren().iterator(); it.hasNext();) {

-			View nextView = (View) it.next();

-			if (nextView instanceof Node && type.equals(nextView.getType())) {

-				return (Node) nextView;

+		for(Iterator it = node.getChildren().iterator(); it.hasNext();) {

+			View nextView = (View)it.next();

+			if(nextView instanceof Node && type.equals(nextView.getType())) {

+				return (Node)nextView;

 			}

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
index 1998192cee7..2af9285d2a2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -102,23 +102,18 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	 */

 	public UMLDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {

 		super(servicesRegistry, diagram);

-

 		// adds a listener to the palette service, which reacts to palette customizations

 		PapyrusPaletteService.getInstance().addProviderChangeListener(this);

-

 		// Share the same editing provider

 		editingDomain = servicesRegistry.getService(TransactionalEditingDomain.class);

 		documentProvider = new GmfMultiDiagramDocumentProvider(editingDomain);

-

 		// overrides editing domain created by super constructor

 		setDocumentProvider(documentProvider);

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected String getContextID() {

 		return CONTEXT_ID;

 	}

@@ -126,10 +121,9 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {

 		PaletteRoot paletteRoot;

-		if (existingPaletteRoot == null) {

+		if(existingPaletteRoot == null) {

 			paletteRoot = PapyrusPaletteService.getInstance().createPalette(this, getDefaultPaletteContent());

 		} else {

 			PapyrusPaletteService.getInstance().updatePalette(existingPaletteRoot, this, getDefaultPaletteContent());

@@ -142,7 +136,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected PreferencesHint getPreferencesHint() {

 		return UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;

 	}

@@ -150,7 +143,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getContributorId() {

 		return UMLDiagramEditorPlugin.ID;

 	}

@@ -158,7 +150,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected final IDocumentProvider getDocumentProvider(IEditorInput input) {

 		return documentProvider;

 	}

@@ -166,7 +157,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	public TransactionalEditingDomain getEditingDomain() {

 		return editingDomain;

 	}

@@ -174,7 +164,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected final void setDocumentProvider(IEditorInput input) {

 		// Already set in the constructor

 	}

@@ -182,7 +171,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	public void gotoMarker(IMarker marker) {

 		MarkerNavigationService.getInstance().gotoMarker(this, marker);

 	}

@@ -190,7 +178,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	public boolean isSaveAsAllowed() {

 		return true;

 	}

@@ -198,7 +185,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	public void doSaveAs() {

 		performSaveAs(new NullProgressMonitor());

 	}

@@ -206,7 +192,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void performSaveAs(IProgressMonitor progressMonitor) {

 		// Nothing

 	}

@@ -214,7 +199,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	public ShowInContext getShowInContext() {

 		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());

 	}

@@ -222,11 +206,9 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void configureGraphicalViewer() {

 		super.configureGraphicalViewer();

-		DiagramEditorContextMenuProvider provider =

-				new DiagramEditorContextMenuProvider(this, getDiagramGraphicalViewer());

+		DiagramEditorContextMenuProvider provider = new DiagramEditorContextMenuProvider(this, getDiagramGraphicalViewer());

 		getDiagramGraphicalViewer().setContextMenu(provider);

 		getSite().registerContextMenu(ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU, provider, getDiagramGraphicalViewer());

 	}

@@ -234,7 +216,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected TransactionalEditingDomain createEditingDomain() {

 		// Already configured

 		return editingDomain;

@@ -243,7 +224,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void configureDiagramEditDomain() {

 		super.configureDiagramEditDomain();

 		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {

@@ -258,7 +238,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	public void doSave(IProgressMonitor progressMonitor) {

 		// The saving of the resource is done by the CoreMultiDiagramEditor

 		getDirtyState().saved();

@@ -268,7 +247,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	 * @generated

 	 */

 	protected OperationHistoryDirtyState getDirtyState() {

-		if (dirtyState == null) {

+		if(dirtyState == null) {

 			dirtyState = OperationHistoryDirtyState.newInstance(getUndoContext(), getOperationHistory());

 		}

 		return dirtyState;

@@ -277,20 +256,17 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setUndoContext(IUndoContext context) {

-		if (dirtyState != null) {

+		if(dirtyState != null) {

 			dirtyState.dispose();

 			dirtyState = null;

 		}

-

 		super.setUndoContext(context);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public boolean isDirty() {

 		return getDirtyState().isDirty();

 	}

@@ -298,29 +274,24 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	public void providerChanged(ProviderChangeEvent event) {

 		// update the palette if the palette service has changed

-		if (PapyrusPaletteService.getInstance().equals(event.getSource())) {

-			PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this,

-					getDefaultPaletteContent());

+		if(PapyrusPaletteService.getInstance().equals(event.getSource())) {

+			PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this, getDefaultPaletteContent());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void dispose() {

 		// remove palette service listener

 		// remove preference listener

 		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);

-

-		if (dirtyState != null) {

+		if(dirtyState != null) {

 			dirtyState.dispose();

 			dirtyState = null;

 		}

-

 		super.dispose();

 	}

 

@@ -334,7 +305,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected PaletteViewer constructPaletteViewer() {

 		return new PapyrusPaletteViewer();

 	}

@@ -342,7 +312,6 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	@Override

 	protected PaletteViewerProvider createPaletteViewerProvider() {

 		getEditDomain().setPaletteRoot(createPaletteRoot(null));

 		return new PaletteViewerProvider(getEditDomain()) {

@@ -357,13 +326,10 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 			@Override

 			protected void configurePaletteViewer(PaletteViewer viewer) {

 				super.configurePaletteViewer(viewer);

-

 				// customize menu...

 				viewer.setContextMenu(new PapyrusPaletteContextMenuProvider(viewer));

-

 				viewer.getKeyHandler().setParent(getPaletteKeyHandler());

 				viewer.getControl().addMouseListener(getPaletteMouseListener());

-

 				// Add a transfer drag target listener that is supported on

 				// palette template entries whose template is a creation tool.

 				// This will enable drag and drop of the palette shape creation

@@ -385,9 +351,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 			 * @return Palette Key Handler for the palette

 			 */

 			private KeyHandler getPaletteKeyHandler() {

-

-				if (paletteKeyHandler == null) {

-

+				if(paletteKeyHandler == null) {

 					paletteKeyHandler = new KeyHandler() {

 

 						/**

@@ -395,34 +359,25 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 						 * whenever a key is released, and the Tool is in the proper state. Override

 						 * to support pressing the enter key to create a shape or connection

 						 * (between two selected shapes)

-						 *

+						 * 

 						 * @param event

 						 *            the KeyEvent

 						 * @return <code>true</code> if KeyEvent was handled in some way

 						 */

 						@Override

 						public boolean keyReleased(KeyEvent event) {

-

-							if (event.keyCode == SWT.Selection) {

-

+							if(event.keyCode == SWT.Selection) {

 								Tool tool = getPaletteViewer().getActiveTool().createTool();

-

-								if (toolSupportsAccessibility(tool)) {

-

+								if(toolSupportsAccessibility(tool)) {

 									tool.keyUp(event, getDiagramGraphicalViewer());

-

 									// deactivate current selection

 									getPaletteViewer().setActiveTool(null);

-

 									return true;

 								}

-

 							}

 							return super.keyReleased(event);

 						}

-

 					};

-

 				}

 				return paletteKeyHandler;

 			}

@@ -431,9 +386,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 			 * @return Palette Mouse listener for the palette

 			 */

 			private MouseListener getPaletteMouseListener() {

-

-				if (paletteMouseListener == null) {

-

+				if(paletteMouseListener == null) {

 					paletteMouseListener = new MouseListener() {

 

 						/**

@@ -445,19 +398,16 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 						/**

 						 * Override to support double-clicking a palette tool entry to create a

 						 * shape or connection (between two selected shapes).

-						 *

+						 * 

 						 * @see MouseListener#mouseDoubleClick(MouseEvent)

 						 */

 						@Override

 						public void mouseDoubleClick(MouseEvent e) {

 							Tool tool = getPaletteViewer().getActiveTool().createTool();

-

-							if (toolSupportsAccessibility(tool)) {

-

+							if(toolSupportsAccessibility(tool)) {

 								tool.setViewer(getDiagramGraphicalViewer());

 								tool.setEditDomain(getDiagramGraphicalViewer().getEditDomain());

 								tool.mouseDoubleClick(e, getDiagramGraphicalViewer());

-

 								// Current active tool should be deactivated,

 								// but if it is down here it will get

 								// reactivated deep in GEF palette code after

@@ -475,18 +425,15 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 						public void mouseUp(MouseEvent e) {

 							// Deactivate current active tool here if a

 							// double-click was handled.

-							if (clearActiveTool) {

+							if(clearActiveTool) {

 								getPaletteViewer().setActiveTool(null);

 								clearActiveTool = false;

 							}

-

 						}

 					};

-

 				}

 				return paletteMouseListener;

 			}

-

 		};

 	}

 

@@ -504,23 +451,20 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	@Override

 	protected void initializeGraphicalViewer() {

 		super.initializeGraphicalViewer();

-

 		// Enable Drop

-		getDiagramGraphicalViewer().addDropTargetListener(

-				new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) {

-

-					@Override

-					protected Object getJavaObject(TransferData data) {

-						// It is usual for the transfer data not to be set because it is available locally

-						return LocalSelectionTransfer.getTransfer().getSelection();

-					}

+		getDiagramGraphicalViewer().addDropTargetListener(new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) {

 

-					@Override

-					protected TransactionalEditingDomain getTransactionalEditingDomain() {

-						return getEditingDomain();

-					}

-				});

+			@Override

+			protected Object getJavaObject(TransferData data) {

+				// It is usual for the transfer data not to be set because it is available locally

+				return LocalSelectionTransfer.getTransfer().getSelection();

+			}

 

+			@Override

+			protected TransactionalEditingDomain getTransactionalEditingDomain() {

+				return getEditingDomain();

+			}

+		});

 	}

 

 	/**

@@ -528,10 +472,10 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	 */

 	@Override

 	public void selectionChanged(IWorkbenchPart part, ISelection selection) {

-		if (getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {

-			IMultiDiagramEditor editor = (IMultiDiagramEditor) getSite().getPage().getActiveEditor();

+		if(getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {

+			IMultiDiagramEditor editor = (IMultiDiagramEditor)getSite().getPage().getActiveEditor();

 			// If not the active editor, ignore selection changed.

-			if (this.equals(editor.getActiveEditor())) {

+			if(this.equals(editor.getActiveEditor())) {

 				updateActions(getSelectionActions());

 				super.selectionChanged(part, selection);

 			} else {

@@ -543,7 +487,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 		// from

 		// org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor.selectionChanged(IWorkbenchPart,

 		// ISelection)

-		if (part == this) {

+		if(part == this) {

 			rebuildStatusLine();

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java
index 0fd9d3efcc9..85e3758211e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java
@@ -1,14 +1,13 @@
 /**

- * Copyright (c) 2014 CEA LIST and others.

- *

+ * Copyright (c) 2014 CEA LIST.

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 410346

  */

 package org.eclipse.papyrus.uml.diagram.composite.part;

 

@@ -22,7 +21,7 @@ import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.composite.preferences.DiagramPreferenceInitializer;

 import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

@@ -84,22 +83,19 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
 	/**

 	 * @generated

 	 */

-	@Override

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

 		instance = this;

 		myLogHelper = new LogHelper(this);

 		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());

-		adapterFactory = org.eclipse.papyrus.infra.gmfdiag.common.Activator.getInstance().getItemProvidersAdapterFactory();

+		adapterFactory = Activator.getInstance().getItemProvidersAdapterFactory();

 		DiagramPreferenceInitializer diagramPreferenceInitializer = new DiagramPreferenceInitializer();

 		diagramPreferenceInitializer.initializeDefaultPreferences();

-

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void stop(BundleContext context) throws Exception {

 		adapterFactory = null;

 		linkConstraints = null;

@@ -118,9 +114,8 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IPreferenceStore getPreferenceStore() {

-		IPreferenceStore store = Activator.getDefault().getPreferenceStore();

+		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();

 		return store;

 	}

 

@@ -135,12 +130,9 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
 	 * @generated

 	 */

 	public ImageDescriptor getItemImageDescriptor(Object item) {

-		IItemLabelProvider labelProvider =

-				(IItemLabelProvider) adapterFactory.adapt(

-						item, IItemLabelProvider.class);

-		if (labelProvider != null) {

-			return ExtendedImageRegistry.getInstance().getImageDescriptor(

-					labelProvider.getImage(item));

+		IItemLabelProvider labelProvider = (IItemLabelProvider)adapterFactory.adapt(item, IItemLabelProvider.class);

+		if(labelProvider != null) {

+			return ExtendedImageRegistry.getInstance().getImageDescriptor(labelProvider.getImage(item));

 		}

 		return null;

 	}

@@ -148,10 +140,9 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
 	/**

 	 * Returns an image descriptor for the image file at the given

 	 * plug-in relative path.

-	 *

+	 * 

 	 * @generated

-	 * @param path

-	 *            the path

+	 * @param path the path

 	 * @return the image descriptor

 	 */

 	public static ImageDescriptor getBundledImageDescriptor(String path) {

@@ -162,17 +153,15 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
 	 * Respects images residing in any plug-in. If path is relative,

 	 * then this bundle is looked up for the image, otherwise, for absolute

 	 * path, first segment is taken as id of plug-in with image

-	 *

+	 * 

 	 * @generated

-	 * @param path

-	 *            the path to image, either absolute (with plug-in id as first segment), or relative for bundled images

+	 * @param path the path to image, either absolute (with plug-in id as first segment), or relative for bundled images

 	 * @return the image descriptor

 	 */

 	public static ImageDescriptor findImageDescriptor(String path) {

 		final IPath p = new Path(path);

-		if (p.isAbsolute() && p.segmentCount() > 1) {

-			return AbstractUIPlugin.imageDescriptorFromPlugin(

-					p.segment(0), p.removeFirstSegments(1).makeAbsolute().toString());

+		if(p.isAbsolute() && p.segmentCount() > 1) {

+			return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), p.removeFirstSegments(1).makeAbsolute().toString());

 		} else {

 			return getBundledImageDescriptor(p.makeAbsolute().toString());

 		}

@@ -181,15 +170,14 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
 	/**

 	 * Returns an image for the image file at the given plugin relative path.

 	 * Client do not need to dispose this image. Images will be disposed automatically.

-	 *

+	 * 

 	 * @generated

-	 * @param path

-	 *            the path

+	 * @param path the path

 	 * @return image instance

 	 */

 	public Image getBundledImage(String path) {

 		Image image = getImageRegistry().get(path);

-		if (image == null) {

+		if(image == null) {

 			getImageRegistry().put(path, getBundledImageDescriptor(path));

 			image = getImageRegistry().get(path);

 		}

@@ -198,19 +186,18 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
 

 	/**

 	 * Returns string from plug-in's resource bundle

-	 *

+	 * 

 	 * @generated

 	 */

 	public static String getString(String key) {

-		return Platform.getResourceString(

-				getInstance().getBundle(), "%" + key); //$NON-NLS-1$

+		return Platform.getResourceString(getInstance().getBundle(), "%" + key); //$NON-NLS-1$

 	}

 

 	/**

 	 * @generated

 	 */

 	public UMLDocumentProvider getDocumentProvider() {

-		if (documentProvider == null) {

+		if(documentProvider == null) {

 			documentProvider = new UMLDocumentProvider();

 		}

 		return documentProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java
index 258995ef886..a7e17ba0c92 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -85,9 +85,9 @@ public class UMLDiagramEditorUtil {
 	public static boolean openDiagram(Resource diagram) throws PartInitException {

 		String path = diagram.getURI().toPlatformString(true);

 		IResource workspaceResource = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(path));

-		if (workspaceResource instanceof IFile) {

+		if(workspaceResource instanceof IFile) {

 			IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();

-			return null != page.openEditor(new FileEditorInput((IFile) workspaceResource), UMLDiagramEditor.ID);

+			return null != page.openEditor(new FileEditorInput((IFile)workspaceResource), UMLDiagramEditor.ID);

 		}

 		return false;

 	}

@@ -96,7 +96,7 @@ public class UMLDiagramEditorUtil {
 	 * @generated

 	 */

 	public static void setCharset(IFile file) {

-		if (file == null) {

+		if(file == null) {

 			return;

 		}

 		try {

@@ -110,19 +110,18 @@ public class UMLDiagramEditorUtil {
 	 * @generated

 	 */

 	public static String getUniqueFileName(IPath containerFullPath, String fileName, String extension) {

-		return DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath, fileName, extension,

-				DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE);

+		return DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath, fileName, extension, DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE);

 	}

 

 	/**

 	 * Runs the wizard in a dialog.

-	 *

+	 * 

 	 * @generated

 	 */

 	public static void runWizard(Shell shell, Wizard wizard, String settingsKey) {

 		IDialogSettings pluginDialogSettings = UMLDiagramEditorPlugin.getInstance().getDialogSettings();

 		IDialogSettings wizardDialogSettings = pluginDialogSettings.getSection(settingsKey);

-		if (wizardDialogSettings == null) {

+		if(wizardDialogSettings == null) {

 			wizardDialogSettings = pluginDialogSettings.addNewSection(settingsKey);

 		}

 		wizard.setDialogSettings(wizardDialogSettings);

@@ -134,7 +133,6 @@ public class UMLDiagramEditorUtil {
 

 	/**

 	 * This method should be called within a workspace modify operation since it creates resources.

-	 *

 	 * @generated

 	 */

 	public static Resource createDiagram(URI diagramURI, URI modelURI, IProgressMonitor progressMonitor) {

@@ -144,25 +142,21 @@ public class UMLDiagramEditorUtil {
 		final Resource modelResource = editingDomain.getResourceSet().createResource(modelURI);

 		final String diagramName = diagramURI.lastSegment();

 		AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, Messages.UMLDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST) {

+

 			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 				Package model = createInitialModel();

 				attachModelToResource(model, modelResource);

-

-				Diagram diagram = ViewService.createDiagram(

-						model,

-						CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

-				if (diagram != null) {

+				Diagram diagram = ViewService.createDiagram(model, CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				if(diagram != null) {

 					diagramResource.getContents().add(diagram);

 					diagram.setName(diagramName);

 					diagram.setElement(model);

 				}

-

 				try {

 					modelResource.save(org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil.getSaveOptions());

 					diagramResource.save(org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil.getSaveOptions());

 				} catch (IOException e) {

-

 					UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$

 				}

 				return CommandResult.newOKCommandResult();

@@ -182,7 +176,6 @@ public class UMLDiagramEditorUtil {
 	 * Create a new instance of domain element associated with canvas.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static Package createInitialModel() {

@@ -193,7 +186,6 @@ public class UMLDiagramEditorUtil {
 	 * Store model element in the resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static void attachModelToResource(Package model, Resource resource) {

@@ -205,17 +197,15 @@ public class UMLDiagramEditorUtil {
 	 */

 	public static void selectElementsInDiagram(IDiagramWorkbenchPart diagramPart, List<EditPart> editParts) {

 		diagramPart.getDiagramGraphicalViewer().deselectAll();

-

 		EditPart firstPrimary = null;

-		for (EditPart nextPart : editParts) {

+		for(EditPart nextPart : editParts) {

 			diagramPart.getDiagramGraphicalViewer().appendSelection(nextPart);

-			if (firstPrimary == null && nextPart instanceof IPrimaryEditPart) {

+			if(firstPrimary == null && nextPart instanceof IPrimaryEditPart) {

 				firstPrimary = nextPart;

 			}

 		}

-

-		if (!editParts.isEmpty()) {

-			diagramPart.getDiagramGraphicalViewer().reveal(firstPrimary != null ? firstPrimary : (EditPart) editParts.get(0));

+		if(!editParts.isEmpty()) {

+			diagramPart.getDiagramGraphicalViewer().reveal(firstPrimary != null ? firstPrimary : (EditPart)editParts.get(0));

 		}

 	}

 

@@ -223,36 +213,33 @@ public class UMLDiagramEditorUtil {
 	 * @generated

 	 */

 	private static int findElementsInDiagramByID(DiagramEditPart diagramPart, EObject element, List<EditPart> editPartCollector) {

-		IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer) diagramPart.getViewer();

+		IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer)diagramPart.getViewer();

 		final int intialNumOfEditParts = editPartCollector.size();

-

-		if (element instanceof View) { // support notation element lookup

-			EditPart editPart = (EditPart) viewer.getEditPartRegistry().get(element);

-			if (editPart != null) {

+		if(element instanceof View) { // support notation element lookup

+			EditPart editPart = (EditPart)viewer.getEditPartRegistry().get(element);

+			if(editPart != null) {

 				editPartCollector.add(editPart);

 				return 1;

 			}

 		}

-

 		String elementID = EMFCoreUtil.getProxyID(element);

 		@SuppressWarnings("unchecked")

 		List<EditPart> associatedParts = viewer.findEditPartsForElement(elementID, IGraphicalEditPart.class);

 		// perform the possible hierarchy disjoint -> take the top-most parts only

-		for (EditPart nextPart : associatedParts) {

+		for(EditPart nextPart : associatedParts) {

 			EditPart parentPart = nextPart.getParent();

-			while (parentPart != null && !associatedParts.contains(parentPart)) {

+			while(parentPart != null && !associatedParts.contains(parentPart)) {

 				parentPart = parentPart.getParent();

 			}

-			if (parentPart == null) {

+			if(parentPart == null) {

 				editPartCollector.add(nextPart);

 			}

 		}

-

-		if (intialNumOfEditParts == editPartCollector.size()) {

-			if (!associatedParts.isEmpty()) {

+		if(intialNumOfEditParts == editPartCollector.size()) {

+			if(!associatedParts.isEmpty()) {

 				editPartCollector.add(associatedParts.get(0));

 			} else {

-				if (element.eContainer() != null) {

+				if(element.eContainer() != null) {

 					return findElementsInDiagramByID(diagramPart, element.eContainer(), editPartCollector);

 				}

 			}

@@ -265,25 +252,22 @@ public class UMLDiagramEditorUtil {
 	 */

 	public static View findView(DiagramEditPart diagramEditPart, EObject targetElement, LazyElement2ViewMap lazyElement2ViewMap) {

 		boolean hasStructuralURI = false;

-		if (targetElement.eResource() instanceof XMLResource) {

-			hasStructuralURI = ((XMLResource) targetElement.eResource()).getID(targetElement) == null;

+		if(targetElement.eResource() instanceof XMLResource) {

+			hasStructuralURI = ((XMLResource)targetElement.eResource()).getID(targetElement) == null;

 		}

-

 		View view = null;

 		LinkedList<EditPart> editPartHolder = new LinkedList<EditPart>();

-		if (hasStructuralURI && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) {

+		if(hasStructuralURI && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) {

 			view = lazyElement2ViewMap.getElement2ViewMap().get(targetElement);

-		} else if (findElementsInDiagramByID(diagramEditPart, targetElement, editPartHolder) > 0) {

+		} else if(findElementsInDiagramByID(diagramEditPart, targetElement, editPartHolder) > 0) {

 			EditPart editPart = editPartHolder.get(0);

-			view = editPart.getModel() instanceof View ? (View) editPart.getModel() : null;

+			view = editPart.getModel() instanceof View ? (View)editPart.getModel() : null;

 		}

-

 		return (view == null) ? diagramEditPart.getDiagramView() : view;

 	}

 

 	/**

 	 * XXX This is quite suspicious code (especially editPartTmpHolder) and likely to be removed soon

-	 *

 	 * @generated

 	 */

 	public static class LazyElement2ViewMap {

@@ -315,18 +299,17 @@ public class UMLDiagramEditorUtil {
 		 * @generated

 		 */

 		public final Map<EObject, View> getElement2ViewMap() {

-			if (element2ViewMap == null) {

+			if(element2ViewMap == null) {

 				element2ViewMap = new HashMap<EObject, View>();

 				// map possible notation elements to itself as these can't be found by view.getElement()

-				for (EObject element : elementSet) {

-					if (element instanceof View) {

-						View view = (View) element;

-						if (view.getDiagram() == scope.getDiagram()) {

+				for(EObject element : elementSet) {

+					if(element instanceof View) {

+						View view = (View)element;

+						if(view.getDiagram() == scope.getDiagram()) {

 							element2ViewMap.put(element, view); // take only those that part of our diagram

 						}

 					}

 				}

-

 				buildElement2ViewMap(scope, element2ViewMap, elementSet);

 			}

 			return element2ViewMap;

@@ -336,27 +319,26 @@ public class UMLDiagramEditorUtil {
 		 * @generated

 		 */

 		private static boolean buildElement2ViewMap(View parentView, Map<EObject, View> element2ViewMap, Set<? extends EObject> elements) {

-			if (elements.size() == element2ViewMap.size()) {

+			if(elements.size() == element2ViewMap.size()) {

 				return true;

 			}

-

-			if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement()) && elements.contains(parentView.getElement())) {

+			if(parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement()) && elements.contains(parentView.getElement())) {

 				element2ViewMap.put(parentView.getElement(), parentView);

-				if (elements.size() == element2ViewMap.size()) {

+				if(elements.size() == element2ViewMap.size()) {

 					return true;

 				}

 			}

 			boolean complete = false;

-			for (Iterator<?> it = parentView.getChildren().iterator(); it.hasNext() && !complete;) {

-				complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements);

+			for(Iterator<?> it = parentView.getChildren().iterator(); it.hasNext() && !complete;) {

+				complete = buildElement2ViewMap((View)it.next(), element2ViewMap, elements);

 			}

-			for (Iterator<?> it = parentView.getSourceEdges().iterator(); it.hasNext() && !complete;) {

-				complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements);

+			for(Iterator<?> it = parentView.getSourceEdges().iterator(); it.hasNext() && !complete;) {

+				complete = buildElement2ViewMap((View)it.next(), element2ViewMap, elements);

 			}

-			for (Iterator<?> it = parentView.getTargetEdges().iterator(); it.hasNext() && !complete;) {

-				complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements);

+			for(Iterator<?> it = parentView.getTargetEdges().iterator(); it.hasNext() && !complete;) {

+				complete = buildElement2ViewMap((View)it.next(), element2ViewMap, elements);

 			}

 			return complete;

 		}

-	} // LazyElement2ViewMap

+	} //LazyElement2ViewMap	

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
index f5da0f844fa..fac5229247b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -117,15 +117,14 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	protected UMLDiagramUpdater() {

-		// to prevent instantiation allowing the override

+		//to prevent instantiation allowing the override

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public List<UMLNodeDescriptor> getSemanticChildren(View view) {

-		switch (UMLVisualIDRegistry.getVisualID(view)) {

+		switch(UMLVisualIDRegistry.getVisualID(view)) {

 		case CompositeStructureDiagramEditPart.VISUAL_ID:

 			return getPackage_1000SemanticChildren(view);

 		case ActivityCompositeEditPart.VISUAL_ID:

@@ -248,218 +247,215 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getPackage_1000SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Package modelElement = (Package) view.getElement();

+		Package modelElement = (Package)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getPackagedElements()

-				.iterator(); it.hasNext();) {

-			PackageableElement childElement = (PackageableElement) it.next();

+		for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

+			PackageableElement childElement = (PackageableElement)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPart.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPart.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPart.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPart.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPart.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPart.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPart.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPart.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPart.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPart.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPart.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPart.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPart.VISUAL_ID) {

+			if(visualID == InterfaceEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPart.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPart.VISUAL_ID) {

+			if(visualID == EnumerationEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPart.VISUAL_ID) {

+			if(visualID == DataTypeEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPart.VISUAL_ID) {

+			if(visualID == ActorEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPart.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPart.VISUAL_ID) {

+			if(visualID == ArtifactEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPart.VISUAL_ID) {

+			if(visualID == InformationItemEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPart.VISUAL_ID) {

+			if(visualID == SignalEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPart.VISUAL_ID) {

+			if(visualID == UseCaseEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEventEditPart.VISUAL_ID) {

+			if(visualID == SignalEventEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CallEventEditPart.VISUAL_ID) {

+			if(visualID == CallEventEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == AnyReceiveEventEditPart.VISUAL_ID) {

+			if(visualID == AnyReceiveEventEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ChangeEventEditPart.VISUAL_ID) {

+			if(visualID == ChangeEventEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeEventEditPart.VISUAL_ID) {

+			if(visualID == TimeEventEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DurationObservationEditPart.VISUAL_ID) {

+			if(visualID == DurationObservationEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeObservationEditPart.VISUAL_ID) {

+			if(visualID == TimeObservationEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == LiteralBooleanEditPart.VISUAL_ID) {

+			if(visualID == LiteralBooleanEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == LiteralIntegerEditPart.VISUAL_ID) {

+			if(visualID == LiteralIntegerEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == LiteralNullEditPart.VISUAL_ID) {

+			if(visualID == LiteralNullEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == LiteralStringEditPart.VISUAL_ID) {

+			if(visualID == LiteralStringEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == LiteralUnlimitedNaturalEditPart.VISUAL_ID) {

+			if(visualID == LiteralUnlimitedNaturalEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StringExpressionEditPart.VISUAL_ID) {

+			if(visualID == StringExpressionEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueExpressionEditPart.VISUAL_ID) {

+			if(visualID == OpaqueExpressionEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeExpressionEditPart.VISUAL_ID) {

+			if(visualID == TimeExpressionEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExpressionEditPart.VISUAL_ID) {

+			if(visualID == ExpressionEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DurationEditPart.VISUAL_ID) {

+			if(visualID == DurationEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeIntervalEditPart.VISUAL_ID) {

+			if(visualID == TimeIntervalEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DurationIntervalEditPart.VISUAL_ID) {

+			if(visualID == DurationIntervalEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalEditPart.VISUAL_ID) {

+			if(visualID == IntervalEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InstanceValueEditPart.VISUAL_ID) {

+			if(visualID == InstanceValueEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPart.VISUAL_ID) {

+			if(visualID == CommentEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPart.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPart.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPart.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPart.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPart.VISUAL_ID) {

+			if(visualID == ConstraintEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -471,25 +467,23 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getActivity_2060SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Activity modelElement = (Activity) view.getElement();

+		Activity modelElement = (Activity)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -501,25 +495,23 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getInteraction_2061SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Interaction modelElement = (Interaction) view.getElement();

+		Interaction modelElement = (Interaction)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -531,25 +523,23 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getProtocolStateMachine_2062SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -561,25 +551,23 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getStateMachine_2063SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		StateMachine modelElement = (StateMachine) view.getElement();

+		StateMachine modelElement = (StateMachine)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -591,25 +579,23 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getFunctionBehavior_2064SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -621,25 +607,23 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getOpaqueBehavior_2065SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -651,16 +635,15 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getComponent_2069SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Component modelElement = (Component) view.getElement();

+		Component modelElement = (Component)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -672,16 +655,15 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getDevice_2070SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Device modelElement = (Device) view.getElement();

+		Device modelElement = (Device)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -693,16 +675,15 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getExecutionEnvironment_2071SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -714,16 +695,15 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getNode_2072SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Node modelElement = (Node) view.getElement();

+		Node modelElement = (Node)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -735,16 +715,15 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getClass_2073SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Class modelElement = (Class) view.getElement();

+		Class modelElement = (Class)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -756,16 +735,15 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getEnumeration_2067SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Enumeration modelElement = (Enumeration) view.getElement();

+		Enumeration modelElement = (Enumeration)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedLiterals()

-				.iterator(); it.hasNext();) {

-			EnumerationLiteral childElement = (EnumerationLiteral) it.next();

+		for(Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

+			EnumerationLiteral childElement = (EnumerationLiteral)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

+			if(visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -785,25 +763,23 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getActivity_3072SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Activity modelElement = (Activity) view.getElement();

+		Activity modelElement = (Activity)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -815,25 +791,23 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getInteraction_3073SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Interaction modelElement = (Interaction) view.getElement();

+		Interaction modelElement = (Interaction)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -845,25 +819,23 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getProtocolStateMachine_3074SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -875,25 +847,23 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getStateMachine_3075SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		StateMachine modelElement = (StateMachine) view.getElement();

+		StateMachine modelElement = (StateMachine)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -905,25 +875,23 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getFunctionBehavior_3076SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -935,25 +903,23 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getOpaqueBehavior_3077SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -965,16 +931,15 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getComponent_3081SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Component modelElement = (Component) view.getElement();

+		Component modelElement = (Component)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -986,16 +951,15 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getDevice_3082SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Device modelElement = (Device) view.getElement();

+		Device modelElement = (Device)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1007,16 +971,15 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getExecutionEnvironment_3083SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1028,16 +991,15 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getNode_3084SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Node modelElement = (Node) view.getElement();

+		Node modelElement = (Node)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1049,16 +1011,15 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getClass_3085SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Class modelElement = (Class) view.getElement();

+		Class modelElement = (Class)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PortEditPart.VISUAL_ID) {

+			if(visualID == PortEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1070,16 +1031,15 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getEnumeration_3079SemanticChildren(View view) {

-		if (!view.isSetElement()) {

+		if(!view.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Enumeration modelElement = (Enumeration) view.getElement();

+		Enumeration modelElement = (Enumeration)view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedLiterals()

-				.iterator(); it.hasNext();) {

-			EnumerationLiteral childElement = (EnumerationLiteral) it.next();

+		for(Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

+			EnumerationLiteral childElement = (EnumerationLiteral)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

+			if(visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1091,20 +1051,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getDataTypeAttributes_7033SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		DataType modelElement = (DataType) containerView.getElement();

+		DataType modelElement = (DataType)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyEditPartCLN.VISUAL_ID) {

+			if(visualID == PropertyEditPartCLN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1116,20 +1075,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getDataTypeOperations_7034SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		DataType modelElement = (DataType) containerView.getElement();

+		DataType modelElement = (DataType)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedOperations()

-				.iterator(); it.hasNext();) {

-			Operation childElement = (Operation) it.next();

+		for(Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) {

+			Operation childElement = (Operation)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == OperationEditPartCLN.VISUAL_ID) {

+			if(visualID == OperationEditPartCLN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1141,20 +1099,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getDataTypeAttributes_7036SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		DataType modelElement = (DataType) containerView.getElement();

+		DataType modelElement = (DataType)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyEditPartCLN.VISUAL_ID) {

+			if(visualID == PropertyEditPartCLN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1166,20 +1123,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getDataTypeOperations_7037SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		DataType modelElement = (DataType) containerView.getElement();

+		DataType modelElement = (DataType)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedOperations()

-				.iterator(); it.hasNext();) {

-			Operation childElement = (Operation) it.next();

+		for(Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) {

+			Operation childElement = (Operation)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == OperationEditPartCLN.VISUAL_ID) {

+			if(visualID == OperationEditPartCLN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1191,20 +1147,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getEnumerationLiterals_7048SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Enumeration modelElement = (Enumeration) containerView.getElement();

+		Enumeration modelElement = (Enumeration)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedLiterals()

-				.iterator(); it.hasNext();) {

-			EnumerationLiteral childElement = (EnumerationLiteral) it.next();

+		for(Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

+			EnumerationLiteral childElement = (EnumerationLiteral)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

+			if(visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1216,20 +1171,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getEnumerationLiterals_7049SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Enumeration modelElement = (Enumeration) containerView.getElement();

+		Enumeration modelElement = (Enumeration)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedLiterals()

-				.iterator(); it.hasNext();) {

-			EnumerationLiteral childElement = (EnumerationLiteral) it.next();

+		for(Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

+			EnumerationLiteral childElement = (EnumerationLiteral)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

+			if(visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1241,165 +1195,159 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getActivityInternalstructure_7050SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Activity modelElement = (Activity) containerView.getElement();

+		Activity modelElement = (Activity)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1411,165 +1359,159 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getInteractionInternalstructure_7051SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Interaction modelElement = (Interaction) containerView.getElement();

+		Interaction modelElement = (Interaction)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1581,165 +1523,159 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getProtocolStateMachineInternalstructure_7052SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		ProtocolStateMachine modelElement = (ProtocolStateMachine) containerView.getElement();

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1751,165 +1687,159 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getStateMachineInternalstructure_7053SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		StateMachine modelElement = (StateMachine) containerView.getElement();

+		StateMachine modelElement = (StateMachine)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -1921,165 +1851,159 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getFunctionBehaviorInternalstructure_7054SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		FunctionBehavior modelElement = (FunctionBehavior) containerView.getElement();

+		FunctionBehavior modelElement = (FunctionBehavior)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -2091,165 +2015,159 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getOpaqueBehaviorInternalstructure_7055SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		OpaqueBehavior modelElement = (OpaqueBehavior) containerView.getElement();

+		OpaqueBehavior modelElement = (OpaqueBehavior)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -2261,156 +2179,151 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getComponentInternalstructure_7056SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Component modelElement = (Component) containerView.getElement();

+		Component modelElement = (Component)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -2422,156 +2335,151 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getDeviceInternalstructure_7057SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Device modelElement = (Device) containerView.getElement();

+		Device modelElement = (Device)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -2583,156 +2491,151 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getExecutionEnvironmentInternalstructure_7058SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		ExecutionEnvironment modelElement = (ExecutionEnvironment) containerView.getElement();

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -2744,156 +2647,151 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getNodeInternalstructure_7059SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Node modelElement = (Node) containerView.getElement();

+		Node modelElement = (Node)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -2905,156 +2803,151 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getClassInternalstructure_7060SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Class modelElement = (Class) containerView.getElement();

+		Class modelElement = (Class)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -3066,72 +2959,67 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getCollaborationInternalstructure_7061SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Collaboration modelElement = (Collaboration) containerView.getElement();

+		Collaboration modelElement = (Collaboration)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getRoles()

-				.iterator(); it.hasNext();) {

-			ConnectableElement childElement = (ConnectableElement) it.next();

+		for(Iterator<?> it = modelElement.getRoles().iterator(); it.hasNext();) {

+			ConnectableElement childElement = (ConnectableElement)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationRoleEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationRoleEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -3143,165 +3031,159 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getActivityInternalstructure_7063SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Activity modelElement = (Activity) containerView.getElement();

+		Activity modelElement = (Activity)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -3313,165 +3195,159 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getInteractionInternalstructure_7064SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Interaction modelElement = (Interaction) containerView.getElement();

+		Interaction modelElement = (Interaction)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -3483,165 +3359,159 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getProtocolStateMachineInternalstructure_7065SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		ProtocolStateMachine modelElement = (ProtocolStateMachine) containerView.getElement();

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -3653,165 +3523,159 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getStateMachineInternalstructure_7066SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		StateMachine modelElement = (StateMachine) containerView.getElement();

+		StateMachine modelElement = (StateMachine)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -3823,165 +3687,159 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getFunctionBehaviorInternalstructure_7067SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		FunctionBehavior modelElement = (FunctionBehavior) containerView.getElement();

+		FunctionBehavior modelElement = (FunctionBehavior)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -3993,165 +3851,159 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getOpaqueBehaviorInternalstructure_7068SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		OpaqueBehavior modelElement = (OpaqueBehavior) containerView.getElement();

+		OpaqueBehavior modelElement = (OpaqueBehavior)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters()

-				.iterator(); it.hasNext();) {

-			Parameter childElement = (Parameter) it.next();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ParameterEditPart.VISUAL_ID) {

+			if(visualID == ParameterEditPart.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -4163,156 +4015,151 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getComponentInternalstructure_7069SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Component modelElement = (Component) containerView.getElement();

+		Component modelElement = (Component)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -4324,156 +4171,151 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getDeviceInternalstructure_7070SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Device modelElement = (Device) containerView.getElement();

+		Device modelElement = (Device)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -4485,156 +4327,151 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getExecutionEnvironmentInternalstructure_7071SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		ExecutionEnvironment modelElement = (ExecutionEnvironment) containerView.getElement();

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -4646,156 +4483,151 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getNodeInternalstructure_7072SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Node modelElement = (Node) containerView.getElement();

+		Node modelElement = (Node)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -4807,156 +4639,151 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getClassInternalstructure_7073SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Class modelElement = (Class) containerView.getElement();

+		Class modelElement = (Class)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers()

-				.iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier) it.next();

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ActorEditPartCN.VISUAL_ID) {

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == SignalEditPartCN.VISUAL_ID) {

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -4968,72 +4795,67 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLNodeDescriptor> getCollaborationInternalstructure_7075SemanticChildren(View view) {

-		if (false == view.eContainer() instanceof View) {

+		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

 		}

-		View containerView = (View) view.eContainer();

-		if (!containerView.isSetElement()) {

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

 			return Collections.emptyList();

 		}

-		Collaboration modelElement = (Collaboration) containerView.getElement();

+		Collaboration modelElement = (Collaboration)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes()

-				.iterator(); it.hasNext();) {

-			Property childElement = (Property) it.next();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses()

-				.iterator(); it.hasNext();) {

-			CollaborationUse childElement = (CollaborationUse) it.next();

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments()

-				.iterator(); it.hasNext();) {

-			Comment childElement = (Comment) it.next();

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CommentEditPartCN.VISUAL_ID) {

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getRoles()

-				.iterator(); it.hasNext();) {

-			ConnectableElement childElement = (ConnectableElement) it.next();

+		for(Iterator<?> it = modelElement.getRoles().iterator(); it.hasNext();) {

+			ConnectableElement childElement = (ConnectableElement)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == CollaborationRoleEditPartCN.VISUAL_ID) {

+			if(visualID == CollaborationRoleEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules()

-				.iterator(); it.hasNext();) {

-			Constraint childElement = (Constraint) it.next();

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

@@ -5052,9 +4874,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	@Override

 	public List<UMLLinkDescriptor> getContainedLinks(View view) {

-		switch (UMLVisualIDRegistry.getVisualID(view)) {

+		switch(UMLVisualIDRegistry.getVisualID(view)) {

 		case CompositeStructureDiagramEditPart.VISUAL_ID:

 			return getPackage_1000ContainedLinks(view);

 		case ActivityCompositeEditPart.VISUAL_ID:

@@ -5260,9 +5081,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	@Override

 	public List<UMLLinkDescriptor> getIncomingLinks(View view) {

-		switch (UMLVisualIDRegistry.getVisualID(view)) {

+		switch(UMLVisualIDRegistry.getVisualID(view)) {

 		case ActivityCompositeEditPart.VISUAL_ID:

 			return getActivity_2060IncomingLinks(view);

 		case InteractionCompositeEditPart.VISUAL_ID:

@@ -5466,9 +5286,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**

 	 * @generated

 	 */

-	@Override

 	public List<UMLLinkDescriptor> getOutgoingLinks(View view) {

-		switch (UMLVisualIDRegistry.getVisualID(view)) {

+		switch(UMLVisualIDRegistry.getVisualID(view)) {

 		case ActivityCompositeEditPart.VISUAL_ID:

 			return getActivity_2060OutgoingLinks(view);

 		case InteractionCompositeEditPart.VISUAL_ID:

@@ -5673,30 +5492,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getPackage_1000ContainedLinks(View view) {

-		Package modelElement = (Package) view.getElement();

+		Package modelElement = (Package)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -5704,12 +5512,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getActivity_2060ContainedLinks(View view) {

-		Activity modelElement = (Activity) view.getElement();

+		Activity modelElement = (Activity)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5717,12 +5523,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInteraction_2061ContainedLinks(View view) {

-		Interaction modelElement = (Interaction) view.getElement();

+		Interaction modelElement = (Interaction)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5730,12 +5534,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getProtocolStateMachine_2062ContainedLinks(View view) {

-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5743,12 +5545,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getStateMachine_2063ContainedLinks(View view) {

-		StateMachine modelElement = (StateMachine) view.getElement();

+		StateMachine modelElement = (StateMachine)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5756,12 +5556,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getFunctionBehavior_2064ContainedLinks(View view) {

-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5769,12 +5567,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getOpaqueBehavior_2065ContainedLinks(View view) {

-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5782,12 +5578,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComponent_2069ContainedLinks(View view) {

-		Component modelElement = (Component) view.getElement();

+		Component modelElement = (Component)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5795,12 +5589,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDevice_2070ContainedLinks(View view) {

-		Device modelElement = (Device) view.getElement();

+		Device modelElement = (Device)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5808,12 +5600,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_2071ContainedLinks(View view) {

-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5821,12 +5611,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getNode_2072ContainedLinks(View view) {

-		Node modelElement = (Node) view.getElement();

+		Node modelElement = (Node)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5834,12 +5622,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getClass_2073ContainedLinks(View view) {

-		Class modelElement = (Class) view.getElement();

+		Class modelElement = (Class)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5847,12 +5633,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getCollaboration_2075ContainedLinks(View view) {

-		Collaboration modelElement = (Collaboration) view.getElement();

+		Collaboration modelElement = (Collaboration)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5860,10 +5644,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInterface_2076ContainedLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

+		Interface modelElement = (Interface)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5871,10 +5654,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getPrimitiveType_2066ContainedLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5882,10 +5664,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getEnumeration_2067ContainedLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

+		Enumeration modelElement = (Enumeration)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5893,10 +5674,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDataType_2068ContainedLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

+		DataType modelElement = (DataType)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5904,10 +5684,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getActor_2077ContainedLinks(View view) {

-		Actor modelElement = (Actor) view.getElement();

+		Actor modelElement = (Actor)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5915,10 +5694,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_2078ContainedLinks(View view) {

-		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

+		DeploymentSpecification modelElement = (DeploymentSpecification)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5926,10 +5704,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getArtifact_2079ContainedLinks(View view) {

-		Artifact modelElement = (Artifact) view.getElement();

+		Artifact modelElement = (Artifact)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5937,12 +5714,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInformationItem_2080ContainedLinks(View view) {

-		InformationItem modelElement = (InformationItem) view.getElement();

+		InformationItem modelElement = (InformationItem)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement));

 		return result;

 	}

 

@@ -5950,10 +5725,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getSignal_2081ContainedLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

+		Signal modelElement = (Signal)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -5961,10 +5735,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getUseCase_2082ContainedLinks(View view) {

-		UseCase modelElement = (UseCase) view.getElement();

+		UseCase modelElement = (UseCase)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6007,10 +5780,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDurationObservation_2093ContainedLinks(View view) {

-		DurationObservation modelElement = (DurationObservation) view.getElement();

+		DurationObservation modelElement = (DurationObservation)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement));

 		return result;

 	}

 

@@ -6018,10 +5790,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeObservation_2094ContainedLinks(View view) {

-		TimeObservation modelElement = (TimeObservation) view.getElement();

+		TimeObservation modelElement = (TimeObservation)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement));

 		return result;

 	}

 

@@ -6127,10 +5898,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComment_2109ContainedLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

+		Comment modelElement = (Comment)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

 		return result;

 	}

 

@@ -6138,10 +5908,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDurationConstraint_2110ContainedLinks(View view) {

-		DurationConstraint modelElement = (DurationConstraint) view.getElement();

+		DurationConstraint modelElement = (DurationConstraint)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

 		return result;

 	}

 

@@ -6149,10 +5918,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeConstraint_2111ContainedLinks(View view) {

-		TimeConstraint modelElement = (TimeConstraint) view.getElement();

+		TimeConstraint modelElement = (TimeConstraint)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

 		return result;

 	}

 

@@ -6160,10 +5928,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getIntervalConstraint_2112ContainedLinks(View view) {

-		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

+		IntervalConstraint modelElement = (IntervalConstraint)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

 		return result;

 	}

 

@@ -6171,10 +5938,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInteractionConstraint_2113ContainedLinks(View view) {

-		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

+		InteractionConstraint modelElement = (InteractionConstraint)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

 		return result;

 	}

 

@@ -6182,10 +5948,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getConstraint_2114ContainedLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

+		Constraint modelElement = (Constraint)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

 		return result;

 	}

 

@@ -6228,12 +5993,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getActivity_3072ContainedLinks(View view) {

-		Activity modelElement = (Activity) view.getElement();

+		Activity modelElement = (Activity)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6241,12 +6004,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInteraction_3073ContainedLinks(View view) {

-		Interaction modelElement = (Interaction) view.getElement();

+		Interaction modelElement = (Interaction)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6254,12 +6015,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getProtocolStateMachine_3074ContainedLinks(View view) {

-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6267,12 +6026,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getStateMachine_3075ContainedLinks(View view) {

-		StateMachine modelElement = (StateMachine) view.getElement();

+		StateMachine modelElement = (StateMachine)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6280,12 +6037,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getFunctionBehavior_3076ContainedLinks(View view) {

-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6293,12 +6048,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getOpaqueBehavior_3077ContainedLinks(View view) {

-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6306,12 +6059,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComponent_3081ContainedLinks(View view) {

-		Component modelElement = (Component) view.getElement();

+		Component modelElement = (Component)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6319,12 +6070,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDevice_3082ContainedLinks(View view) {

-		Device modelElement = (Device) view.getElement();

+		Device modelElement = (Device)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6332,12 +6081,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_3083ContainedLinks(View view) {

-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6345,12 +6092,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getNode_3084ContainedLinks(View view) {

-		Node modelElement = (Node) view.getElement();

+		Node modelElement = (Node)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6358,12 +6103,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getClass_3085ContainedLinks(View view) {

-		Class modelElement = (Class) view.getElement();

+		Class modelElement = (Class)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6371,12 +6114,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getCollaboration_3086ContainedLinks(View view) {

-		Collaboration modelElement = (Collaboration) view.getElement();

+		Collaboration modelElement = (Collaboration)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

-				(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6384,10 +6125,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInterface_3087ContainedLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

+		Interface modelElement = (Interface)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6395,10 +6135,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getPrimitiveType_3078ContainedLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6406,10 +6145,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getEnumeration_3079ContainedLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

+		Enumeration modelElement = (Enumeration)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6417,10 +6155,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDataType_3080ContainedLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

+		DataType modelElement = (DataType)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6428,10 +6165,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getActor_3091ContainedLinks(View view) {

-		Actor modelElement = (Actor) view.getElement();

+		Actor modelElement = (Actor)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6439,10 +6175,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_3092ContainedLinks(View view) {

-		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

+		DeploymentSpecification modelElement = (DeploymentSpecification)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6450,10 +6185,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getArtifact_3093ContainedLinks(View view) {

-		Artifact modelElement = (Artifact) view.getElement();

+		Artifact modelElement = (Artifact)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6461,12 +6195,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInformationItem_3094ContainedLinks(View view) {

-		InformationItem modelElement = (InformationItem) view.getElement();

+		InformationItem modelElement = (InformationItem)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement));

 		return result;

 	}

 

@@ -6474,10 +6206,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getSignal_3095ContainedLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

+		Signal modelElement = (Signal)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6485,10 +6216,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getUseCase_3096ContainedLinks(View view) {

-		UseCase modelElement = (UseCase) view.getElement();

+		UseCase modelElement = (UseCase)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

-				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

 		return result;

 	}

 

@@ -6496,10 +6226,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComment_3097ContainedLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

+		Comment modelElement = (Comment)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

 		return result;

 	}

 

@@ -6507,10 +6236,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDurationConstraint_3116ContainedLinks(View view) {

-		DurationConstraint modelElement = (DurationConstraint) view.getElement();

+		DurationConstraint modelElement = (DurationConstraint)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

 		return result;

 	}

 

@@ -6518,10 +6246,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeConstraint_3117ContainedLinks(View view) {

-		TimeConstraint modelElement = (TimeConstraint) view.getElement();

+		TimeConstraint modelElement = (TimeConstraint)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

 		return result;

 	}

 

@@ -6529,10 +6256,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getIntervalConstraint_3118ContainedLinks(View view) {

-		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

+		IntervalConstraint modelElement = (IntervalConstraint)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

 		return result;

 	}

 

@@ -6540,10 +6266,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInteractionConstraint_3119ContainedLinks(View view) {

-		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

+		InteractionConstraint modelElement = (InteractionConstraint)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

 		return result;

 	}

 

@@ -6551,10 +6276,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getConstraint_3120ContainedLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

+		Constraint modelElement = (Constraint)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

 		return result;

 	}

 

@@ -6674,43 +6398,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getActivity_2060IncomingLinks(View view) {

-		Activity modelElement = (Activity) view.getElement();

+		Activity modelElement = (Activity)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6718,43 +6425,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInteraction_2061IncomingLinks(View view) {

-		Interaction modelElement = (Interaction) view.getElement();

+		Interaction modelElement = (Interaction)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6762,43 +6452,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getProtocolStateMachine_2062IncomingLinks(View view) {

-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6806,43 +6479,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getStateMachine_2063IncomingLinks(View view) {

-		StateMachine modelElement = (StateMachine) view.getElement();

+		StateMachine modelElement = (StateMachine)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6850,43 +6506,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getFunctionBehavior_2064IncomingLinks(View view) {

-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6894,43 +6533,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getOpaqueBehavior_2065IncomingLinks(View view) {

-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6938,43 +6560,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComponent_2069IncomingLinks(View view) {

-		Component modelElement = (Component) view.getElement();

+		Component modelElement = (Component)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6982,43 +6587,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDevice_2070IncomingLinks(View view) {

-		Device modelElement = (Device) view.getElement();

+		Device modelElement = (Device)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7026,43 +6614,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_2071IncomingLinks(View view) {

-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7070,43 +6641,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getNode_2072IncomingLinks(View view) {

-		Node modelElement = (Node) view.getElement();

+		Node modelElement = (Node)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7114,43 +6668,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getClass_2073IncomingLinks(View view) {

-		Class modelElement = (Class) view.getElement();

+		Class modelElement = (Class)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7158,43 +6695,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getCollaboration_2075IncomingLinks(View view) {

-		Collaboration modelElement = (Collaboration) view.getElement();

+		Collaboration modelElement = (Collaboration)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7202,43 +6722,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInterface_2076IncomingLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

+		Interface modelElement = (Interface)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7246,43 +6749,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getPrimitiveType_2066IncomingLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7290,43 +6776,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getEnumeration_2067IncomingLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

+		Enumeration modelElement = (Enumeration)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7334,43 +6803,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDataType_2068IncomingLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

+		DataType modelElement = (DataType)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7378,43 +6830,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getActor_2077IncomingLinks(View view) {

-		Actor modelElement = (Actor) view.getElement();

+		Actor modelElement = (Actor)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7422,43 +6857,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_2078IncomingLinks(View view) {

-		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

+		DeploymentSpecification modelElement = (DeploymentSpecification)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7466,43 +6884,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getArtifact_2079IncomingLinks(View view) {

-		Artifact modelElement = (Artifact) view.getElement();

+		Artifact modelElement = (Artifact)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7510,43 +6911,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInformationItem_2080IncomingLinks(View view) {

-		InformationItem modelElement = (InformationItem) view.getElement();

+		InformationItem modelElement = (InformationItem)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7554,43 +6938,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getSignal_2081IncomingLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

+		Signal modelElement = (Signal)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7598,43 +6965,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getUseCase_2082IncomingLinks(View view) {

-		UseCase modelElement = (UseCase) view.getElement();

+		UseCase modelElement = (UseCase)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7642,39 +6992,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getSignalEvent_2083IncomingLinks(View view) {

-		SignalEvent modelElement = (SignalEvent) view.getElement();

+		SignalEvent modelElement = (SignalEvent)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7682,39 +7017,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getCallEvent_2084IncomingLinks(View view) {

-		CallEvent modelElement = (CallEvent) view.getElement();

+		CallEvent modelElement = (CallEvent)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7722,39 +7042,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getAnyReceiveEvent_2085IncomingLinks(View view) {

-		AnyReceiveEvent modelElement = (AnyReceiveEvent) view.getElement();

+		AnyReceiveEvent modelElement = (AnyReceiveEvent)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7762,39 +7067,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getChangeEvent_2088IncomingLinks(View view) {

-		ChangeEvent modelElement = (ChangeEvent) view.getElement();

+		ChangeEvent modelElement = (ChangeEvent)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7802,39 +7092,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeEvent_2089IncomingLinks(View view) {

-		TimeEvent modelElement = (TimeEvent) view.getElement();

+		TimeEvent modelElement = (TimeEvent)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7842,39 +7117,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDurationObservation_2093IncomingLinks(View view) {

-		DurationObservation modelElement = (DurationObservation) view.getElement();

+		DurationObservation modelElement = (DurationObservation)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7882,39 +7142,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeObservation_2094IncomingLinks(View view) {

-		TimeObservation modelElement = (TimeObservation) view.getElement();

+		TimeObservation modelElement = (TimeObservation)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7922,39 +7167,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getLiteralBoolean_2095IncomingLinks(View view) {

-		LiteralBoolean modelElement = (LiteralBoolean) view.getElement();

+		LiteralBoolean modelElement = (LiteralBoolean)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7962,39 +7192,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getLiteralInteger_2096IncomingLinks(View view) {

-		LiteralInteger modelElement = (LiteralInteger) view.getElement();

+		LiteralInteger modelElement = (LiteralInteger)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8002,39 +7217,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getLiteralNull_2097IncomingLinks(View view) {

-		LiteralNull modelElement = (LiteralNull) view.getElement();

+		LiteralNull modelElement = (LiteralNull)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8042,39 +7242,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getLiteralString_2098IncomingLinks(View view) {

-		LiteralString modelElement = (LiteralString) view.getElement();

+		LiteralString modelElement = (LiteralString)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8082,39 +7267,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getLiteralUnlimitedNatural_2099IncomingLinks(View view) {

-		LiteralUnlimitedNatural modelElement = (LiteralUnlimitedNatural) view.getElement();

+		LiteralUnlimitedNatural modelElement = (LiteralUnlimitedNatural)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8122,39 +7292,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getStringExpression_2100IncomingLinks(View view) {

-		StringExpression modelElement = (StringExpression) view.getElement();

+		StringExpression modelElement = (StringExpression)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8162,39 +7317,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getOpaqueExpression_2101IncomingLinks(View view) {

-		OpaqueExpression modelElement = (OpaqueExpression) view.getElement();

+		OpaqueExpression modelElement = (OpaqueExpression)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8202,39 +7342,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeExpression_2102IncomingLinks(View view) {

-		TimeExpression modelElement = (TimeExpression) view.getElement();

+		TimeExpression modelElement = (TimeExpression)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8242,39 +7367,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getExpression_2103IncomingLinks(View view) {

-		Expression modelElement = (Expression) view.getElement();

+		Expression modelElement = (Expression)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8282,39 +7392,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDuration_2104IncomingLinks(View view) {

-		Duration modelElement = (Duration) view.getElement();

+		Duration modelElement = (Duration)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8322,39 +7417,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeInterval_2105IncomingLinks(View view) {

-		TimeInterval modelElement = (TimeInterval) view.getElement();

+		TimeInterval modelElement = (TimeInterval)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8362,39 +7442,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDurationInterval_2106IncomingLinks(View view) {

-		DurationInterval modelElement = (DurationInterval) view.getElement();

+		DurationInterval modelElement = (DurationInterval)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8402,39 +7467,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInterval_2107IncomingLinks(View view) {

-		Interval modelElement = (Interval) view.getElement();

+		Interval modelElement = (Interval)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8442,39 +7492,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInstanceValue_2108IncomingLinks(View view) {

-		InstanceValue modelElement = (InstanceValue) view.getElement();

+		InstanceValue modelElement = (InstanceValue)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8482,13 +7517,11 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComment_2109IncomingLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

+		Comment modelElement = (Comment)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8496,39 +7529,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDurationConstraint_2110IncomingLinks(View view) {

-		DurationConstraint modelElement = (DurationConstraint) view.getElement();

+		DurationConstraint modelElement = (DurationConstraint)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8536,39 +7554,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeConstraint_2111IncomingLinks(View view) {

-		TimeConstraint modelElement = (TimeConstraint) view.getElement();

+		TimeConstraint modelElement = (TimeConstraint)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8576,39 +7579,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getIntervalConstraint_2112IncomingLinks(View view) {

-		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

+		IntervalConstraint modelElement = (IntervalConstraint)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8616,39 +7604,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInteractionConstraint_2113IncomingLinks(View view) {

-		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

+		InteractionConstraint modelElement = (InteractionConstraint)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8656,39 +7629,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getConstraint_2114IncomingLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

+		Constraint modelElement = (Constraint)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8696,39 +7654,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getPort_3069IncomingLinks(View view) {

-		Port modelElement = (Port) view.getElement();

+		Port modelElement = (Port)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8736,39 +7679,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getParameter_3088IncomingLinks(View view) {

-		Parameter modelElement = (Parameter) view.getElement();

+		Parameter modelElement = (Parameter)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8776,39 +7704,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getProperty_3070IncomingLinks(View view) {

-		Property modelElement = (Property) view.getElement();

+		Property modelElement = (Property)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8816,39 +7729,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getConnectableElement_3115IncomingLinks(View view) {

-		ConnectableElement modelElement = (ConnectableElement) view.getElement();

+		ConnectableElement modelElement = (ConnectableElement)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8856,39 +7754,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getCollaborationUse_3071IncomingLinks(View view) {

-		CollaborationUse modelElement = (CollaborationUse) view.getElement();

+		CollaborationUse modelElement = (CollaborationUse)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8896,43 +7779,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getActivity_3072IncomingLinks(View view) {

-		Activity modelElement = (Activity) view.getElement();

+		Activity modelElement = (Activity)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8940,43 +7806,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInteraction_3073IncomingLinks(View view) {

-		Interaction modelElement = (Interaction) view.getElement();

+		Interaction modelElement = (Interaction)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8984,43 +7833,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getProtocolStateMachine_3074IncomingLinks(View view) {

-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9028,43 +7860,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getStateMachine_3075IncomingLinks(View view) {

-		StateMachine modelElement = (StateMachine) view.getElement();

+		StateMachine modelElement = (StateMachine)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9072,43 +7887,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getFunctionBehavior_3076IncomingLinks(View view) {

-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9116,43 +7914,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getOpaqueBehavior_3077IncomingLinks(View view) {

-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9160,43 +7941,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComponent_3081IncomingLinks(View view) {

-		Component modelElement = (Component) view.getElement();

+		Component modelElement = (Component)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9204,43 +7968,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDevice_3082IncomingLinks(View view) {

-		Device modelElement = (Device) view.getElement();

+		Device modelElement = (Device)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9248,43 +7995,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_3083IncomingLinks(View view) {

-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9292,43 +8022,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getNode_3084IncomingLinks(View view) {

-		Node modelElement = (Node) view.getElement();

+		Node modelElement = (Node)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9336,43 +8049,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getClass_3085IncomingLinks(View view) {

-		Class modelElement = (Class) view.getElement();

+		Class modelElement = (Class)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9380,43 +8076,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getCollaboration_3086IncomingLinks(View view) {

-		Collaboration modelElement = (Collaboration) view.getElement();

+		Collaboration modelElement = (Collaboration)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9424,43 +8103,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInterface_3087IncomingLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

+		Interface modelElement = (Interface)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9468,43 +8130,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getPrimitiveType_3078IncomingLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9512,43 +8157,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getEnumeration_3079IncomingLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

+		Enumeration modelElement = (Enumeration)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9556,43 +8184,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDataType_3080IncomingLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

+		DataType modelElement = (DataType)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9600,43 +8211,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getActor_3091IncomingLinks(View view) {

-		Actor modelElement = (Actor) view.getElement();

+		Actor modelElement = (Actor)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9644,43 +8238,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_3092IncomingLinks(View view) {

-		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

+		DeploymentSpecification modelElement = (DeploymentSpecification)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9688,43 +8265,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getArtifact_3093IncomingLinks(View view) {

-		Artifact modelElement = (Artifact) view.getElement();

+		Artifact modelElement = (Artifact)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9732,43 +8292,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInformationItem_3094IncomingLinks(View view) {

-		InformationItem modelElement = (InformationItem) view.getElement();

+		InformationItem modelElement = (InformationItem)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9776,43 +8319,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getSignal_3095IncomingLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

+		Signal modelElement = (Signal)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9820,43 +8346,26 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getUseCase_3096IncomingLinks(View view) {

-		UseCase modelElement = (UseCase) view.getElement();

+		UseCase modelElement = (UseCase)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9864,13 +8373,11 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComment_3097IncomingLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

+		Comment modelElement = (Comment)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9878,39 +8385,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDurationConstraint_3116IncomingLinks(View view) {

-		DurationConstraint modelElement = (DurationConstraint) view.getElement();

+		DurationConstraint modelElement = (DurationConstraint)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9918,39 +8410,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeConstraint_3117IncomingLinks(View view) {

-		TimeConstraint modelElement = (TimeConstraint) view.getElement();

+		TimeConstraint modelElement = (TimeConstraint)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9958,39 +8435,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getIntervalConstraint_3118IncomingLinks(View view) {

-		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

+		IntervalConstraint modelElement = (IntervalConstraint)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -9998,39 +8460,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInteractionConstraint_3119IncomingLinks(View view) {

-		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

+		InteractionConstraint modelElement = (InteractionConstraint)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10038,39 +8485,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getConstraint_3120IncomingLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

+		Constraint modelElement = (Constraint)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10099,39 +8531,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComponentRealization_4004IncomingLinks(View view) {

-		ComponentRealization modelElement = (ComponentRealization) view.getElement();

+		ComponentRealization modelElement = (ComponentRealization)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10139,39 +8556,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInterfaceRealization_4005IncomingLinks(View view) {

-		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();

+		InterfaceRealization modelElement = (InterfaceRealization)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10179,39 +8581,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getSubstitution_4011IncomingLinks(View view) {

-		Substitution modelElement = (Substitution) view.getElement();

+		Substitution modelElement = (Substitution)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10219,39 +8606,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getRealization_4006IncomingLinks(View view) {

-		Realization modelElement = (Realization) view.getElement();

+		Realization modelElement = (Realization)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10259,39 +8631,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getManifestation_4012IncomingLinks(View view) {

-		Manifestation modelElement = (Manifestation) view.getElement();

+		Manifestation modelElement = (Manifestation)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10299,39 +8656,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getAbstraction_4007IncomingLinks(View view) {

-		Abstraction modelElement = (Abstraction) view.getElement();

+		Abstraction modelElement = (Abstraction)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10339,39 +8681,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getUsage_4008IncomingLinks(View view) {

-		Usage modelElement = (Usage) view.getElement();

+		Usage modelElement = (Usage)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10379,39 +8706,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDeployment_4009IncomingLinks(View view) {

-		Deployment modelElement = (Deployment) view.getElement();

+		Deployment modelElement = (Deployment)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10419,39 +8731,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDependency_4017IncomingLinks(View view) {

-		Dependency modelElement = (Dependency) view.getElement();

+		Dependency modelElement = (Dependency)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10459,39 +8756,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDependency_4010IncomingLinks(View view) {

-		Dependency modelElement = (Dependency) view.getElement();

+		Dependency modelElement = (Dependency)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10499,39 +8781,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getConnector_4013IncomingLinks(View view) {

-		Connector modelElement = (Connector) view.getElement();

+		Connector modelElement = (Connector)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10539,13 +8806,11 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getGeneralization_4015IncomingLinks(View view) {

-		Generalization modelElement = (Generalization) view.getElement();

+		Generalization modelElement = (Generalization)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10553,39 +8818,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInformationFlow_4021IncomingLinks(View view) {

-		InformationFlow modelElement = (InformationFlow) view.getElement();

+		InformationFlow modelElement = (InformationFlow)view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -10593,32 +8843,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getActivity_2060OutgoingLinks(View view) {

-		Activity modelElement = (Activity) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Activity modelElement = (Activity)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -10626,32 +8864,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInteraction_2061OutgoingLinks(View view) {

-		Interaction modelElement = (Interaction) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Interaction modelElement = (Interaction)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -10659,32 +8885,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getProtocolStateMachine_2062OutgoingLinks(View view) {

-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -10692,32 +8906,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getStateMachine_2063OutgoingLinks(View view) {

-		StateMachine modelElement = (StateMachine) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		StateMachine modelElement = (StateMachine)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -10725,32 +8927,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getFunctionBehavior_2064OutgoingLinks(View view) {

-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -10758,32 +8948,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getOpaqueBehavior_2065OutgoingLinks(View view) {

-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -10791,32 +8969,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComponent_2069OutgoingLinks(View view) {

-		Component modelElement = (Component) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Component modelElement = (Component)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -10824,32 +8990,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDevice_2070OutgoingLinks(View view) {

-		Device modelElement = (Device) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Device modelElement = (Device)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -10857,32 +9011,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_2071OutgoingLinks(View view) {

-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -10890,32 +9032,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getNode_2072OutgoingLinks(View view) {

-		Node modelElement = (Node) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Node modelElement = (Node)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -10923,32 +9053,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getClass_2073OutgoingLinks(View view) {

-		Class modelElement = (Class) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Class modelElement = (Class)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -10956,32 +9074,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getCollaboration_2075OutgoingLinks(View view) {

-		Collaboration modelElement = (Collaboration) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Collaboration modelElement = (Collaboration)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -10989,32 +9095,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInterface_2076OutgoingLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Interface modelElement = (Interface)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11022,32 +9116,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getPrimitiveType_2066OutgoingLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11055,32 +9137,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getEnumeration_2067OutgoingLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Enumeration modelElement = (Enumeration)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11088,32 +9158,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDataType_2068OutgoingLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		DataType modelElement = (DataType)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11121,32 +9179,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getActor_2077OutgoingLinks(View view) {

-		Actor modelElement = (Actor) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Actor modelElement = (Actor)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11154,32 +9200,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_2078OutgoingLinks(View view) {

-		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		DeploymentSpecification modelElement = (DeploymentSpecification)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11187,32 +9221,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getArtifact_2079OutgoingLinks(View view) {

-		Artifact modelElement = (Artifact) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Artifact modelElement = (Artifact)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11220,34 +9242,21 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInformationItem_2080OutgoingLinks(View view) {

-		InformationItem modelElement = (InformationItem) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		InformationItem modelElement = (InformationItem)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11255,32 +9264,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getSignal_2081OutgoingLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Signal modelElement = (Signal)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11288,32 +9285,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getUseCase_2082OutgoingLinks(View view) {

-		UseCase modelElement = (UseCase) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		UseCase modelElement = (UseCase)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11321,30 +9306,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getSignalEvent_2083OutgoingLinks(View view) {

-		SignalEvent modelElement = (SignalEvent) view.getElement();

+		SignalEvent modelElement = (SignalEvent)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11352,30 +9326,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getCallEvent_2084OutgoingLinks(View view) {

-		CallEvent modelElement = (CallEvent) view.getElement();

+		CallEvent modelElement = (CallEvent)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11383,30 +9346,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getAnyReceiveEvent_2085OutgoingLinks(View view) {

-		AnyReceiveEvent modelElement = (AnyReceiveEvent) view.getElement();

+		AnyReceiveEvent modelElement = (AnyReceiveEvent)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11414,30 +9366,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getChangeEvent_2088OutgoingLinks(View view) {

-		ChangeEvent modelElement = (ChangeEvent) view.getElement();

+		ChangeEvent modelElement = (ChangeEvent)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11445,30 +9386,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeEvent_2089OutgoingLinks(View view) {

-		TimeEvent modelElement = (TimeEvent) view.getElement();

+		TimeEvent modelElement = (TimeEvent)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11476,32 +9406,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDurationObservation_2093OutgoingLinks(View view) {

-		DurationObservation modelElement = (DurationObservation) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		DurationObservation modelElement = (DurationObservation)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11509,32 +9427,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeObservation_2094OutgoingLinks(View view) {

-		TimeObservation modelElement = (TimeObservation) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		TimeObservation modelElement = (TimeObservation)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11542,30 +9448,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getLiteralBoolean_2095OutgoingLinks(View view) {

-		LiteralBoolean modelElement = (LiteralBoolean) view.getElement();

+		LiteralBoolean modelElement = (LiteralBoolean)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11573,30 +9468,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getLiteralInteger_2096OutgoingLinks(View view) {

-		LiteralInteger modelElement = (LiteralInteger) view.getElement();

+		LiteralInteger modelElement = (LiteralInteger)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11604,30 +9488,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getLiteralNull_2097OutgoingLinks(View view) {

-		LiteralNull modelElement = (LiteralNull) view.getElement();

+		LiteralNull modelElement = (LiteralNull)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11635,30 +9508,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getLiteralString_2098OutgoingLinks(View view) {

-		LiteralString modelElement = (LiteralString) view.getElement();

+		LiteralString modelElement = (LiteralString)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11666,30 +9528,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getLiteralUnlimitedNatural_2099OutgoingLinks(View view) {

-		LiteralUnlimitedNatural modelElement = (LiteralUnlimitedNatural) view.getElement();

+		LiteralUnlimitedNatural modelElement = (LiteralUnlimitedNatural)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11697,30 +9548,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getStringExpression_2100OutgoingLinks(View view) {

-		StringExpression modelElement = (StringExpression) view.getElement();

+		StringExpression modelElement = (StringExpression)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11728,30 +9568,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getOpaqueExpression_2101OutgoingLinks(View view) {

-		OpaqueExpression modelElement = (OpaqueExpression) view.getElement();

+		OpaqueExpression modelElement = (OpaqueExpression)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11759,30 +9588,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeExpression_2102OutgoingLinks(View view) {

-		TimeExpression modelElement = (TimeExpression) view.getElement();

+		TimeExpression modelElement = (TimeExpression)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11790,30 +9608,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getExpression_2103OutgoingLinks(View view) {

-		Expression modelElement = (Expression) view.getElement();

+		Expression modelElement = (Expression)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11821,30 +9628,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDuration_2104OutgoingLinks(View view) {

-		Duration modelElement = (Duration) view.getElement();

+		Duration modelElement = (Duration)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11852,30 +9648,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeInterval_2105OutgoingLinks(View view) {

-		TimeInterval modelElement = (TimeInterval) view.getElement();

+		TimeInterval modelElement = (TimeInterval)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11883,30 +9668,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDurationInterval_2106OutgoingLinks(View view) {

-		DurationInterval modelElement = (DurationInterval) view.getElement();

+		DurationInterval modelElement = (DurationInterval)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11914,30 +9688,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInterval_2107OutgoingLinks(View view) {

-		Interval modelElement = (Interval) view.getElement();

+		Interval modelElement = (Interval)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11945,30 +9708,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInstanceValue_2108OutgoingLinks(View view) {

-		InstanceValue modelElement = (InstanceValue) view.getElement();

+		InstanceValue modelElement = (InstanceValue)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -11976,10 +9728,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComment_2109OutgoingLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

+		Comment modelElement = (Comment)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

 		return result;

 	}

 

@@ -11987,32 +9738,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDurationConstraint_2110OutgoingLinks(View view) {

-		DurationConstraint modelElement = (DurationConstraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		DurationConstraint modelElement = (DurationConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12020,32 +9759,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeConstraint_2111OutgoingLinks(View view) {

-		TimeConstraint modelElement = (TimeConstraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		TimeConstraint modelElement = (TimeConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12053,32 +9780,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getIntervalConstraint_2112OutgoingLinks(View view) {

-		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		IntervalConstraint modelElement = (IntervalConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12086,32 +9801,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInteractionConstraint_2113OutgoingLinks(View view) {

-		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		InteractionConstraint modelElement = (InteractionConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12119,32 +9822,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getConstraint_2114OutgoingLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Constraint modelElement = (Constraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12152,30 +9843,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getPort_3069OutgoingLinks(View view) {

-		Port modelElement = (Port) view.getElement();

+		Port modelElement = (Port)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12183,30 +9863,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getParameter_3088OutgoingLinks(View view) {

-		Parameter modelElement = (Parameter) view.getElement();

+		Parameter modelElement = (Parameter)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12214,30 +9883,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getProperty_3070OutgoingLinks(View view) {

-		Property modelElement = (Property) view.getElement();

+		Property modelElement = (Property)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12245,30 +9903,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getConnectableElement_3115OutgoingLinks(View view) {

-		ConnectableElement modelElement = (ConnectableElement) view.getElement();

+		ConnectableElement modelElement = (ConnectableElement)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12276,30 +9923,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getCollaborationUse_3071OutgoingLinks(View view) {

-		CollaborationUse modelElement = (CollaborationUse) view.getElement();

+		CollaborationUse modelElement = (CollaborationUse)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12307,32 +9943,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getActivity_3072OutgoingLinks(View view) {

-		Activity modelElement = (Activity) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Activity modelElement = (Activity)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12340,32 +9964,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInteraction_3073OutgoingLinks(View view) {

-		Interaction modelElement = (Interaction) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Interaction modelElement = (Interaction)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12373,32 +9985,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getProtocolStateMachine_3074OutgoingLinks(View view) {

-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12406,32 +10006,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getStateMachine_3075OutgoingLinks(View view) {

-		StateMachine modelElement = (StateMachine) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		StateMachine modelElement = (StateMachine)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12439,32 +10027,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getFunctionBehavior_3076OutgoingLinks(View view) {

-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12472,32 +10048,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getOpaqueBehavior_3077OutgoingLinks(View view) {

-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12505,32 +10069,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComponent_3081OutgoingLinks(View view) {

-		Component modelElement = (Component) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Component modelElement = (Component)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12538,32 +10090,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDevice_3082OutgoingLinks(View view) {

-		Device modelElement = (Device) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Device modelElement = (Device)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12571,32 +10111,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getExecutionEnvironment_3083OutgoingLinks(View view) {

-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12604,32 +10132,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getNode_3084OutgoingLinks(View view) {

-		Node modelElement = (Node) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Node modelElement = (Node)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12637,32 +10153,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getClass_3085OutgoingLinks(View view) {

-		Class modelElement = (Class) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Class modelElement = (Class)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12670,32 +10174,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getCollaboration_3086OutgoingLinks(View view) {

-		Collaboration modelElement = (Collaboration) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Collaboration modelElement = (Collaboration)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12703,32 +10195,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInterface_3087OutgoingLinks(View view) {

-		Interface modelElement = (Interface) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Interface modelElement = (Interface)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12736,32 +10216,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getPrimitiveType_3078OutgoingLinks(View view) {

-		PrimitiveType modelElement = (PrimitiveType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12769,32 +10237,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getEnumeration_3079OutgoingLinks(View view) {

-		Enumeration modelElement = (Enumeration) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Enumeration modelElement = (Enumeration)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12802,32 +10258,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDataType_3080OutgoingLinks(View view) {

-		DataType modelElement = (DataType) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		DataType modelElement = (DataType)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12835,32 +10279,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getActor_3091OutgoingLinks(View view) {

-		Actor modelElement = (Actor) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Actor modelElement = (Actor)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12868,32 +10300,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDeploymentSpecification_3092OutgoingLinks(View view) {

-		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		DeploymentSpecification modelElement = (DeploymentSpecification)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12901,32 +10321,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getArtifact_3093OutgoingLinks(View view) {

-		Artifact modelElement = (Artifact) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Artifact modelElement = (Artifact)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12934,34 +10342,21 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInformationItem_3094OutgoingLinks(View view) {

-		InformationItem modelElement = (InformationItem) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		InformationItem modelElement = (InformationItem)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -12969,32 +10364,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getSignal_3095OutgoingLinks(View view) {

-		Signal modelElement = (Signal) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Signal modelElement = (Signal)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13002,32 +10385,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getUseCase_3096OutgoingLinks(View view) {

-		UseCase modelElement = (UseCase) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		UseCase modelElement = (UseCase)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13035,10 +10406,9 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComment_3097OutgoingLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

+		Comment modelElement = (Comment)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

-				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

 		return result;

 	}

 

@@ -13046,32 +10416,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDurationConstraint_3116OutgoingLinks(View view) {

-		DurationConstraint modelElement = (DurationConstraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		DurationConstraint modelElement = (DurationConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13079,32 +10437,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getTimeConstraint_3117OutgoingLinks(View view) {

-		TimeConstraint modelElement = (TimeConstraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		TimeConstraint modelElement = (TimeConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13112,32 +10458,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getIntervalConstraint_3118OutgoingLinks(View view) {

-		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		IntervalConstraint modelElement = (IntervalConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13145,32 +10479,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInteractionConstraint_3119OutgoingLinks(View view) {

-		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		InteractionConstraint modelElement = (InteractionConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13178,32 +10500,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getConstraint_3120OutgoingLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		Constraint modelElement = (Constraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13232,30 +10542,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getComponentRealization_4004OutgoingLinks(View view) {

-		ComponentRealization modelElement = (ComponentRealization) view.getElement();

+		ComponentRealization modelElement = (ComponentRealization)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13263,30 +10562,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInterfaceRealization_4005OutgoingLinks(View view) {

-		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();

+		InterfaceRealization modelElement = (InterfaceRealization)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13294,30 +10582,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getSubstitution_4011OutgoingLinks(View view) {

-		Substitution modelElement = (Substitution) view.getElement();

+		Substitution modelElement = (Substitution)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13325,30 +10602,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getRealization_4006OutgoingLinks(View view) {

-		Realization modelElement = (Realization) view.getElement();

+		Realization modelElement = (Realization)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13356,30 +10622,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getManifestation_4012OutgoingLinks(View view) {

-		Manifestation modelElement = (Manifestation) view.getElement();

+		Manifestation modelElement = (Manifestation)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13387,30 +10642,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getAbstraction_4007OutgoingLinks(View view) {

-		Abstraction modelElement = (Abstraction) view.getElement();

+		Abstraction modelElement = (Abstraction)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13418,30 +10662,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getUsage_4008OutgoingLinks(View view) {

-		Usage modelElement = (Usage) view.getElement();

+		Usage modelElement = (Usage)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13449,30 +10682,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDeployment_4009OutgoingLinks(View view) {

-		Deployment modelElement = (Deployment) view.getElement();

+		Deployment modelElement = (Deployment)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13480,30 +10702,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDependency_4017OutgoingLinks(View view) {

-		Dependency modelElement = (Dependency) view.getElement();

+		Dependency modelElement = (Dependency)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13511,30 +10722,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getDependency_4010OutgoingLinks(View view) {

-		Dependency modelElement = (Dependency) view.getElement();

+		Dependency modelElement = (Dependency)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13542,30 +10742,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getConnector_4013OutgoingLinks(View view) {

-		Connector modelElement = (Connector) view.getElement();

+		Connector modelElement = (Connector)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13580,30 +10769,19 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	public List<UMLLinkDescriptor> getInformationFlow_4021OutgoingLinks(View view) {

-		InformationFlow modelElement = (InformationFlow) view.getElement();

+		InformationFlow modelElement = (InformationFlow)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

-				(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

-				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

 		return result;

 	}

 

@@ -13612,28 +10790,27 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ComponentRealization_4004(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof ComponentRealization) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof ComponentRealization) {

 				continue;

 			}

-			ComponentRealization link = (ComponentRealization) linkObject;

-			if (ComponentRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			ComponentRealization link = (ComponentRealization)linkObject;

+			if(ComponentRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_4004, ComponentRealizationEditPart.VISUAL_ID));

 		}

 		return result;

@@ -13644,28 +10821,27 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InterfaceRealization_4005(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof InterfaceRealization) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof InterfaceRealization) {

 				continue;

 			}

-			InterfaceRealization link = (InterfaceRealization) linkObject;

-			if (InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			InterfaceRealization link = (InterfaceRealization)linkObject;

+			if(InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_4005, InterfaceRealizationEditPart.VISUAL_ID));

 		}

 		return result;

@@ -13676,28 +10852,27 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Substitution_4011(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Substitution) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Substitution) {

 				continue;

 			}

-			Substitution link = (Substitution) linkObject;

-			if (SubstitutionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Substitution link = (Substitution)linkObject;

+			if(SubstitutionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_4011, SubstitutionEditPart.VISUAL_ID));

 		}

 		return result;

@@ -13708,28 +10883,27 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Realization_4006(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Realization) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Realization) {

 				continue;

 			}

-			Realization link = (Realization) linkObject;

-			if (RealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Realization link = (Realization)linkObject;

+			if(RealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_4006, RealizationEditPart.VISUAL_ID));

 		}

 		return result;

@@ -13740,28 +10914,27 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Manifestation_4012(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Manifestation) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Manifestation) {

 				continue;

 			}

-			Manifestation link = (Manifestation) linkObject;

-			if (ManifestationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Manifestation link = (Manifestation)linkObject;

+			if(ManifestationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_4012, ManifestationEditPart.VISUAL_ID));

 		}

 		return result;

@@ -13772,28 +10945,27 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Abstraction_4007(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Abstraction) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Abstraction) {

 				continue;

 			}

-			Abstraction link = (Abstraction) linkObject;

-			if (AbstractionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Abstraction link = (Abstraction)linkObject;

+			if(AbstractionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_4007, AbstractionEditPart.VISUAL_ID));

 		}

 		return result;

@@ -13804,28 +10976,27 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Usage_4008(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Usage) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Usage) {

 				continue;

 			}

-			Usage link = (Usage) linkObject;

-			if (UsageEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Usage link = (Usage)linkObject;

+			if(UsageEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_4008, UsageEditPart.VISUAL_ID));

 		}

 		return result;

@@ -13836,28 +11007,27 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Deployment_4009(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Deployment) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Deployment) {

 				continue;

 			}

-			Deployment link = (Deployment) linkObject;

-			if (DeploymentEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Deployment link = (Deployment)linkObject;

+			if(DeploymentEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Deployment_4009, DeploymentEditPart.VISUAL_ID));

 		}

 		return result;

@@ -13868,28 +11038,27 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_4017(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Dependency) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Dependency) {

 				continue;

 			}

-			Dependency link = (Dependency) linkObject;

-			if (RoleBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Dependency link = (Dependency)linkObject;

+			if(RoleBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4017, RoleBindingEditPart.VISUAL_ID));

 		}

 		return result;

@@ -13900,28 +11069,27 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_4010(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Dependency) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Dependency) {

 				continue;

 			}

-			Dependency link = (Dependency) linkObject;

-			if (DependencyEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Dependency link = (Dependency)linkObject;

+			if(DependencyEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4010, DependencyEditPart.VISUAL_ID));

 		}

 		return result;

@@ -13932,28 +11100,27 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Connector_4013(StructuredClassifier container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getOwnedConnectors()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Connector) {

+		for(Iterator<?> links = container.getOwnedConnectors().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Connector) {

 				continue;

 			}

-			Connector link = (Connector) linkObject;

-			if (ConnectorEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Connector link = (Connector)linkObject;

+			if(ConnectorEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getEnds();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof ConnectorEnd) {

+			if(false == theTarget instanceof ConnectorEnd) {

 				continue;

 			}

-			ConnectorEnd dst = (ConnectorEnd) theTarget;

+			ConnectorEnd dst = (ConnectorEnd)theTarget;

 			List<?> sources = link.getEnds();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof ConnectorEnd) {

+			if(false == theSource instanceof ConnectorEnd) {

 				continue;

 			}

-			ConnectorEnd src = (ConnectorEnd) theSource;

+			ConnectorEnd src = (ConnectorEnd)theSource;

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Connector_4013, ConnectorEditPart.VISUAL_ID));

 		}

 		return result;

@@ -13964,14 +11131,13 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_4015(Classifier container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getGeneralizations()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Generalization) {

+		for(Iterator<?> links = container.getGeneralizations().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Generalization) {

 				continue;

 			}

-			Generalization link = (Generalization) linkObject;

-			if (GeneralizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Generalization link = (Generalization)linkObject;

+			if(GeneralizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			Classifier dst = link.getGeneral();

@@ -13986,28 +11152,27 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InformationFlow_4021(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof InformationFlow) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof InformationFlow) {

 				continue;

 			}

-			InformationFlow link = (InformationFlow) linkObject;

-			if (InformationFlowEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			InformationFlow link = (InformationFlow)linkObject;

+			if(InformationFlowEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getInformationTargets();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getInformationSources();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_4021, InformationFlowEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14019,8 +11184,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(Element target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {

 				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.CommentAnnotatedElement_4002, CommentAnnotatedElementEditPart.VISUAL_ID));

 			}

 		}

@@ -14033,8 +11198,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(Element target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {

 				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.ConstraintConstrainedElement_4003, ConstraintConstrainedElementEditPart.VISUAL_ID));

 			}

 		}

@@ -14047,20 +11212,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_ComponentRealization_4004(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof ComponentRealization) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof ComponentRealization) {

 				continue;

 			}

-			ComponentRealization link = (ComponentRealization) setting.getEObject();

-			if (ComponentRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			ComponentRealization link = (ComponentRealization)setting.getEObject();

+			if(ComponentRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.ComponentRealization_4004, ComponentRealizationEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14072,20 +11237,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_4005(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof InterfaceRealization) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof InterfaceRealization) {

 				continue;

 			}

-			InterfaceRealization link = (InterfaceRealization) setting.getEObject();

-			if (InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			InterfaceRealization link = (InterfaceRealization)setting.getEObject();

+			if(InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InterfaceRealization_4005, InterfaceRealizationEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14097,20 +11262,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Substitution_4011(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Substitution) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Substitution) {

 				continue;

 			}

-			Substitution link = (Substitution) setting.getEObject();

-			if (SubstitutionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Substitution link = (Substitution)setting.getEObject();

+			if(SubstitutionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Substitution_4011, SubstitutionEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14122,20 +11287,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Realization_4006(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Realization) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Realization) {

 				continue;

 			}

-			Realization link = (Realization) setting.getEObject();

-			if (RealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Realization link = (Realization)setting.getEObject();

+			if(RealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Realization_4006, RealizationEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14147,20 +11312,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Manifestation_4012(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Manifestation) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Manifestation) {

 				continue;

 			}

-			Manifestation link = (Manifestation) setting.getEObject();

-			if (ManifestationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Manifestation link = (Manifestation)setting.getEObject();

+			if(ManifestationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Manifestation_4012, ManifestationEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14172,20 +11337,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Abstraction_4007(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Abstraction) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Abstraction) {

 				continue;

 			}

-			Abstraction link = (Abstraction) setting.getEObject();

-			if (AbstractionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Abstraction link = (Abstraction)setting.getEObject();

+			if(AbstractionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Abstraction_4007, AbstractionEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14197,20 +11362,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Usage_4008(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Usage) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Usage) {

 				continue;

 			}

-			Usage link = (Usage) setting.getEObject();

-			if (UsageEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Usage link = (Usage)setting.getEObject();

+			if(UsageEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Usage_4008, UsageEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14222,20 +11387,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Deployment_4009(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Deployment) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Deployment) {

 				continue;

 			}

-			Deployment link = (Deployment) setting.getEObject();

-			if (DeploymentEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Deployment link = (Deployment)setting.getEObject();

+			if(DeploymentEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Deployment_4009, DeploymentEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14247,20 +11412,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_4017(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

 				continue;

 			}

-			Dependency link = (Dependency) setting.getEObject();

-			if (RoleBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Dependency link = (Dependency)setting.getEObject();

+			if(RoleBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_4017, RoleBindingEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14272,20 +11437,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_4010(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

 				continue;

 			}

-			Dependency link = (Dependency) setting.getEObject();

-			if (DependencyEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Dependency link = (Dependency)setting.getEObject();

+			if(DependencyEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_4010, DependencyEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14297,12 +11462,12 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_4015(Classifier target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General() || false == setting.getEObject() instanceof Generalization) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General() || false == setting.getEObject() instanceof Generalization) {

 				continue;

 			}

-			Generalization link = (Generalization) setting.getEObject();

-			if (GeneralizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Generalization link = (Generalization)setting.getEObject();

+			if(GeneralizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			Classifier src = link.getSpecific();

@@ -14317,8 +11482,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getTimeObservation_Event()) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getTimeObservation_Event()) {

 				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.TimeObservationEvent_4018, TimeObservationEventEditPart.VISUAL_ID));

 			}

 		}

@@ -14331,8 +11496,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getDurationObservation_Event()) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getDurationObservation_Event()) {

 				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.DurationObservationEvent_4019, DurationObservationEventEditPart.VISUAL_ID));

 			}

 		}

@@ -14345,8 +11510,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(Classifier target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getInformationItem_Represented()) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getInformationItem_Represented()) {

 				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.InformationItemRepresented_4020, RepresentationEditPart.VISUAL_ID));

 			}

 		}

@@ -14359,20 +11524,20 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InformationFlow_4021(NamedElement target, CrossReferenceAdapter crossReferencer) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInformationFlow_InformationTarget() || false == setting.getEObject() instanceof InformationFlow) {

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInformationFlow_InformationTarget() || false == setting.getEObject() instanceof InformationFlow) {

 				continue;

 			}

-			InformationFlow link = (InformationFlow) setting.getEObject();

-			if (InformationFlowEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			InformationFlow link = (InformationFlow)setting.getEObject();

+			if(InformationFlowEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> sources = link.getInformationSources();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

+			NamedElement src = (NamedElement)theSource;

 			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InformationFlow_4021, InformationFlowEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14383,9 +11548,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(Comment source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> destinations = source.getAnnotatedElements()

-				.iterator(); destinations.hasNext();) {

-			Element destination = (Element) destinations.next();

+		for(Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {

+			Element destination = (Element)destinations.next();

 			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.CommentAnnotatedElement_4002, CommentAnnotatedElementEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14396,9 +11560,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(Constraint source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> destinations = source.getConstrainedElements()

-				.iterator(); destinations.hasNext();) {

-			Element destination = (Element) destinations.next();

+		for(Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {

+			Element destination = (Element)destinations.next();

 			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.ConstraintConstrainedElement_4003, ConstraintConstrainedElementEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14412,38 +11575,37 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				container = (Package) element;

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

 			}

 		}

-		if (container == null) {

+		if(container == null) {

 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof ComponentRealization) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof ComponentRealization) {

 				continue;

 			}

-			ComponentRealization link = (ComponentRealization) linkObject;

-			if (ComponentRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			ComponentRealization link = (ComponentRealization)linkObject;

+			if(ComponentRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

-			if (src != source) {

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_4004, ComponentRealizationEditPart.VISUAL_ID));

@@ -14459,38 +11621,37 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				container = (Package) element;

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

 			}

 		}

-		if (container == null) {

+		if(container == null) {

 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof InterfaceRealization) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof InterfaceRealization) {

 				continue;

 			}

-			InterfaceRealization link = (InterfaceRealization) linkObject;

-			if (InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			InterfaceRealization link = (InterfaceRealization)linkObject;

+			if(InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

-			if (src != source) {

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_4005, InterfaceRealizationEditPart.VISUAL_ID));

@@ -14506,38 +11667,37 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				container = (Package) element;

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

 			}

 		}

-		if (container == null) {

+		if(container == null) {

 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Substitution) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Substitution) {

 				continue;

 			}

-			Substitution link = (Substitution) linkObject;

-			if (SubstitutionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Substitution link = (Substitution)linkObject;

+			if(SubstitutionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

-			if (src != source) {

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_4011, SubstitutionEditPart.VISUAL_ID));

@@ -14553,38 +11713,37 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				container = (Package) element;

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

 			}

 		}

-		if (container == null) {

+		if(container == null) {

 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Realization) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Realization) {

 				continue;

 			}

-			Realization link = (Realization) linkObject;

-			if (RealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Realization link = (Realization)linkObject;

+			if(RealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

-			if (src != source) {

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_4006, RealizationEditPart.VISUAL_ID));

@@ -14600,38 +11759,37 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				container = (Package) element;

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

 			}

 		}

-		if (container == null) {

+		if(container == null) {

 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Manifestation) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Manifestation) {

 				continue;

 			}

-			Manifestation link = (Manifestation) linkObject;

-			if (ManifestationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Manifestation link = (Manifestation)linkObject;

+			if(ManifestationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

-			if (src != source) {

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_4012, ManifestationEditPart.VISUAL_ID));

@@ -14647,38 +11805,37 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				container = (Package) element;

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

 			}

 		}

-		if (container == null) {

+		if(container == null) {

 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Abstraction) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Abstraction) {

 				continue;

 			}

-			Abstraction link = (Abstraction) linkObject;

-			if (AbstractionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Abstraction link = (Abstraction)linkObject;

+			if(AbstractionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

-			if (src != source) {

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_4007, AbstractionEditPart.VISUAL_ID));

@@ -14694,38 +11851,37 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				container = (Package) element;

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

 			}

 		}

-		if (container == null) {

+		if(container == null) {

 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Usage) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Usage) {

 				continue;

 			}

-			Usage link = (Usage) linkObject;

-			if (UsageEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Usage link = (Usage)linkObject;

+			if(UsageEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

-			if (src != source) {

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_4008, UsageEditPart.VISUAL_ID));

@@ -14741,38 +11897,37 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				container = (Package) element;

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

 			}

 		}

-		if (container == null) {

+		if(container == null) {

 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Deployment) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Deployment) {

 				continue;

 			}

-			Deployment link = (Deployment) linkObject;

-			if (DeploymentEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Deployment link = (Deployment)linkObject;

+			if(DeploymentEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

-			if (src != source) {

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Deployment_4009, DeploymentEditPart.VISUAL_ID));

@@ -14788,38 +11943,37 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				container = (Package) element;

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

 			}

 		}

-		if (container == null) {

+		if(container == null) {

 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Dependency) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Dependency) {

 				continue;

 			}

-			Dependency link = (Dependency) linkObject;

-			if (RoleBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Dependency link = (Dependency)linkObject;

+			if(RoleBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

-			if (src != source) {

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4017, RoleBindingEditPart.VISUAL_ID));

@@ -14835,38 +11989,37 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				container = (Package) element;

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

 			}

 		}

-		if (container == null) {

+		if(container == null) {

 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Dependency) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Dependency) {

 				continue;

 			}

-			Dependency link = (Dependency) linkObject;

-			if (DependencyEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Dependency link = (Dependency)linkObject;

+			if(DependencyEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getSuppliers();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getClients();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

-			if (src != source) {

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4010, DependencyEditPart.VISUAL_ID));

@@ -14882,28 +12035,27 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if (element instanceof Classifier) {

-				container = (Classifier) element;

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Classifier) {

+				container = (Classifier)element;

 			}

 		}

-		if (container == null) {

+		if(container == null) {

 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getGeneralizations()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Generalization) {

+		for(Iterator<?> links = container.getGeneralizations().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Generalization) {

 				continue;

 			}

-			Generalization link = (Generalization) linkObject;

-			if (GeneralizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			Generalization link = (Generalization)linkObject;

+			if(GeneralizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			Classifier dst = link.getGeneral();

 			Classifier src = link.getSpecific();

-			if (src != source) {

+			if(src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Generalization_4015, GeneralizationEditPart.VISUAL_ID));

@@ -14917,7 +12069,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018(TimeObservation source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		NamedElement destination = source.getEvent();

-		if (destination == null) {

+		if(destination == null) {

 			return result;

 		}

 		result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.TimeObservationEvent_4018, TimeObservationEventEditPart.VISUAL_ID));

@@ -14929,9 +12081,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019(DurationObservation source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> destinations = source.getEvents()

-				.iterator(); destinations.hasNext();) {

-			NamedElement destination = (NamedElement) destinations.next();

+		for(Iterator<?> destinations = source.getEvents().iterator(); destinations.hasNext();) {

+			NamedElement destination = (NamedElement)destinations.next();

 			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.DurationObservationEvent_4019, DurationObservationEventEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14942,9 +12093,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(InformationItem source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> destinations = source.getRepresenteds()

-				.iterator(); destinations.hasNext();) {

-			Classifier destination = (Classifier) destinations.next();

+		for(Iterator<?> destinations = source.getRepresenteds().iterator(); destinations.hasNext();) {

+			Classifier destination = (Classifier)destinations.next();

 			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.InformationItemRepresented_4020, RepresentationEditPart.VISUAL_ID));

 		}

 		return result;

@@ -14958,38 +12108,37 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		// Find container element for the link.

 		// Climb up by containment hierarchy starting from the source

 		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				container = (Package) element;

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

 			}

 		}

-		if (container == null) {

+		if(container == null) {

 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements()

-				.iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof InformationFlow) {

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof InformationFlow) {

 				continue;

 			}

-			InformationFlow link = (InformationFlow) linkObject;

-			if (InformationFlowEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+			InformationFlow link = (InformationFlow)linkObject;

+			if(InformationFlowEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

 				continue;

 			}

 			List<?> targets = link.getInformationTargets();

 			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

+			if(false == theTarget instanceof NamedElement) {

 				continue;

 			}

-			NamedElement dst = (NamedElement) theTarget;

+			NamedElement dst = (NamedElement)theTarget;

 			List<?> sources = link.getInformationSources();

 			Object theSource = sources.size() == 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

+			if(false == theSource instanceof NamedElement) {

 				continue;

 			}

-			NamedElement src = (NamedElement) theSource;

-			if (src != source) {

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

 				continue;

 			}

 			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_4021, InformationFlowEditPart.VISUAL_ID));

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java
index 1039b1e7238..cd62145d240 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -73,18 +73,13 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected ElementInfo createElementInfo(Object element) throws CoreException {

-		if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) {

-			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

-					NLS.bind(

-							Messages.UMLDocumentProvider_IncorrectInputError,

-							new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$

-					null));

+		if(false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) {

+			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[]{ element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 

+			null));

 		}

-		IEditorInput editorInput = (IEditorInput) element;

-		IDiagramDocument document = (IDiagramDocument) createDocument(editorInput);

-

+		IEditorInput editorInput = (IEditorInput)element;

+		IDiagramDocument document = (IDiagramDocument)createDocument(editorInput);

 		ResourceSetInfo info = new ResourceSetInfo(document, editorInput);

 		info.setModificationStamp(computeModificationStamp(info));

 		info.fStatus = null;

@@ -94,17 +89,13 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IDocument createDocument(Object element) throws CoreException {

-		if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) {

-			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

-					NLS.bind(

-							Messages.UMLDocumentProvider_IncorrectInputError,

-							new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$

-					null));

+		if(false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) {

+			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[]{ element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 

+			null));

 		}

 		IDocument document = createEmptyDocument();

-		setDocumentContent(document, (IEditorInput) element);

+		setDocumentContent(document, (IEditorInput)element);

 		setupDocument(element, document);

 		return document;

 	}

@@ -113,11 +104,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 * Sets up the given document as it would be provided for the given element. The

 	 * content of the document is not changed. This default implementation is empty.

 	 * Subclasses may reimplement.

-	 *

-	 * @param element

-	 *            the blue-print element

-	 * @param document

-	 *            the document to set up

+	 * 

+	 * @param element the blue-print element

+	 * @param document the document to set up

 	 * @generated

 	 */

 	protected void setupDocument(Object element, IDocument document) {

@@ -129,11 +118,11 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 */

 	private long computeModificationStamp(ResourceSetInfo info) {

 		int result = 0;

-		for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+		for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 			Resource nextResource = it.next();

 			IFile file = WorkspaceSynchronizer.getFile(nextResource);

-			if (file != null) {

-				if (file.getLocation() != null) {

+			if(file != null) {

+				if(file.getLocation() != null) {

 					result += file.getLocation().toFile().lastModified();

 				} else {

 					result += file.getModificationStamp();

@@ -146,7 +135,6 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IDocument createEmptyDocument() {

 		DiagramDocument document = new DiagramDocument();

 		document.setEditingDomain(createEditingDomain());

@@ -159,8 +147,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	private TransactionalEditingDomain createEditingDomain() {

 		TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();

 		editingDomain.setID("org.eclipse.papyrus.uml.diagram.composite.EditingDomain"); //$NON-NLS-1$

-		final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet()).and(NotificationFilter.createEventTypeFilter(Notification.ADD))

-				.and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));

+		final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet()).and(NotificationFilter.createEventTypeFilter(Notification.ADD)).and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));

 		editingDomain.getResourceSet().eAdapters().add(new Adapter() {

 

 			private Notifier myTarger;

@@ -177,10 +164,10 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 

 			@Override

 			public void notifyChanged(Notification notification) {

-				if (diagramResourceModifiedFilter.matches(notification)) {

+				if(diagramResourceModifiedFilter.matches(notification)) {

 					Object value = notification.getNewValue();

-					if (value instanceof Resource) {

-						((Resource) value).setTrackingModification(true);

+					if(value instanceof Resource) {

+						((Resource)value).setTrackingModification(true);

 					}

 				}

 			}

@@ -189,9 +176,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 			public void setTarget(Notifier newTarget) {

 				myTarger = newTarget;

 			}

-

 		});

-

 		return editingDomain;

 	}

 

@@ -199,25 +184,25 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 * @generated

 	 */

 	protected void setDocumentContent(IDocument document, IEditorInput element) throws CoreException {

-		IDiagramDocument diagramDocument = (IDiagramDocument) document;

+		IDiagramDocument diagramDocument = (IDiagramDocument)document;

 		TransactionalEditingDomain domain = diagramDocument.getEditingDomain();

-		if (element instanceof FileEditorInput) {

-			IStorage storage = ((FileEditorInput) element).getStorage();

+		if(element instanceof FileEditorInput) {

+			IStorage storage = ((FileEditorInput)element).getStorage();

 			Diagram diagram = DiagramIOUtil.load(domain, storage, true, getProgressMonitor());

 			document.setContent(diagram);

-		} else if (element instanceof URIEditorInput) {

-			URI uri = ((URIEditorInput) element).getURI();

+		} else if(element instanceof URIEditorInput) {

+			URI uri = ((URIEditorInput)element).getURI();

 			Resource resource = null;

 			try {

 				resource = domain.getResourceSet().getResource(uri.trimFragment(), false);

-				if (resource == null) {

+				if(resource == null) {

 					resource = domain.getResourceSet().createResource(uri.trimFragment());

 				}

-				if (!resource.isLoaded()) {

+				if(!resource.isLoaded()) {

 					try {

 						@SuppressWarnings({ "rawtypes", "unchecked" })

 						Map<?, ?> options = new HashMap(GMFResourceFactory.getDefaultLoadOptions());

-						// @see 171060

+						// @see 171060 

 						// options.put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);

 						resource.load(options);

 					} catch (IOException e) {

@@ -225,16 +210,16 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 						throw e;

 					}

 				}

-				if (uri.fragment() != null) {

+				if(uri.fragment() != null) {

 					EObject rootElement = resource.getEObject(uri.fragment());

-					if (rootElement instanceof Diagram) {

+					if(rootElement instanceof Diagram) {

 						document.setContent(rootElement);

 						return;

 					}

 				} else {

-					for (Iterator<EObject> it = resource.getContents().iterator(); it.hasNext();) {

+					for(Iterator<EObject> it = resource.getContents().iterator(); it.hasNext();) {

 						Object rootElement = it.next();

-						if (rootElement instanceof Diagram) {

+						if(rootElement instanceof Diagram) {

 							document.setContent(rootElement);

 							return;

 						}

@@ -243,31 +228,26 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 				throw new RuntimeException(Messages.UMLDocumentProvider_NoDiagramInResourceError);

 			} catch (Exception e) {

 				CoreException thrownExcp = null;

-				if (e instanceof CoreException) {

-					thrownExcp = (CoreException) e;

+				if(e instanceof CoreException) {

+					thrownExcp = (CoreException)e;

 				} else {

 					String msg = e.getLocalizedMessage();

-					thrownExcp = new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

-							msg != null ? msg : Messages.UMLDocumentProvider_DiagramLoadingError, e));

+					thrownExcp = new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, msg != null ? msg : Messages.UMLDocumentProvider_DiagramLoadingError, e));

 				}

 				throw thrownExcp;

 			}

 		} else {

-			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

-					NLS.bind(

-							Messages.UMLDocumentProvider_IncorrectInputError,

-							new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$

-					null));

+			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[]{ element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 

+			null));

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public long getModificationStamp(Object element) {

 		ResourceSetInfo info = getResourceSetInfo(element);

-		if (info != null) {

+		if(info != null) {

 			return computeModificationStamp(info);

 		}

 		return super.getModificationStamp(element);

@@ -276,12 +256,11 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	public boolean isDeleted(Object element) {

 		IDiagramDocument document = getDiagramDocument(element);

-		if (document != null) {

+		if(document != null) {

 			Resource diagramResource = document.getDiagram().eResource();

-			if (diagramResource != null) {

+			if(diagramResource != null) {

 				IFile file = WorkspaceSynchronizer.getFile(diagramResource);

 				return file == null || file.getLocation() == null || !file.getLocation().toFile().exists();

 			}

@@ -293,16 +272,15 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 * @generated

 	 */

 	public ResourceSetInfo getResourceSetInfo(Object editorInput) {

-		return (ResourceSetInfo) super.getElementInfo(editorInput);

+		return (ResourceSetInfo)super.getElementInfo(editorInput);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void disposeElementInfo(Object element, ElementInfo info) {

-		if (info instanceof ResourceSetInfo) {

-			ResourceSetInfo resourceSetInfo = (ResourceSetInfo) info;

+		if(info instanceof ResourceSetInfo) {

+			ResourceSetInfo resourceSetInfo = (ResourceSetInfo)info;

 			resourceSetInfo.dispose();

 		}

 		super.disposeElementInfo(element, info);

@@ -311,32 +289,29 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void doValidateState(Object element, Object computationContext) throws CoreException {

 		ResourceSetInfo info = getResourceSetInfo(element);

-		if (info != null) {

+		if(info != null) {

 			LinkedList<IFile> files2Validate = new LinkedList<IFile>();

-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 				Resource nextResource = it.next();

 				IFile file = WorkspaceSynchronizer.getFile(nextResource);

-				if (file != null && file.isReadOnly()) {

+				if(file != null && file.isReadOnly()) {

 					files2Validate.add(file);

 				}

 			}

 			ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]), computationContext);

 		}

-

 		super.doValidateState(element, computationContext);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public boolean isReadOnly(Object element) {

 		ResourceSetInfo info = getResourceSetInfo(element);

-		if (info != null) {

-			if (info.isUpdateCache()) {

+		if(info != null) {

+			if(info.isUpdateCache()) {

 				try {

 					updateCache(element);

 				} catch (CoreException ex) {

@@ -352,16 +327,15 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	public boolean isModifiable(Object element) {

-		if (!isStateValidated(element)) {

-			if (element instanceof FileEditorInput || element instanceof URIEditorInput) {

+		if(!isStateValidated(element)) {

+			if(element instanceof FileEditorInput || element instanceof URIEditorInput) {

 				return true;

 			}

 		}

 		ResourceSetInfo info = getResourceSetInfo(element);

-		if (info != null) {

-			if (info.isUpdateCache()) {

+		if(info != null) {

+			if(info.isUpdateCache()) {

 				try {

 					updateCache(element);

 				} catch (CoreException ex) {

@@ -379,11 +353,11 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 */

 	protected void updateCache(Object element) throws CoreException {

 		ResourceSetInfo info = getResourceSetInfo(element);

-		if (info != null) {

-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+		if(info != null) {

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 				Resource nextResource = it.next();

 				IFile file = WorkspaceSynchronizer.getFile(nextResource);

-				if (file != null && file.isReadOnly()) {

+				if(file != null && file.isReadOnly()) {

 					info.setReadOnly(true);

 					info.setModifiable(false);

 					return;

@@ -398,10 +372,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void doUpdateStateCache(Object element) throws CoreException {

 		ResourceSetInfo info = getResourceSetInfo(element);

-		if (info != null) {

+		if(info != null) {

 			info.setUpdateCache(true);

 		}

 		super.doUpdateStateCache(element);

@@ -410,10 +383,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	public boolean isSynchronized(Object element) {

 		ResourceSetInfo info = getResourceSetInfo(element);

-		if (info != null) {

+		if(info != null) {

 			return info.isSynchronized();

 		}

 		return super.isSynchronized(element);

@@ -422,15 +394,14 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected ISchedulingRule getResetRule(Object element) {

 		ResourceSetInfo info = getResourceSetInfo(element);

-		if (info != null) {

+		if(info != null) {

 			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 				Resource nextResource = it.next();

 				IFile file = WorkspaceSynchronizer.getFile(nextResource);

-				if (file != null) {

+				if(file != null) {

 					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(file));

 				}

 			}

@@ -442,15 +413,14 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected ISchedulingRule getSaveRule(Object element) {

 		ResourceSetInfo info = getResourceSetInfo(element);

-		if (info != null) {

+		if(info != null) {

 			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 				Resource nextResource = it.next();

 				IFile file = WorkspaceSynchronizer.getFile(nextResource);

-				if (file != null) {

+				if(file != null) {

 					rules.add(computeSchedulingRule(file));

 				}

 			}

@@ -462,15 +432,14 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected ISchedulingRule getSynchronizeRule(Object element) {

 		ResourceSetInfo info = getResourceSetInfo(element);

-		if (info != null) {

+		if(info != null) {

 			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 				Resource nextResource = it.next();

 				IFile file = WorkspaceSynchronizer.getFile(nextResource);

-				if (file != null) {

+				if(file != null) {

 					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().refreshRule(file));

 				}

 			}

@@ -482,15 +451,14 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected ISchedulingRule getValidateStateRule(Object element) {

 		ResourceSetInfo info = getResourceSetInfo(element);

-		if (info != null) {

+		if(info != null) {

 			LinkedList<ISchedulingRule> files = new LinkedList<ISchedulingRule>();

-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 				Resource nextResource = it.next();

 				IFile file = WorkspaceSynchronizer.getFile(nextResource);

-				if (file != null) {

+				if(file != null) {

 					files.add(file);

 				}

 			}

@@ -503,7 +471,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 * @generated

 	 */

 	private ISchedulingRule computeSchedulingRule(IResource toCreateOrModify) {

-		if (toCreateOrModify.exists()) {

+		if(toCreateOrModify.exists()) {

 			return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(toCreateOrModify);

 		}

 		IResource parent = toCreateOrModify;

@@ -516,19 +484,17 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 			 */

 			toCreateOrModify = parent;

 			parent = toCreateOrModify.getParent();

-		} while (parent != null && !parent.exists());

-

+		} while(parent != null && !parent.exists());

 		return ResourcesPlugin.getWorkspace().getRuleFactory().createRule(toCreateOrModify);

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	protected void doSynchronize(Object element, IProgressMonitor monitor) throws CoreException {

 		ResourceSetInfo info = getResourceSetInfo(element);

-		if (info != null) {

-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+		if(info != null) {

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 				Resource nextResource = it.next();

 				handleElementChanged(info, nextResource, monitor);

 			}

@@ -540,26 +506,20 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException {

 		ResourceSetInfo info = getResourceSetInfo(element);

-		if (info != null) {

-			if (!overwrite && !info.isSynchronized()) {

-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID,

-						IResourceStatus.OUT_OF_SYNC_LOCAL,

-						Messages.UMLDocumentProvider_UnsynchronizedFileSaveError,

-						null));

+		if(info != null) {

+			if(!overwrite && !info.isSynchronized()) {

+				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, IResourceStatus.OUT_OF_SYNC_LOCAL, Messages.UMLDocumentProvider_UnsynchronizedFileSaveError, null));

 			}

 			info.stopResourceListening();

 			fireElementStateChanging(element);

 			try {

-				monitor.beginTask(Messages.UMLDocumentProvider_SaveDiagramTask, info.getResourceSet().getResources().size() + 1); // "Saving diagram"

-				for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				monitor.beginTask(Messages.UMLDocumentProvider_SaveDiagramTask, info.getResourceSet().getResources().size() + 1); //"Saving diagram"

+				for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 					Resource nextResource = it.next();

-					monitor.setTaskName(NLS.bind(

-							Messages.UMLDocumentProvider_SaveNextResourceTask,

-							nextResource.getURI()));

-					if (nextResource.isLoaded() && !info.getEditingDomain().isReadOnly(nextResource)) {

+					monitor.setTaskName(NLS.bind(Messages.UMLDocumentProvider_SaveNextResourceTask, nextResource.getURI()));

+					if(nextResource.isLoaded() && !info.getEditingDomain().isReadOnly(nextResource)) {

 						try {

 							nextResource.save(UMLDiagramEditorUtil.getSaveOptions());

 						} catch (IOException e) {

@@ -580,30 +540,27 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 		} else {

 			URI newResoruceURI;

 			List<IFile> affectedFiles = null;

-			if (element instanceof FileEditorInput) {

-				IFile newFile = ((FileEditorInput) element).getFile();

+			if(element instanceof FileEditorInput) {

+				IFile newFile = ((FileEditorInput)element).getFile();

 				affectedFiles = Collections.singletonList(newFile);

 				newResoruceURI = URI.createPlatformResourceURI(newFile.getFullPath().toString(), true);

-			} else if (element instanceof URIEditorInput) {

-				newResoruceURI = ((URIEditorInput) element).getURI();

+			} else if(element instanceof URIEditorInput) {

+				newResoruceURI = ((URIEditorInput)element).getURI();

 			} else {

 				fireElementStateChangeFailed(element);

-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

-						NLS.bind(

-								Messages.UMLDocumentProvider_IncorrectInputError,

-								new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$

-						null));

+				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[]{ element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 

+				null));

 			}

-			if (false == document instanceof IDiagramDocument) {

+			if(false == document instanceof IDiagramDocument) {

 				fireElementStateChangeFailed(element);

-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

-						"Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null)); //$NON-NLS-1$ //$NON-NLS-2$

+				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, "Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null)); //$NON-NLS-1$ //$NON-NLS-2$

 			}

-			IDiagramDocument diagramDocument = (IDiagramDocument) document;

+			IDiagramDocument diagramDocument = (IDiagramDocument)document;

 			final Resource newResource = diagramDocument.getEditingDomain().getResourceSet().createResource(newResoruceURI);

 			final Diagram diagramCopy = EcoreUtil.copy(diagramDocument.getDiagram());

 			try {

 				new AbstractTransactionalCommand(diagramDocument.getEditingDomain(), NLS.bind(Messages.UMLDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles) {

+

 					@Override

 					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 						newResource.getContents().add(diagramCopy);

@@ -627,7 +584,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 */

 	protected void handleElementChanged(ResourceSetInfo info, Resource changedResource, IProgressMonitor monitor) {

 		IFile file = WorkspaceSynchronizer.getFile(changedResource);

-		if (file != null) {

+		if(file != null) {

 			try {

 				file.refreshLocal(IResource.DEPTH_INFINITE, monitor);

 			} catch (CoreException ex) {

@@ -636,7 +593,6 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 			}

 		}

 		changedResource.unload();

-

 		fireElementContentAboutToBeReplaced(info.getEditorInput());

 		removeUnchangedElementListeners(info.getEditorInput(), info);

 		info.fStatus = null;

@@ -645,7 +601,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 		} catch (CoreException e) {

 			info.fStatus = e.getStatus();

 		}

-		if (!info.fCanBeSaved) {

+		if(!info.fCanBeSaved) {

 			info.setModificationStamp(computeModificationStamp(info));

 		}

 		addUnchangedElementListeners(info.getEditorInput(), info);

@@ -656,7 +612,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 * @generated

 	 */

 	protected void handleElementMoved(IEditorInput input, URI uri) {

-		if (input instanceof FileEditorInput) {

+		if(input instanceof FileEditorInput) {

 			IFile newFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(URI.decode(uri.path())).removeFirstSegments(1));

 			fireElementMoved(input, newFile == null ? null : new FileEditorInput(newFile));

 			return;

@@ -668,7 +624,6 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IEditorInput createInputWithEditingDomain(IEditorInput editorInput, TransactionalEditingDomain domain) {

 		return editorInput;

 	}

@@ -676,11 +631,10 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	public IDiagramDocument getDiagramDocument(Object element) {

 		IDocument doc = getDocument(element);

-		if (doc instanceof IDiagramDocument) {

-			return (IDiagramDocument) doc;

+		if(doc instanceof IDiagramDocument) {

+			return (IDiagramDocument)doc;

 		}

 		return null;

 	}

@@ -688,7 +642,6 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {

 		return null;

 	}

@@ -803,7 +756,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 		public void dispose() {

 			stopResourceListening();

 			getResourceSet().eAdapters().remove(myResourceSetListener);

-			for (Iterator<Resource> it = getLoadedResourcesIterator(); it.hasNext();) {

+			for(Iterator<Resource> it = getLoadedResourcesIterator(); it.hasNext();) {

 				Resource resource = it.next();

 				resource.unload();

 			}

@@ -896,22 +849,21 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 			/**

 			 * @generated

 			 */

-			@Override

 			public void dispose() {

 			}

 

 			/**

 			 * @generated

 			 */

-			@Override

 			public boolean handleResourceChanged(final Resource resource) {

-				synchronized (ResourceSetInfo.this) {

-					if (ResourceSetInfo.this.fCanBeSaved) {

+				synchronized(ResourceSetInfo.this) {

+					if(ResourceSetInfo.this.fCanBeSaved) {

 						ResourceSetInfo.this.setUnSynchronized(resource);

 						return true;

 					}

 				}

 				Display.getDefault().asyncExec(new Runnable() {

+

 					@Override

 					public void run() {

 						handleElementChanged(ResourceSetInfo.this, resource, null);

@@ -923,15 +875,15 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 			/**

 			 * @generated

 			 */

-			@Override

 			public boolean handleResourceDeleted(Resource resource) {

-				synchronized (ResourceSetInfo.this) {

-					if (ResourceSetInfo.this.fCanBeSaved) {

+				synchronized(ResourceSetInfo.this) {

+					if(ResourceSetInfo.this.fCanBeSaved) {

 						ResourceSetInfo.this.setUnSynchronized(resource);

 						return true;

 					}

 				}

 				Display.getDefault().asyncExec(new Runnable() {

+

 					@Override

 					public void run() {

 						fireElementDeleted(ResourceSetInfo.this.getEditorInput());

@@ -943,16 +895,16 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 			/**

 			 * @generated

 			 */

-			@Override

 			public boolean handleResourceMoved(Resource resource, final URI newURI) {

-				synchronized (ResourceSetInfo.this) {

-					if (ResourceSetInfo.this.fCanBeSaved) {

+				synchronized(ResourceSetInfo.this) {

+					if(ResourceSetInfo.this.fCanBeSaved) {

 						ResourceSetInfo.this.setUnSynchronized(resource);

 						return true;

 					}

 				}

-				if (myDocument.getDiagram().eResource() == resource) {

+				if(myDocument.getDiagram().eResource() == resource) {

 					Display.getDefault().asyncExec(new Runnable() {

+

 						@Override

 						public void run() {

 							handleElementMoved(ResourceSetInfo.this.getEditorInput(), newURI);

@@ -992,36 +944,34 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 		/**

 		 * @generated

 		 */

-		@Override

 		public void notifyChanged(Notification notification) {

-			if (notification.getNotifier() instanceof ResourceSet) {

+			if(notification.getNotifier() instanceof ResourceSet) {

 				super.notifyChanged(notification);

 			}

-			if (!notification.isTouch() && myModifiedFilter.matches(notification)) {

-				if (notification.getNotifier() instanceof Resource) {

-					Resource resource = (Resource) notification.getNotifier();

-					if (resource.isLoaded()) {

+			if(!notification.isTouch() && myModifiedFilter.matches(notification)) {

+				if(notification.getNotifier() instanceof Resource) {

+					Resource resource = (Resource)notification.getNotifier();

+					if(resource.isLoaded()) {

 						boolean modified = false;

-						for (Iterator<Resource> it = myInfo.getLoadedResourcesIterator(); it.hasNext() && !modified;) {

+						for(Iterator<Resource> it = myInfo.getLoadedResourcesIterator(); it.hasNext() && !modified;) {

 							Resource nextResource = it.next();

-							if (nextResource.isLoaded()) {

+							if(nextResource.isLoaded()) {

 								modified = nextResource.isModified();

 							}

 						}

 						boolean dirtyStateChanged = false;

-						synchronized (myInfo) {

-							if (modified != myInfo.fCanBeSaved) {

+						synchronized(myInfo) {

+							if(modified != myInfo.fCanBeSaved) {

 								myInfo.fCanBeSaved = modified;

 								dirtyStateChanged = true;

 							}

-							if (!resource.isModified()) {

+							if(!resource.isModified()) {

 								myInfo.setSynchronized(resource);

 							}

 						}

-						if (dirtyStateChanged) {

+						if(dirtyStateChanged) {

 							fireElementDirtyStateChanged(myInfo.getEditorInput(), modified);

-

-							if (!modified) {

+							if(!modified) {

 								myInfo.setModificationStamp(computeModificationStamp(myInfo));

 							}

 						}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java
index fad6de275bd..ed2fe467312 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -48,7 +48,6 @@ public class UMLInitDiagramFileAction implements IObjectActionDelegate {
 	/**

 	 * @generated

 	 */

-	@Override

 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {

 		this.targetPart = targetPart;

 	}

@@ -56,15 +55,13 @@ public class UMLInitDiagramFileAction implements IObjectActionDelegate {
 	/**

 	 * @generated

 	 */

-	@Override

 	public void selectionChanged(IAction action, ISelection selection) {

 		domainModelURI = null;

 		action.setEnabled(false);

-		if (selection instanceof IStructuredSelection == false || selection.isEmpty()) {

+		if(selection instanceof IStructuredSelection == false || selection.isEmpty()) {

 			return;

 		}

-		IFile file =

-				(IFile) ((IStructuredSelection) selection).getFirstElement();

+		IFile file = (IFile)((IStructuredSelection)selection).getFirstElement();

 		domainModelURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true);

 		action.setEnabled(true);

 	}

@@ -79,29 +76,22 @@ public class UMLInitDiagramFileAction implements IObjectActionDelegate {
 	/**

 	 * @generated

 	 */

-	@Override

 	public void run(IAction action) {

-		TransactionalEditingDomain editingDomain =

-				WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain();

+		TransactionalEditingDomain editingDomain = WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain();

 		ResourceSet resourceSet = editingDomain.getResourceSet();

 		EObject diagramRoot = null;

 		try {

 			Resource resource = resourceSet.getResource(domainModelURI, true);

 			diagramRoot = resource.getContents().get(0);

 		} catch (WrappedException ex) {

-			UMLDiagramEditorPlugin.getInstance().logError(

-					"Unable to load resource: " + domainModelURI, ex); //$NON-NLS-1$

+			UMLDiagramEditorPlugin.getInstance().logError("Unable to load resource: " + domainModelURI, ex); //$NON-NLS-1$

 		}

-		if (diagramRoot == null) {

-			MessageDialog.openError(getShell(),

-					Messages.InitDiagramFile_ResourceErrorDialogTitle,

-					Messages.InitDiagramFile_ResourceErrorDialogMessage);

+		if(diagramRoot == null) {

+			MessageDialog.openError(getShell(), Messages.InitDiagramFile_ResourceErrorDialogTitle, Messages.InitDiagramFile_ResourceErrorDialogMessage);

 			return;

 		}

 		Wizard wizard = new UMLNewDiagramFileWizard(domainModelURI, diagramRoot, editingDomain);

-		wizard.setWindowTitle(NLS.bind(

-				Messages.InitDiagramFile_WizardTitle,

-				CompositeStructureDiagramEditPart.MODEL_ID));

+		wizard.setWindowTitle(NLS.bind(Messages.InitDiagramFile_WizardTitle, CompositeStructureDiagramEditPart.MODEL_ID));

 		UMLDiagramEditorUtil.runWizard(getShell(), wizard, "InitDiagramFile"); //$NON-NLS-1$

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLLinkDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLLinkDescriptor.java
index be96de79414..42e20a57795 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLLinkDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLLinkDescriptor.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLMatchingStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLMatchingStrategy.java
index 0b16a5d79e0..ce6a3fc41fa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLMatchingStrategy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLMatchingStrategy.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,7 +25,6 @@ public class UMLMatchingStrategy implements IEditorMatchingStrategy {
 	/**

 	 * @generated

 	 */

-	@Override

 	public boolean matches(IEditorReference editorRef, IEditorInput input) {

 		IEditorInput editorInput;

 		try {

@@ -33,12 +32,11 @@ public class UMLMatchingStrategy implements IEditorMatchingStrategy {
 		} catch (PartInitException e) {

 			return false;

 		}

-

-		if (editorInput.equals(input)) {

+		if(editorInput.equals(input)) {

 			return true;

 		}

-		if (editorInput instanceof URIEditorInput && input instanceof URIEditorInput) {

-			return ((URIEditorInput) editorInput).getURI().equals(((URIEditorInput) input).getURI());

+		if(editorInput instanceof URIEditorInput && input instanceof URIEditorInput) {

+			return ((URIEditorInput)editorInput).getURI().equals(((URIEditorInput)input).getURI());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java
index 365fa05c8e2..28209d52587 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -67,39 +67,31 @@ public class UMLNewDiagramFileWizard extends Wizard {
 		assert domainModelURI != null : "Domain model uri must be specified"; //$NON-NLS-1$

 		assert diagramRoot != null : "Doagram root element must be specified"; //$NON-NLS-1$

 		assert editingDomain != null : "Editing domain must be specified"; //$NON-NLS-1$

-

-		myFileCreationPage = new WizardNewFileCreationPage

-				(Messages.UMLNewDiagramFileWizard_CreationPageName, StructuredSelection.EMPTY);

+		myFileCreationPage = new WizardNewFileCreationPage(Messages.UMLNewDiagramFileWizard_CreationPageName, StructuredSelection.EMPTY);

 		myFileCreationPage.setTitle(Messages.UMLNewDiagramFileWizard_CreationPageTitle);

-		myFileCreationPage.setDescription(NLS.bind(

-				Messages.UMLNewDiagramFileWizard_CreationPageDescription,

-				CompositeStructureDiagramEditPart.MODEL_ID));

+		myFileCreationPage.setDescription(NLS.bind(Messages.UMLNewDiagramFileWizard_CreationPageDescription, CompositeStructureDiagramEditPart.MODEL_ID));

 		IPath filePath;

 		String fileName = URI.decode(domainModelURI.trimFileExtension().lastSegment());

-		if (domainModelURI.isPlatformResource()) {

+		if(domainModelURI.isPlatformResource()) {

 			filePath = new Path(domainModelURI.trimSegments(1).toPlatformString(true));

-		} else if (domainModelURI.isFile()) {

+		} else if(domainModelURI.isFile()) {

 			filePath = new Path(domainModelURI.trimSegments(1).toFileString());

 		} else {

 			// TODO : use some default path

 			throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); //$NON-NLS-1$

 		}

 		myFileCreationPage.setContainerFullPath(filePath);

-		myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(

-				filePath, fileName, "uml_csd")); //$NON-NLS-1$

-

+		myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "uml_csd")); //$NON-NLS-1$

 		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.UMLNewDiagramFileWizard_RootSelectionPageName);

 		diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle);

 		diagramRootElementSelectionPage.setDescription(Messages.UMLNewDiagramFileWizard_RootSelectionPageDescription);

 		diagramRootElementSelectionPage.setModelElement(diagramRoot);

-

 		myEditingDomain = editingDomain;

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public void addPages() {

 		addPage(myFileCreationPage);

 		addPage(diagramRootElementSelectionPage);

@@ -108,7 +100,6 @@ public class UMLNewDiagramFileWizard extends Wizard {
 	/**

 	 * @generated

 	 */

-	@Override

 	public boolean performFinish() {

 		LinkedList<IFile> affectedFiles = new LinkedList<IFile>();

 		IFile diagramFile = myFileCreationPage.createNewFile();

@@ -117,38 +108,28 @@ public class UMLNewDiagramFileWizard extends Wizard {
 		URI diagramModelURI = URI.createPlatformResourceURI(diagramFile.getFullPath().toString(), true);

 		ResourceSet resourceSet = myEditingDomain.getResourceSet();

 		final Resource diagramResource = resourceSet.createResource(diagramModelURI);

-		AbstractTransactionalCommand command =

-				new AbstractTransactionalCommand(

-						myEditingDomain, Messages.UMLNewDiagramFileWizard_InitDiagramCommand, affectedFiles) {

-

-					@Override

-					protected CommandResult doExecuteWithResult(

-							IProgressMonitor monitor, IAdaptable info)

-							throws ExecutionException {

-						int diagramVID = UMLVisualIDRegistry.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement());

-						if (diagramVID != CompositeStructureDiagramEditPart.VISUAL_ID) {

-							return CommandResult.newErrorCommandResult(

-									Messages.UMLNewDiagramFileWizard_IncorrectRootError);

-						}

-						Diagram diagram =

-								ViewService.createDiagram(

-										diagramRootElementSelectionPage.getModelElement(), CompositeStructureDiagramEditPart.MODEL_ID,

-										UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

-						diagramResource.getContents().add(diagram);

-						new UMLDiagramContentInitializer().initDiagramContent(diagram);

-						return CommandResult.newOKCommandResult();

-					}

-				};

+		AbstractTransactionalCommand command = new AbstractTransactionalCommand(myEditingDomain, Messages.UMLNewDiagramFileWizard_InitDiagramCommand, affectedFiles) {

+

+			@Override

+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+				int diagramVID = UMLVisualIDRegistry.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement());

+				if(diagramVID != CompositeStructureDiagramEditPart.VISUAL_ID) {

+					return CommandResult.newErrorCommandResult(Messages.UMLNewDiagramFileWizard_IncorrectRootError);

+				}

+				Diagram diagram = ViewService.createDiagram(diagramRootElementSelectionPage.getModelElement(), CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				diagramResource.getContents().add(diagram);

+				new UMLDiagramContentInitializer().initDiagramContent(diagram);

+				return CommandResult.newOKCommandResult();

+			}

+		};

 		try {

-			OperationHistoryFactory.getOperationHistory().execute(

-					command, new NullProgressMonitor(), null);

+			OperationHistoryFactory.getOperationHistory().execute(command, new NullProgressMonitor(), null);

 			diagramResource.save(UMLDiagramEditorUtil.getSaveOptions());

 			UMLDiagramEditorUtil.openDiagram(diagramResource);

 		} catch (ExecutionException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Unable to create model and diagram", e); //$NON-NLS-1$

 		} catch (IOException ex) {

-			UMLDiagramEditorPlugin.getInstance().logError(

-					"Save operation failed for: " + diagramModelURI, ex); //$NON-NLS-1$

+			UMLDiagramEditorPlugin.getInstance().logError("Save operation failed for: " + diagramModelURI, ex); //$NON-NLS-1$

 		} catch (PartInitException ex) {

 			UMLDiagramEditorPlugin.getInstance().logError("Unable to open editor", ex); //$NON-NLS-1$

 		}

@@ -170,7 +151,6 @@ public class UMLNewDiagramFileWizard extends Wizard {
 		/**

 		 * @generated

 		 */

-		@Override

 		protected String getSelectionTitle() {

 			return Messages.UMLNewDiagramFileWizard_RootSelectionPageSelectionTitle;

 		}

@@ -178,16 +158,12 @@ public class UMLNewDiagramFileWizard extends Wizard {
 		/**

 		 * @generated

 		 */

-		@Override

 		protected boolean validatePage() {

-			if (getModelElement() == null) {

+			if(getModelElement() == null) {

 				setErrorMessage(Messages.UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage);

 				return false;

 			}

-			boolean result = ViewService.getInstance().provides(

-					new CreateDiagramViewOperation(

-							new EObjectAdapter(getModelElement()),

-							CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));

+			boolean result = ViewService.getInstance().provides(new CreateDiagramViewOperation(new EObjectAdapter(getModelElement()), CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));

 			setErrorMessage(result ? null : Messages.UMLNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage);

 			return result;

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNodeDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNodeDescriptor.java
index 8065c7ce717..343d045df87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNodeDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNodeDescriptor.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java
index aa135f5d85a..673cc2777dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -26,9 +26,9 @@ import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
  */

 public class UMLPaletteFactory extends PaletteFactory.Adapter {

 

-	// RS: New Palette generation

-	// Generates the ID for the tool elements

-	// Generate the tool factory (if(ID) createtool...)

+	//RS: New Palette generation

+	//Generates the ID for the tool elements

+	//Generate the tool factory (if(ID) createtool...)

 	/**

 	 * @generated

 	 */

@@ -122,6 +122,11 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	/**

 	 * @generated

 	 */

+	private final static String COMPOSITE_TOOL_STRINGEXPRESSION = "composite.tool.stringExpression";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

 	private final static String COMPOSITE_TOOL_LINK = "composite.tool.link";//$NON-NLS-1$

 

 	/**

@@ -177,102 +182,119 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	/**

 	 * @generated

 	 */

-	public UMLPaletteFactory() {

+	private final static String COMPOSITE_TOOL_MANIFESTATION = "composite.tool.manifestation";//$NON-NLS-1$

 

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_DEPLOYMENT = "composite.tool.deployment";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public UMLPaletteFactory() {

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	public Tool createTool(String toolId) {

-		if (toolId.equals(COMPOSITE_TOOL_CLASS)) {

+		if(toolId.equals(COMPOSITE_TOOL_CLASS)) {

 			return createClassCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_PROPERTY)) {

+		if(toolId.equals(COMPOSITE_TOOL_PROPERTY)) {

 			return createPropertyCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_PORT)) {

+		if(toolId.equals(COMPOSITE_TOOL_PORT)) {

 			return createPortCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_COLLABORATION)) {

+		if(toolId.equals(COMPOSITE_TOOL_COLLABORATION)) {

 			return createCollaborationCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_COLLABORATIONROLE)) {

+		if(toolId.equals(COMPOSITE_TOOL_COLLABORATIONROLE)) {

 			return createCollaborationRoleCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_COLLABORATIONUSE)) {

+		if(toolId.equals(COMPOSITE_TOOL_COLLABORATIONUSE)) {

 			return createCollaborationUseCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_COMMENT)) {

+		if(toolId.equals(COMPOSITE_TOOL_COMMENT)) {

 			return createCommentCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_CONSTRAINT)) {

+		if(toolId.equals(COMPOSITE_TOOL_CONSTRAINT)) {

 			return createConstraintCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_TIMEOBSERVATION)) {

+		if(toolId.equals(COMPOSITE_TOOL_TIMEOBSERVATION)) {

 			return createTimeObservationCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_DURATIONOBSERVATION)) {

+		if(toolId.equals(COMPOSITE_TOOL_DURATIONOBSERVATION)) {

 			return createDurationObservationCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_INFORMATIONITEM)) {

+		if(toolId.equals(COMPOSITE_TOOL_INFORMATIONITEM)) {

 			return createInformationItemCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_PARAMETER)) {

+		if(toolId.equals(COMPOSITE_TOOL_PARAMETER)) {

 			return createParameterCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_ACTIVITY)) {

+		if(toolId.equals(COMPOSITE_TOOL_ACTIVITY)) {

 			return createActivityCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_INTERACTION)) {

+		if(toolId.equals(COMPOSITE_TOOL_INTERACTION)) {

 			return createInteractionCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_PROTOCOLSTATEMACHINE)) {

+		if(toolId.equals(COMPOSITE_TOOL_PROTOCOLSTATEMACHINE)) {

 			return createProtocolStateMachineCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_STATEMACHINE)) {

+		if(toolId.equals(COMPOSITE_TOOL_STATEMACHINE)) {

 			return createStateMachineCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_FUNCTIONBEHAVIOR)) {

+		if(toolId.equals(COMPOSITE_TOOL_FUNCTIONBEHAVIOR)) {

 			return createFunctionBehaviorCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_OPAQUEBEHAVIOR)) {

+		if(toolId.equals(COMPOSITE_TOOL_OPAQUEBEHAVIOR)) {

 			return createOpaqueBehaviorCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_LINK)) {

+		if(toolId.equals(COMPOSITE_TOOL_STRINGEXPRESSION)) {

+			return createStringExpressionCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_LINK)) {

 			return createLinkCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_CONNECTOR)) {

+		if(toolId.equals(COMPOSITE_TOOL_CONNECTOR)) {

 			return createConnectorCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_ROLEBINDING)) {

+		if(toolId.equals(COMPOSITE_TOOL_ROLEBINDING)) {

 			return createRoleBindingCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_GENERALIZATION)) {

+		if(toolId.equals(COMPOSITE_TOOL_GENERALIZATION)) {

 			return createGeneralizationCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_REALIZATION)) {

+		if(toolId.equals(COMPOSITE_TOOL_REALIZATION)) {

 			return createRealizationCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_SUBSTITUTION)) {

+		if(toolId.equals(COMPOSITE_TOOL_SUBSTITUTION)) {

 			return createSubstitutionCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_ABSTRACTION)) {

+		if(toolId.equals(COMPOSITE_TOOL_ABSTRACTION)) {

 			return createAbstractionCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_USAGE)) {

+		if(toolId.equals(COMPOSITE_TOOL_USAGE)) {

 			return createUsageCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_DEPENDENCY)) {

+		if(toolId.equals(COMPOSITE_TOOL_DEPENDENCY)) {

 			return createDependencyCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_REPRESENTATION)) {

+		if(toolId.equals(COMPOSITE_TOOL_REPRESENTATION)) {

 			return createRepresentationCreationTool();

 		}

-		if (toolId.equals(COMPOSITE_TOOL_INFORMATIONFLOW)) {

+		if(toolId.equals(COMPOSITE_TOOL_INFORMATIONFLOW)) {

 			return createInformationFlowCreationTool();

 		}

+		if(toolId.equals(COMPOSITE_TOOL_MANIFESTATION)) {

+			return createManifestationCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_DEPLOYMENT)) {

+			return createDeploymentCreationTool();

+		}

 		// default return: null

 		return null;

 	}

@@ -280,9 +302,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	/**

 	 * @generated

 	 */

-	@Override

 	public Object getTemplate(String templateId) {

-

 		// default return: null

 		return null;

 	}

@@ -481,6 +501,16 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	/**

 	 * @generated

 	 */

+	private Tool createStringExpressionCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.StringExpression_2100);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

 	private Tool createLinkCreationTool() {

 		List<IElementType> types = new ArrayList<IElementType>(4);

 		types.add(UMLElementTypes.CommentAnnotatedElement_4002);

@@ -590,4 +620,24 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

 		return tool;

 	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createManifestationCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Manifestation_4012);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createDeploymentCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Deployment_4009);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
index 3fa9611ffd9..69d5042ea29 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -29,7 +29,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * This registry is used to determine which type of visual object should be

  * created for the corresponding Diagram, Node, ChildNode or Link represented

  * by a domain model object.

- *

+ * 

  * @generated

  */

 public class UMLVisualIDRegistry {

@@ -43,8 +43,8 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static int getVisualID(View view) {

-		if (view instanceof Diagram) {

-			if (CompositeStructureDiagramEditPart.MODEL_ID.equals(view.getType())) {

+		if(view instanceof Diagram) {

+			if(CompositeStructureDiagramEditPart.MODEL_ID.equals(view.getType())) {

 				return CompositeStructureDiagramEditPart.VISUAL_ID;

 			} else {

 				return -1;

@@ -58,12 +58,12 @@ public class UMLVisualIDRegistry {
 	 */

 	public static String getModelID(View view) {

 		View diagram = view.getDiagram();

-		while (view != diagram) {

+		while(view != diagram) {

 			EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

-			if (annotation != null) {

+			if(annotation != null) {

 				return annotation.getDetails().get("modelID"); //$NON-NLS-1$

 			}

-			view = (View) view.eContainer();

+			view = (View)view.eContainer();

 		}

 		return diagram != null ? diagram.getType() : null;

 	}

@@ -75,7 +75,7 @@ public class UMLVisualIDRegistry {
 		try {

 			return Integer.parseInt(type);

 		} catch (NumberFormatException e) {

-			if (Boolean.TRUE.toString().equalsIgnoreCase(Platform.getDebugOption(DEBUG_KEY))) {

+			if(Boolean.TRUE.toString().equalsIgnoreCase(Platform.getDebugOption(DEBUG_KEY))) {

 				UMLDiagramEditorPlugin.getInstance().logError("Unable to parse view type as a visualID number: " + type);

 			}

 		}

@@ -93,7 +93,7 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static int getDiagramVisualID(EObject domainElement) {

-		if (domainElement == null) {

+		if(domainElement == null) {

 			return -1;

 		}

 		return 1000;

@@ -103,2487 +103,2487 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static int getNodeVisualID(View containerView, EObject domainElement) {

-		if (domainElement == null) {

+		if(domainElement == null) {

 			return -1;

 		}

 		String containerModelID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(containerView);

-		if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

+		if(!CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

 			return -1;

 		}

 		int containerVisualID;

-		if (CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

+		if(CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

 			containerVisualID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(containerView);

 		} else {

-			if (containerView instanceof Diagram) {

+			if(containerView instanceof Diagram) {

 				containerVisualID = CompositeStructureDiagramEditPart.VISUAL_ID;

 			} else {

 				return -1;

 			}

 		}

-		switch (containerVisualID) {

+		switch(containerVisualID) {

 		case CompositeStructureDiagramEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignalEvent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignalEvent().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEventEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCallEvent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCallEvent().isSuperTypeOf(domainElement.eClass())) {

 				return CallEventEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getAnyReceiveEvent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getAnyReceiveEvent().isSuperTypeOf(domainElement.eClass())) {

 				return AnyReceiveEventEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getChangeEvent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getChangeEvent().isSuperTypeOf(domainElement.eClass())) {

 				return ChangeEventEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeEvent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeEvent().isSuperTypeOf(domainElement.eClass())) {

 				return TimeEventEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationObservation().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationObservation().isSuperTypeOf(domainElement.eClass())) {

 				return DurationObservationEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeObservation().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeObservation().isSuperTypeOf(domainElement.eClass())) {

 				return TimeObservationEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getLiteralBoolean().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getLiteralBoolean().isSuperTypeOf(domainElement.eClass())) {

 				return LiteralBooleanEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getLiteralInteger().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getLiteralInteger().isSuperTypeOf(domainElement.eClass())) {

 				return LiteralIntegerEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getLiteralNull().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getLiteralNull().isSuperTypeOf(domainElement.eClass())) {

 				return LiteralNullEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getLiteralString().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getLiteralString().isSuperTypeOf(domainElement.eClass())) {

 				return LiteralStringEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getLiteralUnlimitedNatural().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getLiteralUnlimitedNatural().isSuperTypeOf(domainElement.eClass())) {

 				return LiteralUnlimitedNaturalEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStringExpression().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStringExpression().isSuperTypeOf(domainElement.eClass())) {

 				return StringExpressionEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueExpression().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueExpression().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueExpressionEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeExpression().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeExpression().isSuperTypeOf(domainElement.eClass())) {

 				return TimeExpressionEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExpression().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExpression().isSuperTypeOf(domainElement.eClass())) {

 				return ExpressionEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDuration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDuration().isSuperTypeOf(domainElement.eClass())) {

 				return DurationEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeInterval().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeInterval().isSuperTypeOf(domainElement.eClass())) {

 				return TimeIntervalEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationInterval().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationInterval().isSuperTypeOf(domainElement.eClass())) {

 				return DurationIntervalEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterval().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterval().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInstanceValue().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInstanceValue().isSuperTypeOf(domainElement.eClass())) {

 				return InstanceValueEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPart.VISUAL_ID;

 			}

 			break;

 		case ActivityCompositeEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

 			break;

 		case InteractionCompositeEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

 			break;

 		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

 			break;

 		case StateMachineCompositeEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

 			break;

 		case FunctionBehaviorCompositeEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

 			break;

 		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

 			break;

 		case ComponentCompositeEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

 			break;

 		case DeviceCompositeEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

 			break;

 		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

 			break;

 		case NodeCompositeEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

 			break;

 		case ClassCompositeEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

 			break;

 		case EnumerationEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationLiteralEditPartCLN.VISUAL_ID;

 			}

 			break;

 		case PropertyPartEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

 			break;

 		case ActivityCompositeEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

 			break;

 		case InteractionCompositeEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

 			break;

 		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

 			break;

 		case StateMachineCompositeEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

 			break;

 		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

 			break;

 		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

 			break;

 		case ComponentCompositeEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

 			break;

 		case DeviceCompositeEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

 			break;

 		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

 			break;

 		case NodeCompositeEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

 			break;

 		case ClassCompositeEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

 				return PortEditPart.VISUAL_ID;

 			}

 			break;

 		case EnumerationEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationLiteralEditPartCLN.VISUAL_ID;

 			}

 			break;

 		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

 				return PropertyEditPartCLN.VISUAL_ID;

 			}

 			break;

 		case DataTypeOperationCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

 				return OperationEditPartCLN.VISUAL_ID;

 			}

 			break;

 		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

 				return PropertyEditPartCLN.VISUAL_ID;

 			}

 			break;

 		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

 				return OperationEditPartCLN.VISUAL_ID;

 			}

 			break;

 		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationLiteralEditPartCLN.VISUAL_ID;

 			}

 			break;

 		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationLiteralEditPartCLN.VISUAL_ID;

 			}

 			break;

 		case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case NodeCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case ClassCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConnectableElement().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConnectableElement().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationRoleEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case ActivityCompositeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case InteractionCompositeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case StateMachineCompositeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

 				return ParameterEditPart.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case ComponentCompositeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case DeviceCompositeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case NodeCompositeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case ClassCompositeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

 				return ActivityCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

 				return StateMachineCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

 				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

 				return DeviceCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

 				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

 				return NodeCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

 				return ClassCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationCompositeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

 				return InterfaceEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

 				return PrimitiveTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

 				return EnumerationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

 				return DataTypeEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

 				return ActorEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

 				return DeploymentSpecificationEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

 				return ArtifactEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

 				return InformationItemEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

 				return SignalEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

 				return UseCaseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case CollaborationCompositeCompartmentEditPart.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationUseEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConnectableElement().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConnectableElement().isSuperTypeOf(domainElement.eClass())) {

 				return CollaborationRoleEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return DurationConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return TimeConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return IntervalConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return InteractionConstraintEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

 				return ConstraintEditPartCN.VISUAL_ID;

 			}

 			break;

 		case PropertyPartCompartmentEditPartCN.VISUAL_ID:

-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

 				return PropertyPartEditPartCN.VISUAL_ID;

 			}

-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

 				return CommentEditPartCN.VISUAL_ID;

 			}

 			break;

@@ -2596,3296 +2596,3296 @@ public class UMLVisualIDRegistry {
 	 */

 	public static boolean canCreateNode(View containerView, int nodeVisualID) {

 		String containerModelID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(containerView);

-		if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

+		if(!CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

 			return false;

 		}

 		int containerVisualID;

-		if (CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

+		if(CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

 			containerVisualID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(containerView);

 		} else {

-			if (containerView instanceof Diagram) {

+			if(containerView instanceof Diagram) {

 				containerVisualID = CompositeStructureDiagramEditPart.VISUAL_ID;

 			} else {

 				return false;

 			}

 		}

-		switch (containerVisualID) {

+		switch(containerVisualID) {

 		case CompositeStructureDiagramEditPart.VISUAL_ID:

-			if (ActivityCompositeEditPart.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPart.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPart.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPart.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPart.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPart.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPart.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPart.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPart.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPart.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPart.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPart.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPart.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPart.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPart.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPart.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPart.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPart.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPart.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPart.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEventEditPart.VISUAL_ID == nodeVisualID) {

+			if(SignalEventEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CallEventEditPart.VISUAL_ID == nodeVisualID) {

+			if(CallEventEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (AnyReceiveEventEditPart.VISUAL_ID == nodeVisualID) {

+			if(AnyReceiveEventEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ChangeEventEditPart.VISUAL_ID == nodeVisualID) {

+			if(ChangeEventEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeEventEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeEventEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationObservationEditPart.VISUAL_ID == nodeVisualID) {

+			if(DurationObservationEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeObservationEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeObservationEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (LiteralBooleanEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralBooleanEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (LiteralIntegerEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralIntegerEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (LiteralNullEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralNullEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (LiteralStringEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralStringEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (LiteralUnlimitedNaturalEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralUnlimitedNaturalEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StringExpressionEditPart.VISUAL_ID == nodeVisualID) {

+			if(StringExpressionEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueExpressionEditPart.VISUAL_ID == nodeVisualID) {

+			if(OpaqueExpressionEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeExpressionEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeExpressionEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExpressionEditPart.VISUAL_ID == nodeVisualID) {

+			if(ExpressionEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationEditPart.VISUAL_ID == nodeVisualID) {

+			if(DurationEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeIntervalEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeIntervalEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationIntervalEditPart.VISUAL_ID == nodeVisualID) {

+			if(DurationIntervalEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalEditPart.VISUAL_ID == nodeVisualID) {

+			if(IntervalEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InstanceValueEditPart.VISUAL_ID == nodeVisualID) {

+			if(InstanceValueEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPart.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPart.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPart.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPart.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPart.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ActivityCompositeEditPart.VISUAL_ID:

-			if (ActivityCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case InteractionCompositeEditPart.VISUAL_ID:

-			if (InteractionCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

-			if (ProtocolStateMachineCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case StateMachineCompositeEditPart.VISUAL_ID:

-			if (StateMachineCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case FunctionBehaviorCompositeEditPart.VISUAL_ID:

-			if (FunctionBehaviorCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

-			if (OpaqueBehaviorCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ComponentCompositeEditPart.VISUAL_ID:

-			if (ComponentCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DeviceCompositeEditPart.VISUAL_ID:

-			if (DeviceCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

-			if (ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case NodeCompositeEditPart.VISUAL_ID:

-			if (NodeCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ClassCompositeEditPart.VISUAL_ID:

-			if (ClassCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case CollaborationCompositeEditPart.VISUAL_ID:

-			if (CollaborationCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case InterfaceEditPart.VISUAL_ID:

-			if (InterfaceNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(InterfaceNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(InterfaceFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case PrimitiveTypeEditPart.VISUAL_ID:

-			if (PrimitiveTypeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case EnumerationEditPart.VISUAL_ID:

-			if (EnumerationNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(EnumerationNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(EnumerationFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DataTypeEditPart.VISUAL_ID:

-			if (DataTypeNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(DataTypeNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(DataTypeFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeAttributeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(DataTypeAttributeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeOperationCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+			if(DataTypeOperationCompartmentEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ActorEditPart.VISUAL_ID:

-			if (ActorNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ActorNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(ActorFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DeploymentSpecificationEditPart.VISUAL_ID:

-			if (DeploymentSpecificationNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ArtifactEditPart.VISUAL_ID:

-			if (ArtifactNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ArtifactNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(ArtifactFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case InformationItemEditPart.VISUAL_ID:

-			if (InformationItemNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(InformationItemNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(InformationItemFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case SignalEditPart.VISUAL_ID:

-			if (SignalNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(SignalNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(SignalFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case UseCaseEditPart.VISUAL_ID:

-			if (UseCaseNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(UseCaseNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(UseCaseFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case SignalEventEditPart.VISUAL_ID:

-			if (SignalEventNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(SignalEventNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEventFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(SignalEventFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case CallEventEditPart.VISUAL_ID:

-			if (CallEventNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(CallEventNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CallEventFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(CallEventFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case AnyReceiveEventEditPart.VISUAL_ID:

-			if (AnyReceiveEventNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(AnyReceiveEventNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (AnyReceiveEventFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(AnyReceiveEventFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ChangeEventEditPart.VISUAL_ID:

-			if (ChangeEventNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ChangeEventNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ChangeEventFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(ChangeEventFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case TimeEventEditPart.VISUAL_ID:

-			if (TimeEventNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeEventNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeEventFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeEventFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DurationObservationEditPart.VISUAL_ID:

-			if (DurationObservationNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(DurationObservationNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationObservationStereotypeLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(DurationObservationStereotypeLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case TimeObservationEditPart.VISUAL_ID:

-			if (TimeObservationNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeObservationNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeObservationStereotypeLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeObservationStereotypeLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case LiteralBooleanEditPart.VISUAL_ID:

-			if (LiteralBooleanNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralBooleanNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (LiteralBooleanFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralBooleanFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case LiteralIntegerEditPart.VISUAL_ID:

-			if (LiteralIntegerNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralIntegerNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (LiteralIntegerFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralIntegerFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case LiteralNullEditPart.VISUAL_ID:

-			if (LiteralNullNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralNullNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (LiteralNullFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralNullFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case LiteralStringEditPart.VISUAL_ID:

-			if (LiteralStringNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralStringNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (LiteralStringFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralStringFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

-			if (LiteralUnlimitedNaturalNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralUnlimitedNaturalNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (LiteralUnlimitedNaturalFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(LiteralUnlimitedNaturalFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case StringExpressionEditPart.VISUAL_ID:

-			if (StringExpressionNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(StringExpressionNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StringExpressionFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(StringExpressionFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case OpaqueExpressionEditPart.VISUAL_ID:

-			if (OpaqueExpressionNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(OpaqueExpressionNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueExpressionFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(OpaqueExpressionFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case TimeExpressionEditPart.VISUAL_ID:

-			if (TimeExpressionNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeExpressionNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeExpressionFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeExpressionFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ExpressionEditPart.VISUAL_ID:

-			if (ExpressionNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ExpressionNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExpressionFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(ExpressionFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DurationEditPart.VISUAL_ID:

-			if (DurationNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(DurationNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(DurationFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case TimeIntervalEditPart.VISUAL_ID:

-			if (TimeIntervalNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeIntervalNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeIntervalFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeIntervalFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DurationIntervalEditPart.VISUAL_ID:

-			if (DurationIntervalNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(DurationIntervalNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationIntervalFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(DurationIntervalFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case IntervalEditPart.VISUAL_ID:

-			if (IntervalNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(IntervalNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(IntervalFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case InstanceValueEditPart.VISUAL_ID:

-			if (InstanceValueNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(InstanceValueNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InstanceValueFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(InstanceValueFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case CommentEditPart.VISUAL_ID:

-			if (CommentBodyEditPart.VISUAL_ID == nodeVisualID) {

+			if(CommentBodyEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DurationConstraintEditPart.VISUAL_ID:

-			if (DurationConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case TimeConstraintEditPart.VISUAL_ID:

-			if (TimeConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case IntervalConstraintEditPart.VISUAL_ID:

-			if (IntervalConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case InteractionConstraintEditPart.VISUAL_ID:

-			if (InteractionConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ConstraintEditPart.VISUAL_ID:

-			if (ConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

+			if(ConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case BehaviorPortEditPart.VISUAL_ID:

-			if (BehaviorPortFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(BehaviorPortFloatingLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case PortEditPart.VISUAL_ID:

-			if (PortNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ParameterEditPart.VISUAL_ID:

-			if (ParameterNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ParameterAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case PropertyPartEditPartCN.VISUAL_ID:

-			if (PropertyPartNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case CollaborationRoleEditPartCN.VISUAL_ID:

-			if (CollaborationRoleNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationRoleNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationRoleFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationRoleFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case CollaborationUseEditPartCN.VISUAL_ID:

-			if (CollaborationUseNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ActivityCompositeEditPartCN.VISUAL_ID:

-			if (ActivityCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case InteractionCompositeEditPartCN.VISUAL_ID:

-			if (InteractionCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

-			if (ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case StateMachineCompositeEditPartCN.VISUAL_ID:

-			if (StateMachineCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

-			if (FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

-			if (OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ComponentCompositeEditPartCN.VISUAL_ID:

-			if (ComponentCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DeviceCompositeEditPartCN.VISUAL_ID:

-			if (DeviceCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

-			if (ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case NodeCompositeEditPartCN.VISUAL_ID:

-			if (NodeCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ClassCompositeEditPartCN.VISUAL_ID:

-			if (ClassCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PortEditPart.VISUAL_ID == nodeVisualID) {

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case CollaborationCompositeEditPartCN.VISUAL_ID:

-			if (CollaborationCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case InterfaceEditPartCN.VISUAL_ID:

-			if (InterfaceNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case PrimitiveTypeEditPartCN.VISUAL_ID:

-			if (PrimitiveTypeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case EnumerationEditPartCN.VISUAL_ID:

-			if (EnumerationNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DataTypeEditPartCN.VISUAL_ID:

-			if (DataTypeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeAttributeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeOperationCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeOperationCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ActorEditPartCN.VISUAL_ID:

-			if (ActorNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DeploymentSpecificationEditPartCN.VISUAL_ID:

-			if (DeploymentSpecificationNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ArtifactEditPartCN.VISUAL_ID:

-			if (ArtifactNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case InformationItemEditPartCN.VISUAL_ID:

-			if (InformationItemNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case SignalEditPartCN.VISUAL_ID:

-			if (SignalNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case UseCaseEditPartCN.VISUAL_ID:

-			if (UseCaseNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseFloatingLabelEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case CommentEditPartCN.VISUAL_ID:

-			if (CommentBodyEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentBodyEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DurationConstraintEditPartCN.VISUAL_ID:

-			if (DurationConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case TimeConstraintEditPartCN.VISUAL_ID:

-			if (TimeConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case IntervalConstraintEditPartCN.VISUAL_ID:

-			if (IntervalConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case InteractionConstraintEditPartCN.VISUAL_ID:

-			if (InteractionConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ConstraintEditPartCN.VISUAL_ID:

-			if (ConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

-			if (PropertyEditPartCLN.VISUAL_ID == nodeVisualID) {

+			if(PropertyEditPartCLN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DataTypeOperationCompartmentEditPart.VISUAL_ID:

-			if (OperationEditPartCLN.VISUAL_ID == nodeVisualID) {

+			if(OperationEditPartCLN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyEditPartCLN.VISUAL_ID == nodeVisualID) {

+			if(PropertyEditPartCLN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

-			if (OperationEditPartCLN.VISUAL_ID == nodeVisualID) {

+			if(OperationEditPartCLN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

-			if (EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

-			if (EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case NodeCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ClassCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (BehaviorPortEditPart.VISUAL_ID == nodeVisualID) {

+			if(BehaviorPortEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationRoleEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationRoleEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ActivityCompositeCompartmentEditPart.VISUAL_ID:

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case InteractionCompositeCompartmentEditPart.VISUAL_ID:

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case StateMachineCompositeCompartmentEditPart.VISUAL_ID:

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:

-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ComponentCompositeCompartmentEditPart.VISUAL_ID:

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DeviceCompositeCompartmentEditPart.VISUAL_ID:

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case NodeCompositeCompartmentEditPart.VISUAL_ID:

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ClassCompositeCompartmentEditPart.VISUAL_ID:

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case CollaborationCompositeCompartmentEditPart.VISUAL_ID:

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CollaborationRoleEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CollaborationRoleEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case PropertyPartCompartmentEditPartCN.VISUAL_ID:

-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ComponentRealizationEditPart.VISUAL_ID:

-			if (ComponentRealizationNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ComponentRealizationNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case InterfaceRealizationEditPart.VISUAL_ID:

-			if (InterfaceRealizationNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(InterfaceRealizationNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case SubstitutionEditPart.VISUAL_ID:

-			if (SubstitutionNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(SubstitutionNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (SubstitutionAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(SubstitutionAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case RealizationEditPart.VISUAL_ID:

-			if (RealizationNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(RealizationNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (RealizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(RealizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ManifestationEditPart.VISUAL_ID:

-			if (ManifestationNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ManifestationNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ManifestationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(ManifestationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case AbstractionEditPart.VISUAL_ID:

-			if (AbstractionNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(AbstractionNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (AbstractionAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(AbstractionAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case UsageEditPart.VISUAL_ID:

-			if (UsageNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(UsageNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (UsageAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(UsageAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DeploymentEditPart.VISUAL_ID:

-			if (DeploymentNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(DeploymentNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DeploymentAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(DeploymentAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case RoleBindingEditPart.VISUAL_ID:

-			if (RoleBindingRoleNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(RoleBindingRoleNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (RoleBindingAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(RoleBindingAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case DependencyEditPart.VISUAL_ID:

-			if (DependencyNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(DependencyNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (DependencyAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(DependencyAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case ConnectorEditPart.VISUAL_ID:

-			if (ConnectorAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(ConnectorAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConnectorNameEditPart.VISUAL_ID == nodeVisualID) {

+			if(ConnectorNameEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConnectorMultiplicitySourceEditPart.VISUAL_ID == nodeVisualID) {

+			if(ConnectorMultiplicitySourceEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (ConnectorMultiplicityTargetEditPart.VISUAL_ID == nodeVisualID) {

+			if(ConnectorMultiplicityTargetEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case GeneralizationEditPart.VISUAL_ID:

-			if (GeneralizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(GeneralizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case RepresentationEditPart.VISUAL_ID:

-			if (RepresentationTagLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(RepresentationTagLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

 		case InformationFlowEditPart.VISUAL_ID:

-			if (InformationFlowConveyedLabelEditPart.VISUAL_ID == nodeVisualID) {

+			if(InformationFlowConveyedLabelEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

-			if (InformationFlowAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+			if(InformationFlowAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

 			break;

@@ -5897,46 +5897,46 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static int getLinkWithClassVisualID(EObject domainElement) {

-		if (domainElement == null) {

+		if(domainElement == null) {

 			return -1;

 		}

-		if (UMLPackage.eINSTANCE.getComponentRealization().isSuperTypeOf(domainElement.eClass())) {

+		if(UMLPackage.eINSTANCE.getComponentRealization().isSuperTypeOf(domainElement.eClass())) {

 			return ComponentRealizationEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(domainElement.eClass())) {

+		if(UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(domainElement.eClass())) {

 			return InterfaceRealizationEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getSubstitution().isSuperTypeOf(domainElement.eClass())) {

+		if(UMLPackage.eINSTANCE.getSubstitution().isSuperTypeOf(domainElement.eClass())) {

 			return SubstitutionEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getRealization().isSuperTypeOf(domainElement.eClass())) {

+		if(UMLPackage.eINSTANCE.getRealization().isSuperTypeOf(domainElement.eClass())) {

 			return RealizationEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getManifestation().isSuperTypeOf(domainElement.eClass())) {

+		if(UMLPackage.eINSTANCE.getManifestation().isSuperTypeOf(domainElement.eClass())) {

 			return ManifestationEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getAbstraction().isSuperTypeOf(domainElement.eClass())) {

+		if(UMLPackage.eINSTANCE.getAbstraction().isSuperTypeOf(domainElement.eClass())) {

 			return AbstractionEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getUsage().isSuperTypeOf(domainElement.eClass())) {

+		if(UMLPackage.eINSTANCE.getUsage().isSuperTypeOf(domainElement.eClass())) {

 			return UsageEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getDeployment().isSuperTypeOf(domainElement.eClass())) {

+		if(UMLPackage.eINSTANCE.getDeployment().isSuperTypeOf(domainElement.eClass())) {

 			return DeploymentEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass()) && isDependency_4017((Dependency) domainElement)) {

+		if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass()) && isDependency_4017((Dependency)domainElement)) {

 			return RoleBindingEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass()) && isDependency_4010((Dependency) domainElement)) {

+		if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass()) && isDependency_4010((Dependency)domainElement)) {

 			return DependencyEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getConnector().isSuperTypeOf(domainElement.eClass())) {

+		if(UMLPackage.eINSTANCE.getConnector().isSuperTypeOf(domainElement.eClass())) {

 			return ConnectorEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) {

+		if(UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) {

 			return GeneralizationEditPart.VISUAL_ID;

 		}

-		if (UMLPackage.eINSTANCE.getInformationFlow().isSuperTypeOf(domainElement.eClass())) {

+		if(UMLPackage.eINSTANCE.getInformationFlow().isSuperTypeOf(domainElement.eClass())) {

 			return InformationFlowEditPart.VISUAL_ID;

 		}

 		return -1;

@@ -5945,7 +5945,7 @@ public class UMLVisualIDRegistry {
 	/**

 	 * User can change implementation of this method to handle some specific

 	 * situations not covered by default logic.

-	 *

+	 * 

 	 * @generated

 	 */

 	private static boolean isDiagram(Package element) {

@@ -5956,19 +5956,18 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	private static boolean isProperty_3070(View containerView, Property domainElement) {

-		// Property / CollaborationRole constraint

+		// Property / CollaborationRole constraint		

 		// Restriction for the case where domainElement owner is a Collaboration

 		// If the domainElement is not referenced as one of its owner role

 		// then it should be considered as a Property creation on Collaboration,

 		// else the test should return false and be considered as a representation of

 		// a collaboration role (ConnectableElement).

-		if (containerView.getElement() instanceof Collaboration) {

-			Collaboration graphicalParent = (Collaboration) containerView.getElement();

-			if (graphicalParent.getCollaborationRoles().contains(domainElement)) {

+		if(containerView.getElement() instanceof Collaboration) {

+			Collaboration graphicalParent = (Collaboration)containerView.getElement();

+			if(graphicalParent.getCollaborationRoles().contains(domainElement)) {

 				return false;

 			}

 		}

-

 		// General case : no restriction

 		return true;

 	}

@@ -5978,9 +5977,9 @@ public class UMLVisualIDRegistry {
 	 */

 	private static boolean isDependency_4017(Dependency domainElement) {

 		// Test if the dependency is a RoleBinding

-		if (domainElement.getOwner() instanceof CollaborationUse) {

-			CollaborationUse owner = (CollaborationUse) domainElement.getOwner();

-			if (owner.getRoleBindings().contains(domainElement)) {

+		if(domainElement.getOwner() instanceof CollaborationUse) {

+			CollaborationUse owner = (CollaborationUse)domainElement.getOwner();

+			if(owner.getRoleBindings().contains(domainElement)) {

 				return true;

 			}

 		}

@@ -5992,9 +5991,9 @@ public class UMLVisualIDRegistry {
 	 */

 	private static boolean isDependency_4010(Dependency domainElement) {

 		// Test if the dependency is not a RoleBinding

-		if (domainElement.getOwner() instanceof CollaborationUse) {

-			CollaborationUse owner = (CollaborationUse) domainElement.getOwner();

-			if (owner.getRoleBindings().contains(domainElement)) {

+		if(domainElement.getOwner() instanceof CollaborationUse) {

+			CollaborationUse owner = (CollaborationUse)domainElement.getOwner();

+			if(owner.getRoleBindings().contains(domainElement)) {

 				return false;

 			}

 		}

@@ -6005,8 +6004,8 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {

-		if (candidate == -1) {

-			// unrecognized id is always bad

+		if(candidate == -1) {

+			//unrecognized id is always bad

 			return false;

 		}

 		int basic = getNodeVisualID(containerView, domainElement);

@@ -6017,7 +6016,7 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static boolean isCompartmentVisualID(int visualID) {

-		switch (visualID) {

+		switch(visualID) {

 		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

 		case DataTypeOperationCompartmentEditPart.VISUAL_ID:

 		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

@@ -6060,7 +6059,7 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static boolean isSemanticLeafVisualID(int visualID) {

-		switch (visualID) {

+		switch(visualID) {

 		case CompositeStructureDiagramEditPart.VISUAL_ID:

 			return false;

 		case PrimitiveTypeEditPart.VISUAL_ID:

@@ -6131,6 +6130,7 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static final DiagramStructure TYPED_INSTANCE = new DiagramStructure() {

+

 		/**

 		 * @generated

 		 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java
index f389e5c3fd8..205831521a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -71,22 +71,18 @@ public class ValidateAction extends Action {
 	/**

 	 * @generated

 	 */

-	@Override

 	public void run() {

 		IWorkbenchPart workbenchPart = page.getActivePart();

-		if (workbenchPart instanceof IDiagramWorkbenchPart) {

-			final IDiagramWorkbenchPart part = (IDiagramWorkbenchPart) workbenchPart;

+		if(workbenchPart instanceof IDiagramWorkbenchPart) {

+			final IDiagramWorkbenchPart part = (IDiagramWorkbenchPart)workbenchPart;

 			try {

-				new WorkspaceModifyDelegatingOperation(

-						new IRunnableWithProgress() {

+				new WorkspaceModifyDelegatingOperation(new IRunnableWithProgress() {

 

-							@Override

-							public void run(IProgressMonitor monitor)

-									throws InterruptedException, InvocationTargetException {

-								runValidation(part.getDiagramEditPart(), part.getDiagram());

-							}

-						})

-						.run(new NullProgressMonitor());

+					@Override

+					public void run(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException {

+						runValidation(part.getDiagramEditPart(), part.getDiagram());

+					}

+				}).run(new NullProgressMonitor());

 			} catch (Exception e) {

 				UMLDiagramEditorPlugin.getInstance().logError("Validation action failed", e); //$NON-NLS-1$

 			}

@@ -98,12 +94,10 @@ public class ValidateAction extends Action {
 	 */

 	public static void runValidation(View view) {

 		try {

-			if (UMLDiagramEditorUtil.openDiagram(view.eResource())) {

-				IEditorPart editorPart = PlatformUI.getWorkbench()

-						.getActiveWorkbenchWindow().getActivePage().getActiveEditor();

-				if (editorPart instanceof IDiagramWorkbenchPart) {

-					runValidation(((IDiagramWorkbenchPart) editorPart).

-							getDiagramEditPart(), view);

+			if(UMLDiagramEditorUtil.openDiagram(view.eResource())) {

+				IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();

+				if(editorPart instanceof IDiagramWorkbenchPart) {

+					runValidation(((IDiagramWorkbenchPart)editorPart).getDiagramEditPart(), view);

 				} else {

 					runNonUIValidation(view);

 				}

@@ -118,13 +112,10 @@ public class ValidateAction extends Action {
 	 */

 	public static void runNonUIValidation(View view) {

 		Shell shell = Display.getCurrent().getActiveShell();

-		if (shell == null) {

+		if(shell == null) {

 			shell = new Shell();

 		}

-

-		DiagramEditPart diagramEditPart =

-				OffscreenEditPartFactory.getInstance().createDiagramEditPart(

-						view.getDiagram(), shell);

+		DiagramEditPart diagramEditPart = OffscreenEditPartFactory.getInstance().createDiagramEditPart(view.getDiagram(), shell);

 		runValidation(diagramEditPart, view);

 	}

 

@@ -148,7 +139,7 @@ public class ValidateAction extends Action {
 	 * @generated

 	 */

 	private static Diagnostic runEMFValidator(View target) {

-		if (target.isSetElement() && target.getElement() != null) {

+		if(target.isSetElement() && target.getElement() != null) {

 			return new Diagnostician() {

 

 				@Override

@@ -164,19 +155,15 @@ public class ValidateAction extends Action {
 	 * @generated

 	 */

 	private static void validate(DiagramEditPart diagramEditPart, View view) {

-		IFile target = view.eResource() != null ?

-				WorkspaceSynchronizer.getFile(view.eResource()) : null;

-		if (target != null) {

+		IFile target = view.eResource() != null ? WorkspaceSynchronizer.getFile(view.eResource()) : null;

+		if(target != null) {

 			UMLMarkerNavigationProvider.deleteMarkers(target);

 		}

 		Diagnostic diagnostic = runEMFValidator(view);

 		createMarkers(target, diagnostic, diagramEditPart);

-		IBatchValidator validator =

-				(IBatchValidator)

-				ModelValidationService.getInstance().newValidator(

-						EvaluationMode.BATCH);

+		IBatchValidator validator = (IBatchValidator)ModelValidationService.getInstance().newValidator(EvaluationMode.BATCH);

 		validator.setIncludeLiveConstraints(true);

-		if (view.isSetElement() && view.getElement() != null) {

+		if(view.isSetElement() && view.getElement() != null) {

 			IStatus status = validator.validate(view.getElement());

 			createMarkers(target, status, diagramEditPart);

 		}

@@ -185,51 +172,37 @@ public class ValidateAction extends Action {
 	/**

 	 * @generated

 	 */

-	private static void createMarkers(IFile

-			target, IStatus validationStatus, DiagramEditPart diagramEditPart) {

-		if (validationStatus.isOK()) {

+	private static void createMarkers(IFile target, IStatus validationStatus, DiagramEditPart diagramEditPart) {

+		if(validationStatus.isOK()) {

 			return;

 		}

 		final IStatus rootStatus = validationStatus;

 		List allStatuses = new ArrayList();

-		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(

-				diagramEditPart.getDiagramView(),

-				collectTargetElements(rootStatus, new HashSet<EObject>(), allStatuses));

-		for (Iterator it = allStatuses.iterator(); it.hasNext();) {

-			IConstraintStatus nextStatus =

-					(IConstraintStatus) it.next();

-			View view = UMLDiagramEditorUtil.findView(

-					diagramEditPart, nextStatus.getTarget(), element2ViewMap);

-			addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view),

-					EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true),

-					nextStatus.getMessage(), nextStatus.getSeverity());

+		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(diagramEditPart.getDiagramView(), collectTargetElements(rootStatus, new HashSet<EObject>(), allStatuses));

+		for(Iterator it = allStatuses.iterator(); it.hasNext();) {

+			IConstraintStatus nextStatus = (IConstraintStatus)it.next();

+			View view = UMLDiagramEditorUtil.findView(diagramEditPart, nextStatus.getTarget(), element2ViewMap);

+			addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view), EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true), nextStatus.getMessage(), nextStatus.getSeverity());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	private static void createMarkers(IFile

-			target, Diagnostic emfValidationStatus, DiagramEditPart diagramEditPart) {

-		if (emfValidationStatus.getSeverity() == Diagnostic.OK) {

+	private static void createMarkers(IFile target, Diagnostic emfValidationStatus, DiagramEditPart diagramEditPart) {

+		if(emfValidationStatus.getSeverity() == Diagnostic.OK) {

 			return;

 		}

 		final Diagnostic rootStatus = emfValidationStatus;

 		List<Diagnostic> allDiagnostics = new ArrayList<Diagnostic>();

-		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap =

-				new UMLDiagramEditorUtil.LazyElement2ViewMap(

-						diagramEditPart.getDiagramView(),

-						collectTargetElements(rootStatus, new HashSet<EObject>(), allDiagnostics));

-		for (Iterator<Diagnostic> it = emfValidationStatus.getChildren().iterator(); it.hasNext();) {

+		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(diagramEditPart.getDiagramView(), collectTargetElements(rootStatus, new HashSet<EObject>(), allDiagnostics));

+		for(Iterator<Diagnostic> it = emfValidationStatus.getChildren().iterator(); it.hasNext();) {

 			Diagnostic nextDiagnostic = it.next();

 			List<?> data = nextDiagnostic.getData();

-			if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) {

-				EObject element = (EObject) data.get(0);

-				View view = UMLDiagramEditorUtil.findView(

-						diagramEditPart, element, element2ViewMap);

-				addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view),

-						EMFCoreUtil.getQualifiedName(element, true),

-						nextDiagnostic.getMessage(), diagnosticToStatusSeverity(nextDiagnostic.getSeverity()));

+			if(data != null && !data.isEmpty() && data.get(0) instanceof EObject) {

+				EObject element = (EObject)data.get(0);

+				View view = UMLDiagramEditorUtil.findView(diagramEditPart, element, element2ViewMap);

+				addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view), EMFCoreUtil.getQualifiedName(element, true), nextDiagnostic.getMessage(), diagnosticToStatusSeverity(nextDiagnostic.getSeverity()));

 			}

 		}

 	}

@@ -237,27 +210,24 @@ public class ValidateAction extends Action {
 	/**

 	 * @generated

 	 */

-	private static void addMarker(EditPartViewer viewer, IFile

-			target, String elementId, String location, String message, int statusSeverity) {

-		if (target == null) {

+	private static void addMarker(EditPartViewer viewer, IFile target, String elementId, String location, String message, int statusSeverity) {

+		if(target == null) {

 			return;

 		}

-		UMLMarkerNavigationProvider.addMarker(

-				target, elementId, location, message, statusSeverity);

+		UMLMarkerNavigationProvider.addMarker(target, elementId, location, message, statusSeverity);

 	}

 

 	/**

 	 * @generated

 	 */

 	private static int diagnosticToStatusSeverity(int diagnosticSeverity) {

-		if (diagnosticSeverity == Diagnostic.OK) {

+		if(diagnosticSeverity == Diagnostic.OK) {

 			return IStatus.OK;

-		} else if (diagnosticSeverity == Diagnostic.INFO) {

+		} else if(diagnosticSeverity == Diagnostic.INFO) {

 			return IStatus.INFO;

-		} else if (diagnosticSeverity == Diagnostic.WARNING) {

+		} else if(diagnosticSeverity == Diagnostic.WARNING) {

 			return IStatus.WARNING;

-		} else if (diagnosticSeverity == Diagnostic.ERROR

-				|| diagnosticSeverity == Diagnostic.CANCEL) {

+		} else if(diagnosticSeverity == Diagnostic.ERROR || diagnosticSeverity == Diagnostic.CANCEL) {

 			return IStatus.ERROR;

 		}

 		return IStatus.INFO;

@@ -267,13 +237,13 @@ public class ValidateAction extends Action {
 	 * @generated

 	 */

 	private static Set<EObject> collectTargetElements(IStatus status, Set<EObject> targetElementCollector, List<IConstraintStatus> allConstraintStatuses) {

-		if (status instanceof IConstraintStatus) {

-			targetElementCollector.add(((IConstraintStatus) status).getTarget());

-			allConstraintStatuses.add((IConstraintStatus) status);

+		if(status instanceof IConstraintStatus) {

+			targetElementCollector.add(((IConstraintStatus)status).getTarget());

+			allConstraintStatuses.add((IConstraintStatus)status);

 		}

-		if (status.isMultiStatus()) {

+		if(status.isMultiStatus()) {

 			IStatus[] children = status.getChildren();

-			for (int i = 0; i < children.length; i++) {

+			for(int i = 0; i < children.length; i++) {

 				collectTargetElements(children[i], targetElementCollector, allConstraintStatuses);

 			}

 		}

@@ -286,15 +256,14 @@ public class ValidateAction extends Action {
 	private static Set<EObject> collectTargetElements(Diagnostic diagnostic, Set<EObject> targetElementCollector, List<Diagnostic> allDiagnostics) {

 		List<?> data = diagnostic.getData();

 		EObject target = null;

-		if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) {

-			target = (EObject) data.get(0);

+		if(data != null && !data.isEmpty() && data.get(0) instanceof EObject) {

+			target = (EObject)data.get(0);

 			targetElementCollector.add(target);

 			allDiagnostics.add(diagnostic);

 		}

-		if (diagnostic.getChildren() != null && !diagnostic.getChildren().isEmpty()) {

-			for (Iterator<Diagnostic> it = diagnostic.getChildren().iterator(); it.hasNext();) {

-				collectTargetElements(it.next(),

-						targetElementCollector, allDiagnostics);

+		if(diagnostic.getChildren() != null && !diagnostic.getChildren().isEmpty()) {

+			for(Iterator<Diagnostic> it = diagnostic.getChildren().iterator(); it.hasNext();) {

+				collectTargetElements(it.next(), targetElementCollector, allDiagnostics);

 			}

 		}

 		return targetElementCollector;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramAppearancePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramAppearancePreferencePage.java
index 767d6fe1560..7598c57d08e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramAppearancePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramAppearancePreferencePage.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramConnectionsPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramConnectionsPreferencePage.java
index 38f0f66b7e6..6eb65b2edf2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramConnectionsPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramConnectionsPreferencePage.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramGeneralPreferencePage.java
index ea1e9349363..5fd97c2931a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramGeneralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramGeneralPreferencePage.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPreferenceInitializer.java
index c0e72ad7994..c1212cb14e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPreferenceInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPreferenceInitializer.java
@@ -1,22 +1,17 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.composite.preferences;

 

 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

-import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;

-import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;

-import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramsPreferencePage;

-import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;

-import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -28,15 +23,13 @@ public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer
 	/**

 	 * @generated

 	 */

-	@Override

 	public void initializeDefaultPreferences() {

 		IPreferenceStore store = getPreferenceStore();

-		DiagramsPreferencePage.initDefaults(store);

-		AppearancePreferencePage.initDefaults(store);

-		ConnectionsPreferencePage.initDefaults(store);

-		PrintingPreferencePage.initDefaults(store);

-		RulerGridPreferencePage.initDefaults(store);

-

+		DiagramGeneralPreferencePage.initDefaults(store);

+		DiagramAppearancePreferencePage.initDefaults(store);

+		DiagramConnectionsPreferencePage.initDefaults(store);

+		DiagramPrintingPreferencePage.initDefaults(store);

+		DiagramRulersAndGridPreferencePage.initDefaults(store);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPrintingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPrintingPreferencePage.java
index 525ec4343bb..cd895de9451 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPrintingPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPrintingPreferencePage.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramRulersAndGridPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramRulersAndGridPreferencePage.java
index 6191193169f..364930abff9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramRulersAndGridPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramRulersAndGridPreferencePage.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java
index c58a3fc8aa7..d8b40697b31 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java
index 29cb127f9eb..92f285b4f4d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -25,8 +25,6 @@ public class UMLEditPartProvider extends DefaultEditPartProvider {
 	 * @generated

 	 */

 	public UMLEditPartProvider() {

-		super(new UMLEditPartFactory(),

-				UMLVisualIDRegistry.TYPED_INSTANCE,

-				CompositeStructureDiagramEditPart.MODEL_ID);

+		super(new UMLEditPartFactory(), UMLVisualIDRegistry.TYPED_INSTANCE, CompositeStructureDiagramEditPart.MODEL_ID);

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java
index e1ec1614527..1ef0c13234f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -327,7 +327,7 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	public static final IElementType ConnectableElement_3115 = getElementType("org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"); //$NON-NLS-1$

+	public static final IElementType ConnectableElement_3115 = getElementType("org.eclipse.papyrus.uml.diagram.composite.CollaborationRole_3115"); //$NON-NLS-1$

 

 	/**

 	 * @generated

@@ -619,318 +619,116 @@ public class UMLElementTypes {
 

 	/**

 	 * Returns 'type' of the ecore object associated with the hint.

-	 *

+	 * 

 	 * @generated

 	 */

 	public static synchronized ENamedElement getElement(IAdaptable hint) {

 		Object type = hint.getAdapter(IElementType.class);

-		if (elements == null) {

+		if(elements == null) {

 			elements = new IdentityHashMap<IElementType, ENamedElement>();

-

 			elements.put(Package_1000, UMLPackage.eINSTANCE.getPackage());

-

-

 			elements.put(Activity_2060, UMLPackage.eINSTANCE.getActivity());

-

-

 			elements.put(Interaction_2061, UMLPackage.eINSTANCE.getInteraction());

-

-

 			elements.put(ProtocolStateMachine_2062, UMLPackage.eINSTANCE.getProtocolStateMachine());

-

-

 			elements.put(StateMachine_2063, UMLPackage.eINSTANCE.getStateMachine());

-

-

 			elements.put(FunctionBehavior_2064, UMLPackage.eINSTANCE.getFunctionBehavior());

-

-

 			elements.put(OpaqueBehavior_2065, UMLPackage.eINSTANCE.getOpaqueBehavior());

-

-

 			elements.put(Component_2069, UMLPackage.eINSTANCE.getComponent());

-

-

 			elements.put(Device_2070, UMLPackage.eINSTANCE.getDevice());

-

-

 			elements.put(ExecutionEnvironment_2071, UMLPackage.eINSTANCE.getExecutionEnvironment());

-

-

 			elements.put(Node_2072, UMLPackage.eINSTANCE.getNode());

-

-

 			elements.put(Class_2073, UMLPackage.eINSTANCE.getClass_());

-

-

 			elements.put(Collaboration_2075, UMLPackage.eINSTANCE.getCollaboration());

-

-

 			elements.put(Interface_2076, UMLPackage.eINSTANCE.getInterface());

-

-

 			elements.put(PrimitiveType_2066, UMLPackage.eINSTANCE.getPrimitiveType());

-

-

 			elements.put(Enumeration_2067, UMLPackage.eINSTANCE.getEnumeration());

-

-

 			elements.put(DataType_2068, UMLPackage.eINSTANCE.getDataType());

-

-

 			elements.put(Actor_2077, UMLPackage.eINSTANCE.getActor());

-

-

 			elements.put(DeploymentSpecification_2078, UMLPackage.eINSTANCE.getDeploymentSpecification());

-

-

 			elements.put(Artifact_2079, UMLPackage.eINSTANCE.getArtifact());

-

-

 			elements.put(InformationItem_2080, UMLPackage.eINSTANCE.getInformationItem());

-

-

 			elements.put(Signal_2081, UMLPackage.eINSTANCE.getSignal());

-

-

 			elements.put(UseCase_2082, UMLPackage.eINSTANCE.getUseCase());

-

-

 			elements.put(SignalEvent_2083, UMLPackage.eINSTANCE.getSignalEvent());

-

-

 			elements.put(CallEvent_2084, UMLPackage.eINSTANCE.getCallEvent());

-

-

 			elements.put(AnyReceiveEvent_2085, UMLPackage.eINSTANCE.getAnyReceiveEvent());

-

-

 			elements.put(ChangeEvent_2088, UMLPackage.eINSTANCE.getChangeEvent());

-

-

 			elements.put(TimeEvent_2089, UMLPackage.eINSTANCE.getTimeEvent());

-

-

 			elements.put(DurationObservation_2093, UMLPackage.eINSTANCE.getDurationObservation());

-

-

 			elements.put(TimeObservation_2094, UMLPackage.eINSTANCE.getTimeObservation());

-

-

 			elements.put(LiteralBoolean_2095, UMLPackage.eINSTANCE.getLiteralBoolean());

-

-

 			elements.put(LiteralInteger_2096, UMLPackage.eINSTANCE.getLiteralInteger());

-

-

 			elements.put(LiteralNull_2097, UMLPackage.eINSTANCE.getLiteralNull());

-

-

 			elements.put(LiteralString_2098, UMLPackage.eINSTANCE.getLiteralString());

-

-

 			elements.put(LiteralUnlimitedNatural_2099, UMLPackage.eINSTANCE.getLiteralUnlimitedNatural());

-

-

 			elements.put(StringExpression_2100, UMLPackage.eINSTANCE.getStringExpression());

-

-

 			elements.put(OpaqueExpression_2101, UMLPackage.eINSTANCE.getOpaqueExpression());

-

-

 			elements.put(TimeExpression_2102, UMLPackage.eINSTANCE.getTimeExpression());

-

-

 			elements.put(Expression_2103, UMLPackage.eINSTANCE.getExpression());

-

-

 			elements.put(Duration_2104, UMLPackage.eINSTANCE.getDuration());

-

-

 			elements.put(TimeInterval_2105, UMLPackage.eINSTANCE.getTimeInterval());

-

-

 			elements.put(DurationInterval_2106, UMLPackage.eINSTANCE.getDurationInterval());

-

-

 			elements.put(Interval_2107, UMLPackage.eINSTANCE.getInterval());

-

-

 			elements.put(InstanceValue_2108, UMLPackage.eINSTANCE.getInstanceValue());

-

-

 			elements.put(Comment_2109, UMLPackage.eINSTANCE.getComment());

-

-

 			elements.put(DurationConstraint_2110, UMLPackage.eINSTANCE.getDurationConstraint());

-

-

 			elements.put(TimeConstraint_2111, UMLPackage.eINSTANCE.getTimeConstraint());

-

-

 			elements.put(IntervalConstraint_2112, UMLPackage.eINSTANCE.getIntervalConstraint());

-

-

 			elements.put(InteractionConstraint_2113, UMLPackage.eINSTANCE.getInteractionConstraint());

-

-

 			elements.put(Constraint_2114, UMLPackage.eINSTANCE.getConstraint());

-

-

 			elements.put(Port_3069, UMLPackage.eINSTANCE.getPort());

-

-

 			elements.put(Parameter_3088, UMLPackage.eINSTANCE.getParameter());

-

-

 			elements.put(Property_3070, UMLPackage.eINSTANCE.getProperty());

-

-

 			elements.put(ConnectableElement_3115, UMLPackage.eINSTANCE.getConnectableElement());

-

-

 			elements.put(CollaborationUse_3071, UMLPackage.eINSTANCE.getCollaborationUse());

-

-

 			elements.put(Activity_3072, UMLPackage.eINSTANCE.getActivity());

-

-

 			elements.put(Interaction_3073, UMLPackage.eINSTANCE.getInteraction());

-

-

 			elements.put(ProtocolStateMachine_3074, UMLPackage.eINSTANCE.getProtocolStateMachine());

-

-

 			elements.put(StateMachine_3075, UMLPackage.eINSTANCE.getStateMachine());

-

-

 			elements.put(FunctionBehavior_3076, UMLPackage.eINSTANCE.getFunctionBehavior());

-

-

 			elements.put(OpaqueBehavior_3077, UMLPackage.eINSTANCE.getOpaqueBehavior());

-

-

 			elements.put(Component_3081, UMLPackage.eINSTANCE.getComponent());

-

-

 			elements.put(Device_3082, UMLPackage.eINSTANCE.getDevice());

-

-

 			elements.put(ExecutionEnvironment_3083, UMLPackage.eINSTANCE.getExecutionEnvironment());

-

-

 			elements.put(Node_3084, UMLPackage.eINSTANCE.getNode());

-

-

 			elements.put(Class_3085, UMLPackage.eINSTANCE.getClass_());

-

-

 			elements.put(Collaboration_3086, UMLPackage.eINSTANCE.getCollaboration());

-

-

 			elements.put(Interface_3087, UMLPackage.eINSTANCE.getInterface());

-

-

 			elements.put(PrimitiveType_3078, UMLPackage.eINSTANCE.getPrimitiveType());

-

-

 			elements.put(Enumeration_3079, UMLPackage.eINSTANCE.getEnumeration());

-

-

 			elements.put(DataType_3080, UMLPackage.eINSTANCE.getDataType());

-

-

 			elements.put(Actor_3091, UMLPackage.eINSTANCE.getActor());

-

-

 			elements.put(DeploymentSpecification_3092, UMLPackage.eINSTANCE.getDeploymentSpecification());

-

-

 			elements.put(Artifact_3093, UMLPackage.eINSTANCE.getArtifact());

-

-

 			elements.put(InformationItem_3094, UMLPackage.eINSTANCE.getInformationItem());

-

-

 			elements.put(Signal_3095, UMLPackage.eINSTANCE.getSignal());

-

-

 			elements.put(UseCase_3096, UMLPackage.eINSTANCE.getUseCase());

-

-

 			elements.put(Comment_3097, UMLPackage.eINSTANCE.getComment());

-

-

 			elements.put(DurationConstraint_3116, UMLPackage.eINSTANCE.getDurationConstraint());

-

-

 			elements.put(TimeConstraint_3117, UMLPackage.eINSTANCE.getTimeConstraint());

-

-

 			elements.put(IntervalConstraint_3118, UMLPackage.eINSTANCE.getIntervalConstraint());

-

-

 			elements.put(InteractionConstraint_3119, UMLPackage.eINSTANCE.getInteractionConstraint());

-

-

 			elements.put(Constraint_3120, UMLPackage.eINSTANCE.getConstraint());

-

-

 			elements.put(Property_3101, UMLPackage.eINSTANCE.getProperty());

-

-

 			elements.put(Operation_3102, UMLPackage.eINSTANCE.getOperation());

-

-

 			elements.put(EnumerationLiteral_3066, UMLPackage.eINSTANCE.getEnumerationLiteral());

-

 			elements.put(CommentAnnotatedElement_4002, UMLPackage.eINSTANCE.getComment_AnnotatedElement());

-

 			elements.put(ConstraintConstrainedElement_4003, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());

-

-

 			elements.put(ComponentRealization_4004, UMLPackage.eINSTANCE.getComponentRealization());

-

-

 			elements.put(InterfaceRealization_4005, UMLPackage.eINSTANCE.getInterfaceRealization());

-

-

 			elements.put(Substitution_4011, UMLPackage.eINSTANCE.getSubstitution());

-

-

 			elements.put(Realization_4006, UMLPackage.eINSTANCE.getRealization());

-

-

 			elements.put(Manifestation_4012, UMLPackage.eINSTANCE.getManifestation());

-

-

 			elements.put(Abstraction_4007, UMLPackage.eINSTANCE.getAbstraction());

-

-

 			elements.put(Usage_4008, UMLPackage.eINSTANCE.getUsage());

-

-

 			elements.put(Deployment_4009, UMLPackage.eINSTANCE.getDeployment());

-

-

 			elements.put(Dependency_4017, UMLPackage.eINSTANCE.getDependency());

-

-

 			elements.put(Dependency_4010, UMLPackage.eINSTANCE.getDependency());

-

-

 			elements.put(Connector_4013, UMLPackage.eINSTANCE.getConnector());

-

-

 			elements.put(Generalization_4015, UMLPackage.eINSTANCE.getGeneralization());

-

 			elements.put(TimeObservationEvent_4018, UMLPackage.eINSTANCE.getTimeObservation_Event());

-

 			elements.put(DurationObservationEvent_4019, UMLPackage.eINSTANCE.getDurationObservation_Event());

-

 			elements.put(InformationItemRepresented_4020, UMLPackage.eINSTANCE.getInformationItem_Represented());

-

-

 			elements.put(InformationFlow_4021, UMLPackage.eINSTANCE.getInformationFlow());

 		}

 		return elements.get(type);

@@ -947,7 +745,7 @@ public class UMLElementTypes {
 	 * @generated

 	 */

 	public static synchronized boolean isKnownElementType(IElementType elementType) {

-		if (KNOWN_ELEMENT_TYPES == null) {

+		if(KNOWN_ELEMENT_TYPES == null) {

 			KNOWN_ELEMENT_TYPES = new HashSet<IElementType>();

 			KNOWN_ELEMENT_TYPES.add(Package_1000);

 			KNOWN_ELEMENT_TYPES.add(Activity_2060);

@@ -1057,14 +855,21 @@ public class UMLElementTypes {
 			KNOWN_ELEMENT_TYPES.add(InformationItemRepresented_4020);

 			KNOWN_ELEMENT_TYPES.add(InformationFlow_4021);

 		}

-		return KNOWN_ELEMENT_TYPES.contains(elementType);

+		boolean result = KNOWN_ELEMENT_TYPES.contains(elementType);

+		if(!result) {

+			IElementType[] supertypes = elementType.getAllSuperTypes();

+			for(int i = 0; !result && (i < supertypes.length); i++) {

+				result = KNOWN_ELEMENT_TYPES.contains(supertypes[i]);

+			}

+		}

+		return result;

 	}

 

 	/**

 	 * @generated

 	 */

 	public static IElementType getElementType(int visualID) {

-		switch (visualID) {

+		switch(visualID) {

 		case CompositeStructureDiagramEditPart.VISUAL_ID:

 			return Package_1000;

 		case ActivityCompositeEditPart.VISUAL_ID:

@@ -1312,4 +1117,18 @@ public class UMLElementTypes {
 			return org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.getElement(elementTypeAdapter);

 		}

 	};

+

+	/**

+	 * @generated

+	 */

+	public static boolean isKindOf(IElementType subtype, IElementType supertype) {

+		boolean result = subtype == supertype;

+		if(!result) {

+			IElementType[] supertypes = subtype.getAllSuperTypes();

+			for(int i = 0; !result && (i < supertypes.length); i++) {

+				result = supertype == supertypes[i];

+			}

+		}

+		return result;

+	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLIconProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLIconProvider.java
index 5cdb4c04ad8..f3a93eefb3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLIconProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLIconProvider.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java
index 6a5a870b8a3..eb6b08dbd36 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -39,23 +39,20 @@ public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationPr
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void doGotoMarker(IMarker marker) {

 		String elementId = marker.getAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, null);

-		if (elementId == null || !(getEditor() instanceof DiagramEditor)) {

+		if(elementId == null || !(getEditor() instanceof DiagramEditor)) {

 			return;

 		}

-		DiagramEditor editor =

-				(DiagramEditor) getEditor();

+		DiagramEditor editor = (DiagramEditor)getEditor();

 		Map<?, ?> editPartRegistry = editor.getDiagramGraphicalViewer().getEditPartRegistry();

 		EObject targetView = editor.getDiagram().eResource().getEObject(elementId);

-		if (targetView == null) {

+		if(targetView == null) {

 			return;

 		}

-		EditPart targetEditPart = (EditPart) editPartRegistry.get(targetView);

-		if (targetEditPart != null) {

-			UMLDiagramEditorUtil.selectElementsInDiagram(

-					editor, Arrays.asList(new EditPart[] { targetEditPart }));

+		EditPart targetEditPart = (EditPart)editPartRegistry.get(targetView);

+		if(targetEditPart != null) {

+			UMLDiagramEditorUtil.selectElementsInDiagram(editor, Arrays.asList(new EditPart[]{ targetEditPart }));

 		}

 	}

 

@@ -81,10 +78,9 @@ public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationPr
 			marker.setAttribute(IMarker.LOCATION, location);

 			marker.setAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, elementId);

 			int markerSeverity = IMarker.SEVERITY_INFO;

-			if (statusSeverity == IStatus.WARNING) {

+			if(statusSeverity == IStatus.WARNING) {

 				markerSeverity = IMarker.SEVERITY_WARNING;

-			} else if (statusSeverity == IStatus.ERROR ||

-					statusSeverity == IStatus.CANCEL) {

+			} else if(statusSeverity == IStatus.ERROR || statusSeverity == IStatus.CANCEL) {

 				markerSeverity = IMarker.SEVERITY_ERROR;

 			}

 			marker.setAttribute(IMarker.SEVERITY, markerSeverity);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java
index c23e590fff8..b23bb35a62c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -46,10 +46,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActivityName_5112Parser() {

-		if (activityName_5112Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(activityName_5112Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -68,10 +66,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActivityName_6079Parser() {

-		if (activityName_6079Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(activityName_6079Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			activityName_6079Parser = parser;

 		}

@@ -87,10 +83,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInteractionName_5113Parser() {

-		if (interactionName_5113Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(interactionName_5113Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -109,10 +103,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInteractionName_6080Parser() {

-		if (interactionName_6080Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(interactionName_6080Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interactionName_6080Parser = parser;

 		}

@@ -128,10 +120,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getProtocolStateMachineName_5114Parser() {

-		if (protocolStateMachineName_5114Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(protocolStateMachineName_5114Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -150,10 +140,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getProtocolStateMachineName_6081Parser() {

-		if (protocolStateMachineName_6081Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(protocolStateMachineName_6081Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			protocolStateMachineName_6081Parser = parser;

 		}

@@ -169,10 +157,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getStateMachineName_5115Parser() {

-		if (stateMachineName_5115Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(stateMachineName_5115Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -191,10 +177,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getStateMachineName_6082Parser() {

-		if (stateMachineName_6082Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(stateMachineName_6082Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			stateMachineName_6082Parser = parser;

 		}

@@ -210,10 +194,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getFunctionBehaviorName_5116Parser() {

-		if (functionBehaviorName_5116Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(functionBehaviorName_5116Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -232,10 +214,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getFunctionBehaviorName_6083Parser() {

-		if (functionBehaviorName_6083Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(functionBehaviorName_6083Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			functionBehaviorName_6083Parser = parser;

 		}

@@ -251,10 +231,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getOpaqueBehaviorName_5117Parser() {

-		if (opaqueBehaviorName_5117Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(opaqueBehaviorName_5117Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -273,10 +251,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getOpaqueBehaviorName_6084Parser() {

-		if (opaqueBehaviorName_6084Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(opaqueBehaviorName_6084Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			opaqueBehaviorName_6084Parser = parser;

 		}

@@ -292,10 +268,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getComponentName_5121Parser() {

-		if (componentName_5121Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(componentName_5121Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -314,10 +288,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getComponentName_6085Parser() {

-		if (componentName_6085Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(componentName_6085Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			componentName_6085Parser = parser;

 		}

@@ -333,10 +305,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDeviceName_5122Parser() {

-		if (deviceName_5122Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(deviceName_5122Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -355,10 +325,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDeviceName_6086Parser() {

-		if (deviceName_6086Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(deviceName_6086Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deviceName_6086Parser = parser;

 		}

@@ -374,10 +342,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getExecutionEnvironmentName_5123Parser() {

-		if (executionEnvironmentName_5123Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(executionEnvironmentName_5123Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -396,10 +362,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getExecutionEnvironmentName_6087Parser() {

-		if (executionEnvironmentName_6087Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(executionEnvironmentName_6087Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			executionEnvironmentName_6087Parser = parser;

 		}

@@ -415,10 +379,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getNodeName_5124Parser() {

-		if (nodeName_5124Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(nodeName_5124Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -437,10 +399,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getNodeName_6088Parser() {

-		if (nodeName_6088Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(nodeName_6088Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			nodeName_6088Parser = parser;

 		}

@@ -456,10 +416,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getClassName_5156Parser() {

-		if (className_5156Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(className_5156Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -478,10 +436,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getClassName_6089Parser() {

-		if (className_6089Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(className_6089Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			className_6089Parser = parser;

 		}

@@ -497,10 +453,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getCollaborationName_5158Parser() {

-		if (collaborationName_5158Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(collaborationName_5158Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -519,10 +473,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getCollaborationName_6090Parser() {

-		if (collaborationName_6090Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(collaborationName_6090Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			collaborationName_6090Parser = parser;

 		}

@@ -538,10 +490,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInterfaceName_5159Parser() {

-		if (interfaceName_5159Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(interfaceName_5159Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -560,10 +510,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInterfaceName_6091Parser() {

-		if (interfaceName_6091Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(interfaceName_6091Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interfaceName_6091Parser = parser;

 		}

@@ -579,10 +527,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getPrimitiveTypeName_5118Parser() {

-		if (primitiveTypeName_5118Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(primitiveTypeName_5118Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -601,10 +547,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getPrimitiveTypeName_6092Parser() {

-		if (primitiveTypeName_6092Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(primitiveTypeName_6092Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			primitiveTypeName_6092Parser = parser;

 		}

@@ -620,10 +564,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getEnumerationName_5119Parser() {

-		if (enumerationName_5119Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(enumerationName_5119Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -642,10 +584,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getEnumerationName_6093Parser() {

-		if (enumerationName_6093Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(enumerationName_6093Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			enumerationName_6093Parser = parser;

 		}

@@ -661,10 +601,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDataTypeName_5120Parser() {

-		if (dataTypeName_5120Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(dataTypeName_5120Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -683,10 +621,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDataTypeName_6094Parser() {

-		if (dataTypeName_6094Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(dataTypeName_6094Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			dataTypeName_6094Parser = parser;

 		}

@@ -702,10 +638,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActorName_5160Parser() {

-		if (actorName_5160Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(actorName_5160Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -724,10 +658,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActorName_6095Parser() {

-		if (actorName_6095Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(actorName_6095Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			actorName_6095Parser = parser;

 		}

@@ -743,10 +675,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDeploymentSpecificationName_5161Parser() {

-		if (deploymentSpecificationName_5161Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(deploymentSpecificationName_5161Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -765,10 +695,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDeploymentSpecificationName_6096Parser() {

-		if (deploymentSpecificationName_6096Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(deploymentSpecificationName_6096Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deploymentSpecificationName_6096Parser = parser;

 		}

@@ -784,10 +712,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getArtifactName_5162Parser() {

-		if (artifactName_5162Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(artifactName_5162Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -806,10 +732,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getArtifactName_6097Parser() {

-		if (artifactName_6097Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(artifactName_6097Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			artifactName_6097Parser = parser;

 		}

@@ -825,10 +749,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInformationItemName_5163Parser() {

-		if (informationItemName_5163Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(informationItemName_5163Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -847,10 +769,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInformationItemName_6098Parser() {

-		if (informationItemName_6098Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(informationItemName_6098Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			informationItemName_6098Parser = parser;

 		}

@@ -866,10 +786,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getSignalName_5164Parser() {

-		if (signalName_5164Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(signalName_5164Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -888,10 +806,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getSignalName_6099Parser() {

-		if (signalName_6099Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(signalName_6099Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			signalName_6099Parser = parser;

 		}

@@ -907,10 +823,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getUseCaseName_5165Parser() {

-		if (useCaseName_5165Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(useCaseName_5165Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -929,10 +843,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getUseCaseName_6100Parser() {

-		if (useCaseName_6100Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(useCaseName_6100Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			useCaseName_6100Parser = parser;

 		}

@@ -948,10 +860,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getSignalEventName_5166Parser() {

-		if (signalEventName_5166Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(signalEventName_5166Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -970,10 +880,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getSignalEventName_6101Parser() {

-		if (signalEventName_6101Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(signalEventName_6101Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			signalEventName_6101Parser = parser;

 		}

@@ -989,10 +897,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getCallEventName_5167Parser() {

-		if (callEventName_5167Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(callEventName_5167Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1011,10 +917,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getCallEventName_6102Parser() {

-		if (callEventName_6102Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(callEventName_6102Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			callEventName_6102Parser = parser;

 		}

@@ -1030,10 +934,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getAnyReceiveEventName_5168Parser() {

-		if (anyReceiveEventName_5168Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(anyReceiveEventName_5168Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1052,10 +954,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getAnyReceiveEventName_6103Parser() {

-		if (anyReceiveEventName_6103Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(anyReceiveEventName_6103Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			anyReceiveEventName_6103Parser = parser;

 		}

@@ -1071,10 +971,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getChangeEventName_5171Parser() {

-		if (changeEventName_5171Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(changeEventName_5171Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1093,10 +991,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getChangeEventName_6104Parser() {

-		if (changeEventName_6104Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(changeEventName_6104Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			changeEventName_6104Parser = parser;

 		}

@@ -1112,10 +1008,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getTimeEventName_5172Parser() {

-		if (timeEventName_5172Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(timeEventName_5172Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1134,10 +1028,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getTimeEventName_6105Parser() {

-		if (timeEventName_6105Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(timeEventName_6105Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeEventName_6105Parser = parser;

 		}

@@ -1153,10 +1045,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDurationObservationName_5151Parser() {

-		if (durationObservationName_5151Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(durationObservationName_5151Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			durationObservationName_5151Parser = parser;

 		}

@@ -1172,7 +1062,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDurationObservationName_5152Parser() {

-		if (durationObservationName_5152Parser == null) {

+		if(durationObservationName_5152Parser == null) {

 			durationObservationName_5152Parser = new AppliedStereotypeParser();

 		}

 		return durationObservationName_5152Parser;

@@ -1187,10 +1077,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getTimeObservationName_5142Parser() {

-		if (timeObservationName_5142Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(timeObservationName_5142Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeObservationName_5142Parser = parser;

 		}

@@ -1206,7 +1094,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getTimeObservationName_5143Parser() {

-		if (timeObservationName_5143Parser == null) {

+		if(timeObservationName_5143Parser == null) {

 			timeObservationName_5143Parser = new AppliedStereotypeParser();

 		}

 		return timeObservationName_5143Parser;

@@ -1221,10 +1109,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getLiteralBooleanName_5178Parser() {

-		if (literalBooleanName_5178Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(literalBooleanName_5178Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1243,10 +1129,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getLiteralBooleanName_6106Parser() {

-		if (literalBooleanName_6106Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(literalBooleanName_6106Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			literalBooleanName_6106Parser = parser;

 		}

@@ -1262,10 +1146,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getLiteralIntegerName_5179Parser() {

-		if (literalIntegerName_5179Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(literalIntegerName_5179Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1284,10 +1166,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getLiteralIntegerName_6107Parser() {

-		if (literalIntegerName_6107Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(literalIntegerName_6107Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			literalIntegerName_6107Parser = parser;

 		}

@@ -1303,10 +1183,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getLiteralNullName_5180Parser() {

-		if (literalNullName_5180Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(literalNullName_5180Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1325,10 +1203,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getLiteralNullName_6108Parser() {

-		if (literalNullName_6108Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(literalNullName_6108Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			literalNullName_6108Parser = parser;

 		}

@@ -1344,10 +1220,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getLiteralStringName_5181Parser() {

-		if (literalStringName_5181Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(literalStringName_5181Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1366,10 +1240,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getLiteralStringName_6109Parser() {

-		if (literalStringName_6109Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(literalStringName_6109Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			literalStringName_6109Parser = parser;

 		}

@@ -1385,10 +1257,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getLiteralUnlimitedNaturalName_5182Parser() {

-		if (literalUnlimitedNaturalName_5182Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(literalUnlimitedNaturalName_5182Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1407,10 +1277,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getLiteralUnlimitedNaturalName_6110Parser() {

-		if (literalUnlimitedNaturalName_6110Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(literalUnlimitedNaturalName_6110Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			literalUnlimitedNaturalName_6110Parser = parser;

 		}

@@ -1426,10 +1294,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getStringExpressionName_5183Parser() {

-		if (stringExpressionName_5183Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(stringExpressionName_5183Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1448,10 +1314,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getStringExpressionName_6111Parser() {

-		if (stringExpressionName_6111Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(stringExpressionName_6111Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			stringExpressionName_6111Parser = parser;

 		}

@@ -1467,10 +1331,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getOpaqueExpressionName_5184Parser() {

-		if (opaqueExpressionName_5184Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(opaqueExpressionName_5184Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1489,10 +1351,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getOpaqueExpressionName_6112Parser() {

-		if (opaqueExpressionName_6112Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(opaqueExpressionName_6112Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			opaqueExpressionName_6112Parser = parser;

 		}

@@ -1508,10 +1368,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getTimeExpressionName_5185Parser() {

-		if (timeExpressionName_5185Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(timeExpressionName_5185Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1530,10 +1388,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getTimeExpressionName_6113Parser() {

-		if (timeExpressionName_6113Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(timeExpressionName_6113Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeExpressionName_6113Parser = parser;

 		}

@@ -1549,10 +1405,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getExpressionName_5186Parser() {

-		if (expressionName_5186Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(expressionName_5186Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1571,10 +1425,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getExpressionName_6114Parser() {

-		if (expressionName_6114Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(expressionName_6114Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			expressionName_6114Parser = parser;

 		}

@@ -1590,10 +1442,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDurationName_5187Parser() {

-		if (durationName_5187Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(durationName_5187Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1612,10 +1462,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDurationName_6115Parser() {

-		if (durationName_6115Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(durationName_6115Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			durationName_6115Parser = parser;

 		}

@@ -1631,10 +1479,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getTimeIntervalName_5188Parser() {

-		if (timeIntervalName_5188Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(timeIntervalName_5188Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1653,10 +1499,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getTimeIntervalName_6116Parser() {

-		if (timeIntervalName_6116Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(timeIntervalName_6116Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeIntervalName_6116Parser = parser;

 		}

@@ -1672,10 +1516,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDurationIntervalName_5189Parser() {

-		if (durationIntervalName_5189Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(durationIntervalName_5189Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1694,10 +1536,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDurationIntervalName_6117Parser() {

-		if (durationIntervalName_6117Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(durationIntervalName_6117Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			durationIntervalName_6117Parser = parser;

 		}

@@ -1713,10 +1553,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getIntervalName_5190Parser() {

-		if (intervalName_5190Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(intervalName_5190Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1735,10 +1573,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getIntervalName_6118Parser() {

-		if (intervalName_6118Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(intervalName_6118Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			intervalName_6118Parser = parser;

 		}

@@ -1754,10 +1590,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInstanceValueName_5191Parser() {

-		if (instanceValueName_5191Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(instanceValueName_5191Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1776,10 +1610,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInstanceValueName_6119Parser() {

-		if (instanceValueName_6119Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(instanceValueName_6119Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			instanceValueName_6119Parser = parser;

 		}

@@ -1795,7 +1627,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getCommentBody_5192Parser() {

-		if (commentBody_5192Parser == null) {

+		if(commentBody_5192Parser == null) {

 			commentBody_5192Parser = new CommentParser();

 		}

 		return commentBody_5192Parser;

@@ -1810,10 +1642,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDurationConstraintName_5193Parser() {

-		if (durationConstraintName_5193Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(durationConstraintName_5193Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			durationConstraintName_5193Parser = parser;

 		}

@@ -1829,7 +1659,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDurationConstraintSpecification_6035Parser() {

-		if (durationConstraintSpecification_6035Parser == null) {

+		if(durationConstraintSpecification_6035Parser == null) {

 			durationConstraintSpecification_6035Parser = new ConstraintParser();

 		}

 		return durationConstraintSpecification_6035Parser;

@@ -1844,10 +1674,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getTimeConstraintName_5194Parser() {

-		if (timeConstraintName_5194Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(timeConstraintName_5194Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeConstraintName_5194Parser = parser;

 		}

@@ -1863,7 +1691,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getTimeConstraintSpecification_6036Parser() {

-		if (timeConstraintSpecification_6036Parser == null) {

+		if(timeConstraintSpecification_6036Parser == null) {

 			timeConstraintSpecification_6036Parser = new ConstraintParser();

 		}

 		return timeConstraintSpecification_6036Parser;

@@ -1878,10 +1706,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getIntervalConstraintName_5195Parser() {

-		if (intervalConstraintName_5195Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(intervalConstraintName_5195Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			intervalConstraintName_5195Parser = parser;

 		}

@@ -1897,7 +1723,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getIntervalConstraintSpecification_6037Parser() {

-		if (intervalConstraintSpecification_6037Parser == null) {

+		if(intervalConstraintSpecification_6037Parser == null) {

 			intervalConstraintSpecification_6037Parser = new ConstraintParser();

 		}

 		return intervalConstraintSpecification_6037Parser;

@@ -1912,10 +1738,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInteractionConstraintName_5196Parser() {

-		if (interactionConstraintName_5196Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(interactionConstraintName_5196Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interactionConstraintName_5196Parser = parser;

 		}

@@ -1931,7 +1755,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInteractionConstraintSpecification_6038Parser() {

-		if (interactionConstraintSpecification_6038Parser == null) {

+		if(interactionConstraintSpecification_6038Parser == null) {

 			interactionConstraintSpecification_6038Parser = new ConstraintParser();

 		}

 		return interactionConstraintSpecification_6038Parser;

@@ -1946,10 +1770,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getConstraintName_5197Parser() {

-		if (constraintName_5197Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(constraintName_5197Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			constraintName_5197Parser = parser;

 		}

@@ -1965,7 +1787,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getConstraintSpecification_6039Parser() {

-		if (constraintSpecification_6039Parser == null) {

+		if(constraintSpecification_6039Parser == null) {

 			constraintSpecification_6039Parser = new ConstraintParser();

 		}

 		return constraintSpecification_6039Parser;

@@ -1980,10 +1802,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getNodeName_6053Parser() {

-		if (nodeName_6053Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(nodeName_6053Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			nodeName_6053Parser = parser;

 		}

@@ -1999,10 +1819,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getPortName_5125Parser() {

-		if (portName_5125Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(portName_5125Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			portName_5125Parser = parser;

 		}

@@ -2018,7 +1836,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getPortName_6029Parser() {

-		if (portName_6029Parser == null) {

+		if(portName_6029Parser == null) {

 			portName_6029Parser = new AppliedStereotypeParser();

 		}

 		return portName_6029Parser;

@@ -2033,10 +1851,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getParameterName_6033Parser() {

-		if (parameterName_6033Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(parameterName_6033Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parameterName_6033Parser = parser;

 		}

@@ -2052,7 +1868,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getParameterName_6034Parser() {

-		if (parameterName_6034Parser == null) {

+		if(parameterName_6034Parser == null) {

 			parameterName_6034Parser = new AppliedStereotypeParser();

 		}

 		return parameterName_6034Parser;

@@ -2067,10 +1883,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getPropertyName_5126Parser() {

-		if (propertyName_5126Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(propertyName_5126Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			propertyName_5126Parser = parser;

 		}

@@ -2086,10 +1900,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getPropertyName_6054Parser() {

-		if (propertyName_6054Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(propertyName_6054Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			propertyName_6054Parser = parser;

 		}

@@ -2105,10 +1917,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getConnectableElementName_5198Parser() {

-		if (connectableElementName_5198Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(connectableElementName_5198Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}"); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2127,10 +1937,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getConnectableElementName_6055Parser() {

-		if (connectableElementName_6055Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(connectableElementName_6055Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			connectableElementName_6055Parser = parser;

 		}

@@ -2146,10 +1954,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getCollaborationUseName_5127Parser() {

-		if (collaborationUseName_5127Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(collaborationUseName_5127Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			collaborationUseName_5127Parser = parser;

 		}

@@ -2165,10 +1971,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getCollaborationUseName_6056Parser() {

-		if (collaborationUseName_6056Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(collaborationUseName_6056Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			collaborationUseName_6056Parser = parser;

 		}

@@ -2184,10 +1988,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActivityName_5128Parser() {

-		if (activityName_5128Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(activityName_5128Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2206,10 +2008,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActivityName_6057Parser() {

-		if (activityName_6057Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(activityName_6057Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			activityName_6057Parser = parser;

 		}

@@ -2225,10 +2025,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInteractionName_5129Parser() {

-		if (interactionName_5129Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(interactionName_5129Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2247,10 +2045,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInteractionName_6058Parser() {

-		if (interactionName_6058Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(interactionName_6058Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interactionName_6058Parser = parser;

 		}

@@ -2266,10 +2062,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getProtocolStateMachineName_5130Parser() {

-		if (protocolStateMachineName_5130Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(protocolStateMachineName_5130Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2288,10 +2082,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getProtocolStateMachineName_6059Parser() {

-		if (protocolStateMachineName_6059Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(protocolStateMachineName_6059Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			protocolStateMachineName_6059Parser = parser;

 		}

@@ -2307,10 +2099,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getStateMachineName_5131Parser() {

-		if (stateMachineName_5131Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(stateMachineName_5131Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2329,10 +2119,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getStateMachineName_6060Parser() {

-		if (stateMachineName_6060Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(stateMachineName_6060Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			stateMachineName_6060Parser = parser;

 		}

@@ -2348,10 +2136,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getFunctionBehaviorName_5132Parser() {

-		if (functionBehaviorName_5132Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(functionBehaviorName_5132Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2370,10 +2156,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getFunctionBehaviorName_6061Parser() {

-		if (functionBehaviorName_6061Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(functionBehaviorName_6061Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			functionBehaviorName_6061Parser = parser;

 		}

@@ -2389,10 +2173,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getOpaqueBehaviorName_5133Parser() {

-		if (opaqueBehaviorName_5133Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(opaqueBehaviorName_5133Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2411,10 +2193,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getOpaqueBehaviorName_6062Parser() {

-		if (opaqueBehaviorName_6062Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(opaqueBehaviorName_6062Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			opaqueBehaviorName_6062Parser = parser;

 		}

@@ -2430,10 +2210,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getComponentName_5137Parser() {

-		if (componentName_5137Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(componentName_5137Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2452,10 +2230,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getComponentName_6063Parser() {

-		if (componentName_6063Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(componentName_6063Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			componentName_6063Parser = parser;

 		}

@@ -2471,10 +2247,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDeviceName_5138Parser() {

-		if (deviceName_5138Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(deviceName_5138Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2493,10 +2267,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDeviceName_6064Parser() {

-		if (deviceName_6064Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(deviceName_6064Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deviceName_6064Parser = parser;

 		}

@@ -2512,10 +2284,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getExecutionEnvironmentName_5139Parser() {

-		if (executionEnvironmentName_5139Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(executionEnvironmentName_5139Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2534,10 +2304,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getExecutionEnvironmentName_6065Parser() {

-		if (executionEnvironmentName_6065Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(executionEnvironmentName_6065Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			executionEnvironmentName_6065Parser = parser;

 		}

@@ -2553,10 +2321,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getNodeName_5140Parser() {

-		if (nodeName_5140Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(nodeName_5140Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2575,10 +2341,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getNodeName_6066Parser() {

-		if (nodeName_6066Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(nodeName_6066Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			nodeName_6066Parser = parser;

 		}

@@ -2594,10 +2358,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getClassName_5155Parser() {

-		if (className_5155Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(className_5155Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2616,10 +2378,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getClassName_6067Parser() {

-		if (className_6067Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(className_6067Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			className_6067Parser = parser;

 		}

@@ -2635,10 +2395,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getCollaborationName_5141Parser() {

-		if (collaborationName_5141Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(collaborationName_5141Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2657,10 +2415,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getCollaborationName_6068Parser() {

-		if (collaborationName_6068Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(collaborationName_6068Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			collaborationName_6068Parser = parser;

 		}

@@ -2676,10 +2432,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInterfaceName_5154Parser() {

-		if (interfaceName_5154Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(interfaceName_5154Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2698,10 +2452,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInterfaceName_6069Parser() {

-		if (interfaceName_6069Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(interfaceName_6069Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interfaceName_6069Parser = parser;

 		}

@@ -2717,10 +2469,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getPrimitiveTypeName_5134Parser() {

-		if (primitiveTypeName_5134Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(primitiveTypeName_5134Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2739,10 +2489,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getPrimitiveTypeName_6070Parser() {

-		if (primitiveTypeName_6070Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(primitiveTypeName_6070Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			primitiveTypeName_6070Parser = parser;

 		}

@@ -2758,10 +2506,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getEnumerationName_5135Parser() {

-		if (enumerationName_5135Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(enumerationName_5135Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2780,10 +2526,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getEnumerationName_6071Parser() {

-		if (enumerationName_6071Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(enumerationName_6071Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			enumerationName_6071Parser = parser;

 		}

@@ -2799,10 +2543,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDataTypeName_5136Parser() {

-		if (dataTypeName_5136Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(dataTypeName_5136Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2821,10 +2563,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDataTypeName_6072Parser() {

-		if (dataTypeName_6072Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(dataTypeName_6072Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			dataTypeName_6072Parser = parser;

 		}

@@ -2840,10 +2580,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActorName_5144Parser() {

-		if (actorName_5144Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(actorName_5144Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2862,10 +2600,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getActorName_6073Parser() {

-		if (actorName_6073Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(actorName_6073Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			actorName_6073Parser = parser;

 		}

@@ -2881,10 +2617,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDeploymentSpecificationName_5145Parser() {

-		if (deploymentSpecificationName_5145Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(deploymentSpecificationName_5145Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2903,10 +2637,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDeploymentSpecificationName_6074Parser() {

-		if (deploymentSpecificationName_6074Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(deploymentSpecificationName_6074Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deploymentSpecificationName_6074Parser = parser;

 		}

@@ -2922,10 +2654,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getArtifactName_5146Parser() {

-		if (artifactName_5146Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(artifactName_5146Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2944,10 +2674,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getArtifactName_6075Parser() {

-		if (artifactName_6075Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(artifactName_6075Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			artifactName_6075Parser = parser;

 		}

@@ -2963,10 +2691,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInformationItemName_5147Parser() {

-		if (informationItemName_5147Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(informationItemName_5147Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -2985,10 +2711,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInformationItemName_6076Parser() {

-		if (informationItemName_6076Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(informationItemName_6076Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			informationItemName_6076Parser = parser;

 		}

@@ -3004,10 +2728,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getSignalName_5148Parser() {

-		if (signalName_5148Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(signalName_5148Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -3026,10 +2748,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getSignalName_6077Parser() {

-		if (signalName_6077Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(signalName_6077Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			signalName_6077Parser = parser;

 		}

@@ -3045,10 +2765,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getUseCaseName_5149Parser() {

-		if (useCaseName_5149Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(useCaseName_5149Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -3067,10 +2785,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getUseCaseName_6078Parser() {

-		if (useCaseName_6078Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(useCaseName_6078Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			useCaseName_6078Parser = parser;

 		}

@@ -3086,7 +2802,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getCommentBody_5150Parser() {

-		if (commentBody_5150Parser == null) {

+		if(commentBody_5150Parser == null) {

 			commentBody_5150Parser = new CommentParser();

 		}

 		return commentBody_5150Parser;

@@ -3101,10 +2817,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDurationConstraintName_6040Parser() {

-		if (durationConstraintName_6040Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(durationConstraintName_6040Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			durationConstraintName_6040Parser = parser;

 		}

@@ -3120,7 +2834,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDurationConstraintSpecification_6041Parser() {

-		if (durationConstraintSpecification_6041Parser == null) {

+		if(durationConstraintSpecification_6041Parser == null) {

 			durationConstraintSpecification_6041Parser = new ConstraintParser();

 		}

 		return durationConstraintSpecification_6041Parser;

@@ -3135,10 +2849,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getTimeConstraintName_6042Parser() {

-		if (timeConstraintName_6042Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(timeConstraintName_6042Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeConstraintName_6042Parser = parser;

 		}

@@ -3154,7 +2866,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getTimeConstraintSpecification_6043Parser() {

-		if (timeConstraintSpecification_6043Parser == null) {

+		if(timeConstraintSpecification_6043Parser == null) {

 			timeConstraintSpecification_6043Parser = new ConstraintParser();

 		}

 		return timeConstraintSpecification_6043Parser;

@@ -3169,10 +2881,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getIntervalConstraintName_6044Parser() {

-		if (intervalConstraintName_6044Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(intervalConstraintName_6044Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			intervalConstraintName_6044Parser = parser;

 		}

@@ -3188,7 +2898,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getIntervalConstraintSpecification_6045Parser() {

-		if (intervalConstraintSpecification_6045Parser == null) {

+		if(intervalConstraintSpecification_6045Parser == null) {

 			intervalConstraintSpecification_6045Parser = new ConstraintParser();

 		}

 		return intervalConstraintSpecification_6045Parser;

@@ -3203,10 +2913,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInteractionConstraintName_6046Parser() {

-		if (interactionConstraintName_6046Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(interactionConstraintName_6046Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interactionConstraintName_6046Parser = parser;

 		}

@@ -3222,7 +2930,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInteractionConstraintSpecification_6047Parser() {

-		if (interactionConstraintSpecification_6047Parser == null) {

+		if(interactionConstraintSpecification_6047Parser == null) {

 			interactionConstraintSpecification_6047Parser = new ConstraintParser();

 		}

 		return interactionConstraintSpecification_6047Parser;

@@ -3237,10 +2945,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getConstraintName_6048Parser() {

-		if (constraintName_6048Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(constraintName_6048Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			constraintName_6048Parser = parser;

 		}

@@ -3256,7 +2962,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getConstraintSpecification_6049Parser() {

-		if (constraintSpecification_6049Parser == null) {

+		if(constraintSpecification_6049Parser == null) {

 			constraintSpecification_6049Parser = new ConstraintParser();

 		}

 		return constraintSpecification_6049Parser;

@@ -3271,10 +2977,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getProperty_3101Parser() {

-		if (property_3101Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(property_3101Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -3293,10 +2997,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getOperation_3102Parser() {

-		if (operation_3102Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(operation_3102Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -3315,10 +3017,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getEnumerationLiteral_3066Parser() {

-		if (enumerationLiteral_3066Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(enumerationLiteral_3066Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -3337,10 +3037,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getComponentRealizationName_6001Parser() {

-		if (componentRealizationName_6001Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(componentRealizationName_6001Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			componentRealizationName_6001Parser = parser;

 		}

@@ -3356,7 +3054,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getComponentRealizationName_6015Parser() {

-		if (componentRealizationName_6015Parser == null) {

+		if(componentRealizationName_6015Parser == null) {

 			componentRealizationName_6015Parser = new AppliedStereotypeParser();

 		}

 		return componentRealizationName_6015Parser;

@@ -3371,10 +3069,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInterfaceRealizationName_6002Parser() {

-		if (interfaceRealizationName_6002Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(interfaceRealizationName_6002Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interfaceRealizationName_6002Parser = parser;

 		}

@@ -3390,7 +3086,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInterfaceRealizationName_6016Parser() {

-		if (interfaceRealizationName_6016Parser == null) {

+		if(interfaceRealizationName_6016Parser == null) {

 			interfaceRealizationName_6016Parser = new AppliedStereotypeParser();

 		}

 		return interfaceRealizationName_6016Parser;

@@ -3405,10 +3101,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getSubstitutionName_6003Parser() {

-		if (substitutionName_6003Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(substitutionName_6003Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			substitutionName_6003Parser = parser;

 		}

@@ -3424,7 +3118,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getSubstitutionName_6017Parser() {

-		if (substitutionName_6017Parser == null) {

+		if(substitutionName_6017Parser == null) {

 			substitutionName_6017Parser = new AppliedStereotypeParser();

 		}

 		return substitutionName_6017Parser;

@@ -3439,10 +3133,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getRealizationName_6004Parser() {

-		if (realizationName_6004Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(realizationName_6004Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			realizationName_6004Parser = parser;

 		}

@@ -3458,7 +3150,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getRealizationName_6018Parser() {

-		if (realizationName_6018Parser == null) {

+		if(realizationName_6018Parser == null) {

 			realizationName_6018Parser = new AppliedStereotypeParser();

 		}

 		return realizationName_6018Parser;

@@ -3473,10 +3165,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getManifestationName_6005Parser() {

-		if (manifestationName_6005Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(manifestationName_6005Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			manifestationName_6005Parser = parser;

 		}

@@ -3492,7 +3182,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getManifestationName_6019Parser() {

-		if (manifestationName_6019Parser == null) {

+		if(manifestationName_6019Parser == null) {

 			manifestationName_6019Parser = new AppliedStereotypeParser();

 		}

 		return manifestationName_6019Parser;

@@ -3507,10 +3197,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getAbstractionName_6006Parser() {

-		if (abstractionName_6006Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(abstractionName_6006Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			abstractionName_6006Parser = parser;

 		}

@@ -3526,7 +3214,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getAbstractionName_6020Parser() {

-		if (abstractionName_6020Parser == null) {

+		if(abstractionName_6020Parser == null) {

 			abstractionName_6020Parser = new AppliedStereotypeParser();

 		}

 		return abstractionName_6020Parser;

@@ -3541,10 +3229,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getUsageName_6007Parser() {

-		if (usageName_6007Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(usageName_6007Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			usageName_6007Parser = parser;

 		}

@@ -3560,7 +3246,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getUsageName_6021Parser() {

-		if (usageName_6021Parser == null) {

+		if(usageName_6021Parser == null) {

 			usageName_6021Parser = new AppliedStereotypeParser();

 		}

 		return usageName_6021Parser;

@@ -3575,10 +3261,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDeploymentName_6008Parser() {

-		if (deploymentName_6008Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(deploymentName_6008Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deploymentName_6008Parser = parser;

 		}

@@ -3594,7 +3278,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDeploymentName_6022Parser() {

-		if (deploymentName_6022Parser == null) {

+		if(deploymentName_6022Parser == null) {

 			deploymentName_6022Parser = new AppliedStereotypeParser();

 		}

 		return deploymentName_6022Parser;

@@ -3609,7 +3293,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDependencyName_6027Parser() {

-		if (dependencyName_6027Parser == null) {

+		if(dependencyName_6027Parser == null) {

 			dependencyName_6027Parser = new RoleBindingRoleNameParser();

 		}

 		return dependencyName_6027Parser;

@@ -3624,7 +3308,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDependencyName_6028Parser() {

-		if (dependencyName_6028Parser == null) {

+		if(dependencyName_6028Parser == null) {

 			dependencyName_6028Parser = new AppliedStereotypeParser();

 		}

 		return dependencyName_6028Parser;

@@ -3639,10 +3323,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDependencyName_6009Parser() {

-		if (dependencyName_6009Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(dependencyName_6009Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			dependencyName_6009Parser = parser;

 		}

@@ -3658,7 +3340,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getDependencyName_6023Parser() {

-		if (dependencyName_6023Parser == null) {

+		if(dependencyName_6023Parser == null) {

 			dependencyName_6023Parser = new AppliedStereotypeParser();

 		}

 		return dependencyName_6023Parser;

@@ -3673,7 +3355,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getConnectorName_6025Parser() {

-		if (connectorName_6025Parser == null) {

+		if(connectorName_6025Parser == null) {

 			connectorName_6025Parser = new AppliedStereotypeParser();

 		}

 		return connectorName_6025Parser;

@@ -3688,10 +3370,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getConnectorName_6050Parser() {

-		if (connectorName_6050Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(connectorName_6050Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			connectorName_6050Parser = parser;

 		}

@@ -3707,10 +3387,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getConnectorName_6051Parser() {

-		if (connectorName_6051Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(connectorName_6051Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("sourceMul{0}"); //$NON-NLS-1$

 			parser.setEditorPattern("sourceMul{0}"); //$NON-NLS-1$

@@ -3729,10 +3407,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getConnectorName_6052Parser() {

-		if (connectorName_6052Parser == null) {

-			EAttribute[] features = new EAttribute[] {

-					UMLPackage.eINSTANCE.getNamedElement_Name()

-			};

+		if(connectorName_6052Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("targetMul{0}"); //$NON-NLS-1$

 			parser.setEditorPattern("targetMul{0}"); //$NON-NLS-1$

@@ -3751,7 +3427,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getGeneralizationIsSubstitutable_6024Parser() {

-		if (generalizationIsSubstitutable_6024Parser == null) {

+		if(generalizationIsSubstitutable_6024Parser == null) {

 			generalizationIsSubstitutable_6024Parser = new AppliedStereotypeParser();

 		}

 		return generalizationIsSubstitutable_6024Parser;

@@ -3766,7 +3442,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	private IParser getInformationFlowName_6032Parser() {

-		if (informationFlowName_6032Parser == null) {

+		if(informationFlowName_6032Parser == null) {

 			informationFlowName_6032Parser = new AppliedStereotypeParser();

 		}

 		return informationFlowName_6032Parser;

@@ -3776,476 +3452,379 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 * @generated

 	 */

 	protected IParser getParser(int visualID) {

-		switch (visualID) {

+		switch(visualID) {

 		case ActivityCompositeNameEditPart.VISUAL_ID:

 			return getActivityName_5112Parser();

 		case ActivityCompositeFloatingLabelEditPart.VISUAL_ID:

 			return getActivityName_6079Parser();

-

 		case InteractionCompositeNameEditPart.VISUAL_ID:

 			return getInteractionName_5113Parser();

 		case InteractionCompositeFloatingLabelEditPart.VISUAL_ID:

 			return getInteractionName_6080Parser();

-

 		case ProtocolStateMachineCompositeNameEditPart.VISUAL_ID:

 			return getProtocolStateMachineName_5114Parser();

 		case ProtocolStateMachineCompositeFloatingLabelEditPart.VISUAL_ID:

 			return getProtocolStateMachineName_6081Parser();

-

 		case StateMachineCompositeNameEditPart.VISUAL_ID:

 			return getStateMachineName_5115Parser();

 		case StateMachineCompositeFloatingLabelEditPart.VISUAL_ID:

 			return getStateMachineName_6082Parser();

-

 		case FunctionBehaviorCompositeNameEditPart.VISUAL_ID:

 			return getFunctionBehaviorName_5116Parser();

 		case FunctionBehaviorCompositeFloatingLabelEditPart.VISUAL_ID:

 			return getFunctionBehaviorName_6083Parser();

-

 		case OpaqueBehaviorCompositeNameEditPart.VISUAL_ID:

 			return getOpaqueBehaviorName_5117Parser();

 		case OpaqueBehaviorCompositeFloatingLabelEditPart.VISUAL_ID:

 			return getOpaqueBehaviorName_6084Parser();

-

 		case ComponentCompositeNameEditPart.VISUAL_ID:

 			return getComponentName_5121Parser();

 		case ComponentCompositeFloatingLabelEditPart.VISUAL_ID:

 			return getComponentName_6085Parser();

-

 		case DeviceCompositeNameEditPart.VISUAL_ID:

 			return getDeviceName_5122Parser();

 		case DeviceCompositeFloatingLabelEditPart.VISUAL_ID:

 			return getDeviceName_6086Parser();

-

 		case ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID:

 			return getExecutionEnvironmentName_5123Parser();

 		case ExecutionEnvironmentCompositeFloatingLabelEditPart.VISUAL_ID:

 			return getExecutionEnvironmentName_6087Parser();

-

 		case NodeCompositeNameEditPart.VISUAL_ID:

 			return getNodeName_5124Parser();

 		case NodeCompositeFloatingLabelEditPart.VISUAL_ID:

 			return getNodeName_6088Parser();

-

 		case ClassCompositeNameEditPart.VISUAL_ID:

 			return getClassName_5156Parser();

 		case ClassCompositeFloatingLabelEditPart.VISUAL_ID:

 			return getClassName_6089Parser();

-

 		case CollaborationCompositeNameEditPart.VISUAL_ID:

 			return getCollaborationName_5158Parser();

 		case CollaborationCompositeFloatingLabelEditPart.VISUAL_ID:

 			return getCollaborationName_6090Parser();

-

 		case InterfaceNameEditPart.VISUAL_ID:

 			return getInterfaceName_5159Parser();

 		case InterfaceFloatingLabelEditPart.VISUAL_ID:

 			return getInterfaceName_6091Parser();

-

 		case PrimitiveTypeNameEditPart.VISUAL_ID:

 			return getPrimitiveTypeName_5118Parser();

 		case PrimitiveTypeFloatingLabelEditPart.VISUAL_ID:

 			return getPrimitiveTypeName_6092Parser();

-

 		case EnumerationNameEditPart.VISUAL_ID:

 			return getEnumerationName_5119Parser();

 		case EnumerationFloatingLabelEditPart.VISUAL_ID:

 			return getEnumerationName_6093Parser();

-

 		case DataTypeNameEditPart.VISUAL_ID:

 			return getDataTypeName_5120Parser();

 		case DataTypeFloatingLabelEditPart.VISUAL_ID:

 			return getDataTypeName_6094Parser();

-

 		case ActorNameEditPart.VISUAL_ID:

 			return getActorName_5160Parser();

 		case ActorFloatingLabelEditPart.VISUAL_ID:

 			return getActorName_6095Parser();

-

 		case DeploymentSpecificationNameEditPart.VISUAL_ID:

 			return getDeploymentSpecificationName_5161Parser();

 		case DeploymentSpecificationFloatingLabelEditPart.VISUAL_ID:

 			return getDeploymentSpecificationName_6096Parser();

-

 		case ArtifactNameEditPart.VISUAL_ID:

 			return getArtifactName_5162Parser();

 		case ArtifactFloatingLabelEditPart.VISUAL_ID:

 			return getArtifactName_6097Parser();

-

 		case InformationItemNameEditPart.VISUAL_ID:

 			return getInformationItemName_5163Parser();

 		case InformationItemFloatingLabelEditPart.VISUAL_ID:

 			return getInformationItemName_6098Parser();

-

 		case SignalNameEditPart.VISUAL_ID:

 			return getSignalName_5164Parser();

 		case SignalFloatingLabelEditPart.VISUAL_ID:

 			return getSignalName_6099Parser();

-

 		case UseCaseNameEditPart.VISUAL_ID:

 			return getUseCaseName_5165Parser();

 		case UseCaseFloatingLabelEditPart.VISUAL_ID:

 			return getUseCaseName_6100Parser();

-

 		case SignalEventNameEditPart.VISUAL_ID:

 			return getSignalEventName_5166Parser();

 		case SignalEventFloatingLabelEditPart.VISUAL_ID:

 			return getSignalEventName_6101Parser();

-

 		case CallEventNameEditPart.VISUAL_ID:

 			return getCallEventName_5167Parser();

 		case CallEventFloatingLabelEditPart.VISUAL_ID:

 			return getCallEventName_6102Parser();

-

 		case AnyReceiveEventNameEditPart.VISUAL_ID:

 			return getAnyReceiveEventName_5168Parser();

 		case AnyReceiveEventFloatingLabelEditPart.VISUAL_ID:

 			return getAnyReceiveEventName_6103Parser();

-

 		case ChangeEventNameEditPart.VISUAL_ID:

 			return getChangeEventName_5171Parser();

 		case ChangeEventFloatingLabelEditPart.VISUAL_ID:

 			return getChangeEventName_6104Parser();

-

 		case TimeEventNameEditPart.VISUAL_ID:

 			return getTimeEventName_5172Parser();

 		case TimeEventFloatingLabelEditPart.VISUAL_ID:

 			return getTimeEventName_6105Parser();

-

 		case DurationObservationNameEditPart.VISUAL_ID:

 			return getDurationObservationName_5151Parser();

 		case DurationObservationStereotypeLabelEditPart.VISUAL_ID:

 			return getDurationObservationName_5152Parser();

-

 		case TimeObservationNameEditPart.VISUAL_ID:

 			return getTimeObservationName_5142Parser();

 		case TimeObservationStereotypeLabelEditPart.VISUAL_ID:

 			return getTimeObservationName_5143Parser();

-

 		case LiteralBooleanNameEditPart.VISUAL_ID:

 			return getLiteralBooleanName_5178Parser();

 		case LiteralBooleanFloatingLabelEditPart.VISUAL_ID:

 			return getLiteralBooleanName_6106Parser();

-

 		case LiteralIntegerNameEditPart.VISUAL_ID:

 			return getLiteralIntegerName_5179Parser();

 		case LiteralIntegerFloatingLabelEditPart.VISUAL_ID:

 			return getLiteralIntegerName_6107Parser();

-

 		case LiteralNullNameEditPart.VISUAL_ID:

 			return getLiteralNullName_5180Parser();

 		case LiteralNullFloatingLabelEditPart.VISUAL_ID:

 			return getLiteralNullName_6108Parser();

-

 		case LiteralStringNameEditPart.VISUAL_ID:

 			return getLiteralStringName_5181Parser();

 		case LiteralStringFloatingLabelEditPart.VISUAL_ID:

 			return getLiteralStringName_6109Parser();

-

 		case LiteralUnlimitedNaturalNameEditPart.VISUAL_ID:

 			return getLiteralUnlimitedNaturalName_5182Parser();

 		case LiteralUnlimitedNaturalFloatingLabelEditPart.VISUAL_ID:

 			return getLiteralUnlimitedNaturalName_6110Parser();

-

 		case StringExpressionNameEditPart.VISUAL_ID:

 			return getStringExpressionName_5183Parser();

 		case StringExpressionFloatingLabelEditPart.VISUAL_ID:

 			return getStringExpressionName_6111Parser();

-

 		case OpaqueExpressionNameEditPart.VISUAL_ID:

 			return getOpaqueExpressionName_5184Parser();

 		case OpaqueExpressionFloatingLabelEditPart.VISUAL_ID:

 			return getOpaqueExpressionName_6112Parser();

-

 		case TimeExpressionNameEditPart.VISUAL_ID:

 			return getTimeExpressionName_5185Parser();

 		case TimeExpressionFloatingLabelEditPart.VISUAL_ID:

 			return getTimeExpressionName_6113Parser();

-

 		case ExpressionNameEditPart.VISUAL_ID:

 			return getExpressionName_5186Parser();

 		case ExpressionFloatingLabelEditPart.VISUAL_ID:

 			return getExpressionName_6114Parser();

-

 		case DurationNameEditPart.VISUAL_ID:

 			return getDurationName_5187Parser();

 		case DurationFloatingLabelEditPart.VISUAL_ID:

 			return getDurationName_6115Parser();

-

 		case TimeIntervalNameEditPart.VISUAL_ID:

 			return getTimeIntervalName_5188Parser();

 		case TimeIntervalFloatingLabelEditPart.VISUAL_ID:

 			return getTimeIntervalName_6116Parser();

-

 		case DurationIntervalNameEditPart.VISUAL_ID:

 			return getDurationIntervalName_5189Parser();

 		case DurationIntervalFloatingLabelEditPart.VISUAL_ID:

 			return getDurationIntervalName_6117Parser();

-

 		case IntervalNameEditPart.VISUAL_ID:

 			return getIntervalName_5190Parser();

 		case IntervalFloatingLabelEditPart.VISUAL_ID:

 			return getIntervalName_6118Parser();

-

 		case InstanceValueNameEditPart.VISUAL_ID:

 			return getInstanceValueName_5191Parser();

 		case InstanceValueFloatingLabelEditPart.VISUAL_ID:

 			return getInstanceValueName_6119Parser();

-

 		case CommentBodyEditPart.VISUAL_ID:

 			return getCommentBody_5192Parser();

-

 		case DurationConstraintNameEditPart.VISUAL_ID:

 			return getDurationConstraintName_5193Parser();

 		case DurationConstraintSpecificationEditPart.VISUAL_ID:

 			return getDurationConstraintSpecification_6035Parser();

-

 		case TimeConstraintNameEditPart.VISUAL_ID:

 			return getTimeConstraintName_5194Parser();

 		case TimeConstraintSpecificationEditPart.VISUAL_ID:

 			return getTimeConstraintSpecification_6036Parser();

-

 		case IntervalConstraintNameEditPart.VISUAL_ID:

 			return getIntervalConstraintName_5195Parser();

 		case IntervalConstraintSpecificationEditPart.VISUAL_ID:

 			return getIntervalConstraintSpecification_6037Parser();

-

 		case InteractionConstraintNameEditPart.VISUAL_ID:

 			return getInteractionConstraintName_5196Parser();

 		case InteractionConstraintSpecificationEditPart.VISUAL_ID:

 			return getInteractionConstraintSpecification_6038Parser();

-

 		case ConstraintNameEditPart.VISUAL_ID:

 			return getConstraintName_5197Parser();

 		case ConstraintSpecificationEditPart.VISUAL_ID:

 			return getConstraintSpecification_6039Parser();

-

 		case BehaviorPortFloatingLabelEditPart.VISUAL_ID:

 			return getNodeName_6053Parser();

-

 		case PortNameEditPart.VISUAL_ID:

 			return getPortName_5125Parser();

 		case PortAppliedStereotypeEditPart.VISUAL_ID:

 			return getPortName_6029Parser();

-

 		case ParameterNameEditPart.VISUAL_ID:

 			return getParameterName_6033Parser();

 		case ParameterAppliedStereotypeEditPart.VISUAL_ID:

 			return getParameterName_6034Parser();

-

 		case PropertyPartNameEditPartCN.VISUAL_ID:

 			return getPropertyName_5126Parser();

 		case PropertyPartFloatingLabelEditPartCN.VISUAL_ID:

 			return getPropertyName_6054Parser();

-

 		case CollaborationRoleNameEditPartCN.VISUAL_ID:

 			return getConnectableElementName_5198Parser();

 		case CollaborationRoleFloatingLabelEditPartCN.VISUAL_ID:

 			return getConnectableElementName_6055Parser();

-

 		case CollaborationUseNameEditPart.VISUAL_ID:

 			return getCollaborationUseName_5127Parser();

 		case CollaborationUseFloatingLabelEditPartCN.VISUAL_ID:

 			return getCollaborationUseName_6056Parser();

-

 		case ActivityCompositeNameEditPartCN.VISUAL_ID:

 			return getActivityName_5128Parser();

 		case ActivityCompositeFloatingLabelEditPartCN.VISUAL_ID:

 			return getActivityName_6057Parser();

-

 		case InteractionCompositeNameEditPartCN.VISUAL_ID:

 			return getInteractionName_5129Parser();

 		case InteractionCompositeFloatingLabelEditPartCN.VISUAL_ID:

 			return getInteractionName_6058Parser();

-

 		case ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID:

 			return getProtocolStateMachineName_5130Parser();

 		case ProtocolStateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID:

 			return getProtocolStateMachineName_6059Parser();

-

 		case StateMachineCompositeNameEditPartCN.VISUAL_ID:

 			return getStateMachineName_5131Parser();

 		case StateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID:

 			return getStateMachineName_6060Parser();

-

 		case FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID:

 			return getFunctionBehaviorName_5132Parser();

 		case FunctionBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID:

 			return getFunctionBehaviorName_6061Parser();

-

 		case OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID:

 			return getOpaqueBehaviorName_5133Parser();

 		case OpaqueBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID:

 			return getOpaqueBehaviorName_6062Parser();

-

 		case ComponentCompositeNameEditPartCN.VISUAL_ID:

 			return getComponentName_5137Parser();

 		case ComponentCompositeFloatingLabelEditPartCN.VISUAL_ID:

 			return getComponentName_6063Parser();

-

 		case DeviceCompositeNameEditPartCN.VISUAL_ID:

 			return getDeviceName_5138Parser();

 		case DeviceCompositeFloatingLabelEditPartCN.VISUAL_ID:

 			return getDeviceName_6064Parser();

-

 		case ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID:

 			return getExecutionEnvironmentName_5139Parser();

 		case ExecutionEnvironmentCompositeFloatingLabelEditPartCN.VISUAL_ID:

 			return getExecutionEnvironmentName_6065Parser();

-

 		case NodeCompositeNameEditPartCN.VISUAL_ID:

 			return getNodeName_5140Parser();

 		case NodeCompositeFloatingLabelEditPartCN.VISUAL_ID:

 			return getNodeName_6066Parser();

-

 		case ClassCompositeNameEditPartCN.VISUAL_ID:

 			return getClassName_5155Parser();

 		case ClassCompositeFloatingLabelEditPartCN.VISUAL_ID:

 			return getClassName_6067Parser();

-

 		case CollaborationCompositeNameEditPartCN.VISUAL_ID:

 			return getCollaborationName_5141Parser();

 		case CollaborationCompositeFloatingLabelEditPartCN.VISUAL_ID:

 			return getCollaborationName_6068Parser();

-

 		case InterfaceNameEditPartCN.VISUAL_ID:

 			return getInterfaceName_5154Parser();

 		case InterfaceFloatingLabelEditPartCN.VISUAL_ID:

 			return getInterfaceName_6069Parser();

-

 		case PrimitiveTypeNameEditPartCN.VISUAL_ID:

 			return getPrimitiveTypeName_5134Parser();

 		case PrimitiveTypeFloatingLabelEditPartCN.VISUAL_ID:

 			return getPrimitiveTypeName_6070Parser();

-

 		case EnumerationNameEditPartCN.VISUAL_ID:

 			return getEnumerationName_5135Parser();

 		case EnumerationFloatingLabelEditPartCN.VISUAL_ID:

 			return getEnumerationName_6071Parser();

-

 		case DataTypeNameEditPartCN.VISUAL_ID:

 			return getDataTypeName_5136Parser();

 		case DataTypeFloatingLabelEditPartCN.VISUAL_ID:

 			return getDataTypeName_6072Parser();

-

 		case ActorNameEditPartCN.VISUAL_ID:

 			return getActorName_5144Parser();

 		case ActorFloatingLabelEditPartCN.VISUAL_ID:

 			return getActorName_6073Parser();

-

 		case DeploymentSpecificationNameEditPartCN.VISUAL_ID:

 			return getDeploymentSpecificationName_5145Parser();

 		case DeploymentSpecificationFloatingLabelEditPartCN.VISUAL_ID:

 			return getDeploymentSpecificationName_6074Parser();

-

 		case ArtifactNameEditPartCN.VISUAL_ID:

 			return getArtifactName_5146Parser();

 		case ArtifactFloatingLabelEditPartCN.VISUAL_ID:

 			return getArtifactName_6075Parser();

-

 		case InformationItemNameEditPartCN.VISUAL_ID:

 			return getInformationItemName_5147Parser();

 		case InformationItemFloatingLabelEditPartCN.VISUAL_ID:

 			return getInformationItemName_6076Parser();

-

 		case SignalNameEditPartCN.VISUAL_ID:

 			return getSignalName_5148Parser();

 		case SignalFloatingLabelEditPartCN.VISUAL_ID:

 			return getSignalName_6077Parser();

-

 		case UseCaseNameEditPartCN.VISUAL_ID:

 			return getUseCaseName_5149Parser();

 		case UseCaseFloatingLabelEditPartCN.VISUAL_ID:

 			return getUseCaseName_6078Parser();

-

 		case CommentBodyEditPartCN.VISUAL_ID:

 			return getCommentBody_5150Parser();

-

 		case DurationConstraintNameEditPartCN.VISUAL_ID:

 			return getDurationConstraintName_6040Parser();

 		case DurationConstraintSpecificationEditPartCN.VISUAL_ID:

 			return getDurationConstraintSpecification_6041Parser();

-

 		case TimeConstraintNameEditPartCN.VISUAL_ID:

 			return getTimeConstraintName_6042Parser();

 		case TimeConstraintSpecificationEditPartCN.VISUAL_ID:

 			return getTimeConstraintSpecification_6043Parser();

-

 		case IntervalConstraintNameEditPartCN.VISUAL_ID:

 			return getIntervalConstraintName_6044Parser();

 		case IntervalConstraintSpecificationEditPartCN.VISUAL_ID:

 			return getIntervalConstraintSpecification_6045Parser();

-

 		case InteractionConstraintNameEditPartCN.VISUAL_ID:

 			return getInteractionConstraintName_6046Parser();

 		case InteractionConstraintSpecificationEditPartCN.VISUAL_ID:

 			return getInteractionConstraintSpecification_6047Parser();

-

 		case ConstraintNameEditPartCN.VISUAL_ID:

 			return getConstraintName_6048Parser();

 		case ConstraintSpecificationEditPartCN.VISUAL_ID:

 			return getConstraintSpecification_6049Parser();

-

 		case PropertyEditPartCLN.VISUAL_ID:

 			return getProperty_3101Parser();

 		case OperationEditPartCLN.VISUAL_ID:

 			return getOperation_3102Parser();

 		case EnumerationLiteralEditPartCLN.VISUAL_ID:

 			return getEnumerationLiteral_3066Parser();

-

-

-

-

 		case ComponentRealizationNameEditPart.VISUAL_ID:

 			return getComponentRealizationName_6001Parser();

 		case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:

 			return getComponentRealizationName_6015Parser();

-

 		case InterfaceRealizationNameEditPart.VISUAL_ID:

 			return getInterfaceRealizationName_6002Parser();

 		case InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID:

 			return getInterfaceRealizationName_6016Parser();

-

 		case SubstitutionNameEditPart.VISUAL_ID:

 			return getSubstitutionName_6003Parser();

 		case SubstitutionAppliedStereotypeEditPart.VISUAL_ID:

 			return getSubstitutionName_6017Parser();

-

 		case RealizationNameEditPart.VISUAL_ID:

 			return getRealizationName_6004Parser();

 		case RealizationAppliedStereotypeEditPart.VISUAL_ID:

 			return getRealizationName_6018Parser();

-

 		case ManifestationNameEditPart.VISUAL_ID:

 			return getManifestationName_6005Parser();

 		case ManifestationAppliedStereotypeEditPart.VISUAL_ID:

 			return getManifestationName_6019Parser();

-

 		case AbstractionNameEditPart.VISUAL_ID:

 			return getAbstractionName_6006Parser();

 		case AbstractionAppliedStereotypeEditPart.VISUAL_ID:

 			return getAbstractionName_6020Parser();

-

 		case UsageNameEditPart.VISUAL_ID:

 			return getUsageName_6007Parser();

 		case UsageAppliedStereotypeEditPart.VISUAL_ID:

 			return getUsageName_6021Parser();

-

 		case DeploymentNameEditPart.VISUAL_ID:

 			return getDeploymentName_6008Parser();

 		case DeploymentAppliedStereotypeEditPart.VISUAL_ID:

 			return getDeploymentName_6022Parser();

-

 		case RoleBindingRoleNameEditPart.VISUAL_ID:

 			return getDependencyName_6027Parser();

 		case RoleBindingAppliedStereotypeEditPart.VISUAL_ID:

 			return getDependencyName_6028Parser();

-

 		case DependencyNameEditPart.VISUAL_ID:

 			return getDependencyName_6009Parser();

 		case DependencyAppliedStereotypeEditPart.VISUAL_ID:

 			return getDependencyName_6023Parser();

-

 		case ConnectorAppliedStereotypeEditPart.VISUAL_ID:

 			return getConnectorName_6025Parser();

 		case ConnectorNameEditPart.VISUAL_ID:

@@ -4254,23 +3833,16 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 			return getConnectorName_6051Parser();

 		case ConnectorMultiplicityTargetEditPart.VISUAL_ID:

 			return getConnectorName_6052Parser();

-

 		case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:

 			return getGeneralizationIsSubstitutable_6024Parser();

-

-

-

-

 		case InformationFlowAppliedStereotypeEditPart.VISUAL_ID:

 			return getInformationFlowName_6032Parser();

-

 		}

 		return null;

 	}

 

 	/**

 	 * Utility method that consults ParserService

-	 *

 	 * @generated

 	 */

 	public static IParser getParser(IElementType type, EObject object, String parserHint) {

@@ -4280,15 +3852,13 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	/**

 	 * @generated

 	 */

-	@Override

 	public IParser getParser(IAdaptable hint) {

-		String vid = (String) hint.getAdapter(String.class);

-		if (vid != null) {

+		String vid = (String)hint.getAdapter(String.class);

+		if(vid != null) {

 			return getParser(UMLVisualIDRegistry.getVisualID(vid));

 		}

-		View view =

-				(View) hint.getAdapter(View.class);

-		if (view != null) {

+		View view = (View)hint.getAdapter(View.class);

+		if(view != null) {

 			return getParser(UMLVisualIDRegistry.getVisualID(view));

 		}

 		return null;

@@ -4297,12 +3867,10 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	/**

 	 * @generated

 	 */

-	@Override

 	public boolean provides(IOperation operation) {

-		if (operation instanceof GetParserOperation) {

-			IAdaptable hint =

-					((GetParserOperation) operation).getHint();

-			if (UMLElementTypes.getElement(hint) == null) {

+		if(operation instanceof GetParserOperation) {

+			IAdaptable hint = ((GetParserOperation)operation).getHint();

+			if(UMLElementTypes.getElement(hint) == null) {

 				return false;

 			}

 			return getParser(hint) != null;

@@ -4332,9 +3900,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 		/**

 		 * @generated

 		 */

-		@Override

 		public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {

-			if (IElementType.class.equals(adapter)) {

+			if(IElementType.class.equals(adapter)) {

 				return elementType;

 			}

 			return super.getAdapter(adapter);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java
index 19980582c23..a941cce9379 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -35,23 +35,21 @@ public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider
 	/**

 	 * @generated

 	 */

-	@Override

 	public void createDecorators(IDecoratorTarget decoratorTarget) {

-		EditPart editPart = (EditPart) decoratorTarget.getAdapter(EditPart.class);

-		if (editPart instanceof GraphicalEditPart ||

-				editPart instanceof AbstractConnectionEditPart) {

+		EditPart editPart = (EditPart)decoratorTarget.getAdapter(EditPart.class);

+		if(editPart instanceof GraphicalEditPart || editPart instanceof AbstractConnectionEditPart) {

 			Object model = editPart.getModel();

-			if ((model instanceof View)) {

-				View view = (View) model;

-				if (!(view instanceof Edge) && !view.isSetElement()) {

+			if((model instanceof View)) {

+				View view = (View)model;

+				if(!(view instanceof Edge) && !view.isSetElement()) {

 					return;

 				}

 			}

 			EditDomain ed = editPart.getViewer().getEditDomain();

-			if (!(ed instanceof DiagramEditDomain)) {

+			if(!(ed instanceof DiagramEditDomain)) {

 				return;

 			}

-			if (((DiagramEditDomain) ed).getEditorPart() instanceof UMLDiagramEditor) {

+			if(((DiagramEditDomain)ed).getEditorPart() instanceof UMLDiagramEditor) {

 				decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget));

 			}

 		}

@@ -60,15 +58,12 @@ public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider
 	/**

 	 * @generated

 	 */

-	@Override

 	public boolean provides(IOperation operation) {

-		if (!(operation instanceof CreateDecoratorsOperation)) {

+		if(!(operation instanceof CreateDecoratorsOperation)) {

 			return false;

 		}

-		IDecoratorTarget decoratorTarget =

-				((CreateDecoratorsOperation) operation).getDecoratorTarget();

-		View view = (View) decoratorTarget.getAdapter(

-				View.class);

+		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation)operation).getDecoratorTarget();

+		View view = (View)decoratorTarget.getAdapter(View.class);

 		return view != null && CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view));

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java
index 6d5dab16a65..3b97299ede0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -40,6 +40,7 @@ public class UMLValidationProvider {
 	public static void runWithConstraints(TransactionalEditingDomain editingDomain, Runnable operation) {

 		final Runnable op = operation;

 		Runnable task = new Runnable() {

+

 			@Override

 			public void run() {

 				try {

@@ -50,7 +51,7 @@ public class UMLValidationProvider {
 				}

 			}

 		};

-		if (editingDomain != null) {

+		if(editingDomain != null) {

 			try {

 				editingDomain.runExclusive(task);

 			} catch (Exception e) {

@@ -65,11 +66,11 @@ public class UMLValidationProvider {
 	 * @generated

 	 */

 	static boolean isInDefaultEditorContext(Object object) {

-		if (shouldConstraintsBePrivate() && !constraintsActive) {

+		if(shouldConstraintsBePrivate() && !constraintsActive) {

 			return false;

 		}

-		if (object instanceof View) {

-			return constraintsActive && CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View) object));

+		if(object instanceof View) {

+			return constraintsActive && CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View)object));

 		}

 		return true;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
index bdb3df72ada..717f958945d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -71,18 +71,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	@Override

 	public final boolean provides(IOperation operation) {

-		if (operation instanceof CreateViewForKindOperation) {

-			return provides((CreateViewForKindOperation) operation);

+		if(operation instanceof CreateViewForKindOperation) {

+			return provides((CreateViewForKindOperation)operation);

 		}

 		assert operation instanceof CreateViewOperation;

-		if (operation instanceof CreateDiagramViewOperation) {

-			return provides((CreateDiagramViewOperation) operation);

-		} else if (operation instanceof CreateEdgeViewOperation) {

-			return provides((CreateEdgeViewOperation) operation);

-		} else if (operation instanceof CreateNodeViewOperation) {

-			return provides((CreateNodeViewOperation) operation);

+		if(operation instanceof CreateDiagramViewOperation) {

+			return provides((CreateDiagramViewOperation)operation);

+		} else if(operation instanceof CreateEdgeViewOperation) {

+			return provides((CreateEdgeViewOperation)operation);

+		} else if(operation instanceof CreateNodeViewOperation) {

+			return provides((CreateNodeViewOperation)operation);

 		}

 		return false;

 	}

@@ -92,23 +91,20 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */

 	protected boolean provides(CreateViewForKindOperation op) {

 		/*

-		 * if (op.getViewKind() == Node.class)

-		 * return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

-		 * if (op.getViewKind() == Edge.class)

-		 * return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

+				if (op.getViewKind() == Node.class)

+					return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

+				if (op.getViewKind() == Edge.class)

+					return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

 		 */

-

 		// check Diagram Type should be the class diagram

 		String modelID = UMLVisualIDRegistry.getModelID(op.getContainerView());

-		if (!getDiagramProvidedId().equals(modelID)) {

+		if(!getDiagramProvidedId().equals(modelID)) {

 			return false;

 		}

-

 		int visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());

-		if (Node.class.isAssignableFrom(op.getViewKind())) {

+		if(Node.class.isAssignableFrom(op.getViewKind())) {

 			return UMLVisualIDRegistry.canCreateNode(op.getContainerView(), visualID);

 		}

-

 		return true;

 	}

 

@@ -138,46 +134,38 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	protected boolean provides(CreateNodeViewOperation op) {

-		if (op.getContainerView() == null) {

+		if(op.getContainerView() == null) {

 			return false;

 		}

 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());

 		EObject domainElement = getSemanticElement(op.getSemanticAdapter());

 		int visualID;

-		if (op.getSemanticHint() == null) {

+		if(op.getSemanticHint() == null) {

 			// Semantic hint is not specified. Can be a result of call from CanonicalEditPolicy.

 			// In this situation there should be NO elementType, visualID will be determined

 			// by VisualIDRegistry.getNodeVisualID() for domainElement.

-			if (elementType != null || domainElement == null) {

+			if(elementType != null || domainElement == null) {

 				return false;

 			}

 			visualID = UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement);

 		} else {

 			visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());

-			if (elementType != null) {

-				if (elementType instanceof IExtendedHintedElementType) {

-					if (domainElement != null) {

-						if (!UMLVisualIDRegistry.checkNodeVisualID(op.getContainerView(), domainElement, visualID)) {

-							return false;

-						}

-					}

-				} else {

-					if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {

-						return false; // foreign element type

-					}

+			if(elementType != null) {

+				if(!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {

+					return false; // foreign element type

 				}

-				String elementTypeHint = ((IHintedType) elementType).getSemanticHint();

-				if (!op.getSemanticHint().equals(elementTypeHint)) {

+				String elementTypeHint = ((IHintedType)elementType).getSemanticHint();

+				if(!op.getSemanticHint().equals(elementTypeHint)) {

 					return false; // if semantic hint is specified it should be the same as in element type

 				}

-				if (domainElement != null && visualID != UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) {

-					return false; // visual id for node EClass should match visual id from element type

-				}

+				//if (domainElement != null && visualID != org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) {

+				//	return false; // visual id for node EClass should match visual id from element type

+				//}

 			} else {

-				if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) {

+				if(!CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) {

 					return false; // foreign diagram

 				}

-				switch (visualID) {

+				switch(visualID) {

 				case BehaviorPortEditPart.VISUAL_ID:

 					break; // pure design element

 				case ActivityCompositeEditPart.VISUAL_ID:

@@ -265,7 +253,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				case ConstraintEditPartCN.VISUAL_ID:

 				case PropertyEditPartCLN.VISUAL_ID:

 				case OperationEditPartCLN.VISUAL_ID:

-					if (domainElement == null || visualID != UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) {

+					if(domainElement == null || visualID != UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) {

 						return false; // visual id in semantic hint should match visual id for domain element

 					}

 					break;

@@ -274,28 +262,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				}

 			}

 		}

-		return ActivityCompositeEditPart.VISUAL_ID == visualID || InteractionCompositeEditPart.VISUAL_ID == visualID || ProtocolStateMachineCompositeEditPart.VISUAL_ID == visualID || StateMachineCompositeEditPart.VISUAL_ID == visualID

-				|| FunctionBehaviorCompositeEditPart.VISUAL_ID == visualID || OpaqueBehaviorCompositeEditPart.VISUAL_ID == visualID || ComponentCompositeEditPart.VISUAL_ID == visualID || DeviceCompositeEditPart.VISUAL_ID == visualID

-				|| ExecutionEnvironmentCompositeEditPart.VISUAL_ID == visualID || NodeCompositeEditPart.VISUAL_ID == visualID || ClassCompositeEditPart.VISUAL_ID == visualID || CollaborationCompositeEditPart.VISUAL_ID == visualID

-				|| InterfaceEditPart.VISUAL_ID == visualID || PrimitiveTypeEditPart.VISUAL_ID == visualID || EnumerationEditPart.VISUAL_ID == visualID || DataTypeEditPart.VISUAL_ID == visualID || ActorEditPart.VISUAL_ID == visualID

-				|| DeploymentSpecificationEditPart.VISUAL_ID == visualID || ArtifactEditPart.VISUAL_ID == visualID || InformationItemEditPart.VISUAL_ID == visualID || SignalEditPart.VISUAL_ID == visualID || UseCaseEditPart.VISUAL_ID == visualID

-				|| SignalEventEditPart.VISUAL_ID == visualID || CallEventEditPart.VISUAL_ID == visualID || AnyReceiveEventEditPart.VISUAL_ID == visualID || ChangeEventEditPart.VISUAL_ID == visualID || TimeEventEditPart.VISUAL_ID == visualID

-				|| DurationObservationEditPart.VISUAL_ID == visualID || TimeObservationEditPart.VISUAL_ID == visualID || LiteralBooleanEditPart.VISUAL_ID == visualID || LiteralIntegerEditPart.VISUAL_ID == visualID || LiteralNullEditPart.VISUAL_ID == visualID

-				|| LiteralStringEditPart.VISUAL_ID == visualID || LiteralUnlimitedNaturalEditPart.VISUAL_ID == visualID || StringExpressionEditPart.VISUAL_ID == visualID || OpaqueExpressionEditPart.VISUAL_ID == visualID

-				|| TimeExpressionEditPart.VISUAL_ID == visualID || ExpressionEditPart.VISUAL_ID == visualID || DurationEditPart.VISUAL_ID == visualID || TimeIntervalEditPart.VISUAL_ID == visualID || DurationIntervalEditPart.VISUAL_ID == visualID

-				|| IntervalEditPart.VISUAL_ID == visualID || InstanceValueEditPart.VISUAL_ID == visualID || CommentEditPart.VISUAL_ID == visualID || DurationConstraintEditPart.VISUAL_ID == visualID || TimeConstraintEditPart.VISUAL_ID == visualID

-				|| IntervalConstraintEditPart.VISUAL_ID == visualID || InteractionConstraintEditPart.VISUAL_ID == visualID || ConstraintEditPart.VISUAL_ID == visualID || BehaviorPortEditPart.VISUAL_ID == visualID || PortEditPart.VISUAL_ID == visualID

-				|| ParameterEditPart.VISUAL_ID == visualID || PropertyPartEditPartCN.VISUAL_ID == visualID || CollaborationRoleEditPartCN.VISUAL_ID == visualID || CollaborationUseEditPartCN.VISUAL_ID == visualID

-				|| ActivityCompositeEditPartCN.VISUAL_ID == visualID || InteractionCompositeEditPartCN.VISUAL_ID == visualID || ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == visualID || StateMachineCompositeEditPartCN.VISUAL_ID == visualID

-				|| FunctionBehaviorCompositeEditPartCN.VISUAL_ID == visualID || OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == visualID || ComponentCompositeEditPartCN.VISUAL_ID == visualID || DeviceCompositeEditPartCN.VISUAL_ID == visualID

-				|| ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == visualID || NodeCompositeEditPartCN.VISUAL_ID == visualID || ClassCompositeEditPartCN.VISUAL_ID == visualID || CollaborationCompositeEditPartCN.VISUAL_ID == visualID

-				|| InterfaceEditPartCN.VISUAL_ID == visualID || PrimitiveTypeEditPartCN.VISUAL_ID == visualID || EnumerationEditPartCN.VISUAL_ID == visualID || DataTypeEditPartCN.VISUAL_ID == visualID || ActorEditPartCN.VISUAL_ID == visualID

-				|| DeploymentSpecificationEditPartCN.VISUAL_ID == visualID || ArtifactEditPartCN.VISUAL_ID == visualID || InformationItemEditPartCN.VISUAL_ID == visualID || SignalEditPartCN.VISUAL_ID == visualID || UseCaseEditPartCN.VISUAL_ID == visualID

-				|| CommentEditPartCN.VISUAL_ID == visualID || DurationConstraintEditPartCN.VISUAL_ID == visualID || TimeConstraintEditPartCN.VISUAL_ID == visualID || IntervalConstraintEditPartCN.VISUAL_ID == visualID

-				|| InteractionConstraintEditPartCN.VISUAL_ID == visualID || ConstraintEditPartCN.VISUAL_ID == visualID || PropertyEditPartCLN.VISUAL_ID == visualID || OperationEditPartCLN.VISUAL_ID == visualID

-				|| EnumerationLiteralEditPartCLN.VISUAL_ID == visualID;

-

-

+		return UMLVisualIDRegistry.canCreateNode(op.getContainerView(), visualID);

 	}

 

 	/**

@@ -303,37 +270,36 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */

 	protected boolean provides(CreateEdgeViewOperation op) {

 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());

-		// RS: add code for extended types creation

-		if (elementType instanceof IExtendedHintedElementType) {

+		//RS: add code for extended types creation

+		if(elementType instanceof IExtendedHintedElementType) {

 			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);

-			if (!UMLElementTypes.isKnownElementType(closestNonExtendedType) || (!(closestNonExtendedType instanceof IHintedType))) {

+			if(!UMLElementTypes.isKnownElementType(closestNonExtendedType) || (!(closestNonExtendedType instanceof IHintedType))) {

 				return false; // foreign element type.

 			}

 		} else {

-			if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {

+			if(!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {

 				return false; // foreign element type

 			}

 		}

-		// if (!org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {

-		// return false; // foreign element type

-		// }

+		//if (!org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {

+		//	return false; // foreign element type

+		//}

 		// END R.S.

-		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();

-		if (elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {

+		String elementTypeHint = ((IHintedType)elementType).getSemanticHint();

+		if(elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {

 			return false; // our hint is visual id and must be specified, and it should be the same as in element type

 		}

-		int visualID = UMLVisualIDRegistry.getVisualID(elementTypeHint);

-		EObject domainElement = getSemanticElement(op.getSemanticAdapter());

-		if (domainElement != null && visualID != UMLVisualIDRegistry.getLinkWithClassVisualID(domainElement)) {

-			return false; // visual id for link EClass should match visual id from element type

-		}

+		//int visualID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(elementTypeHint);

+		//org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter());

+		//if (domainElement != null && visualID != org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getLinkWithClassVisualID(domainElement)) {

+		//	return false; // visual id for link EClass should match visual id from element type

+		//}

 		return true;

 	}

 

 	/**

 	 * @generated

 	 */

-	@Override

 	@SuppressWarnings("unchecked")

 	public Diagram createDiagram(IAdaptable semanticAdapter, String diagramKind, PreferencesHint preferencesHint) {

 		Diagram diagram = NotationFactory.eINSTANCE.createDiagram();

@@ -348,16 +314,15 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	@Override

 	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {

 		final EObject domainElement = getSemanticElement(semanticAdapter);

 		final int visualID;

-		if (semanticHint == null) {

+		if(semanticHint == null) {

 			visualID = UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);

 		} else {

 			visualID = UMLVisualIDRegistry.getVisualID(semanticHint);

 		}

-		switch (visualID) {

+		switch(visualID) {

 		case ActivityCompositeEditPart.VISUAL_ID:

 			return createActivity_2060(domainElement, containerView, index, persisted, preferencesHint);

 		case InteractionCompositeEditPart.VISUAL_ID:

@@ -538,11 +503,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

-	@Override

 	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {

 		IElementType elementType = getSemanticElementType(semanticAdapter);

-		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();

-		switch (UMLVisualIDRegistry.getVisualID(elementTypeHint)) {

+		String elementTypeHint = ((IHintedType)elementType).getSemanticHint();

+		switch(UMLVisualIDRegistry.getVisualID(elementTypeHint)) {

 		case BehaviorPortLinkEditPart.VISUAL_ID:

 			return createLink_4022(containerView, index, persisted, preferencesHint);

 		case LinkDescriptorEditPart.VISUAL_ID:

@@ -598,14 +562,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Activity");

 		Node label5112 = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeNameEditPart.VISUAL_ID));

 		Node label6079 = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeFloatingLabelEditPart.VISUAL_ID));

 		label6079.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6079 = (Location) label6079.getLayoutConstraint();

+		Location location6079 = (Location)label6079.getLayoutConstraint();

 		location6079.setX(0);

 		location6079.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(ActivityCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -623,14 +586,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interaction");

 		Node label5113 = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeNameEditPart.VISUAL_ID));

 		Node label6080 = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeFloatingLabelEditPart.VISUAL_ID));

 		label6080.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6080 = (Location) label6080.getLayoutConstraint();

+		Location location6080 = (Location)label6080.getLayoutConstraint();

 		location6080.setX(0);

 		location6080.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(InteractionCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -648,14 +610,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ProtocolStateMachine");

 		Node label5114 = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPart.VISUAL_ID));

 		Node label6081 = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeFloatingLabelEditPart.VISUAL_ID));

 		label6081.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6081 = (Location) label6081.getLayoutConstraint();

+		Location location6081 = (Location)label6081.getLayoutConstraint();

 		location6081.setX(0);

 		location6081.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -673,14 +634,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "StateMachine");

 		Node label5115 = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPart.VISUAL_ID));

 		Node label6082 = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeFloatingLabelEditPart.VISUAL_ID));

 		label6082.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6082 = (Location) label6082.getLayoutConstraint();

+		Location location6082 = (Location)label6082.getLayoutConstraint();

 		location6082.setX(0);

 		location6082.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(StateMachineCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -698,14 +658,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "FunctionBehavior");

 		Node label5116 = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPart.VISUAL_ID));

 		Node label6083 = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeFloatingLabelEditPart.VISUAL_ID));

 		label6083.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6083 = (Location) label6083.getLayoutConstraint();

+		Location location6083 = (Location)label6083.getLayoutConstraint();

 		location6083.setX(0);

 		location6083.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -723,14 +682,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "OpaqueBehavior");

 		Node label5117 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPart.VISUAL_ID));

 		Node label6084 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeFloatingLabelEditPart.VISUAL_ID));

 		label6084.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6084 = (Location) label6084.getLayoutConstraint();

+		Location location6084 = (Location)label6084.getLayoutConstraint();

 		location6084.setX(0);

 		location6084.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -748,14 +706,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");

 		Node label5121 = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeNameEditPart.VISUAL_ID));

 		Node label6085 = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeFloatingLabelEditPart.VISUAL_ID));

 		label6085.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6085 = (Location) label6085.getLayoutConstraint();

+		Location location6085 = (Location)label6085.getLayoutConstraint();

 		location6085.setX(0);

 		location6085.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -773,14 +730,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Device");

 		Node label5122 = createLabel(node, UMLVisualIDRegistry.getType(DeviceCompositeNameEditPart.VISUAL_ID));

 		Node label6086 = createLabel(node, UMLVisualIDRegistry.getType(DeviceCompositeFloatingLabelEditPart.VISUAL_ID));

 		label6086.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6086 = (Location) label6086.getLayoutConstraint();

+		Location location6086 = (Location)label6086.getLayoutConstraint();

 		location6086.setX(0);

 		location6086.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -798,14 +754,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ExecutionEnvironment");

 		Node label5123 = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID));

 		Node label6087 = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeFloatingLabelEditPart.VISUAL_ID));

 		label6087.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6087 = (Location) label6087.getLayoutConstraint();

+		Location location6087 = (Location)label6087.getLayoutConstraint();

 		location6087.setX(0);

 		location6087.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -823,14 +778,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Node");

 		Node label5124 = createLabel(node, UMLVisualIDRegistry.getType(NodeCompositeNameEditPart.VISUAL_ID));

 		Node label6088 = createLabel(node, UMLVisualIDRegistry.getType(NodeCompositeFloatingLabelEditPart.VISUAL_ID));

 		label6088.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6088 = (Location) label6088.getLayoutConstraint();

+		Location location6088 = (Location)label6088.getLayoutConstraint();

 		location6088.setX(0);

 		location6088.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -848,14 +802,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");

 		Node label5156 = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeNameEditPart.VISUAL_ID));

 		Node label6089 = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeFloatingLabelEditPart.VISUAL_ID));

 		label6089.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6089 = (Location) label6089.getLayoutConstraint();

+		Location location6089 = (Location)label6089.getLayoutConstraint();

 		location6089.setX(0);

 		location6089.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(ClassCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -873,14 +826,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Collaboration");

 		Node label5158 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPart.VISUAL_ID));

 		Node label6090 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeFloatingLabelEditPart.VISUAL_ID));

 		label6090.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6090 = (Location) label6090.getLayoutConstraint();

+		Location location6090 = (Location)label6090.getLayoutConstraint();

 		location6090.setX(0);

 		location6090.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(CollaborationCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -898,14 +850,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");

 		Node label5159 = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID));

 		Node label6091 = createLabel(node, UMLVisualIDRegistry.getType(InterfaceFloatingLabelEditPart.VISUAL_ID));

 		label6091.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6091 = (Location) label6091.getLayoutConstraint();

+		Location location6091 = (Location)label6091.getLayoutConstraint();

 		location6091.setX(0);

 		location6091.setY(5);

 		return node;

@@ -921,14 +872,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType");

 		Node label5118 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID));

 		Node label6092 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeFloatingLabelEditPart.VISUAL_ID));

 		label6092.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6092 = (Location) label6092.getLayoutConstraint();

+		Location location6092 = (Location)label6092.getLayoutConstraint();

 		location6092.setX(0);

 		location6092.setY(5);

 		return node;

@@ -944,14 +894,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration");

 		Node label5119 = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPart.VISUAL_ID));

 		Node label6093 = createLabel(node, UMLVisualIDRegistry.getType(EnumerationFloatingLabelEditPart.VISUAL_ID));

 		label6093.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6093 = (Location) label6093.getLayoutConstraint();

+		Location location6093 = (Location)label6093.getLayoutConstraint();

 		location6093.setX(0);

 		location6093.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID), true, true, true, true);

@@ -969,14 +918,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType");

 		Node label5120 = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPart.VISUAL_ID));

 		Node label6094 = createLabel(node, UMLVisualIDRegistry.getType(DataTypeFloatingLabelEditPart.VISUAL_ID));

 		label6094.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6094 = (Location) label6094.getLayoutConstraint();

+		Location location6094 = (Location)label6094.getLayoutConstraint();

 		location6094.setX(0);

 		location6094.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);

@@ -995,14 +943,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Actor");

 		Node label5160 = createLabel(node, UMLVisualIDRegistry.getType(ActorNameEditPart.VISUAL_ID));

 		Node label6095 = createLabel(node, UMLVisualIDRegistry.getType(ActorFloatingLabelEditPart.VISUAL_ID));

 		label6095.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6095 = (Location) label6095.getLayoutConstraint();

+		Location location6095 = (Location)label6095.getLayoutConstraint();

 		location6095.setX(0);

 		location6095.setY(5);

 		return node;

@@ -1018,14 +965,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DeploymentSpecification");

 		Node label5161 = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPart.VISUAL_ID));

 		Node label6096 = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecificationFloatingLabelEditPart.VISUAL_ID));

 		label6096.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6096 = (Location) label6096.getLayoutConstraint();

+		Location location6096 = (Location)label6096.getLayoutConstraint();

 		location6096.setX(0);

 		location6096.setY(5);

 		return node;

@@ -1041,14 +987,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Artifact");

 		Node label5162 = createLabel(node, UMLVisualIDRegistry.getType(ArtifactNameEditPart.VISUAL_ID));

 		Node label6097 = createLabel(node, UMLVisualIDRegistry.getType(ArtifactFloatingLabelEditPart.VISUAL_ID));

 		label6097.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6097 = (Location) label6097.getLayoutConstraint();

+		Location location6097 = (Location)label6097.getLayoutConstraint();

 		location6097.setX(0);

 		location6097.setY(5);

 		return node;

@@ -1064,14 +1009,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InformationItem");

 		Node label5163 = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID));

 		Node label6098 = createLabel(node, UMLVisualIDRegistry.getType(InformationItemFloatingLabelEditPart.VISUAL_ID));

 		label6098.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6098 = (Location) label6098.getLayoutConstraint();

+		Location location6098 = (Location)label6098.getLayoutConstraint();

 		location6098.setX(0);

 		location6098.setY(5);

 		return node;

@@ -1087,14 +1031,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Signal");

 		Node label5164 = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPart.VISUAL_ID));

 		Node label6099 = createLabel(node, UMLVisualIDRegistry.getType(SignalFloatingLabelEditPart.VISUAL_ID));

 		label6099.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6099 = (Location) label6099.getLayoutConstraint();

+		Location location6099 = (Location)label6099.getLayoutConstraint();

 		location6099.setX(0);

 		location6099.setY(5);

 		return node;

@@ -1110,14 +1053,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "UseCase");

 		Node label5165 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseNameEditPart.VISUAL_ID));

 		Node label6100 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseFloatingLabelEditPart.VISUAL_ID));

 		label6100.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6100 = (Location) label6100.getLayoutConstraint();

+		Location location6100 = (Location)label6100.getLayoutConstraint();

 		location6100.setX(0);

 		location6100.setY(5);

 		return node;

@@ -1133,14 +1075,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "SignalEvent");

 		Node label5166 = createLabel(node, UMLVisualIDRegistry.getType(SignalEventNameEditPart.VISUAL_ID));

 		Node label6101 = createLabel(node, UMLVisualIDRegistry.getType(SignalEventFloatingLabelEditPart.VISUAL_ID));

 		label6101.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6101 = (Location) label6101.getLayoutConstraint();

+		Location location6101 = (Location)label6101.getLayoutConstraint();

 		location6101.setX(0);

 		location6101.setY(5);

 		return node;

@@ -1156,14 +1097,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "CallEvent");

 		Node label5167 = createLabel(node, UMLVisualIDRegistry.getType(CallEventNameEditPart.VISUAL_ID));

 		Node label6102 = createLabel(node, UMLVisualIDRegistry.getType(CallEventFloatingLabelEditPart.VISUAL_ID));

 		label6102.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6102 = (Location) label6102.getLayoutConstraint();

+		Location location6102 = (Location)label6102.getLayoutConstraint();

 		location6102.setX(0);

 		location6102.setY(5);

 		return node;

@@ -1179,14 +1119,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "AnyReceiveEvent");

 		Node label5168 = createLabel(node, UMLVisualIDRegistry.getType(AnyReceiveEventNameEditPart.VISUAL_ID));

 		Node label6103 = createLabel(node, UMLVisualIDRegistry.getType(AnyReceiveEventFloatingLabelEditPart.VISUAL_ID));

 		label6103.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6103 = (Location) label6103.getLayoutConstraint();

+		Location location6103 = (Location)label6103.getLayoutConstraint();

 		location6103.setX(0);

 		location6103.setY(5);

 		return node;

@@ -1202,14 +1141,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ChangeEvent");

 		Node label5171 = createLabel(node, UMLVisualIDRegistry.getType(ChangeEventNameEditPart.VISUAL_ID));

 		Node label6104 = createLabel(node, UMLVisualIDRegistry.getType(ChangeEventFloatingLabelEditPart.VISUAL_ID));

 		label6104.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6104 = (Location) label6104.getLayoutConstraint();

+		Location location6104 = (Location)label6104.getLayoutConstraint();

 		location6104.setX(0);

 		location6104.setY(5);

 		return node;

@@ -1225,14 +1163,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeEvent");

 		Node label5172 = createLabel(node, UMLVisualIDRegistry.getType(TimeEventNameEditPart.VISUAL_ID));

 		Node label6105 = createLabel(node, UMLVisualIDRegistry.getType(TimeEventFloatingLabelEditPart.VISUAL_ID));

 		label6105.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6105 = (Location) label6105.getLayoutConstraint();

+		Location location6105 = (Location)label6105.getLayoutConstraint();

 		location6105.setX(0);

 		location6105.setY(5);

 		return node;

@@ -1248,18 +1185,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DurationObservation");

 		Node label5151 = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationNameEditPart.VISUAL_ID));

 		label5151.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5151 = (Location) label5151.getLayoutConstraint();

+		Location location5151 = (Location)label5151.getLayoutConstraint();

 		location5151.setX(25);

 		location5151.setY(3);

 		Node label5152 = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationStereotypeLabelEditPart.VISUAL_ID));

 		label5152.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5152 = (Location) label5152.getLayoutConstraint();

+		Location location5152 = (Location)label5152.getLayoutConstraint();

 		location5152.setX(25);

 		location5152.setY(-10);

 		return node;

@@ -1275,18 +1211,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeObservation");

 		Node label5142 = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationNameEditPart.VISUAL_ID));

 		label5142.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5142 = (Location) label5142.getLayoutConstraint();

+		Location location5142 = (Location)label5142.getLayoutConstraint();

 		location5142.setX(25);

 		location5142.setY(3);

 		Node label5143 = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationStereotypeLabelEditPart.VISUAL_ID));

 		label5143.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5143 = (Location) label5143.getLayoutConstraint();

+		Location location5143 = (Location)label5143.getLayoutConstraint();

 		location5143.setX(25);

 		location5143.setY(-10);

 		return node;

@@ -1302,14 +1237,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "LiteralBoolean");

 		Node label5178 = createLabel(node, UMLVisualIDRegistry.getType(LiteralBooleanNameEditPart.VISUAL_ID));

 		Node label6106 = createLabel(node, UMLVisualIDRegistry.getType(LiteralBooleanFloatingLabelEditPart.VISUAL_ID));

 		label6106.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6106 = (Location) label6106.getLayoutConstraint();

+		Location location6106 = (Location)label6106.getLayoutConstraint();

 		location6106.setX(0);

 		location6106.setY(5);

 		return node;

@@ -1325,14 +1259,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "LiteralInteger");

 		Node label5179 = createLabel(node, UMLVisualIDRegistry.getType(LiteralIntegerNameEditPart.VISUAL_ID));

 		Node label6107 = createLabel(node, UMLVisualIDRegistry.getType(LiteralIntegerFloatingLabelEditPart.VISUAL_ID));

 		label6107.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6107 = (Location) label6107.getLayoutConstraint();

+		Location location6107 = (Location)label6107.getLayoutConstraint();

 		location6107.setX(0);

 		location6107.setY(5);

 		return node;

@@ -1348,14 +1281,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "LiteralNull");

 		Node label5180 = createLabel(node, UMLVisualIDRegistry.getType(LiteralNullNameEditPart.VISUAL_ID));

 		Node label6108 = createLabel(node, UMLVisualIDRegistry.getType(LiteralNullFloatingLabelEditPart.VISUAL_ID));

 		label6108.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6108 = (Location) label6108.getLayoutConstraint();

+		Location location6108 = (Location)label6108.getLayoutConstraint();

 		location6108.setX(0);

 		location6108.setY(5);

 		return node;

@@ -1371,14 +1303,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "LiteralString");

 		Node label5181 = createLabel(node, UMLVisualIDRegistry.getType(LiteralStringNameEditPart.VISUAL_ID));

 		Node label6109 = createLabel(node, UMLVisualIDRegistry.getType(LiteralStringFloatingLabelEditPart.VISUAL_ID));

 		label6109.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6109 = (Location) label6109.getLayoutConstraint();

+		Location location6109 = (Location)label6109.getLayoutConstraint();

 		location6109.setX(0);

 		location6109.setY(5);

 		return node;

@@ -1394,14 +1325,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "LiteralUnlimitedNatural");

 		Node label5182 = createLabel(node, UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalNameEditPart.VISUAL_ID));

 		Node label6110 = createLabel(node, UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalFloatingLabelEditPart.VISUAL_ID));

 		label6110.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6110 = (Location) label6110.getLayoutConstraint();

+		Location location6110 = (Location)label6110.getLayoutConstraint();

 		location6110.setX(0);

 		location6110.setY(5);

 		return node;

@@ -1417,14 +1347,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "StringExpression");

 		Node label5183 = createLabel(node, UMLVisualIDRegistry.getType(StringExpressionNameEditPart.VISUAL_ID));

 		Node label6111 = createLabel(node, UMLVisualIDRegistry.getType(StringExpressionFloatingLabelEditPart.VISUAL_ID));

 		label6111.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6111 = (Location) label6111.getLayoutConstraint();

+		Location location6111 = (Location)label6111.getLayoutConstraint();

 		location6111.setX(0);

 		location6111.setY(5);

 		return node;

@@ -1440,14 +1369,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "OpaqueExpression");

 		Node label5184 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueExpressionNameEditPart.VISUAL_ID));

 		Node label6112 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueExpressionFloatingLabelEditPart.VISUAL_ID));

 		label6112.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6112 = (Location) label6112.getLayoutConstraint();

+		Location location6112 = (Location)label6112.getLayoutConstraint();

 		location6112.setX(0);

 		location6112.setY(5);

 		return node;

@@ -1463,14 +1391,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeExpression");

 		Node label5185 = createLabel(node, UMLVisualIDRegistry.getType(TimeExpressionNameEditPart.VISUAL_ID));

 		Node label6113 = createLabel(node, UMLVisualIDRegistry.getType(TimeExpressionFloatingLabelEditPart.VISUAL_ID));

 		label6113.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6113 = (Location) label6113.getLayoutConstraint();

+		Location location6113 = (Location)label6113.getLayoutConstraint();

 		location6113.setX(0);

 		location6113.setY(5);

 		return node;

@@ -1486,14 +1413,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Expression");

 		Node label5186 = createLabel(node, UMLVisualIDRegistry.getType(ExpressionNameEditPart.VISUAL_ID));

 		Node label6114 = createLabel(node, UMLVisualIDRegistry.getType(ExpressionFloatingLabelEditPart.VISUAL_ID));

 		label6114.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6114 = (Location) label6114.getLayoutConstraint();

+		Location location6114 = (Location)label6114.getLayoutConstraint();

 		location6114.setX(0);

 		location6114.setY(5);

 		return node;

@@ -1509,14 +1435,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Duration");

 		Node label5187 = createLabel(node, UMLVisualIDRegistry.getType(DurationNameEditPart.VISUAL_ID));

 		Node label6115 = createLabel(node, UMLVisualIDRegistry.getType(DurationFloatingLabelEditPart.VISUAL_ID));

 		label6115.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6115 = (Location) label6115.getLayoutConstraint();

+		Location location6115 = (Location)label6115.getLayoutConstraint();

 		location6115.setX(0);

 		location6115.setY(5);

 		return node;

@@ -1532,14 +1457,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeInterval");

 		Node label5188 = createLabel(node, UMLVisualIDRegistry.getType(TimeIntervalNameEditPart.VISUAL_ID));

 		Node label6116 = createLabel(node, UMLVisualIDRegistry.getType(TimeIntervalFloatingLabelEditPart.VISUAL_ID));

 		label6116.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6116 = (Location) label6116.getLayoutConstraint();

+		Location location6116 = (Location)label6116.getLayoutConstraint();

 		location6116.setX(0);

 		location6116.setY(5);

 		return node;

@@ -1555,14 +1479,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DurationInterval");

 		Node label5189 = createLabel(node, UMLVisualIDRegistry.getType(DurationIntervalNameEditPart.VISUAL_ID));

 		Node label6117 = createLabel(node, UMLVisualIDRegistry.getType(DurationIntervalFloatingLabelEditPart.VISUAL_ID));

 		label6117.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6117 = (Location) label6117.getLayoutConstraint();

+		Location location6117 = (Location)label6117.getLayoutConstraint();

 		location6117.setX(0);

 		location6117.setY(5);

 		return node;

@@ -1578,14 +1501,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interval");

 		Node label5190 = createLabel(node, UMLVisualIDRegistry.getType(IntervalNameEditPart.VISUAL_ID));

 		Node label6118 = createLabel(node, UMLVisualIDRegistry.getType(IntervalFloatingLabelEditPart.VISUAL_ID));

 		label6118.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6118 = (Location) label6118.getLayoutConstraint();

+		Location location6118 = (Location)label6118.getLayoutConstraint();

 		location6118.setX(0);

 		location6118.setY(5);

 		return node;

@@ -1601,14 +1523,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InstanceValue");

 		Node label5191 = createLabel(node, UMLVisualIDRegistry.getType(InstanceValueNameEditPart.VISUAL_ID));

 		Node label6119 = createLabel(node, UMLVisualIDRegistry.getType(InstanceValueFloatingLabelEditPart.VISUAL_ID));

 		label6119.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6119 = (Location) label6119.getLayoutConstraint();

+		Location location6119 = (Location)label6119.getLayoutConstraint();

 		location6119.setX(0);

 		location6119.setY(5);

 		return node;

@@ -1624,9 +1545,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Comment");

 		Node label5192 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID));

 		return node;

@@ -1642,9 +1562,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DurationConstraint");

 		Node label5193 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintNameEditPart.VISUAL_ID));

 		Node label6035 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintSpecificationEditPart.VISUAL_ID));

@@ -1661,9 +1580,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeConstraint");

 		Node label5194 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintNameEditPart.VISUAL_ID));

 		Node label6036 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintSpecificationEditPart.VISUAL_ID));

@@ -1680,9 +1598,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "IntervalConstraint");

 		Node label5195 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintNameEditPart.VISUAL_ID));

 		Node label6037 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintSpecificationEditPart.VISUAL_ID));

@@ -1699,9 +1616,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InteractionConstraint");

 		Node label5196 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintNameEditPart.VISUAL_ID));

 		Node label6038 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintSpecificationEditPart.VISUAL_ID));

@@ -1718,9 +1634,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

 		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint");

 		Node label5197 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID));

 		Node label6039 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintSpecificationEditPart.VISUAL_ID));

@@ -1736,12 +1651,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(BehaviorPortEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		Node label6053 = createLabel(node, UMLVisualIDRegistry.getType(BehaviorPortFloatingLabelEditPart.VISUAL_ID));

 		label6053.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6053 = (Location) label6053.getLayoutConstraint();

+		Location location6053 = (Location)label6053.getLayoutConstraint();

 		location6053.setX(0);

 		location6053.setY(5);

 		return node;

@@ -1756,18 +1670,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(PortEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Port");

 		Node label5125 = createLabel(node, UMLVisualIDRegistry.getType(PortNameEditPart.VISUAL_ID));

 		label5125.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location5125 = (Location) label5125.getLayoutConstraint();

+		Location location5125 = (Location)label5125.getLayoutConstraint();

 		location5125.setX(25);

 		location5125.setY(3);

 		Node label6029 = createLabel(node, UMLVisualIDRegistry.getType(PortAppliedStereotypeEditPart.VISUAL_ID));

 		label6029.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6029 = (Location) label6029.getLayoutConstraint();

+		Location location6029 = (Location)label6029.getLayoutConstraint();

 		location6029.setX(25);

 		location6029.setY(-10);

 		return node;

@@ -1782,18 +1695,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(ParameterEditPart.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Parameter");

 		Node label6033 = createLabel(node, UMLVisualIDRegistry.getType(ParameterNameEditPart.VISUAL_ID));

 		label6033.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6033 = (Location) label6033.getLayoutConstraint();

+		Location location6033 = (Location)label6033.getLayoutConstraint();

 		location6033.setX(25);

 		location6033.setY(3);

 		Node label6034 = createLabel(node, UMLVisualIDRegistry.getType(ParameterAppliedStereotypeEditPart.VISUAL_ID));

 		label6034.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6034 = (Location) label6034.getLayoutConstraint();

+		Location location6034 = (Location)label6034.getLayoutConstraint();

 		location6034.setX(25);

 		location6034.setY(-10);

 		return node;

@@ -1808,14 +1720,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(PropertyPartEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property");

 		Node label5126 = createLabel(node, UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));

 		Node label6054 = createLabel(node, UMLVisualIDRegistry.getType(PropertyPartFloatingLabelEditPartCN.VISUAL_ID));

 		label6054.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6054 = (Location) label6054.getLayoutConstraint();

+		Location location6054 = (Location)label6054.getLayoutConstraint();

 		location6054.setX(0);

 		location6054.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(PropertyPartCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1832,14 +1743,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(CollaborationRoleEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "CollaborationRole");

 		Node label5198 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationRoleNameEditPartCN.VISUAL_ID));

 		Node label6055 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationRoleFloatingLabelEditPartCN.VISUAL_ID));

 		label6055.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6055 = (Location) label6055.getLayoutConstraint();

+		Location location6055 = (Location)label6055.getLayoutConstraint();

 		location6055.setX(0);

 		location6055.setY(5);

 		return node;

@@ -1854,14 +1764,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(CollaborationUseEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "CollaborationUse");

 		Node label5127 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationUseNameEditPart.VISUAL_ID));

 		Node label6056 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationUseFloatingLabelEditPartCN.VISUAL_ID));

 		label6056.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6056 = (Location) label6056.getLayoutConstraint();

+		Location location6056 = (Location)label6056.getLayoutConstraint();

 		location6056.setX(0);

 		location6056.setY(5);

 		return node;

@@ -1876,14 +1785,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(ActivityCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Activity");

 		Node label5128 = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeNameEditPartCN.VISUAL_ID));

 		Node label6057 = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		label6057.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6057 = (Location) label6057.getLayoutConstraint();

+		Location location6057 = (Location)label6057.getLayoutConstraint();

 		location6057.setX(0);

 		location6057.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(ActivityCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1900,14 +1808,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(InteractionCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interaction");

 		Node label5129 = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeNameEditPartCN.VISUAL_ID));

 		Node label6058 = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		label6058.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6058 = (Location) label6058.getLayoutConstraint();

+		Location location6058 = (Location)label6058.getLayoutConstraint();

 		location6058.setX(0);

 		location6058.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(InteractionCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1924,14 +1831,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ProtocolStateMachine");

 		Node label5130 = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));

 		Node label6059 = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		label6059.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6059 = (Location) label6059.getLayoutConstraint();

+		Location location6059 = (Location)label6059.getLayoutConstraint();

 		location6059.setX(0);

 		location6059.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1948,14 +1854,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(StateMachineCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "StateMachine");

 		Node label5131 = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPartCN.VISUAL_ID));

 		Node label6060 = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		label6060.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6060 = (Location) label6060.getLayoutConstraint();

+		Location location6060 = (Location)label6060.getLayoutConstraint();

 		location6060.setX(0);

 		location6060.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(StateMachineCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1972,14 +1877,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(FunctionBehaviorCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "FunctionBehavior");

 		Node label5132 = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID));

 		Node label6061 = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		label6061.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6061 = (Location) label6061.getLayoutConstraint();

+		Location location6061 = (Location)label6061.getLayoutConstraint();

 		location6061.setX(0);

 		location6061.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1996,14 +1900,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "OpaqueBehavior");

 		Node label5133 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID));

 		Node label6062 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		label6062.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6062 = (Location) label6062.getLayoutConstraint();

+		Location location6062 = (Location)label6062.getLayoutConstraint();

 		location6062.setX(0);

 		location6062.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -2020,14 +1923,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(ComponentCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");

 		Node label5137 = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeNameEditPartCN.VISUAL_ID));

 		Node label6063 = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		label6063.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6063 = (Location) label6063.getLayoutConstraint();

+		Location location6063 = (Location)label6063.getLayoutConstraint();

 		location6063.setX(0);

 		location6063.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -2044,14 +1946,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(DeviceCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Device");

 		Node label5138 = createLabel(node, UMLVisualIDRegistry.getType(DeviceCompositeNameEditPartCN.VISUAL_ID));

 		Node label6064 = createLabel(node, UMLVisualIDRegistry.getType(DeviceCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		label6064.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6064 = (Location) label6064.getLayoutConstraint();

+		Location location6064 = (Location)label6064.getLayoutConstraint();

 		location6064.setX(0);

 		location6064.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -2068,14 +1969,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ExecutionEnvironment");

 		Node label5139 = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));

 		Node label6065 = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		label6065.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6065 = (Location) label6065.getLayoutConstraint();

+		Location location6065 = (Location)label6065.getLayoutConstraint();

 		location6065.setX(0);

 		location6065.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -2092,14 +1992,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(NodeCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Node");

 		Node label5140 = createLabel(node, UMLVisualIDRegistry.getType(NodeCompositeNameEditPartCN.VISUAL_ID));

 		Node label6066 = createLabel(node, UMLVisualIDRegistry.getType(NodeCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		label6066.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6066 = (Location) label6066.getLayoutConstraint();

+		Location location6066 = (Location)label6066.getLayoutConstraint();

 		location6066.setX(0);

 		location6066.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -2116,14 +2015,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(ClassCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");

 		Node label5155 = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeNameEditPartCN.VISUAL_ID));

 		Node label6067 = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		label6067.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6067 = (Location) label6067.getLayoutConstraint();

+		Location location6067 = (Location)label6067.getLayoutConstraint();

 		location6067.setX(0);

 		location6067.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(ClassCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -2140,14 +2038,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(CollaborationCompositeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Collaboration");

 		Node label5141 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPartCN.VISUAL_ID));

 		Node label6068 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeFloatingLabelEditPartCN.VISUAL_ID));

 		label6068.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6068 = (Location) label6068.getLayoutConstraint();

+		Location location6068 = (Location)label6068.getLayoutConstraint();

 		location6068.setX(0);

 		location6068.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(CollaborationCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -2164,14 +2061,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(InterfaceEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");

 		Node label5154 = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPartCN.VISUAL_ID));

 		Node label6069 = createLabel(node, UMLVisualIDRegistry.getType(InterfaceFloatingLabelEditPartCN.VISUAL_ID));

 		label6069.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6069 = (Location) label6069.getLayoutConstraint();

+		Location location6069 = (Location)label6069.getLayoutConstraint();

 		location6069.setX(0);

 		location6069.setY(5);

 		return node;

@@ -2186,14 +2082,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(PrimitiveTypeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType");

 		Node label5134 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID));

 		Node label6070 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeFloatingLabelEditPartCN.VISUAL_ID));

 		label6070.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6070 = (Location) label6070.getLayoutConstraint();

+		Location location6070 = (Location)label6070.getLayoutConstraint();

 		location6070.setX(0);

 		location6070.setY(5);

 		return node;

@@ -2208,14 +2103,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(EnumerationEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration");

 		Node label5135 = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID));

 		Node label6071 = createLabel(node, UMLVisualIDRegistry.getType(EnumerationFloatingLabelEditPartCN.VISUAL_ID));

 		label6071.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6071 = (Location) label6071.getLayoutConstraint();

+		Location location6071 = (Location)label6071.getLayoutConstraint();

 		location6071.setX(0);

 		location6071.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

@@ -2232,14 +2126,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(DataTypeEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType");

 		Node label5136 = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPartCN.VISUAL_ID));

 		Node label6072 = createLabel(node, UMLVisualIDRegistry.getType(DataTypeFloatingLabelEditPartCN.VISUAL_ID));

 		label6072.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6072 = (Location) label6072.getLayoutConstraint();

+		Location location6072 = (Location)label6072.getLayoutConstraint();

 		location6072.setX(0);

 		location6072.setY(5);

 		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

@@ -2257,14 +2150,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(ActorEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Actor");

 		Node label5144 = createLabel(node, UMLVisualIDRegistry.getType(ActorNameEditPartCN.VISUAL_ID));

 		Node label6073 = createLabel(node, UMLVisualIDRegistry.getType(ActorFloatingLabelEditPartCN.VISUAL_ID));

 		label6073.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6073 = (Location) label6073.getLayoutConstraint();

+		Location location6073 = (Location)label6073.getLayoutConstraint();

 		location6073.setX(0);

 		location6073.setY(5);

 		return node;

@@ -2279,14 +2171,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(DeploymentSpecificationEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DeploymentSpecification");

 		Node label5145 = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPartCN.VISUAL_ID));

 		Node label6074 = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecificationFloatingLabelEditPartCN.VISUAL_ID));

 		label6074.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6074 = (Location) label6074.getLayoutConstraint();

+		Location location6074 = (Location)label6074.getLayoutConstraint();

 		location6074.setX(0);

 		location6074.setY(5);

 		return node;

@@ -2301,14 +2192,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(ArtifactEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Artifact");

 		Node label5146 = createLabel(node, UMLVisualIDRegistry.getType(ArtifactNameEditPartCN.VISUAL_ID));

 		Node label6075 = createLabel(node, UMLVisualIDRegistry.getType(ArtifactFloatingLabelEditPartCN.VISUAL_ID));

 		label6075.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6075 = (Location) label6075.getLayoutConstraint();

+		Location location6075 = (Location)label6075.getLayoutConstraint();

 		location6075.setX(0);

 		location6075.setY(5);

 		return node;

@@ -2323,14 +2213,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(InformationItemEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InformationItem");

 		Node label5147 = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID));

 		Node label6076 = createLabel(node, UMLVisualIDRegistry.getType(InformationItemFloatingLabelEditPartCN.VISUAL_ID));

 		label6076.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6076 = (Location) label6076.getLayoutConstraint();

+		Location location6076 = (Location)label6076.getLayoutConstraint();

 		location6076.setX(0);

 		location6076.setY(5);

 		return node;

@@ -2345,14 +2234,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(SignalEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Signal");

 		Node label5148 = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPartCN.VISUAL_ID));

 		Node label6077 = createLabel(node, UMLVisualIDRegistry.getType(SignalFloatingLabelEditPartCN.VISUAL_ID));

 		label6077.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6077 = (Location) label6077.getLayoutConstraint();

+		Location location6077 = (Location)label6077.getLayoutConstraint();

 		location6077.setX(0);

 		location6077.setY(5);

 		return node;

@@ -2367,14 +2255,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(UseCaseEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "UseCase");

 		Node label5149 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseNameEditPartCN.VISUAL_ID));

 		Node label6078 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseFloatingLabelEditPartCN.VISUAL_ID));

 		label6078.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6078 = (Location) label6078.getLayoutConstraint();

+		Location location6078 = (Location)label6078.getLayoutConstraint();

 		location6078.setX(0);

 		location6078.setY(5);

 		return node;

@@ -2389,9 +2276,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(CommentEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Comment");

 		Node label5150 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID));

 		return node;

@@ -2406,9 +2292,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(DurationConstraintEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DurationConstraint");

 		Node label6040 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintNameEditPartCN.VISUAL_ID));

 		Node label6041 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintSpecificationEditPartCN.VISUAL_ID));

@@ -2424,9 +2309,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(TimeConstraintEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeConstraint");

 		Node label6042 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintNameEditPartCN.VISUAL_ID));

 		Node label6043 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintSpecificationEditPartCN.VISUAL_ID));

@@ -2442,9 +2326,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(IntervalConstraintEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "IntervalConstraint");

 		Node label6044 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintNameEditPartCN.VISUAL_ID));

 		Node label6045 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintSpecificationEditPartCN.VISUAL_ID));

@@ -2460,9 +2343,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(InteractionConstraintEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InteractionConstraint");

 		Node label6046 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintNameEditPartCN.VISUAL_ID));

 		Node label6047 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintSpecificationEditPartCN.VISUAL_ID));

@@ -2478,9 +2360,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(ConstraintEditPartCN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint");

 		Node label6048 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID));

 		Node label6049 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintSpecificationEditPartCN.VISUAL_ID));

@@ -2496,8 +2377,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(PropertyEditPartCLN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property");

 		return node;

 	}

@@ -2511,8 +2391,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(OperationEditPartCLN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Operation");

 		return node;

 	}

@@ -2526,8 +2405,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(EnumerationLiteralEditPartCLN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

-

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "EnumerationLiteral");

 		return node;

 	}

@@ -2548,13 +2426,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(BehaviorPortLinkEditPart.VISUAL_ID));

 		edge.setElement(null);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		return edge;

 	}

 

@@ -2574,13 +2450,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(LinkDescriptorEditPart.VISUAL_ID));

 		edge.setElement(null);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		return edge;

 	}

 

@@ -2600,14 +2474,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(CommentAnnotatedElementEditPart.VISUAL_ID));

 		edge.setElement(null);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "CommentAnnotatedElement");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		return edge;

 	}

 

@@ -2627,14 +2499,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(ConstraintConstrainedElementEditPart.VISUAL_ID));

 		edge.setElement(null);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ConstraintConstrainedElement");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		return edge;

 	}

 

@@ -2654,24 +2524,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(ComponentRealizationEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ComponentRealization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6001 = createLabel(edge, UMLVisualIDRegistry.getType(ComponentRealizationNameEditPart.VISUAL_ID));

 		label6001.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6001 = (Location) label6001.getLayoutConstraint();

+		Location location6001 = (Location)label6001.getLayoutConstraint();

 		location6001.setX(0);

 		location6001.setY(60);

 		Node label6015 = createLabel(edge, UMLVisualIDRegistry.getType(ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID));

 		label6015.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6015 = (Location) label6015.getLayoutConstraint();

+		Location location6015 = (Location)label6015.getLayoutConstraint();

 		location6015.setX(0);

 		location6015.setY(30);

-

 		return edge;

 	}

 

@@ -2691,24 +2559,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(InterfaceRealizationEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InterfaceRealization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6002 = createLabel(edge, UMLVisualIDRegistry.getType(InterfaceRealizationNameEditPart.VISUAL_ID));

 		label6002.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6002 = (Location) label6002.getLayoutConstraint();

+		Location location6002 = (Location)label6002.getLayoutConstraint();

 		location6002.setX(0);

 		location6002.setY(60);

 		Node label6016 = createLabel(edge, UMLVisualIDRegistry.getType(InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID));

 		label6016.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6016 = (Location) label6016.getLayoutConstraint();

+		Location location6016 = (Location)label6016.getLayoutConstraint();

 		location6016.setX(0);

 		location6016.setY(30);

-

 		return edge;

 	}

 

@@ -2728,24 +2594,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(SubstitutionEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Substitution");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6003 = createLabel(edge, UMLVisualIDRegistry.getType(SubstitutionNameEditPart.VISUAL_ID));

 		label6003.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6003 = (Location) label6003.getLayoutConstraint();

+		Location location6003 = (Location)label6003.getLayoutConstraint();

 		location6003.setX(0);

 		location6003.setY(60);

 		Node label6017 = createLabel(edge, UMLVisualIDRegistry.getType(SubstitutionAppliedStereotypeEditPart.VISUAL_ID));

 		label6017.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6017 = (Location) label6017.getLayoutConstraint();

+		Location location6017 = (Location)label6017.getLayoutConstraint();

 		location6017.setX(0);

 		location6017.setY(30);

-

 		return edge;

 	}

 

@@ -2765,24 +2629,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(RealizationEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Realization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6004 = createLabel(edge, UMLVisualIDRegistry.getType(RealizationNameEditPart.VISUAL_ID));

 		label6004.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6004 = (Location) label6004.getLayoutConstraint();

+		Location location6004 = (Location)label6004.getLayoutConstraint();

 		location6004.setX(0);

 		location6004.setY(60);

 		Node label6018 = createLabel(edge, UMLVisualIDRegistry.getType(RealizationAppliedStereotypeEditPart.VISUAL_ID));

 		label6018.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6018 = (Location) label6018.getLayoutConstraint();

+		Location location6018 = (Location)label6018.getLayoutConstraint();

 		location6018.setX(0);

 		location6018.setY(30);

-

 		return edge;

 	}

 

@@ -2802,24 +2664,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(ManifestationEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Manifestation");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6005 = createLabel(edge, UMLVisualIDRegistry.getType(ManifestationNameEditPart.VISUAL_ID));

 		label6005.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6005 = (Location) label6005.getLayoutConstraint();

+		Location location6005 = (Location)label6005.getLayoutConstraint();

 		location6005.setX(0);

 		location6005.setY(60);

 		Node label6019 = createLabel(edge, UMLVisualIDRegistry.getType(ManifestationAppliedStereotypeEditPart.VISUAL_ID));

 		label6019.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6019 = (Location) label6019.getLayoutConstraint();

+		Location location6019 = (Location)label6019.getLayoutConstraint();

 		location6019.setX(0);

 		location6019.setY(30);

-

 		return edge;

 	}

 

@@ -2839,24 +2699,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(AbstractionEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Abstraction");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6006 = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionNameEditPart.VISUAL_ID));

 		label6006.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6006 = (Location) label6006.getLayoutConstraint();

+		Location location6006 = (Location)label6006.getLayoutConstraint();

 		location6006.setX(0);

 		location6006.setY(60);

 		Node label6020 = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionAppliedStereotypeEditPart.VISUAL_ID));

 		label6020.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6020 = (Location) label6020.getLayoutConstraint();

+		Location location6020 = (Location)label6020.getLayoutConstraint();

 		location6020.setX(0);

 		location6020.setY(30);

-

 		return edge;

 	}

 

@@ -2876,24 +2734,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(UsageEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Usage");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6007 = createLabel(edge, UMLVisualIDRegistry.getType(UsageNameEditPart.VISUAL_ID));

 		label6007.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6007 = (Location) label6007.getLayoutConstraint();

+		Location location6007 = (Location)label6007.getLayoutConstraint();

 		location6007.setX(0);

 		location6007.setY(60);

 		Node label6021 = createLabel(edge, UMLVisualIDRegistry.getType(UsageAppliedStereotypeEditPart.VISUAL_ID));

 		label6021.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6021 = (Location) label6021.getLayoutConstraint();

+		Location location6021 = (Location)label6021.getLayoutConstraint();

 		location6021.setX(0);

 		location6021.setY(30);

-

 		return edge;

 	}

 

@@ -2913,24 +2769,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(DeploymentEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Deployment");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6008 = createLabel(edge, UMLVisualIDRegistry.getType(DeploymentNameEditPart.VISUAL_ID));

 		label6008.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6008 = (Location) label6008.getLayoutConstraint();

+		Location location6008 = (Location)label6008.getLayoutConstraint();

 		location6008.setX(0);

 		location6008.setY(60);

 		Node label6022 = createLabel(edge, UMLVisualIDRegistry.getType(DeploymentAppliedStereotypeEditPart.VISUAL_ID));

 		label6022.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6022 = (Location) label6022.getLayoutConstraint();

+		Location location6022 = (Location)label6022.getLayoutConstraint();

 		location6022.setX(0);

 		location6022.setY(30);

-

 		return edge;

 	}

 

@@ -2950,24 +2804,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(RoleBindingEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "RoleBinding");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6027 = createLabel(edge, UMLVisualIDRegistry.getType(RoleBindingRoleNameEditPart.VISUAL_ID));

 		label6027.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6027 = (Location) label6027.getLayoutConstraint();

+		Location location6027 = (Location)label6027.getLayoutConstraint();

 		location6027.setX(0);

 		location6027.setY(20);

 		Node label6028 = createLabel(edge, UMLVisualIDRegistry.getType(RoleBindingAppliedStereotypeEditPart.VISUAL_ID));

 		label6028.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6028 = (Location) label6028.getLayoutConstraint();

+		Location location6028 = (Location)label6028.getLayoutConstraint();

 		location6028.setX(0);

 		location6028.setY(60);

-

 		return edge;

 	}

 

@@ -2987,24 +2839,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(DependencyEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Dependency");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6009 = createLabel(edge, UMLVisualIDRegistry.getType(DependencyNameEditPart.VISUAL_ID));

 		label6009.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6009 = (Location) label6009.getLayoutConstraint();

+		Location location6009 = (Location)label6009.getLayoutConstraint();

 		location6009.setX(0);

 		location6009.setY(60);

 		Node label6023 = createLabel(edge, UMLVisualIDRegistry.getType(DependencyAppliedStereotypeEditPart.VISUAL_ID));

 		label6023.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6023 = (Location) label6023.getLayoutConstraint();

+		Location location6023 = (Location)label6023.getLayoutConstraint();

 		location6023.setX(0);

 		location6023.setY(60);

-

 		return edge;

 	}

 

@@ -3024,34 +2874,32 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(ConnectorEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Connector");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6025 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorAppliedStereotypeEditPart.VISUAL_ID));

 		label6025.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6025 = (Location) label6025.getLayoutConstraint();

+		Location location6025 = (Location)label6025.getLayoutConstraint();

 		location6025.setX(0);

 		location6025.setY(60);

 		Node label6050 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorNameEditPart.VISUAL_ID));

 		label6050.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6050 = (Location) label6050.getLayoutConstraint();

+		Location location6050 = (Location)label6050.getLayoutConstraint();

 		location6050.setX(0);

 		location6050.setY(-20);

 		Node label6051 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorMultiplicitySourceEditPart.VISUAL_ID));

 		label6051.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6051 = (Location) label6051.getLayoutConstraint();

+		Location location6051 = (Location)label6051.getLayoutConstraint();

 		location6051.setX(0);

 		location6051.setY(20);

 		Node label6052 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorMultiplicityTargetEditPart.VISUAL_ID));

 		label6052.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6052 = (Location) label6052.getLayoutConstraint();

+		Location location6052 = (Location)label6052.getLayoutConstraint();

 		location6052.setX(0);

 		location6052.setY(20);

-

 		return edge;

 	}

 

@@ -3071,19 +2919,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(GeneralizationEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Generalization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6024 = createLabel(edge, UMLVisualIDRegistry.getType(GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

 		label6024.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6024 = (Location) label6024.getLayoutConstraint();

+		Location location6024 = (Location)label6024.getLayoutConstraint();

 		location6024.setX(0);

 		location6024.setY(60);

-

 		return edge;

 	}

 

@@ -3103,14 +2949,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(TimeObservationEventEditPart.VISUAL_ID));

 		edge.setElement(null);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "TimeObservationEvent");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		return edge;

 	}

 

@@ -3130,14 +2974,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(DurationObservationEventEditPart.VISUAL_ID));

 		edge.setElement(null);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "DurationObservationEvent");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

-

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		return edge;

 	}

 

@@ -3157,19 +2999,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(RepresentationEditPart.VISUAL_ID));

 		edge.setElement(null);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.colorToInteger(ColorConstants.black));

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6030 = createLabel(edge, UMLVisualIDRegistry.getType(RepresentationTagLabelEditPart.VISUAL_ID));

 		label6030.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6030 = (Location) label6030.getLayoutConstraint();

+		Location location6030 = (Location)label6030.getLayoutConstraint();

 		location6030.setX(0);

 		location6030.setY(15);

-

 		return edge;

 	}

 

@@ -3189,24 +3029,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setType(UMLVisualIDRegistry.getType(InformationFlowEditPart.VISUAL_ID));

 		edge.setElement(domainElement);

 		// initializePreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InformationFlow");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6031 = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowConveyedLabelEditPart.VISUAL_ID));

 		label6031.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6031 = (Location) label6031.getLayoutConstraint();

+		Location location6031 = (Location)label6031.getLayoutConstraint();

 		location6031.setX(0);

 		location6031.setY(30);

 		Node label6032 = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowAppliedStereotypeEditPart.VISUAL_ID));

 		label6032.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

-		Location location6032 = (Location) label6032.getLayoutConstraint();

+		Location location6032 = (Location)label6032.getLayoutConstraint();

 		location6032.setX(0);

 		location6032.setY(15);

-

 		return edge;

 	}

 

@@ -3214,7 +3052,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	protected void stampShortcut(View containerView, Node target) {

-		if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(containerView))) {

+		if(!CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(containerView))) {

 			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();

 			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$

 			shortcutAnnotation.getDetails().put("modelID", CompositeStructureDiagramEditPart.MODEL_ID); //$NON-NLS-1$

@@ -3236,26 +3074,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	protected Node createCompartment(View owner, String hint, boolean canCollapse, boolean hasTitle, boolean canSort, boolean canFilter) {

-		// SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment();

-		// rv.setShowTitle(showTitle);

-		// rv.setCollapsed(isCollapsed);

+		//SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment();

+		//rv.setShowTitle(showTitle);

+		//rv.setCollapsed(isCollapsed);

 		Node rv;

-		if (canCollapse) {

+		if(canCollapse) {

 			rv = NotationFactory.eINSTANCE.createBasicCompartment();

 		} else {

 			rv = NotationFactory.eINSTANCE.createDecorationNode();

 		}

-

 		rv.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-

-		if (hasTitle) {

+		if(hasTitle) {

 			TitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle();

 			rv.getStyles().add(ts);

 		}

-		if (canSort) {

+		if(canSort) {

 			rv.getStyles().add(NotationFactory.eINSTANCE.createSortingStyle());

 		}

-		if (canFilter) {

+		if(canFilter) {

 			rv.getStyles().add(NotationFactory.eINSTANCE.createFilteringStyle());

 		}

 		rv.setType(hint);

@@ -3267,11 +3103,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	protected EObject getSemanticElement(IAdaptable semanticAdapter) {

-		if (semanticAdapter == null) {

+		if(semanticAdapter == null) {

 			return null;

 		}

-		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);

-		if (eObject != null) {

+		EObject eObject = (EObject)semanticAdapter.getAdapter(EObject.class);

+		if(eObject != null) {

 			return EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(eObject), eObject);

 		}

 		return null;

@@ -3281,10 +3117,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	protected IElementType getSemanticElementType(IAdaptable semanticAdapter) {

-		if (semanticAdapter == null) {

+		if(semanticAdapter == null) {

 			return null;

 		}

-		return (IElementType) semanticAdapter.getAdapter(IElementType.class);

+		return (IElementType)semanticAdapter.getAdapter(IElementType.class);

 	}

 

 	/**

@@ -3293,16 +3129,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

 		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

 		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT);

-

-		FontStyle viewFontStyle = (FontStyle) view.getStyle(NotationPackage.Literals.FONT_STYLE);

-		if (viewFontStyle != null)

-		{

+		FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);

+		if(viewFontStyle != null) {

 			FontData fontData = PreferenceConverter.getFontData(store, fontConstant);

 			viewFontStyle.setFontName(fontData.getName());

 			viewFontStyle.setFontHeight(fontData.getHeight());

 			viewFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

 			viewFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

-

 			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(store, fontColorConstant);

 			viewFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());

 		}

@@ -3324,24 +3157,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

 		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

 		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

-

-

 		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

-

-

-		FillStyle fillStyle = (FillStyle) view

-				.getStyle(NotationPackage.Literals.FILL_STYLE);

-		fillStyle

-				.setFillColor(FigureUtilities.RGBToInteger(fillRGB).intValue());

-

-		;

-		if (store.getBoolean(gradientPolicyConstant)) {

-			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(

-					store.getString(gradientColorConstant));

+		FillStyle fillStyle = (FillStyle)view.getStyle(NotationPackage.Literals.FILL_STYLE);

+		fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB).intValue());;

+		if(store.getBoolean(gradientPolicyConstant)) {

+			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(store.getString(gradientColorConstant));

 			fillStyle.setGradient(gradientPreferenceConverter.getGradientData());

-			fillStyle

-					.setTransparency(gradientPreferenceConverter.getTransparency());

+			fillStyle.setTransparency(gradientPreferenceConverter.getTransparency());

 		}

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java
index 66cdd8e29bd..4ec7a5400bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -21,12 +21,11 @@ public class UMLPropertySection extends DefaultPropertySection implements IPrope
 

 	/**

 	 * Modify/unwrap selection.

-	 *

 	 * @generated

 	 */

 	@Override

 	protected Object transformSelection(Object selected) {

-		selected = /* super. */transformSelectionToDomain(selected);

+		selected = /*super.*/transformSelectionToDomain(selected);

 		return selected;

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLSheetLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLSheetLabelProvider.java
index 3f34fedd6e9..3a38ba42304 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLSheetLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLSheetLabelProvider.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2014 CEA LIST.

- *

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

- *

+ * 

  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

@@ -29,7 +29,6 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr
 	/**

 	 * @generated

 	 */

-	@Override

 	public String getText(Object element) {

 		element = unwrap(element);

 		IElementType etype = getElementType(getView(element));

@@ -39,7 +38,6 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr
 	/**

 	 * @generated

 	 */

-	@Override

 	public Image getImage(Object element) {

 		IElementType etype = getElementType(getView(unwrap(element)));

 		return etype == null ? null : UMLElementTypes.getImage(etype);

@@ -49,8 +47,8 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr
 	 * @generated

 	 */

 	private Object unwrap(Object element) {

-		if (element instanceof IStructuredSelection) {

-			return ((IStructuredSelection) element).getFirstElement();

+		if(element instanceof IStructuredSelection) {

+			return ((IStructuredSelection)element).getFirstElement();

 		}

 		return element;

 	}

@@ -59,11 +57,11 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr
 	 * @generated

 	 */

 	private View getView(Object element) {

-		if (element instanceof View) {

-			return (View) element;

+		if(element instanceof View) {

+			return (View)element;

 		}

-		if (element instanceof IAdaptable) {

-			return (View) ((IAdaptable) element).getAdapter(View.class);

+		if(element instanceof IAdaptable) {

+			return (View)((IAdaptable)element).getAdapter(View.class);

 		}

 		return null;

 	}

@@ -73,15 +71,13 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr
 	 */

 	private IElementType getElementType(View view) {

 		// For intermediate views climb up the containment hierarchy to find the one associated with an element type.

-		while (view != null) {

+		while(view != null) {

 			int vid = UMLVisualIDRegistry.getVisualID(view);

-			IElementType etype =

-					UMLElementTypes.getElementType(vid);

-			if (etype != null) {

+			IElementType etype = UMLElementTypes.getElementType(vid);

+			if(etype != null) {

 				return etype;

 			}

-			view = view.eContainer() instanceof View ?

-					(View) view.eContainer() : null;

+			view = view.eContainer() instanceof View ? (View)view.eContainer() : null;

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.classpath
index 2d1a4302f04..46cec6ed2a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.classpath
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..9ca8e68231b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

+org.eclipse.jdt.core.compiler.compliance=1.7

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

+org.eclipse.jdt.core.compiler.source=1.7

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.settings/org.eclipse.m2e.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
index 623e0c6790e..4ee3f4fd911 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
@@ -26,7 +26,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0"

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.menu;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.1.0.qualifier

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/TODO b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/TODO
index 9819887edfc..a42b94a5800 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/TODO
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/TODO
@@ -1,3 +1,2 @@
 The main part of this plugin must be moved into org.eclipse.papyrus.infra.gmfdiag.menu

-

 The class HandlerStateSourceProvider must be removed and replace by property tester or test in the plugin.xml
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
index 6cb8bff4818..3ca3b20e3a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
@@ -772,7 +772,8 @@
       point="org.eclipse.ui.menus">
    <menuContribution
          allPopups="false"
-         locationURI="menu:org.eclipse.papyrus.uml.diagram.ui.menu">
+         locationURI="menu:org.eclipse.papyrus.uml.diagram.ui.menu">   
+      
       <command
             commandId="org.eclipse.papyrus.uml.diagram.menu.commands.FontCommand"
             icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/font_color.gif"
@@ -1823,7 +1824,6 @@
             id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.alignMenu"
             label="Ali&amp;gnment"
             tooltip="Alignement Menu">
-         mmand>
          <command
                commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.left"
                icon="icons/alignleft.gif"
@@ -3663,6 +3663,41 @@
    </sourceProvider>
 </extension>
 <extension
+      id="PapyrusQuickFormatHandler"
+      name="QuickFormatHandler"
+      point="org.eclipse.ui.handlers">
+   <handler
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DiagramQuickFormatHandler"
+         commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingUpperCaseCommand">
+       <activeWhen>
+         <and>
+            <with
+                  variable="selection">
+               <test
+                     property="org.eclipse.papyrus.uml.diagram.menu.quickformatpropertytester.isNameChangeable"
+                     value="true">
+               </test>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler 
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DiagramQuickFormatHandler"
+         commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingLowerCaseCommand">
+       <activeWhen>
+         <and>
+            <with
+                  variable="selection">
+               <test
+                     property="org.eclipse.papyrus.uml.diagram.menu.quickformatpropertytester.isNameChangeable"
+                     value="true">
+               </test>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+</extension>
+<extension
       id="PapyrusFillColorCommand"
       name="FillColorCommand"
       point="org.eclipse.ui.commands">
@@ -4474,6 +4509,13 @@
                properties="isDiagram,hasRequiredEditPolicy"
                type="org.eclipse.jface.viewers.IStructuredSelection">
          </propertyTester>
+         <propertyTester
+               class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DiagramNamePropertyTester"
+               id="org.eclipse.papyrus.uml.diagram.menu.quickformatpropertytester"
+               namespace="org.eclipse.papyrus.uml.diagram.menu.quickformatpropertytester"
+               properties="isNameChangeable"
+               type="org.eclipse.jface.viewers.IStructuredSelection">
+         </propertyTester>
       </extension>
       <extension
             point="org.eclipse.ui.menus">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractGraphicalParametricOnSelectedElementsAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractGraphicalParametricOnSelectedElementsAction.java
new file mode 100644
index 00000000000..d2d81222218
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/AbstractGraphicalParametricOnSelectedElementsAction.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST.

+ *

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.menu.actions;

+

+import java.util.List;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.papyrus.infra.ui.menu.AbstractParametricOnSelectedElementsAction;

+

+

+public abstract class AbstractGraphicalParametricOnSelectedElementsAction extends AbstractParametricOnSelectedElementsAction {

+

+	/**

+	 *

+	 * Constructor.

+	 *

+	 * @param parameter

+	 *            parameter for the action

+	 * @param selectedEditPart

+	 *            the selectedEditPart for the action

+	 */

+	public AbstractGraphicalParametricOnSelectedElementsAction(String parameter, List<EObject> selectedEditPart) {

+		super(parameter, selectedEditPart);

+	}

+

+	/**

+	 * Returns the command for this action

+	 *

+	 * @return

+	 *         the command for this action

+	 */

+	public Command getCommand() {

+		if (isEnabled()) {

+			Command cmd = getBuildedCommand();

+			if (cmd != null && cmd.canExecute()) {

+				return cmd;

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 *

+	 * @return

+	 *         the command for this action

+	 */

+	protected abstract Command getBuildedCommand();

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/DiagramNameNormalizationCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/DiagramNameNormalizationCommand.java
new file mode 100644
index 00000000000..734a163448b
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/DiagramNameNormalizationCommand.java
@@ -0,0 +1,59 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.menu.actions;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;
+
+/**
+ * this command is used to create a link "satisfyBy" between requirement and namedElement
+ *
+ */
+public class DiagramNameNormalizationCommand extends NameNormalizationCommand{
+
+	public DiagramNameNormalizationCommand(TransactionalEditingDomain domain, EObject source, String parameter){ 
+		super(domain,source, parameter);
+	}
+
+
+	/**
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+	@Override
+	protected void doExecute() {
+		if(source instanceof Diagram){
+			String name = ((Diagram)source).getName();
+
+			switch (parameter) {
+			case UPPERCASE_ACTION:
+				((Diagram)source).setName(name.toUpperCase());
+				break;
+			case LOWERCASE_ACTION:
+				((Diagram)source).setName(name.toLowerCase());
+				break;
+
+			default:
+				((Diagram)source).setName(name.toUpperCase());
+				break;
+			}
+		}
+
+
+
+	}
+
+}
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/DiagramQuickFormatAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/DiagramQuickFormatAction.java
new file mode 100644
index 00000000000..d6d99b2ef98
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/DiagramQuickFormatAction.java
@@ -0,0 +1,54 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST.

+ *

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.menu.actions;

+

+import java.util.List;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.CompoundCommand;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;

+

+public class DiagramQuickFormatAction extends AbstractGraphicalParametricOnSelectedElementsAction {

+

+	public DiagramQuickFormatAction(String parameter , List<EObject> selectedElements) {

+		super(parameter, selectedElements);

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.uml.diagram.menu.actions.AbstractGraphicalParametricAction#getBuildedCommand()

+	 *

+	 * @return

+	 */

+	@Override

+	protected Command getBuildedCommand() {

+		CompoundCommand cc = new CompoundCommand(NameNormalizationCommand.NAME_ACTION);

+		for(EObject igEP : getSelection()){

+			final TransactionalEditingDomain domain = getEditingDomain();

+			DiagramNameNormalizationCommand myCmd = new DiagramNameNormalizationCommand(domain, igEP, parameter);

+			EMFtoGEFCommandWrapper commandWrapper=new EMFtoGEFCommandWrapper(myCmd);

+			cc.add(commandWrapper);

+		}

+		

+		

+		if (!cc.isEmpty() && cc.canExecute()) {

+			return cc;

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractGenericCommandHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractGenericCommandHandler.java
new file mode 100644
index 00000000000..2716d77f80f
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractGenericCommandHandler.java
@@ -0,0 +1,81 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 430701
+ *  Christian W. Damus (CEA) - bug 433320
+ *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 454891
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.menu.actions.handlers;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.ui.menu.AbstractCommonCommandHandler;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * This abstract command handler: - calculates the current selection -
+ * calculates the visibility and enablement based on command executability -
+ * executes the command in Papyrus command stack
+ *
+ */
+public abstract class AbstractGenericCommandHandler extends AbstractCommonCommandHandler {
+
+	protected abstract Command getCommand(ExecutionEvent event);
+
+	/**
+	 * Iterate over current selection and build a list of the {@link EObject} contained in the selection.
+	 *
+	 * @return the currently selected {@link EObject}
+	 */
+	protected List<EObject> getSelectedElements() {
+		List<EObject> result = new LinkedList<EObject>();
+		for (Object element : getSelection()) {
+			EObject elementi = EMFHelper.getEObject(element) ;
+			if(elementi instanceof Diagram){
+				result.add( elementi);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return null
+	 * @throws ExecutionException
+	 */
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		try {
+			ISelection selection = HandlerUtil.getCurrentSelection(event);
+			this.selection = (selection instanceof IStructuredSelection) ? ((IStructuredSelection) selection).toList() : Collections.EMPTY_LIST;
+			getEditingDomain(event).getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(getCommand(event)));
+		} finally {
+			// clear the selection
+			this.selection = Collections.EMPTY_LIST;
+		}
+
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/DiagramNamePropertyTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/DiagramNamePropertyTester.java
new file mode 100644
index 00000000000..a2c1ccd9a3f
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/DiagramNamePropertyTester.java
@@ -0,0 +1,46 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.menu.actions.handlers;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

+import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;

+

+

+public class DiagramNamePropertyTester extends NamePropertyTester {

+

+	/**

+	 * @see org.eclipse.papyrus.infra.ui.menu.NamePropertyTester#isNameChangeable(org.eclipse.jface.viewers.IStructuredSelection)

+	 *

+	 * @param selection

+	 * @return

+	 */

+	@Override

+	protected boolean isNameChangeable(IStructuredSelection selection){

+		boolean onlyWaitElement=true;

+		if (!selection.isEmpty()) {

+			Iterator<?> iter = selection.iterator();

+			while (iter.hasNext()) {

+				EObject object = EMFHelper.getEObject(iter.next());

+				if (!(object instanceof Diagram)) {

+					onlyWaitElement  =false;

+					break;

+				}

+			}

+		}

+		return onlyWaitElement;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/DiagramQuickFormatHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/DiagramQuickFormatHandler.java
new file mode 100644
index 00000000000..d99dbb5e878
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/DiagramQuickFormatHandler.java
@@ -0,0 +1,62 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST.

+ *

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.menu.actions.handlers;

+

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;

+import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;

+import org.eclipse.papyrus.uml.diagram.menu.actions.DiagramQuickFormatAction;

+

+/**

+ * The handler for the {@link DiagramQuickFormatAction}

+ *

+ *

+ *

+ */

+public class DiagramQuickFormatHandler extends AbstractGenericCommandHandler {

+	

+	/**

+	 *

+	 * Constructor.

+	 */

+	public DiagramQuickFormatHandler() {

+		super();

+	}

+	

+	/**

+	 * @see org.eclipse.papyrus.infra.gmfdiag.menu.handlers.AbstractGraphicalCommandHandler#getCommand()

+	 *

+	 * @return

+	 */

+	@Override

+	protected Command getCommand(ExecutionEvent event) {

+		String parameter = event.getParameter(NamePropertyTester.PARAMETER_ID);

+		

+		DiagramQuickFormatAction action = new DiagramQuickFormatAction(parameter,getSelectedElements());

+		setBaseEnabled(action.isEnabled());

+		if (action.isEnabled()) {

+			return action.getCommand();

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	@Override

+	public void setEnabled(Object evaluationContext) {

+		DiagramQuickFormatAction action = new DiagramQuickFormatAction(NameNormalizationCommand.DEFAULT_ACTION, getSelectedElements());

+		setBaseEnabled(action.isEnabled());

+	}

+

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/providers/DiagramPropertyTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/providers/DiagramPropertyTester.java
index ac5e378cac8..f95e5ece95b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/providers/DiagramPropertyTester.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/providers/DiagramPropertyTester.java
@@ -14,10 +14,12 @@ package org.eclipse.papyrus.uml.diagram.menu.providers;
 import java.util.Iterator;

 

 import org.eclipse.core.expressions.PropertyTester;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;

 

 

@@ -81,7 +83,8 @@ public class DiagramPropertyTester extends PropertyTester {
 		if (!selection.isEmpty()) {

 			Iterator<?> iter = selection.iterator();

 			while (iter.hasNext()) {

-				if (!(iter.next() instanceof Diagram)) {

+				EObject object = EMFHelper.getEObject(iter.next());

+				if (!(object instanceof Diagram)) {

 					return false;

 				}

 			}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
index d3ff66c8302..b7fb4b25bfa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
@@ -11,18 +11,15 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.uml2.uml,

  org.eclipse.uml2.uml.edit,

  org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="1.1.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration.p

- rovider

+Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration

- .provider.PaletteConfigurationEditPlugin$Implementation

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider.PaletteConfigurationEditPlugin$Implementation

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfigurat

- ion.edit;singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ChildConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ChildConfigurationItemProvider.java
index 97fc84acecc..00392419058 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ChildConfigurationItemProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ChildConfigurationItemProvider.java
@@ -1,4 +1,14 @@
 /**

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider;

 

@@ -8,23 +18,22 @@ import java.util.List;
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration;

 

 /**

  * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- *

  * @generated

  */

-public class ChildConfigurationItemProvider

-		extends ConfigurationItemProvider {

+public class ChildConfigurationItemProvider extends ConfigurationItemProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ChildConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -35,7 +44,6 @@ public class ChildConfigurationItemProvider
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -51,24 +59,22 @@ public class ChildConfigurationItemProvider
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((ChildConfiguration) object).getId();

+		String label = ((ChildConfiguration)object).getId();

 		return label == null || label.length() == 0 ?

-				getString("_UI_ChildConfiguration_type") :

-				getString("_UI_ChildConfiguration_type") + " " + label;

+			getString("_UI_ChildConfiguration_type") :

+			getString("_UI_ChildConfiguration_type") + " " + label;

 	}

-

+	

 

 	/**

 	 * This handles model notifications by calling {@link #updateChildren} to update any cached

 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -82,7 +88,6 @@ public class ChildConfigurationItemProvider
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ConfigurationItemProvider.java
index d8c49434d0a..c1ab1a626c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ConfigurationItemProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ConfigurationItemProvider.java
@@ -1,4 +1,14 @@
 /**

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider;

 

@@ -8,8 +18,11 @@ import java.util.List;
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.common.util.ResourceLocator;

+

 import org.eclipse.emf.ecore.EStructuralFeature;

+

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -20,6 +33,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ItemProviderAdapter;

 import org.eclipse.emf.edit.provider.ViewerNotification;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

@@ -28,12 +42,11 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration
  * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- *

  * @generated

  */

-public class ConfigurationItemProvider

-		extends ItemProviderAdapter

-		implements

+public class ConfigurationItemProvider 

+	extends ItemProviderAdapter

+	implements

 		IEditingDomainItemProvider,

 		IStructuredItemContentProvider,

 		ITreeItemContentProvider,

@@ -43,7 +56,6 @@ public class ConfigurationItemProvider
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -54,7 +66,6 @@ public class ConfigurationItemProvider
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -73,77 +84,74 @@ public class ConfigurationItemProvider
 	 * This adds a property descriptor for the Id feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void addIdPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Configuration_id_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Configuration_id_feature", "_UI_Configuration_type"),

-						PaletteconfigurationPackage.Literals.CONFIGURATION__ID,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Configuration_id_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_Configuration_id_feature", "_UI_Configuration_type"),

+				 PaletteconfigurationPackage.Literals.CONFIGURATION__ID,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Label feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void addLabelPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Configuration_label_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Configuration_label_feature", "_UI_Configuration_type"),

-						PaletteconfigurationPackage.Literals.CONFIGURATION__LABEL,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Configuration_label_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_Configuration_label_feature", "_UI_Configuration_type"),

+				 PaletteconfigurationPackage.Literals.CONFIGURATION__LABEL,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Description feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void addDescriptionPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Configuration_description_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Configuration_description_feature", "_UI_Configuration_type"),

-						PaletteconfigurationPackage.Literals.CONFIGURATION__DESCRIPTION,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Configuration_description_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_Configuration_description_feature", "_UI_Configuration_type"),

+				 PaletteconfigurationPackage.Literals.CONFIGURATION__DESCRIPTION,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -158,7 +166,6 @@ public class ConfigurationItemProvider
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -173,24 +180,22 @@ public class ConfigurationItemProvider
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((Configuration) object).getId();

+		String label = ((Configuration)object).getId();

 		return label == null || label.length() == 0 ?

-				getString("_UI_Configuration_type") :

-				getString("_UI_Configuration_type") + " " + label;

+			getString("_UI_Configuration_type") :

+			getString("_UI_Configuration_type") + " " + label;

 	}

-

+	

 

 	/**

 	 * This handles model notifications by calling {@link #updateChildren} to update any cached

 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -198,14 +203,14 @@ public class ConfigurationItemProvider
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(Configuration.class)) {

-		case PaletteconfigurationPackage.CONFIGURATION__ID:

-		case PaletteconfigurationPackage.CONFIGURATION__LABEL:

-		case PaletteconfigurationPackage.CONFIGURATION__DESCRIPTION:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case PaletteconfigurationPackage.CONFIGURATION__ICON:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case PaletteconfigurationPackage.CONFIGURATION__ID:

+			case PaletteconfigurationPackage.CONFIGURATION__LABEL:

+			case PaletteconfigurationPackage.CONFIGURATION__DESCRIPTION:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+			case PaletteconfigurationPackage.CONFIGURATION__ICON:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -215,7 +220,6 @@ public class ConfigurationItemProvider
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -223,16 +227,15 @@ public class ConfigurationItemProvider
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(PaletteconfigurationPackage.Literals.CONFIGURATION__ICON,

-						PaletteconfigurationFactory.eINSTANCE.createIconDescriptor()));

+				 PaletteconfigurationFactory.eINSTANCE.createIconDescriptor()));

 	}

 

 	/**

 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/DrawerConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/DrawerConfigurationItemProvider.java
index 407ca51c826..c8cb6b24ec4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/DrawerConfigurationItemProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/DrawerConfigurationItemProvider.java
@@ -1,4 +1,14 @@
 /**

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider;

 

@@ -8,9 +18,12 @@ import java.util.List;
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.ecore.EStructuralFeature;

+

 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ViewerNotification;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

@@ -19,16 +32,13 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration
  * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- *

  * @generated

  */

-public class DrawerConfigurationItemProvider

-		extends ConfigurationItemProvider {

+public class DrawerConfigurationItemProvider extends ConfigurationItemProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public DrawerConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -39,7 +49,6 @@ public class DrawerConfigurationItemProvider
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -52,11 +61,11 @@ public class DrawerConfigurationItemProvider
 	}

 

 	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -71,7 +80,6 @@ public class DrawerConfigurationItemProvider
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -86,7 +94,6 @@ public class DrawerConfigurationItemProvider
 	 * This returns DrawerConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -98,24 +105,22 @@ public class DrawerConfigurationItemProvider
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((DrawerConfiguration) object).getId();

+		String label = ((DrawerConfiguration)object).getId();

 		return label == null || label.length() == 0 ?

-				getString("_UI_DrawerConfiguration_type") :

-				getString("_UI_DrawerConfiguration_type") + " " + label;

+			getString("_UI_DrawerConfiguration_type") :

+			getString("_UI_DrawerConfiguration_type") + " " + label;

 	}

-

+	

 

 	/**

 	 * This handles model notifications by calling {@link #updateChildren} to update any cached

 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -123,9 +128,9 @@ public class DrawerConfigurationItemProvider
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(DrawerConfiguration.class)) {

-		case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -135,7 +140,6 @@ public class DrawerConfigurationItemProvider
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -143,19 +147,19 @@ public class DrawerConfigurationItemProvider
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(PaletteconfigurationPackage.Literals.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS,

-						PaletteconfigurationFactory.eINSTANCE.createToolConfiguration()));

+				 PaletteconfigurationFactory.eINSTANCE.createToolConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(PaletteconfigurationPackage.Literals.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS,

-						PaletteconfigurationFactory.eINSTANCE.createStackConfiguration()));

+				 PaletteconfigurationFactory.eINSTANCE.createStackConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(PaletteconfigurationPackage.Literals.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS,

-						PaletteconfigurationFactory.eINSTANCE.createSeparatorConfiguration()));

+				 PaletteconfigurationFactory.eINSTANCE.createSeparatorConfiguration()));

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ElementDescriptorItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ElementDescriptorItemProvider.java
index 8567d7fa0d5..f6e6caf1bec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ElementDescriptorItemProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ElementDescriptorItemProvider.java
@@ -1,4 +1,14 @@
 /**

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider;

 

@@ -8,7 +18,9 @@ import java.util.List;
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.common.util.ResourceLocator;

+

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -19,6 +31,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ItemProviderAdapter;

 import org.eclipse.emf.edit.provider.ViewerNotification;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

 

@@ -26,12 +39,11 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration
  * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- *

  * @generated

  */

-public class ElementDescriptorItemProvider

-		extends ItemProviderAdapter

-		implements

+public class ElementDescriptorItemProvider 

+	extends ItemProviderAdapter

+	implements

 		IEditingDomainItemProvider,

 		IStructuredItemContentProvider,

 		ITreeItemContentProvider,

@@ -41,7 +53,6 @@ public class ElementDescriptorItemProvider
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ElementDescriptorItemProvider(AdapterFactory adapterFactory) {

@@ -52,7 +63,6 @@ public class ElementDescriptorItemProvider
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -70,53 +80,50 @@ public class ElementDescriptorItemProvider
 	 * This adds a property descriptor for the Element Type Id feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void addElementTypeIdPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ElementDescriptor_elementTypeId_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ElementDescriptor_elementTypeId_feature", "_UI_ElementDescriptor_type"),

-						PaletteconfigurationPackage.Literals.ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_ElementDescriptor_elementTypeId_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_ElementDescriptor_elementTypeId_feature", "_UI_ElementDescriptor_type"),

+				 PaletteconfigurationPackage.Literals.ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Graphical Hints feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void addGraphicalHintsPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ElementDescriptor_graphicalHints_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ElementDescriptor_graphicalHints_feature", "_UI_ElementDescriptor_type"),

-						PaletteconfigurationPackage.Literals.ELEMENT_DESCRIPTOR__GRAPHICAL_HINTS,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_ElementDescriptor_graphicalHints_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_ElementDescriptor_graphicalHints_feature", "_UI_ElementDescriptor_type"),

+				 PaletteconfigurationPackage.Literals.ELEMENT_DESCRIPTOR__GRAPHICAL_HINTS,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns ElementDescriptor.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -128,24 +135,22 @@ public class ElementDescriptorItemProvider
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((ElementDescriptor) object).getElementTypeId();

+		String label = ((ElementDescriptor)object).getElementTypeId();

 		return label == null || label.length() == 0 ?

-				getString("_UI_ElementDescriptor_type") :

-				getString("_UI_ElementDescriptor_type") + " " + label;

+			getString("_UI_ElementDescriptor_type") :

+			getString("_UI_ElementDescriptor_type") + " " + label;

 	}

-

+	

 

 	/**

 	 * This handles model notifications by calling {@link #updateChildren} to update any cached

 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -153,10 +158,10 @@ public class ElementDescriptorItemProvider
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(ElementDescriptor.class)) {

-		case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID:

-		case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__GRAPHICAL_HINTS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID:

+			case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__GRAPHICAL_HINTS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -166,7 +171,6 @@ public class ElementDescriptorItemProvider
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -178,7 +182,6 @@ public class ElementDescriptorItemProvider
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/IconDescriptorItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/IconDescriptorItemProvider.java
index f3af783bbca..bf73012f9c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/IconDescriptorItemProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/IconDescriptorItemProvider.java
@@ -1,4 +1,14 @@
 /**

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider;

 

@@ -8,7 +18,9 @@ import java.util.List;
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.common.util.ResourceLocator;

+

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -19,6 +31,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ItemProviderAdapter;

 import org.eclipse.emf.edit.provider.ViewerNotification;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

 

@@ -26,12 +39,11 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration
  * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- *

  * @generated

  */

-public class IconDescriptorItemProvider

-		extends ItemProviderAdapter

-		implements

+public class IconDescriptorItemProvider 

+	extends ItemProviderAdapter

+	implements

 		IEditingDomainItemProvider,

 		IStructuredItemContentProvider,

 		ITreeItemContentProvider,

@@ -41,7 +53,6 @@ public class IconDescriptorItemProvider
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public IconDescriptorItemProvider(AdapterFactory adapterFactory) {

@@ -52,7 +63,6 @@ public class IconDescriptorItemProvider
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -70,53 +80,50 @@ public class IconDescriptorItemProvider
 	 * This adds a property descriptor for the Plugin ID feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void addPluginIDPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_IconDescriptor_pluginID_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_IconDescriptor_pluginID_feature", "_UI_IconDescriptor_type"),

-						PaletteconfigurationPackage.Literals.ICON_DESCRIPTOR__PLUGIN_ID,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_IconDescriptor_pluginID_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_IconDescriptor_pluginID_feature", "_UI_IconDescriptor_type"),

+				 PaletteconfigurationPackage.Literals.ICON_DESCRIPTOR__PLUGIN_ID,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Icon Path feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void addIconPathPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_IconDescriptor_iconPath_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_IconDescriptor_iconPath_feature", "_UI_IconDescriptor_type"),

-						PaletteconfigurationPackage.Literals.ICON_DESCRIPTOR__ICON_PATH,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_IconDescriptor_iconPath_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_IconDescriptor_iconPath_feature", "_UI_IconDescriptor_type"),

+				 PaletteconfigurationPackage.Literals.ICON_DESCRIPTOR__ICON_PATH,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns IconDescriptor.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -128,24 +135,22 @@ public class IconDescriptorItemProvider
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((IconDescriptor) object).getPluginID();

+		String label = ((IconDescriptor)object).getPluginID();

 		return label == null || label.length() == 0 ?

-				getString("_UI_IconDescriptor_type") :

-				getString("_UI_IconDescriptor_type") + " " + label;

+			getString("_UI_IconDescriptor_type") :

+			getString("_UI_IconDescriptor_type") + " " + label;

 	}

-

+	

 

 	/**

 	 * This handles model notifications by calling {@link #updateChildren} to update any cached

 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -153,10 +158,10 @@ public class IconDescriptorItemProvider
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(IconDescriptor.class)) {

-		case PaletteconfigurationPackage.ICON_DESCRIPTOR__PLUGIN_ID:

-		case PaletteconfigurationPackage.ICON_DESCRIPTOR__ICON_PATH:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case PaletteconfigurationPackage.ICON_DESCRIPTOR__PLUGIN_ID:

+			case PaletteconfigurationPackage.ICON_DESCRIPTOR__ICON_PATH:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -166,7 +171,6 @@ public class IconDescriptorItemProvider
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -178,7 +182,6 @@ public class IconDescriptorItemProvider
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/LeafConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/LeafConfigurationItemProvider.java
index 2b2d3e42bc2..3e29e137d63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/LeafConfigurationItemProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/LeafConfigurationItemProvider.java
@@ -1,4 +1,14 @@
 /**

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider;

 

@@ -8,23 +18,22 @@ import java.util.List;
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration;

 

 /**

  * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- *

  * @generated

  */

-public class LeafConfigurationItemProvider

-		extends ChildConfigurationItemProvider {

+public class LeafConfigurationItemProvider extends ChildConfigurationItemProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public LeafConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -35,7 +44,6 @@ public class LeafConfigurationItemProvider
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -51,24 +59,22 @@ public class LeafConfigurationItemProvider
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((LeafConfiguration) object).getId();

+		String label = ((LeafConfiguration)object).getId();

 		return label == null || label.length() == 0 ?

-				getString("_UI_LeafConfiguration_type") :

-				getString("_UI_LeafConfiguration_type") + " " + label;

+			getString("_UI_LeafConfiguration_type") :

+			getString("_UI_LeafConfiguration_type") + " " + label;

 	}

-

+	

 

 	/**

 	 * This handles model notifications by calling {@link #updateChildren} to update any cached

 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -82,7 +88,6 @@ public class LeafConfigurationItemProvider
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/PaletteConfigurationEditPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/PaletteConfigurationEditPlugin.java
index 48d9c3c1009..085503bb05b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/PaletteConfigurationEditPlugin.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/PaletteConfigurationEditPlugin.java
@@ -1,16 +1,27 @@
 /**

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider;

 

 import org.eclipse.emf.common.EMFPlugin;

+

 import org.eclipse.emf.common.util.ResourceLocator;

+

 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

 

 /**

  * This is the central singleton for the PaletteConfiguration edit plugin.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public final class PaletteConfigurationEditPlugin extends EMFPlugin {

@@ -18,7 +29,6 @@ public final class PaletteConfigurationEditPlugin extends EMFPlugin {
 	 * Keep track of the singleton.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static final PaletteConfigurationEditPlugin INSTANCE = new PaletteConfigurationEditPlugin();

@@ -27,7 +37,6 @@ public final class PaletteConfigurationEditPlugin extends EMFPlugin {
 	 * Keep track of the singleton.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static Implementation plugin;

@@ -36,20 +45,19 @@ public final class PaletteConfigurationEditPlugin extends EMFPlugin {
 	 * Create the instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public PaletteConfigurationEditPlugin() {

-		super(new ResourceLocator[] {

-				EcoreEditPlugin.INSTANCE,

-		});

+		super

+		  (new ResourceLocator [] {

+		     EcoreEditPlugin.INSTANCE,

+		   });

 	}

 

 	/**

 	 * Returns the singleton instance of the Eclipse plugin.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the singleton instance.

 	 * @generated

 	 */

@@ -62,7 +70,6 @@ public final class PaletteConfigurationEditPlugin extends EMFPlugin {
 	 * Returns the singleton instance of the Eclipse plugin.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the singleton instance.

 	 * @generated

 	 */

@@ -74,7 +81,6 @@ public final class PaletteConfigurationEditPlugin extends EMFPlugin {
 	 * The actual implementation of the Eclipse <b>Plugin</b>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static class Implementation extends EclipsePlugin {

@@ -82,7 +88,6 @@ public final class PaletteConfigurationEditPlugin extends EMFPlugin {
 		 * Creates an instance.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		public Implementation() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/PaletteConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/PaletteConfigurationItemProvider.java
index db0d5788c7d..519bacfca72 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/PaletteConfigurationItemProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/PaletteConfigurationItemProvider.java
@@ -1,4 +1,14 @@
 /**

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider;

 

@@ -8,11 +18,14 @@ import java.util.List;
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.ecore.EStructuralFeature;

+

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ViewerNotification;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

@@ -21,16 +34,13 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration
  * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- *

  * @generated

  */

-public class PaletteConfigurationItemProvider

-		extends ConfigurationItemProvider {

+public class PaletteConfigurationItemProvider extends ConfigurationItemProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public PaletteConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -41,7 +51,6 @@ public class PaletteConfigurationItemProvider
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -58,31 +67,30 @@ public class PaletteConfigurationItemProvider
 	 * This adds a property descriptor for the Required Profiles feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void addRequiredProfilesPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_PaletteConfiguration_requiredProfiles_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_PaletteConfiguration_requiredProfiles_feature", "_UI_PaletteConfiguration_type"),

-						PaletteconfigurationPackage.Literals.PALETTE_CONFIGURATION__REQUIRED_PROFILES,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_PaletteConfiguration_requiredProfiles_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_PaletteConfiguration_requiredProfiles_feature", "_UI_PaletteConfiguration_type"),

+				 PaletteconfigurationPackage.Literals.PALETTE_CONFIGURATION__REQUIRED_PROFILES,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -97,7 +105,6 @@ public class PaletteConfigurationItemProvider
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -112,7 +119,6 @@ public class PaletteConfigurationItemProvider
 	 * This returns PaletteConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -124,24 +130,22 @@ public class PaletteConfigurationItemProvider
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((PaletteConfiguration) object).getId();

+		String label = ((PaletteConfiguration)object).getId();

 		return label == null || label.length() == 0 ?

-				getString("_UI_PaletteConfiguration_type") :

-				getString("_UI_PaletteConfiguration_type") + " " + label;

+			getString("_UI_PaletteConfiguration_type") :

+			getString("_UI_PaletteConfiguration_type") + " " + label;

 	}

-

+	

 

 	/**

 	 * This handles model notifications by calling {@link #updateChildren} to update any cached

 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -149,12 +153,12 @@ public class PaletteConfigurationItemProvider
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(PaletteConfiguration.class)) {

-		case PaletteconfigurationPackage.PALETTE_CONFIGURATION__REQUIRED_PROFILES:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case PaletteconfigurationPackage.PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case PaletteconfigurationPackage.PALETTE_CONFIGURATION__REQUIRED_PROFILES:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+			case PaletteconfigurationPackage.PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -164,7 +168,6 @@ public class PaletteConfigurationItemProvider
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -172,9 +175,9 @@ public class PaletteConfigurationItemProvider
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(PaletteconfigurationPackage.Literals.PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS,

-						PaletteconfigurationFactory.eINSTANCE.createDrawerConfiguration()));

+				 PaletteconfigurationFactory.eINSTANCE.createDrawerConfiguration()));

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/PaletteconfigurationItemProviderAdapterFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/PaletteconfigurationItemProviderAdapterFactory.java
index 4f8732ae836..64a7bbc8956 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/PaletteconfigurationItemProviderAdapterFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/PaletteconfigurationItemProviderAdapterFactory.java
@@ -1,4 +1,14 @@
 /**

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider;

 

@@ -8,6 +18,7 @@ import java.util.Collection;
 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.Notifier;

+

 import org.eclipse.emf.edit.provider.ChangeNotifier;

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

@@ -19,6 +30,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;

 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.util.PaletteconfigurationAdapterFactory;

 

 /**

@@ -28,7 +40,6 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.util.Paletteconfigur
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class PaletteconfigurationItemProviderAdapterFactory extends PaletteconfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -36,7 +47,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -45,7 +55,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -54,7 +63,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -63,7 +71,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This constructs an instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public PaletteconfigurationItemProviderAdapterFactory() {

@@ -78,7 +85,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected PaletteConfigurationItemProvider paletteConfigurationItemProvider;

@@ -87,7 +93,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -103,7 +108,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected ToolConfigurationItemProvider toolConfigurationItemProvider;

@@ -112,7 +116,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -128,7 +131,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected StackConfigurationItemProvider stackConfigurationItemProvider;

@@ -137,7 +139,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -153,7 +154,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected DrawerConfigurationItemProvider drawerConfigurationItemProvider;

@@ -162,7 +162,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -178,7 +177,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected IconDescriptorItemProvider iconDescriptorItemProvider;

@@ -187,7 +185,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -203,7 +200,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected ElementDescriptorItemProvider elementDescriptorItemProvider;

@@ -212,7 +208,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -228,7 +223,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected SeparatorConfigurationItemProvider separatorConfigurationItemProvider;

@@ -237,7 +231,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -253,10 +246,8 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This returns the root adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

-	@Override

 	public ComposeableAdapterFactory getRootAdapterFactory() {

 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

 	}

@@ -265,10 +256,8 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This sets the composed adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

-	@Override

 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

 		this.parentAdapterFactory = parentAdapterFactory;

 	}

@@ -276,7 +265,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -288,7 +276,6 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -299,14 +286,13 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

 		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -318,10 +304,8 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This adds a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

-	@Override

 	public void addListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.addListener(notifyChangedListener);

 	}

@@ -330,10 +314,8 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This removes a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

-	@Override

 	public void removeListener(INotifyChangedListener notifyChangedListener) {

 		changeNotifier.removeListener(notifyChangedListener);

 	}

@@ -342,10 +324,8 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

-	@Override

 	public void fireNotifyChanged(Notification notification) {

 		changeNotifier.fireNotifyChanged(notification);

 

@@ -355,35 +335,19 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi
 	}

 

 	/**

-	 * This disposes all of the item providers created by this factory.

+	 * This disposes all of the item providers created by this factory. 

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

-	@Override

 	public void dispose() {

-		if (paletteConfigurationItemProvider != null) {

-			paletteConfigurationItemProvider.dispose();

-		}

-		if (toolConfigurationItemProvider != null) {

-			toolConfigurationItemProvider.dispose();

-		}

-		if (stackConfigurationItemProvider != null) {

-			stackConfigurationItemProvider.dispose();

-		}

-		if (drawerConfigurationItemProvider != null) {

-			drawerConfigurationItemProvider.dispose();

-		}

-		if (iconDescriptorItemProvider != null) {

-			iconDescriptorItemProvider.dispose();

-		}

-		if (elementDescriptorItemProvider != null) {

-			elementDescriptorItemProvider.dispose();

-		}

-		if (separatorConfigurationItemProvider != null) {

-			separatorConfigurationItemProvider.dispose();

-		}

+		if (paletteConfigurationItemProvider != null) paletteConfigurationItemProvider.dispose();

+		if (toolConfigurationItemProvider != null) toolConfigurationItemProvider.dispose();

+		if (stackConfigurationItemProvider != null) stackConfigurationItemProvider.dispose();

+		if (drawerConfigurationItemProvider != null) drawerConfigurationItemProvider.dispose();

+		if (iconDescriptorItemProvider != null) iconDescriptorItemProvider.dispose();

+		if (elementDescriptorItemProvider != null) elementDescriptorItemProvider.dispose();

+		if (separatorConfigurationItemProvider != null) separatorConfigurationItemProvider.dispose();

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/SeparatorConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/SeparatorConfigurationItemProvider.java
index d28bd296c09..c1904b0e833 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/SeparatorConfigurationItemProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/SeparatorConfigurationItemProvider.java
@@ -1,4 +1,14 @@
 /**

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider;

 

@@ -8,23 +18,22 @@ import java.util.List;
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration;

 

 /**

  * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- *

  * @generated

  */

-public class SeparatorConfigurationItemProvider

-		extends LeafConfigurationItemProvider {

+public class SeparatorConfigurationItemProvider extends LeafConfigurationItemProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public SeparatorConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -35,7 +44,6 @@ public class SeparatorConfigurationItemProvider
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -51,7 +59,6 @@ public class SeparatorConfigurationItemProvider
 	 * This returns SeparatorConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -63,24 +70,22 @@ public class SeparatorConfigurationItemProvider
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((SeparatorConfiguration) object).getId();

+		String label = ((SeparatorConfiguration)object).getId();

 		return label == null || label.length() == 0 ?

-				getString("_UI_SeparatorConfiguration_type") :

-				getString("_UI_SeparatorConfiguration_type") + " " + label;

+			getString("_UI_SeparatorConfiguration_type") :

+			getString("_UI_SeparatorConfiguration_type") + " " + label;

 	}

-

+	

 

 	/**

 	 * This handles model notifications by calling {@link #updateChildren} to update any cached

 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -94,7 +99,6 @@ public class SeparatorConfigurationItemProvider
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/StackConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/StackConfigurationItemProvider.java
index e5faad001ba..4e65f4205b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/StackConfigurationItemProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/StackConfigurationItemProvider.java
@@ -1,4 +1,14 @@
 /**

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider;

 

@@ -8,9 +18,12 @@ import java.util.List;
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.ecore.EStructuralFeature;

+

 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ViewerNotification;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;

@@ -19,16 +32,13 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- *

  * @generated

  */

-public class StackConfigurationItemProvider

-		extends ChildConfigurationItemProvider {

+public class StackConfigurationItemProvider extends ChildConfigurationItemProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public StackConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -39,7 +49,6 @@ public class StackConfigurationItemProvider
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -52,11 +61,11 @@ public class StackConfigurationItemProvider
 	}

 

 	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -71,7 +80,6 @@ public class StackConfigurationItemProvider
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -86,7 +94,6 @@ public class StackConfigurationItemProvider
 	 * This returns StackConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -98,24 +105,22 @@ public class StackConfigurationItemProvider
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((StackConfiguration) object).getId();

+		String label = ((StackConfiguration)object).getId();

 		return label == null || label.length() == 0 ?

-				getString("_UI_StackConfiguration_type") :

-				getString("_UI_StackConfiguration_type") + " " + label;

+			getString("_UI_StackConfiguration_type") :

+			getString("_UI_StackConfiguration_type") + " " + label;

 	}

-

+	

 

 	/**

 	 * This handles model notifications by calling {@link #updateChildren} to update any cached

 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -123,9 +128,9 @@ public class StackConfigurationItemProvider
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(StackConfiguration.class)) {

-		case PaletteconfigurationPackage.STACK_CONFIGURATION__OWNED_CONFIGURATIONS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case PaletteconfigurationPackage.STACK_CONFIGURATION__OWNED_CONFIGURATIONS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -135,7 +140,6 @@ public class StackConfigurationItemProvider
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -143,14 +147,14 @@ public class StackConfigurationItemProvider
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(PaletteconfigurationPackage.Literals.STACK_CONFIGURATION__OWNED_CONFIGURATIONS,

-						PaletteconfigurationFactory.eINSTANCE.createToolConfiguration()));

+				 PaletteconfigurationFactory.eINSTANCE.createToolConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(PaletteconfigurationPackage.Literals.STACK_CONFIGURATION__OWNED_CONFIGURATIONS,

-						PaletteconfigurationFactory.eINSTANCE.createSeparatorConfiguration()));

+				 PaletteconfigurationFactory.eINSTANCE.createSeparatorConfiguration()));

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ToolConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ToolConfigurationItemProvider.java
index 60aa42bff57..d7c3a5c25a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ToolConfigurationItemProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ToolConfigurationItemProvider.java
@@ -1,4 +1,14 @@
 /**

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider;

 

@@ -8,11 +18,14 @@ import java.util.List;
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.ecore.EStructuralFeature;

+

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ViewerNotification;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;

@@ -21,16 +34,13 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- *

  * @generated

  */

-public class ToolConfigurationItemProvider

-		extends LeafConfigurationItemProvider {

+public class ToolConfigurationItemProvider extends LeafConfigurationItemProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ToolConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -41,7 +51,6 @@ public class ToolConfigurationItemProvider
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -58,31 +67,30 @@ public class ToolConfigurationItemProvider
 	 * This adds a property descriptor for the Kind feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void addKindPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ToolConfiguration_kind_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ToolConfiguration_kind_feature", "_UI_ToolConfiguration_type"),

-						PaletteconfigurationPackage.Literals.TOOL_CONFIGURATION__KIND,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_ToolConfiguration_kind_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_ToolConfiguration_kind_feature", "_UI_ToolConfiguration_type"),

+				 PaletteconfigurationPackage.Literals.TOOL_CONFIGURATION__KIND,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -97,7 +105,6 @@ public class ToolConfigurationItemProvider
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -112,7 +119,6 @@ public class ToolConfigurationItemProvider
 	 * This returns ToolConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -124,24 +130,22 @@ public class ToolConfigurationItemProvider
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((ToolConfiguration) object).getId();

+		String label = ((ToolConfiguration)object).getId();

 		return label == null || label.length() == 0 ?

-				getString("_UI_ToolConfiguration_type") :

-				getString("_UI_ToolConfiguration_type") + " " + label;

+			getString("_UI_ToolConfiguration_type") :

+			getString("_UI_ToolConfiguration_type") + " " + label;

 	}

-

+	

 

 	/**

 	 * This handles model notifications by calling {@link #updateChildren} to update any cached

 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -149,12 +153,12 @@ public class ToolConfigurationItemProvider
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(ToolConfiguration.class)) {

-		case PaletteconfigurationPackage.TOOL_CONFIGURATION__KIND:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case PaletteconfigurationPackage.TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case PaletteconfigurationPackage.TOOL_CONFIGURATION__KIND:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+			case PaletteconfigurationPackage.TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -164,7 +168,6 @@ public class ToolConfigurationItemProvider
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -172,9 +175,9 @@ public class ToolConfigurationItemProvider
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(PaletteconfigurationPackage.Literals.TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS,

-						PaletteconfigurationFactory.eINSTANCE.createElementDescriptor()));

+				 PaletteconfigurationFactory.eINSTANCE.createElementDescriptor()));

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
index 2ab578698a0..d3f2d5418fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
@@ -23,10 +23,8 @@ Bundle-ClassPath: .
 Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration

- .Activator

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.Activator

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfigurat

- ion;singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecore_diagram b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecore_diagram
new file mode 100644
index 00000000000..1ab0379a414
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecore_diagram
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram 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" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_vUZYQLkAEeSblPRuyGO0dw" type="Ecore" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_8SRwUL2oEeSA8oxr--Q4Aw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_8SWBwL2oEeSA8oxr--Q4Aw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Sa6QL2oEeSA8oxr--Q4Aw" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SbhUL2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SbhUb2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SbhUr2oEeSA8oxr--Q4Aw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SbhU72oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SbhVL2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SbhVb2oEeSA8oxr--Q4Aw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SbhVr2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SbhV72oEeSA8oxr--Q4Aw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//PaletteConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8SRwUb2oEeSA8oxr--Q4Aw" x="100" y="290"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_8ScvcL2oEeSA8oxr--Q4Aw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_8Scvcr2oEeSA8oxr--Q4Aw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Scvc72oEeSA8oxr--Q4Aw" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8ScvdL2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Scvdb2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SdWgL2oEeSA8oxr--Q4Aw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SdWgb2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SdWgr2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SdWg72oEeSA8oxr--Q4Aw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SdWhL2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SdWhb2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//ToolConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Scvcb2oEeSA8oxr--Q4Aw" x="645" y="545"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_8Sd9kL2oEeSA8oxr--Q4Aw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_8Sd9kr2oEeSA8oxr--Q4Aw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Sd9k72oEeSA8oxr--Q4Aw" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8Sd9lL2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Sd9lb2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Sd9lr2oEeSA8oxr--Q4Aw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8Sd9l72oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Sd9mL2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SekoL2oEeSA8oxr--Q4Aw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8Sekob2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Sekor2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//StackConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Sd9kb2oEeSA8oxr--Q4Aw" x="490" y="440"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_8SfywL2oEeSA8oxr--Q4Aw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_8Sfywr2oEeSA8oxr--Q4Aw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SgZ0L2oEeSA8oxr--Q4Aw" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SgZ0b2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SgZ0r2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SgZ072oEeSA8oxr--Q4Aw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SgZ1L2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SgZ1b2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SgZ1r2oEeSA8oxr--Q4Aw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SgZ172oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SgZ2L2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//ChildConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Sfywb2oEeSA8oxr--Q4Aw" x="620" y="290"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_8ShA4L2oEeSA8oxr--Q4Aw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_8ShA4r2oEeSA8oxr--Q4Aw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8ShA472oEeSA8oxr--Q4Aw" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8Shn8L2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Shn8b2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Shn8r2oEeSA8oxr--Q4Aw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8Shn872oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Shn9L2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Shn9b2oEeSA8oxr--Q4Aw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8Shn9r2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Shn972oEeSA8oxr--Q4Aw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//DrawerConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8ShA4b2oEeSA8oxr--Q4Aw" x="330" y="290"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_8SiPAL2oEeSA8oxr--Q4Aw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_8SiPAr2oEeSA8oxr--Q4Aw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SiPA72oEeSA8oxr--Q4Aw" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SiPBL2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SiPBb2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SiPBr2oEeSA8oxr--Q4Aw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8Si2EL2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Si2Eb2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Si2Er2oEeSA8oxr--Q4Aw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8Si2E72oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Si2FL2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//Configuration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8SiPAb2oEeSA8oxr--Q4Aw" x="615" y="110"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_8SjdIL2oEeSA8oxr--Q4Aw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_8SjdIr2oEeSA8oxr--Q4Aw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SjdI72oEeSA8oxr--Q4Aw" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SjdJL2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SjdJb2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SjdJr2oEeSA8oxr--Q4Aw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SjdJ72oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SjdKL2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SjdKb2oEeSA8oxr--Q4Aw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SjdKr2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SjdK72oEeSA8oxr--Q4Aw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//IconDescriptor"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8SjdIb2oEeSA8oxr--Q4Aw" x="140" y="85"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_8SkrQL2oEeSA8oxr--Q4Aw" type="2005" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_8SkrQr2oEeSA8oxr--Q4Aw" type="5005"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SkrQ72oEeSA8oxr--Q4Aw" type="7011">

+      <children xmi:type="notation:Node" xmi:id="_8ZYd4L2oEeSA8oxr--Q4Aw" type="3009">

+        <element xmi:type="ecore:EEnumLiteral" href="PaletteConfiguration.ecore#//ToolKind/CreationTool"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8ZYd4b2oEeSA8oxr--Q4Aw"/>

+      </children>

+      <children xmi:type="notation:Node" xmi:id="_8ZZE8L2oEeSA8oxr--Q4Aw" type="3009">

+        <element xmi:type="ecore:EEnumLiteral" href="PaletteConfiguration.ecore#//ToolKind/ConnectionTool"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8ZZE8b2oEeSA8oxr--Q4Aw"/>

+      </children>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SkrRL2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SkrRb2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SkrRr2oEeSA8oxr--Q4Aw" type="7012">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SkrR72oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SkrSL2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <element xmi:type="ecore:EEnum" href="PaletteConfiguration.ecore#//ToolKind"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8SkrQb2oEeSA8oxr--Q4Aw" x="435" y="630"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_8SlSUL2oEeSA8oxr--Q4Aw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_8SlSUr2oEeSA8oxr--Q4Aw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Sl5YL2oEeSA8oxr--Q4Aw" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8Sl5Yb2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Sl5Yr2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Sl5Y72oEeSA8oxr--Q4Aw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8Sl5ZL2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Sl5Zb2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Sl5Zr2oEeSA8oxr--Q4Aw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8Sl5Z72oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Sl5aL2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//ElementDescriptor"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8SlSUb2oEeSA8oxr--Q4Aw" x="425" y="530"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_8SmgcL2oEeSA8oxr--Q4Aw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_8Smgcr2oEeSA8oxr--Q4Aw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Smgc72oEeSA8oxr--Q4Aw" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SmgdL2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SnHgL2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SnHgb2oEeSA8oxr--Q4Aw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SnHgr2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SnHg72oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8SnHhL2oEeSA8oxr--Q4Aw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SnHhb2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SnHhr2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//SeparatorConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Smgcb2oEeSA8oxr--Q4Aw" x="815" y="550"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_8SnukL2oEeSA8oxr--Q4Aw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_8Snukr2oEeSA8oxr--Q4Aw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Snuk72oEeSA8oxr--Q4Aw" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8SnulL2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Snulb2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Snulr2oEeSA8oxr--Q4Aw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8Snul72oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8SnumL2oEeSA8oxr--Q4Aw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_8Snumb2oEeSA8oxr--Q4Aw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_8Snumr2oEeSA8oxr--Q4Aw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_8Snum72oEeSA8oxr--Q4Aw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//LeafConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Snukb2oEeSA8oxr--Q4Aw" x="710" y="440"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_Bhbq0L5vEeS4RsarI-F0Lw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_Bhbq0r5vEeS4RsarI-F0Lw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_BhcR4L5vEeS4RsarI-F0Lw" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_BhcR4b5vEeS4RsarI-F0Lw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BhcR4r5vEeS4RsarI-F0Lw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_BhcR475vEeS4RsarI-F0Lw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_BhcR5L5vEeS4RsarI-F0Lw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BhcR5b5vEeS4RsarI-F0Lw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_BhcR5r5vEeS4RsarI-F0Lw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_BhcR575vEeS4RsarI-F0Lw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_BhcR6L5vEeS4RsarI-F0Lw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//SetToolConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bhbq0b5vEeS4RsarI-F0Lw" x="630" y="635"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_vUZYQbkAEeSblPRuyGO0dw"/>

+  <element xmi:type="ecore:EPackage" href="PaletteConfiguration.ecore#/"/>

+  <edges xmi:type="notation:Connector" xmi:id="_KQ7goL5mEeS4RsarI-F0Lw" type="4003" source="_8SRwUL2oEeSA8oxr--Q4Aw" target="_8ShA4L2oEeSA8oxr--Q4Aw">

+    <children xmi:type="notation:DecorationNode" xmi:id="_KQ8HsL5mEeS4RsarI-F0Lw" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KQ8uwL5mEeS4RsarI-F0Lw" y="40"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_KQ8uwb5mEeS4RsarI-F0Lw" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KQ8uwr5mEeS4RsarI-F0Lw" y="60"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_KQ7gob5mEeS4RsarI-F0Lw" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="PaletteConfiguration.ecore#//PaletteConfiguration/drawerConfigurations"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KQ7gor5mEeS4RsarI-F0Lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KRxOIL5mEeS4RsarI-F0Lw" type="4004" source="_8SRwUL2oEeSA8oxr--Q4Aw" target="_8SiPAL2oEeSA8oxr--Q4Aw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_KRxOIb5mEeS4RsarI-F0Lw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KRxOIr5mEeS4RsarI-F0Lw" points="[37, 30, -326, -261]$[306, 246, -57, -45]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KSPIML5mEeS4RsarI-F0Lw" type="4003" source="_8ScvcL2oEeSA8oxr--Q4Aw" target="_8SlSUL2oEeSA8oxr--Q4Aw">

+    <children xmi:type="notation:DecorationNode" xmi:id="_KSPvQL5mEeS4RsarI-F0Lw" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KSPvQb5mEeS4RsarI-F0Lw" x="10" y="71"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_KSPvQr5mEeS4RsarI-F0Lw" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KSPvQ75mEeS4RsarI-F0Lw" y="60"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_KSPIMb5mEeS4RsarI-F0Lw" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="PaletteConfiguration.ecore#//ToolConfiguration/elementDescriptors"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KSPIMr5mEeS4RsarI-F0Lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KSV14L5mEeS4RsarI-F0Lw" type="4004" source="_8ScvcL2oEeSA8oxr--Q4Aw" target="_8SnukL2oEeSA8oxr--Q4Aw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_KSV14b5mEeS4RsarI-F0Lw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KSV14r5mEeS4RsarI-F0Lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KSY5ML5mEeS4RsarI-F0Lw" type="4003" source="_8Sd9kL2oEeSA8oxr--Q4Aw" target="_8SnukL2oEeSA8oxr--Q4Aw">

+    <children xmi:type="notation:DecorationNode" xmi:id="_KSY5M75mEeS4RsarI-F0Lw" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KSY5NL5mEeS4RsarI-F0Lw" y="40"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_KSY5Nb5mEeS4RsarI-F0Lw" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KSY5Nr5mEeS4RsarI-F0Lw" y="60"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_KSY5Mb5mEeS4RsarI-F0Lw" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="PaletteConfiguration.ecore#//StackConfiguration/ownedConfigurations"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KSY5Mr5mEeS4RsarI-F0Lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KSdKoL5mEeS4RsarI-F0Lw" type="4004" source="_8Sd9kL2oEeSA8oxr--Q4Aw" target="_8SfywL2oEeSA8oxr--Q4Aw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_KSdKob5mEeS4RsarI-F0Lw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KSdKor5mEeS4RsarI-F0Lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KSgN8L5mEeS4RsarI-F0Lw" type="4004" source="_8SfywL2oEeSA8oxr--Q4Aw" target="_8SiPAL2oEeSA8oxr--Q4Aw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_KSgN8b5mEeS4RsarI-F0Lw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KSgN8r5mEeS4RsarI-F0Lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KSiqML5mEeS4RsarI-F0Lw" type="4003" source="_8ShA4L2oEeSA8oxr--Q4Aw" target="_8SfywL2oEeSA8oxr--Q4Aw">

+    <children xmi:type="notation:DecorationNode" xmi:id="_KSjRQr5mEeS4RsarI-F0Lw" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KSjRQ75mEeS4RsarI-F0Lw" y="40"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_KSjRRL5mEeS4RsarI-F0Lw" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KSjRRb5mEeS4RsarI-F0Lw" y="60"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_KSjRQL5mEeS4RsarI-F0Lw" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="PaletteConfiguration.ecore#//DrawerConfiguration/ownedConfigurations"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KSjRQb5mEeS4RsarI-F0Lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KSnisL5mEeS4RsarI-F0Lw" type="4004" source="_8ShA4L2oEeSA8oxr--Q4Aw" target="_8SiPAL2oEeSA8oxr--Q4Aw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_KSnisb5mEeS4RsarI-F0Lw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KSnisr5mEeS4RsarI-F0Lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KSqmAL5mEeS4RsarI-F0Lw" type="4003" source="_8SiPAL2oEeSA8oxr--Q4Aw" target="_8SjdIL2oEeSA8oxr--Q4Aw">

+    <children xmi:type="notation:DecorationNode" xmi:id="_KSrNEL5mEeS4RsarI-F0Lw" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KSrNEb5mEeS4RsarI-F0Lw" y="40"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_KSrNEr5mEeS4RsarI-F0Lw" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KSrNE75mEeS4RsarI-F0Lw" y="60"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_KSqmAb5mEeS4RsarI-F0Lw" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="PaletteConfiguration.ecore#//Configuration/icon"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KSqmAr5mEeS4RsarI-F0Lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KSvegL5mEeS4RsarI-F0Lw" type="4004" source="_8SmgcL2oEeSA8oxr--Q4Aw" target="_8SnukL2oEeSA8oxr--Q4Aw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_KSvegb5mEeS4RsarI-F0Lw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KSvegr5mEeS4RsarI-F0Lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KSyh0L5mEeS4RsarI-F0Lw" type="4004" source="_8SnukL2oEeSA8oxr--Q4Aw" target="_8SfywL2oEeSA8oxr--Q4Aw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_KSyh0b5mEeS4RsarI-F0Lw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KSyh0r5mEeS4RsarI-F0Lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_Sdb48L5vEeS4RsarI-F0Lw" type="4004" source="_Bhbq0L5vEeS4RsarI-F0Lw" target="_8ScvcL2oEeSA8oxr--Q4Aw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_Sdb48b5vEeS4RsarI-F0Lw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Sdb48r5vEeS4RsarI-F0Lw" points="[2, -26, 1, 61]$[2, -116, 1, -29]"/>

+  </edges>

+</notation:Diagram>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecorediag b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecorediag
deleted file mode 100644
index 62f9a357eb7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecorediag
+++ /dev/null
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram 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" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_quPlkN3cEd-vY7OSNoF8nA" type="EcoreTools" name="PaletteConfiguration" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_Es6HAN3dEd-vY7OSNoF8nA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_Es6HA93dEd-vY7OSNoF8nA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_Es6HBN3dEd-vY7OSNoF8nA" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_8nEWwMSxEeO-K5aODM_IgQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="PaletteConfiguration.ecore#//PaletteConfiguration/requiredProfiles"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8nEWwcSxEeO-K5aODM_IgQ"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Es6HBd3dEd-vY7OSNoF8nA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Es6HBt3dEd-vY7OSNoF8nA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Es6HB93dEd-vY7OSNoF8nA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Es6HCN3dEd-vY7OSNoF8nA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Es6HCd3dEd-vY7OSNoF8nA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Es6HCt3dEd-vY7OSNoF8nA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Es6HC93dEd-vY7OSNoF8nA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Es6HAd3dEd-vY7OSNoF8nA" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//PaletteConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Es6HAt3dEd-vY7OSNoF8nA" x="15" y="240" width="233" height="68"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_FwHQcN3dEd-vY7OSNoF8nA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_FwHQc93dEd-vY7OSNoF8nA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_FwHQdN3dEd-vY7OSNoF8nA" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_ufg5ISAGEeCy0IHGPAm6kg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="PaletteConfiguration.ecore#//ToolConfiguration/kind"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ufg5IiAGEeCy0IHGPAm6kg"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_FwHQdd3dEd-vY7OSNoF8nA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_FwHQdt3dEd-vY7OSNoF8nA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_FwHQd93dEd-vY7OSNoF8nA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_FwHQeN3dEd-vY7OSNoF8nA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_FwHQed3dEd-vY7OSNoF8nA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_FwHQet3dEd-vY7OSNoF8nA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_FwHQe93dEd-vY7OSNoF8nA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_FwHQcd3dEd-vY7OSNoF8nA" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//ToolConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FwHQct3dEd-vY7OSNoF8nA" x="800" y="490" width="173" height="163"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_tJSakOAfEd-0CYOJPs0ewQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_tJSak-AfEd-0CYOJPs0ewQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_tJSalOAfEd-0CYOJPs0ewQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_tJSaleAfEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_tJSaluAfEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_tJSal-AfEd-0CYOJPs0ewQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_tJSamOAfEd-0CYOJPs0ewQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_tJSameAfEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_tJSamuAfEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_tJSam-AfEd-0CYOJPs0ewQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_tJSakeAfEd-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//StackConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tJSakuAfEd-0CYOJPs0ewQ" x="465" y="365" width="173" height="88"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_50zD4OAfEd-0CYOJPs0ewQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_50zD4-AfEd-0CYOJPs0ewQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_50zD5OAfEd-0CYOJPs0ewQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_50zD5eAfEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_50zD5uAfEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_50zD5-AfEd-0CYOJPs0ewQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_50zD6OAfEd-0CYOJPs0ewQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_50zD6eAfEd-0CYOJPs0ewQ" collapsed="true"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_50zD6uAfEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_50zD6-AfEd-0CYOJPs0ewQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_50zD4eAfEd-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//ChildConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_50zD4uAfEd-0CYOJPs0ewQ" x="650" y="235" width="198" height="68"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_Vqk38OAgEd-0CYOJPs0ewQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_Vqk38-AgEd-0CYOJPs0ewQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_Vqk39OAgEd-0CYOJPs0ewQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Vqk39eAgEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Vqk39uAgEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Vqk39-AgEd-0CYOJPs0ewQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Vqk3-OAgEd-0CYOJPs0ewQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Vqk3-eAgEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Vqk3-uAgEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Vqk3--AgEd-0CYOJPs0ewQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Vqk38eAgEd-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//DrawerConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vqk38uAgEd-0CYOJPs0ewQ" x="310" y="240" width="228" height="68"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_KBEQwOEpEd-0CYOJPs0ewQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_KBEQw-EpEd-0CYOJPs0ewQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_KBEQxOEpEd-0CYOJPs0ewQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_iti2wOEXEd-0CYOJPs0ewQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="PaletteConfiguration.ecore#//Configuration/id"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iti2weEXEd-0CYOJPs0ewQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_ko6-UOEXEd-0CYOJPs0ewQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="PaletteConfiguration.ecore#//Configuration/label"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ko6-UeEXEd-0CYOJPs0ewQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_wkqg4OHCEd-0CYOJPs0ewQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="PaletteConfiguration.ecore#//Configuration/description"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_wkqg4eHCEd-0CYOJPs0ewQ"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KBEQxeEpEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_KBEQxuEpEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KBEQx-EpEd-0CYOJPs0ewQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_KBEQyOEpEd-0CYOJPs0ewQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KBEQyeEpEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_KBEQyuEpEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KBEQy-EpEd-0CYOJPs0ewQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KBEQweEpEd-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//Configuration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KBEQwuEpEd-0CYOJPs0ewQ" x="390" y="15" width="188" height="83"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_x9n34OHCEd-0CYOJPs0ewQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_x9n34-HCEd-0CYOJPs0ewQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_x9n35OHCEd-0CYOJPs0ewQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_zItyAOHCEd-0CYOJPs0ewQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="PaletteConfiguration.ecore#//IconDescriptor/pluginID"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zItyAeHCEd-0CYOJPs0ewQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_1_ZrQOHCEd-0CYOJPs0ewQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="PaletteConfiguration.ecore#//IconDescriptor/iconPath"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1_ZrQeHCEd-0CYOJPs0ewQ"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_x9n35eHCEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_x9n35uHCEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_x9n35-HCEd-0CYOJPs0ewQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_x9n36OHCEd-0CYOJPs0ewQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_x9n36eHCEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_x9n36uHCEd-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_x9n36-HCEd-0CYOJPs0ewQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_x9n34eHCEd-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//IconDescriptor"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x9n34uHCEd-0CYOJPs0ewQ" x="710" y="25"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_vcdpkCAGEeCy0IHGPAm6kg" type="1005">

-    <children xmi:type="notation:Node" xmi:id="_vcdpkyAGEeCy0IHGPAm6kg" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_vcnakCAGEeCy0IHGPAm6kg" type="5008">

-      <children xmi:type="notation:Node" xmi:id="_xYSdECAGEeCy0IHGPAm6kg" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="PaletteConfiguration.ecore#//ToolKind/ConnectionTool"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xYSdESAGEeCy0IHGPAm6kg"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_wjPrcCAGEeCy0IHGPAm6kg" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="PaletteConfiguration.ecore#//ToolKind/CreationTool"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_wjPrcSAGEeCy0IHGPAm6kg"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_vcnakSAGEeCy0IHGPAm6kg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_vcnakiAGEeCy0IHGPAm6kg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vcnakyAGEeCy0IHGPAm6kg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_vcdpkSAGEeCy0IHGPAm6kg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="PaletteConfiguration.ecore#//ToolKind"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vcdpkiAGEeCy0IHGPAm6kg" x="335" y="368"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_NRyAEU-1EeCh7u1nEJOyLA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_NRyAFE-1EeCh7u1nEJOyLA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_NRyAFU-1EeCh7u1nEJOyLA" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_gi_yEE-1EeCh7u1nEJOyLA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="PaletteConfiguration.ecore#//ElementDescriptor/elementTypeId"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gi_yEU-1EeCh7u1nEJOyLA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_mH4W8E-1EeCh7u1nEJOyLA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="PaletteConfiguration.ecore#//ElementDescriptor/graphicalHints"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mH4W8U-1EeCh7u1nEJOyLA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_NRyAFk-1EeCh7u1nEJOyLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_NRyAF0-1EeCh7u1nEJOyLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NRyAGE-1EeCh7u1nEJOyLA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_NR7KAE-1EeCh7u1nEJOyLA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_NR7KAU-1EeCh7u1nEJOyLA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_NR7KAk-1EeCh7u1nEJOyLA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NR7KA0-1EeCh7u1nEJOyLA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_NRyAEk-1EeCh7u1nEJOyLA" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//ElementDescriptor"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NRyAE0-1EeCh7u1nEJOyLA" x="1095" y="565" width="178" height="93"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_kxf2wHAKEeCt7epZDqnVSw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_kxpnwHAKEeCt7epZDqnVSw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_kxpnwXAKEeCt7epZDqnVSw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kxpnwnAKEeCt7epZDqnVSw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_kxpnw3AKEeCt7epZDqnVSw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kxpnxHAKEeCt7epZDqnVSw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_kxpnxXAKEeCt7epZDqnVSw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kxpnxnAKEeCt7epZDqnVSw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_kxpnx3AKEeCt7epZDqnVSw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kxpnyHAKEeCt7epZDqnVSw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_kxf2wXAKEeCt7epZDqnVSw" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//SeparatorConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kxf2wnAKEeCt7epZDqnVSw" x="635" y="490" width="158" height="163"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_nCfB8HAKEeCt7epZDqnVSw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_nCfB83AKEeCt7epZDqnVSw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_nCfB9HAKEeCt7epZDqnVSw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_nCfB9XAKEeCt7epZDqnVSw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_nCfB9nAKEeCt7epZDqnVSw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_nCfB93AKEeCt7epZDqnVSw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_nCfB-HAKEeCt7epZDqnVSw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_nCfB-XAKEeCt7epZDqnVSw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_nCfB-nAKEeCt7epZDqnVSw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_nCfB-3AKEeCt7epZDqnVSw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_nCfB8XAKEeCt7epZDqnVSw" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="PaletteConfiguration.ecore#//LeafConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nCfB8nAKEeCt7epZDqnVSw" x="795" y="365" width="158" height="58"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_quPlkd3cEd-vY7OSNoF8nA"/>

-  <element xmi:type="ecore:EPackage" href="PaletteConfiguration.ecore#/"/>

-  <edges xmi:type="notation:Edge" xmi:id="_HkoiEN3dEd-vY7OSNoF8nA" type="3002" source="_Vqk38OAgEd-0CYOJPs0ewQ" target="_50zD4OAfEd-0CYOJPs0ewQ">

-    <children xmi:type="notation:Node" xmi:id="_HkoiFN3dEd-vY7OSNoF8nA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_HkoiFd3dEd-vY7OSNoF8nA" x="6" y="-21"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_HkoiFt3dEd-vY7OSNoF8nA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_HkoiF93dEd-vY7OSNoF8nA" x="2" y="9"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_HkoiEd3dEd-vY7OSNoF8nA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_HkoiEt3dEd-vY7OSNoF8nA" fontColor="4210752" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="PaletteConfiguration.ecore#//DrawerConfiguration/ownedConfigurations"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HkoiE93dEd-vY7OSNoF8nA" points="[0, 0, 0, 67]$[0, -67, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PIU2cOAhEd-0CYOJPs0ewQ" id="(0.9824561403508771,0.10294117647058823)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HkoiGN3dEd-vY7OSNoF8nA" id="(0.07575757575757576,0.22058823529411764)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_vgrvwOAfEd-0CYOJPs0ewQ" type="3002" source="_tJSakOAfEd-0CYOJPs0ewQ" target="_nCfB8HAKEeCt7epZDqnVSw">

-    <children xmi:type="notation:Node" xmi:id="_vgrvxOAfEd-0CYOJPs0ewQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_vgrvxeAfEd-0CYOJPs0ewQ" x="-29" y="-18"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_vgrvxuAfEd-0CYOJPs0ewQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_vgrvx-AfEd-0CYOJPs0ewQ" x="1" y="12"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_vgrvweAfEd-0CYOJPs0ewQ" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_vgrvwuAfEd-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="PaletteConfiguration.ecore#//StackConfiguration/ownedConfigurations"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vgrvw-AfEd-0CYOJPs0ewQ" points="[0, 0, 89, 60]$[-89, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vgrvyOAfEd-0CYOJPs0ewQ" id="(0.8901734104046243,0.13953488372093023)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vgrvyeAfEd-0CYOJPs0ewQ" id="(0.012658227848101266,0.3793103448275862)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ExtdYOAgEd-0CYOJPs0ewQ" type="3003" source="_tJSakOAfEd-0CYOJPs0ewQ" target="_50zD4OAfEd-0CYOJPs0ewQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ExtdYeAgEd-0CYOJPs0ewQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ExtdYuAgEd-0CYOJPs0ewQ"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ExtdY-AgEd-0CYOJPs0ewQ" points="[26, 0, -137, 64]$[26, -30, -137, 34]$[155, -30, -8, 34]$[155, -64, -8, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ex3OYOAgEd-0CYOJPs0ewQ" id="(0.49710982658959535,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hy-O8OAgEd-0CYOJPs0ewQ" id="(0.3235294117647059,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_FH6W4OAgEd-0CYOJPs0ewQ" type="3003" source="_nCfB8HAKEeCt7epZDqnVSw" target="_50zD4OAfEd-0CYOJPs0ewQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FH6W4eAgEd-0CYOJPs0ewQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_FH6W4uAgEd-0CYOJPs0ewQ"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FH6W4-AgEd-0CYOJPs0ewQ" points="[-59, -28, 133, 64]$[-59, -58, 133, 34]$[-168, -58, 24, 34]$[-168, -92, 24, 0]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HNaq0OAgEd-0CYOJPs0ewQ" id="(0.1588235294117647,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_XLcYUOAhEd-0CYOJPs0ewQ" type="3002" source="_Es6HAN3dEd-vY7OSNoF8nA" target="_Vqk38OAgEd-0CYOJPs0ewQ">

-    <children xmi:type="notation:Node" xmi:id="_XLcYVOAhEd-0CYOJPs0ewQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_XLcYVeAhEd-0CYOJPs0ewQ" x="16" y="-21"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_XLcYVuAhEd-0CYOJPs0ewQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_XLcYV-AhEd-0CYOJPs0ewQ" x="1" y="14"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_XLcYUeAhEd-0CYOJPs0ewQ" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_XLcYUuAhEd-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="PaletteConfiguration.ecore#//PaletteConfiguration/drawerConfigurations"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XLcYU-AhEd-0CYOJPs0ewQ" points="[174, 21, -73, 13]$[203, 25, -44, 17]$[238, 12, -9, 4]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eWOMAOEpEd-0CYOJPs0ewQ" id="(0.9742489270386266,0.10294117647058823)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u1gB4OEpEd-0CYOJPs0ewQ" id="(0.03070175438596491,0.14705882352941177)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_OLpa0OEpEd-0CYOJPs0ewQ" type="3003" source="_50zD4OAfEd-0CYOJPs0ewQ" target="_KBEQwOEpEd-0CYOJPs0ewQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_OLpa0eEpEd-0CYOJPs0ewQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_OLpa0uEpEd-0CYOJPs0ewQ"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OLpa0-EpEd-0CYOJPs0ewQ" points="[6, 0, 285, 148]$[6, -70, 285, 78]$[-265, -70, 14, 78]$[-265, -139, 14, 9]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OLpa1OEpEd-0CYOJPs0ewQ" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T2onsOEpEd-0CYOJPs0ewQ" id="(0.425531914893617,0.8676470588235294)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_OojZQOEpEd-0CYOJPs0ewQ" type="3003" source="_Vqk38OAgEd-0CYOJPs0ewQ" target="_KBEQwOEpEd-0CYOJPs0ewQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_OojZQeEpEd-0CYOJPs0ewQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_OojZQuEpEd-0CYOJPs0ewQ"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OojZQ-EpEd-0CYOJPs0ewQ" points="[3, 0, -57, 144]$[3, -75, -57, 69]$[62, -75, 2, 69]$[62, -144, 2, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OojZROEpEd-0CYOJPs0ewQ" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SasOIOEpEd-0CYOJPs0ewQ" id="(0.5,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_dAr8cOEpEd-0CYOJPs0ewQ" type="3003" source="_Es6HAN3dEd-vY7OSNoF8nA" target="_KBEQwOEpEd-0CYOJPs0ewQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_dAr8ceEpEd-0CYOJPs0ewQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_dAr8cuEpEd-0CYOJPs0ewQ"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dAr8c-EpEd-0CYOJPs0ewQ" points="[6, 0, -394, 146]$[6, -75, -394, 71]$[355, -75, -45, 71]$[355, -144, -45, 2]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dAr8dOEpEd-0CYOJPs0ewQ" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dAr8deEpEd-0CYOJPs0ewQ" id="(0.7553191489361702,0.9705882352941176)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EPMx0OHDEd-0CYOJPs0ewQ" type="3002" source="_KBEQwOEpEd-0CYOJPs0ewQ" target="_x9n34OHCEd-0CYOJPs0ewQ">

-    <children xmi:type="notation:Node" xmi:id="_EPMx1OHDEd-0CYOJPs0ewQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EPMx1eHDEd-0CYOJPs0ewQ" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EPMx1uHDEd-0CYOJPs0ewQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EPMx1-HDEd-0CYOJPs0ewQ" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EPMx0eHDEd-0CYOJPs0ewQ" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EPMx0uHDEd-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="PaletteConfiguration.ecore#//Configuration/icon"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EPMx0-HDEd-0CYOJPs0ewQ" points="[21, 2, -161, 1]$[183, 33, 1, 32]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EPMx2OHDEd-0CYOJPs0ewQ" id="(0.8882978723404256,0.38235294117647056)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EPMx2eHDEd-0CYOJPs0ewQ" id="(0.03731343283582089,0.3230769230769231)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_-CzfIVCeEeCNGbEz50xHuA" type="3002" source="_FwHQcN3dEd-vY7OSNoF8nA" target="_NRyAEU-1EeCh7u1nEJOyLA">

-    <children xmi:type="notation:Node" xmi:id="_-C8pEFCeEeCNGbEz50xHuA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_-C8pEVCeEeCNGbEz50xHuA" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_-C8pElCeEeCNGbEz50xHuA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_-C8pE1CeEeCNGbEz50xHuA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_-CzfIlCeEeCNGbEz50xHuA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_-CzfI1CeEeCNGbEz50xHuA" fontColor="4210752" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="PaletteConfiguration.ecore#//ToolConfiguration/elementDescriptors"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-CzfJFCeEeCNGbEz50xHuA" points="[86, 8, -129, 1]$[216, -10, 1, -17]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-C8pFFCeEeCNGbEz50xHuA" id="(0.0898876404494382,0.1935483870967742)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0PYhEHAKEeCt7epZDqnVSw" type="3003" source="_kxf2wHAKEeCt7epZDqnVSw" target="_nCfB8HAKEeCt7epZDqnVSw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0PYhEXAKEeCt7epZDqnVSw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0PYhEnAKEeCt7epZDqnVSw"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0PYhE3AKEeCt7epZDqnVSw" points="[6, -11, -62, 113]$[69, -136, 1, -12]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0PYhFHAKEeCt7epZDqnVSw" id="(0.8354430379746836,0.0736196319018405)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0PYhFXAKEeCt7epZDqnVSw" id="(0.2974683544303797,0.8620689655172413)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0uh7MHAKEeCt7epZDqnVSw" type="3003" source="_FwHQcN3dEd-vY7OSNoF8nA" target="_nCfB8HAKEeCt7epZDqnVSw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0uh7MXAKEeCt7epZDqnVSw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0uh7MnAKEeCt7epZDqnVSw"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0uh7M3AKEeCt7epZDqnVSw" points="[46, -13, 59, 100]$[46, -48, 59, 65]$[-9, -48, 4, 65]$[-9, -82, 4, 31]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0uh7NHAKEeCt7epZDqnVSw" id="(0.26011560693641617,0.08588957055214724)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_22Ig4HAKEeCt7epZDqnVSw" id="(0.23417721518987342,0.4482758620689655)"/>

-  </edges>

-</notation:Diagram>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.genmodel b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.genmodel
index b6baf1bf29b..d24c3200a74 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.genmodel
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.genmodel
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

+    modelDirectory="/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen"

     editDirectory="/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen"

     editorDirectory="/org.eclipse.papyrus.uml.diagram.paletteconfiguration.editor/src-gen"

     modelPluginID="org.eclipse.papyrus.uml.diagram.paletteconfiguration" modelName="PaletteConfiguration"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ChildConfiguration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ChildConfiguration.java
index c286b5ea109..e8dbc0a3c8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ChildConfiguration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ChildConfiguration.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/Configuration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/Configuration.java
index adfbfb1bb02..d3132fd8d87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/Configuration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/Configuration.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration;

 

@@ -15,13 +21,13 @@ import org.eclipse.emf.ecore.EObject;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getId <em>Id</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getLabel <em>Label</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getDescription <em>Description</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getIcon <em>Icon</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getId <em>Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getLabel <em>Label</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getDescription <em>Description</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getIcon <em>Icon</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getConfiguration()

  * @model abstract="true"

@@ -35,7 +41,6 @@ public interface Configuration extends EObject {
 	 * <!-- begin-model-doc -->

 	 * unique identifier of the configuration, used by the tool to retrieve the configuration

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Id</em>' attribute.

 	 * @see #setId(String)

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getConfiguration_Id()

@@ -48,9 +53,7 @@ public interface Configuration extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getId <em>Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Id</em>' attribute.

+	 * @param value the new value of the '<em>Id</em>' attribute.

 	 * @see #getId()

 	 * @generated

 	 */

@@ -63,7 +66,6 @@ public interface Configuration extends EObject {
 	 * <!-- begin-model-doc -->

 	 * label of the configuration, used only for display

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Label</em>' attribute.

 	 * @see #setLabel(String)

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getConfiguration_Label()

@@ -76,9 +78,7 @@ public interface Configuration extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getLabel <em>Label</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Label</em>' attribute.

+	 * @param value the new value of the '<em>Label</em>' attribute.

 	 * @see #getLabel()

 	 * @generated

 	 */

@@ -91,7 +91,6 @@ public interface Configuration extends EObject {
 	 * <!-- begin-model-doc -->

 	 * Description of the configuration.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Description</em>' attribute.

 	 * @see #setDescription(String)

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getConfiguration_Description()

@@ -104,9 +103,7 @@ public interface Configuration extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getDescription <em>Description</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Description</em>' attribute.

+	 * @param value the new value of the '<em>Description</em>' attribute.

 	 * @see #getDescription()

 	 * @generated

 	 */

@@ -116,10 +113,10 @@ public interface Configuration extends EObject {
 	 * Returns the value of the '<em><b>Icon</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Icon</em>' containment reference isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Icon</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Icon</em>' containment reference.

 	 * @see #setIcon(IconDescriptor)

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getConfiguration_Icon()

@@ -132,9 +129,7 @@ public interface Configuration extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getIcon <em>Icon</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Icon</em>' containment reference.

+	 * @param value the new value of the '<em>Icon</em>' containment reference.

 	 * @see #getIcon()

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/DrawerConfiguration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/DrawerConfiguration.java
index 14b89b2e495..679f2a899ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/DrawerConfiguration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/DrawerConfiguration.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration;

 

@@ -15,10 +21,10 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration#getOwnedConfigurations <em>Owned Configurations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration#getOwnedConfigurations <em>Owned Configurations</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getDrawerConfiguration()

  * @model

@@ -30,10 +36,10 @@ public interface DrawerConfiguration extends Configuration {
 	 * The list contents are of type {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Owned Configurations</em>' containment reference list isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Owned Configurations</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>Owned Configurations</em>' containment reference list.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getDrawerConfiguration_OwnedConfigurations()

 	 * @model containment="true" required="true"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ElementDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ElementDescriptor.java
index 8dce47a3742..eba2392d17c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ElementDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ElementDescriptor.java
@@ -1,12 +1,19 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration;

 

 import org.eclipse.emf.common.util.EList;

+

 import org.eclipse.emf.ecore.EObject;

 

 /**

@@ -16,11 +23,11 @@ import org.eclipse.emf.ecore.EObject;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor#getElementTypeId <em>Element Type Id</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor#getGraphicalHints <em>Graphical Hints</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor#getElementTypeId <em>Element Type Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor#getGraphicalHints <em>Graphical Hints</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getElementDescriptor()

  * @model

@@ -31,10 +38,10 @@ public interface ElementDescriptor extends EObject {
 	 * Returns the value of the '<em><b>Element Type Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Element Type Id</em>' attribute isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Element Type Id</em>' attribute isn't clear,

+	 * there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Element Type Id</em>' attribute.

 	 * @see #setElementTypeId(String)

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getElementDescriptor_ElementTypeId()

@@ -47,9 +54,7 @@ public interface ElementDescriptor extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor#getElementTypeId <em>Element Type Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Element Type Id</em>' attribute.

+	 * @param value the new value of the '<em>Element Type Id</em>' attribute.

 	 * @see #getElementTypeId()

 	 * @generated

 	 */

@@ -60,10 +65,10 @@ public interface ElementDescriptor extends EObject {
 	 * The list contents are of type {@link java.lang.String}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Graphical Hints</em>' attribute list isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Graphical Hints</em>' attribute list isn't clear,

+	 * there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Graphical Hints</em>' attribute list.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getElementDescriptor_GraphicalHints()

 	 * @model

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/IconDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/IconDescriptor.java
index f570034673c..c639c92782f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/IconDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/IconDescriptor.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration;

 

@@ -19,11 +25,11 @@ import org.eclipse.emf.ecore.EObject;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor#getPluginID <em>Plugin ID</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor#getIconPath <em>Icon Path</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor#getPluginID <em>Plugin ID</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor#getIconPath <em>Icon Path</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getIconDescriptor()

  * @model

@@ -37,7 +43,6 @@ public interface IconDescriptor extends EObject {
 	 * <!-- begin-model-doc -->

 	 * ID of the plugin where the icon is located. If not set, the tool will look in the bundle defining the palette.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Plugin ID</em>' attribute.

 	 * @see #setPluginID(String)

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getIconDescriptor_PluginID()

@@ -50,9 +55,7 @@ public interface IconDescriptor extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor#getPluginID <em>Plugin ID</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Plugin ID</em>' attribute.

+	 * @param value the new value of the '<em>Plugin ID</em>' attribute.

 	 * @see #getPluginID()

 	 * @generated

 	 */

@@ -63,9 +66,8 @@ public interface IconDescriptor extends EObject {
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * <!-- begin-model-doc -->

-	 * Path of the icon in the bundle.

+	 * Path of the icon in the bundle. 

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Icon Path</em>' attribute.

 	 * @see #setIconPath(String)

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getIconDescriptor_IconPath()

@@ -78,9 +80,7 @@ public interface IconDescriptor extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor#getIconPath <em>Icon Path</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Icon Path</em>' attribute.

+	 * @param value the new value of the '<em>Icon Path</em>' attribute.

 	 * @see #getIconPath()

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/LeafConfiguration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/LeafConfiguration.java
index 70b7d64afc6..f72239e8c22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/LeafConfiguration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/LeafConfiguration.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/PaletteConfiguration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/PaletteConfiguration.java
index 442b81f06c8..cce28b2a524 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/PaletteConfiguration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/PaletteConfiguration.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration;

 

@@ -15,11 +21,11 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration#getDrawerConfigurations <em>Drawer Configurations</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration#getRequiredProfiles <em>Required Profiles</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration#getDrawerConfigurations <em>Drawer Configurations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration#getRequiredProfiles <em>Required Profiles</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getPaletteConfiguration()

  * @model

@@ -31,10 +37,10 @@ public interface PaletteConfiguration extends Configuration {
 	 * The list contents are of type {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Drawer Configurations</em>' containment reference list isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Drawer Configurations</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>Drawer Configurations</em>' containment reference list.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getPaletteConfiguration_DrawerConfigurations()

 	 * @model containment="true" required="true"

@@ -47,10 +53,10 @@ public interface PaletteConfiguration extends Configuration {
 	 * The list contents are of type {@link java.lang.String}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Required Profiles</em>' attribute list isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Required Profiles</em>' attribute list isn't clear,

+	 * there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Required Profiles</em>' attribute list.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getPaletteConfiguration_RequiredProfiles()

 	 * @model

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/PaletteconfigurationFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/PaletteconfigurationFactory.java
index 506c86d19a8..1ac53847b44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/PaletteconfigurationFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/PaletteconfigurationFactory.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration;

 

@@ -13,7 +19,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.diagram.paletteconfiguration.PaletteconfigurationPackage

  * @generated

  */

@@ -22,7 +27,6 @@ public interface PaletteconfigurationFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	PaletteconfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationFactoryImpl.init();

@@ -31,7 +35,6 @@ public interface PaletteconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Palette Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Palette Configuration</em>'.

 	 * @generated

 	 */

@@ -41,7 +44,6 @@ public interface PaletteconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Tool Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Tool Configuration</em>'.

 	 * @generated

 	 */

@@ -51,7 +53,6 @@ public interface PaletteconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Stack Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Stack Configuration</em>'.

 	 * @generated

 	 */

@@ -61,7 +62,6 @@ public interface PaletteconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Drawer Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Drawer Configuration</em>'.

 	 * @generated

 	 */

@@ -71,7 +71,6 @@ public interface PaletteconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Icon Descriptor</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Icon Descriptor</em>'.

 	 * @generated

 	 */

@@ -81,7 +80,6 @@ public interface PaletteconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Element Descriptor</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Element Descriptor</em>'.

 	 * @generated

 	 */

@@ -91,7 +89,6 @@ public interface PaletteconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Separator Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Separator Configuration</em>'.

 	 * @generated

 	 */

@@ -101,10 +98,9 @@ public interface PaletteconfigurationFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

 	PaletteconfigurationPackage getPaletteconfigurationPackage();

 

-} // PaletteconfigurationFactory

+} //PaletteconfigurationFactory

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/PaletteconfigurationPackage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/PaletteconfigurationPackage.java
index 2fca9a0d4d1..84ed7444cc1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/PaletteconfigurationPackage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/PaletteconfigurationPackage.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration;

 

@@ -17,13 +23,12 @@ import org.eclipse.emf.ecore.EReference;
  * The <b>Package</b> for the model.

  * It contains accessors for the meta objects to represent

  * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

+ *   <li>each class,</li>

+ *   <li>each feature of each class,</li>

+ *   <li>each enum,</li>

+ *   <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory

  * @model kind="package"

  * @generated

@@ -33,7 +38,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The package name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNAME = "paletteconfiguration";

@@ -42,7 +46,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The package namespace URI.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7";

@@ -51,7 +54,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The package namespace name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "paletteconfiguration";

@@ -60,7 +62,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	PaletteconfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl.init();

@@ -69,7 +70,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ConfigurationImpl <em>Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ConfigurationImpl

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getConfiguration()

 	 * @generated

@@ -80,7 +80,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -90,7 +89,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Label</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -100,7 +98,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -110,7 +107,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Icon</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -120,7 +116,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -130,7 +125,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteConfigurationImpl <em>Palette Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteConfigurationImpl

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getPaletteConfiguration()

 	 * @generated

@@ -141,7 +135,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -151,7 +144,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Label</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -161,7 +153,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -171,7 +162,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Icon</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -181,7 +171,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Drawer Configurations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -191,7 +180,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Required Profiles</b></em>' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -201,7 +189,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Palette Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -211,7 +198,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ChildConfigurationImpl <em>Child Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ChildConfigurationImpl

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getChildConfiguration()

 	 * @generated

@@ -222,7 +208,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -232,7 +217,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Label</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -242,7 +226,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -252,7 +235,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Icon</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -262,7 +244,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Child Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -272,7 +253,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.LeafConfigurationImpl <em>Leaf Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.LeafConfigurationImpl

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getLeafConfiguration()

 	 * @generated

@@ -283,7 +263,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -293,7 +272,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Label</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -303,7 +281,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -313,7 +290,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Icon</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -323,7 +299,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Leaf Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -333,7 +308,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ToolConfigurationImpl <em>Tool Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ToolConfigurationImpl

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getToolConfiguration()

 	 * @generated

@@ -344,7 +318,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -354,7 +327,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Label</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -364,7 +336,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -374,7 +345,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Icon</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -384,7 +354,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -394,7 +363,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Element Descriptors</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -404,7 +372,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Tool Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -414,7 +381,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.StackConfigurationImpl <em>Stack Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.StackConfigurationImpl

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getStackConfiguration()

 	 * @generated

@@ -425,7 +391,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -435,7 +400,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Label</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -445,7 +409,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -455,7 +418,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Icon</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -465,7 +427,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Configurations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -475,7 +436,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Stack Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -485,7 +445,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.DrawerConfigurationImpl <em>Drawer Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.DrawerConfigurationImpl

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getDrawerConfiguration()

 	 * @generated

@@ -496,7 +455,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -506,7 +464,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Label</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -516,7 +473,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -526,7 +482,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Icon</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -536,7 +491,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Configurations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -546,7 +500,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Drawer Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -556,7 +509,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.IconDescriptorImpl <em>Icon Descriptor</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.IconDescriptorImpl

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getIconDescriptor()

 	 * @generated

@@ -567,7 +519,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Plugin ID</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -577,7 +528,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Icon Path</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -587,7 +537,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Icon Descriptor</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -597,7 +546,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ElementDescriptorImpl <em>Element Descriptor</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ElementDescriptorImpl

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getElementDescriptor()

 	 * @generated

@@ -608,7 +556,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Element Type Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -618,7 +565,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Graphical Hints</b></em>' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -628,7 +574,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Element Descriptor</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -638,7 +583,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.SeparatorConfigurationImpl <em>Separator Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.SeparatorConfigurationImpl

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getSeparatorConfiguration()

 	 * @generated

@@ -649,7 +593,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -659,7 +602,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Label</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -669,7 +611,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -679,7 +620,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Icon</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -689,7 +629,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Separator Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -699,7 +638,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolKind <em>Tool Kind</em>}' enum.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolKind

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getToolKind()

 	 * @generated

@@ -711,7 +649,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration <em>Palette Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Palette Configuration</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration

 	 * @generated

@@ -722,7 +659,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration#getDrawerConfigurations <em>Drawer Configurations</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Drawer Configurations</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration#getDrawerConfigurations()

 	 * @see #getPaletteConfiguration()

@@ -734,7 +670,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration#getRequiredProfiles <em>Required Profiles</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute list '<em>Required Profiles</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration#getRequiredProfiles()

 	 * @see #getPaletteConfiguration()

@@ -746,7 +681,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration <em>Tool Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Tool Configuration</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration

 	 * @generated

@@ -757,7 +691,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration#getKind <em>Kind</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Kind</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration#getKind()

 	 * @see #getToolConfiguration()

@@ -769,7 +702,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration#getElementDescriptors <em>Element Descriptors</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Element Descriptors</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration#getElementDescriptors()

 	 * @see #getToolConfiguration()

@@ -781,7 +713,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration <em>Stack Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Stack Configuration</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration

 	 * @generated

@@ -792,7 +723,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration#getOwnedConfigurations <em>Owned Configurations</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Owned Configurations</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration#getOwnedConfigurations()

 	 * @see #getStackConfiguration()

@@ -804,7 +734,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration <em>Child Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Child Configuration</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration

 	 * @generated

@@ -815,7 +744,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration <em>Drawer Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Drawer Configuration</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration

 	 * @generated

@@ -826,7 +754,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration#getOwnedConfigurations <em>Owned Configurations</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Owned Configurations</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration#getOwnedConfigurations()

 	 * @see #getDrawerConfiguration()

@@ -838,7 +765,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration <em>Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Configuration</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration

 	 * @generated

@@ -849,7 +775,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getId <em>Id</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Id</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getId()

 	 * @see #getConfiguration()

@@ -861,7 +786,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getLabel <em>Label</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Label</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getLabel()

 	 * @see #getConfiguration()

@@ -873,7 +797,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getDescription <em>Description</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Description</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getDescription()

 	 * @see #getConfiguration()

@@ -885,7 +808,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getIcon <em>Icon</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference '<em>Icon</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration#getIcon()

 	 * @see #getConfiguration()

@@ -897,7 +819,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor <em>Icon Descriptor</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Icon Descriptor</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor

 	 * @generated

@@ -908,7 +829,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor#getPluginID <em>Plugin ID</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Plugin ID</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor#getPluginID()

 	 * @see #getIconDescriptor()

@@ -920,7 +840,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor#getIconPath <em>Icon Path</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Icon Path</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor#getIconPath()

 	 * @see #getIconDescriptor()

@@ -932,7 +851,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor <em>Element Descriptor</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Element Descriptor</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor

 	 * @generated

@@ -943,7 +861,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor#getElementTypeId <em>Element Type Id</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Element Type Id</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor#getElementTypeId()

 	 * @see #getElementDescriptor()

@@ -955,7 +872,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor#getGraphicalHints <em>Graphical Hints</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute list '<em>Graphical Hints</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor#getGraphicalHints()

 	 * @see #getElementDescriptor()

@@ -967,7 +883,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration <em>Separator Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Separator Configuration</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration

 	 * @generated

@@ -978,7 +893,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration <em>Leaf Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Leaf Configuration</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration

 	 * @generated

@@ -989,7 +903,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolKind <em>Tool Kind</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for enum '<em>Tool Kind</em>'.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolKind

 	 * @generated

@@ -1000,7 +913,6 @@ public interface PaletteconfigurationPackage 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

 	 */

@@ -1010,13 +922,12 @@ public interface PaletteconfigurationPackage extends EPackage {
 	 * <!-- begin-user-doc -->

 	 * Defines literals for the meta objects that represent

 	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

+	 *   <li>each class,</li>

+	 *   <li>each feature of each class,</li>

+	 *   <li>each enum,</li>

+	 *   <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -1024,7 +935,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteConfigurationImpl <em>Palette Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteConfigurationImpl

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getPaletteConfiguration()

 		 * @generated

@@ -1035,7 +945,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Drawer Configurations</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS = eINSTANCE.getPaletteConfiguration_DrawerConfigurations();

@@ -1044,7 +953,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Required Profiles</b></em>' attribute list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute PALETTE_CONFIGURATION__REQUIRED_PROFILES = eINSTANCE.getPaletteConfiguration_RequiredProfiles();

@@ -1053,7 +961,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ToolConfigurationImpl <em>Tool Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ToolConfigurationImpl

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getToolConfiguration()

 		 * @generated

@@ -1064,7 +971,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute TOOL_CONFIGURATION__KIND = eINSTANCE.getToolConfiguration_Kind();

@@ -1073,7 +979,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Element Descriptors</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS = eINSTANCE.getToolConfiguration_ElementDescriptors();

@@ -1082,7 +987,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.StackConfigurationImpl <em>Stack Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.StackConfigurationImpl

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getStackConfiguration()

 		 * @generated

@@ -1093,7 +997,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Owned Configurations</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference STACK_CONFIGURATION__OWNED_CONFIGURATIONS = eINSTANCE.getStackConfiguration_OwnedConfigurations();

@@ -1102,7 +1005,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ChildConfigurationImpl <em>Child Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ChildConfigurationImpl

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getChildConfiguration()

 		 * @generated

@@ -1113,7 +1015,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.DrawerConfigurationImpl <em>Drawer Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.DrawerConfigurationImpl

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getDrawerConfiguration()

 		 * @generated

@@ -1124,7 +1025,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Owned Configurations</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS = eINSTANCE.getDrawerConfiguration_OwnedConfigurations();

@@ -1133,7 +1033,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ConfigurationImpl <em>Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ConfigurationImpl

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getConfiguration()

 		 * @generated

@@ -1144,7 +1043,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute CONFIGURATION__ID = eINSTANCE.getConfiguration_Id();

@@ -1153,7 +1051,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Label</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute CONFIGURATION__LABEL = eINSTANCE.getConfiguration_Label();

@@ -1162,7 +1059,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute CONFIGURATION__DESCRIPTION = eINSTANCE.getConfiguration_Description();

@@ -1171,7 +1067,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Icon</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference CONFIGURATION__ICON = eINSTANCE.getConfiguration_Icon();

@@ -1180,7 +1075,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.IconDescriptorImpl <em>Icon Descriptor</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.IconDescriptorImpl

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getIconDescriptor()

 		 * @generated

@@ -1191,7 +1085,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Plugin ID</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute ICON_DESCRIPTOR__PLUGIN_ID = eINSTANCE.getIconDescriptor_PluginID();

@@ -1200,7 +1093,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Icon Path</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute ICON_DESCRIPTOR__ICON_PATH = eINSTANCE.getIconDescriptor_IconPath();

@@ -1209,7 +1101,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ElementDescriptorImpl <em>Element Descriptor</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ElementDescriptorImpl

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getElementDescriptor()

 		 * @generated

@@ -1220,7 +1111,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Element Type Id</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID = eINSTANCE.getElementDescriptor_ElementTypeId();

@@ -1229,7 +1119,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Graphical Hints</b></em>' attribute list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute ELEMENT_DESCRIPTOR__GRAPHICAL_HINTS = eINSTANCE.getElementDescriptor_GraphicalHints();

@@ -1238,7 +1127,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.SeparatorConfigurationImpl <em>Separator Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.SeparatorConfigurationImpl

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getSeparatorConfiguration()

 		 * @generated

@@ -1249,7 +1137,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.LeafConfigurationImpl <em>Leaf Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.LeafConfigurationImpl

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getLeafConfiguration()

 		 * @generated

@@ -1260,7 +1147,6 @@ public interface PaletteconfigurationPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolKind <em>Tool Kind</em>}' enum.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolKind

 		 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteconfigurationPackageImpl#getToolKind()

 		 * @generated

@@ -1269,4 +1155,4 @@ public interface PaletteconfigurationPackage extends EPackage {
 

 	}

 

-} // PaletteconfigurationPackage

+} //PaletteconfigurationPackage

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/SeparatorConfiguration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/SeparatorConfiguration.java
index 17fc8226631..761212eac75 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/SeparatorConfiguration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/SeparatorConfiguration.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/StackConfiguration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/StackConfiguration.java
index b2aeb355391..731112e69dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/StackConfiguration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/StackConfiguration.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration;

 

@@ -15,10 +21,10 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration#getOwnedConfigurations <em>Owned Configurations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration#getOwnedConfigurations <em>Owned Configurations</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getStackConfiguration()

  * @model

@@ -30,10 +36,10 @@ public interface StackConfiguration extends ChildConfiguration {
 	 * The list contents are of type {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Owned Configurations</em>' containment reference list isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Owned Configurations</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>Owned Configurations</em>' containment reference list.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getStackConfiguration_OwnedConfigurations()

 	 * @model containment="true" required="true"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ToolConfiguration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ToolConfiguration.java
index 04f80aeadc8..d5e7b352793 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ToolConfiguration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ToolConfiguration.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration;

 

@@ -15,11 +21,11 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration#getKind <em>Kind</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration#getElementDescriptors <em>Element Descriptors</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration#getKind <em>Kind</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration#getElementDescriptors <em>Element Descriptors</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getToolConfiguration()

  * @model

@@ -32,10 +38,10 @@ public interface ToolConfiguration extends LeafConfiguration {
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolKind}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Kind</em>' attribute isn't clear,

+	 * there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Kind</em>' attribute.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolKind

 	 * @see #setKind(ToolKind)

@@ -49,9 +55,7 @@ public interface ToolConfiguration extends LeafConfiguration {
 	 * Sets the value of the '{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration#getKind <em>Kind</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Kind</em>' attribute.

+	 * @param value the new value of the '<em>Kind</em>' attribute.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolKind

 	 * @see #getKind()

 	 * @generated

@@ -63,10 +67,10 @@ public interface ToolConfiguration extends LeafConfiguration {
 	 * The list contents are of type {@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Element Descriptors</em>' containment reference list isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Element Descriptors</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>Element Descriptors</em>' containment reference list.

 	 * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getToolConfiguration_ElementDescriptors()

 	 * @model containment="true"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ToolKind.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ToolKind.java
index e7573e178eb..d0bf480b1ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ToolKind.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ToolKind.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration;

 

@@ -17,7 +23,6 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Tool Kind</b></em>',

  * and utility methods for working with them.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage#getToolKind()

  * @model

  * @generated

@@ -27,7 +32,6 @@ public enum ToolKind implements Enumerator {
 	 * The '<em><b>Creation Tool</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #CREATION_TOOL_VALUE

 	 * @generated

 	 * @ordered

@@ -38,7 +42,6 @@ public enum ToolKind implements Enumerator {
 	 * The '<em><b>Connection Tool</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #CONNECTION_TOOL_VALUE

 	 * @generated

 	 * @ordered

@@ -49,10 +52,10 @@ public enum ToolKind implements Enumerator {
 	 * The '<em><b>Creation Tool</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Creation Tool</b></em>' literal object isn't clear, there really should be more of a description here...

+	 * If the meaning of '<em><b>Creation Tool</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #CREATION_TOOL

 	 * @model name="CreationTool"

 	 * @generated

@@ -64,10 +67,10 @@ public enum ToolKind implements Enumerator {
 	 * The '<em><b>Connection Tool</b></em>' literal value.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of '<em><b>Connection Tool</b></em>' literal object isn't clear, there really should be more of a description here...

+	 * If the meaning of '<em><b>Connection Tool</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #CONNECTION_TOOL

 	 * @model name="ConnectionTool"

 	 * @generated

@@ -79,20 +82,18 @@ public enum ToolKind implements Enumerator {
 	 * An array of all the '<em><b>Tool Kind</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static final ToolKind[] VALUES_ARRAY =

-			new ToolKind[] {

-					CREATION_TOOL,

-					CONNECTION_TOOL,

-			};

+		new ToolKind[] {

+			CREATION_TOOL,

+			CONNECTION_TOOL,

+		};

 

 	/**

 	 * A public read-only list of all the '<em><b>Tool Kind</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static final List<ToolKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

@@ -101,7 +102,8 @@ public enum ToolKind implements Enumerator {
 	 * Returns the '<em><b>Tool Kind</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param literal the literal.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static ToolKind get(String literal) {

@@ -118,7 +120,8 @@ public enum ToolKind implements Enumerator {
 	 * Returns the '<em><b>Tool Kind</b></em>' literal with the specified name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param name the name.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static ToolKind getByName(String name) {

@@ -135,15 +138,14 @@ public enum ToolKind implements Enumerator {
 	 * Returns the '<em><b>Tool Kind</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param value the integer value.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static ToolKind get(int value) {

 		switch (value) {

-		case CREATION_TOOL_VALUE:

-			return CREATION_TOOL;

-		case CONNECTION_TOOL_VALUE:

-			return CONNECTION_TOOL;

+			case CREATION_TOOL_VALUE: return CREATION_TOOL;

+			case CONNECTION_TOOL_VALUE: return CONNECTION_TOOL;

 		}

 		return null;

 	}

@@ -151,7 +153,6 @@ public enum ToolKind implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final int value;

@@ -159,7 +160,6 @@ public enum ToolKind implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final String name;

@@ -167,7 +167,6 @@ public enum ToolKind implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final String literal;

@@ -176,7 +175,6 @@ public enum ToolKind implements Enumerator {
 	 * Only this class can construct instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private ToolKind(int value, String name, String literal) {

@@ -188,43 +186,39 @@ public enum ToolKind implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public int getValue() {

-		return value;

+	  return value;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public String getName() {

-		return name;

+	  return name;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public String getLiteral() {

-		return literal;

+	  return literal;

 	}

 

 	/**

 	 * Returns the literal value of the enumerator, which is its string representation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

 		return literal;

 	}

-

-} // ToolKind

+	

+} //ToolKind

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ChildConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ChildConfigurationImpl.java
index 8f37b4f16c2..359c73ac1e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ChildConfigurationImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ChildConfigurationImpl.java
@@ -1,12 +1,19 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;

 

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

 

@@ -14,8 +21,6 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration
  * <!-- begin-user-doc -->

  * An implementation of the model object '<em><b>Child Configuration</b></em>'.

  * <!-- end-user-doc -->

- * <p>

- * </p>

  *

  * @generated

  */

@@ -23,7 +28,6 @@ public abstract class ChildConfigurationImpl extends ConfigurationImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected ChildConfigurationImpl() {

@@ -33,7 +37,6 @@ public abstract class ChildConfigurationImpl extends ConfigurationImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -41,4 +44,4 @@ public abstract class ChildConfigurationImpl extends ConfigurationImpl implement
 		return PaletteconfigurationPackage.Literals.CHILD_CONFIGURATION;

 	}

 

-} // ChildConfigurationImpl

+} //ChildConfigurationImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ConfigurationImpl.java
index fb68f0cb5f7..3d02783a98b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ConfigurationImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ConfigurationImpl.java
@@ -1,17 +1,26 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

@@ -22,13 +31,13 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ConfigurationImpl#getId <em>Id</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ConfigurationImpl#getLabel <em>Label</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ConfigurationImpl#getDescription <em>Description</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ConfigurationImpl#getIcon <em>Icon</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ConfigurationImpl#getId <em>Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ConfigurationImpl#getLabel <em>Label</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ConfigurationImpl#getDescription <em>Description</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ConfigurationImpl#getIcon <em>Icon</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -37,7 +46,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getId()

 	 * @generated

 	 * @ordered

@@ -48,7 +56,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getId()

 	 * @generated

 	 * @ordered

@@ -59,7 +66,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	 * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLabel()

 	 * @generated

 	 * @ordered

@@ -70,7 +76,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	 * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLabel()

 	 * @generated

 	 * @ordered

@@ -81,7 +86,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDescription()

 	 * @generated

 	 * @ordered

@@ -92,7 +96,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDescription()

 	 * @generated

 	 * @ordered

@@ -103,7 +106,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	 * The cached value of the '{@link #getIcon() <em>Icon</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getIcon()

 	 * @generated

 	 * @ordered

@@ -113,7 +115,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected ConfigurationImpl() {

@@ -123,7 +124,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -134,7 +134,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public String getId() {

@@ -144,21 +143,18 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void setId(String newId) {

 		String oldId = id;

 		id = newId;

-		if (eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, PaletteconfigurationPackage.CONFIGURATION__ID, oldId, id));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public String getLabel() {

@@ -168,21 +164,18 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void setLabel(String newLabel) {

 		String oldLabel = label;

 		label = newLabel;

-		if (eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, PaletteconfigurationPackage.CONFIGURATION__LABEL, oldLabel, label));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public String getDescription() {

@@ -192,21 +185,18 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void setDescription(String newDescription) {

 		String oldDescription = description;

 		description = newDescription;

-		if (eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, PaletteconfigurationPackage.CONFIGURATION__DESCRIPTION, oldDescription, description));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public IconDescriptor getIcon() {

@@ -216,7 +206,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetIcon(IconDescriptor newIcon, NotificationChain msgs) {

@@ -224,11 +213,7 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 		icon = newIcon;

 		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PaletteconfigurationPackage.CONFIGURATION__ICON, oldIcon, newIcon);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -236,39 +221,32 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void setIcon(IconDescriptor newIcon) {

 		if (newIcon != icon) {

 			NotificationChain msgs = null;

-			if (icon != null) {

-				msgs = ((InternalEObject) icon).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PaletteconfigurationPackage.CONFIGURATION__ICON, null, msgs);

-			}

-			if (newIcon != null) {

-				msgs = ((InternalEObject) newIcon).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PaletteconfigurationPackage.CONFIGURATION__ICON, null, msgs);

-			}

+			if (icon != null)

+				msgs = ((InternalEObject)icon).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PaletteconfigurationPackage.CONFIGURATION__ICON, null, msgs);

+			if (newIcon != null)

+				msgs = ((InternalEObject)newIcon).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PaletteconfigurationPackage.CONFIGURATION__ICON, null, msgs);

 			msgs = basicSetIcon(newIcon, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

+			if (msgs != null) msgs.dispatch();

 		}

-		else if (eNotificationRequired()) {

+		else if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, PaletteconfigurationPackage.CONFIGURATION__ICON, newIcon, newIcon));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.CONFIGURATION__ICON:

-			return basicSetIcon(null, msgs);

+			case PaletteconfigurationPackage.CONFIGURATION__ICON:

+				return basicSetIcon(null, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -276,20 +254,19 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.CONFIGURATION__ID:

-			return getId();

-		case PaletteconfigurationPackage.CONFIGURATION__LABEL:

-			return getLabel();

-		case PaletteconfigurationPackage.CONFIGURATION__DESCRIPTION:

-			return getDescription();

-		case PaletteconfigurationPackage.CONFIGURATION__ICON:

-			return getIcon();

+			case PaletteconfigurationPackage.CONFIGURATION__ID:

+				return getId();

+			case PaletteconfigurationPackage.CONFIGURATION__LABEL:

+				return getLabel();

+			case PaletteconfigurationPackage.CONFIGURATION__DESCRIPTION:

+				return getDescription();

+			case PaletteconfigurationPackage.CONFIGURATION__ICON:

+				return getIcon();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -297,24 +274,23 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.CONFIGURATION__ID:

-			setId((String) newValue);

-			return;

-		case PaletteconfigurationPackage.CONFIGURATION__LABEL:

-			setLabel((String) newValue);

-			return;

-		case PaletteconfigurationPackage.CONFIGURATION__DESCRIPTION:

-			setDescription((String) newValue);

-			return;

-		case PaletteconfigurationPackage.CONFIGURATION__ICON:

-			setIcon((IconDescriptor) newValue);

-			return;

+			case PaletteconfigurationPackage.CONFIGURATION__ID:

+				setId((String)newValue);

+				return;

+			case PaletteconfigurationPackage.CONFIGURATION__LABEL:

+				setLabel((String)newValue);

+				return;

+			case PaletteconfigurationPackage.CONFIGURATION__DESCRIPTION:

+				setDescription((String)newValue);

+				return;

+			case PaletteconfigurationPackage.CONFIGURATION__ICON:

+				setIcon((IconDescriptor)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -322,24 +298,23 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.CONFIGURATION__ID:

-			setId(ID_EDEFAULT);

-			return;

-		case PaletteconfigurationPackage.CONFIGURATION__LABEL:

-			setLabel(LABEL_EDEFAULT);

-			return;

-		case PaletteconfigurationPackage.CONFIGURATION__DESCRIPTION:

-			setDescription(DESCRIPTION_EDEFAULT);

-			return;

-		case PaletteconfigurationPackage.CONFIGURATION__ICON:

-			setIcon((IconDescriptor) null);

-			return;

+			case PaletteconfigurationPackage.CONFIGURATION__ID:

+				setId(ID_EDEFAULT);

+				return;

+			case PaletteconfigurationPackage.CONFIGURATION__LABEL:

+				setLabel(LABEL_EDEFAULT);

+				return;

+			case PaletteconfigurationPackage.CONFIGURATION__DESCRIPTION:

+				setDescription(DESCRIPTION_EDEFAULT);

+				return;

+			case PaletteconfigurationPackage.CONFIGURATION__ICON:

+				setIcon((IconDescriptor)null);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -347,20 +322,19 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.CONFIGURATION__ID:

-			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);

-		case PaletteconfigurationPackage.CONFIGURATION__LABEL:

-			return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);

-		case PaletteconfigurationPackage.CONFIGURATION__DESCRIPTION:

-			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);

-		case PaletteconfigurationPackage.CONFIGURATION__ICON:

-			return icon != null;

+			case PaletteconfigurationPackage.CONFIGURATION__ID:

+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);

+			case PaletteconfigurationPackage.CONFIGURATION__LABEL:

+				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);

+			case PaletteconfigurationPackage.CONFIGURATION__DESCRIPTION:

+				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);

+			case PaletteconfigurationPackage.CONFIGURATION__ICON:

+				return icon != null;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -368,14 +342,11 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 	/**

 	 * <!-- 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(" (id: ");

@@ -388,4 +359,4 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura
 		return result.toString();

 	}

 

-} // ConfigurationImpl

+} //ConfigurationImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/DrawerConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/DrawerConfigurationImpl.java
index 38ee34f7efe..0f28f3ae75c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/DrawerConfigurationImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/DrawerConfigurationImpl.java
@@ -1,19 +1,29 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;

 

 import java.util.Collection;

 

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.common.util.EList;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

@@ -24,10 +34,10 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.DrawerConfigurationImpl#getOwnedConfigurations <em>Owned Configurations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.DrawerConfigurationImpl#getOwnedConfigurations <em>Owned Configurations</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -36,7 +46,6 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	 * The cached value of the '{@link #getOwnedConfigurations() <em>Owned Configurations</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getOwnedConfigurations()

 	 * @generated

 	 * @ordered

@@ -46,7 +55,6 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected DrawerConfigurationImpl() {

@@ -56,7 +64,6 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -67,7 +74,6 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EList<ChildConfiguration> getOwnedConfigurations() {

@@ -80,14 +86,13 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

-			return ((InternalEList<?>) getOwnedConfigurations()).basicRemove(otherEnd, msgs);

+			case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

+				return ((InternalEList<?>)getOwnedConfigurations()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -95,14 +100,13 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

-			return getOwnedConfigurations();

+			case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

+				return getOwnedConfigurations();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -110,17 +114,16 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

-			getOwnedConfigurations().clear();

-			getOwnedConfigurations().addAll((Collection<? extends ChildConfiguration>) newValue);

-			return;

+			case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

+				getOwnedConfigurations().clear();

+				getOwnedConfigurations().addAll((Collection<? extends ChildConfiguration>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -128,15 +131,14 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

-			getOwnedConfigurations().clear();

-			return;

+			case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

+				getOwnedConfigurations().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -144,16 +146,15 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

-			return ownedConfigurations != null && !ownedConfigurations.isEmpty();

+			case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

+				return ownedConfigurations != null && !ownedConfigurations.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

 

-} // DrawerConfigurationImpl

+} //DrawerConfigurationImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ElementDescriptorImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ElementDescriptorImpl.java
index 2d6c9ff84c1..dd866608282 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ElementDescriptorImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ElementDescriptorImpl.java
@@ -1,19 +1,30 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;

 

 import java.util.Collection;

 

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.common.util.EList;

+

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

+

 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

 

@@ -23,11 +34,11 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ElementDescriptorImpl#getElementTypeId <em>Element Type Id</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ElementDescriptorImpl#getGraphicalHints <em>Graphical Hints</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ElementDescriptorImpl#getElementTypeId <em>Element Type Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ElementDescriptorImpl#getGraphicalHints <em>Graphical Hints</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -36,7 +47,6 @@ public class ElementDescriptorImpl extends EObjectImpl implements ElementDescrip
 	 * The default value of the '{@link #getElementTypeId() <em>Element Type Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getElementTypeId()

 	 * @generated

 	 * @ordered

@@ -47,7 +57,6 @@ public class ElementDescriptorImpl extends EObjectImpl implements ElementDescrip
 	 * The cached value of the '{@link #getElementTypeId() <em>Element Type Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getElementTypeId()

 	 * @generated

 	 * @ordered

@@ -58,7 +67,6 @@ public class ElementDescriptorImpl extends EObjectImpl implements ElementDescrip
 	 * The cached value of the '{@link #getGraphicalHints() <em>Graphical Hints</em>}' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getGraphicalHints()

 	 * @generated

 	 * @ordered

@@ -68,7 +76,6 @@ public class ElementDescriptorImpl extends EObjectImpl implements ElementDescrip
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected ElementDescriptorImpl() {

@@ -78,7 +85,6 @@ public class ElementDescriptorImpl extends EObjectImpl implements ElementDescrip
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -89,7 +95,6 @@ public class ElementDescriptorImpl extends EObjectImpl implements ElementDescrip
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public String getElementTypeId() {

@@ -99,21 +104,18 @@ public class ElementDescriptorImpl extends EObjectImpl implements ElementDescrip
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void setElementTypeId(String newElementTypeId) {

 		String oldElementTypeId = elementTypeId;

 		elementTypeId = newElementTypeId;

-		if (eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID, oldElementTypeId, elementTypeId));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EList<String> getGraphicalHints() {

@@ -126,16 +128,15 @@ public class ElementDescriptorImpl extends EObjectImpl implements ElementDescrip
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID:

-			return getElementTypeId();

-		case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__GRAPHICAL_HINTS:

-			return getGraphicalHints();

+			case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID:

+				return getElementTypeId();

+			case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__GRAPHICAL_HINTS:

+				return getGraphicalHints();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -143,20 +144,19 @@ public class ElementDescriptorImpl extends EObjectImpl implements ElementDescrip
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID:

-			setElementTypeId((String) newValue);

-			return;

-		case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__GRAPHICAL_HINTS:

-			getGraphicalHints().clear();

-			getGraphicalHints().addAll((Collection<? extends String>) newValue);

-			return;

+			case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID:

+				setElementTypeId((String)newValue);

+				return;

+			case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__GRAPHICAL_HINTS:

+				getGraphicalHints().clear();

+				getGraphicalHints().addAll((Collection<? extends String>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -164,18 +164,17 @@ public class ElementDescriptorImpl extends EObjectImpl implements ElementDescrip
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID:

-			setElementTypeId(ELEMENT_TYPE_ID_EDEFAULT);

-			return;

-		case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__GRAPHICAL_HINTS:

-			getGraphicalHints().clear();

-			return;

+			case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID:

+				setElementTypeId(ELEMENT_TYPE_ID_EDEFAULT);

+				return;

+			case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__GRAPHICAL_HINTS:

+				getGraphicalHints().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -183,16 +182,15 @@ public class ElementDescriptorImpl extends EObjectImpl implements ElementDescrip
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID:

-			return ELEMENT_TYPE_ID_EDEFAULT == null ? elementTypeId != null : !ELEMENT_TYPE_ID_EDEFAULT.equals(elementTypeId);

-		case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__GRAPHICAL_HINTS:

-			return graphicalHints != null && !graphicalHints.isEmpty();

+			case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__ELEMENT_TYPE_ID:

+				return ELEMENT_TYPE_ID_EDEFAULT == null ? elementTypeId != null : !ELEMENT_TYPE_ID_EDEFAULT.equals(elementTypeId);

+			case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR__GRAPHICAL_HINTS:

+				return graphicalHints != null && !graphicalHints.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -200,14 +198,11 @@ public class ElementDescriptorImpl extends EObjectImpl implements ElementDescrip
 	/**

 	 * <!-- 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(" (elementTypeId: ");

@@ -218,4 +213,4 @@ public class ElementDescriptorImpl extends EObjectImpl implements ElementDescrip
 		return result.toString();

 	}

 

-} // ElementDescriptorImpl

+} //ElementDescriptorImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/IconDescriptorImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/IconDescriptorImpl.java
index d27f6cbae5f..9bb8e86cb1b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/IconDescriptorImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/IconDescriptorImpl.java
@@ -1,15 +1,24 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;

 

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

 

@@ -19,11 +28,11 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.IconDescriptorImpl#getPluginID <em>Plugin ID</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.IconDescriptorImpl#getIconPath <em>Icon Path</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.IconDescriptorImpl#getPluginID <em>Plugin ID</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.IconDescriptorImpl#getIconPath <em>Icon Path</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -32,7 +41,6 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 	 * The default value of the '{@link #getPluginID() <em>Plugin ID</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getPluginID()

 	 * @generated

 	 * @ordered

@@ -43,7 +51,6 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 	 * The cached value of the '{@link #getPluginID() <em>Plugin ID</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getPluginID()

 	 * @generated

 	 * @ordered

@@ -54,7 +61,6 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 	 * The default value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getIconPath()

 	 * @generated

 	 * @ordered

@@ -65,7 +71,6 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 	 * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getIconPath()

 	 * @generated

 	 * @ordered

@@ -75,7 +80,6 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected IconDescriptorImpl() {

@@ -85,7 +89,6 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -96,7 +99,6 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public String getPluginID() {

@@ -106,21 +108,18 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void setPluginID(String newPluginID) {

 		String oldPluginID = pluginID;

 		pluginID = newPluginID;

-		if (eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, PaletteconfigurationPackage.ICON_DESCRIPTOR__PLUGIN_ID, oldPluginID, pluginID));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public String getIconPath() {

@@ -130,30 +129,27 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void setIconPath(String newIconPath) {

 		String oldIconPath = iconPath;

 		iconPath = newIconPath;

-		if (eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, PaletteconfigurationPackage.ICON_DESCRIPTOR__ICON_PATH, oldIconPath, iconPath));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.ICON_DESCRIPTOR__PLUGIN_ID:

-			return getPluginID();

-		case PaletteconfigurationPackage.ICON_DESCRIPTOR__ICON_PATH:

-			return getIconPath();

+			case PaletteconfigurationPackage.ICON_DESCRIPTOR__PLUGIN_ID:

+				return getPluginID();

+			case PaletteconfigurationPackage.ICON_DESCRIPTOR__ICON_PATH:

+				return getIconPath();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -161,18 +157,17 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.ICON_DESCRIPTOR__PLUGIN_ID:

-			setPluginID((String) newValue);

-			return;

-		case PaletteconfigurationPackage.ICON_DESCRIPTOR__ICON_PATH:

-			setIconPath((String) newValue);

-			return;

+			case PaletteconfigurationPackage.ICON_DESCRIPTOR__PLUGIN_ID:

+				setPluginID((String)newValue);

+				return;

+			case PaletteconfigurationPackage.ICON_DESCRIPTOR__ICON_PATH:

+				setIconPath((String)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -180,18 +175,17 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.ICON_DESCRIPTOR__PLUGIN_ID:

-			setPluginID(PLUGIN_ID_EDEFAULT);

-			return;

-		case PaletteconfigurationPackage.ICON_DESCRIPTOR__ICON_PATH:

-			setIconPath(ICON_PATH_EDEFAULT);

-			return;

+			case PaletteconfigurationPackage.ICON_DESCRIPTOR__PLUGIN_ID:

+				setPluginID(PLUGIN_ID_EDEFAULT);

+				return;

+			case PaletteconfigurationPackage.ICON_DESCRIPTOR__ICON_PATH:

+				setIconPath(ICON_PATH_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -199,16 +193,15 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.ICON_DESCRIPTOR__PLUGIN_ID:

-			return PLUGIN_ID_EDEFAULT == null ? pluginID != null : !PLUGIN_ID_EDEFAULT.equals(pluginID);

-		case PaletteconfigurationPackage.ICON_DESCRIPTOR__ICON_PATH:

-			return ICON_PATH_EDEFAULT == null ? iconPath != null : !ICON_PATH_EDEFAULT.equals(iconPath);

+			case PaletteconfigurationPackage.ICON_DESCRIPTOR__PLUGIN_ID:

+				return PLUGIN_ID_EDEFAULT == null ? pluginID != null : !PLUGIN_ID_EDEFAULT.equals(pluginID);

+			case PaletteconfigurationPackage.ICON_DESCRIPTOR__ICON_PATH:

+				return ICON_PATH_EDEFAULT == null ? iconPath != null : !ICON_PATH_EDEFAULT.equals(iconPath);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -216,14 +209,11 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 	/**

 	 * <!-- 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(" (pluginID: ");

@@ -234,4 +224,4 @@ public class IconDescriptorImpl extends EObjectImpl implements IconDescriptor {
 		return result.toString();

 	}

 

-} // IconDescriptorImpl

+} //IconDescriptorImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/LeafConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/LeafConfigurationImpl.java
index 2a52c80bc51..30d02fad8e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/LeafConfigurationImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/LeafConfigurationImpl.java
@@ -1,12 +1,19 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;

 

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

 

@@ -14,8 +21,6 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration
  * <!-- begin-user-doc -->

  * An implementation of the model object '<em><b>Leaf Configuration</b></em>'.

  * <!-- end-user-doc -->

- * <p>

- * </p>

  *

  * @generated

  */

@@ -23,7 +28,6 @@ public abstract class LeafConfigurationImpl extends ChildConfigurationImpl imple
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected LeafConfigurationImpl() {

@@ -33,7 +37,6 @@ public abstract class LeafConfigurationImpl extends ChildConfigurationImpl imple
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -41,4 +44,4 @@ public abstract class LeafConfigurationImpl extends ChildConfigurationImpl imple
 		return PaletteconfigurationPackage.Literals.LEAF_CONFIGURATION;

 	}

 

-} // LeafConfigurationImpl

+} //LeafConfigurationImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteConfigurationImpl.java
index 0b40ad22429..edfe31ca4b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteConfigurationImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteConfigurationImpl.java
@@ -1,20 +1,30 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;

 

 import java.util.Collection;

 

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.common.util.EList;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

@@ -25,11 +35,11 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteConfigurationImpl#getDrawerConfigurations <em>Drawer Configurations</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteConfigurationImpl#getRequiredProfiles <em>Required Profiles</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteConfigurationImpl#getDrawerConfigurations <em>Drawer Configurations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.PaletteConfigurationImpl#getRequiredProfiles <em>Required Profiles</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -38,7 +48,6 @@ public class PaletteConfigurationImpl extends ConfigurationImpl implements Palet
 	 * The cached value of the '{@link #getDrawerConfigurations() <em>Drawer Configurations</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDrawerConfigurations()

 	 * @generated

 	 * @ordered

@@ -49,7 +58,6 @@ public class PaletteConfigurationImpl extends ConfigurationImpl implements Palet
 	 * The cached value of the '{@link #getRequiredProfiles() <em>Required Profiles</em>}' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getRequiredProfiles()

 	 * @generated

 	 * @ordered

@@ -59,7 +67,6 @@ public class PaletteConfigurationImpl extends ConfigurationImpl implements Palet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected PaletteConfigurationImpl() {

@@ -69,7 +76,6 @@ public class PaletteConfigurationImpl extends ConfigurationImpl implements Palet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -80,7 +86,6 @@ public class PaletteConfigurationImpl extends ConfigurationImpl implements Palet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EList<DrawerConfiguration> getDrawerConfigurations() {

@@ -93,7 +98,6 @@ public class PaletteConfigurationImpl extends ConfigurationImpl implements Palet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EList<String> getRequiredProfiles() {

@@ -106,14 +110,13 @@ public class PaletteConfigurationImpl extends ConfigurationImpl implements Palet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS:

-			return ((InternalEList<?>) getDrawerConfigurations()).basicRemove(otherEnd, msgs);

+			case PaletteconfigurationPackage.PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS:

+				return ((InternalEList<?>)getDrawerConfigurations()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -121,16 +124,15 @@ public class PaletteConfigurationImpl extends ConfigurationImpl implements Palet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS:

-			return getDrawerConfigurations();

-		case PaletteconfigurationPackage.PALETTE_CONFIGURATION__REQUIRED_PROFILES:

-			return getRequiredProfiles();

+			case PaletteconfigurationPackage.PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS:

+				return getDrawerConfigurations();

+			case PaletteconfigurationPackage.PALETTE_CONFIGURATION__REQUIRED_PROFILES:

+				return getRequiredProfiles();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -138,21 +140,20 @@ public class PaletteConfigurationImpl extends ConfigurationImpl implements Palet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS:

-			getDrawerConfigurations().clear();

-			getDrawerConfigurations().addAll((Collection<? extends DrawerConfiguration>) newValue);

-			return;

-		case PaletteconfigurationPackage.PALETTE_CONFIGURATION__REQUIRED_PROFILES:

-			getRequiredProfiles().clear();

-			getRequiredProfiles().addAll((Collection<? extends String>) newValue);

-			return;

+			case PaletteconfigurationPackage.PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS:

+				getDrawerConfigurations().clear();

+				getDrawerConfigurations().addAll((Collection<? extends DrawerConfiguration>)newValue);

+				return;

+			case PaletteconfigurationPackage.PALETTE_CONFIGURATION__REQUIRED_PROFILES:

+				getRequiredProfiles().clear();

+				getRequiredProfiles().addAll((Collection<? extends String>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -160,18 +161,17 @@ public class PaletteConfigurationImpl extends ConfigurationImpl implements Palet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS:

-			getDrawerConfigurations().clear();

-			return;

-		case PaletteconfigurationPackage.PALETTE_CONFIGURATION__REQUIRED_PROFILES:

-			getRequiredProfiles().clear();

-			return;

+			case PaletteconfigurationPackage.PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS:

+				getDrawerConfigurations().clear();

+				return;

+			case PaletteconfigurationPackage.PALETTE_CONFIGURATION__REQUIRED_PROFILES:

+				getRequiredProfiles().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -179,16 +179,15 @@ public class PaletteConfigurationImpl extends ConfigurationImpl implements Palet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS:

-			return drawerConfigurations != null && !drawerConfigurations.isEmpty();

-		case PaletteconfigurationPackage.PALETTE_CONFIGURATION__REQUIRED_PROFILES:

-			return requiredProfiles != null && !requiredProfiles.isEmpty();

+			case PaletteconfigurationPackage.PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS:

+				return drawerConfigurations != null && !drawerConfigurations.isEmpty();

+			case PaletteconfigurationPackage.PALETTE_CONFIGURATION__REQUIRED_PROFILES:

+				return requiredProfiles != null && !requiredProfiles.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -196,14 +195,11 @@ public class PaletteConfigurationImpl extends ConfigurationImpl implements Palet
 	/**

 	 * <!-- 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(" (requiredProfiles: ");

@@ -212,4 +208,4 @@ public class PaletteConfigurationImpl extends ConfigurationImpl implements Palet
 		return result.toString();

 	}

 

-} // PaletteConfigurationImpl

+} //PaletteConfigurationImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationFactoryImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationFactoryImpl.java
index b7309f3164a..ea8af9bfc85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationFactoryImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationFactoryImpl.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;

 

@@ -10,24 +16,17 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

+

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

+

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolKind;

+

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.*;

 

 /**

  * <!-- begin-user-doc -->

  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class PaletteconfigurationFactoryImpl extends EFactoryImpl implements PaletteconfigurationFactory {

@@ -35,16 +34,16 @@ public class PaletteconfigurationFactoryImpl extends EFactoryImpl implements Pal
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static PaletteconfigurationFactory init() {

 		try {

-			PaletteconfigurationFactory thePaletteconfigurationFactory = (PaletteconfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(PaletteconfigurationPackage.eNS_URI);

+			PaletteconfigurationFactory thePaletteconfigurationFactory = (PaletteconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(PaletteconfigurationPackage.eNS_URI);

 			if (thePaletteconfigurationFactory != null) {

 				return thePaletteconfigurationFactory;

 			}

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new PaletteconfigurationFactoryImpl();

@@ -54,7 +53,6 @@ public class PaletteconfigurationFactoryImpl extends EFactoryImpl implements Pal
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public PaletteconfigurationFactoryImpl() {

@@ -64,67 +62,56 @@ public class PaletteconfigurationFactoryImpl extends EFactoryImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

 		switch (eClass.getClassifierID()) {

-		case PaletteconfigurationPackage.PALETTE_CONFIGURATION:

-			return createPaletteConfiguration();

-		case PaletteconfigurationPackage.TOOL_CONFIGURATION:

-			return createToolConfiguration();

-		case PaletteconfigurationPackage.STACK_CONFIGURATION:

-			return createStackConfiguration();

-		case PaletteconfigurationPackage.DRAWER_CONFIGURATION:

-			return createDrawerConfiguration();

-		case PaletteconfigurationPackage.ICON_DESCRIPTOR:

-			return createIconDescriptor();

-		case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR:

-			return createElementDescriptor();

-		case PaletteconfigurationPackage.SEPARATOR_CONFIGURATION:

-			return createSeparatorConfiguration();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+			case PaletteconfigurationPackage.PALETTE_CONFIGURATION: return createPaletteConfiguration();

+			case PaletteconfigurationPackage.TOOL_CONFIGURATION: return createToolConfiguration();

+			case PaletteconfigurationPackage.STACK_CONFIGURATION: return createStackConfiguration();

+			case PaletteconfigurationPackage.DRAWER_CONFIGURATION: return createDrawerConfiguration();

+			case PaletteconfigurationPackage.ICON_DESCRIPTOR: return createIconDescriptor();

+			case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR: return createElementDescriptor();

+			case PaletteconfigurationPackage.SEPARATOR_CONFIGURATION: return createSeparatorConfiguration();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

 		switch (eDataType.getClassifierID()) {

-		case PaletteconfigurationPackage.TOOL_KIND:

-			return createToolKindFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+			case PaletteconfigurationPackage.TOOL_KIND:

+				return createToolKindFromString(eDataType, initialValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

 		switch (eDataType.getClassifierID()) {

-		case PaletteconfigurationPackage.TOOL_KIND:

-			return convertToolKindToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+			case PaletteconfigurationPackage.TOOL_KIND:

+				return convertToolKindToString(eDataType, instanceValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public PaletteConfiguration createPaletteConfiguration() {

@@ -135,7 +122,6 @@ public class PaletteconfigurationFactoryImpl extends EFactoryImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ToolConfiguration createToolConfiguration() {

@@ -146,7 +132,6 @@ public class PaletteconfigurationFactoryImpl extends EFactoryImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public StackConfiguration createStackConfiguration() {

@@ -157,7 +142,6 @@ public class PaletteconfigurationFactoryImpl extends EFactoryImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public DrawerConfiguration createDrawerConfiguration() {

@@ -168,7 +152,6 @@ public class PaletteconfigurationFactoryImpl extends EFactoryImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public IconDescriptor createIconDescriptor() {

@@ -179,7 +162,6 @@ public class PaletteconfigurationFactoryImpl extends EFactoryImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ElementDescriptor createElementDescriptor() {

@@ -190,7 +172,6 @@ public class PaletteconfigurationFactoryImpl extends EFactoryImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public SeparatorConfiguration createSeparatorConfiguration() {

@@ -201,21 +182,17 @@ public class PaletteconfigurationFactoryImpl extends EFactoryImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ToolKind createToolKindFromString(EDataType eDataType, String initialValue) {

 		ToolKind result = ToolKind.get(initialValue);

-		if (result == null) {

-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

-		}

+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public String convertToolKindToString(EDataType eDataType, Object instanceValue) {

@@ -225,17 +202,15 @@ public class PaletteconfigurationFactoryImpl extends EFactoryImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public PaletteconfigurationPackage getPaletteconfigurationPackage() {

-		return (PaletteconfigurationPackage) getEPackage();

+		return (PaletteconfigurationPackage)getEPackage();

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @deprecated

 	 * @generated

 	 */

@@ -244,4 +219,4 @@ public class PaletteconfigurationFactoryImpl extends EFactoryImpl implements Pal
 		return PaletteconfigurationPackage.eINSTANCE;

 	}

 

-} // PaletteconfigurationFactoryImpl

+} //PaletteconfigurationFactoryImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationPackageImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationPackageImpl.java
index 190878b94a0..3019eb4dea3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationPackageImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationPackageImpl.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;

 

@@ -12,7 +18,9 @@ import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.EcorePackage;

+

 import org.eclipse.emf.ecore.impl.EPackageImpl;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;

@@ -31,14 +39,12 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolKind;
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class PaletteconfigurationPackageImpl extends EPackageImpl implements PaletteconfigurationPackage {

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass paletteConfigurationEClass = null;

@@ -46,7 +52,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass toolConfigurationEClass = null;

@@ -54,7 +59,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass stackConfigurationEClass = null;

@@ -62,7 +66,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass childConfigurationEClass = null;

@@ -70,7 +73,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass drawerConfigurationEClass = null;

@@ -78,7 +80,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass configurationEClass = null;

@@ -86,7 +87,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass iconDescriptorEClass = null;

@@ -94,7 +94,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass elementDescriptorEClass = null;

@@ -102,7 +101,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass separatorConfigurationEClass = null;

@@ -110,7 +108,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass leafConfigurationEClass = null;

@@ -118,17 +115,20 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EEnum toolKindEEnum = 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.diagram.paletteconfiguration.PaletteconfigurationPackage#eNS_URI

 	 * @see #init()

@@ -141,31 +141,27 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link PaletteconfigurationPackage#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 -->

-	 *

+	 * 

+	 * <p>This method is used to initialize {@link PaletteconfigurationPackage#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 PaletteconfigurationPackage init() {

-		if (isInited) {

-			return (PaletteconfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(PaletteconfigurationPackage.eNS_URI);

-		}

+		if (isInited) return (PaletteconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(PaletteconfigurationPackage.eNS_URI);

 

 		// Obtain or create and register package

-		PaletteconfigurationPackageImpl thePaletteconfigurationPackage = (PaletteconfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PaletteconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)

-				: new PaletteconfigurationPackageImpl());

+		PaletteconfigurationPackageImpl thePaletteconfigurationPackage = (PaletteconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PaletteconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PaletteconfigurationPackageImpl());

 

 		isInited = true;

 

@@ -181,7 +177,7 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 		// Mark meta-data to indicate it can't be changed

 		thePaletteconfigurationPackage.freeze();

 

-

+  

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(PaletteconfigurationPackage.eNS_URI, thePaletteconfigurationPackage);

 		return thePaletteconfigurationPackage;

@@ -190,7 +186,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EClass getPaletteConfiguration() {

@@ -200,27 +195,24 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EReference getPaletteConfiguration_DrawerConfigurations() {

-		return (EReference) paletteConfigurationEClass.getEStructuralFeatures().get(0);

+		return (EReference)paletteConfigurationEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EAttribute getPaletteConfiguration_RequiredProfiles() {

-		return (EAttribute) paletteConfigurationEClass.getEStructuralFeatures().get(1);

+		return (EAttribute)paletteConfigurationEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EClass getToolConfiguration() {

@@ -230,27 +222,24 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EAttribute getToolConfiguration_Kind() {

-		return (EAttribute) toolConfigurationEClass.getEStructuralFeatures().get(0);

+		return (EAttribute)toolConfigurationEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EReference getToolConfiguration_ElementDescriptors() {

-		return (EReference) toolConfigurationEClass.getEStructuralFeatures().get(1);

+		return (EReference)toolConfigurationEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EClass getStackConfiguration() {

@@ -260,17 +249,15 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EReference getStackConfiguration_OwnedConfigurations() {

-		return (EReference) stackConfigurationEClass.getEStructuralFeatures().get(0);

+		return (EReference)stackConfigurationEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EClass getChildConfiguration() {

@@ -280,7 +267,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EClass getDrawerConfiguration() {

@@ -290,17 +276,15 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EReference getDrawerConfiguration_OwnedConfigurations() {

-		return (EReference) drawerConfigurationEClass.getEStructuralFeatures().get(0);

+		return (EReference)drawerConfigurationEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EClass getConfiguration() {

@@ -310,47 +294,42 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EAttribute getConfiguration_Id() {

-		return (EAttribute) configurationEClass.getEStructuralFeatures().get(0);

+		return (EAttribute)configurationEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EAttribute getConfiguration_Label() {

-		return (EAttribute) configurationEClass.getEStructuralFeatures().get(1);

+		return (EAttribute)configurationEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EAttribute getConfiguration_Description() {

-		return (EAttribute) configurationEClass.getEStructuralFeatures().get(2);

+		return (EAttribute)configurationEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EReference getConfiguration_Icon() {

-		return (EReference) configurationEClass.getEStructuralFeatures().get(3);

+		return (EReference)configurationEClass.getEStructuralFeatures().get(3);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EClass getIconDescriptor() {

@@ -360,27 +339,24 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EAttribute getIconDescriptor_PluginID() {

-		return (EAttribute) iconDescriptorEClass.getEStructuralFeatures().get(0);

+		return (EAttribute)iconDescriptorEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EAttribute getIconDescriptor_IconPath() {

-		return (EAttribute) iconDescriptorEClass.getEStructuralFeatures().get(1);

+		return (EAttribute)iconDescriptorEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EClass getElementDescriptor() {

@@ -390,27 +366,24 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EAttribute getElementDescriptor_ElementTypeId() {

-		return (EAttribute) elementDescriptorEClass.getEStructuralFeatures().get(0);

+		return (EAttribute)elementDescriptorEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EAttribute getElementDescriptor_GraphicalHints() {

-		return (EAttribute) elementDescriptorEClass.getEStructuralFeatures().get(1);

+		return (EAttribute)elementDescriptorEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EClass getSeparatorConfiguration() {

@@ -420,7 +393,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EClass getLeafConfiguration() {

@@ -430,7 +402,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EEnum getToolKind() {

@@ -440,33 +411,28 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public PaletteconfigurationFactory getPaletteconfigurationFactory() {

-		return (PaletteconfigurationFactory) getEFactoryInstance();

+		return (PaletteconfigurationFactory)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

@@ -511,23 +477,19 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 	/**

 	 * <!-- 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

@@ -536,7 +498,7 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 		setNsURI(eNS_URI);

 

 		// Obtain other dependent packages

-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

 

 		// Create type parameters

 

@@ -553,25 +515,20 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 

 		// Initialize classes and features; add operations and parameters

 		initEClass(paletteConfigurationEClass, PaletteConfiguration.class, "PaletteConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getPaletteConfiguration_DrawerConfigurations(), this.getDrawerConfiguration(), null, "drawerConfigurations", null, 1, -1, PaletteConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getPaletteConfiguration_RequiredProfiles(), theEcorePackage.getEString(), "requiredProfiles", null, 0, -1, PaletteConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

+		initEReference(getPaletteConfiguration_DrawerConfigurations(), this.getDrawerConfiguration(), null, "drawerConfigurations", null, 1, -1, PaletteConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getPaletteConfiguration_RequiredProfiles(), theEcorePackage.getEString(), "requiredProfiles", null, 0, -1, PaletteConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

 		initEClass(toolConfigurationEClass, ToolConfiguration.class, "ToolConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 		initEAttribute(getToolConfiguration_Kind(), this.getToolKind(), "kind", "CreationTool", 1, 1, ToolConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getToolConfiguration_ElementDescriptors(), this.getElementDescriptor(), null, "elementDescriptors", null, 0, -1, ToolConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getToolConfiguration_ElementDescriptors(), this.getElementDescriptor(), null, "elementDescriptors", null, 0, -1, ToolConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

 		initEClass(stackConfigurationEClass, StackConfiguration.class, "StackConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getStackConfiguration_OwnedConfigurations(), this.getLeafConfiguration(), null, "ownedConfigurations", null, 1, -1, StackConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getStackConfiguration_OwnedConfigurations(), this.getLeafConfiguration(), null, "ownedConfigurations", null, 1, -1, StackConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

 		initEClass(childConfigurationEClass, ChildConfiguration.class, "ChildConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

 		initEClass(drawerConfigurationEClass, DrawerConfiguration.class, "DrawerConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getDrawerConfiguration_OwnedConfigurations(), this.getChildConfiguration(), null, "ownedConfigurations", null, 1, -1, DrawerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getDrawerConfiguration_OwnedConfigurations(), this.getChildConfiguration(), null, "ownedConfigurations", null, 1, -1, DrawerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

 		initEClass(configurationEClass, Configuration.class, "Configuration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 		initEAttribute(getConfiguration_Id(), theEcorePackage.getEString(), "id", null, 1, 1, Configuration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -600,4 +557,4 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal
 		createResource(eNS_URI);

 	}

 

-} // PaletteconfigurationPackageImpl

+} //PaletteconfigurationPackageImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/SeparatorConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/SeparatorConfigurationImpl.java
index eb44c633527..c289245f3ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/SeparatorConfigurationImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/SeparatorConfigurationImpl.java
@@ -1,12 +1,19 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;

 

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration;

 

@@ -14,8 +21,6 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfigurati
  * <!-- begin-user-doc -->

  * An implementation of the model object '<em><b>Separator Configuration</b></em>'.

  * <!-- end-user-doc -->

- * <p>

- * </p>

  *

  * @generated

  */

@@ -23,7 +28,6 @@ public class SeparatorConfigurationImpl extends LeafConfigurationImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected SeparatorConfigurationImpl() {

@@ -33,7 +37,6 @@ public class SeparatorConfigurationImpl extends LeafConfigurationImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -41,4 +44,4 @@ public class SeparatorConfigurationImpl extends LeafConfigurationImpl implements
 		return PaletteconfigurationPackage.Literals.SEPARATOR_CONFIGURATION;

 	}

 

-} // SeparatorConfigurationImpl

+} //SeparatorConfigurationImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/StackConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/StackConfigurationImpl.java
index 088c5189988..e15f6262e2c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/StackConfigurationImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/StackConfigurationImpl.java
@@ -1,19 +1,29 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;

 

 import java.util.Collection;

 

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.common.util.EList;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;

@@ -24,10 +34,10 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.StackConfigurationImpl#getOwnedConfigurations <em>Owned Configurations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.StackConfigurationImpl#getOwnedConfigurations <em>Owned Configurations</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -36,7 +46,6 @@ public class StackConfigurationImpl extends ChildConfigurationImpl implements St
 	 * The cached value of the '{@link #getOwnedConfigurations() <em>Owned Configurations</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getOwnedConfigurations()

 	 * @generated

 	 * @ordered

@@ -46,7 +55,6 @@ public class StackConfigurationImpl extends ChildConfigurationImpl implements St
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected StackConfigurationImpl() {

@@ -56,7 +64,6 @@ public class StackConfigurationImpl extends ChildConfigurationImpl implements St
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -67,7 +74,6 @@ public class StackConfigurationImpl extends ChildConfigurationImpl implements St
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EList<LeafConfiguration> getOwnedConfigurations() {

@@ -80,14 +86,13 @@ public class StackConfigurationImpl extends ChildConfigurationImpl implements St
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.STACK_CONFIGURATION__OWNED_CONFIGURATIONS:

-			return ((InternalEList<?>) getOwnedConfigurations()).basicRemove(otherEnd, msgs);

+			case PaletteconfigurationPackage.STACK_CONFIGURATION__OWNED_CONFIGURATIONS:

+				return ((InternalEList<?>)getOwnedConfigurations()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -95,14 +100,13 @@ public class StackConfigurationImpl extends ChildConfigurationImpl implements St
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.STACK_CONFIGURATION__OWNED_CONFIGURATIONS:

-			return getOwnedConfigurations();

+			case PaletteconfigurationPackage.STACK_CONFIGURATION__OWNED_CONFIGURATIONS:

+				return getOwnedConfigurations();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -110,17 +114,16 @@ public class StackConfigurationImpl extends ChildConfigurationImpl implements St
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.STACK_CONFIGURATION__OWNED_CONFIGURATIONS:

-			getOwnedConfigurations().clear();

-			getOwnedConfigurations().addAll((Collection<? extends LeafConfiguration>) newValue);

-			return;

+			case PaletteconfigurationPackage.STACK_CONFIGURATION__OWNED_CONFIGURATIONS:

+				getOwnedConfigurations().clear();

+				getOwnedConfigurations().addAll((Collection<? extends LeafConfiguration>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -128,15 +131,14 @@ public class StackConfigurationImpl extends ChildConfigurationImpl implements St
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.STACK_CONFIGURATION__OWNED_CONFIGURATIONS:

-			getOwnedConfigurations().clear();

-			return;

+			case PaletteconfigurationPackage.STACK_CONFIGURATION__OWNED_CONFIGURATIONS:

+				getOwnedConfigurations().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -144,16 +146,15 @@ public class StackConfigurationImpl extends ChildConfigurationImpl implements St
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.STACK_CONFIGURATION__OWNED_CONFIGURATIONS:

-			return ownedConfigurations != null && !ownedConfigurations.isEmpty();

+			case PaletteconfigurationPackage.STACK_CONFIGURATION__OWNED_CONFIGURATIONS:

+				return ownedConfigurations != null && !ownedConfigurations.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

 

-} // StackConfigurationImpl

+} //StackConfigurationImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ToolConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ToolConfigurationImpl.java
index f08dade7c86..cea4c7969d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ToolConfigurationImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ToolConfigurationImpl.java
@@ -1,8 +1,14 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;

 

@@ -10,12 +16,17 @@ import java.util.Collection;
 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.common.util.EList;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;

@@ -27,11 +38,11 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolKind;
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ToolConfigurationImpl#getKind <em>Kind</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ToolConfigurationImpl#getElementDescriptors <em>Element Descriptors</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ToolConfigurationImpl#getKind <em>Kind</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.ToolConfigurationImpl#getElementDescriptors <em>Element Descriptors</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -40,7 +51,6 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getKind()

 	 * @generated

 	 * @ordered

@@ -51,7 +61,6 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getKind()

 	 * @generated

 	 * @ordered

@@ -62,7 +71,6 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 	 * The cached value of the '{@link #getElementDescriptors() <em>Element Descriptors</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getElementDescriptors()

 	 * @generated

 	 * @ordered

@@ -72,7 +80,6 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected ToolConfigurationImpl() {

@@ -82,7 +89,6 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -93,7 +99,6 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ToolKind getKind() {

@@ -103,21 +108,18 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void setKind(ToolKind newKind) {

 		ToolKind oldKind = kind;

 		kind = newKind == null ? KIND_EDEFAULT : newKind;

-		if (eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, PaletteconfigurationPackage.TOOL_CONFIGURATION__KIND, oldKind, kind));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EList<ElementDescriptor> getElementDescriptors() {

@@ -130,14 +132,13 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS:

-			return ((InternalEList<?>) getElementDescriptors()).basicRemove(otherEnd, msgs);

+			case PaletteconfigurationPackage.TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS:

+				return ((InternalEList<?>)getElementDescriptors()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -145,16 +146,15 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.TOOL_CONFIGURATION__KIND:

-			return getKind();

-		case PaletteconfigurationPackage.TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS:

-			return getElementDescriptors();

+			case PaletteconfigurationPackage.TOOL_CONFIGURATION__KIND:

+				return getKind();

+			case PaletteconfigurationPackage.TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS:

+				return getElementDescriptors();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -162,20 +162,19 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.TOOL_CONFIGURATION__KIND:

-			setKind((ToolKind) newValue);

-			return;

-		case PaletteconfigurationPackage.TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS:

-			getElementDescriptors().clear();

-			getElementDescriptors().addAll((Collection<? extends ElementDescriptor>) newValue);

-			return;

+			case PaletteconfigurationPackage.TOOL_CONFIGURATION__KIND:

+				setKind((ToolKind)newValue);

+				return;

+			case PaletteconfigurationPackage.TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS:

+				getElementDescriptors().clear();

+				getElementDescriptors().addAll((Collection<? extends ElementDescriptor>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -183,18 +182,17 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.TOOL_CONFIGURATION__KIND:

-			setKind(KIND_EDEFAULT);

-			return;

-		case PaletteconfigurationPackage.TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS:

-			getElementDescriptors().clear();

-			return;

+			case PaletteconfigurationPackage.TOOL_CONFIGURATION__KIND:

+				setKind(KIND_EDEFAULT);

+				return;

+			case PaletteconfigurationPackage.TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS:

+				getElementDescriptors().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -202,16 +200,15 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.TOOL_CONFIGURATION__KIND:

-			return kind != KIND_EDEFAULT;

-		case PaletteconfigurationPackage.TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS:

-			return elementDescriptors != null && !elementDescriptors.isEmpty();

+			case PaletteconfigurationPackage.TOOL_CONFIGURATION__KIND:

+				return kind != KIND_EDEFAULT;

+			case PaletteconfigurationPackage.TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS:

+				return elementDescriptors != null && !elementDescriptors.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -219,14 +216,11 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 	/**

 	 * <!-- 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(" (kind: ");

@@ -235,4 +229,4 @@ public class ToolConfigurationImpl extends LeafConfigurationImpl implements Tool
 		return result.toString();

 	}

 

-} // ToolConfigurationImpl

+} //ToolConfigurationImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationAdapterFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationAdapterFactory.java
index 8667f72886d..e3351b7b65f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationAdapterFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationAdapterFactory.java
@@ -1,33 +1,31 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.util;

 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

+

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;

+

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.*;

 

 /**

  * <!-- begin-user-doc -->

  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage

  * @generated

  */

@@ -36,7 +34,6 @@ public class PaletteconfigurationAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static PaletteconfigurationPackage modelPackage;

@@ -45,7 +42,6 @@ public class PaletteconfigurationAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public PaletteconfigurationAdapterFactory() {

@@ -59,7 +55,6 @@ public class PaletteconfigurationAdapterFactory 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

 	 */

@@ -69,7 +64,7 @@ public class PaletteconfigurationAdapterFactory extends AdapterFactoryImpl {
 			return true;

 		}

 		if (object instanceof EObject) {

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

+			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

 	}

@@ -78,80 +73,67 @@ public class PaletteconfigurationAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected PaletteconfigurationSwitch<Adapter> modelSwitch =

-			new PaletteconfigurationSwitch<Adapter>() {

-				@Override

-				public Adapter casePaletteConfiguration(PaletteConfiguration object) {

-					return createPaletteConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseToolConfiguration(ToolConfiguration object) {

-					return createToolConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseStackConfiguration(StackConfiguration object) {

-					return createStackConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseChildConfiguration(ChildConfiguration object) {

-					return createChildConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseDrawerConfiguration(DrawerConfiguration object) {

-					return createDrawerConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseConfiguration(Configuration object) {

-					return createConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseIconDescriptor(IconDescriptor object) {

-					return createIconDescriptorAdapter();

-				}

-

-				@Override

-				public Adapter caseElementDescriptor(ElementDescriptor object) {

-					return createElementDescriptorAdapter();

-				}

-

-				@Override

-				public Adapter caseSeparatorConfiguration(SeparatorConfiguration object) {

-					return createSeparatorConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseLeafConfiguration(LeafConfiguration object) {

-					return createLeafConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter defaultCase(EObject object) {

-					return createEObjectAdapter();

-				}

-			};

+		new PaletteconfigurationSwitch<Adapter>() {

+			@Override

+			public Adapter casePaletteConfiguration(PaletteConfiguration object) {

+				return createPaletteConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseToolConfiguration(ToolConfiguration object) {

+				return createToolConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseStackConfiguration(StackConfiguration object) {

+				return createStackConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseChildConfiguration(ChildConfiguration object) {

+				return createChildConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseDrawerConfiguration(DrawerConfiguration object) {

+				return createDrawerConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseConfiguration(Configuration object) {

+				return createConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseIconDescriptor(IconDescriptor object) {

+				return createIconDescriptorAdapter();

+			}

+			@Override

+			public Adapter caseElementDescriptor(ElementDescriptor object) {

+				return createElementDescriptorAdapter();

+			}

+			@Override

+			public Adapter caseSeparatorConfiguration(SeparatorConfiguration object) {

+				return createSeparatorConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseLeafConfiguration(LeafConfiguration object) {

+				return createLeafConfigurationAdapter();

+			}

+			@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);

 	}

 

 

@@ -161,7 +143,6 @@ public class PaletteconfigurationAdapterFactory 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.diagram.paletteconfiguration.PaletteConfiguration

 	 * @generated

@@ -176,7 +157,6 @@ public class PaletteconfigurationAdapterFactory 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.diagram.paletteconfiguration.ToolConfiguration

 	 * @generated

@@ -191,7 +171,6 @@ public class PaletteconfigurationAdapterFactory 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.diagram.paletteconfiguration.StackConfiguration

 	 * @generated

@@ -206,7 +185,6 @@ public class PaletteconfigurationAdapterFactory 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.diagram.paletteconfiguration.ChildConfiguration

 	 * @generated

@@ -221,7 +199,6 @@ public class PaletteconfigurationAdapterFactory 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.diagram.paletteconfiguration.DrawerConfiguration

 	 * @generated

@@ -236,7 +213,6 @@ public class PaletteconfigurationAdapterFactory 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.diagram.paletteconfiguration.Configuration

 	 * @generated

@@ -251,7 +227,6 @@ public class PaletteconfigurationAdapterFactory 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.diagram.paletteconfiguration.IconDescriptor

 	 * @generated

@@ -266,7 +241,6 @@ public class PaletteconfigurationAdapterFactory 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.diagram.paletteconfiguration.ElementDescriptor

 	 * @generated

@@ -281,7 +255,6 @@ public class PaletteconfigurationAdapterFactory 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.diagram.paletteconfiguration.SeparatorConfiguration

 	 * @generated

@@ -296,7 +269,6 @@ public class PaletteconfigurationAdapterFactory 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.diagram.paletteconfiguration.LeafConfiguration

 	 * @generated

@@ -310,7 +282,6 @@ public class PaletteconfigurationAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -318,4 +289,4 @@ public class PaletteconfigurationAdapterFactory extends AdapterFactoryImpl {
 		return null;

 	}

 

-} // PaletteconfigurationAdapterFactory

+} //PaletteconfigurationAdapterFactory

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceFactoryImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceFactoryImpl.java
index 537c68cb8db..0b12e4f44c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceFactoryImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceFactoryImpl.java
@@ -1,20 +1,27 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.util;

 

 import org.eclipse.emf.common.util.URI;

+

 import org.eclipse.emf.ecore.resource.Resource;

+

 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

 

 /**

  * <!-- begin-user-doc -->

  * The <b>Resource Factory</b> associated with the package.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.util.PaletteconfigurationResourceImpl

  * @generated

  */

@@ -23,7 +30,6 @@ public class PaletteconfigurationResourceFactoryImpl extends ResourceFactoryImpl
 	 * Creates an instance of the resource factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public PaletteconfigurationResourceFactoryImpl() {

@@ -34,7 +40,6 @@ public class PaletteconfigurationResourceFactoryImpl extends ResourceFactoryImpl
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -43,4 +48,4 @@ public class PaletteconfigurationResourceFactoryImpl extends ResourceFactoryImpl
 		return result;

 	}

 

-} // PaletteconfigurationResourceFactoryImpl

+} //PaletteconfigurationResourceFactoryImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceImpl.java
index 4b800f227c5..72eec7d00c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceImpl.java
@@ -1,19 +1,25 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.util;

 

 import org.eclipse.emf.common.util.URI;

+

 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

 

 /**

  * <!-- begin-user-doc -->

  * The <b>Resource </b> associated with the package.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.util.PaletteconfigurationResourceFactoryImpl

  * @generated

  */

@@ -22,13 +28,11 @@ public class PaletteconfigurationResourceImpl extends XMLResourceImpl {
 	 * Creates an instance of the resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

+	 * @param uri the URI of the new resource.

 	 * @generated

 	 */

 	public PaletteconfigurationResourceImpl(URI uri) {

 		super(uri);

 	}

 

-} // PaletteconfigurationResourceImpl

+} //PaletteconfigurationResourceImpl

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationSwitch.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationSwitch.java
index 1e7ef4a877c..beeeb6ec055 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationSwitch.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationSwitch.java
@@ -1,36 +1,34 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.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.diagram.paletteconfiguration.ChildConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;

-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;

+

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.*;

 

 /**

  * <!-- begin-user-doc -->

  * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}

+ * to invoke the <code>caseXXX</code> method for each class of the model,

  * starting with the actual class of the object

  * and proceeding up the inheritance hierarchy

  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage

  * @generated

  */

@@ -39,7 +37,6 @@ public class PaletteconfigurationSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static PaletteconfigurationPackage modelPackage;

@@ -48,7 +45,6 @@ public class PaletteconfigurationSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public PaletteconfigurationSwitch() {

@@ -61,8 +57,7 @@ public class PaletteconfigurationSwitch<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

 	 */

@@ -75,134 +70,86 @@ public class PaletteconfigurationSwitch<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 PaletteconfigurationPackage.PALETTE_CONFIGURATION: {

-			PaletteConfiguration paletteConfiguration = (PaletteConfiguration) theEObject;

-			T result = casePaletteConfiguration(paletteConfiguration);

-			if (result == null) {

-				result = caseConfiguration(paletteConfiguration);

+			case PaletteconfigurationPackage.PALETTE_CONFIGURATION: {

+				PaletteConfiguration paletteConfiguration = (PaletteConfiguration)theEObject;

+				T result = casePaletteConfiguration(paletteConfiguration);

+				if (result == null) result = caseConfiguration(paletteConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if (result == null) {

-				result = defaultCase(theEObject);

+			case PaletteconfigurationPackage.TOOL_CONFIGURATION: {

+				ToolConfiguration toolConfiguration = (ToolConfiguration)theEObject;

+				T result = caseToolConfiguration(toolConfiguration);

+				if (result == null) result = caseLeafConfiguration(toolConfiguration);

+				if (result == null) result = caseChildConfiguration(toolConfiguration);

+				if (result == null) result = caseConfiguration(toolConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			return result;

-		}

-		case PaletteconfigurationPackage.TOOL_CONFIGURATION: {

-			ToolConfiguration toolConfiguration = (ToolConfiguration) theEObject;

-			T result = caseToolConfiguration(toolConfiguration);

-			if (result == null) {

-				result = caseLeafConfiguration(toolConfiguration);

+			case PaletteconfigurationPackage.STACK_CONFIGURATION: {

+				StackConfiguration stackConfiguration = (StackConfiguration)theEObject;

+				T result = caseStackConfiguration(stackConfiguration);

+				if (result == null) result = caseChildConfiguration(stackConfiguration);

+				if (result == null) result = caseConfiguration(stackConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if (result == null) {

-				result = caseChildConfiguration(toolConfiguration);

+			case PaletteconfigurationPackage.CHILD_CONFIGURATION: {

+				ChildConfiguration childConfiguration = (ChildConfiguration)theEObject;

+				T result = caseChildConfiguration(childConfiguration);

+				if (result == null) result = caseConfiguration(childConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if (result == null) {

-				result = caseConfiguration(toolConfiguration);

+			case PaletteconfigurationPackage.DRAWER_CONFIGURATION: {

+				DrawerConfiguration drawerConfiguration = (DrawerConfiguration)theEObject;

+				T result = caseDrawerConfiguration(drawerConfiguration);

+				if (result == null) result = caseConfiguration(drawerConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if (result == null) {

-				result = defaultCase(theEObject);

+			case PaletteconfigurationPackage.CONFIGURATION: {

+				Configuration configuration = (Configuration)theEObject;

+				T result = caseConfiguration(configuration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			return result;

-		}

-		case PaletteconfigurationPackage.STACK_CONFIGURATION: {

-			StackConfiguration stackConfiguration = (StackConfiguration) theEObject;

-			T result = caseStackConfiguration(stackConfiguration);

-			if (result == null) {

-				result = caseChildConfiguration(stackConfiguration);

+			case PaletteconfigurationPackage.ICON_DESCRIPTOR: {

+				IconDescriptor iconDescriptor = (IconDescriptor)theEObject;

+				T result = caseIconDescriptor(iconDescriptor);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if (result == null) {

-				result = caseConfiguration(stackConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case PaletteconfigurationPackage.CHILD_CONFIGURATION: {

-			ChildConfiguration childConfiguration = (ChildConfiguration) theEObject;

-			T result = caseChildConfiguration(childConfiguration);

-			if (result == null) {

-				result = caseConfiguration(childConfiguration);

+			case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR: {

+				ElementDescriptor elementDescriptor = (ElementDescriptor)theEObject;

+				T result = caseElementDescriptor(elementDescriptor);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if (result == null) {

-				result = defaultCase(theEObject);

+			case PaletteconfigurationPackage.SEPARATOR_CONFIGURATION: {

+				SeparatorConfiguration separatorConfiguration = (SeparatorConfiguration)theEObject;

+				T result = caseSeparatorConfiguration(separatorConfiguration);

+				if (result == null) result = caseLeafConfiguration(separatorConfiguration);

+				if (result == null) result = caseChildConfiguration(separatorConfiguration);

+				if (result == null) result = caseConfiguration(separatorConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			return result;

-		}

-		case PaletteconfigurationPackage.DRAWER_CONFIGURATION: {

-			DrawerConfiguration drawerConfiguration = (DrawerConfiguration) theEObject;

-			T result = caseDrawerConfiguration(drawerConfiguration);

-			if (result == null) {

-				result = caseConfiguration(drawerConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case PaletteconfigurationPackage.CONFIGURATION: {

-			Configuration configuration = (Configuration) theEObject;

-			T result = caseConfiguration(configuration);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case PaletteconfigurationPackage.ICON_DESCRIPTOR: {

-			IconDescriptor iconDescriptor = (IconDescriptor) theEObject;

-			T result = caseIconDescriptor(iconDescriptor);

-			if (result == null) {

-				result = defaultCase(theEObject);

+			case PaletteconfigurationPackage.LEAF_CONFIGURATION: {

+				LeafConfiguration leafConfiguration = (LeafConfiguration)theEObject;

+				T result = caseLeafConfiguration(leafConfiguration);

+				if (result == null) result = caseChildConfiguration(leafConfiguration);

+				if (result == null) result = caseConfiguration(leafConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			return result;

-		}

-		case PaletteconfigurationPackage.ELEMENT_DESCRIPTOR: {

-			ElementDescriptor elementDescriptor = (ElementDescriptor) theEObject;

-			T result = caseElementDescriptor(elementDescriptor);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case PaletteconfigurationPackage.SEPARATOR_CONFIGURATION: {

-			SeparatorConfiguration separatorConfiguration = (SeparatorConfiguration) theEObject;

-			T result = caseSeparatorConfiguration(separatorConfiguration);

-			if (result == null) {

-				result = caseLeafConfiguration(separatorConfiguration);

-			}

-			if (result == null) {

-				result = caseChildConfiguration(separatorConfiguration);

-			}

-			if (result == null) {

-				result = caseConfiguration(separatorConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case PaletteconfigurationPackage.LEAF_CONFIGURATION: {

-			LeafConfiguration leafConfiguration = (LeafConfiguration) theEObject;

-			T result = caseLeafConfiguration(leafConfiguration);

-			if (result == null) {

-				result = caseChildConfiguration(leafConfiguration);

-			}

-			if (result == null) {

-				result = caseConfiguration(leafConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

+			default: return defaultCase(theEObject);

 		}

 	}

 

@@ -212,9 +159,7 @@ public class PaletteconfigurationSwitch<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>Palette Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -229,9 +174,7 @@ public class PaletteconfigurationSwitch<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>Tool Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -246,9 +189,7 @@ public class PaletteconfigurationSwitch<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>Stack Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -263,9 +204,7 @@ public class PaletteconfigurationSwitch<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>Child Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -280,9 +219,7 @@ public class PaletteconfigurationSwitch<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>Drawer Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -297,9 +234,7 @@ public class PaletteconfigurationSwitch<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>Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -314,9 +249,7 @@ public class PaletteconfigurationSwitch<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>Icon Descriptor</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -331,9 +264,7 @@ public class PaletteconfigurationSwitch<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>Element Descriptor</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -348,9 +279,7 @@ public class PaletteconfigurationSwitch<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>Separator Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -365,9 +294,7 @@ public class PaletteconfigurationSwitch<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>Leaf Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -382,9 +309,7 @@ public class PaletteconfigurationSwitch<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

@@ -394,4 +319,4 @@ public class PaletteconfigurationSwitch<T> extends Switch<T> {
 		return null;

 	}

 

-} // PaletteconfigurationSwitch

+} //PaletteconfigurationSwitch

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationXMLProcessor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationXMLProcessor.java
index c9585ef5354..31f7948a539 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationXMLProcessor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationXMLProcessor.java
@@ -1,23 +1,31 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.util;

 

 import java.util.Map;

 

 import org.eclipse.emf.ecore.EPackage;

+

 import org.eclipse.emf.ecore.resource.Resource;

+

 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

 

 /**

  * This class contains helper methods to serialize and deserialize XML documents

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class PaletteconfigurationXMLProcessor extends XMLProcessor {

@@ -26,19 +34,17 @@ public class PaletteconfigurationXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public PaletteconfigurationXMLProcessor() {

 		super((EPackage.Registry.INSTANCE));

 		PaletteconfigurationPackage.eINSTANCE.eClass();

 	}

-

+	

 	/**

 	 * Register for "*" and "xml" file extensions the PaletteconfigurationResourceFactoryImpl factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -51,4 +57,4 @@ public class PaletteconfigurationXMLProcessor extends XMLProcessor {
 		return registrations;

 	}

 

-} // PaletteconfigurationXMLProcessor

+} //PaletteconfigurationXMLProcessor

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomStateResizeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomStateResizeCommand.java
index 72caba82472..e5d51db736f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomStateResizeCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomStateResizeCommand.java
@@ -28,6 +28,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationFactory;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomStateEditPart;
 import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
 
 public class CustomStateResizeCommand extends AbstractTransactionalCommand {
@@ -61,7 +62,8 @@ public class CustomStateResizeCommand extends AbstractTransactionalCommand {
 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
 		View state = (View) adaptable.getAdapter(View.class);
 		View stateLabel = (View) state.getChildren().get(0);
-		View stateCompartment = (View) state.getChildren().get(1);
+		View stateCompartment = CustomStateEditPart.getStateCompartmentView(state);
+
 		// a bunch of initializations
 		int direction = request.getResizeDirection();
 		int dx = request.getSizeDelta().width;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPart.java
index 922afc79146..195da33523f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateCompartmentEditPart.java
@@ -23,12 +23,10 @@ public class CustomStateCompartmentEditPart extends StateCompartmentEditPart {
 
 	public CustomStateCompartmentEditPart(View view) {
 		super(view);
-		// TODO Auto-generated constructor stub
 	}
 
 	@Override
 	protected void createDefaultEditPolicies() {
-		// TODO Auto-generated method stub
 		super.createDefaultEditPolicies();
 		removeEditPolicy(EditPolicyRoles.CONNECTION_HANDLES_ROLE);
 		removeEditPolicy(EditPolicyRoles.POPUPBAR_ROLE);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateEditPart.java
index 30416c04930..78133c9bfdf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateEditPart.java
@@ -13,6 +13,7 @@ package org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part;
 
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart;
 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart;
 
 public class CustomStateEditPart extends StateEditPart {
@@ -23,7 +24,6 @@ public class CustomStateEditPart extends StateEditPart {
 
 	@Override
 	protected void createDefaultEditPolicies() {
-		// TODO Auto-generated method stub
 		super.createDefaultEditPolicies();
 		removeEditPolicy(EditPolicyRoles.CONNECTION_HANDLES_ROLE);
 		removeEditPolicy(EditPolicyRoles.POPUPBAR_ROLE);
@@ -49,4 +49,23 @@ public class CustomStateEditPart extends StateEditPart {
 	protected int getDefaultCornerWidth() {
 		return 20;
 	}
+
+	/**
+	 * obtain the state compartment view when the view of the state is given.
+	 * 
+	 * @param stateView
+	 *            the view of the state
+	 * @return the view representing the state compartment
+	 */
+	public static View getStateCompartmentView(View stateView) {
+		for (Object viewObj : stateView.getChildren()) {
+			if (viewObj instanceof View) {
+				View view = (View) viewObj;
+				if (view.getType().equals("" + StateCompartmentEditPart.VISUAL_ID)) { //$NON-NLS-1$
+					return view;
+				}
+			}
+		}
+		return null;
+	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPart.java
index f95cc966d2c..41820f6d86f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomStateNameEditPart.java
@@ -82,9 +82,9 @@ public class CustomStateNameEditPart extends StateNameEditPart {
 		if (stateView == null) {
 			return;
 		}
-		View stateCompartView = (View) stateView.getChildren().get(1);
+		View stateCompartmentView = CustomStateEditPart.getStateCompartmentView(stateView);
 
-		if (stateCompartView.getChildren().isEmpty()) {
+		if (stateCompartmentView.getChildren().isEmpty()) {
 			stateFigure.getStateCompartmentFigure().setVisible(false);
 		} else {
 			stateFigure.getStateCompartmentFigure().setVisible(true);
@@ -103,7 +103,7 @@ public class CustomStateNameEditPart extends StateNameEditPart {
 		// AutomaticCompartmentLayoutManager add extra space on top of the first label which would not be accounted for
 		// when adding the space for the labels.
 		int height = 0;
-		if (stateCompartView.isVisible() && (stateFigure.getStateCompartmentFigure() != null)) {
+		if (stateCompartmentView.isVisible() && (stateFigure.getStateCompartmentFigure() != null)) {
 			stateFigure.validate(); // validate the figure, assure that layout manager is called.
 			height = stateFigure.getStateCompartmentFigure().getBounds().y - stateFigure.getBounds().y + 1;
 			// Sanity check
@@ -118,7 +118,7 @@ public class CustomStateNameEditPart extends StateNameEditPart {
 		int stateHeight = Zone.getHeight(stateView);
 		int stateWidth = Zone.getWidth(stateView);
 
-		int stateCompartHeight = Zone.getHeight(stateCompartView);
+		int stateCompartHeight = Zone.getHeight(stateCompartmentView);
 		if (stateCompartHeight == 0) {
 			// stateCompartHeight is 0 after creation, get height from figure
 			// stateCompartHeight = stateFigure.getStateCompartmentFigure().getBounds().height;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCreationEditPolicy.java
index aadbdcd527d..2ac093506be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCreationEditPolicy.java
@@ -38,6 +38,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
 import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomFirstRegionInCompositeStateCreateElementCommand;
 import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomVertexCreateElementCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomStateEditPart;
 import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.RegionEditPart;
 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateCompartmentEditPart;
@@ -68,7 +69,8 @@ public class CustomStateCreationEditPolicy extends CreationEditPolicy {
 						// starting point is the state node on
 						// which mouse was moving
 						View stateView = (View) getHost().getModel();
-						View stateCompartmentView = (View) stateView.getChildren().get(1);
+						View stateCompartmentView = CustomStateEditPart.getStateCompartmentView(stateView);
+
 						// get and adaptable for it, to pass on to commands
 						IAdaptable adaptableForStateCompartmentView = new SemanticAdapter(null, stateCompartmentView);
 						if (!stateCompartmentView.getChildren().isEmpty()) {
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath
index ed2585fb3f4..6a42377b56a 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="src" path="src-gen"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..9ca8e68231b 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

+org.eclipse.jdt.core.compiler.compliance=1.7

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

+org.eclipse.jdt.core.compiler.source=1.7

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
index 443b6677fc8..de506de562f 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
@@ -34,7 +34,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",

  org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0",

- org.eclipse.emf.edit.ui;bundle-version="2.11.0"

+ org.eclipse.emf.edit.ui;bundle-version="2.11.0",

+ org.eclipse.papyrus.infra.ui;bundle-version="1.1.0",

+ org.eclipse.core.expressions

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .,

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/plugin.xml b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/plugin.xml
index e3c2665ecba..13a9a9344e8 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/plugin.xml
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/plugin.xml
@@ -2358,5 +2358,49 @@
             model="resource/UMLEdges.creationmenumodel">
       </menuCreationModel>
    </extension>
-   
+   <extension
+      id="PapyrusQuickFormatHandler"
+      name="QuickFormatHandler"
+      point="org.eclipse.ui.handlers">
+   <handler
+         class="org.eclipse.papyrus.uml.modelexplorer.handler.UmlQuickFormatHandler"
+         commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingUpperCaseCommand">
+       <activeWhen>
+         <and>
+            <with
+                  variable="selection">
+               <test
+                     property="org.eclipse.papyrus.uml.modelexplorer.menu.quickformatpropertytester.isNameChangeable"
+                     value="true">
+               </test>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler 
+         class="org.eclipse.papyrus.uml.modelexplorer.handler.UmlQuickFormatHandler"
+         commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingLowerCaseCommand">
+       <activeWhen>
+         <and>
+            <with
+                  variable="selection">
+               <test
+                     property="org.eclipse.papyrus.uml.modelexplorer.menu.quickformatpropertytester.isNameChangeable"
+                     value="true">
+               </test>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+</extension>
+      <extension
+            point="org.eclipse.core.expressions.propertyTesters">
+         <propertyTester
+               class="org.eclipse.papyrus.uml.modelexplorer.handler.UmlNamePropertyTester"
+               id="org.eclipse.papyrus.uml.modelexplorer.menu.quickformatpropertytester"
+               namespace="org.eclipse.papyrus.uml.modelexplorer.menu.quickformatpropertytester"
+               properties="isNameChangeable"
+               type="org.eclipse.jface.viewers.IStructuredSelection">
+         </propertyTester>
+      </extension>
 </plugin>
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/actions/UmlNameNormalizationCommand.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/actions/UmlNameNormalizationCommand.java
new file mode 100644
index 00000000000..74b91feae36
--- /dev/null
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/actions/UmlNameNormalizationCommand.java
@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.modelexplorer.actions;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;
+import org.eclipse.uml2.uml.NamedElement;
+
+public class UmlNameNormalizationCommand extends NameNormalizationCommand{
+
+	public UmlNameNormalizationCommand(TransactionalEditingDomain domain, EObject source, String parameter){ 
+		super(domain,source,parameter);
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+	@Override
+	protected void doExecute() {
+		if(source instanceof NamedElement){
+			String name  = ((NamedElement)source).getName();
+			switch (parameter) {
+			case UPPERCASE_ACTION:
+				((NamedElement)source).setName(name.toUpperCase());
+				break;
+			case LOWERCASE_ACTION:
+				((NamedElement)source).setName(name.toLowerCase());
+				break;
+
+			default:
+				((NamedElement)source).setName(name.toUpperCase());
+				break;
+			}
+
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/actions/UmlQuickFormatAction.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/actions/UmlQuickFormatAction.java
new file mode 100644
index 00000000000..1cfdfe65b20
--- /dev/null
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/actions/UmlQuickFormatAction.java
@@ -0,0 +1,53 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST.

+ *

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.modelexplorer.actions;

+

+import java.util.List;

+

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.common.command.CompoundCommand;

+import org.eclipse.emf.common.command.UnexecutableCommand;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.papyrus.infra.ui.menu.AbstractEMFParametricOnSelectedElementsAction;

+import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;

+

+public class UmlQuickFormatAction extends AbstractEMFParametricOnSelectedElementsAction {

+

+	public UmlQuickFormatAction(String parameter , List<EObject> selectedElements) {

+		super(parameter, selectedElements);

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.uml.diagram.menu.actions.AbstractGraphicalParametricAction#getBuildedCommand()

+	 *

+	 * @return

+	 */

+	@Override

+	protected Command getBuildedCommand() {

+		CompoundCommand cc = new CompoundCommand(NameNormalizationCommand.NAME_ACTION);

+		for(EObject igEP : getSelection()){

+			final TransactionalEditingDomain domain = getEditingDomain();

+			UmlNameNormalizationCommand myCmd = new UmlNameNormalizationCommand(domain, igEP, parameter);

+			cc.append(myCmd);

+		}

+		

+		if (!cc.isEmpty() && cc.canExecute()) {

+			return cc;

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+	

+}

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/AbstractGenericCommandHandler.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/AbstractGenericCommandHandler.java
new file mode 100644
index 00000000000..c34acfd4298
--- /dev/null
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/AbstractGenericCommandHandler.java
@@ -0,0 +1,75 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.modelexplorer.handler;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.ui.menu.AbstractCommonCommandHandler;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.uml2.uml.NamedElement;
+
+/**
+ * This abstract command handler: - calculates the current selection -
+ * calculates the visibility and enablement based on command executability -
+ * executes the command in Papyrus command stack
+ *
+ */
+public abstract class AbstractGenericCommandHandler extends AbstractCommonCommandHandler {
+
+	protected abstract Command getCommand(ExecutionEvent event);
+
+	/**
+	 * Iterate over current selection and build a list of the {@link EObject} contained in the selection.
+	 *
+	 * @return the currently selected {@link EObject}
+	 */
+	protected List<EObject> getSelectedElements() {
+		List<EObject> result = new LinkedList<EObject>();
+		for (Object element : getSelection()) {
+			EObject elementi = EMFHelper.getEObject(element) ;
+			if(elementi instanceof NamedElement){
+				result.add( elementi);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return null
+	 * @throws ExecutionException
+	 */
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		try {
+			ISelection selection = HandlerUtil.getCurrentSelection(event);
+			this.selection = (selection instanceof IStructuredSelection) ? ((IStructuredSelection) selection).toList() : Collections.EMPTY_LIST;
+			getEditingDomain(event).getCommandStack().execute(getCommand(event));
+		} finally {
+			// clear the selection
+			this.selection = Collections.EMPTY_LIST;
+		}
+
+		return null;
+	}
+}
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/UmlNamePropertyTester.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/UmlNamePropertyTester.java
new file mode 100644
index 00000000000..8de5e6b8114
--- /dev/null
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/UmlNamePropertyTester.java
@@ -0,0 +1,47 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.modelexplorer.handler;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

+import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;

+import org.eclipse.uml2.uml.NamedElement;

+

+

+public class UmlNamePropertyTester extends NamePropertyTester {

+

+	/**

+	 * @see org.eclipse.papyrus.infra.ui.menu.NamePropertyTester#isNameChangeable(org.eclipse.jface.viewers.IStructuredSelection)

+	 *

+	 * @param selection

+	 * @return

+	 */

+	@Override

+	protected boolean isNameChangeable(IStructuredSelection selection) {

+		boolean atLeastOne=false;

+		if (!selection.isEmpty()) {

+			Iterator<?> iter = selection.iterator();

+			while (iter.hasNext()) {

+				EObject object = EMFHelper.getEObject(iter.next());

+				if (object instanceof NamedElement) {

+					atLeastOne  =true;

+					break;

+				}

+			}

+		}

+		return atLeastOne;

+	}

+

+}

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/UmlQuickFormatHandler.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/UmlQuickFormatHandler.java
new file mode 100644
index 00000000000..e983ba385a9
--- /dev/null
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/UmlQuickFormatHandler.java
@@ -0,0 +1,63 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST.

+ *

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.modelexplorer.handler;

+

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.common.command.UnexecutableCommand;

+import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;

+import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;

+import org.eclipse.papyrus.uml.modelexplorer.actions.UmlQuickFormatAction;

+

+/**

+ * The handler for the {@link UmlQuickFormatAction}

+ *

+ */

+public class UmlQuickFormatHandler extends AbstractGenericCommandHandler {

+

+	/**

+	 *

+	 * Constructor.

+	 */

+	public UmlQuickFormatHandler() {

+		super();

+	}

+	

+	/**

+	 * @see org.eclipse.papyrus.uml.modelexplorer.handler.AbstractGenericCommandHandler#getCommand(org.eclipse.core.commands.ExecutionEvent)

+	 *

+	 * @param event

+	 * @return

+	 */

+	@Override

+	protected Command getCommand(ExecutionEvent event) {

+		String parameter = event.getParameter(NamePropertyTester.PARAMETER_ID);

+		

+		UmlQuickFormatAction action = new UmlQuickFormatAction(parameter,getSelectedElements());

+		setBaseEnabled(action.isEnabled());

+		if (action.isEnabled()) {

+			return action.getCommand();

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+	@Override

+	public void setEnabled(Object evaluationContext) {

+		UmlQuickFormatAction action = new UmlQuickFormatAction(NameNormalizationCommand.DEFAULT_ACTION, getSelectedElements());

+		setBaseEnabled(action.isEnabled());

+	}

+

+

+	

+

+}

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/xmlElementHandlers.xml b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/xmlElementHandlers.xml
deleted file mode 100644
index 1e2d4ff5d6c..00000000000
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/xmlElementHandlers.xml
+++ /dev/null
@@ -1,1791 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-<!-- Creation command declarations -->
-<extension point="org.eclipse.ui.commands">
-	<!-- Creation command for Abstraction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.AbstractionHandler" description="Create a new Abstraction" id="org.eclipse.papyrus.uml.modelexplorer.AbstractionCreateCommand" name="Create a new Abstraction">
-	</command>
-	
-	<!-- Creation command for AcceptCallAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.AcceptCallActionHandler" description="Create a new AcceptCallAction" id="org.eclipse.papyrus.uml.modelexplorer.AcceptCallActionCreateCommand" name="Create a new AcceptCallAction">
-	</command>
-	
-	<!-- Creation command for AcceptEventAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.AcceptEventActionHandler" description="Create a new AcceptEventAction" id="org.eclipse.papyrus.uml.modelexplorer.AcceptEventActionCreateCommand" name="Create a new AcceptEventAction">
-	</command>
-	
-	<!-- Creation command for ActionExecutionSpecification -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ActionExecutionSpecificationHandler" description="Create a new ActionExecutionSpecification" id="org.eclipse.papyrus.uml.modelexplorer.ActionExecutionSpecificationCreateCommand" name="Create a new ActionExecutionSpecification">
-	</command>
-	
-	<!-- Creation command for ActionInputPin -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ActionInputPinHandler" description="Create a new ActionInputPin" id="org.eclipse.papyrus.uml.modelexplorer.ActionInputPinCreateCommand" name="Create a new ActionInputPin">
-	</command>
-	
-	<!-- Creation command for Activity -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ActivityHandler" description="Create a new Activity" id="org.eclipse.papyrus.uml.modelexplorer.ActivityCreateCommand" name="Create a new Activity">
-	</command>
-	
-	<!-- Creation command for ActivityFinalNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ActivityFinalNodeHandler" description="Create a new ActivityFinalNode" id="org.eclipse.papyrus.uml.modelexplorer.ActivityFinalNodeCreateCommand" name="Create a new ActivityFinalNode">
-	</command>
-	
-	<!-- Creation command for ActivityParameterNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ActivityParameterNodeHandler" description="Create a new ActivityParameterNode" id="org.eclipse.papyrus.uml.modelexplorer.ActivityParameterNodeCreateCommand" name="Create a new ActivityParameterNode">
-	</command>
-	
-	<!-- Creation command for ActivityPartition -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ActivityPartitionHandler" description="Create a new ActivityPartition" id="org.eclipse.papyrus.uml.modelexplorer.ActivityPartitionCreateCommand" name="Create a new ActivityPartition">
-	</command>
-	
-	<!-- Creation command for Actor -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ActorHandler" description="Create a new Actor" id="org.eclipse.papyrus.uml.modelexplorer.ActorCreateCommand" name="Create a new Actor">
-	</command>
-	
-	<!-- Creation command for AddStructuralFeatureValueAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.AddStructuralFeatureValueActionHandler" description="Create a new AddStructuralFeatureValueAction" id="org.eclipse.papyrus.uml.modelexplorer.AddStructuralFeatureValueActionCreateCommand" name="Create a new AddStructuralFeatureValueAction">
-	</command>
-	
-	<!-- Creation command for AddVariableValueAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.AddVariableValueActionHandler" description="Create a new AddVariableValueAction" id="org.eclipse.papyrus.uml.modelexplorer.AddVariableValueActionCreateCommand" name="Create a new AddVariableValueAction">
-	</command>
-	
-	<!-- Creation command for AnyReceiveEvent -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.AnyReceiveEventHandler" description="Create a new AnyReceiveEvent" id="org.eclipse.papyrus.uml.modelexplorer.AnyReceiveEventCreateCommand" name="Create a new AnyReceiveEvent">
-	</command>
-	
-	<!-- Creation command for Artifact -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ArtifactHandler" description="Create a new Artifact" id="org.eclipse.papyrus.uml.modelexplorer.ArtifactCreateCommand" name="Create a new Artifact">
-	</command>
-	
-	<!-- Creation command for AssociationBase -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.AssociationBaseHandler" description="Create a new AssociationBase" id="org.eclipse.papyrus.uml.modelexplorer.AssociationBaseCreateCommand" name="Create a new AssociationBase">
-	</command>
-	
-	<!-- Creation command for AssociationClass -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.AssociationClassHandler" description="Create a new AssociationClass" id="org.eclipse.papyrus.uml.modelexplorer.AssociationClassCreateCommand" name="Create a new AssociationClass">
-	</command>
-	
-	<!-- Creation command for BehaviorExecutionSpecification -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.BehaviorExecutionSpecificationHandler" description="Create a new BehaviorExecutionSpecification" id="org.eclipse.papyrus.uml.modelexplorer.BehaviorExecutionSpecificationCreateCommand" name="Create a new BehaviorExecutionSpecification">
-	</command>
-	
-	<!-- Creation command for BroadcastSignalAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.BroadcastSignalActionHandler" description="Create a new BroadcastSignalAction" id="org.eclipse.papyrus.uml.modelexplorer.BroadcastSignalActionCreateCommand" name="Create a new BroadcastSignalAction">
-	</command>
-	
-	<!-- Creation command for CallBehaviorAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.CallBehaviorActionHandler" description="Create a new CallBehaviorAction" id="org.eclipse.papyrus.uml.modelexplorer.CallBehaviorActionCreateCommand" name="Create a new CallBehaviorAction">
-	</command>
-	
-	<!-- Creation command for CallEvent -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.CallEventHandler" description="Create a new CallEvent" id="org.eclipse.papyrus.uml.modelexplorer.CallEventCreateCommand" name="Create a new CallEvent">
-	</command>
-	
-	<!-- Creation command for CallOperationAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.CallOperationActionHandler" description="Create a new CallOperationAction" id="org.eclipse.papyrus.uml.modelexplorer.CallOperationActionCreateCommand" name="Create a new CallOperationAction">
-	</command>
-	
-	<!-- Creation command for CentralBufferNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.CentralBufferNodeHandler" description="Create a new CentralBufferNode" id="org.eclipse.papyrus.uml.modelexplorer.CentralBufferNodeCreateCommand" name="Create a new CentralBufferNode">
-	</command>
-	
-	<!-- Creation command for ChangeEvent -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ChangeEventHandler" description="Create a new ChangeEvent" id="org.eclipse.papyrus.uml.modelexplorer.ChangeEventCreateCommand" name="Create a new ChangeEvent">
-	</command>
-	
-	<!-- Creation command for Class -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ClassHandler" description="Create a new Class" id="org.eclipse.papyrus.uml.modelexplorer.ClassCreateCommand" name="Create a new Class">
-	</command>
-	
-	<!-- Creation command for ClassifierTemplateParameter -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ClassifierTemplateParameterHandler" description="Create a new ClassifierTemplateParameter" id="org.eclipse.papyrus.uml.modelexplorer.ClassifierTemplateParameterCreateCommand" name="Create a new ClassifierTemplateParameter">
-	</command>
-	
-	<!-- Creation command for Clause -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ClauseHandler" description="Create a new Clause" id="org.eclipse.papyrus.uml.modelexplorer.ClauseCreateCommand" name="Create a new Clause">
-	</command>
-	
-	<!-- Creation command for ClearAssociationAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ClearAssociationActionHandler" description="Create a new ClearAssociationAction" id="org.eclipse.papyrus.uml.modelexplorer.ClearAssociationActionCreateCommand" name="Create a new ClearAssociationAction">
-	</command>
-	
-	<!-- Creation command for ClearStructuralFeatureAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ClearStructuralFeatureActionHandler" description="Create a new ClearStructuralFeatureAction" id="org.eclipse.papyrus.uml.modelexplorer.ClearStructuralFeatureActionCreateCommand" name="Create a new ClearStructuralFeatureAction">
-	</command>
-	
-	<!-- Creation command for ClearVariableAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ClearVariableActionHandler" description="Create a new ClearVariableAction" id="org.eclipse.papyrus.uml.modelexplorer.ClearVariableActionCreateCommand" name="Create a new ClearVariableAction">
-	</command>
-	
-	<!-- Creation command for Collaboration -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.CollaborationHandler" description="Create a new Collaboration" id="org.eclipse.papyrus.uml.modelexplorer.CollaborationCreateCommand" name="Create a new Collaboration">
-	</command>
-	
-	<!-- Creation command for CollaborationUse -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.CollaborationUseHandler" description="Create a new CollaborationUse" id="org.eclipse.papyrus.uml.modelexplorer.CollaborationUseCreateCommand" name="Create a new CollaborationUse">
-	</command>
-	
-	<!-- Creation command for CombinedFragment -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.CombinedFragmentHandler" description="Create a new CombinedFragment" id="org.eclipse.papyrus.uml.modelexplorer.CombinedFragmentCreateCommand" name="Create a new CombinedFragment">
-	</command>
-	
-	<!-- Creation command for Comment -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.CommentHandler" description="Create a new Comment" id="org.eclipse.papyrus.uml.modelexplorer.CommentCreateCommand" name="Create a new Comment">
-	</command>
-	
-	<!-- Creation command for CommunicationPath -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.CommunicationPathHandler" description="Create a new CommunicationPath" id="org.eclipse.papyrus.uml.modelexplorer.CommunicationPathCreateCommand" name="Create a new CommunicationPath">
-	</command>
-	
-	<!-- Creation command for Component -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ComponentHandler" description="Create a new Component" id="org.eclipse.papyrus.uml.modelexplorer.ComponentCreateCommand" name="Create a new Component">
-	</command>
-	
-	<!-- Creation command for ComponentRealization -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ComponentRealizationHandler" description="Create a new ComponentRealization" id="org.eclipse.papyrus.uml.modelexplorer.ComponentRealizationCreateCommand" name="Create a new ComponentRealization">
-	</command>
-	
-	<!-- Creation command for ConditionalNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ConditionalNodeHandler" description="Create a new ConditionalNode" id="org.eclipse.papyrus.uml.modelexplorer.ConditionalNodeCreateCommand" name="Create a new ConditionalNode">
-	</command>
-	
-	<!-- Creation command for ConnectableElementTemplateParameter -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ConnectableElementTemplateParameterHandler" description="Create a new ConnectableElementTemplateParameter" id="org.eclipse.papyrus.uml.modelexplorer.ConnectableElementTemplateParameterCreateCommand" name="Create a new ConnectableElementTemplateParameter">
-	</command>
-	
-	<!-- Creation command for ConnectionPointReference -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ConnectionPointReferenceHandler" description="Create a new ConnectionPointReference" id="org.eclipse.papyrus.uml.modelexplorer.ConnectionPointReferenceCreateCommand" name="Create a new ConnectionPointReference">
-	</command>
-	
-	<!-- Creation command for Connector -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ConnectorHandler" description="Create a new Connector" id="org.eclipse.papyrus.uml.modelexplorer.ConnectorCreateCommand" name="Create a new Connector">
-	</command>
-	
-	<!-- Creation command for ConnectorEnd -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ConnectorEndHandler" description="Create a new ConnectorEnd" id="org.eclipse.papyrus.uml.modelexplorer.ConnectorEndCreateCommand" name="Create a new ConnectorEnd">
-	</command>
-	
-	<!-- Creation command for ConsiderIgnoreFragment -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ConsiderIgnoreFragmentHandler" description="Create a new ConsiderIgnoreFragment" id="org.eclipse.papyrus.uml.modelexplorer.ConsiderIgnoreFragmentCreateCommand" name="Create a new ConsiderIgnoreFragment">
-	</command>
-	
-	<!-- Creation command for Constraint -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ConstraintHandler" description="Create a new Constraint" id="org.eclipse.papyrus.uml.modelexplorer.ConstraintCreateCommand" name="Create a new Constraint">
-	</command>
-	
-	<!-- Creation command for Continuation -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ContinuationHandler" description="Create a new Continuation" id="org.eclipse.papyrus.uml.modelexplorer.ContinuationCreateCommand" name="Create a new Continuation">
-	</command>
-	
-	<!-- Creation command for ControlFlow -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ControlFlowHandler" description="Create a new ControlFlow" id="org.eclipse.papyrus.uml.modelexplorer.ControlFlowCreateCommand" name="Create a new ControlFlow">
-	</command>
-	
-	<!-- Creation command for CreateLinkAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.CreateLinkActionHandler" description="Create a new CreateLinkAction" id="org.eclipse.papyrus.uml.modelexplorer.CreateLinkActionCreateCommand" name="Create a new CreateLinkAction">
-	</command>
-	
-	<!-- Creation command for CreateLinkObjectAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.CreateLinkObjectActionHandler" description="Create a new CreateLinkObjectAction" id="org.eclipse.papyrus.uml.modelexplorer.CreateLinkObjectActionCreateCommand" name="Create a new CreateLinkObjectAction">
-	</command>
-	
-	<!-- Creation command for CreateObjectAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.CreateObjectActionHandler" description="Create a new CreateObjectAction" id="org.eclipse.papyrus.uml.modelexplorer.CreateObjectActionCreateCommand" name="Create a new CreateObjectAction">
-	</command>
-	
-	<!-- Creation command for DataStoreNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DataStoreNodeHandler" description="Create a new DataStoreNode" id="org.eclipse.papyrus.uml.modelexplorer.DataStoreNodeCreateCommand" name="Create a new DataStoreNode">
-	</command>
-	
-	<!-- Creation command for DataType -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DataTypeHandler" description="Create a new DataType" id="org.eclipse.papyrus.uml.modelexplorer.DataTypeCreateCommand" name="Create a new DataType">
-	</command>
-	
-	<!-- Creation command for DecisionNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DecisionNodeHandler" description="Create a new DecisionNode" id="org.eclipse.papyrus.uml.modelexplorer.DecisionNodeCreateCommand" name="Create a new DecisionNode">
-	</command>
-	
-	<!-- Creation command for Dependency -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DependencyHandler" description="Create a new Dependency" id="org.eclipse.papyrus.uml.modelexplorer.DependencyCreateCommand" name="Create a new Dependency">
-	</command>
-	
-	<!-- Creation command for Deployment -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DeploymentHandler" description="Create a new Deployment" id="org.eclipse.papyrus.uml.modelexplorer.DeploymentCreateCommand" name="Create a new Deployment">
-	</command>
-	
-	<!-- Creation command for DeploymentSpecification -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DeploymentSpecificationHandler" description="Create a new DeploymentSpecification" id="org.eclipse.papyrus.uml.modelexplorer.DeploymentSpecificationCreateCommand" name="Create a new DeploymentSpecification">
-	</command>
-	
-	<!-- Creation command for DestroyLinkAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DestroyLinkActionHandler" description="Create a new DestroyLinkAction" id="org.eclipse.papyrus.uml.modelexplorer.DestroyLinkActionCreateCommand" name="Create a new DestroyLinkAction">
-	</command>
-	
-	<!-- Creation command for DestroyObjectAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DestroyObjectActionHandler" description="Create a new DestroyObjectAction" id="org.eclipse.papyrus.uml.modelexplorer.DestroyObjectActionCreateCommand" name="Create a new DestroyObjectAction">
-	</command>
-	
-	<!-- Creation command for DestructionOccurrenceSpecification -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DestructionOccurrenceSpecificationHandler" description="Create a new DestructionOccurrenceSpecification" id="org.eclipse.papyrus.uml.modelexplorer.DestructionOccurrenceSpecificationCreateCommand" name="Create a new DestructionOccurrenceSpecification">
-	</command>
-	
-	<!-- Creation command for Device -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DeviceHandler" description="Create a new Device" id="org.eclipse.papyrus.uml.modelexplorer.DeviceCreateCommand" name="Create a new Device">
-	</command>
-	
-	<!-- Creation command for Duration -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DurationHandler" description="Create a new Duration" id="org.eclipse.papyrus.uml.modelexplorer.DurationCreateCommand" name="Create a new Duration">
-	</command>
-	
-	<!-- Creation command for DurationConstraint -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DurationConstraintHandler" description="Create a new DurationConstraint" id="org.eclipse.papyrus.uml.modelexplorer.DurationConstraintCreateCommand" name="Create a new DurationConstraint">
-	</command>
-	
-	<!-- Creation command for DurationInterval -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DurationIntervalHandler" description="Create a new DurationInterval" id="org.eclipse.papyrus.uml.modelexplorer.DurationIntervalCreateCommand" name="Create a new DurationInterval">
-	</command>
-	
-	<!-- Creation command for DurationObservation -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.DurationObservationHandler" description="Create a new DurationObservation" id="org.eclipse.papyrus.uml.modelexplorer.DurationObservationCreateCommand" name="Create a new DurationObservation">
-	</command>
-	
-	<!-- Creation command for ElementImport -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ElementImportHandler" description="Create a new ElementImport" id="org.eclipse.papyrus.uml.modelexplorer.ElementImportCreateCommand" name="Create a new ElementImport">
-	</command>
-	
-	<!-- Creation command for Enumeration -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.EnumerationHandler" description="Create a new Enumeration" id="org.eclipse.papyrus.uml.modelexplorer.EnumerationCreateCommand" name="Create a new Enumeration">
-	</command>
-	
-	<!-- Creation command for EnumerationLiteral -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.EnumerationLiteralHandler" description="Create a new EnumerationLiteral" id="org.eclipse.papyrus.uml.modelexplorer.EnumerationLiteralCreateCommand" name="Create a new EnumerationLiteral">
-	</command>
-	
-	<!-- Creation command for ExceptionHandler -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ExceptionHandlerHandler" description="Create a new ExceptionHandler" id="org.eclipse.papyrus.uml.modelexplorer.ExceptionHandlerCreateCommand" name="Create a new ExceptionHandler">
-	</command>
-	
-	<!-- Creation command for ExecutionEnvironment -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ExecutionEnvironmentHandler" description="Create a new ExecutionEnvironment" id="org.eclipse.papyrus.uml.modelexplorer.ExecutionEnvironmentCreateCommand" name="Create a new ExecutionEnvironment">
-	</command>
-	
-	<!-- Creation command for ExecutionOccurrenceSpecification -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ExecutionOccurrenceSpecificationHandler" description="Create a new ExecutionOccurrenceSpecification" id="org.eclipse.papyrus.uml.modelexplorer.ExecutionOccurrenceSpecificationCreateCommand" name="Create a new ExecutionOccurrenceSpecification">
-	</command>
-	
-	<!-- Creation command for ExpansionNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ExpansionNodeHandler" description="Create a new ExpansionNode" id="org.eclipse.papyrus.uml.modelexplorer.ExpansionNodeCreateCommand" name="Create a new ExpansionNode">
-	</command>
-	
-	<!-- Creation command for ExpansionRegion -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ExpansionRegionHandler" description="Create a new ExpansionRegion" id="org.eclipse.papyrus.uml.modelexplorer.ExpansionRegionCreateCommand" name="Create a new ExpansionRegion">
-	</command>
-	
-	<!-- Creation command for Expression -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ExpressionHandler" description="Create a new Expression" id="org.eclipse.papyrus.uml.modelexplorer.ExpressionCreateCommand" name="Create a new Expression">
-	</command>
-	
-	<!-- Creation command for Extend -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ExtendHandler" description="Create a new Extend" id="org.eclipse.papyrus.uml.modelexplorer.ExtendCreateCommand" name="Create a new Extend">
-	</command>
-	
-	<!-- Creation command for Extension -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ExtensionHandler" description="Create a new Extension" id="org.eclipse.papyrus.uml.modelexplorer.ExtensionCreateCommand" name="Create a new Extension">
-	</command>
-	
-	<!-- Creation command for ExtensionEnd -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ExtensionEndHandler" description="Create a new ExtensionEnd" id="org.eclipse.papyrus.uml.modelexplorer.ExtensionEndCreateCommand" name="Create a new ExtensionEnd">
-	</command>
-	
-	<!-- Creation command for ExtensionPoint -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ExtensionPointHandler" description="Create a new ExtensionPoint" id="org.eclipse.papyrus.uml.modelexplorer.ExtensionPointCreateCommand" name="Create a new ExtensionPoint">
-	</command>
-	
-	<!-- Creation command for FinalState -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.FinalStateHandler" description="Create a new FinalState" id="org.eclipse.papyrus.uml.modelexplorer.FinalStateCreateCommand" name="Create a new FinalState">
-	</command>
-	
-	<!-- Creation command for FlowFinalNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.FlowFinalNodeHandler" description="Create a new FlowFinalNode" id="org.eclipse.papyrus.uml.modelexplorer.FlowFinalNodeCreateCommand" name="Create a new FlowFinalNode">
-	</command>
-	
-	<!-- Creation command for ForkNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ForkNodeHandler" description="Create a new ForkNode" id="org.eclipse.papyrus.uml.modelexplorer.ForkNodeCreateCommand" name="Create a new ForkNode">
-	</command>
-	
-	<!-- Creation command for FunctionBehavior -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.FunctionBehaviorHandler" description="Create a new FunctionBehavior" id="org.eclipse.papyrus.uml.modelexplorer.FunctionBehaviorCreateCommand" name="Create a new FunctionBehavior">
-	</command>
-	
-	<!-- Creation command for Gate -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.GateHandler" description="Create a new Gate" id="org.eclipse.papyrus.uml.modelexplorer.GateCreateCommand" name="Create a new Gate">
-	</command>
-	
-	<!-- Creation command for GeneralOrdering -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.GeneralOrderingHandler" description="Create a new GeneralOrdering" id="org.eclipse.papyrus.uml.modelexplorer.GeneralOrderingCreateCommand" name="Create a new GeneralOrdering">
-	</command>
-	
-	<!-- Creation command for Generalization -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.GeneralizationHandler" description="Create a new Generalization" id="org.eclipse.papyrus.uml.modelexplorer.GeneralizationCreateCommand" name="Create a new Generalization">
-	</command>
-	
-	<!-- Creation command for GeneralizationSet -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.GeneralizationSetHandler" description="Create a new GeneralizationSet" id="org.eclipse.papyrus.uml.modelexplorer.GeneralizationSetCreateCommand" name="Create a new GeneralizationSet">
-	</command>
-	
-	<!-- Creation command for Image -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ImageHandler" description="Create a new Image" id="org.eclipse.papyrus.uml.modelexplorer.ImageCreateCommand" name="Create a new Image">
-	</command>
-	
-	<!-- Creation command for Include -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.IncludeHandler" description="Create a new Include" id="org.eclipse.papyrus.uml.modelexplorer.IncludeCreateCommand" name="Create a new Include">
-	</command>
-	
-	<!-- Creation command for InformationFlow -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.InformationFlowHandler" description="Create a new InformationFlow" id="org.eclipse.papyrus.uml.modelexplorer.InformationFlowCreateCommand" name="Create a new InformationFlow">
-	</command>
-	
-	<!-- Creation command for InformationItem -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.InformationItemHandler" description="Create a new InformationItem" id="org.eclipse.papyrus.uml.modelexplorer.InformationItemCreateCommand" name="Create a new InformationItem">
-	</command>
-	
-	<!-- Creation command for InitialNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.InitialNodeHandler" description="Create a new InitialNode" id="org.eclipse.papyrus.uml.modelexplorer.InitialNodeCreateCommand" name="Create a new InitialNode">
-	</command>
-	
-	<!-- Creation command for InputPin -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.InputPinHandler" description="Create a new InputPin" id="org.eclipse.papyrus.uml.modelexplorer.InputPinCreateCommand" name="Create a new InputPin">
-	</command>
-	
-	<!-- Creation command for InstanceSpecification -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.InstanceSpecificationHandler" description="Create a new InstanceSpecification" id="org.eclipse.papyrus.uml.modelexplorer.InstanceSpecificationCreateCommand" name="Create a new InstanceSpecification">
-	</command>
-	
-	<!-- Creation command for InstanceValue -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.InstanceValueHandler" description="Create a new InstanceValue" id="org.eclipse.papyrus.uml.modelexplorer.InstanceValueCreateCommand" name="Create a new InstanceValue">
-	</command>
-	
-	<!-- Creation command for Interaction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.InteractionHandler" description="Create a new Interaction" id="org.eclipse.papyrus.uml.modelexplorer.InteractionCreateCommand" name="Create a new Interaction">
-	</command>
-	
-	<!-- Creation command for InteractionConstraint -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.InteractionConstraintHandler" description="Create a new InteractionConstraint" id="org.eclipse.papyrus.uml.modelexplorer.InteractionConstraintCreateCommand" name="Create a new InteractionConstraint">
-	</command>
-	
-	<!-- Creation command for InteractionOperand -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.InteractionOperandHandler" description="Create a new InteractionOperand" id="org.eclipse.papyrus.uml.modelexplorer.InteractionOperandCreateCommand" name="Create a new InteractionOperand">
-	</command>
-	
-	<!-- Creation command for InteractionUse -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.InteractionUseHandler" description="Create a new InteractionUse" id="org.eclipse.papyrus.uml.modelexplorer.InteractionUseCreateCommand" name="Create a new InteractionUse">
-	</command>
-	
-	<!-- Creation command for Interface -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.InterfaceHandler" description="Create a new Interface" id="org.eclipse.papyrus.uml.modelexplorer.InterfaceCreateCommand" name="Create a new Interface">
-	</command>
-	
-	<!-- Creation command for InterfaceRealization -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.InterfaceRealizationHandler" description="Create a new InterfaceRealization" id="org.eclipse.papyrus.uml.modelexplorer.InterfaceRealizationCreateCommand" name="Create a new InterfaceRealization">
-	</command>
-	
-	<!-- Creation command for InterruptibleActivityRegion -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.InterruptibleActivityRegionHandler" description="Create a new InterruptibleActivityRegion" id="org.eclipse.papyrus.uml.modelexplorer.InterruptibleActivityRegionCreateCommand" name="Create a new InterruptibleActivityRegion">
-	</command>
-	
-	<!-- Creation command for Interval -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.IntervalHandler" description="Create a new Interval" id="org.eclipse.papyrus.uml.modelexplorer.IntervalCreateCommand" name="Create a new Interval">
-	</command>
-	
-	<!-- Creation command for IntervalConstraint -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.IntervalConstraintHandler" description="Create a new IntervalConstraint" id="org.eclipse.papyrus.uml.modelexplorer.IntervalConstraintCreateCommand" name="Create a new IntervalConstraint">
-	</command>
-	
-	<!-- Creation command for JoinNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.JoinNodeHandler" description="Create a new JoinNode" id="org.eclipse.papyrus.uml.modelexplorer.JoinNodeCreateCommand" name="Create a new JoinNode">
-	</command>
-	
-	<!-- Creation command for Lifeline -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.LifelineHandler" description="Create a new Lifeline" id="org.eclipse.papyrus.uml.modelexplorer.LifelineCreateCommand" name="Create a new Lifeline">
-	</command>
-	
-	<!-- Creation command for LinkEndCreationData -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.LinkEndCreationDataHandler" description="Create a new LinkEndCreationData" id="org.eclipse.papyrus.uml.modelexplorer.LinkEndCreationDataCreateCommand" name="Create a new LinkEndCreationData">
-	</command>
-	
-	<!-- Creation command for LinkEndData -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.LinkEndDataHandler" description="Create a new LinkEndData" id="org.eclipse.papyrus.uml.modelexplorer.LinkEndDataCreateCommand" name="Create a new LinkEndData">
-	</command>
-	
-	<!-- Creation command for LinkEndDestructionData -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.LinkEndDestructionDataHandler" description="Create a new LinkEndDestructionData" id="org.eclipse.papyrus.uml.modelexplorer.LinkEndDestructionDataCreateCommand" name="Create a new LinkEndDestructionData">
-	</command>
-	
-	<!-- Creation command for LiteralBoolean -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.LiteralBooleanHandler" description="Create a new LiteralBoolean" id="org.eclipse.papyrus.uml.modelexplorer.LiteralBooleanCreateCommand" name="Create a new LiteralBoolean">
-	</command>
-	
-	<!-- Creation command for LiteralInteger -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.LiteralIntegerHandler" description="Create a new LiteralInteger" id="org.eclipse.papyrus.uml.modelexplorer.LiteralIntegerCreateCommand" name="Create a new LiteralInteger">
-	</command>
-	
-	<!-- Creation command for LiteralNull -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.LiteralNullHandler" description="Create a new LiteralNull" id="org.eclipse.papyrus.uml.modelexplorer.LiteralNullCreateCommand" name="Create a new LiteralNull">
-	</command>
-	
-	<!-- Creation command for LiteralReal -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.LiteralRealHandler" description="Create a new LiteralReal" id="org.eclipse.papyrus.uml.modelexplorer.LiteralRealCreateCommand" name="Create a new LiteralReal">
-	</command>
-	
-	<!-- Creation command for LiteralString -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.LiteralStringHandler" description="Create a new LiteralString" id="org.eclipse.papyrus.uml.modelexplorer.LiteralStringCreateCommand" name="Create a new LiteralString">
-	</command>
-	
-	<!-- Creation command for LiteralUnlimitedNatural -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.LiteralUnlimitedNaturalHandler" description="Create a new LiteralUnlimitedNatural" id="org.eclipse.papyrus.uml.modelexplorer.LiteralUnlimitedNaturalCreateCommand" name="Create a new LiteralUnlimitedNatural">
-	</command>
-	
-	<!-- Creation command for LoopNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.LoopNodeHandler" description="Create a new LoopNode" id="org.eclipse.papyrus.uml.modelexplorer.LoopNodeCreateCommand" name="Create a new LoopNode">
-	</command>
-	
-	<!-- Creation command for Manifestation -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ManifestationHandler" description="Create a new Manifestation" id="org.eclipse.papyrus.uml.modelexplorer.ManifestationCreateCommand" name="Create a new Manifestation">
-	</command>
-	
-	<!-- Creation command for MergeNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.MergeNodeHandler" description="Create a new MergeNode" id="org.eclipse.papyrus.uml.modelexplorer.MergeNodeCreateCommand" name="Create a new MergeNode">
-	</command>
-	
-	<!-- Creation command for Message -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.MessageHandler" description="Create a new Message" id="org.eclipse.papyrus.uml.modelexplorer.MessageCreateCommand" name="Create a new Message">
-	</command>
-	
-	<!-- Creation command for MessageOccurrenceSpecification -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.MessageOccurrenceSpecificationHandler" description="Create a new MessageOccurrenceSpecification" id="org.eclipse.papyrus.uml.modelexplorer.MessageOccurrenceSpecificationCreateCommand" name="Create a new MessageOccurrenceSpecification">
-	</command>
-	
-	<!-- Creation command for Model -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ModelHandler" description="Create a new Model" id="org.eclipse.papyrus.uml.modelexplorer.ModelCreateCommand" name="Create a new Model">
-	</command>
-	
-	<!-- Creation command for Node -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.NodeHandler" description="Create a new Node" id="org.eclipse.papyrus.uml.modelexplorer.NodeCreateCommand" name="Create a new Node">
-	</command>
-	
-	<!-- Creation command for ObjectFlow -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ObjectFlowHandler" description="Create a new ObjectFlow" id="org.eclipse.papyrus.uml.modelexplorer.ObjectFlowCreateCommand" name="Create a new ObjectFlow">
-	</command>
-	
-	<!-- Creation command for OccurrenceSpecification -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.OccurrenceSpecificationHandler" description="Create a new OccurrenceSpecification" id="org.eclipse.papyrus.uml.modelexplorer.OccurrenceSpecificationCreateCommand" name="Create a new OccurrenceSpecification">
-	</command>
-	
-	<!-- Creation command for OpaqueAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.OpaqueActionHandler" description="Create a new OpaqueAction" id="org.eclipse.papyrus.uml.modelexplorer.OpaqueActionCreateCommand" name="Create a new OpaqueAction">
-	</command>
-	
-	<!-- Creation command for OpaqueBehavior -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.OpaqueBehaviorHandler" description="Create a new OpaqueBehavior" id="org.eclipse.papyrus.uml.modelexplorer.OpaqueBehaviorCreateCommand" name="Create a new OpaqueBehavior">
-	</command>
-	
-	<!-- Creation command for OpaqueExpression -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.OpaqueExpressionHandler" description="Create a new OpaqueExpression" id="org.eclipse.papyrus.uml.modelexplorer.OpaqueExpressionCreateCommand" name="Create a new OpaqueExpression">
-	</command>
-	
-	<!-- Creation command for Operation -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.OperationHandler" description="Create a new Operation" id="org.eclipse.papyrus.uml.modelexplorer.OperationCreateCommand" name="Create a new Operation">
-	</command>
-	
-	<!-- Creation command for OperationTemplateParameter -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.OperationTemplateParameterHandler" description="Create a new OperationTemplateParameter" id="org.eclipse.papyrus.uml.modelexplorer.OperationTemplateParameterCreateCommand" name="Create a new OperationTemplateParameter">
-	</command>
-	
-	<!-- Creation command for OutputPin -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.OutputPinHandler" description="Create a new OutputPin" id="org.eclipse.papyrus.uml.modelexplorer.OutputPinCreateCommand" name="Create a new OutputPin">
-	</command>
-	
-	<!-- Creation command for Package -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.PackageHandler" description="Create a new Package" id="org.eclipse.papyrus.uml.modelexplorer.PackageCreateCommand" name="Create a new Package">
-	</command>
-	
-	<!-- Creation command for PackageImport -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.PackageImportHandler" description="Create a new PackageImport" id="org.eclipse.papyrus.uml.modelexplorer.PackageImportCreateCommand" name="Create a new PackageImport">
-	</command>
-	
-	<!-- Creation command for PackageMerge -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.PackageMergeHandler" description="Create a new PackageMerge" id="org.eclipse.papyrus.uml.modelexplorer.PackageMergeCreateCommand" name="Create a new PackageMerge">
-	</command>
-	
-	<!-- Creation command for Parameter -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ParameterHandler" description="Create a new Parameter" id="org.eclipse.papyrus.uml.modelexplorer.ParameterCreateCommand" name="Create a new Parameter">
-	</command>
-	
-	<!-- Creation command for ParameterSet -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ParameterSetHandler" description="Create a new ParameterSet" id="org.eclipse.papyrus.uml.modelexplorer.ParameterSetCreateCommand" name="Create a new ParameterSet">
-	</command>
-	
-	<!-- Creation command for PartDecomposition -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.PartDecompositionHandler" description="Create a new PartDecomposition" id="org.eclipse.papyrus.uml.modelexplorer.PartDecompositionCreateCommand" name="Create a new PartDecomposition">
-	</command>
-	
-	<!-- Creation command for Pin -->

-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.PinHandler" description="Create a new Pin" id="org.eclipse.papyrus.uml.modelexplorer.PinCreateCommand" name="Create a new Pin">

-	</command>

-	

-	<!-- Creation command for Port -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.PortHandler" description="Create a new Port" id="org.eclipse.papyrus.uml.modelexplorer.PortCreateCommand" name="Create a new Port">
-	</command>
-	
-	<!-- Creation command for PrimitiveType -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.PrimitiveTypeHandler" description="Create a new PrimitiveType" id="org.eclipse.papyrus.uml.modelexplorer.PrimitiveTypeCreateCommand" name="Create a new PrimitiveType">
-	</command>
-	
-	<!-- Creation command for Profile -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ProfileHandler" description="Create a new Profile" id="org.eclipse.papyrus.uml.modelexplorer.ProfileCreateCommand" name="Create a new Profile">
-	</command>
-	
-	<!-- Creation command for ProfileApplication -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ProfileApplicationHandler" description="Create a new ProfileApplication" id="org.eclipse.papyrus.uml.modelexplorer.ProfileApplicationCreateCommand" name="Create a new ProfileApplication">
-	</command>
-	
-	<!-- Creation command for Property -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.PropertyHandler" description="Create a new Property" id="org.eclipse.papyrus.uml.modelexplorer.PropertyCreateCommand" name="Create a new Property">
-	</command>
-	
-	<!-- Creation command for ProtocolConformance -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ProtocolConformanceHandler" description="Create a new ProtocolConformance" id="org.eclipse.papyrus.uml.modelexplorer.ProtocolConformanceCreateCommand" name="Create a new ProtocolConformance">
-	</command>
-	
-	<!-- Creation command for ProtocolStateMachine -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ProtocolStateMachineHandler" description="Create a new ProtocolStateMachine" id="org.eclipse.papyrus.uml.modelexplorer.ProtocolStateMachineCreateCommand" name="Create a new ProtocolStateMachine">
-	</command>
-	
-	<!-- Creation command for ProtocolTransition -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ProtocolTransitionHandler" description="Create a new ProtocolTransition" id="org.eclipse.papyrus.uml.modelexplorer.ProtocolTransitionCreateCommand" name="Create a new ProtocolTransition">
-	</command>
-	
-	<!-- Creation command for Pseudostate -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.PseudostateHandler" description="Create a new Pseudostate" id="org.eclipse.papyrus.uml.modelexplorer.PseudostateCreateCommand" name="Create a new Pseudostate">
-	</command>
-	
-	<!-- Creation command for QualifierValue -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.QualifierValueHandler" description="Create a new QualifierValue" id="org.eclipse.papyrus.uml.modelexplorer.QualifierValueCreateCommand" name="Create a new QualifierValue">
-	</command>
-	
-	<!-- Creation command for RaiseExceptionAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.RaiseExceptionActionHandler" description="Create a new RaiseExceptionAction" id="org.eclipse.papyrus.uml.modelexplorer.RaiseExceptionActionCreateCommand" name="Create a new RaiseExceptionAction">
-	</command>
-	
-	<!-- Creation command for ReadExtentAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ReadExtentActionHandler" description="Create a new ReadExtentAction" id="org.eclipse.papyrus.uml.modelexplorer.ReadExtentActionCreateCommand" name="Create a new ReadExtentAction">
-	</command>
-	
-	<!-- Creation command for ReadIsClassifiedObjectAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ReadIsClassifiedObjectActionHandler" description="Create a new ReadIsClassifiedObjectAction" id="org.eclipse.papyrus.uml.modelexplorer.ReadIsClassifiedObjectActionCreateCommand" name="Create a new ReadIsClassifiedObjectAction">
-	</command>
-	
-	<!-- Creation command for ReadLinkAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ReadLinkActionHandler" description="Create a new ReadLinkAction" id="org.eclipse.papyrus.uml.modelexplorer.ReadLinkActionCreateCommand" name="Create a new ReadLinkAction">
-	</command>
-	
-	<!-- Creation command for ReadLinkObjectEndAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ReadLinkObjectEndActionHandler" description="Create a new ReadLinkObjectEndAction" id="org.eclipse.papyrus.uml.modelexplorer.ReadLinkObjectEndActionCreateCommand" name="Create a new ReadLinkObjectEndAction">
-	</command>
-	
-	<!-- Creation command for ReadLinkObjectEndQualifierAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ReadLinkObjectEndQualifierActionHandler" description="Create a new ReadLinkObjectEndQualifierAction" id="org.eclipse.papyrus.uml.modelexplorer.ReadLinkObjectEndQualifierActionCreateCommand" name="Create a new ReadLinkObjectEndQualifierAction">
-	</command>
-	
-	<!-- Creation command for ReadSelfAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ReadSelfActionHandler" description="Create a new ReadSelfAction" id="org.eclipse.papyrus.uml.modelexplorer.ReadSelfActionCreateCommand" name="Create a new ReadSelfAction">
-	</command>
-	
-	<!-- Creation command for ReadStructuralFeatureAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ReadStructuralFeatureActionHandler" description="Create a new ReadStructuralFeatureAction" id="org.eclipse.papyrus.uml.modelexplorer.ReadStructuralFeatureActionCreateCommand" name="Create a new ReadStructuralFeatureAction">
-	</command>
-	
-	<!-- Creation command for ReadVariableAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ReadVariableActionHandler" description="Create a new ReadVariableAction" id="org.eclipse.papyrus.uml.modelexplorer.ReadVariableActionCreateCommand" name="Create a new ReadVariableAction">
-	</command>
-	
-	<!-- Creation command for Realization -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.RealizationHandler" description="Create a new Realization" id="org.eclipse.papyrus.uml.modelexplorer.RealizationCreateCommand" name="Create a new Realization">
-	</command>
-	
-	<!-- Creation command for Reception -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ReceptionHandler" description="Create a new Reception" id="org.eclipse.papyrus.uml.modelexplorer.ReceptionCreateCommand" name="Create a new Reception">
-	</command>
-	
-	<!-- Creation command for ReclassifyObjectAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ReclassifyObjectActionHandler" description="Create a new ReclassifyObjectAction" id="org.eclipse.papyrus.uml.modelexplorer.ReclassifyObjectActionCreateCommand" name="Create a new ReclassifyObjectAction">
-	</command>
-	
-	<!-- Creation command for RedefinableTemplateSignature -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.RedefinableTemplateSignatureHandler" description="Create a new RedefinableTemplateSignature" id="org.eclipse.papyrus.uml.modelexplorer.RedefinableTemplateSignatureCreateCommand" name="Create a new RedefinableTemplateSignature">
-	</command>
-	
-	<!-- Creation command for ReduceAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ReduceActionHandler" description="Create a new ReduceAction" id="org.eclipse.papyrus.uml.modelexplorer.ReduceActionCreateCommand" name="Create a new ReduceAction">
-	</command>
-	
-	<!-- Creation command for Region -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.RegionHandler" description="Create a new Region" id="org.eclipse.papyrus.uml.modelexplorer.RegionCreateCommand" name="Create a new Region">
-	</command>
-	
-	<!-- Creation command for RemoveStructuralFeatureValueAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.RemoveStructuralFeatureValueActionHandler" description="Create a new RemoveStructuralFeatureValueAction" id="org.eclipse.papyrus.uml.modelexplorer.RemoveStructuralFeatureValueActionCreateCommand" name="Create a new RemoveStructuralFeatureValueAction">
-	</command>
-	
-	<!-- Creation command for RemoveVariableValueAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.RemoveVariableValueActionHandler" description="Create a new RemoveVariableValueAction" id="org.eclipse.papyrus.uml.modelexplorer.RemoveVariableValueActionCreateCommand" name="Create a new RemoveVariableValueAction">
-	</command>
-	
-	<!-- Creation command for ReplyAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ReplyActionHandler" description="Create a new ReplyAction" id="org.eclipse.papyrus.uml.modelexplorer.ReplyActionCreateCommand" name="Create a new ReplyAction">
-	</command>
-	
-	<!-- Creation command for SendObjectAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.SendObjectActionHandler" description="Create a new SendObjectAction" id="org.eclipse.papyrus.uml.modelexplorer.SendObjectActionCreateCommand" name="Create a new SendObjectAction">
-	</command>
-	
-	<!-- Creation command for SendSignalAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.SendSignalActionHandler" description="Create a new SendSignalAction" id="org.eclipse.papyrus.uml.modelexplorer.SendSignalActionCreateCommand" name="Create a new SendSignalAction">
-	</command>
-	
-	<!-- Creation command for SequenceNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.SequenceNodeHandler" description="Create a new SequenceNode" id="org.eclipse.papyrus.uml.modelexplorer.SequenceNodeCreateCommand" name="Create a new SequenceNode">
-	</command>
-	
-	<!-- Creation command for Signal -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.SignalHandler" description="Create a new Signal" id="org.eclipse.papyrus.uml.modelexplorer.SignalCreateCommand" name="Create a new Signal">
-	</command>
-	
-	<!-- Creation command for SignalEvent -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.SignalEventHandler" description="Create a new SignalEvent" id="org.eclipse.papyrus.uml.modelexplorer.SignalEventCreateCommand" name="Create a new SignalEvent">
-	</command>
-	
-	<!-- Creation command for Slot -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.SlotHandler" description="Create a new Slot" id="org.eclipse.papyrus.uml.modelexplorer.SlotCreateCommand" name="Create a new Slot">
-	</command>
-	
-	<!-- Creation command for StartClassifierBehaviorAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.StartClassifierBehaviorActionHandler" description="Create a new StartClassifierBehaviorAction" id="org.eclipse.papyrus.uml.modelexplorer.StartClassifierBehaviorActionCreateCommand" name="Create a new StartClassifierBehaviorAction">
-	</command>
-	
-	<!-- Creation command for StartObjectBehaviorAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.StartObjectBehaviorActionHandler" description="Create a new StartObjectBehaviorAction" id="org.eclipse.papyrus.uml.modelexplorer.StartObjectBehaviorActionCreateCommand" name="Create a new StartObjectBehaviorAction">
-	</command>
-	
-	<!-- Creation command for State -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.StateHandler" description="Create a new State" id="org.eclipse.papyrus.uml.modelexplorer.StateCreateCommand" name="Create a new State">
-	</command>
-	
-	<!-- Creation command for StateInvariant -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.StateInvariantHandler" description="Create a new StateInvariant" id="org.eclipse.papyrus.uml.modelexplorer.StateInvariantCreateCommand" name="Create a new StateInvariant">
-	</command>
-	
-	<!-- Creation command for StateMachine -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.StateMachineHandler" description="Create a new StateMachine" id="org.eclipse.papyrus.uml.modelexplorer.StateMachineCreateCommand" name="Create a new StateMachine">
-	</command>
-	
-	<!-- Creation command for Stereotype -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.StereotypeHandler" description="Create a new Stereotype" id="org.eclipse.papyrus.uml.modelexplorer.StereotypeCreateCommand" name="Create a new Stereotype">
-	</command>
-	
-	<!-- Creation command for StringExpression -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.StringExpressionHandler" description="Create a new StringExpression" id="org.eclipse.papyrus.uml.modelexplorer.StringExpressionCreateCommand" name="Create a new StringExpression">
-	</command>
-	
-	<!-- Creation command for StructuredActivityNode -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.StructuredActivityNodeHandler" description="Create a new StructuredActivityNode" id="org.eclipse.papyrus.uml.modelexplorer.StructuredActivityNodeCreateCommand" name="Create a new StructuredActivityNode">
-	</command>
-	
-	<!-- Creation command for Substitution -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.SubstitutionHandler" description="Create a new Substitution" id="org.eclipse.papyrus.uml.modelexplorer.SubstitutionCreateCommand" name="Create a new Substitution">
-	</command>
-	
-	<!-- Creation command for TemplateBinding -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.TemplateBindingHandler" description="Create a new TemplateBinding" id="org.eclipse.papyrus.uml.modelexplorer.TemplateBindingCreateCommand" name="Create a new TemplateBinding">
-	</command>
-	
-	<!-- Creation command for TemplateParameter -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.TemplateParameterHandler" description="Create a new TemplateParameter" id="org.eclipse.papyrus.uml.modelexplorer.TemplateParameterCreateCommand" name="Create a new TemplateParameter">
-	</command>
-	
-	<!-- Creation command for TemplateParameterSubstitution -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.TemplateParameterSubstitutionHandler" description="Create a new TemplateParameterSubstitution" id="org.eclipse.papyrus.uml.modelexplorer.TemplateParameterSubstitutionCreateCommand" name="Create a new TemplateParameterSubstitution">
-	</command>
-	
-	<!-- Creation command for TemplateSignature -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.TemplateSignatureHandler" description="Create a new TemplateSignature" id="org.eclipse.papyrus.uml.modelexplorer.TemplateSignatureCreateCommand" name="Create a new TemplateSignature">
-	</command>
-	
-	<!-- Creation command for TestIdentityAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.TestIdentityActionHandler" description="Create a new TestIdentityAction" id="org.eclipse.papyrus.uml.modelexplorer.TestIdentityActionCreateCommand" name="Create a new TestIdentityAction">
-	</command>
-	
-	<!-- Creation command for TimeConstraint -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.TimeConstraintHandler" description="Create a new TimeConstraint" id="org.eclipse.papyrus.uml.modelexplorer.TimeConstraintCreateCommand" name="Create a new TimeConstraint">
-	</command>
-	
-	<!-- Creation command for TimeEvent -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.TimeEventHandler" description="Create a new TimeEvent" id="org.eclipse.papyrus.uml.modelexplorer.TimeEventCreateCommand" name="Create a new TimeEvent">
-	</command>
-	
-	<!-- Creation command for TimeExpression -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.TimeExpressionHandler" description="Create a new TimeExpression" id="org.eclipse.papyrus.uml.modelexplorer.TimeExpressionCreateCommand" name="Create a new TimeExpression">
-	</command>
-	
-	<!-- Creation command for TimeInterval -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.TimeIntervalHandler" description="Create a new TimeInterval" id="org.eclipse.papyrus.uml.modelexplorer.TimeIntervalCreateCommand" name="Create a new TimeInterval">
-	</command>
-	
-	<!-- Creation command for TimeObservation -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.TimeObservationHandler" description="Create a new TimeObservation" id="org.eclipse.papyrus.uml.modelexplorer.TimeObservationCreateCommand" name="Create a new TimeObservation">
-	</command>
-	
-	<!-- Creation command for Transition -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.TransitionHandler" description="Create a new Transition" id="org.eclipse.papyrus.uml.modelexplorer.TransitionCreateCommand" name="Create a new Transition">
-	</command>
-	
-	<!-- Creation command for Trigger -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.TriggerHandler" description="Create a new Trigger" id="org.eclipse.papyrus.uml.modelexplorer.TriggerCreateCommand" name="Create a new Trigger">
-	</command>
-	
-	<!-- Creation command for UnmarshallAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.UnmarshallActionHandler" description="Create a new UnmarshallAction" id="org.eclipse.papyrus.uml.modelexplorer.UnmarshallActionCreateCommand" name="Create a new UnmarshallAction">
-	</command>
-	
-	<!-- Creation command for Usage -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.UsageHandler" description="Create a new Usage" id="org.eclipse.papyrus.uml.modelexplorer.UsageCreateCommand" name="Create a new Usage">
-	</command>
-	
-	<!-- Creation command for UseCase -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.UseCaseHandler" description="Create a new UseCase" id="org.eclipse.papyrus.uml.modelexplorer.UseCaseCreateCommand" name="Create a new UseCase">
-	</command>
-	
-	<!-- Creation command for ValuePin -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ValuePinHandler" description="Create a new ValuePin" id="org.eclipse.papyrus.uml.modelexplorer.ValuePinCreateCommand" name="Create a new ValuePin">
-	</command>
-	
-	<!-- Creation command for ValueSpecificationAction -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.ValueSpecificationActionHandler" description="Create a new ValueSpecificationAction" id="org.eclipse.papyrus.uml.modelexplorer.ValueSpecificationActionCreateCommand" name="Create a new ValueSpecificationAction">
-	</command>
-	
-	<!-- Creation command for Variable -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.VariableHandler" description="Create a new Variable" id="org.eclipse.papyrus.uml.modelexplorer.VariableCreateCommand" name="Create a new Variable">
-	</command>
-	
-	<!-- Creation command for Association -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.AssociationHandler" description="Create a new Association" id="org.eclipse.papyrus.uml.modelexplorer.AssociationCreateCommand" name="Create a new Association">
-	</command>
-	
-	<!-- Creation command for Trace -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.TraceHandler" description="Create a new Trace" id="org.eclipse.papyrus.uml.modelexplorer.TraceCreateCommand" name="Create a new Trace">
-	</command>
-	
-	<!-- Creation command for Refine -->
-	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.RefineHandler" description="Create a new Refine" id="org.eclipse.papyrus.uml.modelexplorer.RefineCreateCommand" name="Create a new Refine">
-	</command>
-	
-</extension>
-
-	
-<!-- UI Menu declaration for creation commands -->
-<extension point="org.eclipse.ui.menus">
-
-	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.createchild" allPopups="false">
-
-		<!-- Creation menu action for Abstraction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.AbstractionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" label="Create a new Abstraction" style="push" tooltip="Create a new Abstraction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for AcceptCallAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.AcceptCallActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AcceptCallAction.gif" label="Create a new AcceptCallAction" style="push" tooltip="Create a new AcceptCallAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for AcceptEventAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.AcceptEventActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AcceptEventAction.gif" label="Create a new AcceptEventAction" style="push" tooltip="Create a new AcceptEventAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ActionExecutionSpecification -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ActionExecutionSpecificationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActionExecutionSpecification.gif" label="Create a new ActionExecutionSpecification" style="push" tooltip="Create a new ActionExecutionSpecification">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ActionInputPin -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ActionInputPinCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActionInputPin.gif" label="Create a new ActionInputPin" style="push" tooltip="Create a new ActionInputPin">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Activity -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ActivityCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif" label="Create a new Activity" style="push" tooltip="Create a new Activity">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ActivityFinalNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ActivityFinalNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityFinalNode.gif" label="Create a new ActivityFinalNode" style="push" tooltip="Create a new ActivityFinalNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ActivityParameterNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ActivityParameterNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityParameterNode.gif" label="Create a new ActivityParameterNode" style="push" tooltip="Create a new ActivityParameterNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ActivityPartition -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ActivityPartitionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityPartition.gif" label="Create a new ActivityPartition" style="push" tooltip="Create a new ActivityPartition">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Actor -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ActorCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Actor.gif" label="Create a new Actor" style="push" tooltip="Create a new Actor">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for AddStructuralFeatureValueAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.AddStructuralFeatureValueActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddStructuralFeatureValueAction.gif" label="Create a new AddStructuralFeatureValueAction" style="push" tooltip="Create a new AddStructuralFeatureValueAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for AddVariableValueAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.AddVariableValueActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddVariableValueAction.gif" label="Create a new AddVariableValueAction" style="push" tooltip="Create a new AddVariableValueAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for AnyReceiveEvent -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.AnyReceiveEventCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AnyReceiveEvent.gif" label="Create a new AnyReceiveEvent" style="push" tooltip="Create a new AnyReceiveEvent">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Artifact -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ArtifactCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Artifact.gif" label="Create a new Artifact" style="push" tooltip="Create a new Artifact">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for AssociationBase -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.AssociationBaseCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" label="Create a new AssociationBase" style="push" tooltip="Create a new AssociationBase">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for AssociationClass -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.AssociationClassCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AssociationClass.gif" label="Create a new AssociationClass" style="push" tooltip="Create a new AssociationClass">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for BehaviorExecutionSpecification -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.BehaviorExecutionSpecificationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BehaviorExecutionSpecification.gif" label="Create a new BehaviorExecutionSpecification" style="push" tooltip="Create a new BehaviorExecutionSpecification">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for BroadcastSignalAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.BroadcastSignalActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BroadcastSignalAction.gif" label="Create a new BroadcastSignalAction" style="push" tooltip="Create a new BroadcastSignalAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for CallBehaviorAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.CallBehaviorActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif" label="Create a new CallBehaviorAction" style="push" tooltip="Create a new CallBehaviorAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for CallEvent -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.CallEventCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallEvent.gif" label="Create a new CallEvent" style="push" tooltip="Create a new CallEvent">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for CallOperationAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.CallOperationActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" label="Create a new CallOperationAction" style="push" tooltip="Create a new CallOperationAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for CentralBufferNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.CentralBufferNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CentralBufferNode.gif" label="Create a new CentralBufferNode" style="push" tooltip="Create a new CentralBufferNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ChangeEvent -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ChangeEventCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ChangeEvent.gif" label="Create a new ChangeEvent" style="push" tooltip="Create a new ChangeEvent">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Class -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ClassCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" label="Create a new Class" style="push" tooltip="Create a new Class">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ClassifierTemplateParameter -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ClassifierTemplateParameterCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClassifierTemplateParameter.gif" label="Create a new ClassifierTemplateParameter" style="push" tooltip="Create a new ClassifierTemplateParameter">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Clause -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ClauseCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Clause.gif" label="Create a new Clause" style="push" tooltip="Create a new Clause">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ClearAssociationAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ClearAssociationActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClearAssociationAction.gif" label="Create a new ClearAssociationAction" style="push" tooltip="Create a new ClearAssociationAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ClearStructuralFeatureAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ClearStructuralFeatureActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClearStructuralFeatureAction.gif" label="Create a new ClearStructuralFeatureAction" style="push" tooltip="Create a new ClearStructuralFeatureAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ClearVariableAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ClearVariableActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClearVariableAction.gif" label="Create a new ClearVariableAction" style="push" tooltip="Create a new ClearVariableAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Collaboration -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.CollaborationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif" label="Create a new Collaboration" style="push" tooltip="Create a new Collaboration">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for CollaborationUse -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.CollaborationUseCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif" label="Create a new CollaborationUse" style="push" tooltip="Create a new CollaborationUse">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for CombinedFragment -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.CombinedFragmentCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif" label="Create a new CombinedFragment" style="push" tooltip="Create a new CombinedFragment">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Comment -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.CommentCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif" label="Create a new Comment" style="push" tooltip="Create a new Comment">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for CommunicationPath -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.CommunicationPathCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CommunicationPath.gif" label="Create a new CommunicationPath" style="push" tooltip="Create a new CommunicationPath">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Component -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ComponentCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif" label="Create a new Component" style="push" tooltip="Create a new Component">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ComponentRealization -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ComponentRealizationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif" label="Create a new ComponentRealization" style="push" tooltip="Create a new ComponentRealization">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ConditionalNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ConditionalNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConditionalNode.gif" label="Create a new ConditionalNode" style="push" tooltip="Create a new ConditionalNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ConnectableElementTemplateParameter -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ConnectableElementTemplateParameterCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectableElementTemplateParameter.gif" label="Create a new ConnectableElementTemplateParameter" style="push" tooltip="Create a new ConnectableElementTemplateParameter">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ConnectionPointReference -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ConnectionPointReferenceCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectionPointReference.gif" label="Create a new ConnectionPointReference" style="push" tooltip="Create a new ConnectionPointReference">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Connector -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ConnectorCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif" label="Create a new Connector" style="push" tooltip="Create a new Connector">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ConnectorEnd -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ConnectorEndCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectorEnd.gif" label="Create a new ConnectorEnd" style="push" tooltip="Create a new ConnectorEnd">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ConsiderIgnoreFragment -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ConsiderIgnoreFragmentCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConsiderIgnoreFragment.gif" label="Create a new ConsiderIgnoreFragment" style="push" tooltip="Create a new ConsiderIgnoreFragment">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Constraint -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ConstraintCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" label="Create a new Constraint" style="push" tooltip="Create a new Constraint">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Continuation -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ContinuationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Continuation.gif" label="Create a new Continuation" style="push" tooltip="Create a new Continuation">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ControlFlow -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ControlFlowCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ControlFlow.gif" label="Create a new ControlFlow" style="push" tooltip="Create a new ControlFlow">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for CreateLinkAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.CreateLinkActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CreateLinkAction.gif" label="Create a new CreateLinkAction" style="push" tooltip="Create a new CreateLinkAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for CreateLinkObjectAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.CreateLinkObjectActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CreateLinkObjectAction.gif" label="Create a new CreateLinkObjectAction" style="push" tooltip="Create a new CreateLinkObjectAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for CreateObjectAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.CreateObjectActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CreateObjectAction.gif" label="Create a new CreateObjectAction" style="push" tooltip="Create a new CreateObjectAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for DataStoreNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DataStoreNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataStoreNode.gif" label="Create a new DataStoreNode" style="push" tooltip="Create a new DataStoreNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for DataType -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DataTypeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif" label="Create a new DataType" style="push" tooltip="Create a new DataType">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for DecisionNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DecisionNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DecisionNode.gif" label="Create a new DecisionNode" style="push" tooltip="Create a new DecisionNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Dependency -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DependencyCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif" label="Create a new Dependency" style="push" tooltip="Create a new Dependency">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Deployment -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DeploymentCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Deployment.gif" label="Create a new Deployment" style="push" tooltip="Create a new Deployment">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for DeploymentSpecification -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DeploymentSpecificationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DeploymentSpecification.gif" label="Create a new DeploymentSpecification" style="push" tooltip="Create a new DeploymentSpecification">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for DestroyLinkAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DestroyLinkActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestroyLinkAction.gif" label="Create a new DestroyLinkAction" style="push" tooltip="Create a new DestroyLinkAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for DestroyObjectAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DestroyObjectActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestroyObjectAction.gif" label="Create a new DestroyObjectAction" style="push" tooltip="Create a new DestroyObjectAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for DestructionOccurrenceSpecification -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DestructionOccurrenceSpecificationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestructionOccurrenceSpecification.gif" label="Create a new DestructionOccurrenceSpecification" style="push" tooltip="Create a new DestructionOccurrenceSpecification">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Device -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DeviceCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Device.gif" label="Create a new Device" style="push" tooltip="Create a new Device">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Duration -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DurationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Duration.gif" label="Create a new Duration" style="push" tooltip="Create a new Duration">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for DurationConstraint -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DurationConstraintCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif" label="Create a new DurationConstraint" style="push" tooltip="Create a new DurationConstraint">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for DurationInterval -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DurationIntervalCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationInterval.gif" label="Create a new DurationInterval" style="push" tooltip="Create a new DurationInterval">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for DurationObservation -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.DurationObservationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif" label="Create a new DurationObservation" style="push" tooltip="Create a new DurationObservation">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ElementImport -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ElementImportCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ElementImport.gif" label="Create a new ElementImport" style="push" tooltip="Create a new ElementImport">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Enumeration -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.EnumerationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif" label="Create a new Enumeration" style="push" tooltip="Create a new Enumeration">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for EnumerationLiteral -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.EnumerationLiteralCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif" label="Create a new EnumerationLiteral" style="push" tooltip="Create a new EnumerationLiteral">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ExceptionHandler -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ExceptionHandlerCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExceptionHandler.gif" label="Create a new ExceptionHandler" style="push" tooltip="Create a new ExceptionHandler">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ExecutionEnvironment -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ExecutionEnvironmentCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExecutionEnvironment.gif" label="Create a new ExecutionEnvironment" style="push" tooltip="Create a new ExecutionEnvironment">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ExecutionOccurrenceSpecification -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ExecutionOccurrenceSpecificationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExecutionOccurrenceSpecification.gif" label="Create a new ExecutionOccurrenceSpecification" style="push" tooltip="Create a new ExecutionOccurrenceSpecification">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ExpansionNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ExpansionNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionNode.gif" label="Create a new ExpansionNode" style="push" tooltip="Create a new ExpansionNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ExpansionRegion -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ExpansionRegionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionRegion.gif" label="Create a new ExpansionRegion" style="push" tooltip="Create a new ExpansionRegion">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Expression -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ExpressionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Expression.gif" label="Create a new Expression" style="push" tooltip="Create a new Expression">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Extend -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ExtendCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Extend.gif" label="Create a new Extend" style="push" tooltip="Create a new Extend">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Extension -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ExtensionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Extension.gif" label="Create a new Extension" style="push" tooltip="Create a new Extension">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ExtensionEnd -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ExtensionEndCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExtensionEnd.gif" label="Create a new ExtensionEnd" style="push" tooltip="Create a new ExtensionEnd">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ExtensionPoint -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ExtensionPointCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExtensionPoint.gif" label="Create a new ExtensionPoint" style="push" tooltip="Create a new ExtensionPoint">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for FinalState -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.FinalStateCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FinalState.gif" label="Create a new FinalState" style="push" tooltip="Create a new FinalState">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for FlowFinalNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.FlowFinalNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FlowFinalNode.gif" label="Create a new FlowFinalNode" style="push" tooltip="Create a new FlowFinalNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ForkNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ForkNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ForkNode.gif" label="Create a new ForkNode" style="push" tooltip="Create a new ForkNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for FunctionBehavior -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.FunctionBehaviorCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif" label="Create a new FunctionBehavior" style="push" tooltip="Create a new FunctionBehavior">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Gate -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.GateCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Gate.gif" label="Create a new Gate" style="push" tooltip="Create a new Gate">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for GeneralOrdering -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.GeneralOrderingCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif" label="Create a new GeneralOrdering" style="push" tooltip="Create a new GeneralOrdering">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Generalization -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.GeneralizationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif" label="Create a new Generalization" style="push" tooltip="Create a new Generalization">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for GeneralizationSet -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.GeneralizationSetCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralizationSet.gif" label="Create a new GeneralizationSet" style="push" tooltip="Create a new GeneralizationSet">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Image -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ImageCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Image.gif" label="Create a new Image" style="push" tooltip="Create a new Image">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Include -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.IncludeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Include.gif" label="Create a new Include" style="push" tooltip="Create a new Include">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for InformationFlow -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.InformationFlowCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif" label="Create a new InformationFlow" style="push" tooltip="Create a new InformationFlow">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for InformationItem -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.InformationItemCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif" label="Create a new InformationItem" style="push" tooltip="Create a new InformationItem">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for InitialNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.InitialNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InitialNode.gif" label="Create a new InitialNode" style="push" tooltip="Create a new InitialNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for InputPin -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.InputPinCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InputPin.gif" label="Create a new InputPin" style="push" tooltip="Create a new InputPin">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for InstanceSpecification -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.InstanceSpecificationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif" label="Create a new InstanceSpecification" style="push" tooltip="Create a new InstanceSpecification">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for InstanceValue -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.InstanceValueCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceValue.gif" label="Create a new InstanceValue" style="push" tooltip="Create a new InstanceValue">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Interaction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.InteractionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif" label="Create a new Interaction" style="push" tooltip="Create a new Interaction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for InteractionConstraint -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.InteractionConstraintCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionConstraint.gif" label="Create a new InteractionConstraint" style="push" tooltip="Create a new InteractionConstraint">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for InteractionOperand -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.InteractionOperandCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionOperand.gif" label="Create a new InteractionOperand" style="push" tooltip="Create a new InteractionOperand">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for InteractionUse -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.InteractionUseCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionUse.gif" label="Create a new InteractionUse" style="push" tooltip="Create a new InteractionUse">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Interface -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.InterfaceCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif" label="Create a new Interface" style="push" tooltip="Create a new Interface">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for InterfaceRealization -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.InterfaceRealizationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif" label="Create a new InterfaceRealization" style="push" tooltip="Create a new InterfaceRealization">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for InterruptibleActivityRegion -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.InterruptibleActivityRegionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterruptibleActivityRegion.gif" label="Create a new InterruptibleActivityRegion" style="push" tooltip="Create a new InterruptibleActivityRegion">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Interval -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.IntervalCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interval.gif" label="Create a new Interval" style="push" tooltip="Create a new Interval">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for IntervalConstraint -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.IntervalConstraintCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/IntervalConstraint.gif" label="Create a new IntervalConstraint" style="push" tooltip="Create a new IntervalConstraint">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for JoinNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.JoinNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/JoinNode.gif" label="Create a new JoinNode" style="push" tooltip="Create a new JoinNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Lifeline -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.LifelineCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Lifeline.gif" label="Create a new Lifeline" style="push" tooltip="Create a new Lifeline">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for LinkEndCreationData -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.LinkEndCreationDataCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LinkEndCreationData.gif" label="Create a new LinkEndCreationData" style="push" tooltip="Create a new LinkEndCreationData">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for LinkEndData -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.LinkEndDataCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LinkEndData.gif" label="Create a new LinkEndData" style="push" tooltip="Create a new LinkEndData">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for LinkEndDestructionData -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.LinkEndDestructionDataCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LinkEndDestructionData.gif" label="Create a new LinkEndDestructionData" style="push" tooltip="Create a new LinkEndDestructionData">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for LiteralBoolean -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.LiteralBooleanCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LiteralBoolean.gif" label="Create a new LiteralBoolean" style="push" tooltip="Create a new LiteralBoolean">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for LiteralInteger -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.LiteralIntegerCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LiteralInteger.gif" label="Create a new LiteralInteger" style="push" tooltip="Create a new LiteralInteger">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for LiteralNull -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.LiteralNullCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LiteralNull.gif" label="Create a new LiteralNull" style="push" tooltip="Create a new LiteralNull">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for LiteralReal -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.LiteralRealCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LiteralReal.gif" label="Create a new LiteralReal" style="push" tooltip="Create a new LiteralReal">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for LiteralString -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.LiteralStringCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LiteralString.gif" label="Create a new LiteralString" style="push" tooltip="Create a new LiteralString">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for LiteralUnlimitedNatural -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.LiteralUnlimitedNaturalCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LiteralUnlimitedNatural.gif" label="Create a new LiteralUnlimitedNatural" style="push" tooltip="Create a new LiteralUnlimitedNatural">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for LoopNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.LoopNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LoopNode.gif" label="Create a new LoopNode" style="push" tooltip="Create a new LoopNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Manifestation -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ManifestationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif" label="Create a new Manifestation" style="push" tooltip="Create a new Manifestation">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for MergeNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.MergeNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/MergeNode.gif" label="Create a new MergeNode" style="push" tooltip="Create a new MergeNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Message -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.MessageCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message.gif" label="Create a new Message" style="push" tooltip="Create a new Message">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for MessageOccurrenceSpecification -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.MessageOccurrenceSpecificationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/MessageOccurrenceSpecification.gif" label="Create a new MessageOccurrenceSpecification" style="push" tooltip="Create a new MessageOccurrenceSpecification">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Model -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ModelCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif" label="Create a new Model" style="push" tooltip="Create a new Model">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Node -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.NodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Node.gif" label="Create a new Node" style="push" tooltip="Create a new Node">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ObjectFlow -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ObjectFlowCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ObjectFlow.gif" label="Create a new ObjectFlow" style="push" tooltip="Create a new ObjectFlow">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for OccurrenceSpecification -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.OccurrenceSpecificationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OccurrenceSpecification.gif" label="Create a new OccurrenceSpecification" style="push" tooltip="Create a new OccurrenceSpecification">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for OpaqueAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.OpaqueActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueAction.gif" label="Create a new OpaqueAction" style="push" tooltip="Create a new OpaqueAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for OpaqueBehavior -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.OpaqueBehaviorCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif" label="Create a new OpaqueBehavior" style="push" tooltip="Create a new OpaqueBehavior">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for OpaqueExpression -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.OpaqueExpressionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueExpression.gif" label="Create a new OpaqueExpression" style="push" tooltip="Create a new OpaqueExpression">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Operation -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.OperationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif" label="Create a new Operation" style="push" tooltip="Create a new Operation">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for OperationTemplateParameter -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.OperationTemplateParameterCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OperationTemplateParameter.gif" label="Create a new OperationTemplateParameter" style="push" tooltip="Create a new OperationTemplateParameter">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for OutputPin -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.OutputPinCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OutputPin.gif" label="Create a new OutputPin" style="push" tooltip="Create a new OutputPin">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Package -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.PackageCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif" label="Create a new Package" style="push" tooltip="Create a new Package">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for PackageImport -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.PackageImportCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif" label="Create a new PackageImport" style="push" tooltip="Create a new PackageImport">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for PackageMerge -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.PackageMergeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif" label="Create a new PackageMerge" style="push" tooltip="Create a new PackageMerge">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Parameter -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ParameterCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif" label="Create a new Parameter" style="push" tooltip="Create a new Parameter">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ParameterSet -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ParameterSetCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ParameterSet.gif" label="Create a new ParameterSet" style="push" tooltip="Create a new ParameterSet">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for PartDecomposition -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.PartDecompositionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PartDecomposition.gif" label="Create a new PartDecomposition" style="push" tooltip="Create a new PartDecomposition">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Pin -->

-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.PinCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pin.gif" label="Create a new Pin" style="push" tooltip="Create a new Pin">

-			<visibleWhen checkEnabled="true"/>

-		</command>

-		

-		<!-- Creation menu action for Port -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.PortCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif" label="Create a new Port" style="push" tooltip="Create a new Port">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for PrimitiveType -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.PrimitiveTypeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif" label="Create a new PrimitiveType" style="push" tooltip="Create a new PrimitiveType">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Profile -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ProfileCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Profile.gif" label="Create a new Profile" style="push" tooltip="Create a new Profile">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ProfileApplication -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ProfileApplicationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif" label="Create a new ProfileApplication" style="push" tooltip="Create a new ProfileApplication">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Property -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.PropertyCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" label="Create a new Property" style="push" tooltip="Create a new Property">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ProtocolConformance -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ProtocolConformanceCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolConformance.gif" label="Create a new ProtocolConformance" style="push" tooltip="Create a new ProtocolConformance">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ProtocolStateMachine -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ProtocolStateMachineCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif" label="Create a new ProtocolStateMachine" style="push" tooltip="Create a new ProtocolStateMachine">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ProtocolTransition -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ProtocolTransitionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolTransition.gif" label="Create a new ProtocolTransition" style="push" tooltip="Create a new ProtocolTransition">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Pseudostate -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.PseudostateCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate.gif" label="Create a new Pseudostate" style="push" tooltip="Create a new Pseudostate">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for QualifierValue -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.QualifierValueCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/QualifierValue.gif" label="Create a new QualifierValue" style="push" tooltip="Create a new QualifierValue">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for RaiseExceptionAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.RaiseExceptionActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RaiseExceptionAction.gif" label="Create a new RaiseExceptionAction" style="push" tooltip="Create a new RaiseExceptionAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ReadExtentAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ReadExtentActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadExtentAction.gif" label="Create a new ReadExtentAction" style="push" tooltip="Create a new ReadExtentAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ReadIsClassifiedObjectAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ReadIsClassifiedObjectActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadIsClassifiedObjectAction.gif" label="Create a new ReadIsClassifiedObjectAction" style="push" tooltip="Create a new ReadIsClassifiedObjectAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ReadLinkAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ReadLinkActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadLinkAction.gif" label="Create a new ReadLinkAction" style="push" tooltip="Create a new ReadLinkAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ReadLinkObjectEndAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ReadLinkObjectEndActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadLinkObjectEndAction.gif" label="Create a new ReadLinkObjectEndAction" style="push" tooltip="Create a new ReadLinkObjectEndAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ReadLinkObjectEndQualifierAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ReadLinkObjectEndQualifierActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadLinkObjectEndQualifierAction.gif" label="Create a new ReadLinkObjectEndQualifierAction" style="push" tooltip="Create a new ReadLinkObjectEndQualifierAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ReadSelfAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ReadSelfActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadSelfAction.gif" label="Create a new ReadSelfAction" style="push" tooltip="Create a new ReadSelfAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ReadStructuralFeatureAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ReadStructuralFeatureActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadStructuralFeatureAction.gif" label="Create a new ReadStructuralFeatureAction" style="push" tooltip="Create a new ReadStructuralFeatureAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ReadVariableAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ReadVariableActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadVariableAction.gif" label="Create a new ReadVariableAction" style="push" tooltip="Create a new ReadVariableAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Realization -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.RealizationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif" label="Create a new Realization" style="push" tooltip="Create a new Realization">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Reception -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ReceptionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif" label="Create a new Reception" style="push" tooltip="Create a new Reception">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ReclassifyObjectAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ReclassifyObjectActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReclassifyObjectAction.gif" label="Create a new ReclassifyObjectAction" style="push" tooltip="Create a new ReclassifyObjectAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for RedefinableTemplateSignature -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.RedefinableTemplateSignatureCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RedefinableTemplateSignature.gif" label="Create a new RedefinableTemplateSignature" style="push" tooltip="Create a new RedefinableTemplateSignature">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ReduceAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ReduceActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReduceAction.gif" label="Create a new ReduceAction" style="push" tooltip="Create a new ReduceAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Region -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.RegionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Region.gif" label="Create a new Region" style="push" tooltip="Create a new Region">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for RemoveStructuralFeatureValueAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.RemoveStructuralFeatureValueActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RemoveStructuralFeatureValueAction.gif" label="Create a new RemoveStructuralFeatureValueAction" style="push" tooltip="Create a new RemoveStructuralFeatureValueAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for RemoveVariableValueAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.RemoveVariableValueActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RemoveVariableValueAction.gif" label="Create a new RemoveVariableValueAction" style="push" tooltip="Create a new RemoveVariableValueAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ReplyAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ReplyActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReplyAction.gif" label="Create a new ReplyAction" style="push" tooltip="Create a new ReplyAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for SendObjectAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.SendObjectActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendObjectAction.gif" label="Create a new SendObjectAction" style="push" tooltip="Create a new SendObjectAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for SendSignalAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.SendSignalActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendSignalAction.gif" label="Create a new SendSignalAction" style="push" tooltip="Create a new SendSignalAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for SequenceNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.SequenceNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SequenceNode.gif" label="Create a new SequenceNode" style="push" tooltip="Create a new SequenceNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Signal -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.SignalCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif" label="Create a new Signal" style="push" tooltip="Create a new Signal">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for SignalEvent -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.SignalEventCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SignalEvent.gif" label="Create a new SignalEvent" style="push" tooltip="Create a new SignalEvent">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Slot -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.SlotCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif" label="Create a new Slot" style="push" tooltip="Create a new Slot">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for StartClassifierBehaviorAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.StartClassifierBehaviorActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StartClassifierBehaviorAction.gif" label="Create a new StartClassifierBehaviorAction" style="push" tooltip="Create a new StartClassifierBehaviorAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for StartObjectBehaviorAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.StartObjectBehaviorActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StartObjectBehaviorAction.gif" label="Create a new StartObjectBehaviorAction" style="push" tooltip="Create a new StartObjectBehaviorAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for State -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.StateCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif" label="Create a new State" style="push" tooltip="Create a new State">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for StateInvariant -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.StateInvariantCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateInvariant.gif" label="Create a new StateInvariant" style="push" tooltip="Create a new StateInvariant">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for StateMachine -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.StateMachineCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif" label="Create a new StateMachine" style="push" tooltip="Create a new StateMachine">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Stereotype -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.StereotypeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif" label="Create a new Stereotype" style="push" tooltip="Create a new Stereotype">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for StringExpression -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.StringExpressionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StringExpression.gif" label="Create a new StringExpression" style="push" tooltip="Create a new StringExpression">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for StructuredActivityNode -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.StructuredActivityNodeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif" label="Create a new StructuredActivityNode" style="push" tooltip="Create a new StructuredActivityNode">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Substitution -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.SubstitutionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif" label="Create a new Substitution" style="push" tooltip="Create a new Substitution">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for TemplateBinding -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.TemplateBindingCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateBinding.gif" label="Create a new TemplateBinding" style="push" tooltip="Create a new TemplateBinding">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for TemplateParameter -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.TemplateParameterCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateParameter.gif" label="Create a new TemplateParameter" style="push" tooltip="Create a new TemplateParameter">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for TemplateParameterSubstitution -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.TemplateParameterSubstitutionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateParameterSubstitution.gif" label="Create a new TemplateParameterSubstitution" style="push" tooltip="Create a new TemplateParameterSubstitution">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for TemplateSignature -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.TemplateSignatureCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateSignature.gif" label="Create a new TemplateSignature" style="push" tooltip="Create a new TemplateSignature">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for TestIdentityAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.TestIdentityActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TestIdentityAction.gif" label="Create a new TestIdentityAction" style="push" tooltip="Create a new TestIdentityAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for TimeConstraint -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.TimeConstraintCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif" label="Create a new TimeConstraint" style="push" tooltip="Create a new TimeConstraint">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for TimeEvent -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.TimeEventCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeEvent.gif" label="Create a new TimeEvent" style="push" tooltip="Create a new TimeEvent">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for TimeExpression -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.TimeExpressionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeExpression.gif" label="Create a new TimeExpression" style="push" tooltip="Create a new TimeExpression">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for TimeInterval -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.TimeIntervalCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeInterval.gif" label="Create a new TimeInterval" style="push" tooltip="Create a new TimeInterval">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for TimeObservation -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.TimeObservationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif" label="Create a new TimeObservation" style="push" tooltip="Create a new TimeObservation">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Transition -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.TransitionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition.gif" label="Create a new Transition" style="push" tooltip="Create a new Transition">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Trigger -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.TriggerCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Trigger.gif" label="Create a new Trigger" style="push" tooltip="Create a new Trigger">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for UnmarshallAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.UnmarshallActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/UnmarshallAction.gif" label="Create a new UnmarshallAction" style="push" tooltip="Create a new UnmarshallAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Usage -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.UsageCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif" label="Create a new Usage" style="push" tooltip="Create a new Usage">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for UseCase -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.UseCaseCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/UseCase.gif" label="Create a new UseCase" style="push" tooltip="Create a new UseCase">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ValuePin -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ValuePinCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValuePin.gif" label="Create a new ValuePin" style="push" tooltip="Create a new ValuePin">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for ValueSpecificationAction -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ValueSpecificationActionCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecificationAction.gif" label="Create a new ValueSpecificationAction" style="push" tooltip="Create a new ValueSpecificationAction">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Variable -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.VariableCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Variable.gif" label="Create a new Variable" style="push" tooltip="Create a new Variable">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Association -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.AssociationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" label="Create a new Association" style="push" tooltip="Create a new Association">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Trace -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.TraceCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" label="Create a new Trace" style="push" tooltip="Create a new Trace">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-		<!-- Creation menu action for Refine -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.RefineCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" label="Create a new Refine" style="push" tooltip="Create a new Refine">
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
-	</menuContribution>
-	
-</extension>
-</plugin>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/Activator.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/Activator.java
index 08ee52e79bb..8b854fdec8a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/Activator.java
@@ -13,14 +13,14 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.search.ui;

 

-import org.eclipse.ocl.xtext.essentialocl.ui.internal.EssentialOCLActivator;

 import org.eclipse.papyrus.infra.core.log.LogHelper;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

 /**

  * The activator class controls the plug-in life cycle.

  */

-public class Activator extends EssentialOCLActivator {

+public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

 	/** The Constant PLUGIN_ID. */

@@ -41,7 +41,7 @@ public class Activator extends EssentialOCLActivator {
 

 	/*

 	 * (non-Javadoc)

-	 *

+	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

 	/**

@@ -60,7 +60,7 @@ public class Activator extends EssentialOCLActivator {
 

 	/*

 	 * (non-Javadoc)

-	 *

+	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

 	/**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java
index f59da1ce8da..9faa42cbe16 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java
@@ -188,12 +188,16 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 	private EObject contextObject;
 
 	private static final int TEXT_QUERY_KIND = 0;
+	
+	private static final int OCL_QUERY_KIND = 1;
 
 	private static final int SIMPLE_SEARCH = 0;
 
 	private static final int ADVANCED_SEARCH = 1;
 	
 	private int currentSearchKind = SIMPLE_SEARCH;
+	
+	private int currentQueryKind = TEXT_QUERY_KIND;
 
 	private ParserContext parserContext;
 
@@ -287,7 +291,6 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		searchKind.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 1, 1));
 		searchKind.add(Messages.PapyrusSearchPage_11);
 		searchKind.add(Messages.PapyrusSearchPage_12);
-		searchKind.select(SIMPLE_SEARCH);
 		searchKind.addSelectionListener(new SelectionAdapter() {
 
 			@Override
@@ -299,11 +302,14 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 				
 					if (searchKind.getSelectionIndex() == ADVANCED_SEARCH) {
 						participantsList.clear();
+						stereotypeParticipantsList.clear();
 						createResultList();
 						createAdvancedSearch();
 					} else if (searchKind.getSelectionIndex() == SIMPLE_SEARCH) {
 						simpleSearch();
-					}
+					}/* else {
+						Other search kinds in the future
+					}*/
 					
 					advancedSearchComposite.layout();
 				}
@@ -315,7 +321,18 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		advancedSearchComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
 		advancedSearchComposite.setLayout(new GridLayout(3, false));
 
-		simpleSearch();
+		if (currentSearchKind == ADVANCED_SEARCH) {
+			searchKind.select(ADVANCED_SEARCH);
+			participantsList.clear();
+			stereotypeParticipantsList.clear();
+			createResultList();
+			createAdvancedSearch();
+		} else if (currentSearchKind == SIMPLE_SEARCH) {
+			searchKind.select(SIMPLE_SEARCH);
+			simpleSearch();
+		}/* else {
+			Other search kinds in the future
+		}*/
 	}
 
 	protected void createResultList() {
@@ -621,6 +638,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		fBtnSearchForAnySelected.setText(Messages.PapyrusSearchPage_49);
 		
 		currentSearchKind = ADVANCED_SEARCH;
+		currentQueryKind = TEXT_QUERY_KIND;
 	}
 
 	protected void selectAllSubSter(final ParticipantTypeElement elementParent, final List<ParticipantTypeAttribute> attributeParentList) {
@@ -752,6 +770,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		btnSearchAllStringAttributes.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1));
 		
 		currentSearchKind = SIMPLE_SEARCH;
+		currentQueryKind = TEXT_QUERY_KIND;
 	}
 
 
@@ -848,6 +867,8 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		editorComposite.setLayoutData(data);
 
 		refreshSelection(root);
+		
+		currentQueryKind = OCL_QUERY_KIND;
 	}
 
 	protected ScopeEntry getCurrentScopeEntry() {
@@ -884,63 +905,59 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		queryKind.add(Messages.PapyrusSearchPage_21);
 		queryKind.add(Messages.PapyrusSearchPage_22);
 
-
-
 		queryKind.select(TEXT_QUERY_KIND);
 
 		queryKind.addSelectionListener(new SelectionAdapter() {
-
+			
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				for (Control childControl : queryComposite.getChildren()) {
-					childControl.dispose();
-				}
-
-				if (queryKind.getSelectionIndex() == TEXT_QUERY_KIND) {
-					createSimpleSearchQueryField();
-
-
+				if (queryKind.getSelectionIndex() != currentQueryKind) {
+					for (Control childControl : queryComposite.getChildren()) {
+						childControl.dispose();
+					}
 
+					if (queryKind.getSelectionIndex() == TEXT_QUERY_KIND) {
+						createSimpleSearchQueryField();
+					} else {
+						if (container.getSelectedScope() == ISearchPageContainer.SELECTION_SCOPE) {
+
+							ScopeEntry currentScope = getCurrentScopeEntry();
+							if (currentScope != null) {
+								if (currentScope.getModelSet() != null) {
+
+									try {
+										EObject root = ((UmlModel) currentScope.getModelSet().getModel(UmlModel.MODEL_ID)).lookupRoot();
+										createOCLSearchQueryField(root);
+
+										if (contextObject instanceof NamedElement) {
+											oclContext.setText(((NamedElement) contextObject).getQualifiedName());
+										} else {
+											LabelProviderService labelProviderService = new LabelProviderServiceImpl();
+											ILabelProvider labelProvider = labelProviderService.getLabelProvider();
+											oclContext.setText(labelProvider.getText(contextObject));
+										}
+									} catch (NotFoundException notFoundException) {
 
-				} else {
-					if (container.getSelectedScope() == ISearchPageContainer.SELECTION_SCOPE) {
-
-						ScopeEntry currentScope = getCurrentScopeEntry();
-						if (currentScope != null) {
-							if (currentScope.getModelSet() != null) {
-
-								try {
-									EObject root = ((UmlModel) currentScope.getModelSet().getModel(UmlModel.MODEL_ID)).lookupRoot();
-									createOCLSearchQueryField(root);
-
-									if (contextObject instanceof NamedElement) {
-										oclContext.setText(((NamedElement) contextObject).getQualifiedName());
-									} else {
-										LabelProviderService labelProviderService = new LabelProviderServiceImpl();
-										ILabelProvider labelProvider = labelProviderService.getLabelProvider();
-										oclContext.setText(labelProvider.getText(contextObject));
+										Activator.log.error(Messages.PapyrusQuery_0 + currentScope.getModelSet(), notFoundException);
 									}
-								} catch (NotFoundException notFoundException) {
-
-									Activator.log.error(Messages.PapyrusQuery_0 + currentScope.getModelSet(), notFoundException);
+								} else {
+									MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_23, Messages.PapyrusSearchPage_24);
+									createSimpleSearchQueryField();
+									queryKind.select(TEXT_QUERY_KIND);
 								}
 							} else {
-								MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_23, Messages.PapyrusSearchPage_24);
+								MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_25, Messages.PapyrusSearchPage_26);
 								createSimpleSearchQueryField();
 								queryKind.select(TEXT_QUERY_KIND);
 							}
 						} else {
-							MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_25, Messages.PapyrusSearchPage_26);
+							MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_27, Messages.PapyrusSearchPage_28);
 							createSimpleSearchQueryField();
 							queryKind.select(TEXT_QUERY_KIND);
 						}
-					} else {
-						MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_27, Messages.PapyrusSearchPage_28);
-						createSimpleSearchQueryField();
-						queryKind.select(TEXT_QUERY_KIND);
 					}
+					queryComposite.layout();
 				}
-				queryComposite.layout();
 			}
 		});
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/PapyrusUMLResourceVisitor.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/PapyrusUMLResourceVisitor.java
new file mode 100644
index 00000000000..6c4543bdf72
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/PapyrusUMLResourceVisitor.java
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus (CEA LIST) - Replace workspace IResource dependency with URI for CDO compatibility
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.stereotypecollector;
+
+import java.net.URISyntaxException;
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceProxy;
+import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.URIUtil;
+import org.eclipse.emf.common.util.URI;
+
+/**
+ *
+ * Implements a visitor that goes through a hierarchy of Iresource from a root and collect only those that can be processed for search
+ *
+ */
+public class PapyrusUMLResourceVisitor extends UMLResourceVisitor {
+	
+	public PapyrusUMLResourceVisitor() {
+		super();
+		this.participantURIs = new HashSet<URI>();
+	}
+
+	@Override
+	public boolean visit(IResourceProxy proxy) throws CoreException {
+		switch (proxy.getType()) {
+		case IResource.FILE:
+			IResource resource = proxy.requestResource();
+			URI uri = URI.createPlatformResourceURI(resource.getFullPath().toString(), true);
+
+			if ("uml".equals(uri.fileExtension())) { //$NON-NLS-1$
+				if (resource.getWorkspace().getRoot().exists(resource.getFullPath().removeFileExtension().addFileExtension("di"))) {
+					participantURIs.add(uri);
+				}
+			}
+
+			break;
+		default:
+			break;
+		}
+		return true;
+	}
+
+	public Collection<URI> getParticipantURIs() {
+		return participantURIs;
+	}
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/StereotypeCollector.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/StereotypeCollector.java
index 32defa070a2..75993baf24f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/StereotypeCollector.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/StereotypeCollector.java
@@ -396,7 +396,7 @@ public class StereotypeCollector implements IStereotypeCollector {
 	 *         the found Papyrus models
 	 */
 	protected Collection<URI> findUMLModels(IResource res) {
-		UMLResourceVisitor visitor = new UMLResourceVisitor();
+		PapyrusUMLResourceVisitor visitor = new PapyrusUMLResourceVisitor();
 		try {
 			res.accept(visitor, IResource.DEPTH_INFINITE);
 		} catch (CoreException e) {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/UMLResourceVisitor.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/UMLResourceVisitor.java
index 061fb86c821..4635139a92b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/UMLResourceVisitor.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/UMLResourceVisitor.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA LIST) - Replace workspace IResource dependency with URI for CDO compatibility

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.stereotypecollector;

-

-import java.util.Collection;

-import java.util.HashSet;

-

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceProxy;

-import org.eclipse.core.resources.IResourceProxyVisitor;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.emf.common.util.URI;

-

-/**

- *

- * Implements a visitor that goes through a hierarchy of Iresource from a root and collect only those that can be processed for search

- *

- */

-public class UMLResourceVisitor implements IResourceProxyVisitor {

-

-	private Collection<URI> participantURIs;

-

-	public UMLResourceVisitor() {

-		super();

-		this.participantURIs = new HashSet<URI>();

-	}

-

-	public boolean visit(IResourceProxy proxy) throws CoreException {

-		switch (proxy.getType()) {

-		case IResource.FILE:

-			IResource resource = proxy.requestResource();

-

-			URI uri = URI.createPlatformResourceURI(resource.getFullPath().toString(), true);

-

-			if ("uml".equals(uri.fileExtension())) { //$NON-NLS-1$

-				participantURIs.add(uri);

-

-			}

-

-			break;

-		default:

-			break;

-		}

-		return true;

-	}

-

-	public Collection<URI> getParticipantURIs() {

-		return participantURIs;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus (CEA LIST) - Replace workspace IResource dependency with URI for CDO compatibility
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.stereotypecollector;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceProxy;
+import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.common.util.URI;
+
+/**
+ *
+ * Implements a visitor that goes through a hierarchy of Iresource from a root and collect only those that can be processed for search
+ *
+ */
+public class UMLResourceVisitor implements IResourceProxyVisitor {
+
+	protected Collection<URI> participantURIs;
+
+	public UMLResourceVisitor() {
+		super();
+		this.participantURIs = new HashSet<URI>();
+	}
+
+	public boolean visit(IResourceProxy proxy) throws CoreException {
+		switch (proxy.getType()) {
+		case IResource.FILE:
+			IResource resource = proxy.requestResource();
+
+			URI uri = URI.createPlatformResourceURI(resource.getFullPath().toString(), true);
+
+			if ("uml".equals(uri.fileExtension())) { //$NON-NLS-1$
+				participantURIs.add(uri);
+
+			}
+
+			break;
+		default:
+			break;
+		}
+		return true;
+	}
+
+	public Collection<URI> getParticipantURIs() {
+		return participantURIs;
+	}
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
index 15e8def19d0..88f1ca38208 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  com.google.guava;bundle-version="11.0.0",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0";visibility:=reexport,

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

@@ -30,7 +30,8 @@ Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.0",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",

  org.eclipse.emf.edit.ui,

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0"

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.1.0.qualifier

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/icons/CollaborationRoleBinding.gif b/plugins/uml/org.eclipse.papyrus.uml.service.types/icons/CollaborationRoleBinding.gif
new file mode 100644
index 00000000000..aa8ed5e5f32
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/icons/CollaborationRoleBinding.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
index 39c918ecd45..61e0db0db0f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
@@ -1,18 +1,61 @@
 <?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_SdLC0lYCEeS0WsAAtVmToA" name="UML::UseCase_As_UML::Classifier::ownedUseCase" identifier="org.eclipse.papyrus.uml.UseCase_As_UML::Classifier::ownedUseCase" hint="UML::UseCase_As_UML::Classifier::ownedUseCase">

-    <iconEntry xmi:id="_SdLpwFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_ScP1oFYCEeS0WsAAtVmToA"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_SdLC0lYCEeS0WsAAtVmToA"

+      name="UML::UseCase_As_UML::Classifier::ownedUseCase"

+      identifier="org.eclipse.papyrus.uml.UseCase_As_UML::Classifier::ownedUseCase"

+      hint="UML::UseCase_As_UML::Classifier::ownedUseCase">

+    <iconEntry

+        xmi:id="_SdLpwFYCEeS0WsAAtVmToA"

+        iconPath="/icons/full/obj16/UseCase.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_g1eR0FuQEeSq2af_QYA1OA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.UseCaseAsClassifierOwnedUseCaseEditHelperAdvice"/>

-    <containerConfiguration xmi:id="_SdLpwVYCEeS0WsAAtVmToA">

-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_g1eR0FuQEeSq2af_QYA1OA"

+        editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.UseCaseAsClassifierOwnedUseCaseEditHelperAdvice"/>

+    <containerConfiguration

+        xmi:id="_SdLpwVYCEeS0WsAAtVmToA">

+      <eContainmentFeatures

+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>

     </containerConfiguration>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_OdntAJgmEeSbPLBxcMMcNg" identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement">

-    <iconEntry xmi:id="_m1srIJgmEeSbPLBxcMMcNg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_OdntAJgmEeSbPLBxcMMcNg"

+      identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement">

+    <iconEntry

+        xmi:id="_m1srIJgmEeSbPLBxcMMcNg"

+        iconPath="/icons/full/obj16/Constraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

-    <containerConfiguration xmi:id="_tgfvMJgmEeSbPLBxcMMcNg">

-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

+    <containerConfiguration

+        xmi:id="_tgfvMJgmEeSbPLBxcMMcNg">

+      <eContainmentFeatures

+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_y2EkwL0dEeSA8oxr--Q4Aw"

+      name="UML::StringExpression_As_UML::Package::packagedElement"

+      identifier="org.eclipse.papyrus.uml.StringExpression_As_UML::Package::packagedElement"

+      hint="UML::StringExpression_As_UML::Package::packagedElement">

+    <iconEntry

+        xmi:id="_y2FL0L0dEeSA8oxr--Q4Aw"

+        iconPath="/icons/full/obj16/StringExpression.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StringExpression</specializedTypesID>

+    <containerConfiguration

+        xmi:id="_y2FL0r0dEeSA8oxr--Q4Aw">

+      <eContainmentFeatures

+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

     </containerConfiguration>

   </elementTypeConfigurations>

   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_EcQ3QLocEeSsV_IrhqhBPw" name="Expansion Node" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput" hint="ExpansionNode_As_UML::ExpansionRegion::inputElement">

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
index ed18f8a86fc..ebe00ac1bca 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
@@ -175,6 +175,11 @@
     <iconEntry xmi:id="_Sca07lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

   </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_IsX6UMc9EeS1POoqrCEMrQ" name="UML::Collaboration::CollaborationRole" identifier="org.eclipse.papyrus.uml.Collaboration.CollaborationRole" hint="UML::Collaboration::CollaborationRole">

+    <iconEntry xmi:id="_XvNAUMc9EeS1POoqrCEMrQ" iconPath="/icons/full/obj16/ConnectableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+    <editHelperAdviceConfiguration xmi:id="_8m8kIMc9EeS1POoqrCEMrQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationCollaborationRoleEditHelperAdvice" inheritance="all"/>

+  </elementTypeConfigurations>

   <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Sca071YCEeS0WsAAtVmToA" name="UML::CollaborationUse" identifier="org.eclipse.papyrus.uml.CollaborationUse" hint="UML::CollaborationUse" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">

     <iconEntry xmi:id="_Sca08FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CollaborationUse.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CollaborationUse"/>

@@ -183,12 +188,12 @@
     <iconEntry xmi:id="_Scbb11YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CombinedFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CombinedFragment"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Scbb2FYCEeS0WsAAtVmToA" name="UML::Comment" identifier="org.eclipse.papyrus.uml.Comment" hint="UML::Comment" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.CommentEditHelper">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Scbb2FYCEeS0WsAAtVmToA" name="UML::Comment" identifier="org.eclipse.papyrus.uml.Comment" hint="UML::Comment" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">

     <iconEntry xmi:id="_Scbb2VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>

   </elementTypeConfigurations>

   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_poCSAGqWEeSE-IVtP6jQeA" name="UML::Comment::AnnotatedElements" identifier="org.eclipse.papyrus.uml.Comment.AnnotatedElements" hint="UML::Comment::AnnotatedElements">

-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

     <editHelperAdviceConfiguration xmi:id="_6-K50HY7EeSaAZaF2vKiqg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CommentAnnotatedElementsEditHelperAdvice"/>

   </elementTypeConfigurations>

   <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Scbb2lYCEeS0WsAAtVmToA" name="UML::CommunicationPath" identifier="org.eclipse.papyrus.uml.CommunicationPath" hint="UML::CommunicationPath" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">

@@ -240,11 +245,11 @@
     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>

   </elementTypeConfigurations>

   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XHjzcGslEeSELtwF_9-6fg" name="UML::Constraint::ConstrainedElements" identifier="org.eclipse.papyrus.uml.Constraint.ConstrainedElements" hint="UML::Constraint::ConstrainedElements">

-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

     <editHelperAdviceConfiguration xmi:id="_njRJoHbmEeSsxehP964iKQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintConstrainedElementsEditHelperAdvice"/>

   </elementTypeConfigurations>

   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ax9dwHZLEeSQEpHemLeWnw" name="UML::Constraint::Context" identifier="org.eclipse.papyrus.uml.Constraint.Context" hint="UML::Constraint::Context">

-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

     <editHelperAdviceConfiguration xmi:id="_rZSY8HbmEeSsxehP964iKQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextEditHelperAdvice"/>

   </elementTypeConfigurations>

   <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_SccDFVYCEeS0WsAAtVmToA" name="UML::Continuation" identifier="org.eclipse.papyrus.uml.Continuation" hint="UML::Continuation" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">

@@ -287,11 +292,16 @@
     <iconEntry xmi:id="_SccqHFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency"/>

   </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_TFofsLhAEeSANYuUIb1qQA" name="UML::CollaborationUse::RoleBinding" identifier="org.eclipse.papyrus.uml.CollaborationUse.RoleBinding" hint="UML::CollaborationUse::RoleBinding">

+    <iconEntry xmi:id="_m8FswLhAEeSANYuUIb1qQA" iconPath="/icons/CollaborationRoleBinding.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+    <editHelperAdviceConfiguration xmi:id="_Ao6QQLhBEeSANYuUIb1qQA" identifier="" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.RoleBindingHelperAdvice" inheritance="all"/>

+  </elementTypeConfigurations>

   <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_SccqI1YCEeS0WsAAtVmToA" name="UML::DeployedArtifact" identifier="org.eclipse.papyrus.uml.DeployedArtifact" hint="UML::DeployedArtifact" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">

     <iconEntry xmi:id="_SccqJFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DeployedArtifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DeployedArtifact"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_SccqJVYCEeS0WsAAtVmToA" name="UML::Deployment" identifier="org.eclipse.papyrus.uml.Deployment" hint="UML::Deployment" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_SccqJVYCEeS0WsAAtVmToA" name="UML::Deployment" identifier="org.eclipse.papyrus.uml.Deployment" hint="UML::Deployment" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DeploymentEditHelper">

     <iconEntry xmi:id="_SccqJlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Deployment.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Deployment"/>

   </elementTypeConfigurations>

@@ -468,10 +478,15 @@
     <iconEntry xmi:id="_ScnCC1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Include.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Include"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_ScnCDFYCEeS0WsAAtVmToA" name="UML::InformationFlow" identifier="org.eclipse.papyrus.uml.InformationFlow" hint="UML::InformationFlow" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InformationFlowEditHelper">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_ScnCDFYCEeS0WsAAtVmToA" name="UML::InformationFlowBase" identifier="org.eclipse.papyrus.uml.InformationFlowBase" hint="UML::InformationFlowBase" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InformationFlowEditHelper">

     <iconEntry xmi:id="_ScnCDVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InformationFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InformationFlow"/>

   </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ZLpUILgeEeSANYuUIb1qQA" name="UML::InformationFlow" identifier="org.eclipse.papyrus.uml.InformationFlow" hint="UML::InformationFlow">

+    <iconEntry xmi:id="_jt-DYLgeEeSANYuUIb1qQA" iconPath="/icons/full/obj16/InformationFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlowBase</specializedTypesID>

+    <editHelperAdviceConfiguration xmi:id="_lfPMsLgeEeSANYuUIb1qQA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InformationFlowEditHelperAdvice" inheritance="all"/>

+  </elementTypeConfigurations>

   <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_ScnCFFYCEeS0WsAAtVmToA" name="UML::InformationItem" identifier="org.eclipse.papyrus.uml.InformationItem" hint="UML::InformationItem" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">

     <iconEntry xmi:id="_ScnCFVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InformationItem"/>

@@ -484,7 +499,7 @@
     <iconEntry xmi:id="_Sco3PFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InputPin"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Scr6iVYCEeS0WsAAtVmToA" name="UML::InstanceSpecification" identifier="org.eclipse.papyrus.uml.InstanceSpecification" hint="UML::InstanceSpecification" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InstanceSpecificationEditHelper">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Scr6iVYCEeS0WsAAtVmToA" name="UML::InstanceSpecification" identifier="org.eclipse.papyrus.uml.InstanceSpecification" hint="UML::InstanceSpecification" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">

     <iconEntry xmi:id="_Scr6ilYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InstanceSpecification"/>

   </elementTypeConfigurations>

@@ -596,7 +611,7 @@
     <iconEntry xmi:id="_Sc58-lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LoopNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LoopNode"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Sc59ClYCEeS0WsAAtVmToA" name="UML::Manifestation" identifier="org.eclipse.papyrus.uml.Manifestation" hint="UML::Manifestation" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Sc59ClYCEeS0WsAAtVmToA" name="UML::Manifestation" identifier="org.eclipse.papyrus.uml.Manifestation" hint="UML::Manifestation" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ManifestationEditHelper">

     <iconEntry xmi:id="_Sc59C1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Manifestation.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Manifestation"/>

   </elementTypeConfigurations>

@@ -632,13 +647,10 @@
     <iconEntry xmi:id="_Sc6kDVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/NamedElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Sc6kDlYCEeS0WsAAtVmToA" name="UML::Namespace" identifier="org.eclipse.papyrus.uml.Namespace" hint="UML::Namespace" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.NamespaceEditHelper">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Sc6kDlYCEeS0WsAAtVmToA" name="UML::Namespace" identifier="org.eclipse.papyrus.uml.Namespace" hint="UML::Namespace" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">

     <iconEntry xmi:id="_Sc6kD1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Namespace.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_xVU0MHlEEeSDaJF_npeEXw" name="UML::Namescape::OwnedMember" description="Created to support the ContainmentLink" identifier="org.eclipse.papyrus.uml.Namespace.OwnedMember" hint="UML::Namescape::OwnedMember">

-    <specializedTypesID>org.eclipse.papyrus.uml.Namespace</specializedTypesID>

-  </elementTypeConfigurations>

   <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Sc6kEFYCEeS0WsAAtVmToA" name="UML::Node" identifier="org.eclipse.papyrus.uml.Node" hint="UML::Node" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">

     <iconEntry xmi:id="_Sc6kEVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Node"/>

@@ -687,7 +699,7 @@
     <iconEntry xmi:id="_Sc9ARFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OutputPin"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Sc9nZVYCEeS0WsAAtVmToA" name="UML::Package" identifier="org.eclipse.papyrus.uml.Package" hint="UML::Package" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.PackageEditHelper">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Sc9nZVYCEeS0WsAAtVmToA" name="UML::Package" identifier="org.eclipse.papyrus.uml.Package" hint="UML::Package" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">

     <iconEntry xmi:id="_Sc9nZlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

   </elementTypeConfigurations>

@@ -751,6 +763,11 @@
     <iconEntry xmi:id="_Sc-1cVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

   </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_wdkpELhLEeSANYuUIb1qQA" name="UML::PropertyPart" identifier="org.eclipse.papyrus.uml.PropertyPart" hint="UML::PropertyPart">

+    <iconEntry xmi:id="_5SIO8LhLEeSANYuUIb1qQA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <editHelperAdviceConfiguration xmi:id="_509PMLhLEeSANYuUIb1qQA" identifier="" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PropertyPartHelperAdvice" inheritance="all"/>

+  </elementTypeConfigurations>

   <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Sc-1eFYCEeS0WsAAtVmToA" name="UML::ProtocolConformance" identifier="org.eclipse.papyrus.uml.ProtocolConformance" hint="UML::ProtocolConformance" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ProtocolConformanceEditHelper">

     <iconEntry xmi:id="_Sc-1eVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ProtocolConformance.gif" bundleId="org.eclipse.uml2.uml.edit"/>

     <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ProtocolConformance"/>

@@ -1045,8 +1062,15 @@
     <editHelperAdviceConfiguration xmi:id="_UGdZ8WslEeSELtwF_9-6fg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.RefineEditHelperAdvice"/>

     <matcherConfiguration xmi:id="_UGdZ8mslEeSELtwF_9-6fg" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.RefineMatcher"/>

   </elementTypeConfigurations>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_xVU0MHlEEeSDaJF_npeEXw" name="UML::Element::OwnedElement" description="Created to support the ContainmentLink" identifier="org.eclipse.papyrus.uml.Element.OwnedElement" hint="UML::Element::OwnedElement">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+    <editHelperAdviceConfiguration xmi:id="_JdUX4MHTEeSpuJnfbRdiWQ" identifier="" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementOwnedElementEditHelperAdvice" inheritance="all"/>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ" identifier="org.eclipse.papyrus.uml.advice.Containment" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementOwnedElementReorientEditHelperAdvice" inheritance="all" target="_ScgUUFYCEeS0WsAAtVmToA"/>

+  <adviceBindingsConfigurations xmi:id="_6AWx0MJaEeSl6M4_Zhyt7Q" identifier="org.eclipse.papyrus.uml.advice.ConstraintConstrainedElementsReorient" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintConstrainedElementsReorientEditHelperAdvice" inheritance="all" target="_SccC-1YCEeS0WsAAtVmToA"/>

+  <adviceBindingsConfigurations xmi:id="_Biw5sMdFEeS1POoqrCEMrQ" identifier="org.eclipse.papyrus.uml.advice.CommentAnnotatedElementsReorient" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CommentAnnotatedElementsReorientEditHelperAdvice" inheritance="all" target="_Scbb2FYCEeS0WsAAtVmToA"/>

+  <adviceBindingsConfigurations xmi:id="_UdTKsMJbEeSl6M4_Zhyt7Q" identifier="org.eclipse.papyrus.uml.advice.ConstraintContextReorient" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextReorientEditHelperAdvice" inheritance="all" target="_SccC-1YCEeS0WsAAtVmToA"/>

   <adviceBindingsConfigurations xmi:id="_R_pDcGT7EeSzFvTXGJPhUg" name="org.eclipse.papyrus.uml.advice.ContainmentSubsetRemoval" identifier="org.eclipse.papyrus.uml.advice.ContainmentSubsetRemoval" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ContainmentSubsetRemovalAdvice" inheritance="all" target="_ScgUUFYCEeS0WsAAtVmToA"/>

-  <adviceBindingsConfigurations xmi:id="_lIgXkHl8EeSqauow2xCkqg" name="org.eclipse.papyrus.uml.advice.Containment" identifier="org.eclipse.papyrus.uml.advice.Containment" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.NamespaceOwnedMemberEditHelperAdvice" inheritance="all" target="_Sc6kDlYCEeS0WsAAtVmToA"/>

   <adviceBindingsConfigurations xmi:id="_R_pDcWT7EeSzFvTXGJPhUg" name="org.eclipse.papyrus.uml.advice.Classifier" identifier="org.eclipse.papyrus.uml.advice.Classifier" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierHelperAdvice" inheritance="all" target="_Sca0z1YCEeS0WsAAtVmToA"/>

   <adviceBindingsConfigurations xmi:id="_R_pDcmT7EeSzFvTXGJPhUg" name="org.eclipse.papyrus.uml.advice.Collaboration" identifier="org.eclipse.papyrus.uml.advice.Collaboration" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationHelperAdvice" target="_Sca07VYCEeS0WsAAtVmToA"/>

   <adviceBindingsConfigurations xmi:id="_R_pDc2T7EeSzFvTXGJPhUg" name="org.eclipse.papyrus.uml.advice.CollaborationUse" identifier="org.eclipse.papyrus.uml.advice.CollaborationUse" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationUseHelperAdvice" target="_Sca071YCEeS0WsAAtVmToA"/>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src-gen/org/eclipse/papyrus/uml/service/types/element/UMLElementTypes.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src-gen/org/eclipse/papyrus/uml/service/types/element/UMLElementTypes.java
index 1c301e18f26..3d113f4fc78 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src-gen/org/eclipse/papyrus/uml/service/types/element/UMLElementTypes.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src-gen/org/eclipse/papyrus/uml/service/types/element/UMLElementTypes.java
@@ -140,15 +140,24 @@ public class UMLElementTypes extends AbstractElementTypeEnumerator {
 	/** IElementType for UML Collaboration */
 	public static final IHintedType COLLABORATION = (IHintedType) getElementType("org.eclipse.papyrus.uml.Collaboration"); //$NON-NLS-1$
 
+	/** IElementType for UML Collaboration.CollaborationRole */
+	public static final IHintedType COLLABORATION_COLLABORATIONROLE = (IHintedType) getElementType("org.eclipse.papyrus.uml.Collaboration.CollaborationRole"); //$NON-NLS-1$
+
 	/** IElementType for UML CollaborationUse */
 	public static final IHintedType COLLABORATION_USE = (IHintedType) getElementType("org.eclipse.papyrus.uml.CollaborationUse"); //$NON-NLS-1$
 
+	/** IElementType for UML CollaborationUse.RoleBinding */
+	public static final IHintedType COLLABORATION_USE_ROLEBINDING = (IHintedType) getElementType("org.eclipse.papyrus.uml.CollaborationUse.RoleBinding"); //$NON-NLS-1$
+
 	/** IElementType for UML CombinedFragment */
 	public static final IHintedType COMBINED_FRAGMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.CombinedFragment"); //$NON-NLS-1$
 
 	/** IElementType for UML Comment */
 	public static final IHintedType COMMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.Comment"); //$NON-NLS-1$
 
+	/** IElementType for UML Comment.AnnotatedElements */
+	public static final IHintedType COMMENT_ANNOTATEDELEMENTS = (IHintedType) getElementType("org.eclipse.papyrus.uml.Comment.AnnotatedElements"); //$NON-NLS-1$
+
 	/** IElementType for UML CommunicationPath */
 	public static final IHintedType COMMUNICATION_PATH = (IHintedType) getElementType("org.eclipse.papyrus.uml.CommunicationPath"); //$NON-NLS-1$
 
@@ -470,8 +479,8 @@ public class UMLElementTypes extends AbstractElementTypeEnumerator {
 	/** IElementType for UML Namespace */
 	public static final IHintedType NAMESPACE = (IHintedType) getElementType("org.eclipse.papyrus.uml.Namespace"); //$NON-NLS-1$
 
-	/** IElementType for UML Namespace.OwnedMember */
-	public static final IHintedType NAMESPACE_OWNEDMEMBER = (IHintedType) getElementType("org.eclipse.papyrus.uml.Namespace.OwnedMember"); //$NON-NLS-1$
+	/** IElementType for UML Element.OwnedElement */
+	public static final IHintedType ELEMENT_OWNEDELEMENT = (IHintedType) getElementType("org.eclipse.papyrus.uml.Element.OwnedElement"); //$NON-NLS-1$
 
 	/** IElementType for UML Node */
 	public static final IHintedType NODE = (IHintedType) getElementType("org.eclipse.papyrus.uml.Node"); //$NON-NLS-1$
@@ -548,6 +557,9 @@ public class UMLElementTypes extends AbstractElementTypeEnumerator {
 	/** IElementType for UML Property */
 	public static final IHintedType PROPERTY = (IHintedType) getElementType("org.eclipse.papyrus.uml.Property"); //$NON-NLS-1$
 
+	/** IElementType for UML PropertyPart */
+	public static final IHintedType PROPERTY_PART = (IHintedType) getElementType("org.eclipse.papyrus.uml.PropertyPart"); //$NON-NLS-1$
+
 	/** IElementType for UML ProtocolConformance */
 	public static final IHintedType PROTOCOL_CONFORMANCE = (IHintedType) getElementType("org.eclipse.papyrus.uml.ProtocolConformance"); //$NON-NLS-1$
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/Activator.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/Activator.java
index 6f38ae66c51..3c7cf5dbd7b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/Activator.java
@@ -14,7 +14,10 @@
 package org.eclipse.papyrus.uml.service.types;

 

 import org.eclipse.core.runtime.Plugin;

+import org.eclipse.core.runtime.preferences.InstanceScope;

+import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.core.log.LogHelper;

+import org.eclipse.ui.preferences.ScopedPreferenceStore;

 import org.osgi.framework.BundleContext;

 

 /**

@@ -31,11 +34,39 @@ public class Activator extends Plugin {
 	/** The log service */

 	public static LogHelper log;

 

+	/**

+	 * Storage for preferences.

+	 */

+	private ScopedPreferenceStore preferenceStore;

+

 	/** Default Constructor */

 	public Activator() {

 

 	}

 

+	/**

+	 * Returns the preference store for this UI plug-in.

+	 * This preference store is used to hold persistent settings for this plug-in in

+	 * the context of a workbench. Some of these settings will be user controlled,

+	 * whereas others may be internal setting that are never exposed to the user.

+	 * <p>

+	 * If an error occurs reading the preference store, an empty preference store is quietly created, initialized with defaults, and returned.

+	 * </p>

+	 * <p>

+	 * <strong>NOTE:</strong> As of Eclipse 3.1 this method is no longer referring to the core runtime compatibility layer and so plug-ins relying on Plugin#initializeDefaultPreferences will have to access the compatibility layer themselves.

+	 * </p>

+	 *

+	 * @return the preference store

+	 */

+	public IPreferenceStore getPreferenceStore() {

+		// Create the preference store lazily.

+		if (preferenceStore == null) {

+			preferenceStore = new ScopedPreferenceStore(new InstanceScope(), getBundle().getSymbolicName());

+

+		}

+		return preferenceStore;

+	}

+

 	/*

 	 * (non-Javadoc)

 	 * 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/AssociationReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/AssociationReorientCommand.java
index 93ac9ba6b9f..704282ce710 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/AssociationReorientCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/AssociationReorientCommand.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.service.types.messages.Messages;

 import org.eclipse.papyrus.uml.service.types.utils.ClassifierUtils;

 import org.eclipse.uml2.uml.Artifact;

 import org.eclipse.uml2.uml.Association;

@@ -147,7 +148,7 @@ public class AssociationReorientCommand extends EditElementCommand {
 

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+			throw new ExecutionException(Messages.AssociationReorientCommand_1); 

 		}

 		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

 			return reorientSource();

@@ -202,7 +203,7 @@ public class AssociationReorientCommand extends EditElementCommand {
 		boolean added = ClassifierUtils.addOwnedAttribute(newOwner, end);

 

 		if (!added) {

-			throw new UnsupportedOperationException("Cannot add a Property on Classifier " + newOwner.getQualifiedName());

+			throw new UnsupportedOperationException(Messages.AssociationReorientCommand_0 + newOwner.getQualifiedName());

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CollaborationRoleCreateCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CollaborationRoleCreateCommand.java
index 6ba138250b8..f11376eca03 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CollaborationRoleCreateCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CollaborationRoleCreateCommand.java
@@ -12,7 +12,7 @@
  *  Christian W. Damus (CEA) - bug 410346
  *
  *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.command;
+package org.eclipse.papyrus.uml.service.types.command;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -21,12 +21,10 @@ import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.uml.diagram.composite.custom.messages.Messages;
-import org.eclipse.papyrus.uml.diagram.composite.custom.ui.CollaborationRoleValidator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationRoleCreateCommandCN;
+import org.eclipse.papyrus.uml.service.types.ui.CollaborationRoleValidator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -42,7 +40,13 @@ import org.eclipse.uml2.uml.ConnectableElement;
  * {@link Collaboration}.
  * </pre>
  */
-public class CollaborationRoleCreateCommand extends CollaborationRoleCreateCommandCN {
+public class CollaborationRoleCreateCommand extends EditElementCommand {
+
+	@Override
+	public boolean canExecute() {
+		// TODO Auto-generated method stub
+		return true;
+	}
 
 	/**
 	 * Constructor
@@ -50,8 +54,8 @@ public class CollaborationRoleCreateCommand extends CollaborationRoleCreateComma
 	 * @param req
 	 *            the creation request
 	 */
-	public CollaborationRoleCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req, diagram);
+	public CollaborationRoleCreateCommand(CreateElementRequest req) {
+		super(req.getLabel(), req.getContainer(), req);
 	}
 
 	/**
@@ -59,7 +63,7 @@ public class CollaborationRoleCreateCommand extends CollaborationRoleCreateComma
 	 * The method executes the creation :
 	 *  - opens a selection dialog to choose a {@link ConnectableElement} to reference as a role
 	 *  - add the selection in CollaborationRole eReference of the edited {@link Collaboration}.
-	 *
+	 * 
 	 * {@inheritDoc}
 	 * </pre>
 	 */
@@ -76,8 +80,8 @@ public class CollaborationRoleCreateCommand extends CollaborationRoleCreateComma
 
 		try {
 			// Set dialog parameters
-			dialog.setTitle(Messages.CollaborationRoleSelectionDialog_Title);
-			dialog.setMessage(Messages.CollaborationRoleSelectionDialog_Message);
+			dialog.setTitle("Collaboration role creation");
+			dialog.setMessage("Select the ConnectableElement (ex: Property) to reference as a role:");
 			dialog.setAllowMultiple(false);
 			dialog.setHelpAvailable(false);
 			// ConnectableElement from the whole model can be selected as role.
@@ -97,12 +101,6 @@ public class CollaborationRoleCreateCommand extends CollaborationRoleCreateComma
 			ConnectableElement role = (ConnectableElement) dialog.getFirstResult();
 
 			owner.getCollaborationRoles().add(role);
-
-			try {
-				doConfigure(role, monitor, info);
-			} catch (ExecutionException e) {
-				e.printStackTrace();
-			}
 			((CreateElementRequest) getRequest()).setNewElement(role);
 
 			return CommandResult.newOKCommandResult(role);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientSemanticCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientSemanticCommand.java
index 2253958567b..835845cb263 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientSemanticCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientSemanticCommand.java
@@ -21,6 +21,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.service.types.messages.Messages;

 import org.eclipse.papyrus.uml.service.types.utils.ConnectorUtils;

 import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

 import org.eclipse.uml2.uml.ConnectableElement;

@@ -244,7 +245,7 @@ public class ConnectorReorientSemanticCommand extends EditElementCommand {
 		// Change owner and Connector name (possibly already exists in new container)

 		if(newOwner != connector.getOwner()) {

 			if(newOwner.getOwnedConnector(connector.getName()) != null) {

-				String replacementName = NamedElementHelper.getDefaultNameWithIncrementFromBase("connector", newOwner.eContents()); // //$NON-NLS-0$

+				String replacementName = NamedElementHelper.getDefaultNameWithIncrementFromBase(Messages.ConnectorReorientSemanticCommand_0, newOwner.eContents()); // //$NON-NLS-0$ //$NON-NLS-1$

 				connector.setName(replacementName);

 			}

 			// Replace connector owner

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/DeploymentReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/DeploymentReorientCommand.java
new file mode 100644
index 00000000000..dfeb3685bbf
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/DeploymentReorientCommand.java
@@ -0,0 +1,83 @@
+/*****************************************************************************

+ * Copyright (c) 2011 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ * 

+ * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.service.types.command;

+

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.uml2.uml.Deployment;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.PackageableElement;

+

+/**

+ * <pre>

+ * Re-orient command for {@link Deployment} elements.

+ * </pre>

+ */

+public class DeploymentReorientCommand extends DependencyReorientCommand {

+

+	/**

+	 * <pre>

+	 * Constructor.

+	 * 

+	 * @param request the re-orient relationship request.

+	 * </pre>

+	 */

+	public DeploymentReorientCommand(ReorientRelationshipRequest request) {

+		super(request);

+	}

+

+	/**

+	 * <pre>

+	 * @see org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand#canExecute()

+	 * 

+	 * @return true if the command is executable.

+	 * </pre>

+	 */

+	public boolean canExecute() {

+		if (!(getElementToEdit() instanceof Deployment)) {

+			return false;

+		}

+

+		return super.canExecute();

+	}

+

+	protected boolean canReorientSource() {

+		if (!(newEnd instanceof NamedElement)) {

+			return false;

+		}

+

+		if (newEnd == getLink().getLocation()) {

+			return false;

+		}

+

+		return true;

+	}

+

+	protected boolean canReorientTarget() {

+		if (!(newEnd instanceof PackageableElement)) {

+			return false;

+		}

+

+		if (getLink().getDeployedArtifacts().contains(newEnd)) {

+			return false;

+		}

+

+		return true;

+	}

+

+	protected Deployment getLink() {

+		return (Deployment) getElementToEdit();

+	}

+

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/NamespaceOwnedMemberCreateCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ElementOwnedElementCreateCommand.java
index 2751d4dc959..304f71a2fed 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/NamespaceOwnedMemberCreateCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ElementOwnedElementCreateCommand.java
@@ -23,13 +23,13 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.papyrus.uml.service.types.utils.NamespaceOwnedMemberUtils;

 import org.eclipse.uml2.uml.Namespace;

 

-public class NamespaceOwnedMemberCreateCommand extends EditElementCommand {

+public class ElementOwnedElementCreateCommand extends EditElementCommand {

 

 	protected final EObject source;

 

 	protected final EObject target;

 

-	public NamespaceOwnedMemberCreateCommand(CreateRelationshipRequest request) {

+	public ElementOwnedElementCreateCommand(CreateRelationshipRequest request) {

 		super(request.getLabel(), null, request);

 		this.source = request.getSource();

 		this.target = request.getTarget();

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/NamespaceOwnedMemberReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ElementOwnedElementReorientCommand.java
index 6aa44f87b04..b96b6039bbb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/NamespaceOwnedMemberReorientCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ElementOwnedElementReorientCommand.java
@@ -23,14 +23,14 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

 import org.eclipse.papyrus.uml.service.types.utils.NamespaceOwnedMemberUtils;

 

-public class NamespaceOwnedMemberReorientCommand extends EditElementCommand {

+public class ElementOwnedElementReorientCommand extends EditElementCommand {

 

 	private final int reorientDirection;

 	private final EObject referenceOwner;

 	private final EObject oldEnd;

 	private final EObject newEnd;

 

-	public NamespaceOwnedMemberReorientCommand(ReorientReferenceRelationshipRequest request) {

+	public ElementOwnedElementReorientCommand(ReorientReferenceRelationshipRequest request) {

 		super(request.getLabel(), null, request);

 		reorientDirection = request.getDirection();

 		referenceOwner = request.getReferenceOwner();

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/GeneralizationSetCreationCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/GeneralizationSetCreationCommand.java
index 58763dc5025..5bae1e95836 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/GeneralizationSetCreationCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/GeneralizationSetCreationCommand.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.service.types.messages.Messages;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionEvent;

 import org.eclipse.swt.events.SelectionListener;

@@ -142,10 +143,10 @@ public class GeneralizationSetCreationCommand extends CreateRelationshipCommand
 				GridLayout gridLayout = new GridLayout(2, false);

 				gridLayout.verticalSpacing = 8;

 				dialog.setLayout(gridLayout);

-				dialog.setText("GeneralizationSet Selection");

+				dialog.setText(Messages.GeneralizationSetCreationCommand_0);

 				// Line1: Proposition of a new GeneralizationSet

 				Label text = new Label(dialog, SWT.CENTER);

-				text.setText("Would you like to create a new Generalization?");

+				text.setText(Messages.GeneralizationSetCreationCommand_1);

 				text.setBackground(ColorConstants.white);

 				GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);

 				gridData.horizontalSpan = 1;

@@ -158,7 +159,7 @@ public class GeneralizationSetCreationCommand extends CreateRelationshipCommand
 				// Line2:

 				text = new Label(dialog, SWT.CENTER);

 				text.setBackground(ColorConstants.white);

-				text.setText("Choose a following generalizationSet to connect:");

+				text.setText(Messages.GeneralizationSetCreationCommand_2);

 				gridData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);

 				gridData.horizontalSpan = 1;

 				text.setLayoutData(gridData);

@@ -176,7 +177,7 @@ public class GeneralizationSetCreationCommand extends CreateRelationshipCommand
 					if (generalizationSetList.get(i).getLabel() != null) {

 						list.add(generalizationSetList.get(i).getLabel());

 					} else {

-						list.add("GeneralizationSet" + i);

+						list.add("GeneralizationSet" + i); //$NON-NLS-1$

 					}

 				}

 				radios[0].addSelectionListener(new SelectionListener() {

@@ -197,14 +198,14 @@ public class GeneralizationSetCreationCommand extends CreateRelationshipCommand
 				gridData.horizontalSpan = 1;

 				gridData.horizontalAlignment = GridData.END;

 				buttonok.setLayoutData(gridData);

-				buttonok.setText("  OK  ");

+				buttonok.setText(Messages.GeneralizationSetCreationCommand_4);

 				// button Cancel

 				Button cancel = new Button(dialog, SWT.PUSH);

 				gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);

 				gridData.horizontalSpan = 1;

 				gridData.horizontalAlignment = GridData.END;

 				cancel.setLayoutData(gridData);

-				cancel.setText("Cancel");

+				cancel.setText(Messages.GeneralizationSetCreationCommand_5);

 				// listener of button

 				DialogListener listener = new DialogListener(generalizationSetList, list, buttonok);

 				buttonok.addListener(SWT.Selection, listener);

@@ -240,7 +241,7 @@ public class GeneralizationSetCreationCommand extends CreateRelationshipCommand
 		}

 		if (generalizationSettoCreate == null) {

 			generalizationSettoCreate = UMLFactory.eINSTANCE.createGeneralizationSet();

-			generalizationSettoCreate.setName("GeneralizationSet_" + source.getSpecific().getName() + "_" + target.getSpecific().getName());

+			generalizationSettoCreate.setName("GeneralizationSet_" + source.getSpecific().getName() + "_" + target.getSpecific().getName()); //$NON-NLS-1$ //$NON-NLS-2$

 			container.getPackagedElements().add(generalizationSettoCreate);

 		}

 		if (!generalizationSettoCreate.getGeneralizations().contains(source)) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CustomInformationFlowCreateCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/InformationFlowCreateCommand.java
index 352a9990bb5..eb6aa7c0a96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CustomInformationFlowCreateCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/InformationFlowCreateCommand.java
@@ -12,7 +12,7 @@
  *  Christian W. Damus (CEA) - bug 410346
  *
  *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.command;
+package org.eclipse.papyrus.uml.service.types.command;
 
 import java.util.ArrayList;
 
@@ -24,26 +24,29 @@ import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.CreateElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
 import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.uml.diagram.composite.custom.messages.Messages;
-import org.eclipse.papyrus.uml.diagram.composite.custom.ui.InformationItemElementTreeSelectionDialog;
-import org.eclipse.papyrus.uml.diagram.composite.custom.ui.InformationItemValidator;
-import org.eclipse.papyrus.uml.diagram.composite.custom.ui.NameLabelValidator;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.service.types.Activator;
+import org.eclipse.papyrus.uml.service.types.messages.Messages;
+import org.eclipse.papyrus.uml.service.types.ui.InformationItemElementTreeSelectionDialog;
+import org.eclipse.papyrus.uml.service.types.ui.InformationItemValidator;
+import org.eclipse.papyrus.uml.service.types.ui.NameLabelValidator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.InformationFlow;
 import org.eclipse.uml2.uml.InformationItem;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.UMLFactory;
 
 /**
@@ -52,11 +55,17 @@ import org.eclipse.uml2.uml.UMLFactory;
  * InformationFlow are references toward any {@link InformationItem} in the model
  * </pre>
  */
-public class CustomInformationFlowCreateCommand extends org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand {
+public class InformationFlowCreateCommand extends CreateElementCommand {
+	EObject source;
 
-	public CustomInformationFlowCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request, source, target);
+	EObject target;
 
+
+
+	public InformationFlowCreateCommand(CreateRelationshipRequest request) {
+		super(request);
+		source = ((CreateRelationshipRequest) request).getSource();
+		target = ((CreateRelationshipRequest) request).getTarget();
 	}
 
 	/**
@@ -65,7 +74,7 @@ public class CustomInformationFlowCreateCommand extends org.eclipse.papyrus.uml.
 	 *  - opens a selection dialog to choose {@link InformationItem} or {@link Classifier} reference as a convoyed Classifier
 	 *   by the {@link InformationFlow} type
 	 *  - create the InformationFlow between the source and the target
-	 *
+	 * 
 	 * {@inheritDoc}
 	 * </pre>
 	 */
@@ -79,8 +88,8 @@ public class CustomInformationFlowCreateCommand extends org.eclipse.papyrus.uml.
 
 		try {
 			// Set dialog parameters
-			dialog.setTitle(Messages.InformationFlowSelectionDialog_Title);
-			dialog.setMessage(Messages.InformationFlowSelectionDialog_Message);
+			dialog.setTitle(Messages.InformationFlowCreateCommand_0);
+			dialog.setMessage(Messages.InformationFlowCreateCommand_1);
 			dialog.setAllowMultiple(true);
 			dialog.setHelpAvailable(false);
 			dialog.setInput(getSource().getModel());
@@ -99,7 +108,7 @@ public class CustomInformationFlowCreateCommand extends org.eclipse.papyrus.uml.
 					Object[] conveyedClassified = dialog.getResult();
 
 					InformationFlow newInformationFlow = UMLFactory.eINSTANCE.createInformationFlow();
-					getContainer().getPackagedElements().add(newInformationFlow);
+					((Package) ((CreateElementRequest) getRequest()).getContainer()).getPackagedElements().add(newInformationFlow);
 					newInformationFlow.getInformationSources().add(getSource());
 					newInformationFlow.getInformationTargets().add(getTarget());
 
@@ -108,7 +117,7 @@ public class CustomInformationFlowCreateCommand extends org.eclipse.papyrus.uml.
 						newInformationFlow.getConveyeds().add((Classifier) conveyedClassified[i]);
 					}
 
-					ElementInitializers.getInstance().init_InformationFlow_4021(newInformationFlow);
+					// ElementInitializers.getInstance().init_InformationFlow_4021(newInformationFlow);
 
 					((CreateElementRequest) getRequest()).setNewElement(newInformationFlow);
 					return CommandResult.newOKCommandResult(newInformationFlow);
@@ -127,6 +136,24 @@ public class CustomInformationFlowCreateCommand extends org.eclipse.papyrus.uml.
 		return CommandResult.newCancelledCommandResult();
 	}
 
+
+	private NamedElement getSource() {
+		if (source instanceof Element) {
+			return (NamedElement) source;
+		}
+		return null;
+	}
+
+	/**
+	 * @return
+	 */
+	private NamedElement getTarget() {
+		if (target instanceof Element) {
+			return (NamedElement) target;
+		}
+		return null;
+	}
+
 	/**
 	 * - Create a new {@link InformationItem}
 	 *
@@ -139,8 +166,8 @@ public class CustomInformationFlowCreateCommand extends org.eclipse.papyrus.uml.
 	private InformationItem createNewInformationItem() {
 		// create the new InformationItem
 		InformationItem infoItem = UMLFactory.eINSTANCE.createInformationItem();
-		getContainer().getPackagedElements().add(infoItem);
-		ElementInitializers.getInstance().init_InformationItem_2080(infoItem);
+		((Package) ((CreateElementRequest) getRequest()).getContainer()).getPackagedElements().add(infoItem);
+		// ElementInitializers.getInstance().init_InformationItem_2080(infoItem);
 
 		// ask for the name of the new InformationItem
 		// Create the editor
@@ -149,15 +176,15 @@ public class CustomInformationFlowCreateCommand extends org.eclipse.papyrus.uml.
 		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + infoItem.eClass().getInstanceClassName());
 		configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, infoItem.eClass().getInstanceClassName());
 		configuration.preEditAction(infoItem);
-		configuration.setInputValidator(new NameLabelValidator(Messages.InformationItemGetNameDialog_Error_Message));
+		configuration.setInputValidator(new NameLabelValidator(Messages.InformationFlowCreateCommand_2));
 		ExtendedDirectEditionDialog dialog = new ExtendedDirectEditionDialog(currentShell, infoItem, infoItem.getName(), configuration);
 
 		dialog.open();
 
 		if (dialog.getReturnCode() == Window.CANCEL) {
 			// We delete the newInformationItem
-			int index = getContainer().getPackagedElements().indexOf(infoItem);
-			getContainer().getPackagedElements().remove(index);
+			int index = ((Package) ((CreateElementRequest) getRequest()).getContainer()).getPackagedElements().indexOf(infoItem);
+			((Package) ((CreateElementRequest) getRequest()).getContainer()).getPackagedElements().remove(index);
 			return null;
 		} else {
 			infoItem.setName(dialog.getValue());
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ManifestationReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ManifestationReorientCommand.java
new file mode 100644
index 00000000000..10a75c67dd3
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ManifestationReorientCommand.java
@@ -0,0 +1,83 @@
+/*****************************************************************************

+ * Copyright (c) 2011 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ * 

+ * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.service.types.command;

+

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.uml2.uml.Manifestation;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.PackageableElement;

+

+/**

+ * <pre>

+ * Re-orient command for {@link Manifestation} elements.

+ * </pre>

+ */

+public class ManifestationReorientCommand extends DependencyReorientCommand {

+

+	/**

+	 * <pre>

+	 * Constructor.

+	 * 

+	 * @param request the re-orient relationship request.

+	 * </pre>

+	 */

+	public ManifestationReorientCommand(ReorientRelationshipRequest request) {

+		super(request);

+	}

+

+	/**

+	 * <pre>

+	 * @see org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand#canExecute()

+	 * 

+	 * @return true if the command is executable.

+	 * </pre>

+	 */

+	public boolean canExecute() {

+		if (!(getElementToEdit() instanceof Manifestation)) {

+			return false;

+		}

+

+		return super.canExecute();

+	}

+

+	protected boolean canReorientSource() {

+		if (!(newEnd instanceof NamedElement)) {

+			return false;

+		}

+

+		if (getLink().getClients().contains(newEnd)) {

+			return false;

+		}

+

+		return true;

+	}

+

+	protected boolean canReorientTarget() {

+		if (!(newEnd instanceof PackageableElement)) {

+			return false;

+		}

+

+		if (newEnd == getLink().getUtilizedElement()) {

+			return false;

+		}

+

+		return true;

+	}

+

+	protected Manifestation getLink() {

+		return (Manifestation) getElementToEdit();

+	}

+

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityNodeHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityNodeHelper.java
index 60049f23380..4c7846c6442 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityNodeHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityNodeHelper.java
@@ -41,9 +41,9 @@ public class ActivityNodeHelper extends ElementEditHelper {
 	/**

 	 * Parameter name for {@link ConfigureRequest} Used to pass the actual partition instance to set {@link ActivityNode#getInPartition()}

 	 */

-	public static final String IN_PARTITION = "IN_PARTITION";

+	public static final String IN_PARTITION = "IN_PARTITION"; //$NON-NLS-1$

 

-	public static final String IN_INTERRUPTIBLE_ACTIVITY_REGION = "IN_INTERRUPTIBLE_ACTIVITY_REGION";

+	public static final String IN_INTERRUPTIBLE_ACTIVITY_REGION = "IN_INTERRUPTIBLE_ACTIVITY_REGION"; //$NON-NLS-1$

 

 	@Override

 	protected ICommand getBasicDestroyElementCommand(DestroyElementRequest req) {

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityPartitionEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityPartitionEditHelper.java
index 9dad69fc56c..2dabe3011d4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityPartitionEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ActivityPartitionEditHelper.java
@@ -10,6 +10,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.papyrus.uml.service.types.command.NotContainmentMoveCommand;
+import org.eclipse.papyrus.uml.service.types.messages.Messages;
 import org.eclipse.uml2.uml.Activity;
 import org.eclipse.uml2.uml.ActivityNode;
 import org.eclipse.uml2.uml.ActivityPartition;
@@ -44,7 +45,7 @@ public class ActivityPartitionEditHelper extends ActivityGroupHelper {
 	protected ICommand getMoveCommand(MoveRequest req) {
 		if (req != null) {
 			if (req.getTargetContainer() instanceof ActivityPartition) {
-				CompositeCommand result = new CompositeCommand("Move elements in Partition");
+				CompositeCommand result = new CompositeCommand(Messages.ActivityPartitionEditHelper_0);
 				/**
 				 * separate moving elements containment and not
 				 */
@@ -68,7 +69,7 @@ public class ActivityPartitionEditHelper extends ActivityGroupHelper {
 	 * Contain {@link NotContainmentMoveCommand} to {@link Activity} and {@link SetValueCommand} to set not containment reference for {@link ActivityPartition}
 	 */
 	private ICommand createMoveActivityNodeCommand(MoveRequest baseRequest, ActivityNode node) {
-		CompositeCommand cc = new CompositeCommand("Move ActivityNode command");
+		CompositeCommand cc = new CompositeCommand(Messages.ActivityPartitionEditHelper_1);
 
 		ActivityPartition partition = (ActivityPartition) baseRequest.getTargetContainer();
 		EReference containmentFeature = findActivityFeature(node.eClass());
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CommentEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CommentEditHelper.java
deleted file mode 100644
index 0c9f7c47ff8..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CommentEditHelper.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011-2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *		

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.service.types.helper;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Comment;

-

-/**

- * Edit helper class for binary {@link Association}

- */

-public class CommentEditHelper extends ElementEditHelper {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		// Delegate to advices

-		return null;

-	}

-

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		if (req.getSource() instanceof Comment)

-		{

-			// Delegate to advices

-			return null;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DeploymentEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DeploymentEditHelper.java
new file mode 100644
index 00000000000..fe901fa5ac0
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DeploymentEditHelper.java
@@ -0,0 +1,76 @@
+/*****************************************************************************

+ * Copyright (c) 2011 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ * 

+ * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.service.types.helper;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EReference;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.service.types.command.DeploymentReorientCommand;

+import org.eclipse.uml2.uml.DeployedArtifact;

+import org.eclipse.uml2.uml.Deployment;

+import org.eclipse.uml2.uml.DeploymentTarget;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * This helper is used to set the source and the target for a {@link Deployment}

+ */

+public class DeploymentEditHelper extends DependencyEditHelper {

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected EReference getSourceReference() {

+		return UMLPackage.eINSTANCE.getDeployment_Location();

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected EReference getTargetReference() {

+		return UMLPackage.eINSTANCE.getDeployment_DeployedArtifact();

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected boolean canCreate(EObject source, EObject target) {

+

+		if ((source != null) && !(source instanceof DeploymentTarget)) {

+			return false;

+		}

+

+		if ((target != null) && !(target instanceof DeployedArtifact)) {

+			return false;

+		}

+

+		if ((source != null) && (target != null) && (source == target)) {

+			return false;

+		}

+

+		return true;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected ICommand getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		return new DeploymentReorientCommand(req);

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExpansionNodeHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExpansionNodeHelper.java
index 544ec7ef403..1bb0fb0cf1b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExpansionNodeHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExpansionNodeHelper.java
@@ -15,13 +15,13 @@ public class ExpansionNodeHelper extends ActivityNodeHelper {
 	 * Parameter name for {@link ConfigureRequest}
 	 * Used to pass the parent EObject to actual new element to set it in referenced not containment list.
 	 */
-	public static final String IN_EXPANSION_REGION = "IN_EXPANSION_REGION";
+	public static final String IN_EXPANSION_REGION = "IN_EXPANSION_REGION"; //$NON-NLS-1$
 	
 	/** 
 	 * Parameter name for {@link ConfigureRequest}
 	 * Used to determine feature to add new element in referenced not containment parent list.
 	 */
-	public static final String EXPANSION_REGION_FEATURE = "EXPANSION_REGION_FEATURE";
+	public static final String EXPANSION_REGION_FEATURE = "EXPANSION_REGION_FEATURE"; //$NON-NLS-1$
 	
 	@Override
 	protected ICommand getConfigureCommand(ConfigureRequest req) {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InstanceSpecificationEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InstanceSpecificationEditHelper.java
deleted file mode 100644
index a863f9a8020..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InstanceSpecificationEditHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010-2011 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.service.types.helper;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.uml2.uml.InstanceSpecification;

-

-public class InstanceSpecificationEditHelper extends ElementEditHelper {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		// Delegate to advices

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		if(req.getSource() instanceof InstanceSpecification) {

-			// Delegate to advices

-			return null;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InterruptibleActivityRegionHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InterruptibleActivityRegionHelper.java
index 79403f5f06f..507b3f584bb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InterruptibleActivityRegionHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InterruptibleActivityRegionHelper.java
@@ -12,6 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.papyrus.uml.service.types.command.NotContainmentMoveCommand;
+import org.eclipse.papyrus.uml.service.types.messages.Messages;
 import org.eclipse.uml2.uml.Activity;
 import org.eclipse.uml2.uml.ActivityNode;
 import org.eclipse.uml2.uml.InterruptibleActivityRegion;
@@ -83,7 +84,7 @@ public class InterruptibleActivityRegionHelper extends ActivityGroupHelper {
 	 */
 	protected ICommand createMoveCommandWithSetReference(MoveRequest req, EReference featureToSetReference) {
 		EObject nonContainmentContainer = (EObject) req.getTargetContainer();
-		CompositeCommand result = new CompositeCommand("Move elements in non containment Activity container");
+		CompositeCommand result = new CompositeCommand(Messages.InterruptibleActivityRegionHelper_0);
 		MoveElementsCommand moveCommand = new NotContainmentMoveCommand(createMoveToActivityRequest(req));
 		result.add(moveCommand);
 		for (Object o : req.getElementsToMove().keySet()) {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ManifestationEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ManifestationEditHelper.java
new file mode 100644
index 00000000000..56d8f879a1f
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ManifestationEditHelper.java
@@ -0,0 +1,76 @@
+/*****************************************************************************

+ * Copyright (c) 2011 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ * 

+ * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.service.types.helper;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EReference;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.service.types.command.ManifestationReorientCommand;

+import org.eclipse.uml2.uml.Manifestation;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.PackageableElement;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * This helper is used to set the source and the target for a {@link Manifestation}

+ */

+public class ManifestationEditHelper extends DependencyEditHelper {

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected EReference getSourceReference() {

+		return UMLPackage.eINSTANCE.getDependency_Client();

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected EReference getTargetReference() {

+		return UMLPackage.eINSTANCE.getManifestation_UtilizedElement();

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected boolean canCreate(EObject source, EObject target) {

+

+		if ((source != null) && !(source instanceof NamedElement)) {

+			return false;

+		}

+

+		if ((target != null) && !(target instanceof PackageableElement)) {

+			return false;

+		}

+

+		if ((source != null) && (target != null) && (source == target)) {

+			return false;

+		}

+

+		return true;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected ICommand getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		return new ManifestationReorientCommand(req);

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/NamespaceEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/NamespaceEditHelper.java
deleted file mode 100644
index d00ceed889b..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/NamespaceEditHelper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 

- * 		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.service.types.helper;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-

-

-

-public class NamespaceEditHelper extends ElementEditHelper {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		// For contaimentlink

-		// Delegate to advices

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		// For contaimentlink

-		if (req.getSource() instanceof org.eclipse.uml2.uml.Namespace)

-		{

-			// Delegate to advices

-			return null;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/PackageEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/PackageEditHelper.java
deleted file mode 100644
index e3c8ca2eab2..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/PackageEditHelper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 

- * 		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.service.types.helper;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-

-

-

-public class PackageEditHelper extends ElementEditHelper {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		// For contaimentlink

-		// Delegate to advices

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		// For contaimentlink

-		if (req.getSource() instanceof org.eclipse.uml2.uml.Package)

-		{

-			// Delegate to advices

-			return null;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java
new file mode 100644
index 00000000000..214ec80e403
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java
@@ -0,0 +1,46 @@
+package org.eclipse.papyrus.uml.service.types.helper.advice;

+

+import java.util.Arrays;

+import java.util.List;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.ElementTypeRegistryUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+

+abstract public class AbstractFeatureRelationshipReorientEditHelperAdvice extends AbstractEditHelperAdvice {

+

+

+	@Override

+	protected ICommand getBeforeReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest request) {

+

+		Object value = request.getParameters().get(DefaultSemanticEditPolicy.GRAPHICAL_RECONNECTED_EDGE);

+

+		if (value instanceof View) {

+			List<IElementType> elementTypes = ElementTypeRegistryUtils.getElementTypesBySemanticHint(((View) value).getType());

+

+			for (IElementType iElementType : elementTypes) {

+				List<ISpecializationType> subs = Arrays.asList(ElementTypeRegistry.getInstance().getSpecializationsOf(elementTypeIDToSpecialize()));

+				if (subs.contains(iElementType)) {

+					return getFeatureRelationshipReorientCommand(request);

+				}

+			}

+		}

+

+		return null;

+	}

+

+	/**

+	 * @return

+	 */

+	abstract protected String elementTypeIDToSpecialize();

+

+	abstract protected ICommand getFeatureRelationshipReorientCommand(ReorientReferenceRelationshipRequest request);

+

+

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationEditHelperAdvice.java
index 45aab5ad66d..a69571f8c42 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationEditHelperAdvice.java
@@ -207,7 +207,7 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 				association.getMemberEnds().add(sourceEnd);

 				association.getMemberEnds().add(targetEnd);

 

-				association.setName("A_" + sourceEnd.getName() + "_" + targetEnd.getName());

+				association.setName("A_" + sourceEnd.getName() + "_" + targetEnd.getName()); //$NON-NLS-1$ //$NON-NLS-2$

 

 				// Add end properties in the model

 				try {

@@ -322,8 +322,8 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 		if (association.getMemberEnds().size() == 2) {

 

 

-			Property semanticSource = association.getMemberEnds().get(0);

-			Property semanticTarget = association.getMemberEnds().get(1);

+			Property semanticTarget = association.getMemberEnds().get(0);

+			Property semanticSource = association.getMemberEnds().get(1);

 

 

 			if (request.getDirection() == ReorientRelationshipRequest.REORIENT_SOURCE) {

@@ -403,6 +403,7 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 		return gmfCommand;

 	}

 

+

 	/**

 	 * Find the first memberEnd of an association that is typed by the specified classifier

 	 * 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/CollaborationCollaborationRoleEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/CollaborationCollaborationRoleEditHelperAdvice.java
new file mode 100644
index 00000000000..c42b94010cf
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/CollaborationCollaborationRoleEditHelperAdvice.java
@@ -0,0 +1,27 @@
+package org.eclipse.papyrus.uml.service.types.helper.advice;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.GetEditContextCommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

+import org.eclipse.papyrus.uml.service.types.command.CollaborationRoleCreateCommand;

+

+

+public class CollaborationCollaborationRoleEditHelperAdvice extends AbstractEditHelperAdvice {

+

+	@Override

+	protected ICommand getBeforeEditContextCommand(final GetEditContextRequest request) {

+

+		GetEditContextCommand command = new GetEditContextCommand(request);

+		command.setEditContext(request.getEditHelperContext());

+		return command;

+

+	}

+

+

+	@Override

+	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {

+		return new CollaborationRoleCreateCommand(request);

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/CommentAnnotatedElementsEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/CommentAnnotatedElementsEditHelperAdvice.java
index 208ee798576..b25b5d361d4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/CommentAnnotatedElementsEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/CommentAnnotatedElementsEditHelperAdvice.java
@@ -4,20 +4,22 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;

 import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.GetEditContextCommand;

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

 import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 

 public class CommentAnnotatedElementsEditHelperAdvice extends AbstractEditHelperAdvice {

 

-

 	@Override

-	protected ICommand getBeforeReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest request) {

-		return new CommentAnnotatedElementsReorientCommand(request);

+	protected ICommand getBeforeEditContextCommand(final GetEditContextRequest request) {

+

+		GetEditContextCommand command = new GetEditContextCommand(request);

+		command.setEditContext(request.getEditHelperContext());

+		return command;

 	}

 

 	protected boolean canCreate(EObject source, EObject target) {

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/CommentAnnotatedElementsReorientEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/CommentAnnotatedElementsReorientEditHelperAdvice.java
new file mode 100644
index 00000000000..14e177ca949
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/CommentAnnotatedElementsReorientEditHelperAdvice.java
@@ -0,0 +1,31 @@
+package org.eclipse.papyrus.uml.service.types.helper.advice;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;

+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

+

+public class CommentAnnotatedElementsReorientEditHelperAdvice extends AbstractFeatureRelationshipReorientEditHelperAdvice {

+

+	/**

+	 * @see org.eclipse.papyrus.uml.service.types.helper.advice.AbstractFeatureRelationshipReorientEditHelperAdvice#elementTypeIDToSpecialize()

+	 *

+	 * @return

+	 */

+	@Override

+	protected String elementTypeIDToSpecialize() {

+		return UMLElementTypes.COMMENT_ANNOTATEDELEMENTS.getId();

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.uml.service.types.helper.advice.AbstractFeatureRelationshipReorientEditHelperAdvice#getReorientCommand()

+	 *

+	 * @return

+	 */

+	@Override

+	protected ICommand getFeatureRelationshipReorientCommand(ReorientReferenceRelationshipRequest request) {

+		return new CommentAnnotatedElementsReorientCommand(request);

+	}

+

+

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintConstrainedElementsEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintConstrainedElementsEditHelperAdvice.java
index f01bbb305a4..4912b8a7cc5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintConstrainedElementsEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintConstrainedElementsEditHelperAdvice.java
@@ -1,25 +1,27 @@
 package org.eclipse.papyrus.uml.service.types.helper.advice;

 

-import java.util.Arrays;

-import java.util.List;

-

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;

 import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.GetEditContextCommand;

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

 import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsReorientCommand;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Element;

 

 public class ConstraintConstrainedElementsEditHelperAdvice extends AbstractEditHelperAdvice {

 

+	@Override

+	protected ICommand getBeforeEditContextCommand(final GetEditContextRequest request) {

+

+		GetEditContextCommand command = new GetEditContextCommand(request);

+		command.setEditContext(request.getEditHelperContext());

+		return command;

+	}

+

 	protected boolean canCreate(EObject source, EObject target) {

 		if ((source != null) && !(source instanceof Constraint)) {

 			return false;

@@ -33,20 +35,8 @@ public class ConstraintConstrainedElementsEditHelperAdvice extends AbstractEditH
 	}

 

 	@Override

-	protected ICommand getBeforeReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest request) {

-		return new ConstraintConstrainedElementsReorientCommand(request);

-	}

-

-	@Override

 	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {

 

-		List<ISpecializationType> subs = Arrays.asList(ElementTypeRegistry.getInstance().getSpecializationsOf(UMLElementTypes.CONSTRAINT_CONSTRAINEDELEMENTS.getId()));

-		if (!subs.contains(request.getElementType()))

-		{

-			return IdentityCommand.INSTANCE;

-		}

-

-

 		EObject source = request.getSource();

 		EObject target = request.getTarget();

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintConstrainedElementsReorientEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintConstrainedElementsReorientEditHelperAdvice.java
new file mode 100644
index 00000000000..5195aea48d3
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintConstrainedElementsReorientEditHelperAdvice.java
@@ -0,0 +1,31 @@
+package org.eclipse.papyrus.uml.service.types.helper.advice;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsReorientCommand;

+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

+

+public class ConstraintConstrainedElementsReorientEditHelperAdvice extends AbstractFeatureRelationshipReorientEditHelperAdvice {

+

+	/**

+	 * @see org.eclipse.papyrus.uml.service.types.helper.advice.AbstractFeatureRelationshipReorientEditHelperAdvice#elementTypeIDToSpecialize()

+	 *

+	 * @return

+	 */

+	@Override

+	protected String elementTypeIDToSpecialize() {

+		return UMLElementTypes.CONSTRAINT_CONSTRAINEDELEMENTS.getId();

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.uml.service.types.helper.advice.AbstractFeatureRelationshipReorientEditHelperAdvice#getReorientCommand()

+	 *

+	 * @return

+	 */

+	@Override

+	protected ICommand getFeatureRelationshipReorientCommand(ReorientReferenceRelationshipRequest request) {

+		return new ConstraintConstrainedElementsReorientCommand(request);

+	}

+

+

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintContextEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintContextEditHelperAdvice.java
index 2c858529297..71d1afae33f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintContextEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintContextEditHelperAdvice.java
@@ -1,20 +1,14 @@
 package org.eclipse.papyrus.uml.service.types.helper.advice;

 

-import java.util.Arrays;

-import java.util.List;

-

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;

 import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.GetEditContextCommand;

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

 import org.eclipse.papyrus.uml.service.types.command.ConstraintContextCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.ConstraintContextReorientCommand;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Element;

 

@@ -22,6 +16,14 @@ public class ConstraintContextEditHelperAdvice extends AbstractEditHelperAdvice
 

 

 

+	@Override

+	protected ICommand getBeforeEditContextCommand(final GetEditContextRequest request) {

+

+		GetEditContextCommand command = new GetEditContextCommand(request);

+		command.setEditContext(request.getEditHelperContext());

+		return command;

+	}

+

 	protected boolean canCreate(EObject source, EObject target) {

 		if ((source != null) && !(source instanceof Constraint)) {

 			return false;

@@ -35,18 +37,8 @@ public class ConstraintContextEditHelperAdvice extends AbstractEditHelperAdvice
 	}

 

 	@Override

-	protected ICommand getBeforeReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest request) {

-		return new ConstraintContextReorientCommand(request);

-	}

-

-	@Override

 	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {

 

-		List<ISpecializationType> subs = Arrays.asList(ElementTypeRegistry.getInstance().getSpecializationsOf(UMLElementTypes.CONSTRAINT_CONTEXT.getId()));

-		if (!subs.contains(request.getElementType()))

-		{

-			return IdentityCommand.INSTANCE;

-		}

 

 		EObject source = request.getSource();

 		EObject target = request.getTarget();

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintContextReorientEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintContextReorientEditHelperAdvice.java
new file mode 100644
index 00000000000..c93125f37e0
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ConstraintContextReorientEditHelperAdvice.java
@@ -0,0 +1,32 @@
+package org.eclipse.papyrus.uml.service.types.helper.advice;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.papyrus.uml.service.types.command.ConstraintContextReorientCommand;

+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

+

+public class ConstraintContextReorientEditHelperAdvice extends AbstractFeatureRelationshipReorientEditHelperAdvice {

+

+

+	/**

+	 * @see org.eclipse.papyrus.uml.service.types.helper.advice.AbstractFeatureRelationshipReorientEditHelperAdvice#elementTypeIDToSpecialize()

+	 *

+	 * @return

+	 */

+	@Override

+	protected String elementTypeIDToSpecialize() {

+		return UMLElementTypes.CONSTRAINT_CONTEXT.getId();

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.uml.service.types.helper.advice.AbstractFeatureRelationshipReorientEditHelperAdvice#getReorientCommand()

+	 *

+	 * @return

+	 */

+	@Override

+	protected ICommand getFeatureRelationshipReorientCommand(ReorientReferenceRelationshipRequest request) {

+		return new ConstraintContextReorientCommand(request);

+	}

+

+

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ContainmentSubsetRemovalAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ContainmentSubsetRemovalAdvice.java
index 871314baba8..27e870fbfb2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ContainmentSubsetRemovalAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ContainmentSubsetRemovalAdvice.java
@@ -24,6 +24,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.papyrus.uml.service.types.messages.Messages;
 import org.eclipse.papyrus.uml.tools.model.UmlUtils;
 
 /**
@@ -65,7 +66,7 @@ public class ContainmentSubsetRemovalAdvice extends AbstractEditHelperAdvice {
 			// Add a command that ensures removal from the supersets on redo, if necessary
 			final EObject container = destructee.eContainer();
 
-			ICommand advice = new AbstractCommand("Ensure supersets") {
+			ICommand advice = new AbstractCommand(Messages.ContainmentSubsetRemovalAdvice_0) {
 
 				@Override
 				protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/NamespaceOwnedMemberEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ElementOwnedElementEditHelperAdvice.java
index 34193e5245f..98bded43893 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/NamespaceOwnedMemberEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ElementOwnedElementEditHelperAdvice.java
@@ -9,14 +9,24 @@ import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;
 import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.GetEditContextCommand;

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.uml.service.types.command.NamespaceOwnedMemberCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.NamespaceOwnedMemberReorientCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

+import org.eclipse.papyrus.uml.service.types.command.ElementOwnedElementCreateCommand;

 import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

 

-public class NamespaceOwnedMemberEditHelperAdvice extends AbstractEditHelperAdvice {

+

+public class ElementOwnedElementEditHelperAdvice extends AbstractEditHelperAdvice {

+

+	@Override

+	protected ICommand getBeforeEditContextCommand(final GetEditContextRequest request) {

+

+		GetEditContextCommand command = new GetEditContextCommand(request);

+		command.setEditContext(request.getEditHelperContext());

+		return command;

+

+	}

 

 	protected boolean canCreate(EObject source, EObject target) {

 		if ((source != null) && !(source instanceof org.eclipse.uml2.uml.Namespace)) {

@@ -30,15 +40,11 @@ public class NamespaceOwnedMemberEditHelperAdvice extends AbstractEditHelperAdvi
 		return true;

 	}

 

-	@Override

-	protected ICommand getBeforeReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest request) {

-		return new NamespaceOwnedMemberReorientCommand(request);

-	}

 

 	@Override

 	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {

-		// Be careful, This advice is binded to Namespace elementtype directly

-		List<ISpecializationType> subs = Arrays.asList(ElementTypeRegistry.getInstance().getSpecializationsOf(UMLElementTypes.NAMESPACE_OWNEDMEMBER.getId()));

+		// Be careful, This advice is binded to Element elementtype directly

+		List<ISpecializationType> subs = Arrays.asList(ElementTypeRegistry.getInstance().getSpecializationsOf(UMLElementTypes.ELEMENT_OWNEDELEMENT.getId()));

 		if (!subs.contains(request.getElementType()))

 		{

 			return IdentityCommand.INSTANCE;

@@ -60,6 +66,8 @@ public class NamespaceOwnedMemberEditHelperAdvice extends AbstractEditHelperAdvi
 			// that the create relationship gesture is enabled.

 			return IdentityCommand.INSTANCE;

 		}

-		return new NamespaceOwnedMemberCreateCommand(request);

+

+

+		return new ElementOwnedElementCreateCommand(request);

 	}

 }

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ElementOwnedElementReorientEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ElementOwnedElementReorientEditHelperAdvice.java
new file mode 100644
index 00000000000..f8b8446a8a5
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ElementOwnedElementReorientEditHelperAdvice.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.uml.service.types.helper.advice;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.papyrus.uml.service.types.command.ElementOwnedElementReorientCommand;

+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

+

+

+public class ElementOwnedElementReorientEditHelperAdvice extends AbstractFeatureRelationshipReorientEditHelperAdvice {

+

+	/**

+	 * @see org.eclipse.papyrus.uml.service.types.helper.advice.AbstractFeatureRelationshipReorientEditHelperAdvice#elementTypeIDToSpecialize()

+	 *

+	 * @return

+	 */

+	@Override

+	protected String elementTypeIDToSpecialize() {

+		return UMLElementTypes.ELEMENT_OWNEDELEMENT.getId();

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.uml.service.types.helper.advice.AbstractFeatureRelationshipReorientEditHelperAdvice#getReorientCommand()

+	 *

+	 * @return

+	 */

+	@Override

+	protected ICommand getFeatureRelationshipReorientCommand(ReorientReferenceRelationshipRequest request) {

+		return new ElementOwnedElementReorientCommand(request);

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/InformationFlowEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/InformationFlowEditHelperAdvice.java
new file mode 100644
index 00000000000..58edfaf6dbb
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/InformationFlowEditHelperAdvice.java
@@ -0,0 +1,39 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.service.types.helper.advice;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.service.types.command.InformationFlowCreateCommand;

+

+public class InformationFlowEditHelperAdvice extends AbstractEditHelperAdvice {

+

+	/**

+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest)

+	 *

+	 * @param request

+	 * @return

+	 */

+	@Override

+	protected ICommand getAfterCreateCommand(CreateElementRequest request) {

+		if (request instanceof CreateRelationshipRequest) {

+

+			return new InformationFlowCreateCommand((CreateRelationshipRequest) request);

+		} else {

+			return super.getAfterCreateCommand(request);

+		}

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/PropertyPartHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/PropertyPartHelperAdvice.java
new file mode 100644
index 00000000000..33fb4580ec5
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/PropertyPartHelperAdvice.java
@@ -0,0 +1,97 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.service.types.helper.advice;

+

+import java.util.List;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.CreateElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+

+public class PropertyPartHelperAdvice extends AbstractEditHelperAdvice {

+

+

+

+	@Override

+	protected ICommand getAfterCreateCommand(CreateElementRequest request) {

+

+		List<EClass> subs = EMFHelper.getSubclassesOf(UMLPackage.eINSTANCE.getProperty(), true);

+		if (subs.contains(request.getElementType().getEClass())) {

+

+			return new CreateElementCommand(request) {

+

+				/**

+				 * <pre>

+				 * Checks if the Property can be created on the Property (means appearing graphically on the property).

+				 * The Property must be typed by a StructuredClassifier (in other words, an element that

+				 * can own Property). The new Property is owned be the type of the Property.

+				 * 

+				 * {@inheritDoc}

+				 * </pre>

+				 */

+				@Override

+				public boolean canExecute() {

+					setElementToEdit(((CreateElementRequest) getRequest()).getContainer());

+					Property target = (Property) getElementToEdit();

+

+					if ((target.getType() != null) && (target.getType() instanceof StructuredClassifier)) {

+						return true;

+					} else {

+

+						return false;

+					}

+				}

+

+				/**

+				 * <pre>

+				 * Custom creation of the Property type :

+				 * - resolve the Property type

+				 * - add a new Property on this type.

+				 * 

+				 * {@inheritDoc}

+				 * </pre>

+				 */

+				@Override

+				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

+					Property newElement = UMLFactory.eINSTANCE.createProperty();

+

+					StructuredClassifier owner = (StructuredClassifier) ((Property) getElementToEdit()).getType();

+					owner.getOwnedAttributes().add(newElement);

+

+

+					((CreateElementRequest) getRequest()).setNewElement(newElement);

+					return CommandResult.newOKCommandResult(newElement);

+				}

+			};

+		}

+

+		return super.getAfterCreateCommand(request);

+	}

+

+

+

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/RoleBindingHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/RoleBindingHelperAdvice.java
new file mode 100644
index 00000000000..7362e70f8ef
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/RoleBindingHelperAdvice.java
@@ -0,0 +1,116 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.service.types.helper.advice;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.uml.service.types.ui.CollaborationRoleTreeContentProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;

+import org.eclipse.uml2.uml.CollaborationUse;

+import org.eclipse.uml2.uml.ConnectableElement;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.NamedElement;

+

+

+public class RoleBindingHelperAdvice extends AbstractEditHelperAdvice {

+

+

+	@Override

+	protected ICommand getAfterCreateRelationshipCommand(CreateRelationshipRequest request) {

+		final EObject reqSource = request.getSource();

+

+		if (reqSource instanceof CollaborationUse) {

+			final CollaborationUse source = (CollaborationUse) reqSource;

+			final Dependency dependency = (Dependency) request.getNewElement();

+			final NamedElement target = (NamedElement) request.getTarget();

+			if ((target == null)) {

+				return UnexecutableCommand.INSTANCE;

+			}

+

+

+			return new CreateRelationshipCommand(request) {

+

+				@Override

+				protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+					if (!canExecute()) {

+						throw new ExecutionException("Invalid arguments in create link command");

+					}

+

+

+					// Create and open the selection dialog

+					ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

+					Shell currentShell = new Shell(Display.getCurrent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);

+					ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(currentShell, new AdapterFactoryLabelProvider(adapterFactory), new CollaborationRoleTreeContentProvider());

+

+					try {

+						// Set dialog parameters

+						dialog.setTitle("Collaboration role binding");

+						dialog.setMessage("Select the role to bind:");

+						dialog.setAllowMultiple(false);

+						dialog.setHelpAvailable(false);

+						// The source CollaborationUse is set as input for the selection dialog,

+						// the CollaborationRoleTreeContentProvider provides the roles that can possibly be

+						// selected.

+						dialog.setInput(source);

+

+						dialog.open();

+					} finally {

+						adapterFactory.dispose();

+					}

+

+					// If a ConnectableElement has been selected, complete command execution

+					// using selection as the "newly created" element and make the edited

+					// Collaboration reference it in the CollaborationRoles eReference.

+					if (dialog.getReturnCode() == Window.OK) {

+

+						ConnectableElement roleToBind = (ConnectableElement) dialog.getFirstResult();

+						// Create a Dependency (the binding) between selected role and a ConnectableElement

+						// (the target)

+						dependency.setName("binding_" + roleToBind.getName() + "_" + target.getName());

+						source.getRoleBindings().add(dependency);

+

+

+						((CreateElementRequest) getRequest()).setNewElement(dependency);

+

+						return CommandResult.newOKCommandResult(dependency);

+					}

+

+					// No role selected: abort element creation

+					return CommandResult.newCancelledCommandResult();

+				}

+			};

+		}

+

+		return null;

+

+	}

+

+

+

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/AssociationMatcher.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/AssociationMatcher.java
index 539ba9f4eea..58ba2d6771d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/AssociationMatcher.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/AssociationMatcher.java
@@ -51,6 +51,6 @@ public class AssociationMatcher implements IElementMatcher {
 	

 	private boolean hasNoNature(Element element) {

 		String nature = ElementUtil.getNature(element);

-		return nature == null || "".equals(nature);

+		return nature == null || "".equals(nature); //$NON-NLS-1$

 	}

 }

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/Messages.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/Messages.java
index 638266af2f7..13998cefa37 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/Messages.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/Messages.java
@@ -17,8 +17,80 @@ public class Messages extends NLS {
 

 	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.service.types.messages.messages"; //$NON-NLS-1$

 

+	public static String AbstractAssociationSelectionDialog_1;

+

+	public static String AbstractAssociationSelectionDialog_2;

+

+	public static String AbstractAssociationSelectionDialog_4;

+

+	public static String AbstractAssociationSelectionDialog_5;

+

 	public static String AbstractCreateUmlChildMenu_CommandWithoutDefinition;

 

+	public static String AbstractTemplateParameterConfigurationDialog_0;

+

+	public static String AbstractTemplateParameterConfigurationDialog_1;

+

+	public static String AbstractTemplateParameterConfigurationDialog_10;

+

+	public static String AbstractTemplateParameterConfigurationDialog_14;

+

+	public static String AbstractTemplateParameterConfigurationDialog_15;

+

+	public static String AbstractTemplateParameterConfigurationDialog_16;

+

+	public static String AbstractTemplateParameterConfigurationDialog_17;

+

+	public static String AbstractTemplateParameterConfigurationDialog_3;

+

+	public static String AbstractTemplateParameterConfigurationDialog_4;

+

+	public static String AbstractTemplateParameterConfigurationDialog_9;

+

+	public static String ActivityPartitionEditHelper_0;

+

+	public static String ActivityPartitionEditHelper_1;

+

+	public static String AssociationReorientCommand_0;

+

+	public static String AssociationReorientCommand_1;

+

+	public static String AssociationSelectionDialog_0;

+

+	public static String ConnectorReorientSemanticCommand_0;

+

+	public static String ContainmentSubsetRemovalAdvice_0;

+

+	public static String GeneralizationSetCreationCommand_0;

+

+	public static String GeneralizationSetCreationCommand_1;

+

+	public static String GeneralizationSetCreationCommand_2;

+

+	public static String GeneralizationSetCreationCommand_4;

+

+	public static String GeneralizationSetCreationCommand_5;

+

+	public static String InformationFlowCreateCommand_0;

+

+	public static String InformationFlowCreateCommand_1;

+

+	public static String InformationFlowCreateCommand_2;

+

+	public static String InformationItemElementTreeSelectionDialog_0;

+

+	public static String InformationItemValidator_0;

+

+	public static String InformationItemValidator_1;

+

+	public static String InformationItemValidator_2;

+

+	public static String InstanceSpecificationLinkCreateCommand_0;

+

+	public static String InterruptibleActivityRegionHelper_0;

+

+	public static String NamedElementHelper_0;

+

 	static {

 		// initialize resource bundle

 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/messages.properties b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/messages.properties
index ea593877429..2af983404c1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/messages.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/messages.properties
@@ -1 +1,37 @@
+AbstractAssociationSelectionDialog_1=AssociationSelection

+AbstractAssociationSelectionDialog_2=Select the association for this instanceSpecification:

+AbstractAssociationSelectionDialog_4=Ok

+AbstractAssociationSelectionDialog_5=Cancel

 AbstractCreateUmlChildMenu_CommandWithoutDefinition=Command without definition: 

+AbstractTemplateParameterConfigurationDialog_0=ParameteredElement:

+AbstractTemplateParameterConfigurationDialog_1=TemplateParameterConfiguration

+AbstractTemplateParameterConfigurationDialog_10=Set the default element for this parameter

+AbstractTemplateParameterConfigurationDialog_14=DefaultElement:

+AbstractTemplateParameterConfigurationDialog_15=New Label

+AbstractTemplateParameterConfigurationDialog_16=Execute

+AbstractTemplateParameterConfigurationDialog_17=Cancel

+AbstractTemplateParameterConfigurationDialog_3=Creation of a new template parameter:

+AbstractTemplateParameterConfigurationDialog_4=Set the  paramatered element in the model

+AbstractTemplateParameterConfigurationDialog_9=New Label

+ActivityPartitionEditHelper_0=Move elements in Partition

+ActivityPartitionEditHelper_1=Move ActivityNode command

+AssociationReorientCommand_0=Cannot add a Property on Classifier 

+AssociationReorientCommand_1=Invalid arguments in reorient link command

+AssociationSelectionDialog_0=<untyped>

+ConnectorReorientSemanticCommand_0=connector

+ContainmentSubsetRemovalAdvice_0=Ensure supersets

+GeneralizationSetCreationCommand_0=GeneralizationSet Selection

+GeneralizationSetCreationCommand_1=Would you like to create a new Generalization?

+GeneralizationSetCreationCommand_2=Choose a following generalizationSet to connect:

+GeneralizationSetCreationCommand_4=\ \ OK  

+GeneralizationSetCreationCommand_5=Cancel

+InformationFlowCreateCommand_0=InformationFlow creation

+InformationFlowCreateCommand_1=Select the InformationItems or the Classifiers to convey

+InformationFlowCreateCommand_2=Enter a name for the new InformationItem

+InformationItemElementTreeSelectionDialog_0=New InformationItem

+InformationItemValidator_0=No selection found

+InformationItemValidator_1=Selection validated

+InformationItemValidator_2=Selection has to be a Classifier or an Information Item.

+InstanceSpecificationLinkCreateCommand_0=InstanceEnd

+InterruptibleActivityRegionHelper_0=Move elements in non containment Activity container

+NamedElementHelper_0=default

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/AbstractAssociationSelectionDialog.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/AbstractAssociationSelectionDialog.java
index 2a37ee16014..9f7e2ebbe0c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/AbstractAssociationSelectionDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/AbstractAssociationSelectionDialog.java
@@ -13,6 +13,7 @@
 package org.eclipse.papyrus.uml.service.types.ui;

 

 import org.eclipse.papyrus.uml.diagram.common.Activator;

+import org.eclipse.papyrus.uml.service.types.messages.Messages;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.FontData;

 import org.eclipse.swt.layout.FillLayout;

@@ -47,7 +48,7 @@ public class AbstractAssociationSelectionDialog extends Dialog {
 	 */

 	public AbstractAssociationSelectionDialog(Shell parent, int style) {

 		super(parent, SWT.DIALOG_TRIM | SWT.PRIMARY_MODAL);

-		setText("SWT Dialog");

+		setText("SWT Dialog"); //$NON-NLS-1$

 	}

 

 	/**

@@ -74,7 +75,7 @@ public class AbstractAssociationSelectionDialog extends Dialog {
 	protected void createContents() {

 		shlAssociationselection = new Shell(getParent(), getStyle());

 		shlAssociationselection.setSize(501, 227);

-		shlAssociationselection.setText("AssociationSelection");

+		shlAssociationselection.setText(Messages.AbstractAssociationSelectionDialog_1);

 		shlAssociationselection.setLayout(new FillLayout(SWT.HORIZONTAL));

 		Composite composite = new Composite(shlAssociationselection, SWT.NONE);

 		composite.setLayout(null);

@@ -82,17 +83,17 @@ public class AbstractAssociationSelectionDialog extends Dialog {
 		Label lblSelectTheAssociation = new Label(composite, SWT.NONE);

 		lblSelectTheAssociation.setLocation(24, 10);

 		lblSelectTheAssociation.setSize(441, 30);

-		lblSelectTheAssociation.setText("Select the association for this instanceSpecification:");

+		lblSelectTheAssociation.setText(Messages.AbstractAssociationSelectionDialog_2);

 		lblSelectTheAssociation.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));

-		FontData[] fontdatas = { new FontData("Tahoma", 12, SWT.BOLD) };

+		FontData[] fontdatas = { new FontData("Tahoma", 12, SWT.BOLD) }; //$NON-NLS-1$

 		lblSelectTheAssociation.setFont(Activator.getFontManager().get(fontdatas));

 		table = new Table(composite, SWT.BORDER | SWT.FULL_SELECTION);

 		table.setBounds(25, 48, 440, 85);

 		btnOk = new Button(composite, SWT.NONE);

 		btnOk.setBounds(396, 159, 68, 23);

-		btnOk.setText("Ok");

+		btnOk.setText(Messages.AbstractAssociationSelectionDialog_4);

 		btnCancel = new Button(composite, SWT.NONE);

 		btnCancel.setBounds(291, 159, 68, 23);

-		btnCancel.setText("Cancel");

+		btnCancel.setText(Messages.AbstractAssociationSelectionDialog_5);

 	}

 }

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/AbstractTemplateParameterConfigurationDialog.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/AbstractTemplateParameterConfigurationDialog.java
index f444a085c0f..bb1d44707ab 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/AbstractTemplateParameterConfigurationDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/AbstractTemplateParameterConfigurationDialog.java
@@ -14,6 +14,7 @@
 package org.eclipse.papyrus.uml.service.types.ui;

 

 import org.eclipse.papyrus.uml.diagram.common.Activator;

+import org.eclipse.papyrus.uml.service.types.messages.Messages;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.custom.CLabel;

 import org.eclipse.swt.events.SelectionAdapter;

@@ -64,7 +65,7 @@ public class AbstractTemplateParameterConfigurationDialog extends Dialog {
 	 */

 	public AbstractTemplateParameterConfigurationDialog(Shell parent, int style) {

 		super(parent, SWT.DIALOG_TRIM | SWT.PRIMARY_MODAL);

-		setText("SWT Dialog");

+		setText("SWT Dialog"); //$NON-NLS-1$

 	}

 

 	public Button getBtnCancel() {

@@ -102,13 +103,13 @@ public class AbstractTemplateParameterConfigurationDialog extends Dialog {
 		shlTemplateparameterconfiguration = new Shell(getParent(), getStyle());

 		shlTemplateparameterconfiguration.setBackground(display.getSystemColor(SWT.COLOR_WHITE));

 		shlTemplateparameterconfiguration.setSize(426, 281);

-		shlTemplateparameterconfiguration.setText("TemplateParameterConfiguration");

+		shlTemplateparameterconfiguration.setText(Messages.AbstractTemplateParameterConfigurationDialog_1);

 		shlTemplateparameterconfiguration.setLocation(new Point(rect.x + (rect.width / 2), rect.y + (rect.height / 2) - shlTemplateparameterconfiguration.getSize().y));

 		Label lblCreationOfA = new Label(shlTemplateparameterconfiguration, SWT.NONE);

 		lblCreationOfA.setBackground(display.getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));

-		FontData[] fontdatas = { new FontData("Tahoma", 12, SWT.BOLD) };

+		FontData[] fontdatas = { new FontData("Tahoma", 12, SWT.BOLD) }; //$NON-NLS-1$

 		lblCreationOfA.setFont(Activator.getFontManager().get(fontdatas));

-		lblCreationOfA.setText("Creation of a new template parameter:");

+		lblCreationOfA.setText(Messages.AbstractTemplateParameterConfigurationDialog_3);

 		lblCreationOfA.setBounds(10, 10, 408, 28);

 		ExpandBar expandBarRef = new ExpandBar(shlTemplateparameterconfiguration, SWT.NONE);

 		expandBarRef.setBackground(display.getSystemColor(SWT.COLOR_WHITE));

@@ -116,7 +117,7 @@ public class AbstractTemplateParameterConfigurationDialog extends Dialog {
 		expandBarRef.setSize(408, 70);

 		ExpandItem xpndtmChooseYourParamter = new ExpandItem(expandBarRef, SWT.NONE);

 		xpndtmChooseYourParamter.setExpanded(true);

-		xpndtmChooseYourParamter.setText("Set the  paramatered element in the model");

+		xpndtmChooseYourParamter.setText(Messages.AbstractTemplateParameterConfigurationDialog_4);

 		Composite composite_1 = new Composite(expandBarRef, SWT.NONE);

 		composite_1.setBackground(display.getSystemColor(SWT.COLOR_WHITE));

 		xpndtmChooseYourParamter.setControl(composite_1);

@@ -127,50 +128,50 @@ public class AbstractTemplateParameterConfigurationDialog extends Dialog {
 			public void widgetSelected(SelectionEvent e) {

 			}

 		});

-		choosePararameteredElementButton.setImage(Activator.getPluginIconImage("org.eclipse.papyrus.uml.icons", "resource/gif/Package.gif"));

+		choosePararameteredElementButton.setImage(Activator.getPluginIconImage("org.eclipse.papyrus.uml.icons", "resource/gif/Package.gif")); //$NON-NLS-1$ //$NON-NLS-2$

 		choosePararameteredElementButton.setBounds(322, 10, 68, 23);

-		choosePararameteredElementButton.setText("...");

+		choosePararameteredElementButton.setText("..."); //$NON-NLS-1$

 		parameteredElementLabel = new CLabel(composite_1, SWT.NONE);

 		parameteredElementLabel.setBackground(display.getSystemColor(SWT.COLOR_WHITE));

 		parameteredElementLabel.setForeground(display.getSystemColor(SWT.COLOR_WIDGET_FOREGROUND));

 		parameteredElementLabel.setBounds(10, 10, 110, 19);

-		parameteredElementLabel.setText("ParameteredElement:");

+		parameteredElementLabel.setText(Messages.AbstractTemplateParameterConfigurationDialog_0);

 		parameteredElementContent = new CLabel(composite_1, SWT.NONE);

 		parameteredElementContent.setBackground(display.getSystemColor(SWT.COLOR_WHITE));

 		parameteredElementContent.setForeground(display.getSystemColor(SWT.COLOR_WIDGET_FOREGROUND));

 		parameteredElementContent.setBounds(126, 10, 178, 19);

-		parameteredElementContent.setText("New Label");

+		parameteredElementContent.setText(Messages.AbstractTemplateParameterConfigurationDialog_9);

 		xpndtmChooseYourParamter.setHeight(40);

 		ExpandBar expandBarDefault = new ExpandBar(shlTemplateparameterconfiguration, SWT.NONE);

 		expandBarDefault.setBackground(display.getSystemColor(SWT.COLOR_WHITE));

 		expandBarDefault.setBounds(10, 120, 408, 70);

 		ExpandItem xpndtmSetTheDefault = new ExpandItem(expandBarDefault, SWT.NONE);

 		xpndtmSetTheDefault.setExpanded(true);

-		xpndtmSetTheDefault.setText("Set the default element for this parameter");

+		xpndtmSetTheDefault.setText(Messages.AbstractTemplateParameterConfigurationDialog_10);

 		Composite composite = new Composite(expandBarDefault, SWT.NONE);

 		composite.setBackground(display.getSystemColor(SWT.COLOR_WHITE));

 		xpndtmSetTheDefault.setControl(composite);

 		chooseDefaultParameterButton = new Button(composite, SWT.NONE);

-		chooseDefaultParameterButton.setImage(Activator.getPluginIconImage("org.eclipse.papyrus.uml.icons", "resource/gif/Package.gif"));

+		chooseDefaultParameterButton.setImage(Activator.getPluginIconImage("org.eclipse.papyrus.uml.icons", "resource/gif/Package.gif")); //$NON-NLS-1$ //$NON-NLS-2$

 		chooseDefaultParameterButton.setBounds(322, 10, 68, 23);

-		chooseDefaultParameterButton.setText("...");

+		chooseDefaultParameterButton.setText("..."); //$NON-NLS-1$

 		defaultElementLabel = new CLabel(composite, SWT.NONE);

 		defaultElementLabel.setBackground(display.getSystemColor(SWT.COLOR_WHITE));

 		defaultElementLabel.setForeground(display.getSystemColor(SWT.COLOR_WIDGET_FOREGROUND));

 		defaultElementLabel.setBounds(10, 10, 88, 19);

-		defaultElementLabel.setText("DefaultElement:");

+		defaultElementLabel.setText(Messages.AbstractTemplateParameterConfigurationDialog_14);

 		defaultElementContent = new CLabel(composite, SWT.NONE);

 		defaultElementContent.setBackground(display.getSystemColor(SWT.COLOR_WHITE));

 		defaultElementContent.setForeground(display.getSystemColor(SWT.COLOR_WIDGET_FOREGROUND));

 		defaultElementContent.setBounds(104, 10, 205, 19);

-		defaultElementContent.setText("New Label");

+		defaultElementContent.setText(Messages.AbstractTemplateParameterConfigurationDialog_15);

 		xpndtmSetTheDefault.setHeight(40);

 		btnExecute = new Button(shlTemplateparameterconfiguration, SWT.NONE);

 		btnExecute.setBounds(342, 216, 68, 23);

-		btnExecute.setText("Execute");

+		btnExecute.setText(Messages.AbstractTemplateParameterConfigurationDialog_16);

 		btnCancel = new Button(shlTemplateparameterconfiguration, SWT.NONE);

 		btnCancel.setBounds(252, 216, 68, 23);

-		btnCancel.setText("Cancel");

+		btnCancel.setText(Messages.AbstractTemplateParameterConfigurationDialog_17);

 	}

 

 	/**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/AssociationSelectionDialog.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/AssociationSelectionDialog.java
index 1af004c0aa4..e3dcfa190d7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/AssociationSelectionDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/AssociationSelectionDialog.java
@@ -29,6 +29,7 @@ import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

 import org.eclipse.papyrus.uml.service.types.Activator;

+import org.eclipse.papyrus.uml.service.types.messages.Messages;

 import org.eclipse.swt.events.SelectionAdapter;

 import org.eclipse.swt.events.SelectionEvent;

 import org.eclipse.swt.widgets.Shell;

@@ -39,7 +40,7 @@ import org.eclipse.uml2.uml.Association;
  */

 public class AssociationSelectionDialog extends AbstractAssociationSelectionDialog {

 

-	private static final String UNTYPED = "<untyped>";

+	private static final String UNTYPED = Messages.AssociationSelectionDialog_0;

 

 	/** The selected association. */

 	protected Association selectedAssociation;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/CollaborationRoleTreeContentProvider.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/CollaborationRoleTreeContentProvider.java
new file mode 100644
index 00000000000..1073409a79e
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/CollaborationRoleTreeContentProvider.java
@@ -0,0 +1,97 @@
+/*****************************************************************************

+ * Copyright (c) 2009-2011 CEA LIST.

+ *

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.service.types.ui;

+

+import org.eclipse.jface.viewers.ITreeContentProvider;

+import org.eclipse.jface.viewers.Viewer;

+import org.eclipse.uml2.uml.Collaboration;

+import org.eclipse.uml2.uml.CollaborationUse;

+

+/**

+ * This class is a basic content provider that assumes a {@link CollaborationUse} is given as the

+ * root parent, and that will calculate the possible roles that can be used for binding.

+ *

+ */

+public class CollaborationRoleTreeContentProvider implements ITreeContentProvider {

+

+	/**

+	 *

+	 * {@inheritDoc}

+	 */

+	@Override

+	public Object[] getChildren(Object parentElement) {

+		// no implementation needed.

+		return null;

+	}

+

+	/**

+	 *

+	 * {@inheritDoc}

+	 */

+	@Override

+	public Object getParent(Object element) {

+		// no implementation needed.

+		return null;

+	}

+

+	/**

+	 *

+	 * {@inheritDoc}

+	 */

+	@Override

+	public boolean hasChildren(Object element) {

+		// no implementation needed.

+		return false;

+	}

+

+	/**

+	 * <pre>

+	 * This method returns the role referenced by the {@link Collaboration} that is

+	 * the type of the {@link CollaborationUse}.

+	 *

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	public Object[] getElements(Object inputElement) {

+		Object[] children = null;

+

+		if (inputElement instanceof CollaborationUse) {

+			CollaborationUse parentUMLElement = (CollaborationUse) inputElement;

+			if (parentUMLElement.getType() != null) {

+				children = parentUMLElement.getType().getCollaborationRoles().toArray();

+			}

+		}

+		return children;

+	}

+

+	/**

+	 *

+	 * {@inheritDoc}

+	 */

+	@Override

+	public void dispose() {

+		// no implementation needed.

+	}

+

+	/**

+	 *

+	 * {@inheritDoc}

+	 */

+	@Override

+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

+		// no implementation needed.

+	}

+

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/ui/CollaborationRoleValidator.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/CollaborationRoleValidator.java
index 6a3f2eaf1a0..424a577ec22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/ui/CollaborationRoleValidator.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/CollaborationRoleValidator.java
@@ -11,11 +11,11 @@
  *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.composite.custom.ui;

+package org.eclipse.papyrus.uml.service.types.ui;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.service.types.Activator;

 import org.eclipse.ui.dialogs.ISelectionStatusValidator;

 import org.eclipse.uml2.uml.ConnectableElement;

 

@@ -29,20 +29,20 @@ public class CollaborationRoleValidator implements ISelectionStatusValidator {
 	/**

 	 * <pre>

 	 * The selection has to be a {@link ConnectableElement} for validation.

-	 *

+	 * 

 	 * {@inheritDoc}

 	 * </pre>

 	 */

 	@Override

 	public IStatus validate(Object[] selection) {

 

-		IStatus status = new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, "No selection found.");

+		IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "No selection found.");

 

 		if (selection.length == 1) {

 			if (selection[0] instanceof ConnectableElement) {

-				status = new Status(IStatus.OK, UMLDiagramEditorPlugin.ID, "Selection validated.");

+				status = new Status(IStatus.OK, Activator.PLUGIN_ID, "Selection validated.");

 			} else {

-				status = new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, "Selection has to be a ConnectableElement.");

+				status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Selection has to be a ConnectableElement.");

 			}

 		}

 		return status;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/InformationItemElementTreeSelectionDialog.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/InformationItemElementTreeSelectionDialog.java
new file mode 100644
index 00000000000..8f0bc7becf6
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/InformationItemElementTreeSelectionDialog.java
@@ -0,0 +1,74 @@
+/*****************************************************************************

+ * Copyright (c) 2009-2011 CEA LIST.

+ *

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+

+package org.eclipse.papyrus.uml.service.types.ui;

+

+import org.eclipse.jface.dialogs.IDialogConstants;

+import org.eclipse.jface.viewers.ILabelProvider;

+import org.eclipse.jface.viewers.ITreeContentProvider;

+import org.eclipse.papyrus.uml.service.types.messages.Messages;

+import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;

+

+/**

+ * Add a Button to the super-class {@link ElementTreeSelectionDialog} to create a new

+ * InformationItem

+ *

+ */

+public class InformationItemElementTreeSelectionDialog extends ElementTreeSelectionDialog {

+

+	protected Button newInformationItemButton;

+

+	public static final int newInformationItemButton_ID = IDialogConstants.CLIENT_ID + 1;

+

+	public InformationItemElementTreeSelectionDialog(Shell parent, ILabelProvider labelProvider, ITreeContentProvider contentProvider) {

+		super(parent, labelProvider, contentProvider);

+

+	}

+

+	/**

+	 *

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected void createButtonsForButtonBar(Composite parent) {

+		createButton(parent, newInformationItemButton_ID, Messages.InformationItemElementTreeSelectionDialog_0, false);

+		super.createButtonsForButtonBar(parent);

+	}

+

+	/**

+	 *

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected void buttonPressed(int buttonId) {

+		if (buttonId == newInformationItemButton_ID) {

+			newInformationItemButtonPressed();

+		} else {

+			super.buttonPressed(buttonId);

+		}

+

+	}

+

+	/**

+	 * Write the ReturnCode and close the window

+	 *

+	 */

+	protected void newInformationItemButtonPressed() {

+		setReturnCode(newInformationItemButton_ID);

+		close();

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/InformationItemValidator.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/InformationItemValidator.java
new file mode 100644
index 00000000000..d4fe2017728
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/InformationItemValidator.java
@@ -0,0 +1,58 @@
+/*****************************************************************************

+ * Copyright (c) 2009-2011 CEA LIST.

+ *

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.service.types.ui;

+

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.papyrus.uml.service.types.Activator;

+import org.eclipse.papyrus.uml.service.types.messages.Messages;

+import org.eclipse.ui.dialogs.ISelectionStatusValidator;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.InformationItem;

+import org.eclipse.uml2.uml.Interface;

+import org.eclipse.uml2.uml.Signal;

+

+/**

+ * This SelectionStatusValidator validate the selected objects. It is assumed here that the

+ * selection allow multiples elements.

+ *

+ */

+public class InformationItemValidator implements ISelectionStatusValidator {

+

+	/**

+	 * <pre>

+	 * The selection has to be a {@link Classifier} or an {@link InformationItem} for validation.

+	 * 

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	public IStatus validate(Object[] selection) {

+

+		IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.InformationItemValidator_0);

+		if (selection.length >= 1) {

+			for (int i = 0; i < selection.length; i++) {

+				if (selection[i] instanceof InformationItem || selection[i] instanceof Class || selection[i] instanceof Interface || selection[i] instanceof Signal || selection[i] instanceof Component) {

+					status = new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.InformationItemValidator_1);

+				} else {

+					status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.InformationItemValidator_2);

+					break;

+				}

+			}

+		}

+		return status;

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/NameLabelValidator.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/NameLabelValidator.java
new file mode 100644
index 00000000000..616f4fb673e
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/NameLabelValidator.java
@@ -0,0 +1,41 @@
+/*****************************************************************************

+ * Copyright (c) 2009-2011 CEA LIST.

+ *

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.service.types.ui;

+

+import org.eclipse.jface.dialogs.IInputValidator;

+

+/**

+ * Used to validate a nameLabel

+ *

+ */

+public class NameLabelValidator implements IInputValidator {

+

+	private String error;

+

+	public NameLabelValidator(String errorMessage) {

+		// TODO Auto-generated constructor stub

+		super();

+		error = errorMessage;

+	}

+

+	@Override

+	public String isValid(String newText) {

+		if ((newText != null) && (!"".equals(newText))) { //$NON-NLS-1$

+			return null;// OK

+		} else {

+			return error;

+		}

+

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/TemplateParameterConfigurationDialog.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/TemplateParameterConfigurationDialog.java
index add33d40c54..4d5f80d273d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/TemplateParameterConfigurationDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/ui/TemplateParameterConfigurationDialog.java
@@ -124,8 +124,8 @@ public class TemplateParameterConfigurationDialog extends AbstractTemplateParame
 	protected void createContents() {

 		// TODO Auto-generated method stub

 		super.createContents();

-		getParameteredElementContent().setText("");

-		getDefaultElementContent().setText("");

+		getParameteredElementContent().setText(""); //$NON-NLS-1$

+		getDefaultElementContent().setText(""); //$NON-NLS-1$

 		ServicesRegistry registry;

 		try {

 			registry = ServiceUtilsForResource.getInstance().getServiceRegistry(templatesignature.eResource());

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ElementUtil.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ElementUtil.java
index f3701aa4077..c252fbec244 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ElementUtil.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ElementUtil.java
@@ -32,12 +32,12 @@ public class ElementUtil {
 	/**
 	 * The ID for Papyrus EAnnotations.
 	 */
-	private static final String PAPYRUS_URI = "org.eclipse.papyrus";
+	private static final String PAPYRUS_URI = "org.eclipse.papyrus"; //$NON-NLS-1$
 
 	/**
 	 * The ID for element nature in Papyrus EAnnotations. 
 	 */
-	private static final String PAPYRUS_ELEMENT_NATURE = "nature";
+	private static final String PAPYRUS_ELEMENT_NATURE = "nature"; //$NON-NLS-1$
 
 	/**
 	 * Convenient method to retrieve the StereotypeApplication by passing an
@@ -83,7 +83,7 @@ public class ElementUtil {
 			return eAnnotation.getDetails().get(PAPYRUS_ELEMENT_NATURE);
 		}
 
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/InteractionConstraintUtil.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/InteractionConstraintUtil.java
index cfd660f6748..cb167e26e4e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/InteractionConstraintUtil.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/InteractionConstraintUtil.java
@@ -23,7 +23,7 @@ public class InteractionConstraintUtil {
 		if(value == null) {

 			return null;

 		}

-		if("*".equals(value) || "*".equals(value.toString())) {

+		if("*".equals(value) || "*".equals(value.toString())) { //$NON-NLS-1$ //$NON-NLS-2$

 			return Integer.MAX_VALUE;

 		} else if(value instanceof Integer) {

 			return (Integer)value;

@@ -36,7 +36,7 @@ public class InteractionConstraintUtil {
 				}

 			} catch (Exception e) {

 				String stringValue = valueSpec.stringValue();

-				if("*".equals(stringValue)) {

+				if("*".equals(stringValue)) { //$NON-NLS-1$

 					return Integer.MAX_VALUE;

 				}

 			}

@@ -88,7 +88,7 @@ public class InteractionConstraintUtil {
 			}

 		} catch (Exception e) {

 			//must be a number or *.

-			if("*".equals(maxint.stringValue())) {

+			if("*".equals(maxint.stringValue())) { //$NON-NLS-1$

 				return Integer.MAX_VALUE;

 			}

 		}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/NamedElementHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/NamedElementHelper.java
index d9c457297ae..bda27612e97 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/NamedElementHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/NamedElementHelper.java
@@ -18,6 +18,7 @@ import java.util.Collection;
 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.uml.service.types.messages.Messages;

 import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Namespace;

@@ -36,7 +37,7 @@ public class NamedElementHelper {
 	public static NamedElementHelper EINSTANCE = new NamedElementHelper();

 

 	@Deprecated

-	private String baseString = "default";

+	private String baseString = Messages.NamedElementHelper_0;

 

 	/**

 	 * Get the base string to use for default name creation

@@ -94,7 +95,7 @@ public class NamedElementHelper {
 	}

 

 	public static String getDefaultNameWithIncrementFromBase(String base, Collection<?> contents) {

-		return getDefaultNameWithIncrementFromBase(base, contents, null, "");

+		return getDefaultNameWithIncrementFromBase(base, contents, null, ""); //$NON-NLS-1$

 	}

 

 	public static String getDefaultNameWithIncrementFromBase(String base, Collection<?> contents, String separator) {

@@ -102,7 +103,7 @@ public class NamedElementHelper {
 	}

 	

 	public static String getDefaultNameWithIncrementFromBase(String base, Collection<?> contents, EObject elementToRename) {

-		return getDefaultNameWithIncrementFromBase(base, contents, elementToRename, "");

+		return getDefaultNameWithIncrementFromBase(base, contents, elementToRename, ""); //$NON-NLS-1$

 	}

 

 	public static String getDefaultNameWithIncrementFromBase(String base, Collection<?> contents, EObject elementToRename, String separator) {

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi
index ccbc376ed66..c7f09140fa8 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi
@@ -15,6 +15,9 @@
   <constraintTypes
       label="Is UML Datatype Instance"
       constraintClass="org.eclipse.papyrus.uml.properties.constraints.IsUMLDatatypeInstance"/>
+  <constraintTypes
+      label="Is Profile Applied"
+      constraintClass="org.eclipse.papyrus.uml.properties.constraints.IsProfileAppliedConstraint"/>
   <modelElementFactories
       name="UML Specific Factory"
       factoryClass="org.eclipse.papyrus.uml.properties.modelelement.UMLEditorFactory"/>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/constraints/IsProfileAppliedConstraint.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/constraints/IsProfileAppliedConstraint.java
new file mode 100644
index 00000000000..205dccb4449
--- /dev/null
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/constraints/IsProfileAppliedConstraint.java
@@ -0,0 +1,116 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.properties.constraints;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.papyrus.uml.tools.utils.UMLUtil;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Profile;
+
+/**
+ * A constraint to test if the given object is a UML Element and
+ * has the given profile applied
+ *
+ * @author Benoit Maggi
+ */
+public class IsProfileAppliedConstraint extends AbstractConstraint {
+
+	/**
+	 * The name of the property that hold the pluginURI used by this constraint
+	 */
+	public static final String PROFILE_URI = "profileURI"; //$NON-NLS-1$
+
+	/**
+	 * The uri of the profile to look for
+	 */
+	protected String profileURI;
+
+	/**
+	 * The UML element on which the profile may be applied
+	 */
+	protected Element umlElement;
+
+	/**
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#match(java.lang.Object)
+	 * Check if the containing package has profilUri applied.
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		umlElement = UMLUtil.resolveUMLElement(selection);
+		if (umlElement == null) {
+			return false;
+		}
+		
+		EList<Profile> allAppliedProfiles = umlElement.getNearestPackage().getAllAppliedProfiles();
+		for (Profile profile : allAppliedProfiles) {
+			String uri = profile.getURI();
+			if (profileURI.equals(uri)){
+				return true;
+			}
+		}
+		return false; // always called even when not defined 
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#setDescriptor(org.eclipse.papyrus.infra.constraints.SimpleConstraint)
+	 *
+	 * @param descriptor
+	 */
+	@Override
+	public void setDescriptor(SimpleConstraint descriptor) {
+		profileURI = getValue(PROFILE_URI);
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 *
+	 * @return
+	 */
+	@Override
+	public String toString() {
+		return String.format("IsProfileApplied %s (%s)", profileURI, getDisplayUnit().getElementMultiplicity() == 1 ? "Single" : "Multiple"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)
+	 * Check if the constraint share the same pluginURI
+	 * @param constraint
+	 * @return
+	 */
+	@Override
+	protected boolean equivalent(Constraint constraint) {
+		if (this == constraint) {
+			return true;
+		}
+		if (constraint == null) {
+			return false;
+		}
+		if (!(constraint instanceof IsProfileAppliedConstraint)) {
+			return false;
+		}
+		IsProfileAppliedConstraint other = (IsProfileAppliedConstraint) constraint;
+		if (profileURI == null) {
+			if (other.profileURI != null) {
+				return false;
+			}
+		} else if (!profileURI.equals(other.profileURI)) {
+			return false;
+		}
+		return true;
+	}
+	
+}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java
index 63fca2d9b58..18825d8960d 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java
@@ -165,7 +165,7 @@ public class UMLModelElement extends EMFModelElement {
 			return new ConstrainedElementContentProvider(source, feature);
 		}
 
-		return new UMLContentProvider(source, feature);
+		return new UMLContentProvider(source, feature, null, domain.getResourceSet());
 	}
 
 	@Override
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearance.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearance.java
index e00aa2d3074..ba020fb443d 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearance.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearance.java
@@ -51,6 +51,9 @@ public interface ICustomAppearance {
 	 */
 	public final static String DISP_TYPE = "type";
 
+	/** Style constant for display state in labels*/
+	public final String DISP_STATE = "state";
+
 	/**
 	 * Style constant for multiplicity display in labels.
 	 */
@@ -159,4 +162,8 @@ public interface ICustomAppearance {
 	 */
 	public final static Collection<String> DEFAULT_UML_INSTANCESPECIFICATION = Arrays.asList(DISP_NAME, DISP_TYPE);
 
+	/**
+	 * default uml ActivityParameterNode .
+	 */
+	public final static Collection<String> DEFAULT_UML_ACTIVITYPARAMETERNODE = Arrays.asList(DISP_NAME);
 }
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java
index 8179e5882e3..5f30dc7e55a 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java
@@ -1,462 +1,483 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 444092

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.common.util.BasicEList;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.ConnectableElement;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.Message;

-import org.eclipse.uml2.uml.MessageEvent;

-import org.eclipse.uml2.uml.MessageOccurrenceSpecification;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * A Helper class for UML

- *

- * @author Camille Letavernier

- */

-// TODO/FIXME : Check implementations. Most of them are old and don't always match the

-// specification for some cases.

-public class UMLUtil {

-

-	/**

-	 * Retrieve the UML semantic element from the given Object.

-	 * This method relies on {@link EMFHelper#getEObject(Object)} to resolve

-	 * an EObject from an Object, then checks if the resulting EObject is a

-	 * UML Element.

-	 *

-	 * @param source

-	 *            The Object to resolve

-	 * @return

-	 *         The UML semantic element, or null if it couldn't be resolved

-	 */

-	public static Element resolveUMLElement(Object source) {

-		EObject eElement = EMFHelper.getEObject(source);

-

-		if (eElement instanceof Element) {

-			return (Element) eElement;

-		}

-

-		return null;

-	}

-

-	/**

-	 * Tests if a class is a subclass of another class. The classes are described

-	 * by their className, in the UML Metamodel.

-	 *

-	 * @param className

-	 * @param superclassName

-	 * @return

-	 *         True if the class className is a subclass of the class superclassName

-	 */

-	public static boolean isSubClass(String className, String superclassName) {

-		EClass eClass = (EClass) getUMLMetamodel().getEClassifier(className);

-		EClass superClass = (EClass) getUMLMetamodel().getEClassifier(superclassName);

-		return EMFHelper.isSubclass(eClass, superClass);

-	}

-

-	/**

-	 * Retrieve the EditingDomain for the given source object

-	 *

-	 * @param source

-	 * @return

-	 *         The source object's editing domain, or null if it couldn't be found

-	 */

-	public static EditingDomain resolveEditingDomain(Object source) {

-		return EMFHelper.resolveEditingDomain(resolveUMLElement(source));

-	}

-

-	/**

-	 * @return the UML EPackage

-	 */

-	public static EPackage getUMLMetamodel() {

-		return UMLPackage.eINSTANCE;

-	}

-

-	/**

-	 * Search the given stereotype (by name) on the given UML Element.

-	 * If the search is not strict, the name may be the qualified name of a

-	 * super-stereotype of some applied stereotype

-	 *

-	 * @param umlElement

-	 *            The UML Element on which the stereotype is applied

-	 * @param stereotypeName

-	 *            The qualified name of the stereotype

-	 * @param strict

-	 *            If set to true, only a stereotype matching the exact qualified name

-	 *            will be returned. Otherwise, any subtype of the given stereotype may be

-	 *            returned. Note that if more than one stereotype is a subtype of the

-	 *            given stereotype, the first matching stereotype is returned.

-	 * @return

-	 *         The first matching stereotype, or null if none was found

-	 */

-	public static Stereotype getAppliedStereotype(Element umlElement, String stereotypeName, boolean strict) {

-		if (umlElement == null || stereotypeName == null) {

-			return null;

-		}

-

-		Stereotype stereotype = umlElement.getAppliedStereotype(stereotypeName);

-		if (strict || stereotype != null) {

-			return stereotype;

-		}

-

-		// The parent stereotype is not always applicable...

-		// stereotype = umlElement.getApplicableStereotype(stereotypeName);

-

-		List<Stereotype> subStereotypes = findSubstereotypes(umlElement, stereotypeName);

-

-		for (Stereotype subStereotype : subStereotypes) {

-			if (umlElement.getAppliedStereotypes().contains(subStereotype)) {

-				return subStereotype;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * Obtains the possibly implicitly applied (by virtue of some sub-stereotype of it being applied) stereotype

-	 * of the specified name on a UML element.

-	 *

-	 * @param umlElement

-	 *            The UML Element on which the stereotype is (possibly pseudo-) applied

-	 * @param stereotypeName

-	 *            The qualified name of the stereotype

-	 * @return

-	 *         The stereotype of the given name that either is applied or has some substereotype that is applied to the element

-	 */

-	public static Stereotype getAppliedSuperstereotype(Element umlElement, String stereotypeName) {

-		if (umlElement == null) {

-			throw new IllegalArgumentException("umlElement"); //$NON-NLS-1$

-		}

-		if (stereotypeName == null) {

-			throw new IllegalArgumentException("stereotypeName"); //$NON-NLS-1$

-		}

-

-		// Simplest case

-		Stereotype result = umlElement.getAppliedStereotype(stereotypeName);

-		if (result == null) {

-			for (Stereotype sub : findSubstereotypes(umlElement, stereotypeName)) {

-				if (umlElement.isStereotypeApplied(sub)) {

-					result = getSuperstereotype(sub, stereotypeName);

-					break;

-				}

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * Search the given stereotype (by name) that is applicable to the given UML Element.

-	 * If the search is not strict, the name may be the qualified name of a

-	 * sub-stereotype of an applied stereotype

-	 *

-	 * @param umlElement

-	 *            The UML Element on which the stereotype could be applied. Must not be {@code null}

-	 * @param stereotypeName

-	 *            The qualified name of the stereotype. Must not be {@code null}

-	 * @param strict

-	 *            If set to true, only a stereotype matching the exact qualified name

-	 *            will be returned. Otherwise, any subtype of the given stereotype may be

-	 *            returned. Note that if more than one stereotype is a subtype of the

-	 *            given stereotype, the first matching stereotype is returned.

-	 * @return

-	 *         The first matching applicable stereotype, or null if none was found

-	 */

-	public static Stereotype getApplicableStereotype(Element umlElement, String stereotypeName, boolean strict) {

-		if (umlElement == null) {

-			throw new IllegalArgumentException("umlElement"); //$NON-NLS-1$

-		}

-		if (stereotypeName == null) {

-			throw new IllegalArgumentException("stereotypeName"); //$NON-NLS-1$

-		}

-

-		Stereotype result = umlElement.getApplicableStereotype(stereotypeName);

-		if ((result == null) && !strict) {

-			List<Stereotype> subStereotypes = findSubstereotypes(umlElement, stereotypeName);

-

-			for (Stereotype subStereotype : subStereotypes) {

-				if (umlElement.isStereotypeApplicable(subStereotype)) {

-					result = subStereotype;

-					break;

-				}

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * Gets the first stereotype conforming to the given {@code stereotype} that is applied to the specified UML element.

-	 * 

-	 * @param umlElement

-	 *            an UML element. Must not be {@code null}

-	 * @param stereotype

-	 *            a stereotype that may or may not be applied to the element. Must not be {@code null}

-	 * 

-	 * @return the {@code stereotype} if it is applied to the element, or some subtype of it that is applied,

-	 *         if any sub-type of the {@code stereotype} is applied to the element

-	 */

-	public static Stereotype getAppliedSubstereotype(Element umlElement, Stereotype stereotype) {

-		if (umlElement == null) {

-			throw new IllegalArgumentException("umlElement"); //$NON-NLS-1$

-		}

-		if (stereotype == null) {

-			throw new IllegalArgumentException("stereotype"); //$NON-NLS-1$

-		}

-

-		Stereotype result = null;

-		if (umlElement.isStereotypeApplied(stereotype)) {

-			result = stereotype;

-		} else {

-			result = getAppliedStereotype(umlElement, stereotype.getQualifiedName(), false);

-		}

-

-		return result;

-	}

-

-	/**

-	 * Finds the Stereotype matching the given name.

-	 * The search is done in the context of the given UML Element

-	 * (i.e. the Profiles applied on the Element's nearest package)

-	 *

-	 * @param umlElement

-	 * @param stereotypeName

-	 * @return

-	 */

-	public static Stereotype findStereotype(Element umlElement, String stereotypeName) {

-		if (umlElement == null || stereotypeName == null) {

-			return null;

-		}

-

-		Stereotype stereotype = null;

-		org.eclipse.uml2.uml.Package umlPackage = umlElement.getNearestPackage();

-		if (umlPackage == null) {

-			stereotype = umlElement.getApplicableStereotype(stereotypeName);

-		} else {

-			outerLoop: for (Profile profile : umlPackage.getAllAppliedProfiles()) {

-				for (Stereotype ownedStereotype : profile.getOwnedStereotypes()) {

-					if (ownedStereotype.getQualifiedName().equals(stereotypeName)) {

-						stereotype = ownedStereotype;

-						break outerLoop;

-					}

-				}

-			}

-		}

-		return stereotype;

-	}

-

-	/**

-	 * Returns all stereotypes matching the given qualified stereotype name, and their substereotypes

-	 * The search is performed in the context of the given UML Element, i.e. the profiles applied

-	 * on the Element's nearest package

-	 *

-	 * @param umlElement

-	 * @param stereotypeName

-	 * @return

-	 */

-	public static List<Stereotype> findSubstereotypes(Element umlElement, String stereotypeName) {

-		if (umlElement == null || stereotypeName == null) {

-			return null;

-		}

-

-		Set<Stereotype> stereotypes = new HashSet<Stereotype>();

-		org.eclipse.uml2.uml.Package umlPackage = umlElement.getNearestPackage();

-

-		if (umlPackage == null) {

-			Stereotype stereotype = umlElement.getApplicableStereotype(stereotypeName);

-			if (stereotype != null) {

-				stereotypes.add(stereotype);

-			}

-		} else {

-			for (Profile profile : umlPackage.getAllAppliedProfiles()) {

-				for (Stereotype ownedStereotype : profile.getOwnedStereotypes()) {

-					for (Stereotype superStereotype : getAllSuperStereotypes(ownedStereotype)) {

-						if (stereotypeName.equals(superStereotype.getQualifiedName())) {

-							stereotypes.add(ownedStereotype);

-						}

-					}

-				}

-			}

-		}

-

-		return new LinkedList<Stereotype>(stereotypes);

-	}

-

-	private static Stereotype getSuperstereotype(Stereotype substereotype, String qualifiedName) {

-		Stereotype result = null;

-

-		if (qualifiedName.equals(substereotype.getQualifiedName())) {

-			result = substereotype;

-		} else {

-			for (Stereotype next : getAllSuperStereotypes(substereotype)) {

-				if (qualifiedName.equals(next.getQualifiedName())) {

-					result = next;

-					break;

-				}

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * Returns a collection of all super stereotypes of the given stereotype

-	 * (Including itself)

-	 *

-	 * @param stereotype

-	 * @return

-	 *         A collection of all super stereotypes

-	 */

-	public static Collection<Stereotype> getAllSuperStereotypes(Stereotype stereotype) {

-		Set<Stereotype> result = new HashSet<Stereotype>();

-		if (stereotype != null) {

-			getAllSuperStereotypes(stereotype, result);

-		}

-		return result;

-	}

-

-	private static void getAllSuperStereotypes(Stereotype stereotype, Set<Stereotype> result) {

-		result.add(stereotype);

-		for (Classifier superClassifier : stereotype.getGenerals()) {

-			if (superClassifier instanceof Stereotype && !result.contains(superClassifier)) {

-				getAllSuperStereotypes((Stereotype) superClassifier, result);

-			}

-		}

-	}

-

-	/**

-	 * Retrieves the UML Class associated to the given Message

-	 *

-	 * @param message

-	 * @return the UML Class associated to the given Message

-	 */

-	public static org.eclipse.uml2.uml.Class getContextClassForMessage(Message message) {

-		MessageOccurrenceSpecification receiveEvent = (MessageOccurrenceSpecification) message.getReceiveEvent();

-

-		if (receiveEvent == null) {

-			return null;

-		}

-

-		return getContextClassForMessageOccurrence(receiveEvent);

-	}

-

-	/**

-	 * Retrieves the UML Class associated to the given MessageOccurrenceSpecification

-	 *

-	 * @param messageOccurrence

-	 * @return the UML Class associated to the given MessageOccurrenceSpecification

-	 */

-	public static org.eclipse.uml2.uml.Class getContextClassForMessageOccurrence(MessageOccurrenceSpecification messageOccurrence) {

-		List<Lifeline> lifelines = messageOccurrence.getCovereds();

-		if (lifelines.isEmpty()) {

-			return null; // We can't find the context

-		} else if (lifelines.size() == 1) {

-			Lifeline lifeline = lifelines.get(0);

-			ConnectableElement element = lifeline.getRepresents();

-			if (element == null) {

-				return null;

-			}

-			Type type = element.getType();

-			if (type instanceof org.eclipse.uml2.uml.Class) {

-				org.eclipse.uml2.uml.Class clazz = (org.eclipse.uml2.uml.Class) type;

-				return clazz;

-			} else {

-				return null; // The type is not a Class

-			}

-		} else {

-			return null; // Too many contexts : which one should we choose ?

-		}

-	}

-

-	/**

-	 * Finds the UML Class associated to the given MessageEvent

-	 *

-	 * @param event

-	 * @return the Class associated to the given MessageEvent

-	 */

-	public static Class getContextClassForMessageEvent(MessageEvent event) {

-		Collection<EStructuralFeature.Setting> settings = EMFHelper.getUsages(event);

-		if (settings.isEmpty()) {

-			return null;

-		}

-

-		if (settings.size() == 1) {

-			EObject referer = settings.iterator().next().getEObject();

-			if (referer instanceof MessageOccurrenceSpecification) {

-				return UMLUtil.getContextClassForMessageOccurrence((MessageOccurrenceSpecification) referer);

-			} else {

-				return null;

-			}

-		}

-

-		MessageOccurrenceSpecification referer = null;

-		EObject newReferer = null;

-

-		for (EStructuralFeature.Setting setting : settings) {

-			newReferer = setting.getEObject();

-			if (!(newReferer instanceof MessageOccurrenceSpecification)) {

-				continue;

-			}

-

-			if (referer == null || referer == newReferer) {

-				referer = (MessageOccurrenceSpecification) newReferer;

-			} else {

-				referer = null;

-				break;

-			}

-		}

-

-		if (referer == null) {

-			return null;

-		}

-

-		return UMLUtil.getContextClassForMessageOccurrence(referer);

-	}

-

-	/**

-	 * Destroy all elements in a given list

-	 *

-	 * @param list

-	 *            a list of elements

-	 */

-	public static void destroyElements(EList<? extends Element> list) {

-		BasicEList<Element> listCopy = new BasicEList<Element>();

-		// loop on copy in order to avoid iterator exception

-		listCopy.addAll(list);

-		for (Element element : listCopy) {

-			element.destroy();

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 444092
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.tools.utils;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.ConnectableElement;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.Message;
+import org.eclipse.uml2.uml.MessageEvent;
+import org.eclipse.uml2.uml.MessageOccurrenceSpecification;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * A Helper class for UML
+ *
+ * @author Camille Letavernier
+ */
+// TODO/FIXME : Check implementations. Most of them are old and don't always match the
+// specification for some cases.
+public class UMLUtil {
+
+	/**
+	 * Retrieve the UML semantic element from the given Object.
+	 * This method relies on {@link EMFHelper#getEObject(Object)} to resolve
+	 * an EObject from an Object, then checks if the resulting EObject is a
+	 * UML Element.
+	 *
+	 * @param source
+	 *            The Object to resolve
+	 * @return
+	 *         The UML semantic element, or null if it couldn't be resolved
+	 */
+	public static Element resolveUMLElement(Object source) {
+		EObject eElement = EMFHelper.getEObject(source);
+
+		if (eElement instanceof Element) {
+			return (Element) eElement;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Tests if a class is a subclass of another class. The classes are described
+	 * by their className, in the UML Metamodel.
+	 *
+	 * @param className
+	 * @param superclassName
+	 * @return
+	 *         True if the class className is a subclass of the class superclassName
+	 */
+	public static boolean isSubClass(String className, String superclassName) {
+		EClass eClass = (EClass) getUMLMetamodel().getEClassifier(className);
+		EClass superClass = (EClass) getUMLMetamodel().getEClassifier(superclassName);
+		return EMFHelper.isSubclass(eClass, superClass);
+	}
+
+	/**
+	 * Retrieve the EditingDomain for the given source object
+	 *
+	 * @param source
+	 * @return
+	 *         The source object's editing domain, or null if it couldn't be found
+	 */
+	public static EditingDomain resolveEditingDomain(Object source) {
+		return EMFHelper.resolveEditingDomain(resolveUMLElement(source));
+	}
+
+	/**
+	 * @return the UML EPackage
+	 */
+	public static EPackage getUMLMetamodel() {
+		return UMLPackage.eINSTANCE;
+	}
+
+	/**
+	 * Search the given stereotype (by name) on the given UML Element.
+	 * If the search is not strict, the name may be the qualified name of a
+	 * super-stereotype of some applied stereotype
+	 *
+	 * @param umlElement
+	 *            The UML Element on which the stereotype is applied
+	 * @param stereotypeName
+	 *            The qualified name of the stereotype
+	 * @param strict
+	 *            If set to true, only a stereotype matching the exact qualified name
+	 *            will be returned. Otherwise, any subtype of the given stereotype may be
+	 *            returned. Note that if more than one stereotype is a subtype of the
+	 *            given stereotype, the first matching stereotype is returned.
+	 * @return
+	 *         The first matching stereotype, or null if none was found
+	 */
+	public static Stereotype getAppliedStereotype(Element umlElement, String stereotypeName, boolean strict) {
+		if (umlElement == null || stereotypeName == null) {
+			return null;
+		}
+
+		Stereotype stereotype = umlElement.getAppliedStereotype(stereotypeName);
+		if (strict || stereotype != null) {
+			return stereotype;
+		}
+
+		// The parent stereotype is not always applicable...
+		// stereotype = umlElement.getApplicableStereotype(stereotypeName);
+
+		List<Stereotype> subStereotypes = findSubstereotypes(umlElement, stereotypeName);
+
+		for (Stereotype subStereotype : subStereotypes) {
+			if (umlElement.getAppliedStereotypes().contains(subStereotype)) {
+				return subStereotype;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Obtains the possibly implicitly applied (by virtue of some sub-stereotype of it being applied) stereotype
+	 * of the specified name on a UML element.
+	 *
+	 * @param umlElement
+	 *            The UML Element on which the stereotype is (possibly pseudo-) applied
+	 * @param stereotypeName
+	 *            The qualified name of the stereotype
+	 * @return
+	 *         The stereotype of the given name that either is applied or has some substereotype that is applied to the element
+	 */
+	public static Stereotype getAppliedSuperstereotype(Element umlElement, String stereotypeName) {
+		if (umlElement == null) {
+			throw new IllegalArgumentException("umlElement"); //$NON-NLS-1$
+		}
+		if (stereotypeName == null) {
+			throw new IllegalArgumentException("stereotypeName"); //$NON-NLS-1$
+		}
+
+		// Simplest case
+		Stereotype result = umlElement.getAppliedStereotype(stereotypeName);
+		if (result == null) {
+			for (Stereotype sub : findSubstereotypes(umlElement, stereotypeName)) {
+				if (umlElement.isStereotypeApplied(sub)) {
+					result = getSuperstereotype(sub, stereotypeName);
+					break;
+				}
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Search the given stereotype (by name) that is applicable to the given UML Element.
+	 * If the search is not strict, the name may be the qualified name of a
+	 * sub-stereotype of an applied stereotype
+	 *
+	 * @param umlElement
+	 *            The UML Element on which the stereotype could be applied. Must not be {@code null}
+	 * @param stereotypeName
+	 *            The qualified name of the stereotype. Must not be {@code null}
+	 * @param strict
+	 *            If set to true, only a stereotype matching the exact qualified name
+	 *            will be returned. Otherwise, any subtype of the given stereotype may be
+	 *            returned. Note that if more than one stereotype is a subtype of the
+	 *            given stereotype, the first matching stereotype is returned.
+	 * @return
+	 *         The first matching applicable stereotype, or null if none was found
+	 */
+	public static Stereotype getApplicableStereotype(Element umlElement, String stereotypeName, boolean strict) {
+		if (umlElement == null) {
+			throw new IllegalArgumentException("umlElement"); //$NON-NLS-1$
+		}
+		if (stereotypeName == null) {
+			throw new IllegalArgumentException("stereotypeName"); //$NON-NLS-1$
+		}
+
+		Stereotype result = umlElement.getApplicableStereotype(stereotypeName);
+		if ((result == null) && !strict) {
+			List<Stereotype> subStereotypes = findSubstereotypes(umlElement, stereotypeName);
+
+			for (Stereotype subStereotype : subStereotypes) {
+				if (umlElement.isStereotypeApplicable(subStereotype)) {
+					result = subStereotype;
+					break;
+				}
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Gets the first stereotype conforming to the given {@code stereotype} that is applied to the specified UML element.
+	 * 
+	 * @param umlElement
+	 *            an UML element. Must not be {@code null}
+	 * @param stereotype
+	 *            a stereotype that may or may not be applied to the element. Must not be {@code null}
+	 * 
+	 * @return the {@code stereotype} if it is applied to the element, or some subtype of it that is applied,
+	 *         if any sub-type of the {@code stereotype} is applied to the element
+	 */
+	public static Stereotype getAppliedSubstereotype(Element umlElement, Stereotype stereotype) {
+		if (umlElement == null) {
+			throw new IllegalArgumentException("umlElement"); //$NON-NLS-1$
+		}
+		if (stereotype == null) {
+			throw new IllegalArgumentException("stereotype"); //$NON-NLS-1$
+		}
+
+		Stereotype result = null;
+		if (umlElement.isStereotypeApplied(stereotype)) {
+			result = stereotype;
+		} else {
+			result = getAppliedStereotype(umlElement, stereotype.getQualifiedName(), false);
+		}
+
+		return result;
+	}
+
+	/**
+	 * Finds the Stereotype matching the given name.
+	 * The search is done in the context of the given UML Element
+	 * (i.e. the Profiles applied on the Element's nearest package)
+	 *
+	 * @param umlElement
+	 * @param stereotypeName
+	 * @return
+	 */
+	public static Stereotype findStereotype(Element umlElement, String stereotypeName) {
+		if (umlElement == null || stereotypeName == null) {
+			return null;
+		}
+
+		Stereotype stereotype = null;
+		org.eclipse.uml2.uml.Package umlPackage = umlElement.getNearestPackage();
+		if (umlPackage == null) {
+			stereotype = umlElement.getApplicableStereotype(stereotypeName);
+		} else {
+			outerLoop: for (Profile profile : umlPackage.getAllAppliedProfiles()) {
+				for (Stereotype ownedStereotype : profile.getOwnedStereotypes()) {
+					if (ownedStereotype.getQualifiedName().equals(stereotypeName)) {
+						stereotype = ownedStereotype;
+						break outerLoop;
+					}
+				}
+			}
+		}
+		return stereotype;
+	}
+
+	/**
+	 * Returns all stereotypes matching the given qualified stereotype name, and their substereotypes
+	 * The search is performed in the context of the given UML Element, i.e. the profiles applied
+	 * on the Element's nearest package
+	 *
+	 * @param umlElement
+	 * @param stereotypeName
+	 * @return
+	 */
+	public static List<Stereotype> findSubstereotypes(Element umlElement, String stereotypeName) {
+		if (umlElement == null || stereotypeName == null) {
+			return null;
+		}
+
+		Set<Stereotype> stereotypes = new HashSet<Stereotype>();
+		org.eclipse.uml2.uml.Package umlPackage = umlElement.getNearestPackage();
+
+		if (umlPackage == null) {
+			Stereotype stereotype = umlElement.getApplicableStereotype(stereotypeName);
+			if (stereotype != null) {
+				stereotypes.add(stereotype);
+			}
+		} else {
+			for (Profile profile : umlPackage.getAllAppliedProfiles()) {
+				Set<Stereotype> ownedStereotypes = getAllStereotypes(profile);
+				for (Stereotype ownedStereotype : ownedStereotypes) {
+					for (Stereotype superStereotype : getAllSuperStereotypes(ownedStereotype)) {
+						if (stereotypeName.equals(superStereotype.getQualifiedName())) {
+							stereotypes.add(ownedStereotype);
+						}
+					}
+				}
+			}
+		}
+
+		return new LinkedList<Stereotype>(stereotypes);
+	}
+
+	
+	
+	/**
+	 * Get all stereotyped contained in a profile and its nested package
+	 * @param pck
+	 * @return
+	 */
+	public static Set<Stereotype> getAllStereotypes(Package pck){
+		Set<Stereotype> stereotypes = new HashSet<Stereotype>();
+		stereotypes.addAll(pck.getOwnedStereotypes());
+		for (Package nestedPackage : pck.getNestedPackages()) {
+			stereotypes.addAll(getAllStereotypes(nestedPackage));
+		}
+		return stereotypes;
+	}
+	
+	
+	
+	
+	private static Stereotype getSuperstereotype(Stereotype substereotype, String qualifiedName) {
+		Stereotype result = null;
+
+		if (qualifiedName.equals(substereotype.getQualifiedName())) {
+			result = substereotype;
+		} else {
+			for (Stereotype next : getAllSuperStereotypes(substereotype)) {
+				if (qualifiedName.equals(next.getQualifiedName())) {
+					result = next;
+					break;
+				}
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Returns a collection of all super stereotypes of the given stereotype
+	 * (Including itself)
+	 *
+	 * @param stereotype
+	 * @return
+	 *         A collection of all super stereotypes
+	 */
+	public static Collection<Stereotype> getAllSuperStereotypes(Stereotype stereotype) {
+		Set<Stereotype> result = new HashSet<Stereotype>();
+		if (stereotype != null) {
+			getAllSuperStereotypes(stereotype, result);
+		}
+		return result;
+	}
+
+	private static void getAllSuperStereotypes(Stereotype stereotype, Set<Stereotype> result) {
+		result.add(stereotype);
+		for (Classifier superClassifier : stereotype.getGenerals()) {
+			if (superClassifier instanceof Stereotype && !result.contains(superClassifier)) {
+				getAllSuperStereotypes((Stereotype) superClassifier, result);
+			}
+		}
+	}
+
+	/**
+	 * Retrieves the UML Class associated to the given Message
+	 *
+	 * @param message
+	 * @return the UML Class associated to the given Message
+	 */
+	public static org.eclipse.uml2.uml.Class getContextClassForMessage(Message message) {
+		MessageOccurrenceSpecification receiveEvent = (MessageOccurrenceSpecification) message.getReceiveEvent();
+
+		if (receiveEvent == null) {
+			return null;
+		}
+
+		return getContextClassForMessageOccurrence(receiveEvent);
+	}
+
+	/**
+	 * Retrieves the UML Class associated to the given MessageOccurrenceSpecification
+	 *
+	 * @param messageOccurrence
+	 * @return the UML Class associated to the given MessageOccurrenceSpecification
+	 */
+	public static org.eclipse.uml2.uml.Class getContextClassForMessageOccurrence(MessageOccurrenceSpecification messageOccurrence) {
+		List<Lifeline> lifelines = messageOccurrence.getCovereds();
+		if (lifelines.isEmpty()) {
+			return null; // We can't find the context
+		} else if (lifelines.size() == 1) {
+			Lifeline lifeline = lifelines.get(0);
+			ConnectableElement element = lifeline.getRepresents();
+			if (element == null) {
+				return null;
+			}
+			Type type = element.getType();
+			if (type instanceof org.eclipse.uml2.uml.Class) {
+				org.eclipse.uml2.uml.Class clazz = (org.eclipse.uml2.uml.Class) type;
+				return clazz;
+			} else {
+				return null; // The type is not a Class
+			}
+		} else {
+			return null; // Too many contexts : which one should we choose ?
+		}
+	}
+
+	/**
+	 * Finds the UML Class associated to the given MessageEvent
+	 *
+	 * @param event
+	 * @return the Class associated to the given MessageEvent
+	 */
+	public static Class getContextClassForMessageEvent(MessageEvent event) {
+		Collection<EStructuralFeature.Setting> settings = EMFHelper.getUsages(event);
+		if (settings.isEmpty()) {
+			return null;
+		}
+
+		if (settings.size() == 1) {
+			EObject referer = settings.iterator().next().getEObject();
+			if (referer instanceof MessageOccurrenceSpecification) {
+				return UMLUtil.getContextClassForMessageOccurrence((MessageOccurrenceSpecification) referer);
+			} else {
+				return null;
+			}
+		}
+
+		MessageOccurrenceSpecification referer = null;
+		EObject newReferer = null;
+
+		for (EStructuralFeature.Setting setting : settings) {
+			newReferer = setting.getEObject();
+			if (!(newReferer instanceof MessageOccurrenceSpecification)) {
+				continue;
+			}
+
+			if (referer == null || referer == newReferer) {
+				referer = (MessageOccurrenceSpecification) newReferer;
+			} else {
+				referer = null;
+				break;
+			}
+		}
+
+		if (referer == null) {
+			return null;
+		}
+
+		return UMLUtil.getContextClassForMessageOccurrence(referer);
+	}
+
+	/**
+	 * Destroy all elements in a given list
+	 *
+	 * @param list
+	 *            a list of elements
+	 */
+	public static void destroyElements(EList<? extends Element> list) {
+		BasicEList<Element> listCopy = new BasicEList<Element>();
+		// loop on copy in order to avoid iterator exception
+		listCopy.addAll(list);
+		for (Element element : listCopy) {
+			element.destroy();
+		}
+	}
+}
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/OwnedAttributeHelper.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/OwnedAttributeHelper.java
new file mode 100644
index 00000000000..f2c6d5b5105
--- /dev/null
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/OwnedAttributeHelper.java
@@ -0,0 +1,91 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST and others.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.uml.tools.databinding;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.tools.Activator;

+import org.eclipse.uml2.uml.Artifact;

+import org.eclipse.uml2.uml.Association;

+import org.eclipse.uml2.uml.DataType;

+import org.eclipse.uml2.uml.Interface;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.Signal;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.Type;

+import org.eclipse.uml2.uml.UMLPackage;

+

+public class OwnedAttributeHelper {

+

+	public static EStructuralFeature getFeatureForType(Type type) {

+		if (type instanceof StructuredClassifier) {

+			return UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();

+		}

+		if (type instanceof Interface) {

+			return UMLPackage.eINSTANCE.getInterface_OwnedAttribute();

+		}

+		if (type instanceof DataType) {

+			return UMLPackage.eINSTANCE.getDataType_OwnedAttribute();

+		}

+		if (type instanceof Artifact) {

+			return UMLPackage.eINSTANCE.getArtifact_OwnedAttribute();

+		}

+		if (type instanceof Signal) {

+			return UMLPackage.eINSTANCE.getSignal_OwnedAttribute();

+		}

+

+		// Unknown type : we try to find the feature reflexively

+		Activator.log.warn("Unknown type : " + type.eClass().getName());

+		EStructuralFeature feature = type.eClass().getEStructuralFeature("ownedAttribute"); //$NON-NLS-1$

+		if (feature == null) {

+			Activator.log.warn("Cannot find a valid feature for type " + type.eClass().getName());

+		}

+		return feature;

+	}

+	

+	public static ICommand getSetTypeOwnerForAssociationAttributeCommand(Association association, Property memberEnd) {

+		ICommand command = null;

+		Type ownerType;

+		List<Type> ownerList = association.getEndTypes();

+

+		if (ownerList.get(0).equals(memberEnd.getType()) && ownerList.size() > 1) {

+			ownerType = ownerList.get(1);

+		} else {

+			ownerType = ownerList.get(0);

+		}

+

+		EStructuralFeature ownedAttributeFeature = getFeatureForType(ownerType);

+		if (ownedAttributeFeature != null) {

+

+			List<Property> attributeList = new ArrayList<Property>();

+			attributeList.addAll((EList<Property>) ownerType.eGet(ownedAttributeFeature));

+			attributeList.add(memberEnd);

+

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(ownerType);

+			if (provider != null) {

+				SetRequest request = new SetRequest(ownerType, ownedAttributeFeature, memberEnd);

+

+				command = provider.getEditCommand(request);

+			}

+		}

+		return command;

+	}

+}

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/OwnerObservableValue.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/OwnerObservableValue.java
index 314b60eac7d..c42e91a4d77 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/OwnerObservableValue.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/OwnerObservableValue.java
@@ -25,7 +25,6 @@ import org.eclipse.core.databinding.observable.IObserving;
 import org.eclipse.core.databinding.observable.list.IObservableList;

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.databinding.EMFProperties;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

@@ -38,14 +37,8 @@ import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;

 import org.eclipse.papyrus.infra.tools.databinding.ReferenceCountedObservable;

 import org.eclipse.papyrus.uml.tools.Activator;

-import org.eclipse.uml2.uml.Artifact;

 import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Interface;

 import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Signal;

-import org.eclipse.uml2.uml.StructuredClassifier;

-import org.eclipse.uml2.uml.Type;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

@@ -141,7 +134,7 @@ public class OwnerObservableValue extends ReferenceCountedObservable.Value imple
 			// Classifier classifier = memberEnd.getClass_();

 			// EStructuralFeature ownedEndFeature = association.eClass().getEStructuralFeature(UMLPackage.ASSOCIATION__OWNED_END);

 

-			Command command = null;

+			ICommand command = null;

 

 			if (isOwnedByAssociation) { // Owned by Association

 				IElementEditService provider = ElementEditServiceUtils.getCommandProvider(association);

@@ -154,76 +147,25 @@ public class OwnerObservableValue extends ReferenceCountedObservable.Value imple
 

 					SetRequest request = new SetRequest(association, feature, attributeList);

 

-					ICommand createGMFCommand = provider.getEditCommand(request);

+					command = provider.getEditCommand(request);

 

-					command = new GMFtoEMFCommandWrapper(createGMFCommand);

 				}

 			} else { // Owned by Classifier

 

-				Type ownerType;

-				List<Type> ownerList = association.getEndTypes();

-

-				if (ownerList.get(0).equals(memberEnd.getType()) && ownerList.size() > 1) {

-					ownerType = ownerList.get(1);

-				} else {

-					ownerType = ownerList.get(0);

-				}

-

-				EStructuralFeature ownedAttributeFeature = getFeatureForType(ownerType);

-				if (ownedAttributeFeature != null) {

-

-					List<Property> attributeList = new ArrayList<Property>();

-					attributeList.addAll((EList<Property>) ownerType.eGet(ownedAttributeFeature));

-					attributeList.add(memberEnd);

-

-					IElementEditService provider = ElementEditServiceUtils.getCommandProvider(ownerType);

-					if (provider != null) {

-						SetRequest request = new SetRequest(ownerType, ownedAttributeFeature, memberEnd);

-

-						ICommand createGMFCommand = provider.getEditCommand(request);

-

-						command = new GMFtoEMFCommandWrapper(createGMFCommand);

-					}

-				}

+				command = OwnedAttributeHelper.getSetTypeOwnerForAssociationAttributeCommand(association, memberEnd);

 			}

 

 			if (command != null) {

 				this.currentValue = owner;

+				return new GMFtoEMFCommandWrapper(command);

 			} else {

 				Activator.log.warn("Cannot modify the memberEnd owner");

 			}

-			return command;

 		}

 

 		return UnexecutableCommand.INSTANCE;

 	}

 

-	private EStructuralFeature getFeatureForType(Type type) {

-		if (type instanceof StructuredClassifier) {

-			return UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();

-		}

-		if (type instanceof Interface) {

-			return UMLPackage.eINSTANCE.getInterface_OwnedAttribute();

-		}

-		if (type instanceof DataType) {

-			return UMLPackage.eINSTANCE.getDataType_OwnedAttribute();

-		}

-		if (type instanceof Artifact) {

-			return UMLPackage.eINSTANCE.getArtifact_OwnedAttribute();

-		}

-		if (type instanceof Signal) {

-			return UMLPackage.eINSTANCE.getSignal_OwnedAttribute();

-		}

-

-		// Unknown type : we try to find the feature reflexively

-		Activator.log.warn("Unknown type : " + type.eClass().getName());

-		EStructuralFeature feature = type.eClass().getEStructuralFeature("ownedAttribute"); //$NON-NLS-1$

-		if (feature == null) {

-			Activator.log.warn("Cannot find a valid feature for type " + type.eClass().getName());

-		}

-		return feature;

-	}

-

 	public AggregatedObservable aggregate(IObservable observable) {

 		try {

 			return new AggregatedPapyrusObservableValue(domain, this, observable);

diff --git a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
index b9b5f8c95c7..bfb83fd2892 100644
--- a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
+++ b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
@@ -1,2912 +1,2951 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<setup:Project
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
-    xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
-    xmlns:mylyn="http://www.eclipse.org/oomph/setup/mylyn/1.0"
-    xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
-    xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
-    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
-    xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
-    xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
-    xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
-    xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
-    name="papyrus"
-    label="Papyrus">
-  <setupTask
-      xsi:type="setup.p2:P2Task"
-      label="Core Development Tools">
-    <requirement
-        name="org.eclipse.emf.sdk.feature.group"/>
-    <requirement
-        name="org.eclipse.gmf.runtime.notation.sdk.feature.group"/>
-    <requirement
-        name="org.eclipse.gmf.runtime.sdk.feature.group"/>
-    <requirement
-        name="org.eclipse.gmf.sdk.feature.group"/>
-    <requirement
-        name="org.eclipse.uml2.sdk.feature.group"/>
-    <requirement
-        name="org.eclipse.papyrus.sdk.feature.feature.group"/>
-    <requirement
-        name="org.eclipse.pde.api.tools.ee.feature.feature.group"/>
-    <requirement
-        name="org.eclipse.mylyn.ide_feature.feature.group"/>
-    <requirement
-        name="org.eclipse.mylyn.java_feature.feature.group"/>
-    <requirement
-        name="org.eclipse.mylyn.pde_feature.feature.group"/>
-    <requirement
-        name="org.eclipse.mylyn.team_feature.feature.group"/>
-    <requirement
-        name="org.eclipse.mylyn.gerrit.feature.feature.group"/>
-    <requirement
-        name="org.eclipse.mylyn_feature.feature.group"/>
-    <requirement
-        name="org.eclipse.mylyn.bugzilla_feature.feature.group"/>
-    <requirement
-        name="org.eclipse.mylyn.git.feature.group"/>
-    <requirement
-        name="org.eclipse.mylyn.hudson.feature.group"/>
-    <requirement
-        name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
-    <requirement
-        name="org.eclipse.egit.feature.group"/>
-    <requirement
-        name="org.eclipse.egit.mylyn.feature.group"/>
-    <requirement
-        name="org.eclipse.buckminster.core.feature.feature.group"/>
-    <requirement
-        name="org.eclipse.buckminster.git.feature.feature.group"/>
-    <requirement
-        name="org.eclipse.buckminster.pde.feature.feature.group"/>
-    <requirement
-        name="org.eclipse.swtbot.ide.feature.group"/>
-    <requirement
-        name="org.eclipse.swtbot.generator.feature.feature.group"/>
-    <requirement
-        name="org.eclipse.m2e.feature.feature.group"/>
-    <repository
-        url="http://download.eclipse.org/tools/buckminster/updates-4.4"/>
-    <repository
-        url="http://download.eclipse.org/technology/swtbot/snapshots"/>
-  </setupTask>
-  <setupTask
-      xsi:type="setup.p2:P2Task"
-      label="Releng Tools">
-    <requirement
-        name="org.eclipse.oomph.projectconfig.feature.group"/>
-    <requirement
-        name="org.eclipse.oomph.projectcopy.feature.group"/>
-    <requirement
-        name="org.eclipse.oomph.workingsets.feature.group"/>
-  </setupTask>
-  <setupTask
-      xsi:type="setup.p2:P2Task"
-      label="Code Quality Tools">
-    <requirement
-        name="com.mountainminds.eclemma.feature.feature.group"
-        optional="true"/>
-    <requirement
-        name="net.sf.eclipsecs.feature.group"
-        optional="true"/>
-    <requirement
-        name="edu.umd.cs.findbugs.plugin.eclipse.feature.group"
-        optional="true"/>
-    <repository
-        url="http://update.eclemma.org/"/>
-    <repository
-        url="http://eclipse-cs.sourceforge.net/update/"/>
-    <repository
-        url="http://findbugs.cs.umd.edu/eclipse/"/>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:EclipseIniTask"
-      option="-Xmx"
-      value="2048m"
-      vm="true"/>
-  <setupTask
-      xsi:type="setup:ResourceCreationTask"
-      excludedTriggers="STARTUP MANUAL"
-      content="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;item value=&quot;${papyrus.git.clone.location}/doc/DevelopperDocuments/templates&quot; key=&quot;org.eclipse.jdt.ui.cleanup.loadpath&quot;/>&#xA;&#x9;&lt;item value=&quot;${papyrus.git.clone.location}/doc/DevelopperDocuments/templates&quot; key=&quot;org.eclipse.jdt.ui.codeformatter.loadpath&quot;/>&#xA;&#x9;&lt;item value=&quot;${papyrus.git.clone.location}/doc/DevelopperDocuments/templates&quot; key=&quot;org.eclipse.jdt.ui.importorder.loadpath&quot;/>&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"
-      targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
-      encoding="UTF-8"/>
-  <setupTask
-      xsi:type="setup:ResourceCreationTask"
-      content="cleanup_profile=_Papyrus&#xA;cleanup_settings_version=2&#xA;eclipse.preferences.version=1&#xA;formatter_profile=_Papyrus Formatter Profile CDM&#xA;formatter_settings_version=12&#xA;org.eclipse.jdt.ui.cleanupprofiles=&lt;?xml version\=&quot;1.0&quot; encoding\=&quot;UTF-8&quot; standalone\=&quot;no&quot;?>\n&lt;profiles version\=&quot;2&quot;>\n&lt;profile kind\=&quot;CleanUpProfile&quot; name\=&quot;Papyrus&quot; version\=&quot;2&quot;>\n&lt;setting id\=&quot;cleanup.format_source_code&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.convert_functional_interfaces&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.add_missing_annotations&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.use_this_for_non_static_method_access_only_if_necessary&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unused_private_types&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.insert_inferred_type_arguments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.qualify_static_member_accesses_through_instances_with_declaring_class&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.qualify_static_method_accesses_with_declaring_class&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.add_generated_serial_version_id&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.make_variable_declarations_final&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.add_missing_methods&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.always_use_this_for_non_static_field_access&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.use_type_arguments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_trailing_whitespaces_ignore_empty&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.correct_indentation&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.never_use_parentheses_in_expressions&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.add_serial_version_id&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unused_private_methods&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.use_this_for_non_static_field_access&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.use_blocks_only_for_return_and_throw&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unused_private_members&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.add_missing_override_annotations_interface_methods&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.remove_trailing_whitespaces_all&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.make_type_abstract_if_missing_method&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.always_use_this_for_non_static_method_access&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unnecessary_nls_tags&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.format_source_code_changes_only&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.qualify_static_field_accesses_with_declaring_class&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.add_missing_nls_tags&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.use_this_for_non_static_field_access_only_if_necessary&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unnecessary_casts&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.qualify_static_member_accesses_with_declaring_class&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.use_parentheses_in_expressions&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unused_private_fields&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.make_parameters_final&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_redundant_type_arguments&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.remove_trailing_whitespaces&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unused_imports&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.use_anonymous_class_creation&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.organize_imports&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.sort_members&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_private_constructors&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.convert_to_enhanced_for_loop&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.always_use_blocks&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.never_use_blocks&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.use_lambda&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.always_use_parentheses_in_expressions&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.use_this_for_non_static_method_access&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unused_local_variables&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.make_private_fields_final&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.add_missing_deprecated_annotations&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.add_default_serial_version_id&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.sort_members_all&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.use_blocks&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.add_missing_override_annotations&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.make_local_variable_final&quot; value\=&quot;true&quot;/>\n&lt;/profile>\n&lt;/profiles>\n&#xA;org.eclipse.jdt.ui.cleanupprofiles.version=2&#xA;org.eclipse.jdt.ui.formatterprofiles=&lt;?xml version\=&quot;1.0&quot; encoding\=&quot;UTF-8&quot; standalone\=&quot;no&quot;?>\n&lt;profiles version\=&quot;12&quot;>\n&lt;profile kind\=&quot;CodeFormatterProfile&quot; name\=&quot;Papyrus Formatter Profile CDM&quot; version\=&quot;12&quot;>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.disabling_tag&quot; value\=&quot;@formatter\:off&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_field&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.use_on_off_tags&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_ellipsis&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_multiple_fields&quot; value\=&quot;16&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_conditional_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_binary_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_array_initializer&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_after_package&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.continuation_indentation&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_binary_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_package&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.source&quot; value\=&quot;1.8&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_line_comments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.join_wrapped_lines&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_member_type&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.align_type_members_on_columns&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_unary_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.indent_parameter_description&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.lineSplit&quot; value\=&quot;200&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indentation.size&quot; value\=&quot;4&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.enabling_tag&quot; value\=&quot;@formatter\:on&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_assignment&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.problem.assertIdentifier&quot; value\=&quot;error&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.tabulation.char&quot; value\=&quot;tab&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_statements_compare_to_body&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_method&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_method_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_switch&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.problem.enumIdentifier&quot; value\=&quot;error&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_ellipsis&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_block&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_method_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.compact_else_if&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.indent_root_tags&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_enum_constant&quot; value\=&quot;next_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch&quot; value\=&quot;16&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.tabulation.size&quot; value\=&quot;4&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_empty_lines&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_block_in_case&quot; value\=&quot;next_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve&quot; value\=&quot;5&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.compliance&quot; value\=&quot;1.8&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_lambda_body&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_unary_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_binary_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode&quot; value\=&quot;enabled&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_label&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_javadoc_comments&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.line_length&quot; value\=&quot;150&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_between_import_groups&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.wrap_before_binary_operator&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_statements_compare_to_block&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.join_lines_in_comments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_compact_if&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_imports&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_html&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_source_code&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.codegen.targetPlatform&quot; value\=&quot;1.8&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_resources_in_try&quot; value\=&quot;80&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_header&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_block_comments&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_enum_constants&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_type_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_after_imports&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line&quot; value\=&quot;false&quot;/>\n&lt;/profile>\n&lt;profile kind\=&quot;CodeFormatterProfile&quot; name\=&quot;Zero blank Papyrus Formatter Profile CDM&quot; version\=&quot;12&quot;>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.disabling_tag&quot; value\=&quot;@formatter\:off&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_field&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.use_on_off_tags&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_ellipsis&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_multiple_fields&quot; value\=&quot;16&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_conditional_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_binary_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_array_initializer&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_after_package&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.continuation_indentation&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_binary_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_package&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.source&quot; value\=&quot;1.8&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_line_comments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.join_wrapped_lines&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_member_type&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.align_type_members_on_columns&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_unary_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.indent_parameter_description&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.lineSplit&quot; value\=&quot;200&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indentation.size&quot; value\=&quot;4&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.enabling_tag&quot; value\=&quot;@formatter\:on&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_assignment&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.problem.assertIdentifier&quot; value\=&quot;error&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.tabulation.char&quot; value\=&quot;tab&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_statements_compare_to_body&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_method&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_method_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_switch&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.problem.enumIdentifier&quot; value\=&quot;error&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_ellipsis&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_block&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_method_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.compact_else_if&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.indent_root_tags&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_enum_constant&quot; value\=&quot;next_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch&quot; value\=&quot;16&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.tabulation.size&quot; value\=&quot;4&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_empty_lines&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_block_in_case&quot; value\=&quot;next_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.compliance&quot; value\=&quot;1.8&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_lambda_body&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_unary_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_binary_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode&quot; value\=&quot;enabled&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_label&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_javadoc_comments&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.line_length&quot; value\=&quot;150&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_between_import_groups&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.wrap_before_binary_operator&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_statements_compare_to_block&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.join_lines_in_comments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_compact_if&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_imports&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_html&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_source_code&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.codegen.targetPlatform&quot; value\=&quot;1.8&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_resources_in_try&quot; value\=&quot;80&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_header&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_block_comments&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_enum_constants&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_type_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_after_imports&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line&quot; value\=&quot;false&quot;/>\n&lt;/profile>\n&lt;/profiles>\n&#xA;org.eclipse.jdt.ui.formatterprofiles.version=12&#xA;org.eclipse.jdt.ui.text.code_templates_migrated=true&#xA;org.eclipse.jdt.ui.text.custom_code_templates=&lt;?xml version\=&quot;1.0&quot; encoding\=&quot;UTF-8&quot; standalone\=&quot;no&quot;?>&lt;templates>&lt;template autoinsert\=&quot;false&quot; context\=&quot;constructorcomment_context&quot; deleted\=&quot;false&quot; description\=&quot;Comment for created constructors&quot; enabled\=&quot;true&quot; id\=&quot;org.eclipse.jdt.ui.text.codetemplates.constructorcomment&quot; name\=&quot;constructorcomment&quot;>/**\n * Constructor.\n *\n * $${tags}\n */&lt;/template>&lt;template autoinsert\=&quot;false&quot; context\=&quot;filecomment_context&quot; deleted\=&quot;false&quot; description\=&quot;Comment for created Java files&quot; enabled\=&quot;true&quot; id\=&quot;org.eclipse.jdt.ui.text.codetemplates.filecomment&quot; name\=&quot;filecomment&quot;>/*****************************************************************************\n * Copyright (c) $${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n&lt;/template>&lt;template autoinsert\=&quot;false&quot; context\=&quot;overridecomment_context&quot; deleted\=&quot;false&quot; description\=&quot;Comment for overriding methods&quot; enabled\=&quot;true&quot; id\=&quot;org.eclipse.jdt.ui.text.codetemplates.overridecomment&quot; name\=&quot;overridecomment&quot;>/**\n * $${see_to_overridden}\n *\n * $${tags}\n */&lt;/template>&lt;template autoinsert\=&quot;false&quot; context\=&quot;delegatecomment_context&quot; deleted\=&quot;false&quot; description\=&quot;Comment for delegate methods&quot; enabled\=&quot;true&quot; id\=&quot;org.eclipse.jdt.ui.text.codetemplates.delegatecomment&quot; name\=&quot;delegatecomment&quot;>/**\n * $${see_to_target}\n *\n * $${tags}\n */&lt;/template>&lt;/templates>&#xA;"
-      targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs">
-    <description>Code formatting and clean-up profiles for Papyrus.</description>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:CompoundTask"
-      name="Compiler Preferences">
-    <setupTask
-        xsi:type="setup:PreferenceTask"
-        key="instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE"
-        value="ignore"/>
-    <setupTask
-        xsi:type="setup:PreferenceTask"
-        key="instance/org.eclipse.pde/compilers.f.unresolved-features"
-        value="2"/>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="org.eclipse.pde.api.tools">
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.pde.api.tools/missing_default_api_profile"
-          value="Ignore"/>
-    </setupTask>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:VariableTask"
-      type="URI"
-      name="base.downloads.url"
-      value="http://download.eclipse.org"/>
-  <setupTask
-      xsi:type="setup:VariableTask"
-      name="git.checkout.branch"
-      value="${scope.project.stream.name}"/>
-  <setupTask
-      xsi:type="setup:VariableTask"
-      name="eclipse.target.platform"
-      defaultValue="Luna"
-      storageURI="scope://Workspace"/>
-  <setupTask
-      xsi:type="git:GitCloneTask"
-      id="papyrus.git.clone"
-      remoteURI="papyrus/org.eclipse.papyrus"
-      pushURI=""
-      checkoutBranch="${git.checkout.branch}">
-    <annotation
-        source="http://www.eclipse.org/oomph/setup/InducedChoices">
-      <detail
-          key="inherit">
-        <value>eclipse.git.gerrit.remoteURIs</value>
-      </detail>
-      <detail
-          key="label">
-        <value>Papyrus Git or Gerrit Repository</value>
-      </detail>
-      <detail
-          key="target">
-        <value>remoteURI</value>
-      </detail>
-    </annotation>
-    <description>Papyrus</description>
-  </setupTask>
-  <setupTask
-      xsi:type="setup.targlets:TargletTask">
-    <targlet
-        name="Papyrus Main Dependencies"
-        activeRepositoryList="${eclipse.target.platform}">
-      <requirement
-          name="org.eclipse.sdk.feature.group"/>
-      <requirement
-          name="org.eclipse.acceleo.feature.group"/>
-      <requirement
-          name="org.eclipse.uml2.sdk.feature.group"/>
-      <requirement
-          name="org.eclipse.emf.sdk.feature.group"/>
-      <repositoryList
-          name="Mars">
-        <repository
-            url="http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M5a-201502031300/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>Eclipse</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="${base.downloads.url}/tools/orbit/downloads/drops/R20140525021250/repository"/>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>EMF (Core)</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201502040445">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>EMF TRANSACTION</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201502040400">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>EMF VALIDATION</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/tools/gef/updates/milestones">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>GEF</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201502040533">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>GMF Runtime</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201502040339">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>GMF Notation</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/M4">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>GMF Tooling</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201502030703/mwe">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>EMFT MWE</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201502030947/mwe2lang">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>EMFT MWE:1</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201502021150">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>QVT Operational</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201502030917">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>M2T ACCELEO</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/mdt/ocl/updates/interim/6.0.0/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>MDT OCL 6.0</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/mdt/uml2/updates/5.1-I-builds/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>MDT UML2</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201502030723/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>M2T XPAND</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201502030924/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>Xtext, Xtend</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201502031424">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>EMF COMPARE</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M4-20141211000148/repository/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>WebTools</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="${base.downloads.url}/nattable/releases/1.2.0/repository/"/>
-        <repository
-            url="http://download.eclipse.org/xwt/release-1.1.0">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>XWT</value>
-            </detail>
-          </annotation>
-        </repository>
-      </repositoryList>
-      <repositoryList
-          name="Luna">
-        <repository
-            url="http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>Eclipse</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="${base.downloads.url}/tools/orbit/downloads/drops/R20140525021250/repository"/>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/emf/updates/2.10.x/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>EMF (Core)</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/transaction/updates/releases/R201405281451/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>EMF TRANSACTION</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/validation/updates/releases/R201405281429/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>EMF VALIDATION</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="${base.downloads.url}/modeling/emf/query/updates/releases/R201405281426"/>
-        <repository
-            url="http://download.eclipse.org/tools/gef/updates/milestones">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>GEF</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201408201453/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>GMF Runtime</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201405281433/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>GMF Notation</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.2.1.RC4">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>GMF Tooling</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201409021027/mwe">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>EMFT MWE</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/mmt/qvto/updates/milestones/3.4.0/S201406101621">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>QVT Operational</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/acceleo/updates/milestones/3.5/S201409021433">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>M2T ACCELEO</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/5.0.2/S201409011459">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>MDT OCL 5.0</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/mdt/uml2/updates/5.0">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>MDT UML2</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201406030414/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>M2T XPAND</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/maintenance/R201409160908/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>Xtext, Xtend</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.0/S201408191310">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>EMF COMPARE</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="http://download.eclipse.org/webtools/downloads/drops/R3.6.1/R-3.6.1-20140912000031/repository/">
-          <annotation
-              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-            <detail
-                key="updateFrom">
-              <value>WebTools</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="${base.downloads.url}/nattable/releases/1.2.0/repository/"/>
-      </repositoryList>
-    </targlet>
-    <targlet
-        name="Papyrus Test Dependencies"
-        activeRepositoryList="${eclipse.target.platform}">
-      <requirement
-          name="org.eclipse.swtbot.feature.group"/>
-      <requirement
-          name="org.eclipse.swtbot.eclipse.feature.group"/>
-      <requirement
-          name="org.eclipse.swtbot.eclipse.gef.feature.group"/>
-      <requirement
-          name="org.eclipse.swtbot.forms.feature.group"/>
-      <repositoryList
-          name="Mars">
-        <repository
-            url="${base.downloads.url}/technology/swtbot/snapshots"/>
-      </repositoryList>
-      <repositoryList
-          name="Luna">
-        <repository
-            url="${base.downloads.url}/technology/swtbot/snapshots"/>
-      </repositoryList>
-    </targlet>
-    <targlet
-        name="Papyrus Main Plug-ins"
-        activeRepositoryList="${eclipse.target.platform}">
-      <requirement
-          name="org.eclipse.papyrus.sdk.feature.feature.group"/>
-      <repositoryList
-          name="Mars">
-        <repository
-            url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/mars/main"/>
-      </repositoryList>
-      <repositoryList
-          name="Luna">
-        <repository
-            url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/luna"/>
-      </repositoryList>
-    </targlet>
-    <targlet
-        name="Diagnostic/Debug Tools"
-        activeRepositoryList="${eclipse.target.platform}"
-        includeSources="false">
-      <requirement
-          name="org.eclipse.swt.tools"
-          optional="true"/>
-      <repositoryList
-          name="Mars">
-        <repository
-            url="http://www.eclipse.org/swt/updates/4.4"/>
-      </repositoryList>
-      <repositoryList
-          name="Luna">
-        <repository
-            url="http://www.eclipse.org/swt/updates/4.4"/>
-      </repositoryList>
-    </targlet>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:CompoundTask"
-      name="Mylyn Queries">
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="papyrus.bugzilla.repository"
-        value="https://bugs.eclipse.org/bugs"/>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="papyrus.bugzilla.prefix"
-        value="/buglist.cgi?classification=Modeling&amp;product=Papyrus"/>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="papyrus.bugzilla.open"
-        value="bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED"/>
-    <setupTask
-        xsi:type="mylyn:MylynQueriesTask"
-        repositoryURL="${papyrus.bugzilla.repository}">
-      <query
-          summary="Papyrus Flagged for Review"
-          url="${papyrus.bugzilla.prefix}&amp;version=${papyrus.bugzilla.version}&amp;${papyrus.bugzilla.open}&amp;query_format=advanced&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=review%3F"/>
-      <query
-          summary="Papyrus Open Bugs"
-          url="${papyrus.bugzilla.prefix}&amp;version=${papyrus.bugzilla.version}&amp;${papyrus.bugzilla.open}&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial"/>
-      <query
-          summary="Papyrus Open Enhancement Requests"
-          url="${papyrus.bugzilla.prefix}&amp;version=${papyrus.bugzilla.version}&amp;${papyrus.bugzilla.open}&amp;bug_severity=enhancement"/>
-      <query
-          summary="Papyrus Resolved Items"
-          url="${papyrus.bugzilla.prefix}&amp;version=${papyrus.bugzilla.version}&amp;bug_status=RESOLVED&amp;resolution=FIXED"/>
-    </setupTask>
-    <setupTask
-        xsi:type="mylyn:MylynQueriesTask"
-        connectorKind="org.eclipse.mylyn.gerrit"
-        repositoryURL="https://git.eclipse.org/r"
-        userID="${bugzilla.id}"
-        password="${eclipse.user.password}">
-      <query
-          summary="Papyrus Open Gerrit Reviews">
-        <attribute
-            key="gerrit query type"
-            value="custom"/>
-        <attribute
-            key="gerrit query project"
-            value="papyrus/org.eclipse.papyrus"/>
-        <attribute
-            key="gerrit query string"
-            value="project:papyrus/org.eclipse.papyrus status:open branch:${git.checkout.branch}"/>
-      </query>
-    </setupTask>
-    <setupTask
-        xsi:type="mylyn:MylynBuildsTask"
-        serverURL="https://hudson.eclipse.org/papyrus/"
-        userID="${bugzilla.id}"
-        password="${eclipse.user.password}">
-      <buildPlan
-          name="Papyrus-Master"/>
-      <buildPlan
-          name="Papyrus-Master-Tests"/>
-      <buildPlan
-          name="Papyrus-Master-Extra"/>
-      <buildPlan
-          name="Papyrus-Master-Extra-Tests"/>
-      <buildPlan
-          name="Papyrus-Luna"/>
-      <buildPlan
-          name="Papyrus-Luna-Tests"/>
-    </setupTask>
-  </setupTask>
-  <setupTask
-      xsi:type="projects:ProjectsImportTask">
-    <sourceLocator
-        rootFolder="${papyrus.git.clone.location/tests/junit/plugins}">
-      <predicate
-          xsi:type="predicates:OrPredicate">
-        <operand
-            xsi:type="predicates:NamePredicate"
-            pattern="org\.eclipse\.papyrus\.junit\.framework"/>
-        <operand
-            xsi:type="predicates:NamePredicate"
-            pattern="org\.eclipse\.papyrus\.junit\.utils"/>
-      </predicate>
-    </sourceLocator>
-  </setupTask>
-  <project name="main"
-      label="Main">
-    <project
-        name="infra"
-        label="Infra">
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/plugins/infra}">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:OrPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.infra\..*"/>
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.eclipse\.project\.editors"/>
-            </operand>
-            <operand
-                xsi:type="predicates:NotPredicate">
-              <operand
-                  xsi:type="predicates:OrPredicate">
-                <operand
-                    xsi:type="predicates:NamePredicate"
-                    pattern="org\.eclipse\.papyrus\.infra\.emf\.(?:embedded)?editor"/>
-                <operand
-                    xsi:type="predicates:NamePredicate"
-                    pattern="org\.eclipse\.papyrus\.infra\.emf\.facet\.queries"/>
-                <operand
-                    xsi:type="predicates:NamePredicate"
-                    pattern="org\.eclipse\.papyrus\.infra\.emf\.newchild"/>
-              </operand>
-            </operand>
-          </predicate>
-        </sourceLocator>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/plugins/editor}"/>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/infra}"/>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/core}">
-          <predicate
-              xsi:type="predicates:NotPredicate">
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.tests"/>
-          </predicate>
-        </sourceLocator>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/features}">
-          <predicate
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.(tests\.)?infra($|\..+)"/>
-        </sourceLocator>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus Infra"
-            id="papyrus-infra">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.infra.core"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:OrPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.infra\..*"/>
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.editor($|\..+)"/>
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.eclipse\.project\.editors"/>
-            </operand>
-            <operand
-                xsi:type="workingsets:ExclusionPredicate"
-                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.1 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.2 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.3 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.4"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus Infra Diagram"
-            id="papyrus-infra-diagram">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.infra.gmfdiag.common"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.infra\.gmfdiag($|\..+)"/>
-            <operand
-                xsi:type="workingsets:ExclusionPredicate"
-                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus Infra Nattable"
-            id="papyrus-infra-nattable">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.infra.nattable"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.infra\.(?:emf\.)?nattable($|\..+)"/>
-            <operand
-                xsi:type="workingsets:ExclusionPredicate"
-                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus Infra Services"
-            id="papyrus-infra-services">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.infra.services.labelprovider"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.infra\.services($|\..+)"/>
-            <operand
-                xsi:type="workingsets:ExclusionPredicate"
-                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus Infra Viewpoints"
-            id="papyrus-infra-viewpoints">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.infra.viewpoints.policy"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.infra\.viewpoints($|\..+)"/>
-            <operand
-                xsi:type="workingsets:ExclusionPredicate"
-                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus Infra Tests"
-            id="papyrus-infra-tests">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.infra.core.tests"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:OrPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.infra(\..+)?\.tests"/>
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.editor\.integration\.tests"/>
-            </operand>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus Infra Features"
-            id="papyrus-infra-features">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.infra.core.feature"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.FeatureNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus(\.tests)?\.infra($|\..+)"/>
-          </predicate>
-        </workingSet>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-        <setupTask
-            xsi:type="setup.targlets:TargletTask">
-          <targlet
-              name="Papyrus Infra Dependencies"
-              activeRepositoryList="${eclipse.target.platform}">
-            <requirement
-                name="org.eclipse.nebula.widgets.tablecombo.feature.feature.group"/>
-            <repositoryList
-                name="Mars">
-              <repository
-                  url="${base.downloads.url}/technology/nebula/archives/Q12015/release"/>
-            </repositoryList>
-            <repositoryList
-                name="Luna"/>
-          </targlet>
-        </setupTask>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-    </project>
-    <project
-        name="views"
-        label="Views">
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/plugins/views}"/>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/views}"/>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/features}">
-          <predicate
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.(tests\.)?views($|\..+)"/>
-        </sourceLocator>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus Views"
-            id="papyrus-views">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.views.properties"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.views($|\..+)"/>
-            <operand
-                xsi:type="workingsets:ExclusionPredicate"
-                excludedWorkingSet="//@projects[name='main']/@projects[name='views']/@setupTasks.1/@workingSets.1"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus Views Tests"
-            id="papyrus-views-tests">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.views.modelexplorer.tests"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.views(\..+)?\.tests"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus Views Features"
-            id="papyrus-views-features">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.views.properties.feature"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.FeatureNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.(tests\.)?views($|\..+)"/>
-          </predicate>
-        </workingSet>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-        <setupTask
-            xsi:type="projects:ProjectsImportTask">
-          <sourceLocator
-              rootFolder="${papyrus.git.clone.location/plugins/xwt}"/>
-          <sourceLocator
-              rootFolder="${papyrus.git.clone.location/features}">
-            <predicate
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.(tests\.)?xwt($|\..+)"/>
-          </sourceLocator>
-        </setupTask>
-        <setupTask
-            xsi:type="setup.workingsets:WorkingSetTask">
-          <workingSet
-              name="Papyrus XWT"
-              id="papyrus-xwt">
-            <predicate
-                xsi:type="predicates:AndPredicate">
-              <operand
-                  xsi:type="predicates:RepositoryPredicate"
-                  project="org.eclipse.papyrus.views.properties"/>
-              <operand
-                  xsi:type="predicates:NaturePredicate"
-                  nature="org.eclipse.pde.PluginNature"/>
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.xwt($|\..+)"/>
-            </predicate>
-          </workingSet>
-          <workingSet
-              name="Papyrus XWT Features"
-              id="papyrus-xwt-features">
-            <predicate
-                xsi:type="predicates:AndPredicate">
-              <operand
-                  xsi:type="predicates:RepositoryPredicate"
-                  project="org.eclipse.papyrus.views.properties.feature"/>
-              <operand
-                  xsi:type="predicates:NaturePredicate"
-                  nature="org.eclipse.pde.FeatureNature"/>
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.(tests\.)?xwt($|\..+)"/>
-            </predicate>
-          </workingSet>
-        </setupTask>
-      </stream>
-    </project>
-    <project
-        name="uml"
-        label="UML">
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/plugins/uml}">
-          <predicate
-              xsi:type="predicates:NotPredicate">
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
-          </predicate>
-        </sourceLocator>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/uml}">
-          <predicate
-              xsi:type="predicates:NotPredicate">
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
-          </predicate>
-        </sourceLocator>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/features}">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.(tests\.)?uml($|\..+)"/>
-            <operand
-                xsi:type="predicates:NotPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
-            </operand>
-          </predicate>
-        </sourceLocator>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus UML"
-            id="papyrus-uml">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.uml.commands"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.uml($|\..+)"/>
-            <operand
-                xsi:type="predicates:NotPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
-            </operand>
-            <operand
-                xsi:type="workingsets:ExclusionPredicate"
-                excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.1 //@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.2 //@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.3"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus UML Diagrams"
-            id="papyrus-uml-diagram">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.uml.diagram.common"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.uml\.diagram.*"/>
-            <operand
-                xsi:type="predicates:NotPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
-            </operand>
-            <operand
-                xsi:type="workingsets:ExclusionPredicate"
-                excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.3"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus UML Tables"
-            id="papyrus-uml-table">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.uml.nattable"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.uml\.nattable.*"/>
-            <operand
-                xsi:type="predicates:NotPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
-            </operand>
-            <operand
-                xsi:type="workingsets:ExclusionPredicate"
-                excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.3"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus UML Tests"
-            id="papyrus-uml-tests">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.uml.diagram.common.tests"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.uml(\..+)?\.tests"/>
-            <operand
-                xsi:type="predicates:NotPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern=".*\.alf.*|.*\.uml\.textedit.*"/>
-            </operand>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus UML Features"
-            id="papyrus-uml-features">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.uml.feature"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.FeatureNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus(\.tests)?\.uml($|\..+)"/>
-            <operand
-                xsi:type="predicates:NotPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>
-            </operand>
-          </predicate>
-        </workingSet>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.targlets:TargletTask">
-        <targlet
-            name="Additional UML Dependencies"
-            activeRepositoryList="">
-          <requirement
-              name="org.eclipse.ocl.jdt.annotation7"
-              optional="true"/>
-        </targlet>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-    </project>
-    <project
-        name="uml-alf"
-        label="UML ALF">
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/plugins/uml}">
-          <predicate
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/>
-        </sourceLocator>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/uml}">
-          <predicate
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/>
-        </sourceLocator>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/features}">
-          <predicate
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.(tests\.)?uml\.alf($|\..+)"/>
-        </sourceLocator>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus UML ALF"
-            id="papyrus-uml-alf">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.uml.alf.common"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus UML ALF Features"
-            id="papyrus-uml-alf-features">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.uml.alf.feature"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.FeatureNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/>
-          </predicate>
-        </workingSet>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-    </project>
-    <project
-        name="uml-text"
-        label="UML Text Editors">
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/plugins/uml}">
-          <predicate
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/>
-        </sourceLocator>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/uml}">
-          <predicate
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/>
-        </sourceLocator>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/features}">
-          <predicate
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.(tests\.)?uml\.(textedit|xtext)($|\..+)"/>
-        </sourceLocator>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus UML Text Editors"
-            id="papyrus-uml-text">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.uml.textedit.common.xtext"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus UML Text Editors Features"
-            id="papyrus-uml-text-features">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.uml.textedit.feature"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.FeatureNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/>
-          </predicate>
-        </workingSet>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-    </project>
-    <project
-        name="sysml"
-        label="SysML">
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/plugins/sysml}"/>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/sysml}"/>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/features}">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.(tests\.)?sysml($|\..+)"/>
-          </predicate>
-        </sourceLocator>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus SysML"
-            id="papyrus-sysml">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.sysml"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.sysml($|\..+)"/>
-            <operand
-                xsi:type="workingsets:ExclusionPredicate"
-                excludedWorkingSet="//@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.1 //@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.2 //@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.3"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus SysML Diagrams"
-            id="papyrus-sysml-diagram">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.sysml.diagram.common"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.sysml\.diagram($|\..+)"/>
-            <operand
-                xsi:type="workingsets:ExclusionPredicate"
-                excludedWorkingSet="//@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.3"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus SysML Tables"
-            id="papyrus-sysml-table">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.sysml.nattable"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.sysml\.nattable($|\..+)"/>
-            <operand
-                xsi:type="workingsets:ExclusionPredicate"
-                excludedWorkingSet="//@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.3"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus SysML Tests"
-            id="papyrus-sysml-tests">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.sysml.tests"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.sysml(\..+)?\.tests"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus SysML Features"
-            id="papyrus-sysml-features">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.sysml.feature"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.FeatureNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus(\.tests)?\.sysml($|\..+)"/>
-          </predicate>
-        </workingSet>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-    </project>
-    <project
-        name="emffacet"
-        label="EMF Facet">
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/plugins/facet}">
-          <predicate
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.emf\.facet\..*"/>
-        </sourceLocator>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/features}">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.(tests\.)?emf\.facet($|\..+)"/>
-          </predicate>
-        </sourceLocator>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus EMF Facet"
-            id="papyrus-emffacet">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.emf.facet.common.core"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.emf\.facet($|\..+)"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus EMF Facet Features"
-            id="papyrus-emffacet-features">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.emf.facet.feature"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.FeatureNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus(\.tests)?\.emf\.facet($|\..+)"/>
-          </predicate>
-        </workingSet>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-    </project>
-    <project
-        name="customization"
-        label="Customization">
-      <setupTask
-          xsi:type="setup.p2:P2Task">
-        <requirement
-            name="org.eclipse.m2m.qvt.oml.sdk.feature.group"/>
-      </setupTask>
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/plugins/customization}"/>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/customization}"/>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/features}">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.(tests\.)?customization($|\..+)"/>
-          </predicate>
-        </sourceLocator>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus Customization"
-            id="papyrus-customization">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.customization"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:OrPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.customization(?:$|\..+)"/>
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.editor(?:$|\..+)"/>
-            </operand>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus Customization Features"
-            id="papyrus-customization-features">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.customization.feature"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.FeatureNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.customization(?:$|\..+)"/>
-          </predicate>
-        </workingSet>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-    </project>
-    <project
-        name="doc"
-        label="Documentation">
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/plugins/doc}"/>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/features}">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus(\..+)?\.doc($|\..+)"/>
-          </predicate>
-        </sourceLocator>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus Documentation"
-            id="papyrus-doc">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.uml.doc"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus(\..+)?\.doc(umentation)?"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus Documentation Features"
-            id="papyrus-doc-features">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.doc.feature"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.FeatureNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus(\..+)?\.doc($|\..+)"/>
-          </predicate>
-        </workingSet>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-    </project>
-    <project
-        name="alltests"
-        label="All Tests">
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/tests/junit/plugins}"/>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/features}">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.tests\..+"/>
-            <operand
-                xsi:type="predicates:NotPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern=".*\.extra\..*"/>
-            </operand>
-          </predicate>
-        </sourceLocator>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus All Main Tests"
-            id="papyrus-alltests">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.tests"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus(\..+)?\.tests"/>
-            <operand
-                xsi:type="predicates:NotPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern=".*\.extra\..*"/>
-            </operand>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus Main Test Features"
-            id="papyrus-alltests-features">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.tests.feature"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.FeatureNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.tests($|\..+)"/>
-            <operand
-                xsi:type="predicates:NotPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern=".*\.extra\..*"/>
-            </operand>
-          </predicate>
-        </workingSet>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-    </project>
-    <project
-        name="misc"
-        label="Others">
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/plugins/team}"/>
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/features}">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.team($|\..+)"/>
-          </predicate>
-        </sourceLocator>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus Others"
-            id="papyrus-others">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.team.svn"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.team\.svn"/>
-          </predicate>
-        </workingSet>
-        <workingSet
-            name="Papyrus Other Features"
-            id="papyrus-others-features">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.team.feature"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.FeatureNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.team($|\..+)"/>
-          </predicate>
-        </workingSet>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.targlets:TargletTask">
-        <targlet
-            name="Papyrus Other Dependencies"
-            activeRepositoryList="${eclipse.target.platform}">
-          <requirement
-              name="org.eclipse.team.svn.feature.group"/>
-          <requirement
-              name="org.polarion.eclipse.team.svn.connector.svnkit18.feature.group"/>
-          <repositoryList
-              name="Luna">
-            <repository
-                url="${base.downloads.url}/technology/subversive/2.0/luna-site/"/>
-            <repository
-                url="http://community.polarion.com/projects/subversive/download/eclipse/4.0/update-site/"/>
-          </repositoryList>
-          <repositoryList
-              name="Mars">
-            <repository
-                url="http://download.eclipse.org/technology/subversive/2.0/mars-site/">
-              <annotation
-                  source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-                <detail
-                    key="updateFrom">
-                  <value>Subversive</value>
-                </detail>
-              </annotation>
-            </repository>
-            <repository
-                url="http://community.polarion.com/projects/subversive/download/eclipse/4.0/update-site/"/>
-          </repositoryList>
-        </targlet>
-        <description>
-          Additional dependencies, e.g. for Subversive (SVN team integration), including
-          an SVN connector from Polarion to prevent the connector dialog appearing at
-          run-time, especially as it interferes with JUnit test execution.
-        </description>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-    </project>
-    <project
-        name="releng"
-        label="Releng">
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/releng}"
-            locateNestedProjects="true">
-          <excludedPath>emfgen</excludedPath>
-        </sourceLocator>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus Releng"
-            id="papyrus-releng">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="releng"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern=".*\.releng.*|.*\.oomph.*|releng"/>
-          </predicate>
-        </workingSet>
-      </setupTask>
-      <project
-          name="maven"
-          label="Maven Plug-ins">
-        <setupTask
-            xsi:type="projects:ProjectsImportTask">
-          <sourceLocator
-              rootFolder="${papyrus.git.clone.location/releng/emfgen}"
-              locateNestedProjects="true"/>
-        </setupTask>
-        <stream
-            name="master"
-            label="master (Mars/1.1)">
-          <setupTask
-              xsi:type="setup:VariableTask"
-              name="papyrus.bugzilla.version"
-              value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-        </stream>
-        <description>Sources of Maven plug-ins for Papyrus custom build behaviours</description>
-      </project>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-    </project>
-    <description>Tools, dependencies, and sources for development of the main Papyrus components.  Required for any Papyrus development.</description>
-  </project>
-  <project name="extras"
-      label="Extras">
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="papyrus.extratests.folder"
-        value="${papyrus.extraplugins.folder}"/>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="papyrus.extrafeature"
-        value="extra.${papyrus.extraplugins.folder}"/>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="papyrus.extratestsfeature"
-        value="tests.${papyrus.extrafeature}"/>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="${scope.project.label} Plug-ins"
-          activeRepositoryList="${eclipse.target.platform}">
-        <requirement
-            name="org.eclipse.papyrus.${papyrus.extrafeature}.feature.feature.group"
-            optional="true"/>
-        <repositoryList
-            name="Mars">
-          <repository
-              url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/mars/extra"/>
-        </repositoryList>
-        <repositoryList
-            name="Luna">
-          <repository
-              url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/luna"/>
-        </repositoryList>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
-      <sourceLocator
-          rootFolder="${papyrus.git.clone.location/extraplugins}/${papyrus.extraplugins.folder}"/>
-      <sourceLocator
-          rootFolder="${papyrus.git.clone.location/tests/junit/extraplugins}/${papyrus.extratests.folder}"/>
-      <sourceLocator
-          rootFolder="${papyrus.git.clone.location/features/papyrus-extra-features}">
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org\.eclipse\.papyrus\.${papyrus.extrafeature}\.feature"/>
-      </sourceLocator>
-      <sourceLocator
-          rootFolder="${papyrus.git.clone.location/features/papyrus-tests-extra-features}">
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org\.eclipse\.papyrus\.${papyrus.extratestsfeature}\.feature"/>
-      </sourceLocator>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Papyrus ${scope.project.label}">
-        <predicate
-            xsi:type="predicates:OrPredicate">
-          <operand
-              xsi:type="predicates:LocationPredicate"
-              pattern="\Q${papyrus.git.clone.location/extraplugins}\E[\\/]\Q${papyrus.extraplugins.folder}\E"/>
-          <operand
-              xsi:type="predicates:LocationPredicate"
-              pattern="\Q${papyrus.git.clone.location/extraplugins}\E[\\/]\Q${papyrus.extraplugins.folder}\E[\\/].*"/>
-          <operand
-              xsi:type="predicates:LocationPredicate"
-              pattern="\Q${papyrus.git.clone.location/tests/junit/extraplugins}\E[\\/]\Q${papyrus.extratests.folder}\E[\\/].*"/>
-          <operand
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.FeatureNature"/>
-            <operand
-                xsi:type="predicates:OrPredicate">
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.${papyrus.extrafeature}($|\..*)"/>
-              <operand
-                  xsi:type="predicates:NamePredicate"
-                  pattern="org\.eclipse\.papyrus\.${papyrus.extratestsfeature}($|\..*)"/>
-            </operand>
-          </operand>
-        </predicate>
-      </workingSet>
-    </setupTask>
-    <project
-        name="cdo"
-        label="CDO Integration">
-      <setupTask
-          xsi:type="setup.targlets:TargletTask">
-        <targlet
-            name="Papyrus CDO Dependencies"
-            activeRepositoryList="${eclipse.target.platform}">
-          <requirement
-              name="org.eclipse.emf.cdo.sdk.feature.group"/>
-          <repositoryList
-              name="Mars">
-            <repository
-                url="http://download.eclipse.org/modeling/emf/cdo/drops/R20140610-0212">
-              <annotation
-                  source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-                <detail
-                    key="updateFrom">
-                  <value>EMF CDO</value>
-                </detail>
-              </annotation>
-            </repository>
-          </repositoryList>
-          <repositoryList
-              name="Luna">
-            <repository
-                url="${base.downloads.url}/modeling/emf/cdo/drops/R20140610-0212"/>
-          </repositoryList>
-        </targlet>
-      </setupTask>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="cdo"/>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-    </project>
-    <project
-        name="cpp"
-        label="C/C++ Codegen">
-      <setupTask
-          xsi:type="setup.targlets:TargletTask">
-        <targlet
-            name="Papyrus CPP Dependencies"
-            activeRepositoryList="${eclipse.target.platform}">
-          <requirement
-              name="org.eclipse.cdt.feature.group"/>
-          <requirement
-              name="org.eclipse.emf.facet.sdk.feature.feature.group"/>
-          <repositoryList
-              name="Mars">
-            <repository
-                url="http://download.eclipse.org/tools/cdt/builds/mars/milestones">
-              <annotation
-                  source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-                <detail
-                    key="updateFrom">
-                  <value>CDT</value>
-                </detail>
-              </annotation>
-            </repository>
-            <repository
-                url="http://download.eclipse.org/facet/updates/integration/1.0.0/I201502030839/">
-              <annotation
-                  source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
-                <detail
-                    key="updateFrom">
-                  <value>EMF Facet</value>
-                </detail>
-              </annotation>
-            </repository>
-          </repositoryList>
-          <repositoryList
-              name="Luna">
-            <repository
-                url="${base.downloads.url}/tools/cdt/builds/luna/milestones"/>
-            <repository
-                url="${base.downloads.url}/facet/updates/release/0.4.0"/>
-          </repositoryList>
-        </targlet>
-      </setupTask>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="codegen"/>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extratests.folder"
-          value="codegen"/>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extrafeature"
-          value="extra.cpp"/>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extratestsfeature"
-          value="tests.extra.codegen.cpp"/>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-    </project>
-    <project
-        name="diagramtemplate"
-        label="Diagram Template">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="diagramtemplate"/>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-      <description></description>
-    </project>
-    <project
-        name="dsml.validation"
-        label="DSML Validation">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="dsml.validation"/>
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/extraplugins}/codegen">
-          <predicate
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.codegen\.base"/>
-        </sourceLocator>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.p2:P2Task">
-        <requirement
-            name="org.eclipse.xtend.sdk.feature.group"/>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-      <description></description>
-    </project>
-    <project
-        name="eastadl"
-        label="East-ADL">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="eastadl"/>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-      <description></description>
-    </project>
-    <project
-        name="java"
-        label="Java">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="java"/>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extrafeature"
-          value="java\.(?:profile|generator|reverse)"/>
-      <setupTask
-          xsi:type="setup.targlets:TargletTask">
-        <targlet
-            name="Java Plug-ins"
-            activeRepositoryList="${eclipse.target.platform}">
-          <requirement
-              name="org.eclipse.papyrus.java.profile.feature.feature.group"/>
-          <requirement
-              name="org.eclipse.papyrus.java.generator.feature.feature.group"/>
-          <requirement
-              name="org.eclipse.papyrus.java.reverse.feature.feature.group"/>
-          <repositoryList
-              name="Mars">
-            <repository
-                url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/mars/extra"/>
-          </repositoryList>
-          <repositoryList
-              name="Luna">
-            <repository
-                url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/luna"/>
-          </repositoryList>
-        </targlet>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus Java">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.layers.stackmodel"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.java\..*"/>
-          </predicate>
-        </workingSet>
-        <description>Projects related to Java code generation/reverse.</description>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-      <description></description>
-    </project>
-    <project
-        name="layers"
-        label="Layers">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="layers"/>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extrafeature"
-          value="layers"/>
-      <setupTask
-          xsi:type="setup.workingsets:WorkingSetTask">
-        <workingSet
-            name="Papyrus Layers">
-          <predicate
-              xsi:type="predicates:AndPredicate">
-            <operand
-                xsi:type="predicates:RepositoryPredicate"
-                project="org.eclipse.papyrus.layers.stackmodel"/>
-            <operand
-                xsi:type="predicates:NaturePredicate"
-                nature="org.eclipse.pde.PluginNature"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.layers\..*"/>
-          </predicate>
-        </workingSet>
-        <description>Projects related to Papyrus Layers.</description>
-      </setupTask>
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/tests/integration/plugins}/org.eclipse.papyrus.integrationtests.editor"/>
-        <description>Import plugin requested by Layers</description>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.targlets:TargletTask">
-        <targlet
-            name="Layers dependencies"
-            activeRepositoryList="${eclipse.target.platform}">
-          <requirement
-              name="org.eclipse.emf.query.sdk.feature.group"/>
-          <repositoryList
-              name="Mars">
-            <repository
-                url="http://download.eclipse.org/modeling/emf/query/updates/releases/"/>
-          </repositoryList>
-        </targlet>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-      <description></description>
-    </project>
-    <project
-        name="marte"
-        label="MARTE">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="marte"/>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-      <description></description>
-    </project>
-    <project
-        name="migration"
-        label="Model Migration">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="migration"/>
-      <setupTask
-          xsi:type="setup.targlets:TargletTask">
-        <targlet
-            name="Papyrus Model Migration Dependencies">
-          <requirement
-              name="org.eclipse.papyrus.umlrt"/>
-        </targlet>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-      <description></description>
-    </project>
-    <project
-        name="moka"
-        label="Moka">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="moka"/>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-      <description></description>
-    </project>
-    <project
-        name="robotml"
-        label="RobotML">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="robotml"/>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-      <description></description>
-    </project>
-    <project
-        name="tablemigration"
-        label="Table Migration">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="tablemigration"/>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extrafeature"
-          value="tablemigration"/>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-      <description></description>
-    </project>
-    <project
-        name="umlcompare"
-        label="UML Compare">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="uml/compare"/>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extrafeature"
-          value="extra.uml.compare"/>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-      <description></description>
-    </project>
-    <project
-        name="umlexport"
-        label="UML Export">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="uml/org.eclipse.papyrus.uml.export"/>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extrafeature"
-          value="uml.export"/>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-      <description></description>
-    </project>
-    <project
-        name="umlrt"
-        label="UML-RT">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.extraplugins.folder"
-          value="umlrt"/>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-      </stream>
-      <description></description>
-    </project>
-    <description>Select sub-projects to import dependencies and sources for Papyrus extra components.</description>
-  </project>
-  <project name="dev"
-      label="Developer">
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
-      <sourceLocator
-          rootFolder="${papyrus.git.clone.location/plugins/developer}">
-        <predicate
-            xsi:type="predicates:NotPredicate">
-          <operand
-              xsi:type="predicates:OrPredicate">
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.sysml\.sysmloveruml\.codegen"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.infra\.extendedtypes\.elementtypeview"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.dev\.view\.services\.edit\.request"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.diagramdev\.modelexplorer"/>
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.papyrus\.releng\.tools"/>
-          </operand>
-        </predicate>
-      </sourceLocator>
-      <sourceLocator
-          rootFolder="${papyrus.git.clone.location/features/papyrus-dev-features}"/>
-      <sourceLocator
-          rootFolder="${papyrus.git.clone.location/tests/junit/plugins/developer}"/>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Papyrus Developer Tools"
-          id="papyrus-dev">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.papyrus.codegen"/>
-          <operand
-              xsi:type="predicates:OrPredicate">
-            <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="\Q${papyrus.git.clone.location/plugins/developer/}\E.+"/>
-            <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="\Q${papyrus.git.clone.location/features/papyrus-dev-features/}\E.*"/>
-            <operand
-                xsi:type="predicates:LocationPredicate"
-                pattern="\Q${papyrus.git.clone.location/tests/junit/plugins/developer/}\E.+"/>
-          </operand>
-        </predicate>
-      </workingSet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Papyrus Developer Tools Dependencies">
-        <requirement
-            name="org.eclipse.gmf.tooling.codegen.xtend2.feature.group"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.p2:P2Task">
-      <requirement
-          name="org.eclipse.xtend.sdk.feature.group"/>
-    </setupTask>
-    <project
-        name="Oomph"
-        label="Oomph Setup">
-      <setupTask
-          xsi:type="setup:EclipseIniTask"
-          option="-Doomph.redirection.papyrussetups"
-          value="=http://git.eclipse.org/c/papyrus/org.eclipse.papyrus.git/plain/releng/org.eclipse.papyrus.oomph/setups/->${papyrus.git.clone.location|uri}/releng/org.eclipse.papyrus.oomph/setups/"
-          vm="true"/>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <description>Additional configuration for developing and testing the Oomph setup model.</description>
-    </project>
-    <project
-        name="relengtools"
-        label="Releng Tools">
-      <setupTask
-          xsi:type="setup.targlets:TargletTask">
-        <targlet
-            name="Papyrus Releng Tools Dependencies">
-          <requirement
-              name="org.eclipse.oomph.setup.targlets.feature.group"
-              optional="true"/>
-          <requirement
-              name="org.eclipse.oomph.setup.feature.group"
-              optional="true"/>
-          <requirement
-              name="org.eclipse.b3.aggregator.engine.feature.feature.group"/>
-          <repositoryList>
-            <repository
-                url="${oomph.update.url}"/>
-            <repository
-                url="http://download.eclipse.org/modeling/emft/b3/updates-4.3/"/>
-          </repositoryList>
-        </targlet>
-      </setupTask>
-      <setupTask
-          xsi:type="projects:ProjectsImportTask">
-        <sourceLocator
-            rootFolder="${papyrus.git.clone.location/plugins/developer}"
-            locateNestedProjects="true">
-          <predicate
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.papyrus\.releng\.tools"/>
-        </sourceLocator>
-      </setupTask>
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-      </stream>
-      <description>Release engineering tools, including the POM and Oomph Setup dependencies updater actions.</description>
-    </project>
-    <project
-        name="devtools"
-        label="Developer Tools">
-      <stream
-          name="master"
-          label="master (Mars/1.1)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-        <setupTask
-            xsi:type="setup.p2:P2Task">
-          <requirement
-              name="org.eclipse.papyrus.dev.feature.feature.group"/>
-          <repository
-              url="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/releng/dev/target/repository/"/>
-        </setupTask>
-      </stream>
-      <stream
-          name="streams/1.0-maintenance"
-          label="streams/1.0-maintenance (Luna/1.0.x)">
-        <setupTask
-            xsi:type="setup:VariableTask"
-            name="papyrus.bugzilla.version"
-            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-        <setupTask
-            xsi:type="setup.p2:P2Task">
-          <requirement
-              name="org.eclipse.papyrus.dev.feature.feature.group"/>
-          <repository
-              url="https://hudson.eclipse.org/papyrus/job/Papyrus-Luna-Developer/lastSuccessfulBuild/artifact/releng/dev/target/repository/"/>
-        </setupTask>
-      </stream>
-      <description>Installs developer tools, including the code generator for Papyrus diagram plug-ins and various debugging aids such as &quot;spy&quot; views.  Source code is not included.</description>
-    </project>
-    <stream
-        name="master"
-        label="master (Mars/1.1)">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.bugzilla.version"
-          value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-    </stream>
-    <stream
-        name="streams/1.0-maintenance"
-        label="streams/1.0-maintenance (Luna/1.0.x)">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="papyrus.bugzilla.version"
-          value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-    </stream>
-    <description>Sources and tools required for working on the Papyrus developer tools (not part of the product).  Does not install the developer tools in your IDE:  use the Developer Tools sub-project for that.</description>
-  </project>
-  <stream name="master"
-      label="master (Mars/1.1)">
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="papyrus.bugzilla.version"
-        value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>
-    <setupTask
-        xsi:type="jdt:JRETask"
-        version="JavaSE-1.7"
-        location="${jre.location-1.7}"/>
-    <setupTask
-        xsi:type="setup.p2:P2Task">
-      <requirement
-          name="org.eclipse.uml2.sdk.feature.group"/>
-      <repository
-          url="http://download.eclipse.org/modeling/mdt/uml2/updates/5.1-I-builds/"/>
-    </setupTask>
-  </stream>
-  <stream name="streams/1.0-maintenance"
-      label="streams/1.0-maintenance (Luna/1.0.x)">
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="papyrus.bugzilla.version"
-        value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>
-    <setupTask
-        xsi:type="jdt:JRETask"
-        version="JavaSE-1.6"
-        location="${jre.location-1.6}"/>
-  </stream>
-  <logicalProjectContainer
-      xsi:type="setup:ProjectCatalog"
-      href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>
-  <description>Workbench and workspace configuration for development on Papyrus</description>
-</setup:Project>
+<?xml version="1.0" encoding="UTF-8"?>

+<setup:Project

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"

+    xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"

+    xmlns:mylyn="http://www.eclipse.org/oomph/setup/mylyn/1.0"

+    xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"

+    xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"

+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"

+    xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"

+    xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"

+    xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"

+    xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"

+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"

+    name="papyrus"

+    label="Papyrus">

+  <setupTask

+      xsi:type="setup.p2:P2Task"

+      label="Core Development Tools">

+    <requirement

+        name="org.eclipse.emf.sdk.feature.group"/>

+    <requirement

+        name="org.eclipse.gmf.runtime.notation.sdk.feature.group"/>

+    <requirement

+        name="org.eclipse.gmf.runtime.sdk.feature.group"/>

+    <requirement

+        name="org.eclipse.gmf.sdk.feature.group"/>

+    <requirement

+        name="org.eclipse.uml2.sdk.feature.group"/>

+    <requirement

+        name="org.eclipse.papyrus.sdk.feature.feature.group"/>

+    <requirement

+        name="org.eclipse.pde.api.tools.ee.feature.feature.group"/>

+    <requirement

+        name="org.eclipse.mylyn.ide_feature.feature.group"/>

+    <requirement

+        name="org.eclipse.mylyn.java_feature.feature.group"/>

+    <requirement

+        name="org.eclipse.mylyn.pde_feature.feature.group"/>

+    <requirement

+        name="org.eclipse.mylyn.team_feature.feature.group"/>

+    <requirement

+        name="org.eclipse.mylyn.gerrit.feature.feature.group"/>

+    <requirement

+        name="org.eclipse.mylyn_feature.feature.group"/>

+    <requirement

+        name="org.eclipse.mylyn.bugzilla_feature.feature.group"/>

+    <requirement

+        name="org.eclipse.mylyn.git.feature.group"/>

+    <requirement

+        name="org.eclipse.mylyn.hudson.feature.group"/>

+    <requirement

+        name="org.eclipse.mylyn.wikitext_feature.feature.group"/>

+    <requirement

+        name="org.eclipse.egit.feature.group"/>

+    <requirement

+        name="org.eclipse.egit.mylyn.feature.group"/>

+    <requirement

+        name="org.eclipse.buckminster.core.feature.feature.group"/>

+    <requirement

+        name="org.eclipse.buckminster.git.feature.feature.group"/>

+    <requirement

+        name="org.eclipse.buckminster.pde.feature.feature.group"/>

+    <requirement

+        name="org.eclipse.swtbot.ide.feature.group"/>

+    <requirement

+        name="org.eclipse.swtbot.generator.feature.feature.group"/>

+    <requirement

+        name="org.eclipse.m2e.feature.feature.group"/>

+    <repository

+        url="http://download.eclipse.org/tools/buckminster/updates-4.4"/>

+    <repository

+        url="http://download.eclipse.org/technology/swtbot/snapshots"/>

+  </setupTask>

+  <setupTask

+      xsi:type="setup.p2:P2Task"

+      label="Releng Tools">

+    <requirement

+        name="org.eclipse.oomph.projectconfig.feature.group"/>

+    <requirement

+        name="org.eclipse.oomph.projectcopy.feature.group"/>

+    <requirement

+        name="org.eclipse.oomph.workingsets.feature.group"/>

+    <requirement

+        name="org.sonatype.tycho.m2e.feature.feature.group"/>

+    <repository

+        url="http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.8.0/N/LATEST/"/>

+  </setupTask>

+  <setupTask

+      xsi:type="setup.p2:P2Task"

+      label="Code Quality Tools">

+    <requirement

+        name="com.mountainminds.eclemma.feature.feature.group"

+        optional="true"/>

+    <requirement

+        name="net.sf.eclipsecs.feature.group"

+        optional="true"/>

+    <requirement

+        name="edu.umd.cs.findbugs.plugin.eclipse.feature.group"

+        optional="true"/>

+    <repository

+        url="http://update.eclemma.org/"/>

+    <repository

+        url="http://eclipse-cs.sourceforge.net/update/"/>

+    <repository

+        url="http://findbugs.cs.umd.edu/eclipse/"/>

+  </setupTask>

+  <setupTask

+      xsi:type="setup:EclipseIniTask"

+      option="-Xmx"

+      value="2048m"

+      vm="true"/>

+  <setupTask

+      xsi:type="setup:ResourceCreationTask"

+      excludedTriggers="STARTUP MANUAL"

+      content="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;item value=&quot;${papyrus.git.clone.location}/doc/DevelopperDocuments/templates&quot; key=&quot;org.eclipse.jdt.ui.cleanup.loadpath&quot;/>&#xA;&#x9;&lt;item value=&quot;${papyrus.git.clone.location}/doc/DevelopperDocuments/templates&quot; key=&quot;org.eclipse.jdt.ui.codeformatter.loadpath&quot;/>&#xA;&#x9;&lt;item value=&quot;${papyrus.git.clone.location}/doc/DevelopperDocuments/templates&quot; key=&quot;org.eclipse.jdt.ui.importorder.loadpath&quot;/>&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"

+      targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"

+      encoding="UTF-8"/>

+  <setupTask

+      xsi:type="setup:ResourceCreationTask"

+      content="cleanup_profile=_Papyrus&#xA;cleanup_settings_version=2&#xA;eclipse.preferences.version=1&#xA;formatter_profile=_Papyrus Formatter Profile CDM&#xA;formatter_settings_version=12&#xA;org.eclipse.jdt.ui.cleanupprofiles=&lt;?xml version\=&quot;1.0&quot; encoding\=&quot;UTF-8&quot; standalone\=&quot;no&quot;?>\n&lt;profiles version\=&quot;2&quot;>\n&lt;profile kind\=&quot;CleanUpProfile&quot; name\=&quot;Papyrus&quot; version\=&quot;2&quot;>\n&lt;setting id\=&quot;cleanup.format_source_code&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.convert_functional_interfaces&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.add_missing_annotations&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.use_this_for_non_static_method_access_only_if_necessary&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unused_private_types&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.insert_inferred_type_arguments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.qualify_static_member_accesses_through_instances_with_declaring_class&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.qualify_static_method_accesses_with_declaring_class&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.add_generated_serial_version_id&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.make_variable_declarations_final&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.add_missing_methods&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.always_use_this_for_non_static_field_access&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.use_type_arguments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_trailing_whitespaces_ignore_empty&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.correct_indentation&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.never_use_parentheses_in_expressions&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.add_serial_version_id&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unused_private_methods&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.use_this_for_non_static_field_access&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.use_blocks_only_for_return_and_throw&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unused_private_members&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.add_missing_override_annotations_interface_methods&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.remove_trailing_whitespaces_all&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.make_type_abstract_if_missing_method&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.always_use_this_for_non_static_method_access&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unnecessary_nls_tags&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.format_source_code_changes_only&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.qualify_static_field_accesses_with_declaring_class&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.add_missing_nls_tags&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.use_this_for_non_static_field_access_only_if_necessary&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unnecessary_casts&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.qualify_static_member_accesses_with_declaring_class&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.use_parentheses_in_expressions&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unused_private_fields&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.make_parameters_final&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_redundant_type_arguments&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.remove_trailing_whitespaces&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unused_imports&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.use_anonymous_class_creation&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.organize_imports&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.sort_members&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_private_constructors&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.convert_to_enhanced_for_loop&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.always_use_blocks&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.never_use_blocks&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.use_lambda&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.always_use_parentheses_in_expressions&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.use_this_for_non_static_method_access&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.remove_unused_local_variables&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.make_private_fields_final&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.add_missing_deprecated_annotations&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.add_default_serial_version_id&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.sort_members_all&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;cleanup.use_blocks&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.add_missing_override_annotations&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;cleanup.make_local_variable_final&quot; value\=&quot;true&quot;/>\n&lt;/profile>\n&lt;/profiles>\n&#xA;org.eclipse.jdt.ui.cleanupprofiles.version=2&#xA;org.eclipse.jdt.ui.formatterprofiles=&lt;?xml version\=&quot;1.0&quot; encoding\=&quot;UTF-8&quot; standalone\=&quot;no&quot;?>\n&lt;profiles version\=&quot;12&quot;>\n&lt;profile kind\=&quot;CodeFormatterProfile&quot; name\=&quot;Papyrus Formatter Profile CDM&quot; version\=&quot;12&quot;>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.disabling_tag&quot; value\=&quot;@formatter\:off&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_field&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.use_on_off_tags&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_ellipsis&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_multiple_fields&quot; value\=&quot;16&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_conditional_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_binary_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_array_initializer&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_after_package&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.continuation_indentation&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_binary_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_package&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.source&quot; value\=&quot;1.8&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_line_comments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.join_wrapped_lines&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_member_type&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.align_type_members_on_columns&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_unary_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.indent_parameter_description&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.lineSplit&quot; value\=&quot;200&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indentation.size&quot; value\=&quot;4&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.enabling_tag&quot; value\=&quot;@formatter\:on&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_assignment&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.problem.assertIdentifier&quot; value\=&quot;error&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.tabulation.char&quot; value\=&quot;tab&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_statements_compare_to_body&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_method&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_method_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_switch&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.problem.enumIdentifier&quot; value\=&quot;error&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_ellipsis&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_block&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_method_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.compact_else_if&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.indent_root_tags&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_enum_constant&quot; value\=&quot;next_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch&quot; value\=&quot;16&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.tabulation.size&quot; value\=&quot;4&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_empty_lines&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_block_in_case&quot; value\=&quot;next_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve&quot; value\=&quot;5&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.compliance&quot; value\=&quot;1.8&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_lambda_body&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_unary_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_binary_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode&quot; value\=&quot;enabled&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_label&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_javadoc_comments&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.line_length&quot; value\=&quot;150&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_between_import_groups&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.wrap_before_binary_operator&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_statements_compare_to_block&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.join_lines_in_comments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_compact_if&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_imports&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_html&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_source_code&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.codegen.targetPlatform&quot; value\=&quot;1.8&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_resources_in_try&quot; value\=&quot;80&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_header&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_block_comments&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_enum_constants&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_type_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_after_imports&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line&quot; value\=&quot;false&quot;/>\n&lt;/profile>\n&lt;profile kind\=&quot;CodeFormatterProfile&quot; name\=&quot;Zero blank Papyrus Formatter Profile CDM&quot; version\=&quot;12&quot;>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.disabling_tag&quot; value\=&quot;@formatter\:off&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_field&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.use_on_off_tags&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_ellipsis&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_multiple_fields&quot; value\=&quot;16&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_conditional_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_binary_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_array_initializer&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_after_package&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.continuation_indentation&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_binary_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_package&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.source&quot; value\=&quot;1.8&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_line_comments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.join_wrapped_lines&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_member_type&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.align_type_members_on_columns&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_unary_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.indent_parameter_description&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.lineSplit&quot; value\=&quot;200&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indentation.size&quot; value\=&quot;4&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.enabling_tag&quot; value\=&quot;@formatter\:on&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_assignment&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.problem.assertIdentifier&quot; value\=&quot;error&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.tabulation.char&quot; value\=&quot;tab&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_statements_compare_to_body&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_method&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_method_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_switch&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.problem.enumIdentifier&quot; value\=&quot;error&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_ellipsis&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_block&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_method_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.compact_else_if&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.indent_root_tags&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_enum_constant&quot; value\=&quot;next_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch&quot; value\=&quot;16&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.tabulation.size&quot; value\=&quot;4&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_empty_lines&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_block_in_case&quot; value\=&quot;next_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.compliance&quot; value\=&quot;1.8&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_lambda_body&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_unary_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_binary_expression&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode&quot; value\=&quot;enabled&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_label&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_javadoc_comments&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.line_length&quot; value\=&quot;150&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_between_import_groups&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.wrap_before_binary_operator&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_statements_compare_to_block&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.join_lines_in_comments&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_compact_if&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_imports&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_html&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_source_code&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.compiler.codegen.targetPlatform&quot; value\=&quot;1.8&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_resources_in_try&quot; value\=&quot;80&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_header&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.format_block_comments&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.alignment_for_enum_constants&quot; value\=&quot;0&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.brace_position_for_type_declaration&quot; value\=&quot;end_of_line&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.blank_lines_after_imports&quot; value\=&quot;1&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header&quot; value\=&quot;true&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for&quot; value\=&quot;insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments&quot; value\=&quot;do not insert&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column&quot; value\=&quot;false&quot;/>\n&lt;setting id\=&quot;org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line&quot; value\=&quot;false&quot;/>\n&lt;/profile>\n&lt;/profiles>\n&#xA;org.eclipse.jdt.ui.formatterprofiles.version=12&#xA;org.eclipse.jdt.ui.text.code_templates_migrated=true&#xA;org.eclipse.jdt.ui.text.custom_code_templates=&lt;?xml version\=&quot;1.0&quot; encoding\=&quot;UTF-8&quot; standalone\=&quot;no&quot;?>&lt;templates>&lt;template autoinsert\=&quot;false&quot; context\=&quot;constructorcomment_context&quot; deleted\=&quot;false&quot; description\=&quot;Comment for created constructors&quot; enabled\=&quot;true&quot; id\=&quot;org.eclipse.jdt.ui.text.codetemplates.constructorcomment&quot; name\=&quot;constructorcomment&quot;>/**\n * Constructor.\n *\n * $${tags}\n */&lt;/template>&lt;template autoinsert\=&quot;false&quot; context\=&quot;filecomment_context&quot; deleted\=&quot;false&quot; description\=&quot;Comment for created Java files&quot; enabled\=&quot;true&quot; id\=&quot;org.eclipse.jdt.ui.text.codetemplates.filecomment&quot; name\=&quot;filecomment&quot;>/*****************************************************************************\n * Copyright (c) $${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n&lt;/template>&lt;template autoinsert\=&quot;false&quot; context\=&quot;overridecomment_context&quot; deleted\=&quot;false&quot; description\=&quot;Comment for overriding methods&quot; enabled\=&quot;true&quot; id\=&quot;org.eclipse.jdt.ui.text.codetemplates.overridecomment&quot; name\=&quot;overridecomment&quot;>/**\n * $${see_to_overridden}\n *\n * $${tags}\n */&lt;/template>&lt;template autoinsert\=&quot;false&quot; context\=&quot;delegatecomment_context&quot; deleted\=&quot;false&quot; description\=&quot;Comment for delegate methods&quot; enabled\=&quot;true&quot; id\=&quot;org.eclipse.jdt.ui.text.codetemplates.delegatecomment&quot; name\=&quot;delegatecomment&quot;>/**\n * $${see_to_target}\n *\n * $${tags}\n */&lt;/template>&lt;/templates>&#xA;"

+      targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs">

+    <description>Code formatting and clean-up profiles for Papyrus.</description>

+  </setupTask>

+  <setupTask

+      xsi:type="setup:CompoundTask"

+      name="Compiler Preferences">

+    <setupTask

+        xsi:type="setup:PreferenceTask"

+        key="instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE"

+        value="ignore"/>

+    <setupTask

+        xsi:type="setup:PreferenceTask"

+        key="instance/org.eclipse.pde/compilers.f.unresolved-features"

+        value="2"/>

+    <setupTask

+        xsi:type="setup:CompoundTask"

+        name="org.eclipse.pde.api.tools">

+      <setupTask

+          xsi:type="setup:PreferenceTask"

+          key="/instance/org.eclipse.pde.api.tools/missing_default_api_profile"

+          value="Ignore"/>

+    </setupTask>

+  </setupTask>

+  <setupTask

+      xsi:type="setup:VariableTask"

+      type="URI"

+      name="base.downloads.url"

+      value="http://download.eclipse.org"/>

+  <setupTask

+      xsi:type="setup:VariableTask"

+      name="git.checkout.branch"

+      value="${scope.project.stream.name}"/>

+  <setupTask

+      xsi:type="setup:VariableTask"

+      name="eclipse.target.platform"

+      defaultValue="Luna"

+      storageURI="scope://Workspace"/>

+  <setupTask

+      xsi:type="git:GitCloneTask"

+      id="papyrus.git.clone"

+      remoteURI="papyrus/org.eclipse.papyrus"

+      pushURI=""

+      checkoutBranch="${git.checkout.branch}">

+    <annotation

+        source="http://www.eclipse.org/oomph/setup/InducedChoices">

+      <detail

+          key="inherit">

+        <value>eclipse.git.gerrit.remoteURIs</value>

+      </detail>

+      <detail

+          key="label">

+        <value>Papyrus Git or Gerrit Repository</value>

+      </detail>

+      <detail

+          key="target">

+        <value>remoteURI</value>

+      </detail>

+    </annotation>

+    <description>Papyrus</description>

+  </setupTask>

+  <setupTask

+      xsi:type="setup.targlets:TargletTask">

+    <targlet

+        name="Papyrus Main Dependencies"

+        activeRepositoryList="${eclipse.target.platform}">

+      <requirement

+          name="org.eclipse.sdk.feature.group"/>

+      <requirement

+          name="org.eclipse.acceleo.feature.group"/>

+      <requirement

+          name="org.eclipse.uml2.sdk.feature.group"/>

+      <requirement

+          name="org.eclipse.emf.sdk.feature.group"/>

+      <repositoryList

+          name="Mars">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M6-201503200800/">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>Eclipse</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="${base.downloads.url}/tools/orbit/downloads/drops/R20140525021250/repository"/>

+        <repository

+            url="http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>EMF (Core)</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201503250534">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>EMF TRANSACTION</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201503250348">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>EMF VALIDATION</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/tools/gef/updates/milestones">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>GEF</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201502040533">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>GMF Runtime</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201503250354">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>GMF Notation</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/M4">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>GMF Tooling</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240644/mwe">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>EMFT MWE</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240833/mwe2lang">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>EMFT MWE:1</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201503241740">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>QVT Operational</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201503131323">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>M2T ACCELEO</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.0.0/S201503240634">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>MDT OCL 6.0</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/mdt/uml2/updates/5.1milestones">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>MDT UML2</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201503240650/">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>M2T XPAND</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.1/">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>Xtext, Xtend</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201503131342">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>EMF COMPARE</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M6-20150324000117/repository/">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>WebTools</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="${base.downloads.url}/nattable/releases/1.2.0/repository/"/>

+        <repository

+            url="http://download.eclipse.org/xwt/release-1.1.0">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>XWT</value>

+            </detail>

+          </annotation>

+        </repository>

+      </repositoryList>

+      <repositoryList

+          name="Luna">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M6-201503200800/">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>Eclipse</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="${base.downloads.url}/tools/orbit/downloads/drops/R20140525021250/repository"/>

+        <repository

+            url="http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>EMF (Core)</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201503250534">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>EMF TRANSACTION</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201503250348">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>EMF VALIDATION</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="${base.downloads.url}/modeling/emf/query/updates/releases/R201405281426"/>

+        <repository

+            url="http://download.eclipse.org/tools/gef/updates/milestones">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>GEF</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201502040533">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>GMF Runtime</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201503250354">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>GMF Notation</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/M4">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>GMF Tooling</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240644/mwe">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>EMFT MWE</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201503241740">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>QVT Operational</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201503131323">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>M2T ACCELEO</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.0.0/S201503240634">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>MDT OCL 6.0</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/mdt/uml2/updates/5.1milestones">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>MDT UML2</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201503240650/">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>M2T XPAND</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.1/">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>Xtext, Xtend</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201503131342">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>EMF COMPARE</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M6-20150324000117/repository/">

+          <annotation

+              source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+            <detail

+                key="updateFrom">

+              <value>WebTools</value>

+            </detail>

+          </annotation>

+        </repository>

+        <repository

+            url="${base.downloads.url}/nattable/releases/1.2.0/repository/"/>

+      </repositoryList>

+    </targlet>

+    <targlet

+        name="Papyrus Test Dependencies"

+        activeRepositoryList="${eclipse.target.platform}">

+      <requirement

+          name="org.eclipse.swtbot.feature.group"/>

+      <requirement

+          name="org.eclipse.swtbot.eclipse.feature.group"/>

+      <requirement

+          name="org.eclipse.swtbot.eclipse.gef.feature.group"/>

+      <requirement

+          name="org.eclipse.swtbot.forms.feature.group"/>

+      <repositoryList

+          name="Mars">

+        <repository

+            url="${base.downloads.url}/technology/swtbot/snapshots"/>

+      </repositoryList>

+      <repositoryList

+          name="Luna">

+        <repository

+            url="${base.downloads.url}/technology/swtbot/snapshots"/>

+      </repositoryList>

+    </targlet>

+    <targlet

+        name="Papyrus Main Plug-ins"

+        activeRepositoryList="${eclipse.target.platform}">

+      <requirement

+          name="org.eclipse.papyrus.sdk.feature.feature.group"/>

+      <repositoryList

+          name="Mars">

+        <repository

+            url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/mars/main"/>

+      </repositoryList>

+      <repositoryList

+          name="Luna">

+        <repository

+            url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/luna"/>

+      </repositoryList>

+    </targlet>

+    <targlet

+        name="Diagnostic/Debug Tools"

+        activeRepositoryList="${eclipse.target.platform}"

+        includeSources="false">

+      <requirement

+          name="org.eclipse.swt.tools"

+          optional="true"/>

+      <repositoryList

+          name="Mars">

+        <repository

+            url="http://www.eclipse.org/swt/updates/4.4"/>

+      </repositoryList>

+      <repositoryList

+          name="Luna">

+        <repository

+            url="http://www.eclipse.org/swt/updates/4.4"/>

+      </repositoryList>

+    </targlet>

+  </setupTask>

+  <setupTask

+      xsi:type="setup:CompoundTask"

+      name="Mylyn Queries">

+    <setupTask

+        xsi:type="setup:VariableTask"

+        name="papyrus.bugzilla.repository"

+        value="https://bugs.eclipse.org/bugs"/>

+    <setupTask

+        xsi:type="setup:VariableTask"

+        name="papyrus.bugzilla.prefix"

+        value="/buglist.cgi?classification=Modeling&amp;product=Papyrus"/>

+    <setupTask

+        xsi:type="setup:VariableTask"

+        name="papyrus.bugzilla.open"

+        value="bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED"/>

+    <setupTask

+        xsi:type="mylyn:MylynQueriesTask"

+        repositoryURL="${papyrus.bugzilla.repository}">

+      <query

+          summary="Papyrus Flagged for Review"

+          url="${papyrus.bugzilla.prefix}&amp;version=${papyrus.bugzilla.version}&amp;${papyrus.bugzilla.open}&amp;query_format=advanced&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=review%3F"/>

+      <query

+          summary="Papyrus Open Bugs"

+          url="${papyrus.bugzilla.prefix}&amp;version=${papyrus.bugzilla.version}&amp;${papyrus.bugzilla.open}&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial"/>

+      <query

+          summary="Papyrus Open Enhancement Requests"

+          url="${papyrus.bugzilla.prefix}&amp;version=${papyrus.bugzilla.version}&amp;${papyrus.bugzilla.open}&amp;bug_severity=enhancement"/>

+      <query

+          summary="Papyrus Resolved Items"

+          url="${papyrus.bugzilla.prefix}&amp;version=${papyrus.bugzilla.version}&amp;bug_status=RESOLVED&amp;resolution=FIXED"/>

+    </setupTask>

+    <setupTask

+        xsi:type="mylyn:MylynQueriesTask"

+        connectorKind="org.eclipse.mylyn.gerrit"

+        repositoryURL="https://git.eclipse.org/r"

+        userID="${bugzilla.id}"

+        password="${eclipse.user.password}">

+      <query

+          summary="Papyrus Open Gerrit Reviews">

+        <attribute

+            key="gerrit query type"

+            value="custom"/>

+        <attribute

+            key="gerrit query project"

+            value="papyrus/org.eclipse.papyrus"/>

+        <attribute

+            key="gerrit query string"

+            value="project:papyrus/org.eclipse.papyrus status:open branch:${git.checkout.branch}"/>

+      </query>

+    </setupTask>

+    <setupTask

+        xsi:type="mylyn:MylynBuildsTask"

+        serverURL="https://hudson.eclipse.org/papyrus/"

+        userID="${bugzilla.id}"

+        password="${eclipse.user.password}">

+      <buildPlan

+          name="Papyrus-Master"/>

+      <buildPlan

+          name="Papyrus-Master-Tests"/>

+      <buildPlan

+          name="Papyrus-Master-Extra"/>

+      <buildPlan

+          name="Papyrus-Master-Extra-Tests"/>

+      <buildPlan

+          name="Papyrus-Luna"/>

+      <buildPlan

+          name="Papyrus-Luna-Tests"/>

+    </setupTask>

+  </setupTask>

+  <setupTask

+      xsi:type="projects:ProjectsImportTask">

+    <sourceLocator

+        rootFolder="${papyrus.git.clone.location/tests/junit/plugins}">

+      <predicate

+          xsi:type="predicates:OrPredicate">

+        <operand

+            xsi:type="predicates:NamePredicate"

+            pattern="org\.eclipse\.papyrus\.junit\.framework"/>

+        <operand

+            xsi:type="predicates:NamePredicate"

+            pattern="org\.eclipse\.papyrus\.junit\.utils"/>

+      </predicate>

+    </sourceLocator>

+  </setupTask>

+  <project name="main"

+      label="Main">

+    <project

+        name="infra"

+        label="Infra">

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/plugins/infra}">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:OrPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern="org\.eclipse\.papyrus\.infra\..*"/>

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern="org\.eclipse\.papyrus\.eclipse\.project\.editors"/>

+            </operand>

+            <operand

+                xsi:type="predicates:NotPredicate">

+              <operand

+                  xsi:type="predicates:OrPredicate">

+                <operand

+                    xsi:type="predicates:NamePredicate"

+                    pattern="org\.eclipse\.papyrus\.infra\.emf\.(?:embedded)?editor"/>

+                <operand

+                    xsi:type="predicates:NamePredicate"

+                    pattern="org\.eclipse\.papyrus\.infra\.emf\.facet\.queries"/>

+                <operand

+                    xsi:type="predicates:NamePredicate"

+                    pattern="org\.eclipse\.papyrus\.infra\.emf\.newchild"/>

+              </operand>

+            </operand>

+          </predicate>

+        </sourceLocator>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/plugins/editor}"/>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/infra}"/>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/core}">

+          <predicate

+              xsi:type="predicates:NotPredicate">

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.tests"/>

+          </predicate>

+        </sourceLocator>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/features}">

+          <predicate

+              xsi:type="predicates:NamePredicate"

+              pattern="org\.eclipse\.papyrus\.(tests\.)?infra($|\..+)"/>

+        </sourceLocator>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus Infra"

+            id="papyrus-infra">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.infra.core"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:OrPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern="org\.eclipse\.papyrus\.infra\..*"/>

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern="org\.eclipse\.papyrus\.editor($|\..+)"/>

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern="org\.eclipse\.papyrus\.eclipse\.project\.editors"/>

+            </operand>

+            <operand

+                xsi:type="workingsets:ExclusionPredicate"

+                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.1 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.2 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.3 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5 //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.4"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus Infra Diagram"

+            id="papyrus-infra-diagram">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.infra.gmfdiag.common"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.infra\.gmfdiag($|\..+)"/>

+            <operand

+                xsi:type="workingsets:ExclusionPredicate"

+                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus Infra Nattable"

+            id="papyrus-infra-nattable">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.infra.nattable"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.infra\.(?:emf\.)?nattable($|\..+)"/>

+            <operand

+                xsi:type="workingsets:ExclusionPredicate"

+                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus Infra Services"

+            id="papyrus-infra-services">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.infra.services.labelprovider"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.infra\.services($|\..+)"/>

+            <operand

+                xsi:type="workingsets:ExclusionPredicate"

+                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus Infra Viewpoints"

+            id="papyrus-infra-viewpoints">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.infra.viewpoints.policy"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.infra\.viewpoints($|\..+)"/>

+            <operand

+                xsi:type="workingsets:ExclusionPredicate"

+                excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets.5"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus Infra Tests"

+            id="papyrus-infra-tests">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.infra.core.tests"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:OrPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern="org\.eclipse\.papyrus\.infra(\..+)?\.tests"/>

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern="org\.eclipse\.papyrus\.editor\.integration\.tests"/>

+            </operand>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus Infra Features"

+            id="papyrus-infra-features">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.infra.core.feature"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.FeatureNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus(\.tests)?\.infra($|\..+)"/>

+          </predicate>

+        </workingSet>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+        <setupTask

+            xsi:type="setup.targlets:TargletTask">

+          <targlet

+              name="Papyrus Infra Dependencies"

+              activeRepositoryList="${eclipse.target.platform}">

+            <requirement

+                name="org.eclipse.nebula.widgets.tablecombo.feature.feature.group"/>

+            <repositoryList

+                name="Mars">

+              <repository

+                  url="${base.downloads.url}/technology/nebula/archives/Q12015/release"/>

+            </repositoryList>

+            <repositoryList

+                name="Luna"/>

+          </targlet>

+        </setupTask>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+    </project>

+    <project

+        name="views"

+        label="Views">

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/plugins/views}"/>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/views}"/>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/features}">

+          <predicate

+              xsi:type="predicates:NamePredicate"

+              pattern="org\.eclipse\.papyrus\.(tests\.)?views($|\..+)"/>

+        </sourceLocator>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus Views"

+            id="papyrus-views">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.views.properties"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.views($|\..+)"/>

+            <operand

+                xsi:type="workingsets:ExclusionPredicate"

+                excludedWorkingSet="//@projects[name='main']/@projects[name='views']/@setupTasks.1/@workingSets.1"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus Views Tests"

+            id="papyrus-views-tests">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.views.modelexplorer.tests"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.views(\..+)?\.tests"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus Views Features"

+            id="papyrus-views-features">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.views.properties.feature"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.FeatureNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.(tests\.)?views($|\..+)"/>

+          </predicate>

+        </workingSet>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+        <setupTask

+            xsi:type="projects:ProjectsImportTask">

+          <sourceLocator

+              rootFolder="${papyrus.git.clone.location/plugins/xwt}"/>

+          <sourceLocator

+              rootFolder="${papyrus.git.clone.location/features}">

+            <predicate

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.(tests\.)?xwt($|\..+)"/>

+          </sourceLocator>

+        </setupTask>

+        <setupTask

+            xsi:type="setup.workingsets:WorkingSetTask">

+          <workingSet

+              name="Papyrus XWT"

+              id="papyrus-xwt">

+            <predicate

+                xsi:type="predicates:AndPredicate">

+              <operand

+                  xsi:type="predicates:RepositoryPredicate"

+                  project="org.eclipse.papyrus.views.properties"/>

+              <operand

+                  xsi:type="predicates:NaturePredicate"

+                  nature="org.eclipse.pde.PluginNature"/>

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern="org\.eclipse\.papyrus\.xwt($|\..+)"/>

+            </predicate>

+          </workingSet>

+          <workingSet

+              name="Papyrus XWT Features"

+              id="papyrus-xwt-features">

+            <predicate

+                xsi:type="predicates:AndPredicate">

+              <operand

+                  xsi:type="predicates:RepositoryPredicate"

+                  project="org.eclipse.papyrus.views.properties.feature"/>

+              <operand

+                  xsi:type="predicates:NaturePredicate"

+                  nature="org.eclipse.pde.FeatureNature"/>

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern="org\.eclipse\.papyrus\.(tests\.)?xwt($|\..+)"/>

+            </predicate>

+          </workingSet>

+        </setupTask>

+      </stream>

+    </project>

+    <project

+        name="uml"

+        label="UML">

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/plugins/uml}">

+          <predicate

+              xsi:type="predicates:NotPredicate">

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern=".*\.(alf|textedit|xtext)($|\..+)"/>

+          </predicate>

+        </sourceLocator>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/uml}">

+          <predicate

+              xsi:type="predicates:NotPredicate">

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern=".*\.(alf|textedit|xtext)($|\..+)"/>

+          </predicate>

+        </sourceLocator>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/features}">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.(tests\.)?uml($|\..+)"/>

+            <operand

+                xsi:type="predicates:NotPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>

+            </operand>

+          </predicate>

+        </sourceLocator>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus UML"

+            id="papyrus-uml">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.uml.commands"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.uml($|\..+)"/>

+            <operand

+                xsi:type="predicates:NotPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>

+            </operand>

+            <operand

+                xsi:type="workingsets:ExclusionPredicate"

+                excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.1 //@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.2 //@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.3"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus UML Diagrams"

+            id="papyrus-uml-diagram">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.uml.diagram.common"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.uml\.diagram.*"/>

+            <operand

+                xsi:type="predicates:NotPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>

+            </operand>

+            <operand

+                xsi:type="workingsets:ExclusionPredicate"

+                excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.3"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus UML Tables"

+            id="papyrus-uml-table">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.uml.nattable"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.uml\.nattable.*"/>

+            <operand

+                xsi:type="predicates:NotPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>

+            </operand>

+            <operand

+                xsi:type="workingsets:ExclusionPredicate"

+                excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets.3"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus UML Tests"

+            id="papyrus-uml-tests">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.uml.diagram.common.tests"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.uml(\..+)?\.tests"/>

+            <operand

+                xsi:type="predicates:NotPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern=".*\.alf.*|.*\.uml\.textedit.*"/>

+            </operand>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus UML Features"

+            id="papyrus-uml-features">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.uml.feature"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.FeatureNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus(\.tests)?\.uml($|\..+)"/>

+            <operand

+                xsi:type="predicates:NotPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern=".*\.(alf|textedit|xtext)($|\..+)"/>

+            </operand>

+          </predicate>

+        </workingSet>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.targlets:TargletTask">

+        <targlet

+            name="Additional UML Dependencies"

+            activeRepositoryList="">

+          <requirement

+              name="org.eclipse.ocl.jdt.annotation7"

+              optional="true"/>

+        </targlet>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.p2:P2Task">

+        <requirement

+            name="org.eclipse.xtend.sdk.feature.group"/>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+    </project>

+    <project

+        name="uml-alf"

+        label="UML ALF">

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/plugins/uml}">

+          <predicate

+              xsi:type="predicates:NamePredicate"

+              pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/>

+        </sourceLocator>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/uml}">

+          <predicate

+              xsi:type="predicates:NamePredicate"

+              pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/>

+        </sourceLocator>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/features}">

+          <predicate

+              xsi:type="predicates:NamePredicate"

+              pattern="org\.eclipse\.papyrus\.(tests\.)?uml\.alf($|\..+)"/>

+        </sourceLocator>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus UML ALF"

+            id="papyrus-uml-alf">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.uml.alf.common"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus UML ALF Features"

+            id="papyrus-uml-alf-features">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.uml.alf.feature"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.FeatureNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/>

+          </predicate>

+        </workingSet>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.p2:P2Task">

+        <requirement

+            name="org.eclipse.xtend.sdk.feature.group"/>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+    </project>

+    <project

+        name="uml-text"

+        label="UML Text Editors">

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/plugins/uml}">

+          <predicate

+              xsi:type="predicates:NamePredicate"

+              pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/>

+        </sourceLocator>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/uml}">

+          <predicate

+              xsi:type="predicates:NamePredicate"

+              pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/>

+        </sourceLocator>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/features}">

+          <predicate

+              xsi:type="predicates:NamePredicate"

+              pattern="org\.eclipse\.papyrus\.(tests\.)?uml\.(textedit|xtext)($|\..+)"/>

+        </sourceLocator>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus UML Text Editors"

+            id="papyrus-uml-text">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.uml.textedit.common.xtext"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus UML Text Editors Features"

+            id="papyrus-uml-text-features">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.uml.textedit.feature"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.FeatureNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/>

+          </predicate>

+        </workingSet>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.p2:P2Task">

+        <requirement

+            name="org.eclipse.xtend.sdk.feature.group"/>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+    </project>

+    <project

+        name="sysml"

+        label="SysML">

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/plugins/sysml}"/>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/sysml}"/>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/features}">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.(tests\.)?sysml($|\..+)"/>

+          </predicate>

+        </sourceLocator>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus SysML"

+            id="papyrus-sysml">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.sysml"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.sysml($|\..+)"/>

+            <operand

+                xsi:type="workingsets:ExclusionPredicate"

+                excludedWorkingSet="//@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.1 //@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.2 //@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.3"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus SysML Diagrams"

+            id="papyrus-sysml-diagram">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.sysml.diagram.common"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.sysml\.diagram($|\..+)"/>

+            <operand

+                xsi:type="workingsets:ExclusionPredicate"

+                excludedWorkingSet="//@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.3"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus SysML Tables"

+            id="papyrus-sysml-table">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.sysml.nattable"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.sysml\.nattable($|\..+)"/>

+            <operand

+                xsi:type="workingsets:ExclusionPredicate"

+                excludedWorkingSet="//@projects[name='main']/@projects[name='sysml']/@setupTasks.1/@workingSets.3"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus SysML Tests"

+            id="papyrus-sysml-tests">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.sysml.tests"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.sysml(\..+)?\.tests"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus SysML Features"

+            id="papyrus-sysml-features">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.sysml.feature"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.FeatureNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus(\.tests)?\.sysml($|\..+)"/>

+          </predicate>

+        </workingSet>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+    </project>

+    <project

+        name="emffacet"

+        label="EMF Facet">

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/plugins/facet}">

+          <predicate

+              xsi:type="predicates:NamePredicate"

+              pattern="org\.eclipse\.papyrus\.emf\.facet\..*"/>

+        </sourceLocator>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/features}">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.(tests\.)?emf\.facet($|\..+)"/>

+          </predicate>

+        </sourceLocator>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus EMF Facet"

+            id="papyrus-emffacet">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.emf.facet.common.core"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.emf\.facet($|\..+)"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus EMF Facet Features"

+            id="papyrus-emffacet-features">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.emf.facet.feature"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.FeatureNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus(\.tests)?\.emf\.facet($|\..+)"/>

+          </predicate>

+        </workingSet>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+    </project>

+    <project

+        name="customization"

+        label="Customization">

+      <setupTask

+          xsi:type="setup.p2:P2Task">

+        <requirement

+            name="org.eclipse.m2m.qvt.oml.sdk.feature.group"/>

+      </setupTask>

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/plugins/customization}"/>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/tests/junit/plugins/customization}"/>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/features}">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.(tests\.)?customization($|\..+)"/>

+          </predicate>

+        </sourceLocator>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus Customization"

+            id="papyrus-customization">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.customization"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:OrPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern="org\.eclipse\.papyrus\.customization(?:$|\..+)"/>

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern="org\.eclipse\.papyrus\.editor(?:$|\..+)"/>

+            </operand>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus Customization Features"

+            id="papyrus-customization-features">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.customization.feature"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.FeatureNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.customization(?:$|\..+)"/>

+          </predicate>

+        </workingSet>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+    </project>

+    <project

+        name="doc"

+        label="Documentation">

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/plugins/doc}"/>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/features}">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus(\..+)?\.doc($|\..+)"/>

+          </predicate>

+        </sourceLocator>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus Documentation"

+            id="papyrus-doc">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.uml.doc"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus(\..+)?\.doc(umentation)?"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus Documentation Features"

+            id="papyrus-doc-features">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.doc.feature"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.FeatureNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus(\..+)?\.doc($|\..+)"/>

+          </predicate>

+        </workingSet>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+    </project>

+    <project

+        name="alltests"

+        label="All Tests">

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/tests/junit/plugins}"/>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/features}">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.tests\..+"/>

+            <operand

+                xsi:type="predicates:NotPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern=".*\.extra\..*"/>

+            </operand>

+          </predicate>

+        </sourceLocator>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus All Main Tests"

+            id="papyrus-alltests">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.tests"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus(\..+)?\.tests"/>

+            <operand

+                xsi:type="predicates:NotPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern=".*\.extra\..*"/>

+            </operand>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus Main Test Features"

+            id="papyrus-alltests-features">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.tests.feature"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.FeatureNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.tests($|\..+)"/>

+            <operand

+                xsi:type="predicates:NotPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern=".*\.extra\..*"/>

+            </operand>

+          </predicate>

+        </workingSet>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+    </project>

+    <project

+        name="misc"

+        label="Others">

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/plugins/team}"/>

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/features}">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.team($|\..+)"/>

+          </predicate>

+        </sourceLocator>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus Others"

+            id="papyrus-others">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.team.svn"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.team\.svn"/>

+          </predicate>

+        </workingSet>

+        <workingSet

+            name="Papyrus Other Features"

+            id="papyrus-others-features">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.team.feature"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.FeatureNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.team($|\..+)"/>

+          </predicate>

+        </workingSet>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.targlets:TargletTask">

+        <targlet

+            name="Papyrus Other Dependencies"

+            activeRepositoryList="${eclipse.target.platform}">

+          <requirement

+              name="org.eclipse.team.svn.feature.group"/>

+          <requirement

+              name="org.polarion.eclipse.team.svn.connector.svnkit18.feature.group"/>

+          <repositoryList

+              name="Luna">

+            <repository

+                url="${base.downloads.url}/technology/subversive/2.0/luna-site/"/>

+            <repository

+                url="http://community.polarion.com/projects/subversive/download/eclipse/4.0/update-site/"/>

+          </repositoryList>

+          <repositoryList

+              name="Mars">

+            <repository

+                url="http://download.eclipse.org/technology/subversive/3.0/mars-site/">

+              <annotation

+                  source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+                <detail

+                    key="updateFrom">

+                  <value>Subversive</value>

+                </detail>

+              </annotation>

+            </repository>

+            <repository

+                url="http://community.polarion.com/projects/subversive/download/eclipse/4.0/update-site/"/>

+          </repositoryList>

+        </targlet>

+        <description>

+          Additional dependencies, e.g. for Subversive (SVN team integration), including

+          an SVN connector from Polarion to prevent the connector dialog appearing at

+          run-time, especially as it interferes with JUnit test execution.

+        </description>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+    </project>

+    <project

+        name="releng"

+        label="Releng">

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/releng}"

+            locateNestedProjects="true">

+          <excludedPath>emfgen</excludedPath>

+        </sourceLocator>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus Releng"

+            id="papyrus-releng">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="releng"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern=".*\.releng.*|.*\.oomph.*|releng"/>

+          </predicate>

+        </workingSet>

+      </setupTask>

+      <project

+          name="maven"

+          label="Maven Plug-ins">

+        <setupTask

+            xsi:type="projects:ProjectsImportTask">

+          <sourceLocator

+              rootFolder="${papyrus.git.clone.location/releng/emfgen}"

+              locateNestedProjects="true"/>

+        </setupTask>

+        <stream

+            name="master"

+            label="master (Mars/1.1)">

+          <setupTask

+              xsi:type="setup:VariableTask"

+              name="papyrus.bugzilla.version"

+              value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+        </stream>

+        <description>Sources of Maven plug-ins for Papyrus custom build behaviours</description>

+      </project>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+    </project>

+    <description>Tools, dependencies, and sources for development of the main Papyrus components.  Required for any Papyrus development.</description>

+  </project>

+  <project name="extras"

+      label="Extras">

+    <setupTask

+        xsi:type="setup:VariableTask"

+        name="papyrus.extratests.folder"

+        value="${papyrus.extraplugins.folder}"/>

+    <setupTask

+        xsi:type="setup:VariableTask"

+        name="papyrus.extrafeature"

+        value="extra.${papyrus.extraplugins.folder}"/>

+    <setupTask

+        xsi:type="setup:VariableTask"

+        name="papyrus.extratestsfeature"

+        value="tests.${papyrus.extrafeature}"/>

+    <setupTask

+        xsi:type="setup.targlets:TargletTask">

+      <targlet

+          name="${scope.project.label} Plug-ins"

+          activeRepositoryList="${eclipse.target.platform}">

+        <requirement

+            name="org.eclipse.papyrus.${papyrus.extrafeature}.feature.feature.group"

+            optional="true"/>

+        <repositoryList

+            name="Mars">

+          <repository

+              url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/mars/extra"/>

+        </repositoryList>

+        <repositoryList

+            name="Luna">

+          <repository

+              url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/luna"/>

+        </repositoryList>

+      </targlet>

+    </setupTask>

+    <setupTask

+        xsi:type="projects:ProjectsImportTask">

+      <sourceLocator

+          rootFolder="${papyrus.git.clone.location/extraplugins}/${papyrus.extraplugins.folder}"/>

+      <sourceLocator

+          rootFolder="${papyrus.git.clone.location/tests/junit/extraplugins}/${papyrus.extratests.folder}"/>

+      <sourceLocator

+          rootFolder="${papyrus.git.clone.location/features/papyrus-extra-features}">

+        <predicate

+            xsi:type="predicates:NamePredicate"

+            pattern="org\.eclipse\.papyrus\.${papyrus.extrafeature}\.feature"/>

+      </sourceLocator>

+      <sourceLocator

+          rootFolder="${papyrus.git.clone.location/features/papyrus-tests-extra-features}">

+        <predicate

+            xsi:type="predicates:NamePredicate"

+            pattern="org\.eclipse\.papyrus\.${papyrus.extratestsfeature}\.feature"/>

+      </sourceLocator>

+    </setupTask>

+    <setupTask

+        xsi:type="setup.workingsets:WorkingSetTask">

+      <workingSet

+          name="Papyrus ${scope.project.label}">

+        <predicate

+            xsi:type="predicates:OrPredicate">

+          <operand

+              xsi:type="predicates:LocationPredicate"

+              pattern="\Q${papyrus.git.clone.location/extraplugins}\E[\\/]\Q${papyrus.extraplugins.folder}\E"/>

+          <operand

+              xsi:type="predicates:LocationPredicate"

+              pattern="\Q${papyrus.git.clone.location/extraplugins}\E[\\/]\Q${papyrus.extraplugins.folder}\E[\\/].*"/>

+          <operand

+              xsi:type="predicates:LocationPredicate"

+              pattern="\Q${papyrus.git.clone.location/tests/junit/extraplugins}\E[\\/]\Q${papyrus.extratests.folder}\E[\\/].*"/>

+          <operand

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.FeatureNature"/>

+            <operand

+                xsi:type="predicates:OrPredicate">

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern="org\.eclipse\.papyrus\.${papyrus.extrafeature}($|\..*)"/>

+              <operand

+                  xsi:type="predicates:NamePredicate"

+                  pattern="org\.eclipse\.papyrus\.${papyrus.extratestsfeature}($|\..*)"/>

+            </operand>

+          </operand>

+        </predicate>

+      </workingSet>

+    </setupTask>

+    <project

+        name="cdo"

+        label="CDO Integration">

+      <setupTask

+          xsi:type="setup.targlets:TargletTask">

+        <targlet

+            name="Papyrus CDO Dependencies"

+            activeRepositoryList="${eclipse.target.platform}">

+          <requirement

+              name="org.eclipse.emf.cdo.sdk.feature.group"/>

+          <repositoryList

+              name="Mars">

+            <repository

+                url="http://download.eclipse.org/modeling/emf/cdo/drops/S20150324-0935">

+              <annotation

+                  source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+                <detail

+                    key="updateFrom">

+                  <value>EMF CDO</value>

+                </detail>

+              </annotation>

+            </repository>

+          </repositoryList>

+          <repositoryList

+              name="Luna">

+            <repository

+                url="${base.downloads.url}/modeling/emf/cdo/drops/R20140610-0212"/>

+          </repositoryList>

+        </targlet>

+      </setupTask>

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="cdo"/>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+    </project>

+    <project

+        name="cpp"

+        label="C/C++ Codegen">

+      <setupTask

+          xsi:type="setup.targlets:TargletTask">

+        <targlet

+            name="Papyrus CPP Dependencies"

+            activeRepositoryList="${eclipse.target.platform}">

+          <requirement

+              name="org.eclipse.cdt.feature.group"/>

+          <requirement

+              name="org.eclipse.emf.facet.sdk.feature.feature.group"/>

+          <repositoryList

+              name="Mars">

+            <repository

+                url="http://download.eclipse.org/tools/cdt/builds/mars/milestones">

+              <annotation

+                  source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+                <detail

+                    key="updateFrom">

+                  <value>CDT</value>

+                </detail>

+              </annotation>

+            </repository>

+            <repository

+                url="http://download.eclipse.org/facet/updates/integration/1.0.0/I201502030839/">

+              <annotation

+                  source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">

+                <detail

+                    key="updateFrom">

+                  <value>EMF Facet</value>

+                </detail>

+              </annotation>

+            </repository>

+          </repositoryList>

+          <repositoryList

+              name="Luna">

+            <repository

+                url="${base.downloads.url}/tools/cdt/builds/luna/milestones"/>

+            <repository

+                url="${base.downloads.url}/facet/updates/release/0.4.0"/>

+          </repositoryList>

+        </targlet>

+      </setupTask>

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="codegen"/>

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extratests.folder"

+          value="codegen"/>

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extrafeature"

+          value="extra.cpp"/>

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extratestsfeature"

+          value="tests.extra.codegen.cpp"/>

+      <setupTask

+          xsi:type="setup.p2:P2Task">

+        <requirement

+            name="org.eclipse.xtend.sdk.feature.group"/>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+    </project>

+    <project

+        name="diagramtemplate"

+        label="Diagram Template">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="diagramtemplate"/>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+      <description></description>

+    </project>

+    <project

+        name="dsml.validation"

+        label="DSML Validation">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="dsml.validation"/>

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/extraplugins}/codegen">

+          <predicate

+              xsi:type="predicates:NamePredicate"

+              pattern="org\.eclipse\.papyrus\.codegen\.base"/>

+        </sourceLocator>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.p2:P2Task">

+        <requirement

+            name="org.eclipse.xtend.sdk.feature.group"/>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+      <description></description>

+    </project>

+    <project

+        name="eastadl"

+        label="East-ADL">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="eastadl"/>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+      <description></description>

+    </project>

+    <project

+        name="java"

+        label="Java">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="java"/>

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extrafeature"

+          value="java\.(?:profile|generator|reverse)"/>

+      <setupTask

+          xsi:type="setup.targlets:TargletTask">

+        <targlet

+            name="Java Plug-ins"

+            activeRepositoryList="${eclipse.target.platform}">

+          <requirement

+              name="org.eclipse.papyrus.java.profile.feature.feature.group"/>

+          <requirement

+              name="org.eclipse.papyrus.java.generator.feature.feature.group"/>

+          <requirement

+              name="org.eclipse.papyrus.java.reverse.feature.feature.group"/>

+          <repositoryList

+              name="Mars">

+            <repository

+                url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/mars/extra"/>

+          </repositoryList>

+          <repositoryList

+              name="Luna">

+            <repository

+                url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/luna"/>

+          </repositoryList>

+        </targlet>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus Java">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.layers.stackmodel"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.java\..*"/>

+          </predicate>

+        </workingSet>

+        <description>Projects related to Java code generation/reverse.</description>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+      <description></description>

+    </project>

+    <project

+        name="layers"

+        label="Layers">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="layers"/>

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extrafeature"

+          value="layers"/>

+      <setupTask

+          xsi:type="setup.workingsets:WorkingSetTask">

+        <workingSet

+            name="Papyrus Layers">

+          <predicate

+              xsi:type="predicates:AndPredicate">

+            <operand

+                xsi:type="predicates:RepositoryPredicate"

+                project="org.eclipse.papyrus.layers.stackmodel"/>

+            <operand

+                xsi:type="predicates:NaturePredicate"

+                nature="org.eclipse.pde.PluginNature"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.layers\..*"/>

+          </predicate>

+        </workingSet>

+        <description>Projects related to Papyrus Layers.</description>

+      </setupTask>

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/tests/integration/plugins}/org.eclipse.papyrus.integrationtests.editor"/>

+        <description>Import plugin requested by Layers</description>

+      </setupTask>

+      <setupTask

+          xsi:type="setup.targlets:TargletTask">

+        <targlet

+            name="Layers dependencies"

+            activeRepositoryList="${eclipse.target.platform}">

+          <requirement

+              name="org.eclipse.emf.query.sdk.feature.group"/>

+          <repositoryList

+              name="Mars">

+            <repository

+                url="http://download.eclipse.org/modeling/emf/query/updates/releases/"/>

+          </repositoryList>

+        </targlet>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+      <description></description>

+    </project>

+    <project

+        name="marte"

+        label="MARTE">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="marte"/>

+      <setupTask

+          xsi:type="setup.p2:P2Task">

+        <requirement

+            name="org.eclipse.xtend.sdk.feature.group"/>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+      <description></description>

+    </project>

+    <project

+        name="migration"

+        label="Model Migration">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="migration"/>

+      <setupTask

+          xsi:type="setup.targlets:TargletTask">

+        <targlet

+            name="Papyrus Model Migration Dependencies">

+          <requirement

+              name="org.eclipse.papyrus.umlrt"/>

+        </targlet>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+      <description></description>

+    </project>

+    <project

+        name="moka"

+        label="Moka">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="moka"/>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+      <description></description>

+    </project>

+    <project

+        name="robotml"

+        label="RobotML">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="robotml"/>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+      <description></description>

+    </project>

+    <project

+        name="tablemigration"

+        label="Table Migration">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="tablemigration"/>

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extrafeature"

+          value="tablemigration"/>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+      <description></description>

+    </project>

+    <project

+        name="umlcompare"

+        label="UML Compare">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="uml/compare"/>

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extrafeature"

+          value="extra.uml.compare"/>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+      <description></description>

+    </project>

+    <project

+        name="umlexport"

+        label="UML Export">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="uml/org.eclipse.papyrus.uml.export"/>

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extrafeature"

+          value="uml.export"/>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+      <description></description>

+    </project>

+    <project

+        name="umlrt"

+        label="UML-RT">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.extraplugins.folder"

+          value="umlrt"/>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+      </stream>

+      <description></description>

+    </project>

+    <description>Select sub-projects to import dependencies and sources for Papyrus extra components.</description>

+  </project>

+  <project name="dev"

+      label="Developer">

+    <setupTask

+        xsi:type="projects:ProjectsImportTask">

+      <sourceLocator

+          rootFolder="${papyrus.git.clone.location/plugins/developer}">

+        <predicate

+            xsi:type="predicates:NotPredicate">

+          <operand

+              xsi:type="predicates:OrPredicate">

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.sysml\.sysmloveruml\.codegen"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.infra\.extendedtypes\.elementtypeview"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.dev\.view\.services\.edit\.request"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.diagramdev\.modelexplorer"/>

+            <operand

+                xsi:type="predicates:NamePredicate"

+                pattern="org\.eclipse\.papyrus\.releng\.tools"/>

+          </operand>

+        </predicate>

+      </sourceLocator>

+      <sourceLocator

+          rootFolder="${papyrus.git.clone.location/features/papyrus-dev-features}"/>

+      <sourceLocator

+          rootFolder="${papyrus.git.clone.location/tests/junit/plugins/developer}"/>

+    </setupTask>

+    <setupTask

+        xsi:type="setup.workingsets:WorkingSetTask">

+      <workingSet

+          name="Papyrus Developer Tools"

+          id="papyrus-dev">

+        <predicate

+            xsi:type="predicates:AndPredicate">

+          <operand

+              xsi:type="predicates:RepositoryPredicate"

+              project="org.eclipse.papyrus.codegen"/>

+          <operand

+              xsi:type="predicates:OrPredicate">

+            <operand

+                xsi:type="predicates:LocationPredicate"

+                pattern="\Q${papyrus.git.clone.location/plugins/developer/}\E.+"/>

+            <operand

+                xsi:type="predicates:LocationPredicate"

+                pattern="\Q${papyrus.git.clone.location/features/papyrus-dev-features/}\E.*"/>

+            <operand

+                xsi:type="predicates:LocationPredicate"

+                pattern="\Q${papyrus.git.clone.location/tests/junit/plugins/developer/}\E.+"/>

+          </operand>

+        </predicate>

+      </workingSet>

+    </setupTask>

+    <setupTask

+        xsi:type="setup.targlets:TargletTask">

+      <targlet

+          name="Papyrus Developer Tools Dependencies">

+        <requirement

+            name="org.eclipse.gmf.tooling.codegen.xtend2.feature.group"/>

+      </targlet>

+    </setupTask>

+    <setupTask

+        xsi:type="setup.p2:P2Task">

+      <requirement

+          name="org.eclipse.xtend.sdk.feature.group"/>

+    </setupTask>

+    <project

+        name="Oomph"

+        label="Oomph Setup">

+      <setupTask

+          xsi:type="setup:EclipseIniTask"

+          option="-Doomph.redirection.papyrussetups"

+          value="=http://git.eclipse.org/c/papyrus/org.eclipse.papyrus.git/plain/releng/org.eclipse.papyrus.oomph/setups/->${papyrus.git.clone.location|uri}/releng/org.eclipse.papyrus.oomph/setups/"

+          vm="true"/>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <description>Additional configuration for developing and testing the Oomph setup model.</description>

+    </project>

+    <project

+        name="relengtools"

+        label="Releng Tools">

+      <setupTask

+          xsi:type="setup.targlets:TargletTask">

+        <targlet

+            name="Papyrus Releng Tools Dependencies">

+          <requirement

+              name="org.eclipse.oomph.setup.targlets.feature.group"

+              optional="true"/>

+          <requirement

+              name="org.eclipse.oomph.setup.feature.group"

+              optional="true"/>

+          <requirement

+              name="org.eclipse.b3.aggregator.engine.feature.feature.group"/>

+          <repositoryList>

+            <repository

+                url="${oomph.update.url}"/>

+            <repository

+                url="http://download.eclipse.org/modeling/emft/b3/updates-4.3/"/>

+          </repositoryList>

+        </targlet>

+      </setupTask>

+      <setupTask

+          xsi:type="projects:ProjectsImportTask">

+        <sourceLocator

+            rootFolder="${papyrus.git.clone.location/plugins/developer}"

+            locateNestedProjects="true">

+          <predicate

+              xsi:type="predicates:NamePredicate"

+              pattern="org\.eclipse\.papyrus\.releng\.tools"/>

+        </sourceLocator>

+      </setupTask>

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+      </stream>

+      <description>Release engineering tools, including the POM and Oomph Setup dependencies updater actions.</description>

+    </project>

+    <project

+        name="devtools"

+        label="Developer Tools">

+      <stream

+          name="master"

+          label="master (Mars/1.1)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+        <setupTask

+            xsi:type="setup.p2:P2Task">

+          <requirement

+              name="org.eclipse.papyrus.dev.feature.feature.group"/>

+          <repository

+              url="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/releng/dev/target/repository/"/>

+          <repository

+              url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/mars/main"/>

+          <repository

+              url="http://download.eclipse.org/modeling/emft/b3/updates-4.3/"/>

+        </setupTask>

+      </stream>

+      <stream

+          name="streams/1.0-maintenance"

+          label="streams/1.0-maintenance (Luna/1.0.x)">

+        <setupTask

+            xsi:type="setup:VariableTask"

+            name="papyrus.bugzilla.version"

+            value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+        <setupTask

+            xsi:type="setup.p2:P2Task">

+          <requirement

+              name="org.eclipse.papyrus.dev.feature.feature.group"/>

+          <requirement

+              name="org.eclipse.b3.aggregator.engine.feature.feature.group"/>

+          <repository

+              url="https://hudson.eclipse.org/papyrus/job/Papyrus-Luna-Developer/lastSuccessfulBuild/artifact/releng/dev/target/repository/"/>

+          <repository

+              url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/luna"/>

+          <repository

+              url="http://download.eclipse.org/modeling/emft/b3/updates-4.3/"/>

+        </setupTask>

+      </stream>

+      <description>Installs developer tools, including the code generator for Papyrus diagram plug-ins and various debugging aids such as &quot;spy&quot; views.  Source code is not included.</description>

+    </project>

+    <stream

+        name="master"

+        label="master (Mars/1.1)">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.bugzilla.version"

+          value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+    </stream>

+    <stream

+        name="streams/1.0-maintenance"

+        label="streams/1.0-maintenance (Luna/1.0.x)">

+      <setupTask

+          xsi:type="setup:VariableTask"

+          name="papyrus.bugzilla.version"

+          value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+    </stream>

+    <description>Sources and tools required for working on the Papyrus developer tools (not part of the product).  Does not install the developer tools in your IDE:  use the Developer Tools sub-project for that.</description>

+  </project>

+  <stream name="master"

+      label="master (Mars/1.1)">

+    <setupTask

+        xsi:type="setup:VariableTask"

+        name="papyrus.bugzilla.version"

+        value="1.0.0&amp;version=1.0.1&amp;version=1.0.2&amp;version=1.1.0"/>

+    <setupTask

+        xsi:type="jdt:JRETask"

+        version="JavaSE-1.7"

+        location="${jre.location-1.7}"/>

+    <setupTask

+        xsi:type="setup.p2:P2Task">

+      <requirement

+          name="org.eclipse.uml2.sdk.feature.group"/>

+      <repository

+          url="http://download.eclipse.org/modeling/mdt/uml2/updates/5.1-I-builds/"/>

+    </setupTask>

+  </stream>

+  <stream name="streams/1.0-maintenance"

+      label="streams/1.0-maintenance (Luna/1.0.x)">

+    <setupTask

+        xsi:type="setup:VariableTask"

+        name="papyrus.bugzilla.version"

+        value="1.0.0&amp;version=1.0.1&amp;version=1.0.2"/>

+    <setupTask

+        xsi:type="jdt:JRETask"

+        version="JavaSE-1.6"

+        location="${jre.location-1.6}"/>

+  </stream>

+  <logicalProjectContainer

+      xsi:type="setup:ProjectCatalog"

+      href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>

+  <description>Workbench and workspace configuration for development on Papyrus</description>

+</setup:Project>

diff --git a/releng/top-pom-dev.xml b/releng/top-pom-dev.xml
index 5f55ed0201d..d7407c20999 100644
--- a/releng/top-pom-dev.xml
+++ b/releng/top-pom-dev.xml
@@ -1,166 +1,284 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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>
-	<groupId>org.eclipse.papyrus</groupId>
-	<artifactId>org.eclipse.papyrus</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<modules>
-		<module>../plugins/developer/org.eclipse.papyrus.codegen</module>
-		<module>../plugins/developer/org.eclipse.papyrus.dev.java.utils</module>
-	 	<module>../plugins/developer/org.eclipse.papyrus.dev.project.management</module>
-        <module>../plugins/developer/org.eclipse.papyrus.dev.assistants.codegen</module>
-		<module>../plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request</module>
-		<module>../plugins/developer/org.eclipse.papyrus.developer.profile</module>
-	<!--  	<module>../plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer</module> -->
-		<module>../plugins/developer/org.eclipse.papyrus.domaincodegen.ui</module>
-		<module>../plugins/developer/org.eclipse.papyrus.domaincontextcodegen</module>
-		<module>../plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit</module>
-		<module>../plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor</module>
-		<module>../plugins/developer/org.eclipse.papyrus.gmf.editpartview</module>
-		<module>../plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates</module>
-		<module>../plugins/developer/org.eclipse.papyrus.gmf.figureview</module>
-		<module>../plugins/developer/org.eclipse.papyrus.gmfgenextension</module>
-	 	<module>../plugins/developer/org.eclipse.papyrus.infra.emf.commandstack</module>
-		<module>../plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview</module>
-		<module>../plugins/developer/org.eclipse.papyrus.mwe2.utils</module>
-	 	<module>../plugins/developer/org.eclipse.papyrus.releng.tools</module>
-		<module>../plugins/developer/org.eclipse.papyrus.uml.developer.mde</module>
-		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug</module>
-		<module>../features/papyrus-dev-features/org.eclipse.papyrus.dev.feature</module>
-		<module>dev</module>
-	</modules>
-	<properties>
-		<tycho-version>0.22.0</tycho-version>
-		<tychoExtrasVersion>0.22.0</tychoExtrasVersion>
-		<papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/main</papyrus.repo.main>
-		<papyrus.repo.extra>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/extra</papyrus.repo.extra>
-	</properties>
-	<repositories>
-		<repository>
-			<id>eclipse</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/mars</url>
-		</repository>
-		<repository>
-			<id>ep</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Eclipse",0) -->
-			<url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M5a-201502031300/</url>
-		</repository>
-		<repository>
-			<id>emf-cdo</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF CDO",0) -->
-			<url>http://download.eclipse.org/modeling/emf/cdo/drops/R20140610-0212</url>
-		</repository>
-		<repository>
-			<id>b3</id>
-			<layout>p2</layout>
-			<!-- B3 is not in the release train. Always targets the latest released version (i.e. Luna for Mars Development) -->
-			<url>http://download.eclipse.org/modeling/emft/b3/updates-4.4</url>
-		</repository>
-		<repository>
-			<id>papyrus-main</id>
-			<layout>p2</layout>
-			<url>${papyrus.repo.main}</url>
-		</repository>
-		<repository>
-			<id>papyrus-extra</id>
-			<layout>p2</layout>
-			<url>${papyrus.repo.extra}</url>
-		</repository>
-	</repositories>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
-				<configuration>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-compiler-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-					<optimize>true</optimize>
-					<showWarnings>true</showWarnings>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-maven-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<extensions>true</extensions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<environments>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86_64</arch>
-						</environment>
-					</environments>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho-version}</version>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tychoExtrasVersion}</version>
-				<executions>
-					<execution>
-						<id>source-feature</id>
-						<phase>package</phase>
-						<goals>
-							<goal>source-feature</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-p2-metadata</id>
-						<phase>package</phase>
-						<goals>
-							<goal>p2-metadata</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<defaultP2Metadata>false</defaultP2Metadata>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<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>

+	<groupId>org.eclipse.papyrus</groupId>

+	<artifactId>org.eclipse.papyrus</artifactId>

+	<version>1.1.0-SNAPSHOT</version>

+	<packaging>pom</packaging>

+	<modules>

+		<module>../plugins/developer/org.eclipse.papyrus.codegen</module>

+		<module>../plugins/developer/org.eclipse.papyrus.dev.java.utils</module>

+	 	<module>../plugins/developer/org.eclipse.papyrus.dev.project.management</module>

+        <module>../plugins/developer/org.eclipse.papyrus.dev.assistants.codegen</module>

+		<module>../plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request</module>

+		<module>../plugins/developer/org.eclipse.papyrus.developer.profile</module>

+	<!--  	<module>../plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer</module> -->

+		<module>../plugins/developer/org.eclipse.papyrus.domaincodegen.ui</module>

+		<module>../plugins/developer/org.eclipse.papyrus.domaincontextcodegen</module>

+		<module>../plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit</module>

+		<module>../plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor</module>

+		<module>../plugins/developer/org.eclipse.papyrus.gmf.editpartview</module>

+		<module>../plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates</module>

+		<module>../plugins/developer/org.eclipse.papyrus.gmf.figureview</module>

+		<module>../plugins/developer/org.eclipse.papyrus.gmfgenextension</module>

+	 	<module>../plugins/developer/org.eclipse.papyrus.infra.emf.commandstack</module>

+		<module>../plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview</module>

+		<module>../plugins/developer/org.eclipse.papyrus.mwe2.utils</module>

+	 	<module>../plugins/developer/org.eclipse.papyrus.releng.tools</module>

+		<module>../plugins/developer/org.eclipse.papyrus.uml.developer.mde</module>

+		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug</module>

+		<module>../features/papyrus-dev-features/org.eclipse.papyrus.dev.feature</module>

+		<module>dev</module>

+	</modules>

+	<properties>

+		<tycho-version>0.22.0</tycho-version>

+		<tychoExtrasVersion>0.22.0</tychoExtrasVersion>

+		<papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/main</papyrus.repo.main>

+		<papyrus.repo.extra>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/extra</papyrus.repo.extra>

+	</properties>

+	<repositories>

+		<repository>

+			<id>emf-emf</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF (Core)",0) -->

+			<url>http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/</url>

+		</repository>

+		<repository>

+			<id>emft-mwe[0]</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMFT MWE",0) -->

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240644/mwe</url>

+		</repository>

+		<repository>

+			<id>emft-mwe[1]</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMFT MWE",1) -->

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240833/mwe2lang</url>

+		</repository>

+		<repository>

+			<id>emf-transaction</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF TRANSACTION",0) -->

+			<url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201503250534</url>

+		</repository>

+		<repository>

+			<id>emf-validation</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF VALIDATION",0) -->

+			<url>http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201503250348</url>

+		</repository>

+		<repository>

+			<id>ep</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Eclipse",0) -->

+			<url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M6-201503200800/</url>

+		</repository>

+		<repository>

+			<id>gef</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GEF",0) -->

+			<url>http://download.eclipse.org/tools/gef/updates/milestones</url>

+		</repository>

+		<repository>

+			<id>gmp-gmf-notation</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Notation",0) -->

+			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201503250354</url>

+		</repository>

+		<repository>

+			<id>gmp-gmf-runtime</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Runtime",0) -->

+			<url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201502040533</url>

+		</repository>

+		<repository>

+			<id>gmf-tooling</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Tooling",0) -->

+			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/M4</url>

+		</repository>

+		<repository>

+			<id>m2t-xpand</id>

+			<layout>p2</layout>

+			<!-- updateFrom("M2T XPAND",0) -->

+			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201503240650/</url>

+		</repository>

+		<repository>

+			<id>mdt-ocl</id>

+			<layout>p2</layout>

+			<!-- updateFrom("MDT OCL 6.0",0) -->

+			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.0.0/S201503240634</url>

+		</repository>

+		<repository>

+			<id>mdt-uml2</id>

+			<layout>p2</layout>

+			<!-- updateFrom("MDT UML2",0) -->

+			<url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.1milestones</url>

+		</repository>

+		<repository>

+			<id>mmt-qvto</id>

+			<layout>p2</layout>

+			<!-- updateFrom("QVT Operational",0) -->

+			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201503241740</url>

+		</repository>

+		<repository>

+			<id>nattable</id>

+			<layout>p2</layout>

+			<url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>

+		</repository>

+        <repository>

+            <id>nebula-tablecombo</id>

+            <layout>p2</layout>

+            <url>http://download.eclipse.org/technology/nebula/archives/Q12015/release/</url>

+        </repository>

+		<repository>

+			<id>orbit</id>

+			<layout>p2</layout>

+			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository</url>

+		</repository>

+		<repository>

+			<id>tmf-xtext</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Xtext, Xtend",0) -->

+			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.1/</url>

+		</repository>

+		<repository>

+			<id>webtools</id>

+			<layout>p2</layout>

+			<!-- updateFrom("WebTools",0) -->

+			<url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M6-20150324000117/repository/</url>

+		</repository>

+		<repository>

+			<id>XWT</id>

+			<layout>p2</layout>

+			<!-- updateFrom("XWT",0) -->

+			<url>http://download.eclipse.org/xwt/release-1.1.0</url>

+		</repository>

+		<repository>

+			<id>subversive</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Subversive",0) -->

+			<url>http://download.eclipse.org/technology/subversive/3.0/mars-site/</url>

+		</repository>

+		<repository>

+			<id>m2t-acceleo</id>

+			<layout>p2</layout>

+			<!-- updateFrom("M2T ACCELEO",0) -->

+			<url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201503131323</url>

+		</repository>

+		<repository>

+			<id>b3</id>

+			<layout>p2</layout>

+			<!-- B3 is not in the release train. Always targets the latest released version (i.e. Luna for Mars Development) -->

+			<url>http://download.eclipse.org/modeling/emft/b3/updates-4.4</url>

+		</repository>

+		<repository>

+			<id>oomph</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Oomph",0) -->

+			<url>http://download.eclipse.org/oomph/updates/latest</url>

+		</repository>		

+		<repository>

+			<id>papyrus-main</id>

+			<layout>p2</layout>

+			<url>${papyrus.repo.main}</url>

+		</repository>

+		<repository>

+			<id>papyrus-extra</id>

+			<layout>p2</layout>

+			<url>${papyrus.repo.extra}</url>

+		</repository>

+	</repositories>

+	<build>

+		<plugins>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-resources-plugin</artifactId>

+				<version>2.6</version>

+				<configuration>

+					<encoding>UTF-8</encoding>

+				</configuration>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-compiler-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<configuration>

+					<source>1.7</source>

+					<target>1.7</target>

+					<optimize>true</optimize>

+					<showWarnings>true</showWarnings>

+				</configuration>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-maven-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<extensions>true</extensions>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>target-platform-configuration</artifactId>

+				<version>${tycho-version}</version>

+				<configuration>

+					<environments>

+						<environment>

+							<os>win32</os>

+							<ws>win32</ws>

+							<arch>x86_64</arch>

+						</environment>

+					</environments>

+				</configuration>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-p2-repository-plugin</artifactId>

+				<version>${tycho-version}</version>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-source-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<executions>

+					<execution>

+						<id>plugin-source</id>

+						<goals>

+							<goal>plugin-source</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho.extras</groupId>

+				<artifactId>tycho-source-feature-plugin</artifactId>

+				<version>${tychoExtrasVersion}</version>

+				<executions>

+					<execution>

+						<id>source-feature</id>

+						<phase>package</phase>

+						<goals>

+							<goal>source-feature</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-p2-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<executions>

+					<execution>

+						<id>attach-p2-metadata</id>

+						<phase>package</phase>

+						<goals>

+							<goal>p2-metadata</goal>

+						</goals>

+					</execution>

+				</executions>

+				<configuration>

+					<defaultP2Metadata>false</defaultP2Metadata>

+				</configuration>

+			</plugin>

+		</plugins>

+	</build>

+</project>

diff --git a/releng/top-pom-extra-tests.xml b/releng/top-pom-extra-tests.xml
index 72708deb0e5..ef2730df88b 100644
--- a/releng/top-pom-extra-tests.xml
+++ b/releng/top-pom-extra-tests.xml
@@ -66,13 +66,13 @@
 			<id>emf-cdo</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMF CDO",0) -->

-			<url>http://download.eclipse.org/modeling/emf/cdo/drops/R20140610-0212</url>

+			<url>http://download.eclipse.org/modeling/emf/cdo/drops/S20150324-0935</url>

 		</repository>

 		<repository>

 			<id>emf-compare</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMF COMPARE",0) -->

-			<url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201502031424</url>

+			<url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201503131342</url>

 		</repository>

 		<repository>

 			<id>emf-emf</id>

@@ -84,37 +84,37 @@
 			<id>emft-mwe[0]</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMFT MWE",0) -->

-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201502030703/mwe</url>

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240644/mwe</url>

 		</repository>

 		<repository>

 			<id>emft-mwe[1]</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMFT MWE",1) -->

-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201502030947/mwe2lang</url>

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240833/mwe2lang</url>

 		</repository>

 		<repository>

 			<id>emf-query</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMF Query",0) -->

-			<url>http://download.eclipse.org/modeling/emf/query/updates/milestones/S201502040400/</url>

+			<url>http://download.eclipse.org/modeling/emf/query/updates/milestones/S201503250423/</url>

 		</repository>

 		<repository>

 			<id>emf-transaction</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMF TRANSACTION",0) -->

-			<url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201502040445</url>

+			<url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201503250534</url>

 		</repository>

 		<repository>

 			<id>emf-validation</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMF VALIDATION",0) -->

-			<url>http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201502040400</url>

+			<url>http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201503250348</url>

 		</repository>

 		<repository>

 			<id>ep</id>

 			<layout>p2</layout>

 			<!-- updateFrom("Eclipse",0) -->

-			<url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M5a-201502031300/</url>

+			<url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M6-201503200800/</url>

 		</repository>

 		<repository>

 			<id>gef</id>

@@ -126,7 +126,7 @@
 			<id>gmp-gmf-notation</id>

 			<layout>p2</layout>

 			<!-- updateFrom("GMF Notation",0) -->

-			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201502040339</url>

+			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201503250354</url>

 		</repository>

 		<repository>

 			<id>gmp-gmf-runtime</id>

@@ -144,31 +144,31 @@
 			<id>m2t-acceleo</id>

 			<layout>p2</layout>

 			<!-- updateFrom("M2T ACCELEO",0) -->

-			<url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201502030917</url>

+			<url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201503131323</url>

 		</repository>

 		<repository>

 			<id>m2t-xpand</id>

 			<layout>p2</layout>

 			<!-- updateFrom("M2T XPAND",0) -->

-			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201502030723/</url>

+			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201503240650/</url>

 		</repository>

 		<repository>

 			<id>mdt-ocl</id>

 			<layout>p2</layout>

 			<!-- updateFrom("MDT OCL 6.0",0) -->

-			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/interim/6.0.0/</url>

+			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.0.0/S201503240634</url>

 		</repository>

 		<repository>

 			<id>mdt-uml2</id>

 			<layout>p2</layout>

 			<!-- updateFrom("MDT UML2",0) -->

-			<url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.1-I-builds/</url>

+			<url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.1milestones</url>

 		</repository>

 		<repository>

 			<id>mmt-qvto</id>

 			<layout>p2</layout>

 			<!-- updateFrom("QVT Operational",0) -->

-			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201502021150</url>

+			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201503241740</url>

 		</repository>

 		<repository>

 			<id>nattable</id>

@@ -184,19 +184,19 @@
 			<id>subversive</id>

 			<layout>p2</layout>

 			<!-- updateFrom("Subversive",0) -->

-			<url>http://download.eclipse.org/technology/subversive/2.0/mars-site/</url>

+			<url>http://download.eclipse.org/technology/subversive/3.0/mars-site/</url>

 		</repository>

 		<repository>

 			<id>tmf-xtext</id>

 			<layout>p2</layout>

 			<!-- updateFrom("Xtext, Xtend",0) -->

-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201502030924/</url>

+			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.1/</url>

 		</repository>

 		<repository>

 			<id>webtools</id>

 			<layout>p2</layout>

 			<!-- updateFrom("WebTools",0) -->

-			<url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M4-20141211000148/repository/</url>

+			<url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M6-20150324000117/repository/</url>

 		</repository>

 		<repository>

 			<id>XWT</id>

diff --git a/releng/top-pom-extras.xml b/releng/top-pom-extras.xml
index fbac4731926..0ef639d0760 100644
--- a/releng/top-pom-extras.xml
+++ b/releng/top-pom-extras.xml
@@ -1,716 +1,716 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus</groupId>
-	<artifactId>org.eclipse.papyrus</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<modules>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.layers.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.acceleo</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.debug</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.ui</module>
-		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.core</module>
-		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui</module>
-		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties</module>
-		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink</module>
-		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui</module>
-		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui</module>
-		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui</module>
-		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems</module>
-		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.codegen.base</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.cpp.examples</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.cpp.profile</module>
-		<module>../plugins/customization/org.eclipse.papyrus.customization</module>
-		<module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate</module>
-		<module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit</module>
-		<module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor</module>
-		<module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation</module>
-		<module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator</module>
-		<module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model</module>
-		<module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui</module>
-		<module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties</module>
-		<module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard</module>
-		<module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl</module>
-		<module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable</module>
-		<module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation</module>
-		<module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config</module>
-		<module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu</module>
-		<module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types</module>
-		<module>../plugins/infra/org.eclipse.papyrus.eclipse.project.editors</module>
-		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile</module>
-		<module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints</module>
-		<module>../extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer</module>
-		<module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt</module>
-		<module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit</module>
-		<module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor</module>
-		<module>../extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt</module>
-		<module>../extraplugins/java/org.eclipse.papyrus.java.generator.ui</module>
-		<module>../extraplugins/java/org.eclipse.papyrus.java.profile</module>
-		<module>../extraplugins/java/org.eclipse.papyrus.java.profile.edit</module>
-		<module>../extraplugins/java/org.eclipse.papyrus.java.profile.editor</module>
-		<module>../extraplugins/java/org.eclipse.papyrus.java.reverse</module>
-		<module>../extraplugins/java/org.eclipse.papyrus.java.reverse.ui</module>
-		<module>../extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit</module>
-		<module>../extraplugins/layers/org.eclipse.papyrus.layers.runtime</module>
-		<module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel</module>
-		<module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram</module>
-		<module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit</module>
-		<module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor</module>
-		<module>../extraplugins/layers/org.eclipse.papyrus.layers.ui</module>
-		<module>../extraplugins/marte/properties/org.eclipse.papyrus.marte.properties</module>
-		<module>../extraplugins/marte/org.eclipse.papyrus.marte.static.profile</module>
-		<module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext</module>
-		<module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui</module>
-		<module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext</module>
-		<module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui</module>
-		<module>../extraplugins/marte/org.eclipse.papyrus.marte.vsl</module>
-		<module>../extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui</module>
-		<module>../extraplugins/migration/org.eclipse.papyrus.migration.properties.model</module>
-		<module>../extraplugins/moka/org.eclipse.papyrus.moka</module>
-		<module>../extraplugins/moka/org.eclipse.papyrus.moka.alf.resources</module>
-		<module>../extraplugins/moka/org.eclipse.papyrus.moka.async.fuml</module>
-		<module>../extraplugins/moka/org.eclipse.papyrus.moka.composites</module>
-		<module>../extraplugins/moka/org.eclipse.papyrus.moka.composites.utils</module>
-		<module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml</module>
-		<module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary</module>
-		<module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary</module>
-		<module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary</module>
-		<module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation</module>
-		<module>../extraplugins/moka/org.eclipse.papyrus.moka.ui</module>
-		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core</module>
-		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp</module>
-		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java</module>
-		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc</module>
-		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui</module>
-		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation</module>
-		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl</module>
-		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core</module>
-		<module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing</module>
-		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml</module>
-		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.deployment</module>
-		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common</module>
-		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui</module>
-		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.doc</module>
-		<module>../extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common</module>
-		<module>../extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps</module>
-		<module>../extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui</module>
-		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.perspective</module>
-		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository</module>
-		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.validation</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.model</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer</module>
-		<module>../extraplugins/uml/compare/org.eclipse.papyrus.uml.compare</module>
-		<module>../extraplugins/uml/org.eclipse.papyrus.uml.export</module>
-		
-		<!-- Papyrus Uml Rt  -->
-		<module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt</module>
-		<module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui</module>
-		<module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties</module>
-		<module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation</module>
-		<module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard</module>					
-		
-		<module>../extraplugins/migration/org.eclipse.papyrus.m2m.qvto</module>
-		<module>../extraplugins/migration/org.eclipse.papyrus.migration.rsa</module>
-		<module>../extraplugins/codegen/org.eclipse.papyrus.views.cpp</module>
-		<module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints</module>
-		<!-- Papyrus Uml Diagram Ecore -->
-		<module>../extraplugins/papyrus4ecore/org.eclipse.papyrus.uml.diagram.ecore</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.diagram.ecore.feature</module>	
-		<!-- Papyrus 4 Education -->
-		<module>../extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education</module>	
-		<!-- Module EPF -->
-		<module>../extraplugins/epf-richtext/org.eclipse.papyrus.infra.widgets.epf.richtext.extension</module>
-		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.epf.richtext.feature</module>
-		
-        <module>../extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile</module>
-        <module>../extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant</module>
-        <module>../extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.table</module>
-        <module>../extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool</module>
-        <module>../extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile</module>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<groupId>org.eclipse.papyrus</groupId>

+	<artifactId>org.eclipse.papyrus</artifactId>

+	<version>1.1.0-SNAPSHOT</version>

+	<packaging>pom</packaging>

+	<modules>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.layers.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.acceleo</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.debug</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.ui</module>

+		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.core</module>

+		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui</module>

+		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties</module>

+		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink</module>

+		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui</module>

+		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui</module>

+		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui</module>

+		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems</module>

+		<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.codegen.base</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.cpp.examples</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.cpp.profile</module>

+		<module>../plugins/customization/org.eclipse.papyrus.customization</module>

+		<module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate</module>

+		<module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit</module>

+		<module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor</module>

+		<module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation</module>

+		<module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator</module>

+		<module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model</module>

+		<module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui</module>

+		<module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties</module>

+		<module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard</module>

+		<module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl</module>

+		<module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable</module>

+		<module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation</module>

+		<module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config</module>

+		<module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu</module>

+		<module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types</module>

+		<module>../plugins/infra/org.eclipse.papyrus.eclipse.project.editors</module>

+		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile</module>

+		<module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints</module>

+		<module>../extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer</module>

+		<module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt</module>

+		<module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit</module>

+		<module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor</module>

+		<module>../extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt</module>

+		<module>../extraplugins/java/org.eclipse.papyrus.java.generator.ui</module>

+		<module>../extraplugins/java/org.eclipse.papyrus.java.profile</module>

+		<module>../extraplugins/java/org.eclipse.papyrus.java.profile.edit</module>

+		<module>../extraplugins/java/org.eclipse.papyrus.java.profile.editor</module>

+		<module>../extraplugins/java/org.eclipse.papyrus.java.reverse</module>

+		<module>../extraplugins/java/org.eclipse.papyrus.java.reverse.ui</module>

+		<module>../extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit</module>

+		<module>../extraplugins/layers/org.eclipse.papyrus.layers.runtime</module>

+		<module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel</module>

+		<module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram</module>

+		<module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit</module>

+		<module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor</module>

+		<module>../extraplugins/layers/org.eclipse.papyrus.layers.ui</module>

+		<module>../extraplugins/marte/properties/org.eclipse.papyrus.marte.properties</module>

+		<module>../extraplugins/marte/org.eclipse.papyrus.marte.static.profile</module>

+		<module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext</module>

+		<module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui</module>

+		<module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext</module>

+		<module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui</module>

+		<module>../extraplugins/marte/org.eclipse.papyrus.marte.vsl</module>

+		<module>../extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui</module>

+		<module>../extraplugins/migration/org.eclipse.papyrus.migration.properties.model</module>

+		<module>../extraplugins/moka/org.eclipse.papyrus.moka</module>

+		<module>../extraplugins/moka/org.eclipse.papyrus.moka.alf.resources</module>

+		<module>../extraplugins/moka/org.eclipse.papyrus.moka.async.fuml</module>

+		<module>../extraplugins/moka/org.eclipse.papyrus.moka.composites</module>

+		<module>../extraplugins/moka/org.eclipse.papyrus.moka.composites.utils</module>

+		<module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml</module>

+		<module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary</module>

+		<module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary</module>

+		<module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary</module>

+		<module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation</module>

+		<module>../extraplugins/moka/org.eclipse.papyrus.moka.ui</module>

+		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core</module>

+		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp</module>

+		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.java</module>

+		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc</module>

+		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui</module>

+		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation</module>

+		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl</module>

+		<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core</module>

+		<module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing</module>

+		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml</module>

+		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.deployment</module>

+		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common</module>

+		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui</module>

+		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.doc</module>

+		<module>../extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common</module>

+		<module>../extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps</module>

+		<module>../extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui</module>

+		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.perspective</module>

+		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository</module>

+		<module>../extraplugins/robotml/org.eclipse.papyrus.robotml.validation</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.model</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer</module>

+		<module>../extraplugins/uml/compare/org.eclipse.papyrus.uml.compare</module>

+		<module>../extraplugins/uml/org.eclipse.papyrus.uml.export</module>

+		

+		<!-- Papyrus Uml Rt  -->

+		<module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt</module>

+		<module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui</module>

+		<module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties</module>

+		<module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation</module>

+		<module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard</module>					

+		

+		<module>../extraplugins/migration/org.eclipse.papyrus.m2m.qvto</module>

+		<module>../extraplugins/migration/org.eclipse.papyrus.migration.rsa</module>

+		<module>../extraplugins/codegen/org.eclipse.papyrus.views.cpp</module>

+		<module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints</module>

+		<!-- Papyrus Uml Diagram Ecore -->

+		<module>../extraplugins/papyrus4ecore/org.eclipse.papyrus.uml.diagram.ecore</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.diagram.ecore.feature</module>	

+		<!-- Papyrus 4 Education -->

+		<module>../extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education</module>	

+		<!-- Module EPF -->

+		<module>../extraplugins/epf-richtext/org.eclipse.papyrus.infra.widgets.epf.richtext.extension</module>

+		<module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.epf.richtext.feature</module>

+		

+        <module>../extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile</module>

+        <module>../extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant</module>

+        <module>../extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.table</module>

+        <module>../extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool</module>

+        <module>../extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile</module>

         <!-- Missing org.eclipse.xtext.gmf.glue 0.8.0' <module>../extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui</module> 
-        <module>../extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext</module>-->
- 
-        <module>../extraplugins/design/org.eclipse.papyrus.design.profile.architecture</module>
-        <module>../extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit</module>
-        <module>../extraplugins/design/org.eclipse.papyrus.design.profile.architecture.editor</module>
-
-        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit</module>
-        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor</module>
-        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt</module>
-        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.dd</module>
-        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.notation.export</module>
-        <!-- Compilation failure <module>../extraplugins/diagram-definition/org.eclipse.papyrus.notation.qvt</module> -->
-        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.notation2umldi</module>
-        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit</module>
-        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor</module>
-        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.umldi</module>
-        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg</module>
-        <module>../extraplugins/facade/org.eclipse.papyrus.facade.codegen</module>
-        <module>../extraplugins/facade/org.eclipse.papyrus.facade.definition.editor</module>
-        <module>../extraplugins/facade/org.eclipse.papyrus.facade.edit</module>
-        <module>../extraplugins/facade/org.eclipse.papyrus.facade.editor</module>
-        <module>../extraplugins/facade/org.eclipse.papyrus.facade.utils</module>
-        <module>../extraplugins/facade/org.eclipse.papyrus.facade</module>
-        <module>../extraplugins/layout/org.eclipse.papyrus.layout</module> 
-        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm</module>
-        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm</module>
-        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm</module>
-        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm</module>
-        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm</module>
-        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm</module>
-        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm</module>
-        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm</module>
-        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm</module>
-        <module>../extraplugins/layout/org.eclipse.papyrus.layout.subeditor.gmf</module>
-        
-        <module>../extraplugins/revision/org.eclipse.papyrus.revisiontool</module>
-        <module>../extraplugins/spem2/org.eclipse.papyrus.spem2.profile</module>
-		
-		<module>extras</module>
-	</modules>
-	<properties>
-		<tycho-version>0.22.0</tycho-version>
-		<tychoExtrasVersion>0.22.0</tychoExtrasVersion>
-		<xtext.version>2.7.3</xtext.version>
-		<java.source.version>1.6</java.source.version>
-		<java.target.version>1.6</java.target.version>
-		<papyrus.eclipse.target>mars</papyrus.eclipse.target>
-		<papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}</papyrus.repo.main>
-	</properties>
-	<repositories>
-		<repository>
-			<id>org.eclipse.epf.richtext_1.5.1.6-update-site</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/modeling/mdt/papyrus/updates/epf/main</url>
-		</repository>
-		<repository>
-			<id>papyrus-main</id>
-			<layout>p2</layout>
-			<url>${papyrus.repo.main}</url>
-		</repository>
-		<repository>
-			<id>cdt</id>
-			<layout>p2</layout>
-			<!-- updateFrom("CDT",0) -->
-			<url>http://download.eclipse.org/tools/cdt/builds/mars/milestones</url>
-		</repository>
-		<repository>
-			<id>emft-emffacet</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF Facet",0) -->
-			<url>http://download.eclipse.org/facet/updates/integration/1.0.0/I201502030839/</url>
-		</repository>
-		<repository>
-			<id>emf-cdo</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF CDO",0) -->
-			<url>http://download.eclipse.org/modeling/emf/cdo/drops/R20140610-0212</url>
-		</repository>
-		<repository>
-			<id>emf-compare</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF COMPARE",0) -->
-			<url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201502031424</url>
-		</repository>
-		<repository>
-			<id>emf-emf</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF (Core)",0) -->
-			<url>http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/</url>
-		</repository>
-		<repository>
-			<id>emft-mwe[0]</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMFT MWE",0) -->
-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201502030703/mwe</url>
-		</repository>
-		<repository>
-			<id>emft-mwe[1]</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMFT MWE",1) -->
-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201502030947/mwe2lang</url>
-		</repository>
-		<repository>
-			<id>emf-query</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF Query",0) -->
-			<url>http://download.eclipse.org/modeling/emf/query/updates/milestones/S201502040400/</url>
-		</repository>
-		<repository>
-			<id>emf-transaction</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF TRANSACTION",0) -->
-			<url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201502040445</url>
-		</repository>
-		<repository>
-			<id>emf-validation</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF VALIDATION",0) -->
-			<url>http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201502040400</url>
-		</repository>
-		<repository>
-			<id>ep</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Eclipse",0) -->
-			<url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M5a-201502031300/</url>
-		</repository>
-		<repository>
-			<id>gef</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GEF",0) -->
-			<url>http://download.eclipse.org/tools/gef/updates/milestones</url>
-		</repository>
-		<repository>
-			<id>gmp-gmf-notation</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Notation",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201502040339</url>
-		</repository>
-		<repository>
-			<id>gmp-gmf-runtime</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Runtime",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201502040533</url>
-		</repository>
-		<repository>
-			<id>gmf-tooling</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Tooling",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/M4</url>
-		</repository>
-		<repository>
-			<id>m2t-acceleo</id>
-			<layout>p2</layout>
-			<!-- updateFrom("M2T ACCELEO",0) -->
-			<url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201502030917</url>
-		</repository>
-		<repository>
-			<id>m2t-xpand</id>
-			<layout>p2</layout>
-			<!-- updateFrom("M2T XPAND",0) -->
-			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201502030723/</url>
-		</repository>
-		<repository>
-			<id>mdt-ocl</id>
-			<layout>p2</layout>
-			<!-- updateFrom("MDT OCL 6.0",0) -->
-			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/interim/6.0.0/</url>
-		</repository>
-		<repository>
-			<id>mdt-uml2</id>
-			<layout>p2</layout>
-			<!-- updateFrom("MDT UML2",0) -->
-			<url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.1-I-builds/</url>
-		</repository>
-		<repository>
-			<id>mmt-qvto</id>
-			<layout>p2</layout>
-			<!-- updateFrom("QVT Operational",0) -->
-			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201502021150</url>
-		</repository>
-		<repository>
-			<id>nattable</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>
-		</repository>
-		<repository>
-			<id>orbit</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository</url>
-		</repository>
-		<repository>
-			<id>subversive</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Subversive",0) -->
-			<url>http://download.eclipse.org/technology/subversive/2.0/mars-site/</url>
-		</repository>
-		<repository>
-			<id>tmf-xtext</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Xtext, Xtend",0) -->
-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201502030924/</url>
-		</repository>
-		<repository>
-			<id>webtools</id>
-			<layout>p2</layout>
-			<!-- updateFrom("WebTools",0) -->
-			<url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M4-20141211000148/repository/</url>
-		</repository>
-		<repository>
-			<id>XWT</id>
-			<layout>p2</layout>
-			<!-- updateFrom("XWT",0) -->
-			<url>http://download.eclipse.org/xwt/release-1.1.0</url>
-		</repository>
-		<repository>
-			<id>EEF</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/modeling/emft/eef/updates/releases/1.2/</url>
-		</repository>		
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>org.eclipse.cbi.maven.plugins</id>
-			<name>Eclipse CBI</name>
-			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
-			 <releases>
-		     	<enabled>true</enabled>
-		     </releases>
-		     <snapshots>
-		     	<enabled>false</enabled>
-		     </snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-	<build>
-	
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.2</version>
-					<configuration>
-						<source>${java.source.version}</source>
-						<target>${java.target.version}</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-clean-plugin</artifactId>
-					<version>2.6</version>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>build-helper-maven-plugin</artifactId>
-					<version>1.9.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>exec-maven-plugin</artifactId>
-					<version>1.2.1</version>
-				</plugin>
-                <plugin>
-                    <groupId>org.eclipse.xtend</groupId>
-                    <artifactId>xtend-maven-plugin</artifactId>
-                    <version>${xtext.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.6</version>
-                    <configuration>
-                        <encoding>UTF-8</encoding>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>tycho-compiler-plugin</artifactId>
-                    <version>${tycho-version}</version>
-                    <configuration>
-                        <optimize>true</optimize>
-                        <showWarnings>true</showWarnings>
-                        <!-- Tycho build using the project's JDT settings. -->
-                        <useProjectSettings>true</useProjectSettings>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>tycho-maven-plugin</artifactId>
-                    <version>${tycho-version}</version>
-                    <extensions>true</extensions>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>target-platform-configuration</artifactId>
-                    <version>${tycho-version}</version>
-                    <configuration>
-                        <environments>
-                            <environment>
-                                <os>win32</os>
-                                <ws>win32</ws>
-                                <arch>x86_64</arch>
-                            </environment>
-                        </environments>
-                    </configuration>
-                </plugin>
-			</plugins>
-		</pluginManagement>
-	
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho-version}</version>
-			</plugin>
-            <!-- Sources -->
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tychoExtrasVersion}</version>
-				<executions>
-					<execution>
-						<id>source-feature</id>
-						<phase>package</phase>
-						<goals>
-							<goal>source-feature</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.9</version>
-				<executions>
-					<execution>
-						<id>purge-local-dependencies</id>
-						<phase>process-sources</phase>
-						<goals>
-							<goal>purge-local-repository</goal>
-						</goals>
-						<configuration>
-							<includes>
-								<include>org.eclipse.papyrus</include>
-							</includes>
-							<verbose>true</verbose>
-							<resolutionFuzziness>groupId</resolutionFuzziness>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	
-	
-	<profiles>
-		
-		<profile>
-			<id>defaultProfile</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-p2-plugin</artifactId>
-						<version>${tycho-version}</version>
-						<executions>
-							<execution>
-								<id>attach-p2-metadata</id>
-								<phase>package</phase>
-								<goals>
-									<goal>p2-metadata</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-		</profile>	  
-	  
-		<profile>
-	  		<id>packAndSign</id> <!-- Stable release profile. Takes +30min. Eclipse servers only -->
-		  	<!-- Pack200 -->
-		  	<build>
-			  	<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-pack200a-plugin</artifactId>
-						<version>${tychoExtrasVersion}</version>
-						<executions>
-							<execution>
-								<id>pack200-normalize</id>
-								<goals>
-									<goal>normalize</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.eclipse.cbi.maven.plugins</groupId>
-						<artifactId>eclipse-jarsigner-plugin</artifactId>
-						<version>1.0.5</version>
-						<executions>
-							<execution>
-						    	<id>sign</id>
-						    	<goals>
-						    		<goal>sign</goal>
-						    	</goals>
-						  	</execution>
-						</executions>
-		            </plugin>
-					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-pack200b-plugin</artifactId>
-						<version>${tychoExtrasVersion}</version>
-						<executions>
-							<execution>
-								<id>pack200-pack</id>
-								<goals>
-									<goal>pack</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-p2-plugin</artifactId>
-						<version>${tycho-version}</version>
-						<executions>
-							<execution>
-								<id>attach-p2-metadata</id>
-								<phase>package</phase>
-								<goals>
-									<goal>p2-metadata</goal>
-								</goals>
-							</execution>
-						</executions>
-						<configuration>
-							<defaultP2Metadata>false</defaultP2Metadata>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-	        <activation>
-	        	<property>
-	        		<name>SIGN</name>
-	        		<value>true</value>
-	        	</property>
-	        </activation>
-		</profile>
-	  
-	  
-    	<profile>
-	        <id>pack</id> <!-- Nightly profile. Artifacts can be consumed, but are not signed -->
-	        <build>
-	          <plugins>
-	            <!-- Pack200 -->
-				<plugin>
-					<groupId>org.eclipse.tycho.extras</groupId>
-					<artifactId>tycho-pack200b-plugin</artifactId>
-					<version>${tychoExtrasVersion}</version>
-					<executions>
-						<execution>
-							<id>pack200-pack</id>
-							<goals>
-								<goal>pack</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-p2-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<executions>
-						<execution>
-							<id>attach-p2-metadata</id>
-							<phase>package</phase>
-							<goals>
-								<goal>p2-metadata</goal>
-							</goals>
-						</execution>
-					</executions>
-					<configuration>
-						<defaultP2Metadata>false</defaultP2Metadata>
-					</configuration>
-				</plugin>
-	          </plugins>
-	        </build>
-	        <activation>
-	        	<property>
-	        		<name>SIGN</name>
-	        		<value>false</value>
-	        	</property>
-	        </activation>
-    	</profile>
-      
-        <!-- profile dedicated to activate the repository linked to nightly artifacts, useful for daily life of developers -->
-		<profile>
-			<id>nightly</id>
-			<repositories>
-				<repository>
-					<id>papyrus</id>
-					<layout>p2</layout>
-					<url>${papyrus.repo.main}</url>
-					<releases>
-						<enabled>true</enabled>
-						<updatePolicy>daily</updatePolicy>
-						<checksumPolicy>warn</checksumPolicy>
-					</releases>
-					<snapshots>
-						<enabled>true</enabled>
-						<updatePolicy>daily</updatePolicy>
-						<checksumPolicy>fail</checksumPolicy>
-					</snapshots>
-				</repository>
-			</repositories>
-			<activation>
-				<property>
-					<name>env</name>
-					<value>devnightly</value>
-				</property>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-		</profile>
-    </profiles>
-</project>
+        <module>../extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext</module>-->

+ 

+        <module>../extraplugins/design/org.eclipse.papyrus.design.profile.architecture</module>

+        <module>../extraplugins/design/org.eclipse.papyrus.design.profile.architecture.edit</module>

+        <module>../extraplugins/design/org.eclipse.papyrus.design.profile.architecture.editor</module>

+

+        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit</module>

+        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor</module>

+        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.dd.qvt</module>

+        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.dd</module>

+        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.notation.export</module>

+        <!-- Compilation failure <module>../extraplugins/diagram-definition/org.eclipse.papyrus.notation.qvt</module> -->

+        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.notation2umldi</module>

+        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit</module>

+        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor</module>

+        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.umldi</module>

+        <module>../extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg</module>

+        <module>../extraplugins/facade/org.eclipse.papyrus.facade.codegen</module>

+        <module>../extraplugins/facade/org.eclipse.papyrus.facade.definition.editor</module>

+        <module>../extraplugins/facade/org.eclipse.papyrus.facade.edit</module>

+        <module>../extraplugins/facade/org.eclipse.papyrus.facade.editor</module>

+        <module>../extraplugins/facade/org.eclipse.papyrus.facade.utils</module>

+        <module>../extraplugins/facade/org.eclipse.papyrus.facade</module>

+        <module>../extraplugins/layout/org.eclipse.papyrus.layout</module> 

+        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.gridAlgorithm</module>

+        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm</module>

+        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm</module>

+        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm</module>

+        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.radialAlgorithm</module>

+        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.springAlgorithm</module>

+        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.treeAlgorithm</module>

+        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalAlgorithm</module>

+        <module>../extraplugins/layout/org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm</module>

+        <module>../extraplugins/layout/org.eclipse.papyrus.layout.subeditor.gmf</module>

+        

+        <module>../extraplugins/revision/org.eclipse.papyrus.revisiontool</module>

+        <module>../extraplugins/spem2/org.eclipse.papyrus.spem2.profile</module>

+		

+		<module>extras</module>

+	</modules>

+	<properties>

+		<tycho-version>0.22.0</tycho-version>

+		<tychoExtrasVersion>0.22.0</tychoExtrasVersion>

+		<xtext.version>2.7.3</xtext.version>

+		<java.source.version>1.6</java.source.version>

+		<java.target.version>1.6</java.target.version>

+		<papyrus.eclipse.target>mars</papyrus.eclipse.target>

+		<papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}</papyrus.repo.main>

+	</properties>

+	<repositories>

+		<repository>

+			<id>org.eclipse.epf.richtext_1.5.1.6-update-site</id>

+			<layout>p2</layout>

+			<url>http://download.eclipse.org/modeling/mdt/papyrus/updates/epf/main</url>

+		</repository>

+		<repository>

+			<id>papyrus-main</id>

+			<layout>p2</layout>

+			<url>${papyrus.repo.main}</url>

+		</repository>

+		<repository>

+			<id>cdt</id>

+			<layout>p2</layout>

+			<!-- updateFrom("CDT",0) -->

+			<url>http://download.eclipse.org/tools/cdt/builds/mars/milestones</url>

+		</repository>

+		<repository>

+			<id>emft-emffacet</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF Facet",0) -->

+			<url>http://download.eclipse.org/facet/updates/integration/1.0.0/I201502030839/</url>

+		</repository>

+		<repository>

+			<id>emf-cdo</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF CDO",0) -->

+			<url>http://download.eclipse.org/modeling/emf/cdo/drops/S20150324-0935</url>

+		</repository>

+		<repository>

+			<id>emf-compare</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF COMPARE",0) -->

+			<url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201503131342</url>

+		</repository>

+		<repository>

+			<id>emf-emf</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF (Core)",0) -->

+			<url>http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/</url>

+		</repository>

+		<repository>

+			<id>emft-mwe[0]</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMFT MWE",0) -->

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240644/mwe</url>

+		</repository>

+		<repository>

+			<id>emft-mwe[1]</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMFT MWE",1) -->

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240833/mwe2lang</url>

+		</repository>

+		<repository>

+			<id>emf-query</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF Query",0) -->

+			<url>http://download.eclipse.org/modeling/emf/query/updates/milestones/S201503250423/</url>

+		</repository>

+		<repository>

+			<id>emf-transaction</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF TRANSACTION",0) -->

+			<url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201503250534</url>

+		</repository>

+		<repository>

+			<id>emf-validation</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF VALIDATION",0) -->

+			<url>http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201503250348</url>

+		</repository>

+		<repository>

+			<id>ep</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Eclipse",0) -->

+			<url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M6-201503200800/</url>

+		</repository>

+		<repository>

+			<id>gef</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GEF",0) -->

+			<url>http://download.eclipse.org/tools/gef/updates/milestones</url>

+		</repository>

+		<repository>

+			<id>gmp-gmf-notation</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Notation",0) -->

+			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201503250354</url>

+		</repository>

+		<repository>

+			<id>gmp-gmf-runtime</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Runtime",0) -->

+			<url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201502040533</url>

+		</repository>

+		<repository>

+			<id>gmf-tooling</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Tooling",0) -->

+			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/M4</url>

+		</repository>

+		<repository>

+			<id>m2t-acceleo</id>

+			<layout>p2</layout>

+			<!-- updateFrom("M2T ACCELEO",0) -->

+			<url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201503131323</url>

+		</repository>

+		<repository>

+			<id>m2t-xpand</id>

+			<layout>p2</layout>

+			<!-- updateFrom("M2T XPAND",0) -->

+			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201503240650/</url>

+		</repository>

+		<repository>

+			<id>mdt-ocl</id>

+			<layout>p2</layout>

+			<!-- updateFrom("MDT OCL 6.0",0) -->

+			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.0.0/S201503240634</url>

+		</repository>

+		<repository>

+			<id>mdt-uml2</id>

+			<layout>p2</layout>

+			<!-- updateFrom("MDT UML2",0) -->

+			<url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.1milestones</url>

+		</repository>

+		<repository>

+			<id>mmt-qvto</id>

+			<layout>p2</layout>

+			<!-- updateFrom("QVT Operational",0) -->

+			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201503241740</url>

+		</repository>

+		<repository>

+			<id>nattable</id>

+			<layout>p2</layout>

+			<url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>

+		</repository>

+		<repository>

+			<id>orbit</id>

+			<layout>p2</layout>

+			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository</url>

+		</repository>

+		<repository>

+			<id>subversive</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Subversive",0) -->

+			<url>http://download.eclipse.org/technology/subversive/3.0/mars-site/</url>

+		</repository>

+		<repository>

+			<id>tmf-xtext</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Xtext, Xtend",0) -->

+			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.1/</url>

+		</repository>

+		<repository>

+			<id>webtools</id>

+			<layout>p2</layout>

+			<!-- updateFrom("WebTools",0) -->

+			<url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M6-20150324000117/repository/</url>

+		</repository>

+		<repository>

+			<id>XWT</id>

+			<layout>p2</layout>

+			<!-- updateFrom("XWT",0) -->

+			<url>http://download.eclipse.org/xwt/release-1.1.0</url>

+		</repository>

+		<repository>

+			<id>EEF</id>

+			<layout>p2</layout>

+			<url>http://download.eclipse.org/modeling/emft/eef/updates/releases/1.2/</url>

+		</repository>		

+	</repositories>

+	<pluginRepositories>

+		<pluginRepository>

+			<id>org.eclipse.cbi.maven.plugins</id>

+			<name>Eclipse CBI</name>

+			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>

+			 <releases>

+		     	<enabled>true</enabled>

+		     </releases>

+		     <snapshots>

+		     	<enabled>false</enabled>

+		     </snapshots>

+		</pluginRepository>

+	</pluginRepositories>

+	<build>

+	

+		<pluginManagement>

+			<plugins>

+				<plugin>

+					<groupId>org.apache.maven.plugins</groupId>

+					<artifactId>maven-compiler-plugin</artifactId>

+					<version>3.2</version>

+					<configuration>

+						<source>${java.source.version}</source>

+						<target>${java.target.version}</target>

+					</configuration>

+				</plugin>

+				<plugin>

+					<groupId>org.apache.maven.plugins</groupId>

+					<artifactId>maven-clean-plugin</artifactId>

+					<version>2.6</version>

+				</plugin>

+				<plugin>

+					<groupId>org.codehaus.mojo</groupId>

+					<artifactId>build-helper-maven-plugin</artifactId>

+					<version>1.9.1</version>

+				</plugin>

+				<plugin>

+					<groupId>org.codehaus.mojo</groupId>

+					<artifactId>exec-maven-plugin</artifactId>

+					<version>1.2.1</version>

+				</plugin>

+                <plugin>

+                    <groupId>org.eclipse.xtend</groupId>

+                    <artifactId>xtend-maven-plugin</artifactId>

+                    <version>${xtext.version}</version>

+                </plugin>

+                <plugin>

+                    <groupId>org.apache.maven.plugins</groupId>

+                    <artifactId>maven-resources-plugin</artifactId>

+                    <version>2.6</version>

+                    <configuration>

+                        <encoding>UTF-8</encoding>

+                    </configuration>

+                </plugin>

+                <plugin>

+                    <groupId>org.eclipse.tycho</groupId>

+                    <artifactId>tycho-compiler-plugin</artifactId>

+                    <version>${tycho-version}</version>

+                    <configuration>

+                        <optimize>true</optimize>

+                        <showWarnings>true</showWarnings>

+                        <!-- Tycho build using the project's JDT settings. -->

+                        <useProjectSettings>true</useProjectSettings>

+                    </configuration>

+                </plugin>

+                <plugin>

+                    <groupId>org.eclipse.tycho</groupId>

+                    <artifactId>tycho-maven-plugin</artifactId>

+                    <version>${tycho-version}</version>

+                    <extensions>true</extensions>

+                </plugin>

+                <plugin>

+                    <groupId>org.eclipse.tycho</groupId>

+                    <artifactId>target-platform-configuration</artifactId>

+                    <version>${tycho-version}</version>

+                    <configuration>

+                        <environments>

+                            <environment>

+                                <os>win32</os>

+                                <ws>win32</ws>

+                                <arch>x86_64</arch>

+                            </environment>

+                        </environments>

+                    </configuration>

+                </plugin>

+			</plugins>

+		</pluginManagement>

+	

+		<plugins>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-resources-plugin</artifactId>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-compiler-plugin</artifactId>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-maven-plugin</artifactId>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>target-platform-configuration</artifactId>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-p2-repository-plugin</artifactId>

+				<version>${tycho-version}</version>

+			</plugin>

+            <!-- Sources -->

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-source-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<executions>

+					<execution>

+						<id>plugin-source</id>

+						<goals>

+							<goal>plugin-source</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho.extras</groupId>

+				<artifactId>tycho-source-feature-plugin</artifactId>

+				<version>${tychoExtrasVersion}</version>

+				<executions>

+					<execution>

+						<id>source-feature</id>

+						<phase>package</phase>

+						<goals>

+							<goal>source-feature</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-dependency-plugin</artifactId>

+				<version>2.9</version>

+				<executions>

+					<execution>

+						<id>purge-local-dependencies</id>

+						<phase>process-sources</phase>

+						<goals>

+							<goal>purge-local-repository</goal>

+						</goals>

+						<configuration>

+							<includes>

+								<include>org.eclipse.papyrus</include>

+							</includes>

+							<verbose>true</verbose>

+							<resolutionFuzziness>groupId</resolutionFuzziness>

+						</configuration>

+					</execution>

+				</executions>

+			</plugin>

+		</plugins>

+	</build>

+	

+	

+	<profiles>

+		

+		<profile>

+			<id>defaultProfile</id>

+			<build>

+				<plugins>

+					<plugin>

+						<groupId>org.eclipse.tycho</groupId>

+						<artifactId>tycho-p2-plugin</artifactId>

+						<version>${tycho-version}</version>

+						<executions>

+							<execution>

+								<id>attach-p2-metadata</id>

+								<phase>package</phase>

+								<goals>

+									<goal>p2-metadata</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+				</plugins>

+			</build>

+			<activation>

+				<activeByDefault>true</activeByDefault>

+			</activation>

+		</profile>	  

+	  

+		<profile>

+	  		<id>packAndSign</id> <!-- Stable release profile. Takes +30min. Eclipse servers only -->

+		  	<!-- Pack200 -->

+		  	<build>

+			  	<plugins>

+					<plugin>

+						<groupId>org.eclipse.tycho.extras</groupId>

+						<artifactId>tycho-pack200a-plugin</artifactId>

+						<version>${tychoExtrasVersion}</version>

+						<executions>

+							<execution>

+								<id>pack200-normalize</id>

+								<goals>

+									<goal>normalize</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+					<plugin>

+						<groupId>org.eclipse.cbi.maven.plugins</groupId>

+						<artifactId>eclipse-jarsigner-plugin</artifactId>

+						<version>1.0.5</version>

+						<executions>

+							<execution>

+						    	<id>sign</id>

+						    	<goals>

+						    		<goal>sign</goal>

+						    	</goals>

+						  	</execution>

+						</executions>

+		            </plugin>

+					<plugin>

+						<groupId>org.eclipse.tycho.extras</groupId>

+						<artifactId>tycho-pack200b-plugin</artifactId>

+						<version>${tychoExtrasVersion}</version>

+						<executions>

+							<execution>

+								<id>pack200-pack</id>

+								<goals>

+									<goal>pack</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+					<plugin>

+						<groupId>org.eclipse.tycho</groupId>

+						<artifactId>tycho-p2-plugin</artifactId>

+						<version>${tycho-version}</version>

+						<executions>

+							<execution>

+								<id>attach-p2-metadata</id>

+								<phase>package</phase>

+								<goals>

+									<goal>p2-metadata</goal>

+								</goals>

+							</execution>

+						</executions>

+						<configuration>

+							<defaultP2Metadata>false</defaultP2Metadata>

+						</configuration>

+					</plugin>

+				</plugins>

+			</build>

+	        <activation>

+	        	<property>

+	        		<name>SIGN</name>

+	        		<value>true</value>

+	        	</property>

+	        </activation>

+		</profile>

+	  

+	  

+    	<profile>

+	        <id>pack</id> <!-- Nightly profile. Artifacts can be consumed, but are not signed -->

+	        <build>

+	          <plugins>

+	            <!-- Pack200 -->

+				<plugin>

+					<groupId>org.eclipse.tycho.extras</groupId>

+					<artifactId>tycho-pack200b-plugin</artifactId>

+					<version>${tychoExtrasVersion}</version>

+					<executions>

+						<execution>

+							<id>pack200-pack</id>

+							<goals>

+								<goal>pack</goal>

+							</goals>

+						</execution>

+					</executions>

+				</plugin>

+				<plugin>

+					<groupId>org.eclipse.tycho</groupId>

+					<artifactId>tycho-p2-plugin</artifactId>

+					<version>${tycho-version}</version>

+					<executions>

+						<execution>

+							<id>attach-p2-metadata</id>

+							<phase>package</phase>

+							<goals>

+								<goal>p2-metadata</goal>

+							</goals>

+						</execution>

+					</executions>

+					<configuration>

+						<defaultP2Metadata>false</defaultP2Metadata>

+					</configuration>

+				</plugin>

+	          </plugins>

+	        </build>

+	        <activation>

+	        	<property>

+	        		<name>SIGN</name>

+	        		<value>false</value>

+	        	</property>

+	        </activation>

+    	</profile>

+      

+        <!-- profile dedicated to activate the repository linked to nightly artifacts, useful for daily life of developers -->

+		<profile>

+			<id>nightly</id>

+			<repositories>

+				<repository>

+					<id>papyrus</id>

+					<layout>p2</layout>

+					<url>${papyrus.repo.main}</url>

+					<releases>

+						<enabled>true</enabled>

+						<updatePolicy>daily</updatePolicy>

+						<checksumPolicy>warn</checksumPolicy>

+					</releases>

+					<snapshots>

+						<enabled>true</enabled>

+						<updatePolicy>daily</updatePolicy>

+						<checksumPolicy>fail</checksumPolicy>

+					</snapshots>

+				</repository>

+			</repositories>

+			<activation>

+				<property>

+					<name>env</name>

+					<value>devnightly</value>

+				</property>

+				<activeByDefault>false</activeByDefault>

+			</activation>

+		</profile>

+    </profiles>

+</project>

diff --git a/releng/top-pom-main-tests.xml b/releng/top-pom-main-tests.xml
index 8dd18097a3d..b3221109e09 100644
--- a/releng/top-pom-main-tests.xml
+++ b/releng/top-pom-main-tests.xml
@@ -1,365 +1,367 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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>
-	<groupId>org.eclipse.papyrus</groupId>
-	<artifactId>org.eclipse.papyrus</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<modules>
-		<module>../tests/junit/plugins/core/org.eclipse.papyrus.tests</module>
-        <module>../tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.feature</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.nattable.feature</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.diagram.feature</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.feature</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.nattable.feature</module>
-        <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.assistants.feature</module>
-        <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.decoratormodel.feature</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.tools.feature</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.views.feature</module>
-	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.uml.textedit.tests.feature</module>
-		<module>../tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests</module>
-		<module>../tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests</module>
-		<module>../tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests</module>
-		<module>../tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests</module>
-		<module>../tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests</module>
-		<module>../tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests</module>
-		<module>../tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests</module>
-        <module>../tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests</module>
-		<module>../tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests</module>
-		<module>../tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests</module>
-		<module>../tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests</module>
-		<module>../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests</module>
-		<module>../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests</module>
-		<module>../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests</module>
-        <module>../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests</module>
-        <module>../tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests</module>
-        <module>../tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests</module>
-		<module>../tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests</module>
-		<module>../tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests</module>
-		<module>../tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests</module>
-		<module>../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests</module>
-		<module>../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests</module>
-		<module>../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests</module>
-		<module>../tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework</module>
-		<module>../tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils</module>
-		<module>../tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests</module>
-		<module>../tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests</module>
-		<module>../tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests</module>
-		<module>../tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests</module>
-		<module>../tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests</module>
-		<module>../tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests</module>
-		<module>../tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests</module>
-		<module>../tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests</module>
-		<module>../tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests</module>
-        <module>../tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests</module>
-        <module>../tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests</module>
-        <module>../tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests</module>
-        <module>../tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests</module>
-		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests</module>
-		<module>../tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests</module>
-		<module>../tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests</module>
-		<module>../tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests</module>
-		<module>../tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests</module>
-		<module>../tests/junit/plugins/uml/org.eclipse.papyrus.search.tests</module>
-        <module>../tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests</module>
-		<module>../tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests</module>
-		<module>../tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests</module>
-		<module>../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests</module>
-		<module>../tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests</module>
-		<module>../tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests</module>
-		<module>../tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests</module>
-		<module>../tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests</module>
-		<module>../tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests</module>
-		<module>../tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests</module>
-		<module>../tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests</module>
-		<module>../tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests</module>
-	</modules>
-	<properties>
-		<tycho-version>0.22.0</tycho-version>
-		<tychoExtrasVersion>0.22.0</tychoExtrasVersion>
-		<testConfig>CI_TESTS_CONFIG</testConfig> <!-- See org.eclipse.papyrus.junit.framework.classification.ClassificationConfig -->
-        <testSuitePlugin>org.eclipse.papyrus.tests</testSuitePlugin>
-        <testSuiteClass>org.eclipse.papyrus.tests.AllTests</testSuiteClass>
-	</properties>
-	<repositories>
-		<repository>
-			<id>papyrus-main</id>
-			<layout>p2</layout>
-			<url>${papyrus.repo.main}</url>
-		</repository>
-		<repository>
-			<id>emf-compare</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF COMPARE",0) -->
-			<url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201502031424</url>
-		</repository>
-		<repository>
-			<id>emf-emf</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF (Core)",0) -->
-			<url>http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/</url>
-		</repository>
-		<repository>
-			<id>emft-mwe[0]</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMFT MWE",0) -->
-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201502030703/mwe</url>
-		</repository>
-		<repository>
-			<id>emft-mwe[1]</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMFT MWE",1) -->
-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201502030947/mwe2lang</url>
-		</repository>
-		<repository>
-			<id>emf-transaction</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF TRANSACTION",0) -->
-			<url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201502040445</url>
-		</repository>
-		<repository>
-			<id>emf-validation</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF VALIDATION",0) -->
-			<url>http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201502040400</url>
-		</repository>
-		<repository>
-			<id>ep</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Eclipse",0) -->
-			<url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M5a-201502031300/</url>
-		</repository>
-		<repository>
-			<id>gef</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GEF",0) -->
-			<url>http://download.eclipse.org/tools/gef/updates/milestones</url>
-		</repository>
-		<repository>
-			<id>gmp-gmf-notation</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Notation",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201502040339</url>
-		</repository>
-		<repository>
-			<id>gmp-gmf-runtime</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Runtime",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201502040533</url>
-		</repository>
-		<repository>
-			<id>gmf-tooling</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Tooling",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/M4</url>
-		</repository>
-		<repository>
-			<id>m2t-acceleo</id>
-			<layout>p2</layout>
-			<!-- updateFrom("M2T ACCELEO",0) -->
-			<url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201502030917</url>
-		</repository>
-		<repository>
-			<id>m2t-xpand</id>
-			<layout>p2</layout>
-			<!-- updateFrom("M2T XPAND",0) -->
-			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201502030723/</url>
-		</repository>
-		<repository>
-			<id>mdt-ocl</id>
-			<layout>p2</layout>
-			<!-- updateFrom("MDT OCL 6.0",0) -->
-			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/interim/6.0.0/</url>
-		</repository>
-		<repository>
-			<id>mdt-uml2</id>
-			<layout>p2</layout>
-			<!-- updateFrom("MDT UML2",0) -->
-			<url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.1-I-builds/</url>
-		</repository>
-		<repository>
-			<id>mmt-qvto</id>
-			<layout>p2</layout>
-			<!-- updateFrom("QVT Operational",0) -->
-			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201502021150</url>
-		</repository>
-		<repository>
-			<id>nattable</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>
-		</repository>
-		<repository>
-			<id>orbit</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository</url>
-		</repository>
-		<repository>
-			<id>subversive</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Subversive",0) -->
-			<url>http://download.eclipse.org/technology/subversive/2.0/mars-site/</url>
-		</repository>
-		<repository>
-			<id>tmf-xtext</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Xtext, Xtend",0) -->
-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201502030924/</url>
-		</repository>
-		<repository>
-			<id>swtbot</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/technology/swtbot/snapshots</url>
-		</repository>
-		<repository>
-			<id>webtools</id>
-			<layout>p2</layout>
-			<!-- updateFrom("WebTools",0) -->
-			<url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M4-20141211000148/repository/</url>
-		</repository>
-		<repository>
-			<id>XWT</id>
-			<layout>p2</layout>
-			<!-- updateFrom("XWT",0) -->
-			<url>http://download.eclipse.org/xwt/release-1.1.0</url>
-		</repository>
-	</repositories>
-	<build>
-		<pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
-				<configuration>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-compiler-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<optimize>true</optimize>
-					<showWarnings>true</showWarnings>
-                    <!-- Tycho build using the project's JDT settings. -->
-                    <useProjectSettings>true</useProjectSettings>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-maven-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<extensions>true</extensions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					 <environments>
-						 <environment>
-							 <os>win32</os>
-							 <ws>win32</ws>
-							 <arch>x86</arch>
-						 </environment>
-						 <environment>
-							 <os>win32</os>
-							 <ws>win32</ws>
-							 <arch>x86_64</arch>
-						 </environment>
-						 <environment>
-							 <os>linux</os>
-							 <ws>gtk</ws>
-							 <arch>x86</arch>
-						 </environment>
-						 <environment>
-							 <os>linux</os>
-							 <ws>gtk</ws>
-							 <arch>x86_64</arch>
-						 </environment>
-						 <environment>
-							 <os>macosx</os>
-							 <ws>cocoa</ws>
-							 <arch>x86_64</arch>
-						 </environment>
-					 </environments>
-				</configuration>
-			</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho-version}</version>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<testSuite>${testSuitePlugin}</testSuite>
-					<testClass>${testSuiteClass}</testClass>
-					<useUIHarness>true</useUIHarness>
-					<useUIThread>true</useUIThread>
-					<testFailureIgnore>true</testFailureIgnore>
-					<argLine>-Xms512m -Xmx2048m -XX:MaxPermSize=512M -XX:SoftRefLRUPolicyMSPerMB=100</argLine>
-					<appArgLine>-testConfig=${testConfig}</appArgLine>
-					<product>org.eclipse.sdk.ide</product>
-					
-					<dependencies>
-			            <dependency>
-			              <type>p2-installable-unit</type>
-			              <artifactId>org.eclipse.sdk.feature.group</artifactId>
-			              <version>0.0.0</version>
-			            </dependency>
-			            <dependency>
-			              <type>p2-installable-unit</type>
-			              <artifactId>org.eclipse.papyrus.sdk.feature.feature.group</artifactId>
-			              <version>0.0.0</version>
-			            </dependency>
-		            </dependencies>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<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>

+	<groupId>org.eclipse.papyrus</groupId>

+	<artifactId>org.eclipse.papyrus</artifactId>

+	<version>1.1.0-SNAPSHOT</version>

+	<packaging>pom</packaging>

+	<modules>

+		<module>../tests/junit/plugins/core/org.eclipse.papyrus.tests</module>

+        <module>../tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.feature</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.nattable.feature</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.diagram.feature</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.feature</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.nattable.feature</module>

+        <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.assistants.feature</module>

+        <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.decoratormodel.feature</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.tools.feature</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.tests.views.feature</module>

+	    <module>../features/papyrus-tests-features/org.eclipse.papyrus.uml.textedit.tests.feature</module>

+		<module>../tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests</module>

+		<module>../tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests</module>

+		<module>../tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests</module>

+		<module>../tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests</module>

+		<module>../tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests</module>

+		<module>../tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests</module>

+		<module>../tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests</module>

+		<module>../tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests</module>

+        <module>../tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests</module>

+		<module>../tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests</module>

+		<module>../tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests</module>

+		<module>../tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests</module>

+		<module>../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests</module>

+		<module>../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests</module>

+		<module>../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests</module>

+        <module>../tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests</module>

+        <module>../tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests</module>

+        <module>../tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests</module>

+		<module>../tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests</module>

+		<module>../tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests</module>

+		<module>../tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests</module>

+		<module>../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests</module>

+		<module>../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests</module>

+		<module>../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests</module>

+		<module>../tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework</module>

+		<module>../tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils</module>

+		<module>../tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests</module>

+		<module>../tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests</module>

+		<module>../tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests</module>

+		<module>../tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests</module>

+		<module>../tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests</module>

+		<module>../tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests</module>

+		<module>../tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests</module>

+		<module>../tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests</module>

+		<module>../tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests</module>

+        <module>../tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests</module>

+        <module>../tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests</module>

+        <module>../tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests</module>

+        <module>../tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests</module>

+		<module>../tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests</module>

+		<module>../tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests</module>

+		<module>../tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests</module>

+		<module>../tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests</module>

+		<module>../tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests</module>

+		<module>../tests/junit/plugins/uml/org.eclipse.papyrus.search.tests</module>

+        <module>../tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests</module>

+		<module>../tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests</module>

+		<module>../tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests</module>

+		<module>../tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests</module>

+		<module>../tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests</module>

+		<module>../tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests</module>

+		<module>../tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests</module>

+		<module>../tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests</module>

+		<module>../tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests</module>

+		<module>../tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests</module>

+		<module>../tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests</module>

+		<module>../tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests</module>

+	</modules>

+	<properties>

+		<tycho-version>0.22.0</tycho-version>

+		<tychoExtrasVersion>0.22.0</tychoExtrasVersion>

+		<testConfig>CI_TESTS_CONFIG</testConfig> <!-- See org.eclipse.papyrus.junit.framework.classification.ClassificationConfig -->

+        <testSuitePlugin>org.eclipse.papyrus.tests</testSuitePlugin>

+        <testSuiteClass>org.eclipse.papyrus.tests.AllTests</testSuiteClass>

+	</properties>

+	<repositories>

+		<repository>

+			<id>papyrus-main</id>

+			<layout>p2</layout>

+			<url>${papyrus.repo.main}</url>

+		</repository>

+		<repository>

+			<id>emf-compare</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF COMPARE",0) -->

+			<url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201503131342</url>

+		</repository>

+		<repository>

+			<id>emf-emf</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF (Core)",0) -->

+			<url>http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/</url>

+		</repository>

+		<repository>

+			<id>emft-mwe[0]</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMFT MWE",0) -->

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240644/mwe</url>

+		</repository>

+		<repository>

+			<id>emft-mwe[1]</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMFT MWE",1) -->

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240833/mwe2lang</url>

+		</repository>

+		<repository>

+			<id>emf-transaction</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF TRANSACTION",0) -->

+			<url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201503250534</url>

+		</repository>

+		<repository>

+			<id>emf-validation</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF VALIDATION",0) -->

+			<url>http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201503250348</url>

+		</repository>

+		<repository>

+			<id>ep</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Eclipse",0) -->

+			<url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M6-201503200800/</url>

+		</repository>

+		<repository>

+			<id>gef</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GEF",0) -->

+			<url>http://download.eclipse.org/tools/gef/updates/milestones</url>

+		</repository>

+		<repository>

+			<id>gmp-gmf-notation</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Notation",0) -->

+			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201503250354</url>

+		</repository>

+		<repository>

+			<id>gmp-gmf-runtime</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Runtime",0) -->

+			<url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201502040533</url>

+		</repository>

+		<repository>

+			<id>gmf-tooling</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Tooling",0) -->

+			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/M4</url>

+		</repository>

+		<repository>

+			<id>m2t-acceleo</id>

+			<layout>p2</layout>

+			<!-- updateFrom("M2T ACCELEO",0) -->

+			<url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201503131323</url>

+		</repository>

+		<repository>

+			<id>m2t-xpand</id>

+			<layout>p2</layout>

+			<!-- updateFrom("M2T XPAND",0) -->

+			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201503240650/</url>

+		</repository>

+		<repository>

+			<id>mdt-ocl</id>

+			<layout>p2</layout>

+			<!-- updateFrom("MDT OCL 6.0",0) -->

+			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.0.0/S201503240634</url>

+		</repository>

+		<repository>

+			<id>mdt-uml2</id>

+			<layout>p2</layout>

+			<!-- updateFrom("MDT UML2",0) -->

+			<url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.1milestones</url>

+		</repository>

+		<repository>

+			<id>mmt-qvto</id>

+			<layout>p2</layout>

+			<!-- updateFrom("QVT Operational",0) -->

+			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201503241740</url>

+		</repository>

+		<repository>

+			<id>nattable</id>

+			<layout>p2</layout>

+			<url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>

+		</repository>

+		<repository>

+			<id>orbit</id>

+			<layout>p2</layout>

+			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository</url>

+		</repository>

+		<repository>

+			<id>subversive</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Subversive",0) -->

+			<url>http://download.eclipse.org/technology/subversive/3.0/mars-site/</url>

+		</repository>

+		<repository>

+			<id>tmf-xtext</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Xtext, Xtend",0) -->

+			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.1/</url>

+		</repository>

+		<repository>

+			<id>swtbot</id>

+			<layout>p2</layout>

+			<url>http://download.eclipse.org/technology/swtbot/snapshots</url>

+		</repository>

+		<repository>

+			<id>webtools</id>

+			<layout>p2</layout>

+			<!-- updateFrom("WebTools",0) -->

+			<url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M6-20150324000117/repository/</url>

+		</repository>

+		<repository>

+			<id>XWT</id>

+			<layout>p2</layout>

+			<!-- updateFrom("XWT",0) -->

+			<url>http://download.eclipse.org/xwt/release-1.1.0</url>

+		</repository>

+	</repositories>

+	<build>

+		<pluginManagement>

+		<plugins>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-resources-plugin</artifactId>

+				<version>2.6</version>

+				<configuration>

+					<encoding>UTF-8</encoding>

+				</configuration>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-compiler-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<configuration>

+					<optimize>true</optimize>

+					<showWarnings>true</showWarnings>

+                    <!-- Tycho build using the project's JDT settings. -->

+                    <useProjectSettings>true</useProjectSettings>

+				</configuration>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-maven-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<extensions>true</extensions>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>target-platform-configuration</artifactId>

+				<version>${tycho-version}</version>

+				<configuration>

+					 <environments>

+						 <environment>

+							 <os>win32</os>

+							 <ws>win32</ws>

+							 <arch>x86</arch>

+						 </environment>

+						 <environment>

+							 <os>win32</os>

+							 <ws>win32</ws>

+							 <arch>x86_64</arch>

+						 </environment>

+						 <environment>

+							 <os>linux</os>

+							 <ws>gtk</ws>

+							 <arch>x86</arch>

+						 </environment>

+						 <environment>

+							 <os>linux</os>

+							 <ws>gtk</ws>

+							 <arch>x86_64</arch>

+						 </environment>

+						 <environment>

+							 <os>macosx</os>

+							 <ws>cocoa</ws>

+							 <arch>x86_64</arch>

+						 </environment>

+					 </environments>

+				</configuration>

+			</plugin>

+			</plugins>

+		</pluginManagement>

+		<plugins>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-resources-plugin</artifactId>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-compiler-plugin</artifactId>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-maven-plugin</artifactId>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>target-platform-configuration</artifactId>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-p2-repository-plugin</artifactId>

+				<version>${tycho-version}</version>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-surefire-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<configuration>

+					<testSuite>${testSuitePlugin}</testSuite>

+					<testClass>${testSuiteClass}</testClass>

+					<useUIHarness>true</useUIHarness>

+					<useUIThread>true</useUIThread>

+					<testFailureIgnore>true</testFailureIgnore>

+					<argLine>-Xms512m -Xmx2048m -XX:MaxPermSize=512M -XX:SoftRefLRUPolicyMSPerMB=100</argLine>

+					<appArgLine>-testConfig=${testConfig}</appArgLine>

+					<product>org.eclipse.sdk.ide</product>

+					

+					<dependencies>

+			            <dependency>

+			              <type>p2-installable-unit</type>

+			              <artifactId>org.eclipse.sdk.feature.group</artifactId>

+			              <version>0.0.0</version>

+			            </dependency>

+			            <dependency>

+			              <type>p2-installable-unit</type>

+			              <artifactId>org.eclipse.papyrus.sdk.feature.feature.group</artifactId>

+			              <version>0.0.0</version>

+			            </dependency>

+		            </dependencies>

+				</configuration>

+			</plugin>

+		</plugins>

+	</build>

+</project>

diff --git a/releng/top-pom-main.xml b/releng/top-pom-main.xml
index 569267f0047..cb10069f60d 100644
--- a/releng/top-pom-main.xml
+++ b/releng/top-pom-main.xml
@@ -1,851 +1,878 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus</groupId>
-	<artifactId>org.eclipse.papyrus</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<modules>
-	    <module>../features/papyrus-main-features/org.eclipse.papyrus.customization.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.doc.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.editor.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.sdk.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.sysml.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature</module>
-        <module>../features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature</module>
-        <module>../features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.views.search.feature</module>
-		<module>../features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature</module>
-		<module>../plugins/doc/org.eclipse.papyrus.cdo.ui.doc</module>
-		<module>../plugins/doc/org.eclipse.papyrus.copypaste.ui.doc</module>
-		<module>../plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc</module>
-		<module>../plugins/doc/org.eclipse.papyrus.layers.documentation</module>
-        <module>../plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc</module>
-        <module>../plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc</module>
-        <module>../plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc</module>
-		<module>../plugins/customization/org.eclipse.papyrus.customization.palette</module>
-		<module>../plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration</module>
-		<module>../plugins/customization/org.eclipse.papyrus.customization.properties</module>
-		<module>../plugins/customization/org.eclipse.papyrus.customization.properties.generation</module>
-		<module>../plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt</module>
-		<module>../plugins/doc/org.eclipse.papyrus.dsml.validation.doc</module>
-		<module>../plugins/editor/org.eclipse.papyrus.editor</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.common.core</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.common.ui</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.custom.core</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.java</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.core</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.swt</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.ui</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.widgets</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors</module>
-		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.constraints</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.constraints.edit</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.constraints.editor</module>
-		<module>../plugins/infra/core/org.eclipse.papyrus.infra.core</module>
-		<module>../plugins/infra/core/org.eclipse.papyrus.infra.core.log</module>
-		<module>../plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer</module>
-		<module>../plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor</module>
-		<module>../plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di</module>
-		<module>../plugins/infra/discovery/org.eclipse.papyrus.infra.discovery</module>
-		<module>../plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui</module>
-		<module>../plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.doc</module>
-		<module>../plugins/infra/emf/org.eclipse.papyrus.infra.emf</module>
-		<module>../plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance</module>
-		<module>../plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common</module>
-		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable</module>
-		<module>../plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.extendedtypes</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes</module>
-        <module>../plugins/infra/org.eclipse.papyrus.infra.filters</module>
-        <module>../plugins/infra/org.eclipse.papyrus.infra.filters.edit</module>
-		<module>../plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations</module>
-        <module>../plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant</module>
-        <module>../plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit</module>
-        <module>../plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor</module>
-        <module>../plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common</module>
-		<module>../plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode</module>
-		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css</module>
-		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration</module>
-		<module>../plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette</module>
-		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties</module>
-		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme</module>
-		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext</module>
-		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher</module>
-		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.hyperlink</module>
-		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable</module>
-		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common</module>
-		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode</module>
-		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model</module>
-		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit</module>
-		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor</module>
-		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer</module>
-		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties</module>
-		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config</module>
-		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.newchild</module>
-		<module>../plugins/doc/org.eclipse.papyrus.infra.newchild.doc</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.newchild.edit</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.onefile</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.psf</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.decoration</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.edit</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.localizer</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.navigation</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.openelement</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.semantic</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.validation</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch</module>
-		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.tools</module>
-		<module>../plugins/infra/org.eclipse.papyrus.infra.ui.resources</module>
-		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration</module>
-		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit</module>
-		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor</module>
-		<module>../plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc</module>
-		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010</module>
-		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit</module>
-		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy</module>
-		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences</module>
-		<module>../plugins/infra/widget/org.eclipse.papyrus.infra.widgets</module>
-		<module>../plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox</module>
-		<module>../plugins/doc/org.eclipse.papyrus.moka.doc</module>
-		<module>../plugins/sysml/org.eclipse.papyrus.sysml</module>
-		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition</module>
-		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common</module>
-		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css</module>
-		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock</module>
-		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric</module>
-		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement</module>
-		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui</module>
-		<module>../plugins/sysml/org.eclipse.papyrus.sysml.edit</module>
-		<module>../plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer</module>
-		<module>../plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable</module>
-		<module>../plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation</module>
-		<module>../plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config</module>
-		<module>../plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu</module>
-		<module>../plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement</module>
-		<module>../plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config</module>
-		<module>../plugins/sysml/properties/org.eclipse.papyrus.sysml.properties</module>
-		<module>../plugins/sysml/org.eclipse.papyrus.sysml.service.types</module>
-		<module>../plugins/uml/alf/org.eclipse.papyrus.uml.alf</module>
-		<module>../plugins/uml/alf/org.eclipse.papyrus.uml.alf.common</module>
-		<module>../plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui</module>
-		<module>../plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui</module>
-        <module>../plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator</module>
-        <module>../plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui</module>
-        <module>../plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator</module>
-        <module>../plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui</module>
-        <module>../plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator</module>
-        <module>../plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.appearance</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.commands</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.controlmode.profile</module>
-        <module>../plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel</module>
-        <module>../plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode</module>
-        <module>../plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties</module>
-        <module>../plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common</module>
-		<module>../plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile</module>
-		<module>../plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase</module>
-		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards</module>
-		<module>../plugins/doc/org.eclipse.papyrus.uml.doc</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.documentation.profile</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.extensionpoints</module>
-        <module>../plugins/uml/org.eclipse.papyrus.uml.filters</module>
-        <module>../plugins/uml/org.eclipse.papyrus.uml.filters.edit</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.icons</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.import</module>
-		<module>../plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer</module>
-		<module>../plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.modelrepair</module>
-		<module>../plugins/uml/nattable/org.eclipse.papyrus.uml.nattable</module>
-		<module>../plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic</module>
-		<module>../plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config</module>
-		<module>../plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config</module>
-		<module>../plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu</module>
-		<module>../plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.navigation</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.perspective</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.profile</module>
-		<module>../plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter</module>
-		<module>../plugins/uml/properties/org.eclipse.papyrus.uml.properties</module>
-		<module>../plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.search.ui</module>
-		<module>../plugins/doc/org.eclipse.papyrus.uml.search.ui.doc</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.service.types</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.service.validation</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.services.decoration</module>
-		<module>../plugins/uml/org.eclipse.papyrus.uml.templaterepository</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext</module>
-		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui</module>
-		<module>../plugins/uml/tools/org.eclipse.papyrus.uml.tools</module>
-		<module>../plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes</module>
-		<module>../plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils</module>
-		<module>../plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core</module>
-		<module>../plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui</module>
-		<module>../plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation</module>
-		<module>../plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer</module>
-		<module>../plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild</module>
-		<module>../plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading</module>
-		<module>../plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets</module>
-		<module>../plugins/views/properties/org.eclipse.papyrus.views.properties</module>
-		<module>../plugins/doc/org.eclipse.papyrus.views.properties.doc</module>
-		<module>../plugins/views/properties/org.eclipse.papyrus.views.properties.model</module>
-		<module>../plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit</module>
-		<module>../plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor</module>
-		<module>../plugins/views/org.eclipse.papyrus.views.search</module>
-		<module>../plugins/views/validation/org.eclipse.papyrus.views.validation</module>
-		<module>../plugins/team/org.eclipse.papyrus.team.svn</module>
-		<module>main</module>
-		<!-- Papyrus Sysml 1.4 -->
-		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14</module>
-		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition</module>
-		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock</module>
-		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric</module>
-		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement</module>
-		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit</module>
-		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types</module>
-		<!-- Papyrus examples -->
-		<module>../examples/core/org.eclipse.papyrus.example.core.lifecycleevents</module>
-		<module>../examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor</module>
-		<module>../examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor</module>
-		<module>../examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval</module>
-		<module>../examples/org.eclipse.papyrus.example.text.instance</module>
-		<module>../examples/org.eclipse.papyrus.example.uml.comment.editor.newresource</module>
-		<module>../examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource</module>
-		<module>../examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences</module>
-		<module>../examples/emf/org.eclipse.papyrus.outline.emftree</module>
-		<module>../examples/uml/org.eclipse.papyrus.thousandcreation</module>
-		<module>../examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation</module>	
-		
-		
-	</modules>
-	<properties>
-		<tycho-version>0.22.0</tycho-version>
-		<tychoExtrasVersion>0.22.0</tychoExtrasVersion>
-		<findbugs.version>2.5.3</findbugs.version>
-		<xtext.version>2.7.3</xtext.version>
-		<java.source.version>1.6</java.source.version>
-		<java.target.version>1.6</java.target.version>
-		<papyrus.eclipse.target>mars</papyrus.eclipse.target>
-	</properties>
-	<repositories>
-		<repository>
-			<id>emf-emf</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF (Core)",0) -->
-			<url>http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/</url>
-		</repository>
-		<repository>
-			<id>emft-mwe[0]</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMFT MWE",0) -->
-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201502030703/mwe</url>
-		</repository>
-		<repository>
-			<id>emft-mwe[1]</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMFT MWE",1) -->
-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201502030947/mwe2lang</url>
-		</repository>
-		<repository>
-			<id>emf-transaction</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF TRANSACTION",0) -->
-			<url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201502040445</url>
-		</repository>
-		<repository>
-			<id>emf-validation</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF VALIDATION",0) -->
-			<url>http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201502040400</url>
-		</repository>
-		<repository>
-			<id>ep</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Eclipse",0) -->
-			<url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M5a-201502031300/</url>
-		</repository>
-		<repository>
-			<id>gef</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GEF",0) -->
-			<url>http://download.eclipse.org/tools/gef/updates/milestones</url>
-		</repository>
-		<repository>
-			<id>gmp-gmf-notation</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Notation",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201502040339</url>
-		</repository>
-		<repository>
-			<id>gmp-gmf-runtime</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Runtime",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201502040533</url>
-		</repository>
-		<repository>
-			<id>gmf-tooling</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Tooling",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/M4</url>
-		</repository>
-		<repository>
-			<id>m2t-xpand</id>
-			<layout>p2</layout>
-			<!-- updateFrom("M2T XPAND",0) -->
-			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201502030723/</url>
-		</repository>
-		<repository>
-			<id>mdt-ocl</id>
-			<layout>p2</layout>
-			<!-- updateFrom("MDT OCL 6.0",0) -->
-			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/interim/6.0.0/</url>
-		</repository>
-		<repository>
-			<id>mdt-uml2</id>
-			<layout>p2</layout>
-			<!-- updateFrom("MDT UML2",0) -->
-			<url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.1-I-builds/</url>
-		</repository>
-		<repository>
-			<id>mmt-qvto</id>
-			<layout>p2</layout>
-			<!-- updateFrom("QVT Operational",0) -->
-			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201502021150</url>
-		</repository>
-		<repository>
-			<id>nattable</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>
-		</repository>
-        <repository>
-            <id>nebula-tablecombo</id>
-            <layout>p2</layout>
-            <url>http://download.eclipse.org/technology/nebula/archives/Q12015/release/</url>
-        </repository>
-		<repository>
-			<id>orbit</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository</url>
-		</repository>
-		<repository>
-			<id>tmf-xtext</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Xtext, Xtend",0) -->
-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201502030924/</url>
-		</repository>
-		<repository>
-			<id>webtools</id>
-			<layout>p2</layout>
-			<!-- updateFrom("WebTools",0) -->
-			<url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M4-20141211000148/repository/</url>
-		</repository>
-		<repository>
-			<id>XWT</id>
-			<layout>p2</layout>
-			<!-- updateFrom("XWT",0) -->
-			<url>http://download.eclipse.org/xwt/release-1.1.0</url>
-		</repository>
-		<repository>
-			<id>subversive</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Subversive",0) -->
-			<url>http://download.eclipse.org/technology/subversive/2.0/mars-site/</url>
-		</repository>		
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>org.eclipse.cbi.maven.plugins</id>
-			<name>Eclipse CBI</name>
-			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
-			 <releases>
-		     	<enabled>true</enabled>
-		     </releases>
-		     <snapshots>
-		     	<enabled>false</enabled>
-		     </snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-	<build>
-		<pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.2</version>
-					<configuration>
-						<source>${java.source.version}</source>
-						<target>${java.target.version}</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-clean-plugin</artifactId>
-					<version>2.6</version>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>build-helper-maven-plugin</artifactId>
-					<version>1.9.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>exec-maven-plugin</artifactId>
-					<version>1.2.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.xtend</groupId>
-					<artifactId>xtend-maven-plugin</artifactId>
-					<version>${xtext.version}</version>
-				</plugin>
-	            <plugin>
-	                <groupId>org.apache.maven.plugins</groupId>
-	                <artifactId>maven-resources-plugin</artifactId>
-	                <version>2.6</version>
-	                <configuration>
-	                    <encoding>UTF-8</encoding>
-	                </configuration>
-	            </plugin>
-	            <plugin>
-	                <groupId>org.eclipse.tycho</groupId>
-	                <artifactId>tycho-compiler-plugin</artifactId>
-	                <version>${tycho-version}</version>
-	                <configuration>
-	                    <optimize>true</optimize>
-	                    <showWarnings>true</showWarnings>
-	                    <!-- Tycho build using the project's JDT settings. -->
-	                    <useProjectSettings>true</useProjectSettings>
-	                </configuration>
-	            </plugin>
-	            <plugin>
-	                <groupId>org.eclipse.tycho</groupId>
-	                <artifactId>tycho-maven-plugin</artifactId>
-	                <version>${tycho-version}</version>
-	                <extensions>true</extensions>
-	            </plugin>
-	            <plugin>
-	                <groupId>org.eclipse.tycho</groupId>
-	                <artifactId>target-platform-configuration</artifactId>
-	                <version>${tycho-version}</version>
-	                <configuration>
-	                    <environments>
-	                        <environment>
-	                            <os>win32</os>
-	                            <ws>win32</ws>
-	                            <arch>x86_64</arch>
-	                        </environment>
-	                    </environments>
-	                </configuration>
-	            </plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho-version}</version>
-			</plugin>
-			<!-- Sources -->
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tychoExtrasVersion}</version>
-				<executions>
-					<execution>
-						<id>source-feature</id>
-						<phase>package</phase>
-						<goals>
-							<goal>source-feature</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<groupId>org.eclipse.papyrus</groupId>

+	<artifactId>org.eclipse.papyrus</artifactId>

+	<version>1.1.0-SNAPSHOT</version>

+	<packaging>pom</packaging>

+	<modules>

+	    <module>../features/papyrus-main-features/org.eclipse.papyrus.customization.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.doc.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.editor.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.sdk.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.sysml.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature</module>

+        <module>../features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature</module>

+        <module>../features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.views.search.feature</module>

+		<module>../features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature</module>

+		<module>../plugins/doc</module>

+		<module>../plugins/customization/org.eclipse.papyrus.customization.palette</module>

+		<module>../plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration</module>

+		<module>../plugins/customization/org.eclipse.papyrus.customization.properties</module>

+		<module>../plugins/customization/org.eclipse.papyrus.customization.properties.generation</module>

+		<module>../plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt</module>

+		<module>../plugins/editor/org.eclipse.papyrus.editor</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.common.core</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.common.ui</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.custom.core</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.java</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.core</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.swt</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.util.ui</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.widgets</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors</module>

+		<module>../plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.ui</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.constraints</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.constraints.edit</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.constraints.editor</module>

+		<module>../plugins/infra/core/org.eclipse.papyrus.infra.core</module>

+		<module>../plugins/infra/core/org.eclipse.papyrus.infra.core.log</module>

+		<module>../plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer</module>

+		<module>../plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor</module>

+		<module>../plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di</module>

+		<module>../plugins/infra/discovery/org.eclipse.papyrus.infra.discovery</module>

+		<module>../plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui</module>

+		<module>../plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu</module>

+		<module>../plugins/infra/emf/org.eclipse.papyrus.infra.emf</module>

+		<module>../plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance</module>

+		<module>../plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common</module>

+		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable</module>

+		<module>../plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.extendedtypes</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes</module>

+        <module>../plugins/infra/org.eclipse.papyrus.infra.filters</module>

+        <module>../plugins/infra/org.eclipse.papyrus.infra.filters.edit</module>

+		<module>../plugins/uml/tools/org.eclipse.papyrus.uml.tools.elementtypesconfigurations</module>

+        <module>../plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant</module>

+        <module>../plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit</module>

+        <module>../plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor</module>

+        <module>../plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode</module>

+		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css</module>

+		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette</module>

+		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties</module>

+		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme</module>

+		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext</module>

+		<module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher</module>

+		<module>../plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.hyperlink</module>

+		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable</module>

+		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common</module>

+		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode</module>

+		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model</module>

+		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit</module>

+		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor</module>

+		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer</module>

+		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties</module>

+		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config</module>

+		<module>../plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.newchild</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.newchild.edit</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.onefile</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.psf</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.decoration</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.edit</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.localizer</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.navigation</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.openelement</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.semantic</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.validation</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch</module>

+		<module>../plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.tools</module>

+		<module>../plugins/infra/org.eclipse.papyrus.infra.ui.resources</module>

+		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration</module>

+		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit</module>

+		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor</module>

+		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010</module>

+		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit</module>

+		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy</module>

+		<module>../plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences</module>

+		<module>../plugins/infra/widget/org.eclipse.papyrus.infra.widgets</module>

+		<module>../plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox</module>

+		<module>../plugins/sysml/org.eclipse.papyrus.sysml</module>

+		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition</module>

+		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common</module>

+		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css</module>

+		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock</module>

+		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric</module>

+		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement</module>

+		<module>../plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui</module>

+		<module>../plugins/sysml/org.eclipse.papyrus.sysml.edit</module>

+		<module>../plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer</module>

+		<module>../plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable</module>

+		<module>../plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation</module>

+		<module>../plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config</module>

+		<module>../plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu</module>

+		<module>../plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement</module>

+		<module>../plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config</module>

+		<module>../plugins/sysml/properties/org.eclipse.papyrus.sysml.properties</module>

+		<module>../plugins/sysml/org.eclipse.papyrus.sysml.service.types</module>

+		<module>../plugins/uml/alf/org.eclipse.papyrus.uml.alf</module>

+		<module>../plugins/uml/alf/org.eclipse.papyrus.uml.alf.common</module>

+		<module>../plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui</module>

+		<module>../plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui</module>

+        <module>../plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator</module>

+        <module>../plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui</module>

+        <module>../plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator</module>

+        <module>../plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui</module>

+        <module>../plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator</module>

+        <module>../plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.appearance</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.commands</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.controlmode.profile</module>

+        <module>../plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel</module>

+        <module>../plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode</module>

+        <module>../plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties</module>

+        <module>../plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase</module>

+		<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.documentation.profile</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.extensionpoints</module>

+        <module>../plugins/uml/org.eclipse.papyrus.uml.filters</module>

+        <module>../plugins/uml/org.eclipse.papyrus.uml.filters.edit</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.icons</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.import</module>

+		<module>../plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer</module>

+		<module>../plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.modelrepair</module>

+		<module>../plugins/uml/nattable/org.eclipse.papyrus.uml.nattable</module>

+		<module>../plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic</module>

+		<module>../plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config</module>

+		<module>../plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config</module>

+		<module>../plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu</module>

+		<module>../plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.navigation</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.perspective</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.profile</module>

+		<module>../plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter</module>

+		<module>../plugins/uml/properties/org.eclipse.papyrus.uml.properties</module>

+		<module>../plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.search.ui</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.service.types</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.service.validation</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.services.decoration</module>

+		<module>../plugins/uml/org.eclipse.papyrus.uml.templaterepository</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext</module>

+		<module>../plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui</module>

+		<module>../plugins/uml/tools/org.eclipse.papyrus.uml.tools</module>

+		<module>../plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes</module>

+		<module>../plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils</module>

+		<module>../plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core</module>

+		<module>../plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui</module>

+		<module>../plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation</module>

+		<module>../plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer</module>

+		<module>../plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild</module>

+		<module>../plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading</module>

+		<module>../plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets</module>

+		<module>../plugins/views/properties/org.eclipse.papyrus.views.properties</module>

+		<module>../plugins/views/properties/org.eclipse.papyrus.views.properties.model</module>

+		<module>../plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit</module>

+		<module>../plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor</module>

+		<module>../plugins/views/org.eclipse.papyrus.views.search</module>

+		<module>../plugins/views/validation/org.eclipse.papyrus.views.validation</module>

+		<module>../plugins/team/org.eclipse.papyrus.team.svn</module>

+		<module>main</module>

+		<!-- Papyrus Sysml 1.4 -->

+		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14</module>

+		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.ui</module>

+		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common</module>

+		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition</module>

+		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock</module>

+		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric</module>

+		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement</module>

+		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.edit</module>

+		<module>../plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types</module>

+		<!-- Papyrus examples -->

+		<module>../examples/core/org.eclipse.papyrus.example.core.lifecycleevents</module>

+		<module>../examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor</module>

+		<module>../examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor</module>

+		<module>../examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval</module>

+		<module>../examples/org.eclipse.papyrus.example.text.instance</module>

+		<module>../examples/org.eclipse.papyrus.example.uml.comment.editor.newresource</module>

+		<module>../examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource</module>

+		<module>../examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences</module>

+		<module>../examples/emf/org.eclipse.papyrus.outline.emftree</module>

+		<module>../examples/uml/org.eclipse.papyrus.thousandcreation</module>

+		<module>../examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation</module>	

+		

+		

+	</modules>

+	<properties>

+		<tycho-version>0.22.0</tycho-version>

+		<tychoExtrasVersion>0.22.0</tychoExtrasVersion>

+		<findbugs.version>2.5.3</findbugs.version>

+		<xtext.version>2.7.3</xtext.version>

+		<java.source.version>1.6</java.source.version>

+		<java.target.version>1.6</java.target.version>

+		<papyrus.eclipse.target>mars</papyrus.eclipse.target>

+		<mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>

+	</properties>

+	<repositories>

+		<repository>

+			<id>emf-emf</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF (Core)",0) -->

+			<url>http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/</url>

+		</repository>

+		<repository>

+			<id>emft-mwe[0]</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMFT MWE",0) -->

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240644/mwe</url>

+		</repository>

+		<repository>

+			<id>emft-mwe[1]</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMFT MWE",1) -->

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240833/mwe2lang</url>

+		</repository>

+		<repository>

+			<id>emf-transaction</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF TRANSACTION",0) -->

+			<url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201503250534</url>

+		</repository>

+		<repository>

+			<id>emf-validation</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF VALIDATION",0) -->

+			<url>http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201503250348</url>

+		</repository>

+		<repository>

+			<id>ep</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Eclipse",0) -->

+			<url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M6-201503200800/</url>

+		</repository>

+		<repository>

+			<id>gef</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GEF",0) -->

+			<url>http://download.eclipse.org/tools/gef/updates/milestones</url>

+		</repository>

+		<repository>

+			<id>gmp-gmf-notation</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Notation",0) -->

+			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201503250354</url>

+		</repository>

+		<repository>

+			<id>gmp-gmf-runtime</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Runtime",0) -->

+			<url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201502040533</url>

+		</repository>

+		<repository>

+			<id>gmf-tooling</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Tooling",0) -->

+			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/M4</url>

+		</repository>

+		<repository>

+			<id>m2t-xpand</id>

+			<layout>p2</layout>

+			<!-- updateFrom("M2T XPAND",0) -->

+			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201503240650/</url>

+		</repository>

+		<repository>

+			<id>mdt-ocl</id>

+			<layout>p2</layout>

+			<!-- updateFrom("MDT OCL 6.0",0) -->

+			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.0.0/S201503240634</url>

+		</repository>

+		<repository>

+			<id>mdt-uml2</id>

+			<layout>p2</layout>

+			<!-- updateFrom("MDT UML2",0) -->

+			<url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.1milestones</url>

+		</repository>

+		<repository>

+			<id>mmt-qvto</id>

+			<layout>p2</layout>

+			<!-- updateFrom("QVT Operational",0) -->

+			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201503241740</url>

+		</repository>

+		<repository>

+			<id>nattable</id>

+			<layout>p2</layout>

+			<url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>

+		</repository>

+        <repository>

+            <id>nebula-tablecombo</id>

+            <layout>p2</layout>

+            <url>http://download.eclipse.org/technology/nebula/archives/Q12015/release/</url>

+        </repository>

+		<repository>

+			<id>orbit</id>

+			<layout>p2</layout>

+			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository</url>

+		</repository>

+		<repository>

+			<id>tmf-xtext</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Xtext, Xtend",0) -->

+			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.1/</url>

+		</repository>

+		<repository>

+			<id>webtools</id>

+			<layout>p2</layout>

+			<!-- updateFrom("WebTools",0) -->

+			<url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M6-20150324000117/repository/</url>

+		</repository>

+		<repository>

+			<id>XWT</id>

+			<layout>p2</layout>

+			<!-- updateFrom("XWT",0) -->

+			<url>http://download.eclipse.org/xwt/release-1.1.0</url>

+		</repository>

+		<repository>

+			<id>subversive</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Subversive",0) -->

+			<url>http://download.eclipse.org/technology/subversive/3.0/mars-site/</url>

+		</repository>		

+	</repositories>

+	<pluginRepositories>

+		<pluginRepository>

+			<id>org.eclipse.cbi.maven.plugins</id>

+			<name>Eclipse CBI</name>

+			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>

+			 <releases>

+		     	<enabled>true</enabled>

+		     </releases>

+		     <snapshots>

+		     	<enabled>false</enabled>

+		     </snapshots>

+		</pluginRepository>

+		<pluginRepository>

+			<id>eclipse.org-mylyn</id>

+			<!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->

+			<url>https://repo.eclipse.org/content/repositories/mylyn/</url>

+		</pluginRepository>

+	</pluginRepositories>

+	<build>

+		<pluginManagement>

+		<plugins>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+					<artifactId>maven-compiler-plugin</artifactId>

+					<version>3.2</version>

+					<configuration>

+						<source>${java.source.version}</source>

+						<target>${java.target.version}</target>

+					</configuration>

+				</plugin>

+				<plugin>

+					<groupId>org.apache.maven.plugins</groupId>

+					<artifactId>maven-clean-plugin</artifactId>

+					<version>2.6</version>

+				</plugin>

+				<plugin>

+					<groupId>org.codehaus.mojo</groupId>

+					<artifactId>build-helper-maven-plugin</artifactId>

+					<version>1.9.1</version>

+				</plugin>

+				<plugin>

+					<groupId>org.codehaus.mojo</groupId>

+					<artifactId>exec-maven-plugin</artifactId>

+					<version>1.2.1</version>

+				</plugin>

+				<plugin>

+					<groupId>org.eclipse.xtend</groupId>

+					<artifactId>xtend-maven-plugin</artifactId>

+					<version>${xtext.version}</version>

+				</plugin>

+	            <plugin>

+	                <groupId>org.apache.maven.plugins</groupId>

+	                <artifactId>maven-resources-plugin</artifactId>

+	                <version>2.6</version>

+	                <configuration>

+	                    <encoding>UTF-8</encoding>

+	                </configuration>

+	            </plugin>

+	            <plugin>

+	                <groupId>org.eclipse.tycho</groupId>

+	                <artifactId>tycho-compiler-plugin</artifactId>

+	                <version>${tycho-version}</version>

+	                <configuration>

+	                    <optimize>true</optimize>

+	                    <showWarnings>true</showWarnings>

+	                    <!-- Tycho build using the project's JDT settings. -->

+	                    <useProjectSettings>true</useProjectSettings>

+	                </configuration>

+	            </plugin>

+	            <plugin>

+	                <groupId>org.eclipse.tycho</groupId>

+	                <artifactId>tycho-maven-plugin</artifactId>

+	                <version>${tycho-version}</version>

+	                <extensions>true</extensions>

+	            </plugin>

+	            <plugin>

+	                <groupId>org.eclipse.tycho</groupId>

+	                <artifactId>target-platform-configuration</artifactId>

+	                <version>${tycho-version}</version>

+	                <configuration>

+	                    <environments>

+	                        <environment>

+	                            <os>win32</os>

+	                            <ws>win32</ws>

+	                            <arch>x86_64</arch>

+	                        </environment>

+	                    </environments>

+	                </configuration>

+	            </plugin>

+	            <plugin>

+					<groupId>org.eclipse.mylyn.docs</groupId>

+					<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>

+					<version>${mylyn.wikitext.version}</version>

+				</plugin>

+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->

+				<plugin>

+					<groupId>org.eclipse.m2e</groupId>

+					<artifactId>lifecycle-mapping</artifactId>

+					<version>1.0.0</version>

+					<configuration>

+						<lifecycleMappingMetadata>

+							<pluginExecutions>

+								<pluginExecution>

+									<pluginExecutionFilter>

+										<groupId>

+											org.eclipse.mylyn.docs

+										</groupId>

+										<artifactId>

+											org.eclipse.mylyn.wikitext.core.maven

+										</artifactId>

+										<versionRange>

+											[2.4.0-SNAPSHOT,)

+										</versionRange>

+										<goals>

+											<goal>eclipse-help</goal>

+										</goals>

+									</pluginExecutionFilter>

+									<action>

+										<execute/>

+									</action>

+								</pluginExecution>

+							</pluginExecutions>

+						</lifecycleMappingMetadata>

+					</configuration>

+				</plugin>

+			</plugins>

+		</pluginManagement>

+		<plugins>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-resources-plugin</artifactId>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-compiler-plugin</artifactId>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-maven-plugin</artifactId>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>target-platform-configuration</artifactId>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-p2-repository-plugin</artifactId>

+				<version>${tycho-version}</version>

+			</plugin>

+			<!-- Sources -->

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-source-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<executions>

+					<execution>

+						<id>plugin-source</id>

+						<goals>

+							<goal>plugin-source</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho.extras</groupId>

+				<artifactId>tycho-source-feature-plugin</artifactId>

+				<version>${tychoExtrasVersion}</version>

+				<executions>

+					<execution>

+						<id>source-feature</id>

+						<phase>package</phase>

+						<goals>

+							<goal>source-feature</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+		</plugins>

+	</build>

+	

 	<!--
 		No profile: Don't produce any artifact (update site). Used by Gerrit
 		
 		findBugs: produce analysis reports. Activation: explicit ("Profiles")
 		packAndSign: produce a stable update site (Packed & signed). Used for releases (+ milestones) only. Activation: SIGN=true
 		pack: produce a simple update site (Packed). Used for nightly or feature branch builds. Activation: SIGN=false
-	 -->
-	<profiles>
-		
-		<profile>
-			<id>defaultProfile</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-p2-plugin</artifactId>
-						<version>${tycho-version}</version>
-						<executions>
-							<execution>
-								<id>attach-p2-metadata</id>
-								<phase>package</phase>
-								<goals>
-									<goal>p2-metadata</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-		</profile>
-	
-		<profile>
-		  	<id>findBugs</id> <!-- Analysis profile. Takes +1h -->
-		  	<build>
-		  		<plugins>
-		  			<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>findbugs-maven-plugin</artifactId>
-						<version>${findbugs.version}</version>
-						<configuration>
-							<findbugsXmlOutput>true</findbugsXmlOutput>
-							<failOnError>false</failOnError>
-							<maxHeap>1024</maxHeap>
-						</configuration>
-						<executions>
-							<execution>
-								<goals>
-									<goal>check</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-p2-plugin</artifactId>
-						<version>${tycho-version}</version>
-						<executions>
-							<execution>
-								<id>attach-p2-metadata</id>
-								<phase>package</phase>
-								<goals>
-									<goal>p2-metadata</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-		  		</plugins>
-		  	</build>
-		</profile>
-	  
-	  
-		<profile>
-	  		<id>packAndSign</id> <!-- Stable release profile. Takes +30min. Eclipse servers only -->
-		  	<!-- Pack200 -->
-		  	<build>
-			  	<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-pack200a-plugin</artifactId>
-						<version>${tychoExtrasVersion}</version>
-						<executions>
-							<execution>
-								<id>pack200-normalize</id>
-								<goals>
-									<goal>normalize</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.eclipse.cbi.maven.plugins</groupId>
-						<artifactId>eclipse-jarsigner-plugin</artifactId>
-						<version>1.0.5</version>
-						<executions>
-							<execution>
-						    	<id>sign</id>
-						    	<goals>
-						    		<goal>sign</goal>
-						    	</goals>
-						  	</execution>
-						</executions>
-		            </plugin>
-					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-pack200b-plugin</artifactId>
-						<version>${tychoExtrasVersion}</version>
-						<executions>
-							<execution>
-								<id>pack200-pack</id>
-								<goals>
-									<goal>pack</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-p2-plugin</artifactId>
-						<version>${tycho-version}</version>
-						<executions>
-							<execution>
-								<id>attach-p2-metadata</id>
-								<phase>package</phase>
-								<goals>
-									<goal>p2-metadata</goal>
-								</goals>
-							</execution>
-						</executions>
-						<configuration>
-							<defaultP2Metadata>false</defaultP2Metadata>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-	        <activation>
-	        	<property>
-	        		<name>SIGN</name>
-	        		<value>true</value>
-	        	</property>
-	        </activation>
-		</profile>
-	  
-	  
-    	<profile>
-	        <id>pack</id> <!-- Nightly profile. Artifacts can be consumed, but are not signed -->
-	        <build>
-	          <plugins>
-	            <!-- Pack200 -->
-				<plugin>
-					<groupId>org.eclipse.tycho.extras</groupId>
-					<artifactId>tycho-pack200b-plugin</artifactId>
-					<version>${tychoExtrasVersion}</version>
-					<executions>
-						<execution>
-							<id>pack200-pack</id>
-							<goals>
-								<goal>pack</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-p2-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<executions>
-						<execution>
-							<id>attach-p2-metadata</id>
-							<phase>package</phase>
-							<goals>
-								<goal>p2-metadata</goal>
-							</goals>
-						</execution>
-					</executions>
-					<configuration>
-						<defaultP2Metadata>false</defaultP2Metadata>
-					</configuration>
-				</plugin>
-	          </plugins>
-	        </build>
-	        <activation>
-	        	<property>
-	        		<name>SIGN</name>
-	        		<value>false</value>
-	        	</property>
-	        </activation>
-    	</profile>
-      
-        <!-- nightly profile is usefull for developers that want to link to nightly build -->
-		<profile>
-			<id>nightly</id>
-			<repositories>
-				<repository>
-					<id>papyrus-nightly</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/
-					</url>
-					<releases>
-						<enabled>true</enabled>
-						<updatePolicy>daily</updatePolicy>
-						<checksumPolicy>warn</checksumPolicy>
-					</releases>
-					<snapshots>
-						<enabled>true</enabled>
-						<updatePolicy>daily</updatePolicy>
-						<checksumPolicy>fail</checksumPolicy>
-					</snapshots>
-				</repository>
-			</repositories>
-			<activation>
-				<property>
-					<name>env</name>
-					<value>devnightly</value>
-				</property>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-		</profile>
-    </profiles>
-</project>
+	 -->

+	<profiles>

+		

+		<profile>

+			<id>defaultProfile</id>

+			<build>

+				<plugins>

+					<plugin>

+						<groupId>org.eclipse.tycho</groupId>

+						<artifactId>tycho-p2-plugin</artifactId>

+						<version>${tycho-version}</version>

+						<executions>

+							<execution>

+								<id>attach-p2-metadata</id>

+								<phase>package</phase>

+								<goals>

+									<goal>p2-metadata</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+				</plugins>

+			</build>

+			<activation>

+				<activeByDefault>true</activeByDefault>

+			</activation>

+		</profile>

+	

+		<profile>

+		  	<id>findBugs</id> <!-- Analysis profile. Takes +1h -->

+		  	<build>

+		  		<plugins>

+		  			<plugin>

+						<groupId>org.codehaus.mojo</groupId>

+						<artifactId>findbugs-maven-plugin</artifactId>

+						<version>${findbugs.version}</version>

+						<configuration>

+							<findbugsXmlOutput>true</findbugsXmlOutput>

+							<failOnError>false</failOnError>

+							<maxHeap>1024</maxHeap>

+						</configuration>

+						<executions>

+							<execution>

+								<goals>

+									<goal>check</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+					<plugin>

+						<groupId>org.eclipse.tycho</groupId>

+						<artifactId>tycho-p2-plugin</artifactId>

+						<version>${tycho-version}</version>

+						<executions>

+							<execution>

+								<id>attach-p2-metadata</id>

+								<phase>package</phase>

+								<goals>

+									<goal>p2-metadata</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+		  		</plugins>

+		  	</build>

+		</profile>

+	  

+	  

+		<profile>

+	  		<id>packAndSign</id> <!-- Stable release profile. Takes +30min. Eclipse servers only -->

+		  	<!-- Pack200 -->

+		  	<build>

+			  	<plugins>

+					<plugin>

+						<groupId>org.eclipse.tycho.extras</groupId>

+						<artifactId>tycho-pack200a-plugin</artifactId>

+						<version>${tychoExtrasVersion}</version>

+						<executions>

+							<execution>

+								<id>pack200-normalize</id>

+								<goals>

+									<goal>normalize</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+					<plugin>

+						<groupId>org.eclipse.cbi.maven.plugins</groupId>

+						<artifactId>eclipse-jarsigner-plugin</artifactId>

+						<version>1.0.5</version>

+						<executions>

+							<execution>

+						    	<id>sign</id>

+						    	<goals>

+						    		<goal>sign</goal>

+						    	</goals>

+						  	</execution>

+						</executions>

+		            </plugin>

+					<plugin>

+						<groupId>org.eclipse.tycho.extras</groupId>

+						<artifactId>tycho-pack200b-plugin</artifactId>

+						<version>${tychoExtrasVersion}</version>

+						<executions>

+							<execution>

+								<id>pack200-pack</id>

+								<goals>

+									<goal>pack</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+					<plugin>

+						<groupId>org.eclipse.tycho</groupId>

+						<artifactId>tycho-p2-plugin</artifactId>

+						<version>${tycho-version}</version>

+						<executions>

+							<execution>

+								<id>attach-p2-metadata</id>

+								<phase>package</phase>

+								<goals>

+									<goal>p2-metadata</goal>

+								</goals>

+							</execution>

+						</executions>

+						<configuration>

+							<defaultP2Metadata>false</defaultP2Metadata>

+						</configuration>

+					</plugin>

+				</plugins>

+			</build>

+	        <activation>

+	        	<property>

+	        		<name>SIGN</name>

+	        		<value>true</value>

+	        	</property>

+	        </activation>

+		</profile>

+	  

+	  

+    	<profile>

+	        <id>pack</id> <!-- Nightly profile. Artifacts can be consumed, but are not signed -->

+	        <build>

+	          <plugins>

+	            <!-- Pack200 -->

+				<plugin>

+					<groupId>org.eclipse.tycho.extras</groupId>

+					<artifactId>tycho-pack200b-plugin</artifactId>

+					<version>${tychoExtrasVersion}</version>

+					<executions>

+						<execution>

+							<id>pack200-pack</id>

+							<goals>

+								<goal>pack</goal>

+							</goals>

+						</execution>

+					</executions>

+				</plugin>

+				<plugin>

+					<groupId>org.eclipse.tycho</groupId>

+					<artifactId>tycho-p2-plugin</artifactId>

+					<version>${tycho-version}</version>

+					<executions>

+						<execution>

+							<id>attach-p2-metadata</id>

+							<phase>package</phase>

+							<goals>

+								<goal>p2-metadata</goal>

+							</goals>

+						</execution>

+					</executions>

+					<configuration>

+						<defaultP2Metadata>false</defaultP2Metadata>

+					</configuration>

+				</plugin>

+	          </plugins>

+	        </build>

+	        <activation>

+	        	<property>

+	        		<name>SIGN</name>

+	        		<value>false</value>

+	        	</property>

+	        </activation>

+    	</profile>

+      

+        <!-- nightly profile is usefull for developers that want to link to nightly build -->

+		<profile>

+			<id>nightly</id>

+			<repositories>

+				<repository>

+					<id>papyrus-nightly</id>

+					<layout>p2</layout>

+					<url>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/

+					</url>

+					<releases>

+						<enabled>true</enabled>

+						<updatePolicy>daily</updatePolicy>

+						<checksumPolicy>warn</checksumPolicy>

+					</releases>

+					<snapshots>

+						<enabled>true</enabled>

+						<updatePolicy>daily</updatePolicy>

+						<checksumPolicy>fail</checksumPolicy>

+					</snapshots>

+				</repository>

+			</repositories>

+			<activation>

+				<property>

+					<name>env</name>

+					<value>devnightly</value>

+				</property>

+				<activeByDefault>false</activeByDefault>

+			</activation>

+		</profile>

+    </profiles>

+</project>

diff --git a/releng/top-pom-rcp.xml b/releng/top-pom-rcp.xml
index 4c8b7366a07..6aa191fa6fe 100755
--- a/releng/top-pom-rcp.xml
+++ b/releng/top-pom-rcp.xml
@@ -25,31 +25,31 @@
 			<id>emft-mwe[0]</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMFT MWE",0) -->

-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201502030703/mwe</url>

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240644/mwe</url>

 		</repository>

 		<repository>

 			<id>emft-mwe[1]</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMFT MWE",1) -->

-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201502030947/mwe2lang</url>

+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201503240833/mwe2lang</url>

 		</repository>

 		<repository>

 			<id>emf-transaction</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMF TRANSACTION",0) -->

-			<url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201502040445</url>

+			<url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201503250534</url>

 		</repository>

 		<repository>

 			<id>emf-validation</id>

 			<layout>p2</layout>

 			<!-- updateFrom("EMF VALIDATION",0) -->

-			<url>http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201502040400</url>

+			<url>http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201503250348</url>

 		</repository>

 		<repository>

 			<id>ep</id>

 			<layout>p2</layout>

 			<!-- updateFrom("Eclipse",0) -->

-			<url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M5a-201502031300/</url>

+			<url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M6-201503200800/</url>

 		</repository>

 		<repository>

 			<id>gef</id>

@@ -61,7 +61,7 @@
 			<id>gmp-gmf-notation</id>

 			<layout>p2</layout>

 			<!-- updateFrom("GMF Notation",0) -->

-			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201502040339</url>

+			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201503250354</url>

 		</repository>

 		<repository>

 			<id>gmp-gmf-runtime</id>

@@ -79,13 +79,13 @@
 			<id>m2t-xpand</id>

 			<layout>p2</layout>

 			<!-- updateFrom("M2T XPAND",0) -->

-			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201502030723/</url>

+			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201503240650/</url>

 		</repository>

 		<repository>

 			<id>mdt-ocl</id>

 			<layout>p2</layout>

 			<!-- updateFrom("MDT OCL 6.0",0) -->

-			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.0.0/S201502021341</url>

+			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.0.0/S201503240634</url>

 		</repository>

 		<repository>

 			<id>mdt-uml2</id>

@@ -97,7 +97,7 @@
 			<id>mmt-qvto</id>

 			<layout>p2</layout>

 			<!-- updateFrom("QVT Operational",0) -->

-			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201502021150</url>

+			<url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201503241740</url>

 		</repository>

 		<repository>

 			<id>nattable</id>

@@ -113,13 +113,13 @@
 			<id>tmf-xtext</id>

 			<layout>p2</layout>

 			<!-- updateFrom("Xtext, Xtend",0) -->

-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201502030924/</url>

+			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.1/</url>

 		</repository>

 		<repository>

 			<id>webtools</id>

 			<layout>p2</layout>

 			<!-- updateFrom("WebTools",0) -->

-			<url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M4-20141211000148/repository/</url>

+			<url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M6-20150324000117/repository/</url>

 		</repository>

 		<repository>

 			<id>XWT</id>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.classpath b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.classpath
new file mode 100644
index 00000000000..065ac06e197
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/.project b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.project
index a304ab2be14..22e16c202cd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/.project
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.project
@@ -1,22 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.doc</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.elementtypesconfigurations.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..eb9bfba9949
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,296 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..3643df49234
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.emf.transaction;bundle-version="1.4.0",
+ org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
+Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.tests
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.1.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.elementtypesconfigurations.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/about.html b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/build.properties b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/build.properties
new file mode 100644
index 00000000000..f846d6a61a6
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/build.properties
@@ -0,0 +1,19 @@
+# Copyright (c) 2014 CEA LIST.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#  CEA LIST - Initial API and implementation
+
+bin.includes = .,\
+               META-INF/,\
+               plugin.properties,\
+               plugin.xml,\
+               model/
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/M.gif b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/M.gif
new file mode 100644
index 00000000000..f9a5b239d6c
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/M.gif
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/O.gif b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/O.gif
new file mode 100644
index 00000000000..e6ce0916227
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/O.gif
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/Values.gif b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/Values.gif
new file mode 100644
index 00000000000..f1f019535ea
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/Values.gif
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/debug.gif b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/debug.gif
new file mode 100644
index 00000000000..ac5431fa311
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/debug.gif
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesMenu.xmi b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesMenu.xmi
new file mode 100644
index 00000000000..8b806ee99e6
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesMenu.xmi
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ASCII"?>
+<ElementCreationMenuModel:Folder
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel"
+    label="Test For ElementTypeConfigurations">
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="specific Component"
+      elementTypeIdRef="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.specificcomponent"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="Class - abstract"
+      icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+      elementTypeIdRef="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="Standard Class"
+      elementTypeIdRef="org.eclipse.papyrus.uml.Class"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="Package - simple stereotype"
+      elementTypeIdRef="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotype"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="Class - simple stereotype - rename"
+      elementTypeIdRef="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRename"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="Class - simple stereotype - set Values"
+      elementTypeIdRef="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeSetValues"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="Class - abstract - simple stereotype - set Values"
+      elementTypeIdRef="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.abstractclassSimpleStereotype"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+      label="Class - abstract - simple stereotype - set Values - view"
+      elementTypeIdRef="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView"/>
+</ElementCreationMenuModel:Folder>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.ctx b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.ctx
new file mode 100644
index 00000000000..7d888d19fac
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.ctx
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ASCII"?>

+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" name="ElementTypesTestsProfile">

+  <dependencies href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#/"/>

+  <tabs label="ElementTypesTestsProfile" id="elementtypestestsprofile" priority="100">

+    <sections name="Single PackageWithComponents" sectionFile="ui/SinglePackageWithComponents.xwt">

+      <widget href="ui/SinglePackageWithComponents.xwt#/"/>

+    </sections>

+    <sections name="Multiple PackageWithComponents" sectionFile="ui/MultiplePackageWithComponents.xwt">

+      <widget href="ui/MultiplePackageWithComponents.xwt#/"/>

+    </sections>

+    <sections name="Single StereotypeWithFeaturesToSet" sectionFile="ui/SingleStereotypeWithFeaturesToSet.xwt">

+      <widget href="ui/SingleStereotypeWithFeaturesToSet.xwt#/"/>

+    </sections>

+    <sections name="Multiple StereotypeWithFeaturesToSet" sectionFile="ui/MultipleStereotypeWithFeaturesToSet.xwt">

+      <widget href="ui/MultipleStereotypeWithFeaturesToSet.xwt#/"/>

+    </sections>

+  </tabs>

+  <views name="Single StereotypeWithFeaturesToSet" sections="//@tabs.0/@sections.2" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleStereotypeWithFeaturesToSet">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="ElementTypesTestsProfile::StereotypeWithFeaturesToSet"/>

+    </constraints>

+  </views>

+  <dataContexts name="ElementTypesTestsProfile">

+    <elements name="PackageWithComponents">

+      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.1"/>

+    </elements>

+    <elements name="StereotypeWithFeaturesToSet">

+      <properties name="boolean" type="Boolean"/>

+      <properties name="multiStrings" multiplicity="-1"/>

+      <properties name="value" type="Integer"/>

+      <properties name="stringFeature"/>

+      <properties name="enumeration" type="Enumeration"/>

+      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.1"/>

+    </elements>

+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@modelElementFactories.2"/>

+  </dataContexts>

+</contexts:Context>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.di b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.notation b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.notation
new file mode 100644
index 00000000000..1d458586ccd
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.notation
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_fZB8QLhGEeS0cu6lbJ9jDQ" type="PapyrusUMLProfileDiagram" name="Main" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_624_kLhGEeS0cu6lbJ9jDQ" type="1026">
+      <children xmi:type="notation:DecorationNode" xmi:id="_6260wLhGEeS0cu6lbJ9jDQ" type="1034"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6260wbhGEeS0cu6lbJ9jDQ" type="1071">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6260wrhGEeS0cu6lbJ9jDQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6260w7hGEeS0cu6lbJ9jDQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6260xLhGEeS0cu6lbJ9jDQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6260xbhGEeS0cu6lbJ9jDQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_627b0LhGEeS0cu6lbJ9jDQ" type="1019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_627b0bhGEeS0cu6lbJ9jDQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_627b0rhGEeS0cu6lbJ9jDQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_627b07hGEeS0cu6lbJ9jDQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_627b1LhGEeS0cu6lbJ9jDQ"/>
+      </children>
+      <element xmi:type="uml:Stereotype" href="ElementTypesTestsProfile.profile.uml#_62vOkLhGEeS0cu6lbJ9jDQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_624_kbhGEeS0cu6lbJ9jDQ" x="319" y="232"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_HZPs4LhHEeS0cu6lbJ9jDQ" type="1026">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HZPs4rhHEeS0cu6lbJ9jDQ" type="1034"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HZPs47hHEeS0cu6lbJ9jDQ" type="1071">
+        <children xmi:type="notation:Shape" xmi:id="_9VdsELhMEeSEVa3MHbyMkQ" type="3002">
+          <element xmi:type="uml:Property" href="ElementTypesTestsProfile.profile.uml#_9TmD0LhMEeSEVa3MHbyMkQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_9VeTILhMEeSEVa3MHbyMkQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Ckf8wLhNEeSEVa3MHbyMkQ" type="3002">
+          <element xmi:type="uml:Property" href="ElementTypesTestsProfile.profile.uml#_Ckc5cLhNEeSEVa3MHbyMkQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ckf8wbhNEeSEVa3MHbyMkQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_GO_RgLhNEeSEVa3MHbyMkQ" type="3002">
+          <element xmi:type="uml:Property" href="ElementTypesTestsProfile.profile.uml#_GO-qcLhNEeSEVa3MHbyMkQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_GO_RgbhNEeSEVa3MHbyMkQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_p4wmULhNEeSEVa3MHbyMkQ" type="3002">
+          <element xmi:type="uml:Property" href="ElementTypesTestsProfile.profile.uml#_p4uxILhNEeSEVa3MHbyMkQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_p4wmUbhNEeSEVa3MHbyMkQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_tFTa0LhNEeSEVa3MHbyMkQ" type="3002">
+          <element xmi:type="uml:Property" href="ElementTypesTestsProfile.profile.uml#_tFSMsLhNEeSEVa3MHbyMkQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_tFTa0bhNEeSEVa3MHbyMkQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HZPs5LhHEeS0cu6lbJ9jDQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HZPs5bhHEeS0cu6lbJ9jDQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HZPs5rhHEeS0cu6lbJ9jDQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HZPs57hHEeS0cu6lbJ9jDQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HZQT8LhHEeS0cu6lbJ9jDQ" type="1019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HZQT8bhHEeS0cu6lbJ9jDQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HZQT8rhHEeS0cu6lbJ9jDQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HZQT87hHEeS0cu6lbJ9jDQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HZQT9LhHEeS0cu6lbJ9jDQ"/>
+      </children>
+      <element xmi:type="uml:Stereotype" href="ElementTypesTestsProfile.profile.uml#_HZK0YLhHEeS0cu6lbJ9jDQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HZPs4bhHEeS0cu6lbJ9jDQ" x="655" y="257" height="211"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_PWJ5ELhHEeS0cu6lbJ9jDQ" type="2006">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PWKgILhHEeS0cu6lbJ9jDQ" type="5023"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_PWKgIbhHEeS0cu6lbJ9jDQ" type="1063">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VgfUYLhHEeS0cu6lbJ9jDQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vgf7cLhHEeS0cu6lbJ9jDQ" key="collapsed" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_2Z2IULhNEeSEVa3MHbyMkQ" type="1037">
+          <element xmi:type="uml:EnumerationLiteral" href="ElementTypesTestsProfile.profile.uml#_SSE3oLhHEeS0cu6lbJ9jDQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2Z2IUbhNEeSEVa3MHbyMkQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_2Z2vYLhNEeSEVa3MHbyMkQ" type="1037">
+          <element xmi:type="uml:EnumerationLiteral" href="ElementTypesTestsProfile.profile.uml#_T4hRALhHEeS0cu6lbJ9jDQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2Z2vYbhNEeSEVa3MHbyMkQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PWKgIrhHEeS0cu6lbJ9jDQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PWKgI7hHEeS0cu6lbJ9jDQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PWKgJLhHEeS0cu6lbJ9jDQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PWKgJbhHEeS0cu6lbJ9jDQ"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="ElementTypesTestsProfile.profile.uml#_PVwQcLhHEeS0cu6lbJ9jDQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PWJ5EbhHEeS0cu6lbJ9jDQ" x="953" y="309"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_fSekILhNEeSEVa3MHbyMkQ" type="1031">
+      <children xmi:type="notation:DecorationNode" xmi:id="_fSfLMLhNEeSEVa3MHbyMkQ" type="1084"/>
+      <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fSekIbhNEeSEVa3MHbyMkQ" x="425" y="85"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_fZB8QbhGEeS0cu6lbJ9jDQ" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_fZB8QrhGEeS0cu6lbJ9jDQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_fZB8Q7hGEeS0cu6lbJ9jDQ">
+      <owner xmi:type="uml:Profile" href="ElementTypesTestsProfile.profile.uml#_fYQgMLhGEeS0cu6lbJ9jDQ"/>
+    </styles>
+    <element xmi:type="uml:Profile" href="ElementTypesTestsProfile.profile.uml#_fYQgMLhGEeS0cu6lbJ9jDQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_hIYV0LhNEeSEVa3MHbyMkQ" type="1013" source="_624_kLhGEeS0cu6lbJ9jDQ" target="_fSekILhNEeSEVa3MHbyMkQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_hIYV0bhNEeSEVa3MHbyMkQ"/>
+      <element xmi:type="uml:Extension" href="ElementTypesTestsProfile.profile.uml#_hIRBELhNEeSEVa3MHbyMkQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hIYV0rhNEeSEVa3MHbyMkQ" points="[7, -9, -15, 128]$[-13, -162, -35, -25]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hIpbkLhNEeSEVa3MHbyMkQ" id="(0.8064516129032258,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_azM7MLj3EeS4eYQIptruBA" id="(0.43,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_hrlJgLhNEeSEVa3MHbyMkQ" type="1013" source="_HZPs4LhHEeS0cu6lbJ9jDQ" target="_fSekILhNEeSEVa3MHbyMkQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_hrlJgbhNEeSEVa3MHbyMkQ"/>
+      <element xmi:type="uml:Extension" href="ElementTypesTestsProfile.profile.uml#_hrjUUbhNEeSEVa3MHbyMkQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hrlJgrhNEeSEVa3MHbyMkQ" points="[-11, -9, 180, 156]$[-170, -168, 21, -3]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hrnlwLhNEeSEVa3MHbyMkQ" id="(0.0446927374301676,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hroM0LhNEeSEVa3MHbyMkQ" id="(1.0,0.82)"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_iBsnoLhGEeS0cu6lbJ9jDQ"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.uml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.uml
new file mode 100644
index 00000000000..4f1610dae4d
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.uml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_fYQgMLhGEeS0cu6lbJ9jDQ" name="ElementTypesTestsProfile" metamodelReference="_fYQgMbhGEeS0cu6lbJ9jDQ">
+  <eAnnotations xmi:id="_FV4G8LhHEeS0cu6lbJ9jDQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_ctjvELj3EeS4eYQIptruBA" name="ElementTypesTestsProfile" nsURI="http:///schemas/ElementTypesTestsProfile/_cthS0Lj3EeS4eYQIptruBA/4" nsPrefix="ElementTypesTestsProfile">
+      <eAnnotations xmi:id="_ctlkQbj3EeS4eYQIptruBA" source="PapyrusVersion">
+        <details xmi:id="_ctlkQrj3EeS4eYQIptruBA" key="Version" value="0.0.5"/>
+        <details xmi:id="_ctlkQ7j3EeS4eYQIptruBA" key="Comment" value=""/>
+        <details xmi:id="_ctlkRLj3EeS4eYQIptruBA" key="Copyright" value=""/>
+        <details xmi:id="_ctlkRbj3EeS4eYQIptruBA" key="Date" value="2015-02-20"/>
+        <details xmi:id="_ctlkRrj3EeS4eYQIptruBA" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_ctjvEbj3EeS4eYQIptruBA" name="PackageWithComponents">
+        <eAnnotations xmi:id="_ctjvErj3EeS4eYQIptruBA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_62vOkLhGEeS0cu6lbJ9jDQ"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ctjvE7j3EeS4eYQIptruBA" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_ctjvFbj3EeS4eYQIptruBA" name="StereotypeWithFeaturesToSet">
+        <eAnnotations xmi:id="_ctjvFrj3EeS4eYQIptruBA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_HZK0YLhHEeS0cu6lbJ9jDQ"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ctjvF7j3EeS4eYQIptruBA" name="stringFeature" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ctjvGbj3EeS4eYQIptruBA" name="multiStrings" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ctjvG7j3EeS4eYQIptruBA" name="value" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_ctjvHbj3EeS4eYQIptruBA" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ctjvH7j3EeS4eYQIptruBA" name="boolean" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_ctjvIbj3EeS4eYQIptruBA" name="enumeration" ordered="false" lowerBound="1" eType="_ctjvI7j3EeS4eYQIptruBA"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_ctjvI7j3EeS4eYQIptruBA" name="Enum">
+        <eAnnotations xmi:id="_ctjvJLj3EeS4eYQIptruBA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_PVwQcLhHEeS0cu6lbJ9jDQ"/>
+        <eLiterals xmi:id="_ctjvJbj3EeS4eYQIptruBA" name="Enum1"/>
+        <eLiterals xmi:id="_ctjvJrj3EeS4eYQIptruBA" name="Enum2" value="1"/>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_3TZmgLhNEeSEVa3MHbyMkQ" name="ElementTypesTestsProfile" nsURI="http:///schemas/ElementTypesTestsProfile/_3TY_cLhNEeSEVa3MHbyMkQ/3" nsPrefix="ElementTypesTestsProfile">
+      <eAnnotations xmi:id="_3Ta0oLhNEeSEVa3MHbyMkQ" source="PapyrusVersion">
+        <details xmi:id="_3Ta0obhNEeSEVa3MHbyMkQ" key="Version" value="0.0.4"/>
+        <details xmi:id="_3Ta0orhNEeSEVa3MHbyMkQ" key="Comment" value=""/>
+        <details xmi:id="_3Ta0o7hNEeSEVa3MHbyMkQ" key="Copyright" value=""/>
+        <details xmi:id="_3Ta0pLhNEeSEVa3MHbyMkQ" key="Date" value="2015-02-19"/>
+        <details xmi:id="_3Ta0pbhNEeSEVa3MHbyMkQ" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_3TZmgbhNEeSEVa3MHbyMkQ" name="PackageWithComponents">
+        <eAnnotations xmi:id="_3TZmgrhNEeSEVa3MHbyMkQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_62vOkLhGEeS0cu6lbJ9jDQ"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3TZmg7hNEeSEVa3MHbyMkQ" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_3TZmhbhNEeSEVa3MHbyMkQ" name="StereotypeWithFeaturesToSet">
+        <eAnnotations xmi:id="_3TZmhrhNEeSEVa3MHbyMkQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_HZK0YLhHEeS0cu6lbJ9jDQ"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3TZmh7hNEeSEVa3MHbyMkQ" name="stringFeature" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3TZmibhNEeSEVa3MHbyMkQ" name="multiStrings" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3TZmi7hNEeSEVa3MHbyMkQ" name="value" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3TZmjbhNEeSEVa3MHbyMkQ" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3TZmj7hNEeSEVa3MHbyMkQ" name="boolean" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3TZmkbhNEeSEVa3MHbyMkQ" name="enumeration" ordered="false" lowerBound="1" eType="_3TZmk7hNEeSEVa3MHbyMkQ"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_3TZmk7hNEeSEVa3MHbyMkQ" name="Enum">
+        <eAnnotations xmi:id="_3TZmlLhNEeSEVa3MHbyMkQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_PVwQcLhHEeS0cu6lbJ9jDQ"/>
+        <eLiterals xmi:id="_3TZmlbhNEeSEVa3MHbyMkQ" name="Enum1"/>
+        <eLiterals xmi:id="_3TZmlrhNEeSEVa3MHbyMkQ" name="Enum2" value="1"/>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_yL120LhNEeSEVa3MHbyMkQ" name="ElementTypesTestsProfile" nsURI="http:///schemas/ElementTypesTestsProfile/_yLzakLhNEeSEVa3MHbyMkQ/2" nsPrefix="ElementTypesTestsProfile">
+      <eAnnotations xmi:id="_yL4TELhNEeSEVa3MHbyMkQ" source="PapyrusVersion">
+        <details xmi:id="_yL4TEbhNEeSEVa3MHbyMkQ" key="Version" value="0.0.3"/>
+        <details xmi:id="_yL4TErhNEeSEVa3MHbyMkQ" key="Comment" value=""/>
+        <details xmi:id="_yL4TE7hNEeSEVa3MHbyMkQ" key="Copyright" value=""/>
+        <details xmi:id="_yL4TFLhNEeSEVa3MHbyMkQ" key="Date" value="2015-02-19"/>
+        <details xmi:id="_yL4TFbhNEeSEVa3MHbyMkQ" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_yL120bhNEeSEVa3MHbyMkQ" name="PackageWithComponents">
+        <eAnnotations xmi:id="_yL120rhNEeSEVa3MHbyMkQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_62vOkLhGEeS0cu6lbJ9jDQ"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_yL1207hNEeSEVa3MHbyMkQ" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_yL121bhNEeSEVa3MHbyMkQ" name="StereotypeWithFeaturesToSet">
+        <eAnnotations xmi:id="_yL121rhNEeSEVa3MHbyMkQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_HZK0YLhHEeS0cu6lbJ9jDQ"/>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_yL1217hNEeSEVa3MHbyMkQ" name="stringFeature" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_yL122bhNEeSEVa3MHbyMkQ" name="multiStrings" ordered="false" upperBound="-1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_yL1227hNEeSEVa3MHbyMkQ" name="value" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Integer"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_yL123bhNEeSEVa3MHbyMkQ" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_yL1237hNEeSEVa3MHbyMkQ" name="boolean" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_yL124bhNEeSEVa3MHbyMkQ" name="enumeration" ordered="false" lowerBound="1" eType="_yL1247hNEeSEVa3MHbyMkQ"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_yL1247hNEeSEVa3MHbyMkQ" name="Enum">
+        <eAnnotations xmi:id="_yL125LhNEeSEVa3MHbyMkQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_PVwQcLhHEeS0cu6lbJ9jDQ"/>
+        <eLiterals xmi:id="_yL125bhNEeSEVa3MHbyMkQ" name="Enum1"/>
+        <eLiterals xmi:id="_yL125rhNEeSEVa3MHbyMkQ" name="Enum2" value="1"/>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_YYnYELhHEeS0cu6lbJ9jDQ" name="ElementTypesTestsProfile" nsURI="http:///schemas/ElementTypesTestsProfile/_YYmxALhHEeS0cu6lbJ9jDQ/1" nsPrefix="ElementTypesTestsProfile">
+      <eAnnotations xmi:id="_YYn_ILhHEeS0cu6lbJ9jDQ" source="PapyrusVersion">
+        <details xmi:id="_YYn_IbhHEeS0cu6lbJ9jDQ" key="Version" value="0.0.2"/>
+        <details xmi:id="_YYn_IrhHEeS0cu6lbJ9jDQ" key="Comment" value=""/>
+        <details xmi:id="_YYn_I7hHEeS0cu6lbJ9jDQ" key="Copyright" value=""/>
+        <details xmi:id="_YYn_JLhHEeS0cu6lbJ9jDQ" key="Date" value="2015-02-19"/>
+        <details xmi:id="_YYn_JbhHEeS0cu6lbJ9jDQ" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_YYnYEbhHEeS0cu6lbJ9jDQ" name="PackageWithComponents">
+        <eAnnotations xmi:id="_YYnYErhHEeS0cu6lbJ9jDQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_62vOkLhGEeS0cu6lbJ9jDQ"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_YYnYE7hHEeS0cu6lbJ9jDQ" name="StereotypeWithFeaturesToSet">
+        <eAnnotations xmi:id="_YYnYFLhHEeS0cu6lbJ9jDQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_HZK0YLhHEeS0cu6lbJ9jDQ"/>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_YYnYFbhHEeS0cu6lbJ9jDQ" name="Enum">
+        <eAnnotations xmi:id="_YYnYFrhHEeS0cu6lbJ9jDQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_PVwQcLhHEeS0cu6lbJ9jDQ"/>
+        <eLiterals xmi:id="_YYnYF7hHEeS0cu6lbJ9jDQ" name="Enum1"/>
+        <eLiterals xmi:id="_YYnYGLhHEeS0cu6lbJ9jDQ" name="Enum2" value="1"/>
+      </eClassifiers>
+    </contents>
+    <contents xmi:type="ecore:EPackage" xmi:id="_FV4uALhHEeS0cu6lbJ9jDQ" name="ElementTypesTestsProfile" nsURI="http:///schemas/ElementTypesTestsProfile/_FV240LhHEeS0cu6lbJ9jDQ/0" nsPrefix="ElementTypesTestsProfile">
+      <eAnnotations xmi:id="_FV58ILhHEeS0cu6lbJ9jDQ" source="PapyrusVersion">
+        <details xmi:id="_FV58IbhHEeS0cu6lbJ9jDQ" key="Version" value="0.0.1"/>
+        <details xmi:id="_FV58IrhHEeS0cu6lbJ9jDQ" key="Comment" value=""/>
+        <details xmi:id="_FV58I7hHEeS0cu6lbJ9jDQ" key="Copyright" value=""/>
+        <details xmi:id="_FV58JLhHEeS0cu6lbJ9jDQ" key="Date" value="2015-02-19"/>
+        <details xmi:id="_FV58JbhHEeS0cu6lbJ9jDQ" key="Author" value="Le fevre"/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_FV4uAbhHEeS0cu6lbJ9jDQ" name="PackageWithComponents">
+        <eAnnotations xmi:id="_FV4uArhHEeS0cu6lbJ9jDQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_62vOkLhGEeS0cu6lbJ9jDQ"/>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <packageImport xmi:id="_fYQgMbhGEeS0cu6lbJ9jDQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
+  </packageImport>
+  <packageImport xmi:id="_fYQgMrhGEeS0cu6lbJ9jDQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_62vOkLhGEeS0cu6lbJ9jDQ" name="PackageWithComponents">
+    <ownedAttribute xmi:id="_hIQaALhNEeSEVa3MHbyMkQ" name="base_Element" association="_hIRBELhNEeSEVa3MHbyMkQ">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_HZK0YLhHEeS0cu6lbJ9jDQ" name="StereotypeWithFeaturesToSet">
+    <ownedAttribute xmi:id="_9TmD0LhMEeSEVa3MHbyMkQ" name="stringFeature">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:id="_Ckc5cLhNEeSEVa3MHbyMkQ" name="multiStrings">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FY_doLhNEeSEVa3MHbyMkQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FZArwLhNEeSEVa3MHbyMkQ" value="*"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:id="_GO-qcLhNEeSEVa3MHbyMkQ" name="value">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:id="_hrjUULhNEeSEVa3MHbyMkQ" name="base_Element" association="_hrjUUbhNEeSEVa3MHbyMkQ">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:id="_p4uxILhNEeSEVa3MHbyMkQ" name="boolean">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:id="_tFSMsLhNEeSEVa3MHbyMkQ" name="enumeration" type="_PVwQcLhHEeS0cu6lbJ9jDQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Enumeration" xmi:id="_PVwQcLhHEeS0cu6lbJ9jDQ" name="Enum">
+    <ownedLiteral xmi:id="_SSE3oLhHEeS0cu6lbJ9jDQ" name="Enum1"/>
+    <ownedLiteral xmi:id="_T4hRALhHEeS0cu6lbJ9jDQ" name="Enum2"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_hIRBELhNEeSEVa3MHbyMkQ" name="E_PackageWithComponents_Element1" memberEnd="_hIRBEbhNEeSEVa3MHbyMkQ _hIQaALhNEeSEVa3MHbyMkQ">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_hIRBEbhNEeSEVa3MHbyMkQ" name="extension_PackageWithComponents" type="_62vOkLhGEeS0cu6lbJ9jDQ" aggregation="composite" association="_hIRBELhNEeSEVa3MHbyMkQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_hrjUUbhNEeSEVa3MHbyMkQ" name="E_StereotypeWithFeaturesToSet_Element1" memberEnd="_hrjUUrhNEeSEVa3MHbyMkQ _hrjUULhNEeSEVa3MHbyMkQ">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_hrjUUrhNEeSEVa3MHbyMkQ" name="extension_StereotypeWithFeaturesToSet" type="_HZK0YLhHEeS0cu6lbJ9jDQ" aggregation="composite" association="_hrjUUbhNEeSEVa3MHbyMkQ"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/MyPalette.palette b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/MyPalette.palette
new file mode 100644
index 00000000000..6fe86de2535
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/MyPalette.palette
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1387437837516"
+			name="TestDrawer">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1387437855081" name="Electrical Module"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="ElementTypesTestsProfile::Module">
+							<property propertyName="ElementTypesTestsProfile::Module::kind">
+								<value>Electrical</value>
+							</property>
+						</stereotype>
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/WorkspaceTest.elementtypesconfigurations b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/WorkspaceTest.elementtypesconfigurations
new file mode 100644
index 00000000000..ff35d94aead
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/WorkspaceTest.elementtypesconfigurations
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="ASCII"?>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmlns:setvaluesadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.0"

+    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"

+    xmi:id="_ScP1oFYCEeS0WsAAtVmToA"

+    name="WorkspaceTypeTests"

+    description=""

+    identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.workspacetype"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_Sg8B4MyyEeS2aYvfnAB4ZA"

+      name="WorkspaceType_AbstractClass"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool"

+      hint="WorkspaceType_AbstractClass">

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations

+      xsi:type="setvaluesadviceconfiguration:SetValuesAdviceConfiguration"

+      xmi:id="_1JyvELtVEeSfJNL-2_VlLg"

+      name="WorkspaceType_AbstractClass"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool"

+      editHelperAdviceClassName=""

+      target="_Sg8B4MyyEeS2aYvfnAB4ZA">

+    <featuresToSet

+        xmi:id="_CNnKsLtWEeSfJNL-2_VlLg"

+        featureName="isAbstract">

+      <value

+          xsi:type="setvaluesadviceconfiguration:ConstantValue"

+          xmi:id="_E2SdILtWEeSfJNL-2_VlLg">

+        <valueInstance

+            xsi:type="uml:LiteralBoolean"

+            xmi:id="_FySLULtWEeSfJNL-2_VlLg"

+            value="true"/>

+      </value>

+    </featuresToSet>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations
new file mode 100644
index 00000000000..2ff5cb6b1f5
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="ASCII"?>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.0"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmlns:invariantcontainerruleconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.0"

+    xmlns:invariantstereotyperuleconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invariantstereotyperule/1.0"

+    xmlns:invarianttypeconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.0"

+    xmlns:runtimevalueseditionadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.0"

+    xmlns:setvaluesadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.0"

+    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"

+    xmi:id="_ScP1oFYCEeS0WsAAtVmToA"

+    name="Test element types"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <elementTypeConfigurations

+      xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration"

+      xmi:id="_JIwuQLg9EeS0cu6lbJ9jDQ"

+      name="Component in specific package only"

+      description=""

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.specificcomponent"

+      hint="ElementTypes">

+    <iconEntry

+        xmi:id="_FW5wwLg-EeS0cu6lbJ9jDQ"

+        iconPath="icons/full/obj16/add_obj.gif"

+        bundleId="org.eclipse.ui"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+    <invariantRuleConfiguration

+        xsi:type="invariantcontainerruleconfiguration:InvariantContainerRuleConfiguration"

+        xmi:id="_N9YeYLg-EeS0cu6lbJ9jDQ">

+      <permissions

+          xmi:id="_Ow-egLg-EeS0cu6lbJ9jDQ"

+          containerType="org.eclipse.papyrus.uml.Package"/>

+      <permissions

+          xmi:id="_QsZCULg-EeS0cu6lbJ9jDQ"

+          containerType="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.packagewithcomponentsonly"

+          permitted="true"

+          strict="true"/>

+    </invariantRuleConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration"

+      xmi:id="_Zn1TULg-EeS0cu6lbJ9jDQ"

+      name="PackageWithComponentsOnly"

+      description="Package that can contain only components"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.packagewithcomponentsonly"

+      hint="ElementTypes">

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+    <invariantRuleConfiguration

+        xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration"

+        xmi:id="_mzVEQLg-EeS0cu6lbJ9jDQ"

+        stereotypeQualifiedName="ElementTypesTestsProfile::PackageWithComponents"

+        requiredProfile=""/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_mhW74My1EeS2aYvfnAB4ZA"

+      name="Abstract Class Creation Action"

+      description="Semantic element type to create abstract classes"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass"

+      hint="Abstract Class Creation Action">

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_CSBmcMy2EeS2aYvfnAB4ZA"

+      name="Class With Stereotype"

+      description="Test elementTypeConfigurations"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotype"

+      hint="ElementElementTypeConfigurations">

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_5vXW8My3EeS2aYvfnAB4ZA"

+      name="Package With Stereotype And Renamed"

+      description="Test elementTypeConfigurations"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRename"

+      hint="ElementElementTypeConfigurations">

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_HT1okMy4EeS2aYvfnAB4ZA"

+      name="Package With Stereotype And Renamed"

+      description="Test elementTypeConfigurations"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeSetValues"

+      hint="ElementElementTypeConfigurations">

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_mrg2EMy4EeS2aYvfnAB4ZA"

+      name="Package With Stereotype And Renamed"

+      description="Test elementTypeConfigurations"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.abstractclassSimpleStereotype"

+      hint="ElementElementTypeConfigurations">

+    <specializedTypesID>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_SKcvUMzEEeSJ0sn3znt87w"

+      name="Package With Stereotype And Renamed - View"

+      description="Test elementTypeConfigurations"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView"

+      hint="ElementElementTypeConfigurations">

+    <specializedTypesID>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRename</specializedTypesID>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations

+      xsi:type="setvaluesadviceconfiguration:SetValuesAdviceConfiguration"

+      xmi:id="_6Zq8QLg_EeS0cu6lbJ9jDQ"

+      description="Aspect Semantic element type to create abstract classes"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass.advice"

+      target="_mhW74My1EeS2aYvfnAB4ZA">

+    <featuresToSet

+        xmi:id="_7FIUELg_EeS0cu6lbJ9jDQ"

+        featureName="isAbstract">

+      <value

+          xsi:type="setvaluesadviceconfiguration:ConstantValue"

+          xmi:id="_-d4_oLg_EeS0cu6lbJ9jDQ">

+        <valueInstance

+            xsi:type="uml:LiteralBoolean"

+            xmi:id="__mUnULg_EeS0cu6lbJ9jDQ"

+            value="true"/>

+      </value>

+    </featuresToSet>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations

+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"

+      xmi:id="_NEmxYLhAEeS0cu6lbJ9jDQ"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotype.advice"

+      target="_CSBmcMy2EeS2aYvfnAB4ZA">

+    <stereotypesToApply

+        xmi:id="_PuEG8LhAEeS0cu6lbJ9jDQ"

+        stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet">

+      <requiredProfiles>ElementTypesTestProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations

+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"

+      xmi:id="_Z3bfkMy4EeS2aYvfnAB4ZA"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRename.advice"

+      target="_5vXW8My3EeS2aYvfnAB4ZA">

+    <stereotypesToApply

+        xmi:id="_Z3bfkcy4EeS2aYvfnAB4ZA"

+        stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet"

+        updateName="true">

+      <requiredProfiles>ElementTypesTestProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations

+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"

+      xmi:id="_havkELhAEeS0cu6lbJ9jDQ"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeSetValues.advice"

+      target="_HT1okMy4EeS2aYvfnAB4ZA">

+    <stereotypesToApply

+        xmi:id="_vA53wLhAEeS0cu6lbJ9jDQ"

+        stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet"

+        updateName="true">

+      <requiredProfiles>ElementTypesTestsProfile</requiredProfiles>

+      <featuresToSet

+          xmi:id="__E3qoLhAEeS0cu6lbJ9jDQ"

+          featureName="stringFeature">

+        <value

+            xsi:type="applystereotypeadviceconfiguration:ConstantValue"

+            xmi:id="_DFSzILhBEeS0cu6lbJ9jDQ">

+          <valueInstance

+              xsi:type="uml:LiteralString"

+              xmi:id="_MDKGALhBEeS0cu6lbJ9jDQ"

+              value="MyStringValue"/>

+        </value>

+      </featuresToSet>

+      <featuresToSet

+          xmi:id="_A8odgLhBEeS0cu6lbJ9jDQ"

+          featureName="value">

+        <value

+            xsi:type="applystereotypeadviceconfiguration:ConstantValue"

+            xmi:id="_Eb_gULhBEeS0cu6lbJ9jDQ">

+          <valueInstance

+              xsi:type="uml:LiteralInteger"

+              xmi:id="_Gt4qcLhBEeS0cu6lbJ9jDQ"

+              value="3"/>

+        </value>

+      </featuresToSet>

+      <featuresToSet

+          xmi:id="_BSTykLhBEeS0cu6lbJ9jDQ"

+          featureName="boolean">

+        <value

+            xsi:type="applystereotypeadviceconfiguration:ConstantValue"

+            xmi:id="_ExAHALhBEeS0cu6lbJ9jDQ">

+          <valueInstance

+              xsi:type="uml:LiteralBoolean"

+              xmi:id="_QFRQkLhBEeS0cu6lbJ9jDQ"

+              value="true"/>

+        </value>

+      </featuresToSet>

+      <featuresToSet

+          xmi:id="_Bm_pILhBEeS0cu6lbJ9jDQ"

+          featureName="enumeration">

+        <value

+            xsi:type="applystereotypeadviceconfiguration:ConstantValue"

+            xmi:id="_FFqIYLhBEeS0cu6lbJ9jDQ">

+          <valueInstance

+              xsi:type="uml:InstanceValue"

+              xmi:id="_VToy4LhBEeS0cu6lbJ9jDQ"/>

+        </value>

+      </featuresToSet>

+      <featuresToSet

+          xmi:id="_B7jj4LhBEeS0cu6lbJ9jDQ"

+          featureName="multiStrings">

+        <value

+            xsi:type="applystereotypeadviceconfiguration:ListValue"

+            xmi:id="_rQRXYLhDEeS0cu6lbJ9jDQ"/>

+      </featuresToSet>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations

+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"

+      xmi:id="_ls9AILhAEeS0cu6lbJ9jDQ"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.abstractclassSimpleStereotype.advice"

+      target="_mrg2EMy4EeS2aYvfnAB4ZA">

+    <stereotypesToApply

+        xmi:id="_u0-NMLhDEeS0cu6lbJ9jDQ"

+        stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeatureToSet">

+      <requiredProfiles>ElementTypesTestsProfile</requiredProfiles>

+      <featuresToSet

+          xmi:id="_6XspgLhDEeS0cu6lbJ9jDQ"

+          featureName="stringFeature">

+        <value

+            xsi:type="applystereotypeadviceconfiguration:ConstantValue"

+            xmi:id="_7YVAELhDEeS0cu6lbJ9jDQ">

+          <valueInstance

+              xsi:type="uml:LiteralString"

+              xmi:id="_-BmvcLhDEeS0cu6lbJ9jDQ"

+              name=""

+              value="MyOtherValue"/>

+        </value>

+      </featuresToSet>

+      <featuresToSet

+          xmi:id="_Bj7msLhEEeS0cu6lbJ9jDQ"

+          featureName="value">

+        <value

+            xsi:type="applystereotypeadviceconfiguration:ConstantValue"

+            xmi:id="_Dd4x8LhEEeS0cu6lbJ9jDQ">

+          <valueInstance

+              xsi:type="uml:LiteralInteger"

+              xmi:id="_HdrBQLhEEeS0cu6lbJ9jDQ"

+              value="18"/>

+        </value>

+      </featuresToSet>

+      <featuresToSet

+          xmi:id="_CKkv8LhEEeS0cu6lbJ9jDQ"

+          featureName="boolean">

+        <value

+            xsi:type="applystereotypeadviceconfiguration:ConstantValue"

+            xmi:id="_It5TALhEEeS0cu6lbJ9jDQ">

+          <valueInstance

+              xsi:type="uml:LiteralBoolean"

+              xmi:id="_JxtgcLhEEeS0cu6lbJ9jDQ"

+              value="true"/>

+        </value>

+      </featuresToSet>

+      <featuresToSet

+          xmi:id="_CqCTILhEEeS0cu6lbJ9jDQ"

+          featureName="enumeration">

+        <value

+            xsi:type="applystereotypeadviceconfiguration:ConstantValue"

+            xmi:id="_LYi7YLhEEeS0cu6lbJ9jDQ">

+          <valueInstance

+              xsi:type="uml:InstanceValue"

+              xmi:id="_NPf18LhEEeS0cu6lbJ9jDQ"

+              name="">

+            <instance

+                href="ElementTypesTestsProfile.profile.uml#_T4hRALhHEeS0cu6lbJ9jDQ"/>

+          </valueInstance>

+        </value>

+      </featuresToSet>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations

+      xsi:type="runtimevalueseditionadviceconfiguration:RuntimeValuesEditionAdviceConfiguration"

+      xmi:id="_bmwRsMzEEeSJ0sn3znt87w"

+      identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView.advice"

+      target="_SKcvUMzEEeSJ0sn3znt87w">

+    <viewsToDisplay

+        xmi:id="_d7FEwMzEEeSJ0sn3znt87w">

+      <view

+          href="ElementTypesTestsProfile.ctx#//@views.0"/>

+    </viewsToDisplay>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.di b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.notation b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.notation
new file mode 100644
index 00000000000..71ff069b40f
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.notation
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_FXBxsLjwEeS4eYQIptruBA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_JXbFALjwEeS4eYQIptruBA" type="2007">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qA_7ELj3EeS4eYQIptruBA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rTbMQLj3EeS4eYQIptruBA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rTbMQbj3EeS4eYQIptruBA" key="StereotypeList" value="ElementTypesTestsProfile::PackageWithComponents"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rTbMQrj3EeS4eYQIptruBA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rTbMQ7j3EeS4eYQIptruBA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rTbMRLj3EeS4eYQIptruBA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_JXcTILjwEeS4eYQIptruBA" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_JXcTIbjwEeS4eYQIptruBA" type="7016">
+      <children xmi:type="notation:Shape" xmi:id="_QSA4kLjwEeS4eYQIptruBA" type="3021">
+        <children xmi:type="notation:DecorationNode" xmi:id="_QSA4krjwEeS4eYQIptruBA" type="5043"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_QSA4k7jwEeS4eYQIptruBA" type="8513">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QSA4lLjwEeS4eYQIptruBA" y="5"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_QSBfoLjwEeS4eYQIptruBA" type="7023">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_QSBfobjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_QSBforjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_QSBfo7jwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QSBfpLjwEeS4eYQIptruBA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_QSBfpbjwEeS4eYQIptruBA" type="7024">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_QSBfprjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_QSBfp7jwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_QSBfqLjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QSBfqbjwEeS4eYQIptruBA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_QSBfqrjwEeS4eYQIptruBA" type="7025">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_QSBfq7jwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_QSBfrLjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_QSBfrbjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QSBfrrjwEeS4eYQIptruBA"/>
+        </children>
+        <element xmi:type="uml:Component" href="model.uml#_QR8nILjwEeS4eYQIptruBA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QSA4kbjwEeS4eYQIptruBA" x="35" y="25"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_RJWwQLjwEeS4eYQIptruBA" type="3021">
+        <children xmi:type="notation:DecorationNode" xmi:id="_RJWwQrjwEeS4eYQIptruBA" type="5043"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_RJWwQ7jwEeS4eYQIptruBA" type="8513">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_RJWwRLjwEeS4eYQIptruBA" y="5"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_RJWwRbjwEeS4eYQIptruBA" type="7023">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_RJWwRrjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_RJWwR7jwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_RJWwSLjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RJWwSbjwEeS4eYQIptruBA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_RJWwSrjwEeS4eYQIptruBA" type="7024">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_RJWwS7jwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_RJWwTLjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_RJWwTbjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RJWwTrjwEeS4eYQIptruBA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_RJWwT7jwEeS4eYQIptruBA" type="7025">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_RJWwULjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_RJWwUbjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_RJWwUrjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RJWwU7jwEeS4eYQIptruBA"/>
+        </children>
+        <element xmi:type="uml:Component" href="model.uml#_RJViILjwEeS4eYQIptruBA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RJWwQbjwEeS4eYQIptruBA" x="220" y="23"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_JXcTIrjwEeS4eYQIptruBA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JXcTI7jwEeS4eYQIptruBA"/>
+    </children>
+    <element xmi:type="uml:Package" href="model.uml#_JXFt0LjwEeS4eYQIptruBA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JXbFAbjwEeS4eYQIptruBA" x="82" y="52" width="370" height="222"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_L5qYQLjwEeS4eYQIptruBA" type="2007">
+    <children xmi:type="notation:DecorationNode" xmi:id="_L5qYQrjwEeS4eYQIptruBA" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_L5qYQ7jwEeS4eYQIptruBA" type="7016">
+      <children xmi:type="notation:Shape" xmi:id="_VvnJsLjwEeS4eYQIptruBA" type="3010">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v5qXkLj3EeS4eYQIptruBA" source="Stereotype_Annotation">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5qXkbj3EeS4eYQIptruBA" key="StereotypeWithQualifiedNameList" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5qXkrj3EeS4eYQIptruBA" key="StereotypeList" value="ElementTypesTestsProfile::StereotypeWithFeaturesToSet"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5q-oLj3EeS4eYQIptruBA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5q-obj3EeS4eYQIptruBA" key="PropStereoDisplay" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v5q-orj3EeS4eYQIptruBA" key="StereotypePropertyLocation" value="Compartment"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_VvnwwLjwEeS4eYQIptruBA" type="5014"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_VvnwwbjwEeS4eYQIptruBA" type="8518">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_VvnwwrjwEeS4eYQIptruBA" y="5"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_Vvnww7jwEeS4eYQIptruBA" type="7011">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_VvnwxLjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_VvnwxbjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_VvnwxrjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vvnwx7jwEeS4eYQIptruBA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_VvnwyLjwEeS4eYQIptruBA" type="7012">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_VvnwybjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_VvnwyrjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Vvnwy7jwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VvnwzLjwEeS4eYQIptruBA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_VvnwzbjwEeS4eYQIptruBA" type="7013">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_VvnwzrjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Vvnwz7jwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Vvnw0LjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vvnw0bjwEeS4eYQIptruBA"/>
+        </children>
+        <element xmi:type="uml:Class" href="model.uml#_VvcKkLjwEeS4eYQIptruBA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VvnJsbjwEeS4eYQIptruBA" x="59" y="15"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_cLHNgLjwEeS4eYQIptruBA" type="3010">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wvGx0Lj3EeS4eYQIptruBA" source="Stereotype_Annotation">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wvGx0bj3EeS4eYQIptruBA" key="StereotypeWithQualifiedNameList" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wvGx0rj3EeS4eYQIptruBA" key="StereotypeList" value="ElementTypesTestsProfile::StereotypeWithFeaturesToSet"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wvGx07j3EeS4eYQIptruBA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wvGx1Lj3EeS4eYQIptruBA" key="PropStereoDisplay" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wvGx1bj3EeS4eYQIptruBA" key="StereotypePropertyLocation" value="Compartment"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_cLHNgrjwEeS4eYQIptruBA" type="5014"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_cLHNg7jwEeS4eYQIptruBA" type="8518">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_cLHNhLjwEeS4eYQIptruBA" y="5"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_cLHNhbjwEeS4eYQIptruBA" type="7011">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_cLHNhrjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_cLHNh7jwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_cLHNiLjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cLHNibjwEeS4eYQIptruBA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_cLH0kLjwEeS4eYQIptruBA" type="7012">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_cLH0kbjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_cLH0krjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_cLH0k7jwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cLH0lLjwEeS4eYQIptruBA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_cLH0lbjwEeS4eYQIptruBA" type="7013">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_cLH0lrjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_cLH0l7jwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_cLH0mLjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cLH0mbjwEeS4eYQIptruBA"/>
+        </children>
+        <element xmi:type="uml:Class" href="model.uml#_cLF_YLjwEeS4eYQIptruBA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cLHNgbjwEeS4eYQIptruBA" x="291" y="66"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_L5qYRLjwEeS4eYQIptruBA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L5qYRbjwEeS4eYQIptruBA"/>
+    </children>
+    <element xmi:type="uml:Package" href="model.uml#_L5pKILjwEeS4eYQIptruBA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L5qYQbjwEeS4eYQIptruBA" x="525" y="59" width="748" height="278"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_N1Cf0LjwEeS4eYQIptruBA" type="2007">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o_mvgLj3EeS4eYQIptruBA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o_mvgbj3EeS4eYQIptruBA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o_mvgrj3EeS4eYQIptruBA" key="StereotypeList" value="ElementTypesTestsProfile::PackageWithComponents"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o_mvg7j3EeS4eYQIptruBA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o_mvhLj3EeS4eYQIptruBA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o_mvhbj3EeS4eYQIptruBA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_N1DG4LjwEeS4eYQIptruBA" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_N1DG4bjwEeS4eYQIptruBA" type="7016">
+      <children xmi:type="notation:Shape" xmi:id="_et_Z8LjwEeS4eYQIptruBA" type="3021">
+        <children xmi:type="notation:DecorationNode" xmi:id="_euABALjwEeS4eYQIptruBA" type="5043"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_euABAbjwEeS4eYQIptruBA" type="8513">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_euABArjwEeS4eYQIptruBA" y="5"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_euABA7jwEeS4eYQIptruBA" type="7023">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_euABBLjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_euABBbjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_euABBrjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_euABB7jwEeS4eYQIptruBA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_euABCLjwEeS4eYQIptruBA" type="7024">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_euABCbjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_euABCrjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_euABC7jwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_euABDLjwEeS4eYQIptruBA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_euABDbjwEeS4eYQIptruBA" type="7025">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_euABDrjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_euABD7jwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_euABELjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_euABEbjwEeS4eYQIptruBA"/>
+        </children>
+        <element xmi:type="uml:Component" href="model.uml#_et-y4LjwEeS4eYQIptruBA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_et_Z8bjwEeS4eYQIptruBA" x="31" y="21"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_fHYKULjwEeS4eYQIptruBA" type="3021">
+        <children xmi:type="notation:DecorationNode" xmi:id="_fHYKUrjwEeS4eYQIptruBA" type="5043"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_fHYKU7jwEeS4eYQIptruBA" type="8513">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_fHYKVLjwEeS4eYQIptruBA" y="5"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_fHYKVbjwEeS4eYQIptruBA" type="7023">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_fHYKVrjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_fHYKV7jwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_fHYKWLjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHYKWbjwEeS4eYQIptruBA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_fHYKWrjwEeS4eYQIptruBA" type="7024">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_fHYKW7jwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_fHYKXLjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_fHYKXbjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHYKXrjwEeS4eYQIptruBA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_fHYKX7jwEeS4eYQIptruBA" type="7025">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_fHYKYLjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_fHYKYbjwEeS4eYQIptruBA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_fHYKYrjwEeS4eYQIptruBA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHYKY7jwEeS4eYQIptruBA"/>
+        </children>
+        <element xmi:type="uml:Component" href="model.uml#_fHW8MLjwEeS4eYQIptruBA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHYKUbjwEeS4eYQIptruBA" x="150" y="41"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_N1DG4rjwEeS4eYQIptruBA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N1DG47jwEeS4eYQIptruBA"/>
+    </children>
+    <element xmi:type="uml:Package" href="model.uml#_N0_cgLjwEeS4eYQIptruBA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N1Cf0bjwEeS4eYQIptruBA" x="310" y="340" width="417" height="206"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_FXBxsbjwEeS4eYQIptruBA" name="diagram_compatibility_version" stringValue="1.0.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_FXBxsrjwEeS4eYQIptruBA"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_FXBxs7jwEeS4eYQIptruBA">
+    <owner xmi:type="uml:Model" href="model.uml#_FUbJoLjwEeS4eYQIptruBA"/>
+  </styles>
+  <element xmi:type="uml:Model" href="model.uml#_FUbJoLjwEeS4eYQIptruBA"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.uml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.uml
new file mode 100644
index 00000000000..020393cf651
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.uml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ElementTypesTestsProfile="http:///schemas/ElementTypesTestsProfile/_cthS0Lj3EeS4eYQIptruBA/4" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/ElementTypesTestsProfile/_cthS0Lj3EeS4eYQIptruBA/4 ElementTypesTestsProfile.profile.uml#_ctjvELj3EeS4eYQIptruBA">
+  <uml:Model xmi:id="_FUbJoLjwEeS4eYQIptruBA" name="Model">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_FUbJobjwEeS4eYQIptruBA">
+      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Package" xmi:id="_JXFt0LjwEeS4eYQIptruBA" name="PackageWithComponents">
+      <packagedElement xmi:type="uml:Component" xmi:id="_QR8nILjwEeS4eYQIptruBA" name="Component1"/>
+      <packagedElement xmi:type="uml:Component" xmi:id="_RJViILjwEeS4eYQIptruBA" name="Component2"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_L5pKILjwEeS4eYQIptruBA" name="PackageWithAllElements">
+      <packagedElement xmi:type="uml:Class" xmi:id="_VvcKkLjwEeS4eYQIptruBA" name="Class"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_cLF_YLjwEeS4eYQIptruBA" name="StereotypeWithFeaturesToSetClass1"/>
+      <packagedElement xmi:type="uml:Component" xmi:id="_n7iHkLjwEeS4eYQIptruBA" name="Component1"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_N0_cgLjwEeS4eYQIptruBA" name="OtherPackageWithComponents">
+      <packagedElement xmi:type="uml:Component" xmi:id="_et-y4LjwEeS4eYQIptruBA" name="Component1"/>
+      <packagedElement xmi:type="uml:Component" xmi:id="_fHW8MLjwEeS4eYQIptruBA" name="Component"/>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_hUQ0cLj3EeS4eYQIptruBA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hVGh8bj3EeS4eYQIptruBA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hVGh8rj3EeS4eYQIptruBA" key="Version" value="0.0.5"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hVHJALj3EeS4eYQIptruBA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hVHJAbj3EeS4eYQIptruBA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hVHJArj3EeS4eYQIptruBA" key="Date" value="2015-02-20"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hVHJA7j3EeS4eYQIptruBA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hVGh8Lj3EeS4eYQIptruBA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="ElementTypesTestsProfile.profile.uml#_ctjvELj3EeS4eYQIptruBA"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="ElementTypesTestsProfile.profile.uml#_fYQgMLhGEeS0cu6lbJ9jDQ"/>
+    </profileApplication>
+  </uml:Model>
+  <ElementTypesTestsProfile:PackageWithComponents xmi:id="_o_kTQLj3EeS4eYQIptruBA" base_Element="_N0_cgLjwEeS4eYQIptruBA"/>
+  <ElementTypesTestsProfile:PackageWithComponents xmi:id="_rTZXELj3EeS4eYQIptruBA" base_Element="_JXFt0LjwEeS4eYQIptruBA"/>
+  <ElementTypesTestsProfile:StereotypeWithFeaturesToSet xmi:id="_v5nUQLj3EeS4eYQIptruBA" base_Element="_VvcKkLjwEeS4eYQIptruBA"/>
+  <ElementTypesTestsProfile:StereotypeWithFeaturesToSet xmi:id="_wvE8oLj3EeS4eYQIptruBA" base_Element="_cLF_YLjwEeS4eYQIptruBA"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt
new file mode 100644
index 00000000000..530de8cc95d
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:j="clr-namespace:java.lang">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>

+	</Composite>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:StringEditor input="{Binding}"

+			property="ElementTypesTestsProfile:StereotypeWithFeaturesToSet:stringFeature"></ppe:StringEditor>

+	</Composite>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:BooleanRadio input="{Binding}"

+			property="ElementTypesTestsProfile:StereotypeWithFeaturesToSet:boolean"></ppe:BooleanRadio>

+	</Composite>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:IntegerEditor input="{Binding}"

+			property="ElementTypesTestsProfile:StereotypeWithFeaturesToSet:value"></ppe:IntegerEditor>

+	</Composite>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:EnumCombo input="{Binding}"

+			property="ElementTypesTestsProfile:StereotypeWithFeaturesToSet:enumeration"></ppe:EnumCombo>

+	</Composite>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:MultiString input="{Binding}"

+			property="ElementTypesTestsProfile:StereotypeWithFeaturesToSet:multiStrings"></ppe:MultiString>

+	</Composite>

+</Composite>
\ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/org.eclipse.papyrus.infra.elementtypes.tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/org.eclipse.papyrus.infra.elementtypes.tests.launch
new file mode 100644
index 00000000000..dfe0e869f48
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/org.eclipse.papyrus.infra.elementtypes.tests.launch
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspacemd5"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.elementtypesconfigurations.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx1024m -XX:PermSize=256M -XX:MaxPermSize=512M"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="false"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.properties b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.properties
new file mode 100644
index 00000000000..596019605b9
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.properties
@@ -0,0 +1,13 @@
+# Copyright (c) 2014 CEA LIST.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#  CEA LIST - Initial API and implementation
+
+pluginName = ElementTypesConfigurations Tests
+providerName = Eclipse Modeling Project
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.xml
new file mode 100644
index 00000000000..9c366d8b5d4
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      <elementTypeSet
+            id="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tests"
+            path="model/elementtypetest.elementtypesconfigurations">
+      </elementTypeSet>
+   </extension>
+      <extension
+         point="org.eclipse.papyrus.infra.newchild">
+      <menuCreationModel
+            model="model/ElementTypesMenu.xmi">
+      </menuCreationModel>
+   </extension>
+
+</plugin>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/pom.xml
new file mode 100644
index 00000000000..d16128fdd35
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.papyrus</groupId>
+    <artifactId>org.eclipse.papyrus</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
+  </parent>
+  <groupId>org.eclipse.papyrus</groupId>
+  <artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.tests</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AbstractElementTypeTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AbstractElementTypeTests.java
new file mode 100644
index 00000000000..951d42e0c9e
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AbstractElementTypeTests.java
@@ -0,0 +1,198 @@
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelUtils;
+import org.eclipse.papyrus.infra.core.resource.NotFoundException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+import org.eclipse.papyrus.junit.utils.EditorUtils;
+import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.uml.tools.model.UmlModel;
+import org.eclipse.papyrus.uml.tools.model.UmlUtils;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.uml2.uml.Component;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Package;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.osgi.framework.Bundle;
+
+/**
+ * Abstract class for element types tests
+ */
+public abstract class AbstractElementTypeTests implements ITestConstants {
+
+
+	@ClassRule
+	public static HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
+
+	protected static IProject createProject;
+
+	protected static IFile copyPapyrusModel;
+
+	protected static IMultiDiagramEditor openPapyrusEditor;
+
+	protected static ModelSet modelset;
+
+	protected static UmlModel umlIModel;
+
+	protected static Model rootModel;
+
+	protected static TransactionalEditingDomain transactionalEditingDomain;
+
+	protected static IFile workspaceTestFile;
+
+	protected static Package packageWithAllElements;
+
+	protected static Package packageWithComponents;
+
+	protected static IClientContext papyrusContext;
+
+	protected static Package otherPackageWithComponents;
+
+	protected static Component component1_packageWithComponents;
+
+	protected static Component component1_otherPackageWithComponents;
+
+	protected static Component component1_packageWithAllElements;
+
+
+	/**
+	 * Init test class
+	 */
+	@SuppressWarnings("restriction")
+	@BeforeClass
+	public static void initCreateElementTest() {
+
+		// create Project
+		createProject = houseKeeper.createProject("ElementTypes");
+
+		// import test model and profile
+		try {
+			Bundle bundle = Platform.getBundle("org.eclipse.papyrus.infra.elementtypesconfigurations.tests");
+			copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, bundle, "/model/", "model");
+			PapyrusProjectUtils.copyPapyrusModel(createProject, bundle, "/model/", "ElementTypesTestsProfile.profile");
+			workspaceTestFile = PapyrusProjectUtils.copyIFile("/model/WorkspaceTest.elementtypesconfigurations", bundle, createProject, "/model/WorkspaceTest.elementtypesconfigurations");
+			Assert.assertTrue(workspaceTestFile.isAccessible());
+		} catch (CoreException e) {
+			fail(e.getMessage());
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+
+		// open project
+		Display.getDefault().syncExec(new Runnable() {
+
+			public void run() {
+				try {
+					openPapyrusEditor = houseKeeper.cleanUpLater(EditorUtils.openPapyrusEditor(copyPapyrusModel));
+				} catch (PartInitException e) {
+					fail(e.getMessage());
+				}
+			}
+		});
+
+		transactionalEditingDomain = (TransactionalEditingDomain)openPapyrusEditor.getAdapter(TransactionalEditingDomain.class);
+		assertTrue("Impossible to init editing domain", transactionalEditingDomain instanceof TransactionalEditingDomain);
+
+		// retrieve UML model from this editor
+		try {
+			modelset = ModelUtils.getModelSetChecked(openPapyrusEditor.getServicesRegistry());
+			umlIModel = UmlUtils.getUmlModel(modelset);
+			rootModel = (Model)umlIModel.lookupRoot();
+
+			Assert.assertNotNull("root model should not be null", rootModel);
+
+		} catch (ServiceException e) {
+			fail(e.getMessage());
+		} catch (NotFoundException e) {
+			fail(e.getMessage());
+		} catch (ClassCastException e) {
+			fail(e.getMessage());
+		}
+		try {
+			initExistingElements();
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+
+		try {
+			papyrusContext = TypeContext.getContext();
+		} catch (ServiceException e) {
+			fail(e.getMessage());
+		}
+
+	}
+
+	/**
+	 * Init fields corresponding to element in the test model
+	 */
+	protected static void initExistingElements() throws Exception {
+		packageWithComponents = rootModel.getNestedPackage(PACKAGE_WITH_COMPONENTS);
+		Assert.assertNotNull(PACKAGE_WITH_COMPONENTS + " should not be null", packageWithComponents);
+		Assert.assertTrue(PACKAGE_WITH_COMPONENTS + " should be a Package", packageWithComponents instanceof Package);
+
+		packageWithAllElements = rootModel.getNestedPackage(PACKAGE_WITH_ALL_ELEMENTS);
+		Assert.assertNotNull(PACKAGE_WITH_ALL_ELEMENTS + " should not be null", packageWithAllElements);
+		Assert.assertTrue(PACKAGE_WITH_ALL_ELEMENTS + " should be a Package", packageWithAllElements instanceof Package);
+
+		otherPackageWithComponents = rootModel.getNestedPackage(OTHER_PACKAGE_WITH_COMPONENTS);
+		Assert.assertNotNull(OTHER_PACKAGE_WITH_COMPONENTS + " should not be null", otherPackageWithComponents);
+		Assert.assertTrue(OTHER_PACKAGE_WITH_COMPONENTS + " should be a Package", otherPackageWithComponents instanceof Package);
+
+		// init components
+		component1_packageWithComponents = (Component)packageWithComponents.getPackagedElement(COMPONENT_NAME);
+		Assert.assertNotNull(COMPONENT_NAME + " should not be null", component1_packageWithComponents);
+
+		component1_otherPackageWithComponents = (Component)otherPackageWithComponents.getPackagedElement(COMPONENT_NAME);
+		Assert.assertNotNull(COMPONENT_NAME + " should not be null", component1_otherPackageWithComponents);
+
+		component1_packageWithAllElements = (Component)packageWithAllElements.getPackagedElement(COMPONENT_NAME);
+		Assert.assertNotNull(COMPONENT_NAME + " should not be null", component1_packageWithAllElements);
+
+	}
+
+	/**
+	 * @throws java.lang.Exception
+	 */
+	@Before
+	public void setUp() throws Exception {
+	}
+
+	/**
+	 * @throws java.lang.Exception
+	 */
+	@After
+	public void tearDown() throws Exception {
+	}
+
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/Activator.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/Activator.java
new file mode 100644
index 00000000000..685ab64c3cc
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/Activator.java
@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AllTests.java
new file mode 100644
index 00000000000..70684c8723e
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AllTests.java
@@ -0,0 +1,26 @@
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+/**
+ * All tests for this fragment
+ */
+@RunWith(Suite.class)
+@SuiteClasses({ ElementTypesRegistryTests.class, ElementEditHelperAdviceTests.class })
+public class AllTests {
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java
new file mode 100644
index 00000000000..b5ef43aa3b4
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java
@@ -0,0 +1,244 @@
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.uml2.uml.Component;
+import org.eclipse.uml2.uml.Package;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Based upon ExtendedEditHelperAdviceTests
+ * Test class for element type edit helper advice
+ */
+public class ElementEditHelperAdviceTests extends AbstractElementTypeTests implements ITestConstants {
+
+	@Test
+	// transcoded from extended types framework
+	public void testPACKAGE_WITH_COMPONENTSType() {
+		List<IElementType> elementTypes = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(packageWithComponents, papyrusContext));
+		Assert.assertNotNull("list should not be null", elementTypes);
+		Assert.assertTrue("list should not be empty", elementTypes.size() > 0);
+		System.out.println("elementTypes.size() " + elementTypes.size());
+		Assert.assertTrue(PACKAGE_WITH_COMPONENTS + " should be a Package With components only type", elementTypes.contains(ElementTypeRegistry.getInstance().getType(PACKAGE_WITH_COMPONENTS_TYPE_ID)));
+	}
+
+	@Ignore
+	@Test
+	public void testPACKAGE_WITH_ALL_ELEMENTSType() {
+		List<IElementType> elementTypes = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(packageWithAllElements, papyrusContext));
+		Assert.assertNotNull("list should not be null", elementTypes);
+		Assert.assertTrue("list should not be empty", elementTypes.size() > 0);
+		Assert.assertTrue(PACKAGE_WITH_ALL_ELEMENTS + " should not be a Package With components only type", !elementTypes.contains(ElementTypeRegistry.getInstance().getType(PACKAGE_WITH_COMPONENTS_TYPE_ID)));
+	}
+
+	@Ignore
+	@Test
+	// transcoded from extended types framework
+	public void testSemanticCreateComponentInGoodPackage() throws ExecutionException {
+		testCreateComponent(packageWithComponents, true);
+	}
+
+	@Ignore
+	@Test
+	// transcoded from extended types framework
+	public void testSemanticCreateComponentInWrongPackage() throws ExecutionException {
+		testCreateComponent(packageWithAllElements, false);
+	}
+
+	protected void testCreateComponent(Package container, boolean canCreate) throws ExecutionException {
+		IProgressMonitor monitor = new NullProgressMonitor();
+		// should be possible
+		IElementType type = ElementTypeRegistry.getInstance().getType(SPECIFICCOMPONENT_TYPE_ID);
+		CreateElementRequest request = new CreateElementRequest(transactionalEditingDomain, container, type);
+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(container);
+		ICommand command = service.getEditCommand(request);
+		// get children before modification
+		List<EObject> originalChildren = new ArrayList<EObject>(container.getPackagedElements());
+		if (canCreate) {
+			Assert.assertTrue("Command should be executable", command.canExecute());
+			IStatus status = command.execute(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			// get result
+			List<EObject> afterCreationChildren = new ArrayList<EObject>(container.getPackagedElements());
+			List<EObject> delta = new ArrayList<EObject>(afterCreationChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have only one more element", 1, delta.size());
+			// check it does not impact undo
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			List<EObject> afterUndoChildren = new ArrayList<EObject>(container.getPackagedElements());
+			delta = new ArrayList<EObject>(afterUndoChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have no element", 0, delta.size());
+			// should be redoable
+			Assert.assertTrue("Command should be redoable", command.canRedo());
+			status = command.redo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			List<EObject> afterRedoChildren = new ArrayList<EObject>(container.getPackagedElements());
+			delta = new ArrayList<EObject>(afterRedoChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have one more element", 1, delta.size());
+			// undo to revert state
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+		} else {
+			Assert.assertTrue("Command should not be executable", command == null || !(command.canExecute()));
+		}
+	}
+
+	@Test
+	public void testSemanticMoveComponentFromGoodPackageToGoodPackage() throws ExecutionException {
+		// should be possible (target = good package)
+		testMoveComponent(otherPackageWithComponents, component1_packageWithComponents, true);
+	}
+
+	@Ignore
+	@Test
+	// transcoded from extended types framework
+	public void testSemanticMoveComponentFromGoodPackageToWrongPackage() throws ExecutionException {
+		// should be impossible (target = wrong package)
+		testMoveComponent(packageWithAllElements, component1_packageWithComponents, false);
+	}
+
+	@Test
+	public void testSemanticMoveComponentFromWrongPackageToGoodPackage() throws ExecutionException {
+		// should be possible (target = good package)
+		testMoveComponent(packageWithComponents, component1_packageWithAllElements, true);
+	}
+
+	@Test
+	public void testSemanticMoveComponentFromWrongPackageToWrongPackage() throws ExecutionException {
+		// should be impossible (target = wrong package)
+		testMoveComponent(packageWithAllElements, component1_packageWithAllElements, false);
+	}
+
+	protected void testMoveComponent(Package targetContainer, Component sourceComponent, boolean canMove) throws ExecutionException {
+		IProgressMonitor monitor = new NullProgressMonitor();
+		// should be possible
+		MoveRequest request = new MoveRequest(transactionalEditingDomain, targetContainer, sourceComponent);
+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(targetContainer);
+		ICommand command = service.getEditCommand(request);
+		// get children before modification
+		List<EObject> originalChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());
+		if (canMove) {
+			Assert.assertTrue("Command should be executable", command.canExecute());
+			IStatus status = command.execute(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			// get result
+			List<EObject> afterCreationChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());
+			List<EObject> delta = new ArrayList<EObject>(afterCreationChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have only one more element", 1, delta.size());
+			// check it does not impact undo
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			List<EObject> afterUndoChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());
+			delta = new ArrayList<EObject>(afterUndoChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have no element", 0, delta.size());
+			// should be redoable
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			List<EObject> afterRedoChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());
+			delta = new ArrayList<EObject>(afterRedoChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have one more element", 1, delta.size());
+			// undo to revert state
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+		} else {
+			Assert.assertTrue("Command should not be executable", command == null || !command.canExecute());
+		}
+	}
+
+	@Test
+	public void testDeleteComponentFromWrongPackage() throws ExecutionException {
+		// should be possible. no influence on deletion is expected
+		testDeleteComponent(component1_packageWithAllElements, true);
+	}
+
+	@Test
+	public void testDeleteComponentFromGoodPackage() throws ExecutionException {
+		// should be possible. no influence on deletion is expected
+		testDeleteComponent(component1_packageWithComponents, true);
+	}
+
+	protected void testDeleteComponent(EObject objectToDelete, boolean canDelete) throws ExecutionException {
+		IProgressMonitor monitor = new NullProgressMonitor();
+		// should be possible
+		DestroyElementRequest request = new DestroyElementRequest(transactionalEditingDomain, objectToDelete, false);
+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(objectToDelete);
+		ICommand command = service.getEditCommand(request);
+		// get children before modification
+		List<EObject> originalChildren = new ArrayList<EObject>((List<EObject>) objectToDelete.eContainer().eGet(objectToDelete.eContainingFeature(), true));
+		EObject container = objectToDelete.eContainer();
+		EStructuralFeature containingFeature = objectToDelete.eContainingFeature();
+		if (canDelete) {
+			Assert.assertTrue("Command should be executable", command.canExecute());
+			IStatus status = command.execute(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			// get result
+			List<EObject> afterDeletionChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));
+			List<EObject> delta = new ArrayList<EObject>(originalChildren);
+			delta.removeAll(afterDeletionChildren);
+			Assert.assertEquals("List should have one element only", 1, delta.size());
+			Assert.assertEquals("deleted element should be the specified one", objectToDelete, delta.get(0));
+			// check it does not impact undo
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			List<EObject> afterUndoChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));
+			delta = new ArrayList<EObject>(afterUndoChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have no element", 0, delta.size());
+			// should be redoable
+			Assert.assertTrue("Command should be redoable", command.canRedo());
+			status = command.redo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			List<EObject> afterRedoChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));
+			delta = new ArrayList<EObject>(originalChildren);
+			delta.removeAll(afterRedoChildren);
+			Assert.assertEquals("List should have one more element", 1, delta.size());
+			// undo to revert state
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+		} else {
+			Assert.assertTrue("Command should not be executable", command == null || !command.canExecute());
+		}
+	}
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java
new file mode 100644
index 00000000000..72696cee1a7
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java
@@ -0,0 +1,97 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 431953 (fix test to prevent Model Repair dialog on unrecognized profile schema)
+ *  Christian W. Damus (CEA) - bug 434993
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
+
+
+
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.preferences.ElementTypesPreferences;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Tests for {@link ElementTypesConfigurationsRegistry}
+ */
+public class ElementTypesRegistryTests extends AbstractElementTypeTests implements ITestConstants {
+
+	/**
+	 * Test registration based on plugin declaration
+	 */
+	@Ignore
+	@Test
+	// transcoded from extended types framework
+	public final void testGetTypeRegisteredInplugin() {
+		// check standard class
+		IElementType classType = ElementTypeRegistry.getInstance().getType(ORG_ECLIPSE_PAPYRUS_UML_CLASS);
+		Assert.assertNotNull("Element type should be registered", classType);
+		IElementType abstractClassType = ElementTypeRegistry.getInstance().getType(ABSTRACT_CLASS_TOOL);
+		Assert.assertNotNull("Element type should be registered", abstractClassType);
+	}
+
+	/**
+	 * Test workspace registration. Element type in the workspace, but element type set is not loaded
+	 */
+	@Ignore
+	@Test
+	// transcoded from extended types framework
+	public final void testGetTypeRegisteredInWorkspaceNotLoaded() {
+		checkPluginTypes();
+		// no preference should be set for this test
+		ElementTypesPreferences.unregisterWorkspaceDefinition(WORKSPACE_ELEMENT_TYPE_ID);
+		// this should not be defined yet
+		IElementType workspaceType = ElementTypeRegistry.getInstance().getType(WORKSPACE_ELEMENT_TYPE_TOOL);
+		Assert.assertNull("Element type should not be registered yet", workspaceType);
+	}
+
+	/**
+	 * Test workspace registration. Element type in the workspace, but element type set is not loaded
+	 */
+	@Ignore
+	@Test
+	// transcoded from extended types framework
+	public final void testLoadUnloadWorkspaceSet() {
+		// this should not be defined yet
+		IElementType workspaceType = ElementTypeRegistry.getInstance().getType(WORKSPACE_ELEMENT_TYPE_TOOL);
+		Assert.assertNull("Element type should not be registered yet", workspaceType);
+		checkPluginTypes();
+		// register
+		System.out.println(WORKSPACE_ELEMENT_TYPE_ID + "=" + workspaceTestFile.getFullPath().toString());
+		ElementTypesPreferences.registerWorkspaceDefinition(WORKSPACE_ELEMENT_TYPE_ID, workspaceTestFile.getFullPath().toString());
+		ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(WORKSPACE_ELEMENT_TYPE_ID);
+		//
+		workspaceType = ElementTypeRegistry.getInstance().getType(WORKSPACE_ELEMENT_TYPE_TOOL);
+		Assert.assertNotNull("Element type should be registered", workspaceType);
+		checkPluginTypes();
+		// unregister
+		ElementTypesPreferences.unregisterWorkspaceDefinition(WORKSPACE_ELEMENT_TYPE_ID);
+		ElementTypeSetConfigurationRegistry.getInstance().unload(WORKSPACE_ELEMENT_TYPE_ID);
+		workspaceType = ElementTypeRegistry.getInstance().getType(WORKSPACE_ELEMENT_TYPE_TOOL);
+		Assert.assertNull("Element type should not be registered anymore", workspaceType);
+		checkPluginTypes();
+	}
+
+	/**
+	 * Check always present element types are registered
+	 */
+	private void checkPluginTypes() {
+		IElementType classType = ElementTypeRegistry.getInstance().getType(ORG_ECLIPSE_PAPYRUS_UML_CLASS);
+		Assert.assertNotNull("Element type should be registered", classType);
+		IElementType abstractClassType = ElementTypeRegistry.getInstance().getType(ABSTRACT_CLASS_TOOL);
+		Assert.assertNotNull("Element type should be registered", abstractClassType);
+	}
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ITestConstants.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ITestConstants.java
new file mode 100644
index 00000000000..9e723e65591
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ITestConstants.java
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
+
+
+/**
+ * Constants for test classes
+ */
+public interface ITestConstants {
+	static final String ORG_ECLIPSE_PAPYRUS_UML_CLASS = "org.eclipse.papyrus.uml.Class"; //$NON-NLS-1$
+
+	final static String ABSTRACT_CLASS_TOOL = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass"; //$NON-NLS-1$
+
+	final static String ElementTypeConfigurationSetName_Test1 = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tests"; //$NON-NLS-1$
+	
+	final static String WORKSPACE_ELEMENT_TYPE_ID = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.workspacetype"; //$NON-NLS-1$
+
+	final static String WORKSPACE_ELEMENT_TYPE_TOOL = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool"; //$NON-NLS-1$
+
+	static final String PACKAGE_WITH_COMPONENTS = "PackageWithComponents"; //$NON-NLS-1$
+
+	static final String PACKAGE_WITH_ALL_ELEMENTS = "PackageWithAllElements"; //$NON-NLS-1$
+
+	static final String OTHER_PACKAGE_WITH_COMPONENTS = "OtherPackageWithComponents"; //$NON-NLS-1$
+
+	static final String PACKAGE_WITH_COMPONENTS_TYPE_ID = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.packagewithcomponentsonly"; //$NON-NLS-1$
+
+	static final String SPECIFICCOMPONENT_TYPE_ID = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.specificcomponent"; //$NON-NLS-1$
+
+	static final String COMPONENT_NAME = "Component1"; //$NON-NLS-1$
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
index a2b3452f6ca..33a2b8542af 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -43,6 +43,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.1.0",
  org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.elementtypesconfigurations.tests;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.extendedtypes.tests;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
index 0ab807df1d4..a076a6e9642 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
@@ -54,6 +54,7 @@ public class AllTests {
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.labelprovider.tests.AllTests.class));
 		suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.emf.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.emf.tests.AllTests"));
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.extendedtypes.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.elementtypesconfigurations.tests.AllTests.class));
 		// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.openelement.tests.AllTests.class));
 		suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.commands.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.gmfdiag.commands.tests.AllTests"));
 		suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.common.Activator.ID, "org.eclipse.papyrus.infra.gmfdiag.common.tests.AllTests"));
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
index a92d947bf8b..2a84cc10223 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.1.0",

  org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.1.0",

  org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui;bundle-version="1.1.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java
index 10e9bc9bb20..27209d75cfd 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java
@@ -27,7 +27,8 @@ TestActivityDiagramChildNode.class,
 TestActivityChildNodeInStructuredActivity.class,

 TestActivityGroup.class,

 TestDropObjects.class,

-TestCommentLink.class

+TestCommentLink.class,

+TestSemanticContainerFeature.class

 })

 public class AllCanonicalTests {

 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestSemanticContainerFeature.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestSemanticContainerFeature.java
new file mode 100644
index 00000000000..ba9b238ffdc
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestSemanticContainerFeature.java
@@ -0,0 +1,181 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.AcceptEventActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityContentCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityEditPartCN;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ConditionalNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ConditionalNodeStructuredActivityNodeContentCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.CreateLinkActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.DecisionNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionNodeAsInEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionNodeAsOutEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionRegionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.InitialNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.LoopNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.LoopNodeStructuredActivityNodeContentCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.OpaqueActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.StructuredActivityNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.TestIdentityActionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Base class for test containers  which add children using right features
+ */
+public class TestSemanticContainerFeature extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IActivityDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IActivityDiagramTestsConstants.FILE_NAME;
+	}
+
+	protected IGraphicalEditPart getActivityCompartmentEditPart() {
+		IGraphicalEditPart activityEP = findChildBySemanticHint(getDiagramEditPart(), ActivityEditPart.VISUAL_ID);
+		return findChildBySemanticHint(activityEP, ActivityActivityContentCompartmentEditPart.VISUAL_ID);
+	}
+	
+	@Test
+	public void testFeatureActivityInActivity() {
+		IGraphicalEditPart activity = createChild(ActivityEditPartCN.VISUAL_ID, getActivityCompartmentEditPart());
+		checkListSemantic(activity, getActivityCompartmentEditPart(), UMLPackage.eINSTANCE.getBehavioredClassifier_OwnedBehavior());
+	}
+	
+	@Test
+	public void testFeatureTestIdentityActionInActivity() {
+		IGraphicalEditPart testIdentityAction = createChild(TestIdentityActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		checkListSemantic(testIdentityAction, getActivityCompartmentEditPart(), UMLPackage.eINSTANCE.getActivity_OwnedNode());
+	}
+	
+	@Test
+	public void testFeatureCreateLinkActionInActivity() {
+		IGraphicalEditPart createLinkAction = createChild(CreateLinkActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		checkListSemantic(createLinkAction, getActivityCompartmentEditPart(), UMLPackage.eINSTANCE.getActivity_OwnedNode());
+	}
+	
+	@Test
+	public void testFeatureOpaqueActionActionInActivity() {
+		IGraphicalEditPart opaqueAction = createChild(OpaqueActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		checkListSemantic(opaqueAction, getActivityCompartmentEditPart(), UMLPackage.eINSTANCE.getActivity_OwnedNode());
+	}
+	
+	@Test
+	public void testFeatureInitialNodeActionActionInActivity() {
+		IGraphicalEditPart initialNode = createChild(InitialNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		checkListSemantic(initialNode, getActivityCompartmentEditPart(), UMLPackage.eINSTANCE.getActivity_OwnedNode());
+	}
+	
+	@Test
+	public void testFeatureLoopNodeInActivity() {
+		IGraphicalEditPart loopNode = createChild(LoopNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		checkListSemantic(loopNode, getActivityCompartmentEditPart(), UMLPackage.eINSTANCE.getActivity_StructuredNode(), UMLPackage.eINSTANCE.getActivity_Group());
+	}
+	
+	@Test
+	public void testFeatureStructuredActivityNodeInActivity() {
+		IGraphicalEditPart structuredNode = createChild(StructuredActivityNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		checkListSemantic(structuredNode, getActivityCompartmentEditPart(), UMLPackage.eINSTANCE.getActivity_StructuredNode());
+	}
+	
+	@Test
+	public void testFeatureExpansionRegionInActivity() {
+		IGraphicalEditPart expansionRegion = createChild(ExpansionRegionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		checkListSemantic(expansionRegion, getActivityCompartmentEditPart(), UMLPackage.eINSTANCE.getActivity_StructuredNode());
+	}
+	
+	@Test
+	public void testFeatureConditionalNodeInActivity() {
+		IGraphicalEditPart conditionalNode = createChild(ConditionalNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		checkListSemantic(conditionalNode, getActivityCompartmentEditPart(), UMLPackage.eINSTANCE.getActivity_StructuredNode());
+	}
+	
+	@Test
+	public void testFeatureExpansionNodeAsOutInExpansionRegion() {
+		IGraphicalEditPart expansionRegion = createChild(ExpansionRegionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart expansionNode = createChild(ExpansionNodeAsOutEditPart.VISUAL_ID, expansionRegion);
+		
+		checkListSemantic(expansionNode, expansionRegion, UMLPackage.eINSTANCE.getStructuredActivityNode_Node(), UMLPackage.eINSTANCE.getExpansionRegion_OutputElement());
+	}
+	
+	@Test
+	public void testFeatureExpansionNodeAsInInExpansionRegion() {
+		IGraphicalEditPart expansionRegion = createChild(ExpansionRegionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart expansionNode = createChild(ExpansionNodeAsInEditPart.VISUAL_ID, expansionRegion);
+		
+		checkListSemantic(expansionNode, expansionRegion, UMLPackage.eINSTANCE.getStructuredActivityNode_Node(), UMLPackage.eINSTANCE.getExpansionRegion_InputElement());
+	}
+	
+	
+	@Test
+	public void testFeatureExpansionRegonInStructuredActivityNode() {
+		IGraphicalEditPart structuredNode = createChild(StructuredActivityNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart structuredNodeCompartment =  findChildBySemanticHint(structuredNode, StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
+		IGraphicalEditPart expansionRegion = createChild(ExpansionRegionEditPart.VISUAL_ID, structuredNodeCompartment);
+		
+		checkListSemantic(expansionRegion, structuredNodeCompartment, UMLPackage.eINSTANCE.getStructuredActivityNode_Node());
+	}
+	
+	@Test
+	public void testFeatureAcceptEventActionInLoopNode() {
+		IGraphicalEditPart loopNode = createChild(LoopNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart loopNodeCompartment =  findChildBySemanticHint(loopNode, LoopNodeStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
+		IGraphicalEditPart acceptEventAction= createChild(AcceptEventActionEditPart.VISUAL_ID, loopNodeCompartment);
+		
+		checkListSemantic(acceptEventAction, loopNodeCompartment, UMLPackage.eINSTANCE.getStructuredActivityNode_Node());
+	}
+	
+	@Test
+	public void testFeatureDecisionNodeInConditionalNode() {
+		IGraphicalEditPart conditionalNode = createChild(ConditionalNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart loopNodeCompartment =  findChildBySemanticHint(conditionalNode, ConditionalNodeStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
+		IGraphicalEditPart decisionNode= createChild(DecisionNodeEditPart.VISUAL_ID, loopNodeCompartment);
+		
+		checkListSemantic(decisionNode, loopNodeCompartment, UMLPackage.eINSTANCE.getStructuredActivityNode_Node());
+	}
+	
+	public void checkListSemantic(IGraphicalEditPart ep,IGraphicalEditPart parentEP, EReference... expectedFeature) {
+		EObject child = getSemanticElement(ep);
+		EObject parent = getSemanticElement(parentEP);
+		for (EReference feature: expectedFeature) {
+			Object objectList = parent.eGet(feature);
+			Assert.assertTrue(objectList instanceof List<?>);
+			List<Object> children = (List<Object>) objectList;
+			Assert.assertTrue("Element:" + parent.getClass().getSimpleName() + " should contein child:" + child.getClass().getSimpleName()  + " in feature: " + feature.getName(), children.contains(child));
+		}
+	}
+	
+	protected EObject getSemanticElement(IGraphicalEditPart ep) {
+		EObject activityNode = ep.resolveSemanticElement();
+		assertNotNull("Primary view of " + ep.getNotationView() + " must have EObject element", activityNode);
+		return activityNode;
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/Bug418509_ReorientationAssociation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/Bug418509_ReorientationAssociation.java
index a8ca0fdbfef..501ca334dff 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/Bug418509_ReorientationAssociation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/Bug418509_ReorientationAssociation.java
@@ -77,6 +77,7 @@ public class Bug418509_ReorientationAssociation extends AbstractPapyrusTest {
 		// Get data test
 		Association association = (Association) modelSetFixture.getModel().getMember("Association");
 		NamedElement target = modelSetFixture.getModel().getMember("C");
+		NamedElement source = modelSetFixture.getModel().getMember("A");
 		StructuredClassifier sourceAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("B");
 
 		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "418509");
@@ -89,8 +90,8 @@ public class Bug418509_ReorientationAssociation extends AbstractPapyrusTest {
 		Command command = targetEP.getCommand(reconnectReq);
 		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
 
-		assertNotNull(association.getMemberEnd(target.getName().toLowerCase(), (Type) target));
-		assertNotNull(sourceAssiociation.getOwnedAttribute(target.getName().toLowerCase(), (Type) target));
+		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), (Type) target));
+		assertNotNull(sourceAssiociation.getOwnedAttribute(source.getName().toLowerCase(), (Type) target));
 		assertNotNull(association.getOwnedEnd(sourceAssiociation.getName().toLowerCase(), sourceAssiociation));
 
 
@@ -106,6 +107,7 @@ public class Bug418509_ReorientationAssociation extends AbstractPapyrusTest {
 		// Get data test
 		Association association = (Association) modelSetFixture.getModel().getMember("Association");
 		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");
+		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B");
 		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");
 
 		Diagram diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "418509");
@@ -118,9 +120,9 @@ public class Bug418509_ReorientationAssociation extends AbstractPapyrusTest {
 		Command command = targetEP.getCommand(reconnectReq);
 		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
 
-		assertNotNull(association.getMemberEnd(target.getName().toLowerCase(), target));
+		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), target));
 		assertNotNull(target.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));
-		assertNotNull(association.getOwnedEnd(target.getName().toLowerCase(), target));
+		assertNotNull(association.getOwnedEnd(source.getName().toLowerCase(), target));
 
 
 	}
@@ -155,7 +157,7 @@ public class Bug418509_ReorientationAssociation extends AbstractPapyrusTest {
 		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
 
 		assertTrue(association.getOwnedEnds().isEmpty());
-		assertNotNull(association.getMemberEnd(target.getName().toLowerCase(), target));
+		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), target));
 		assertNotNull(target.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));
 		assertNull(source.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));
 
@@ -172,6 +174,7 @@ public class Bug418509_ReorientationAssociation extends AbstractPapyrusTest {
 		// Get data test
 		Association association = (Association) modelSetFixture.getModel().getMember("Association");
 		StructuredClassifier target = (StructuredClassifier) modelSetFixture.getModel().getMember("D");
+		StructuredClassifier source = (StructuredClassifier) modelSetFixture.getModel().getMember("B");
 		StructuredClassifier targetAssiociation = (StructuredClassifier) modelSetFixture.getModel().getMember("A");
 
 		// Set End a to association
@@ -191,7 +194,7 @@ public class Bug418509_ReorientationAssociation extends AbstractPapyrusTest {
 		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
 
 		assertEquals(2, association.getOwnedEnds().size());
-		assertNotNull(association.getOwnedEnd(target.getName().toLowerCase(), target));
+		assertNotNull(association.getOwnedEnd(source.getName().toLowerCase(), target));
 		assertNotNull(association.getOwnedEnd(targetAssiociation.getName().toLowerCase(), targetAssiociation));
 		assertFalse(target.eIsSet(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute()));
 		assertFalse(targetAssiociation.eIsSet(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute()));
@@ -220,8 +223,8 @@ public class Bug418509_ReorientationAssociation extends AbstractPapyrusTest {
 		Command command = targetEP.getCommand(new EditCommandRequestWrapper(request));
 		modelSetFixture.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
 
-		assertNotNull(association.getMemberEnd(target.getName().toLowerCase(), (Type) target));
-		assertNotNull(sourceAssiociation.getOwnedAttribute(target.getName().toLowerCase(), (Type) target));
+		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), (Type) target));
+		assertNotNull(sourceAssiociation.getOwnedAttribute(source.getName().toLowerCase(), (Type) target));
 		assertNotNull(association.getOwnedEnd(sourceAssiociation.getName().toLowerCase(), sourceAssiociation));
 
 
@@ -248,9 +251,9 @@ public class Bug418509_ReorientationAssociation extends AbstractPapyrusTest {
 		Command command = targetEP.getCommand(new EditCommandRequestWrapper(request));
 		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
 
-		assertNotNull(association.getMemberEnd(target.getName().toLowerCase(), target));
+		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), target));
 		assertNotNull(target.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));
-		assertNotNull(association.getOwnedEnd(target.getName().toLowerCase(), target));
+		assertNotNull(association.getOwnedEnd(source.getName().toLowerCase(), target));
 
 
 	}
@@ -283,7 +286,7 @@ public class Bug418509_ReorientationAssociation extends AbstractPapyrusTest {
 		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
 
 		assertTrue(association.getOwnedEnds().isEmpty());
-		assertNotNull(association.getMemberEnd(target.getName().toLowerCase(), target));
+		assertNotNull(association.getMemberEnd(source.getName().toLowerCase(), target));
 		assertNotNull(target.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));
 		assertNull(source.getOwnedAttribute(targetAssiociation.getName().toLowerCase(), targetAssiociation));
 
@@ -318,7 +321,7 @@ public class Bug418509_ReorientationAssociation extends AbstractPapyrusTest {
 		modelSetFixture.getEditingDomain().getCommandStack().execute(GEFtoEMFCommandWrapper.wrap(command));
 
 		assertEquals(2, association.getOwnedEnds().size());
-		assertNotNull(association.getOwnedEnd(target.getName().toLowerCase(), target));
+		assertNotNull(association.getOwnedEnd(source.getName().toLowerCase(), target));
 		assertNotNull(association.getOwnedEnd(targetAssiociation.getName().toLowerCase(), targetAssiociation));
 		assertFalse(target.eIsSet(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute()));
 		assertFalse(targetAssiociation.eIsSet(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute()));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/org.eclipse.papyrus.uml.diagram.communication.tests.launch b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/org.eclipse.papyrus.uml.diagram.communication.tests.launch
index 9c9b84fa32c..0e51d8019eb 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/org.eclipse.papyrus.uml.diagram.communication.tests.launch
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/org.eclipse.papyrus.uml.diagram.communication.tests.launch
@@ -1,45 +1,46 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">

-<listEntry value="=org.eclipse.papyrus.uml.diagram.activity/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.activity/custom-src"/>

-</listAttribute>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.diagram.communication.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.diagram.communication.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms256m -Xmx1024m -XX:PermSize=64m  -XX:MaxPermSize=256m"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="false"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">
+<listEntry value="=org.eclipse.papyrus.uml.diagram.activity/src"/>
+<listEntry value="=org.eclipse.papyrus.uml.diagram.activity/custom-src"/>
+</listAttribute>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.diagram.communication.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.diagram.communication.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms256m -Xmx1024m -XX:PermSize=64m  -XX:MaxPermSize=256m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java
index 00653ce3a45..b40097e750d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.uml.diagram.component.test.canonical;
 

 import org.eclipse.gmf.tooling.runtime.update.DiagramUpdater;

 import org.eclipse.papyrus.commands.ICreationCommand;

+import org.eclipse.papyrus.junit.framework.classification.FailingTest;

 import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

 import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

@@ -45,6 +46,7 @@ public class TestComponentDiagramCommentLink extends TestCommentLink {
 	/**

 	 * Test to manage Comment

 	 */

+	@FailingTest

 	@Test

 	public void testToManageComment() {

 		testToManageLink(UMLElementTypes.Comment_3201, UMLElementTypes.Package_3200, UMLElementTypes.CommentAnnotatedElement_4015, UMLElementTypes.Package_3200, true);

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java
index 6a44341c6a0..1c55b0b6d4f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.uml.diagram.component.test.canonical;
 

 import org.eclipse.gmf.tooling.runtime.update.DiagramUpdater;

 import org.eclipse.papyrus.commands.ICreationCommand;

+import org.eclipse.papyrus.junit.framework.classification.FailingTest;

 import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

 import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

@@ -45,6 +46,7 @@ public class TestComponentDiagramConstraintLink extends TestConstraintLink {
 	/**

 	 * Test to manage Constraint

 	 */

+	@FailingTest

 	@Test

 	public void testToManageConstraint() {

 		testToManageLink(UMLElementTypes.Constraint_3199, UMLElementTypes.Package_3200, UMLElementTypes.ConstraintConstrainedElement_4009, UMLElementTypes.Package_3200, true);

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithDifferentParentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithDifferentParentLink.java
index 97057869d0e..5060ba36466 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithDifferentParentLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithDifferentParentLink.java
@@ -178,14 +178,6 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink
 		testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Abstraction_4007, UMLElementTypes.Class_2073, true);
 	}
 
-	/**
-	 * Test to manage port substitution.
-	 */
-	@Test
-	public void testToManagePortSubstitution() {
-		initConfLinkOwnedByParent();
-		testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Substitution_4011, UMLElementTypes.Class_2073, true);
-	}
 
 	/**
 	 * Test to manage port generalization.
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java
index a642377bd36..b526bcabe41 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java
@@ -24,6 +24,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.tooling.runtime.update.DiagramUpdater;
 import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.junit.framework.classification.InteractiveTest;
 import org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand;
 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdater;
 import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
@@ -82,7 +83,7 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP
 	 * Sets the up.
 	 *
 	 * @throws Exception
-	 *         the exception
+	 *             the exception
 	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#setUp()
 	 */
 	@Before
@@ -97,17 +98,16 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP
 	 * Install environment.
 	 *
 	 * @param sourceType
-	 *        the source type
+	 *            the source type
 	 * @param targetType
-	 *        the target type
-	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.TestLinkWithParent#installEnvironment(org.eclipse.gmf.runtime.emf.type.core.IElementType,
-	 *      org.eclipse.gmf.runtime.emf.type.core.IElementType)
+	 *            the target type
+	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.TestLinkWithParent#installEnvironment(org.eclipse.gmf.runtime.emf.type.core.IElementType, org.eclipse.gmf.runtime.emf.type.core.IElementType)
 	 */
 	@Override
 	public void installEnvironment(IElementType sourceType, IElementType targetType) {
 		super.installEnvironment(sourceType, targetType);
 
-		//create the target
+		// create the target
 		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());
 		requestcreation.setLocation(DEFAULT_SOURCE_LOCATION);
 		Command command = parent.getCommand(requestcreation);
@@ -183,21 +183,22 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP
 		testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Abstraction_4007, UMLElementTypes.Class_2073, true);
 	}
 
+
 	/**
-	 * Test to manage port substitution.
+	 * Test to manage port generalization.
 	 */
 	@Test
-	public void testToManagePortSubstitution() {
-		initConfLinkOwnedByDiagram();
-		testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Substitution_4011, UMLElementTypes.Class_2073, true);
+	public void testToManagePortGeneralization() {
+		testImpossibleToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Generalization_4015);
 	}
 
 	/**
-	 * Test to manage port generalization.
+	 * Test to manage component.
 	 */
 	@Test
-	public void testToManagePortGeneralization() {
-		testImpossibleToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Generalization_4015);
+	@InteractiveTest
+	public void testToDeployment() {
+		testToManageLink(UMLElementTypes.Node_3084, UMLElementTypes.DeploymentSpecification_3092, UMLElementTypes.Deployment_4009, UMLElementTypes.Class_2073, true);
 	}
 
 }
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramLinkOwnedBySource.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramLinkOwnedBySource.java
index 0aa6d480a0e..6220efeca35 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramLinkOwnedBySource.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramLinkOwnedBySource.java
@@ -31,12 +31,13 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource
 	public DiagramUpdater getDiagramUpdater() {
 		return UMLDiagramUpdater.INSTANCE;
 	}
+
 	/**
 	 * @see org.eclipse.papyrus.uml.diagram.tests.canonical.AbstractPapyrusTestCase#getDiagramCommandCreation()
 	 *
 	 * @return
 	 */
-	
+
 	@Override
 	protected ICreationCommand getDiagramCommandCreation() {
 		return new CreateCompositeDiagramCommand();
@@ -47,7 +48,7 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource
 	 *
 	 * @return
 	 */
-	
+
 	@Override
 	protected String getProjectName() {
 		return ICompositeDiagramTestsConstants.PROJECT_NAME;
@@ -58,7 +59,7 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource
 	 *
 	 * @return
 	 */
-	
+
 	@Override
 	protected String getFileName() {
 		return ICompositeDiagramTestsConstants.FILE_NAME;
@@ -70,16 +71,16 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource
 	@Test
 	public void testToManageGeneralization() {
 		testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Generalization_4015, UMLElementTypes.Package_1000, true);
-	}	
+	}
+
 
-	
 	/**
 	 * Test class to collaboration generalization.
 	 */
 	@Test
 	public void testClassToCollaborationGeneralization() {
 		testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Collaboration_2075, UMLElementTypes.Generalization_4015, UMLElementTypes.Package_1000, true);
-	}		
+	}
 
 	/**
 	 * Test collaboration to class generalization.
@@ -87,14 +88,65 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource
 	@Test
 	public void testCollaborationToClassGeneralization() {
 		testToManageLink(UMLElementTypes.Collaboration_2075, UMLElementTypes.Class_2073, UMLElementTypes.Generalization_4015, UMLElementTypes.Package_1000, true);
-	}	
+	}
+
 	/**
-	* Test to manage component.
-	*/
+	 * Test to manage component.
+	 */
 	@Test
 	@InvalidTest
 	public void testToComponentRealization() {
-	testToManageLink(UMLElementTypes.Component_2069, UMLElementTypes.Interface_2076, UMLElementTypes.ComponentRealization_4004, UMLElementTypes.Package_1000, true);
+		testToManageLink(UMLElementTypes.Component_2069, UMLElementTypes.Interface_2076, UMLElementTypes.ComponentRealization_4004, UMLElementTypes.Package_1000, true);
+	}
+
+	/**
+	 * Test to manage activity substitution.
+	 */
+	@Test
+	public void testToManageActivitySubstitution() {
+		testToManageLink(UMLElementTypes.Activity_2060, UMLElementTypes.Activity_2060, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, true);
 	}
-	
+
+	/**
+	 * Test to manage state machine substitution.
+	 */
+	@Test
+	public void testToManageStateMachineSubstitution() {
+		testToManageLink(UMLElementTypes.StateMachine_2063, UMLElementTypes.StateMachine_2063, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, true);
+	}
+
+	/**
+	 * Test to manage collaboration substitution.
+	 */
+	@Test
+	public void testToManageCollaborationSubstitution() {
+		testToManageLink(UMLElementTypes.Collaboration_2075, UMLElementTypes.Collaboration_2075, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, true);
+	}
+
+	/**
+	 * Test to manage component.
+	 */
+	@Test
+	public void testToSubstitution() {
+		testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, true);
+	}
+
+	/**
+	 * Test to manage class substitution.
+	 */
+	@Test
+	public void testToManageClassSubstitution() {
+		testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, true);
+	}
+
+
+
+	/**
+	 * Test to manage component.
+	 */
+	@Test
+	public void testToInterfaceRealization() {
+		testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Interface_2076, UMLElementTypes.InterfaceRealization_4005, UMLElementTypes.Package_1000, true);
+	}
+
 }
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramSimpleLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramSimpleLink.java
index 2c2047c102e..38f49ae9cd6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramSimpleLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramSimpleLink.java
@@ -76,14 +76,6 @@ public class TestCompositeDiagramSimpleLink extends TestLink {
 	}
 
 	/**
-	 * Test to manage class substitution.
-	 */
-	@Test
-	public void testToManageClassSubstitution() {
-		testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, true);
-	}
-
-	/**
 	 * Test to manage class dependency.
 	 */
 	@Test
@@ -116,13 +108,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink {
 		testToManageLink(UMLElementTypes.Activity_2060, UMLElementTypes.Activity_2060, UMLElementTypes.Usage_4008, UMLElementTypes.Package_1000, true);
 	}
 
-	/**
-	 * Test to manage activity substitution.
-	 */
-	@Test
-	public void testToManageActivitySubstitution() {
-		testToManageLink(UMLElementTypes.Activity_2060, UMLElementTypes.Activity_2060, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, true);
-	}
+
 
 	/**
 	 * Test to manage activity dependency.
@@ -158,13 +144,6 @@ public class TestCompositeDiagramSimpleLink extends TestLink {
 		testToManageLink(UMLElementTypes.StateMachine_2063, UMLElementTypes.StateMachine_2063, UMLElementTypes.Usage_4008, UMLElementTypes.Package_1000, true);
 	}
 
-	/**
-	 * Test to manage state machine substitution.
-	 */
-	@Test
-	public void testToManageStateMachineSubstitution() {
-		testToManageLink(UMLElementTypes.StateMachine_2063, UMLElementTypes.StateMachine_2063, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, true);
-	}
 
 	/**
 	 * Test to manage state machine dependency.
@@ -200,13 +179,6 @@ public class TestCompositeDiagramSimpleLink extends TestLink {
 		testToManageLink(UMLElementTypes.Collaboration_2075, UMLElementTypes.Collaboration_2075, UMLElementTypes.Usage_4008, UMLElementTypes.Package_1000, true);
 	}
 
-	/**
-	 * Test to manage collaboration substitution.
-	 */
-	@Test
-	public void testToManageCollaborationSubstitution() {
-		testToManageLink(UMLElementTypes.Collaboration_2075, UMLElementTypes.Collaboration_2075, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, true);
-	}
 
 	/**
 	 * Test to manage collaboration dependency.
@@ -232,21 +204,6 @@ public class TestCompositeDiagramSimpleLink extends TestLink {
 		testToManageLink(UMLElementTypes.Collaboration_2075, UMLElementTypes.Collaboration_2075, UMLElementTypes.Realization_4006, UMLElementTypes.Package_1000, true);
 	}
 
-	/**
-	 * Test to manage component.
-	 */
-	@Test
-	public void testToInterfaceRealization() {
-		testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Interface_2076, UMLElementTypes.InterfaceRealization_4005, UMLElementTypes.Package_1000, true);
-	}
-
-	/**
-	 * Test to manage component.
-	 */
-	@Test
-	public void testToSubstitution() {
-		testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, true);
-	}
 
 	/**
 	 * Test to manage component.
@@ -280,13 +237,6 @@ public class TestCompositeDiagramSimpleLink extends TestLink {
 		testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Usage_4008, UMLElementTypes.Package_1000, true);
 	}
 
-	/**
-	 * Test to manage component.
-	 */
-	@Test
-	public void testToDeployment() {
-		testToManageLink(UMLElementTypes.Node_2072, UMLElementTypes.Class_2073, UMLElementTypes.Deployment_4009, UMLElementTypes.Package_1000, true);
-	}
 
 	/**
 	 * Test to manage component.
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/.classpath
new file mode 100644
index 00000000000..098194ca4b7
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/.project b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/.project
new file mode 100644
index 00000000000..9b9c69549d3
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f08be2b06c4
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..f99fbeca31d
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests;singleton:=true
+Bundle-Version: 1.1.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.Activator
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.extensionpoints
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/OSGI-INF/l10n/bundle.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 00000000000..705aa1f0fda
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests
+Bundle-Vendor = Eclipse Modeling Project
+Bundle-Name = Palette Configuration Test Plug-in
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/about.html b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/about.html
new file mode 100644
index 00000000000..dd3c089a94c
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/build.properties
index 10c4491dfb3..4b9649bd064 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/build.properties
@@ -1,9 +1,8 @@
-source.. = src/,\
-          src-gen/
+source.. = src/
+output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
                about.html,\
-               icons/
-
-src.includes = about.html
+               plugin.xml,\
+               resources/,\
+               OSGI-INF/
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.launch b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.launch
new file mode 100644
index 00000000000..9aa1bb6c5e6
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.launch
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.7 -Xms40m -Xmx2048m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="false"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/plugin.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/plugin.xml
new file mode 100644
index 00000000000..013e1243d48
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/plugin.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      <elementTypeSet
+            id="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.elementTypeSet"
+            path="resources/TestPalette.elementtypesconfigurations">
+      </elementTypeSet>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.paletteDefinition"
+            class="org.eclipse.papyrus.uml.diagram.common.service.ExtendedPluginPaletteProvider"
+            name="Test Palette Configuration"
+            path="resources/TestPalette.paletteconfiguration"
+            provider="Eclipse Modeling Project">
+         <Priority
+               name="Medium">
+         </Priority>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">
+      <profile
+            name="Test Palette Configuration Profile"
+            path="/resources/TestPalette.profile.uml">
+      </profile>
+   </extension>
+
+	<!-- false palette declaraiton, with no corresponding profile applied -->
+<extension
+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      <elementTypeSet
+            id="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.elementTypeSet"
+            path="resources/FakeProfile.elementtypesconfigurations">
+      </elementTypeSet>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.fakepaletteDefinition"
+            class="org.eclipse.papyrus.uml.diagram.common.service.ExtendedPluginPaletteProvider"
+            name="Test Fake Palette Configuration"
+            path="resources/FakeProfile.paletteconfiguration"
+            provider="Eclipse Modeling Project">
+         <Priority
+               name="Medium">
+         </Priority>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.noProfilepaletteDefinition"
+            class="org.eclipse.papyrus.uml.diagram.common.service.ExtendedPluginPaletteProvider"
+            name="Test No Profile Palette Configuration"
+            path="resources/NoProfile.paletteconfiguration"
+            provider="Eclipse Modeling Project">
+         <Priority
+               name="Medium">
+         </Priority>
+      </paletteDefinition>
+   </extension>
+</plugin>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/pom.xml
new file mode 100644
index 00000000000..96440c232b8
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.papyrus</groupId>
+    <artifactId>org.eclipse.papyrus</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
+  </parent>
+  <groupId>org.eclipse.papyrus</groupId>
+  <artifactId>org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
new file mode 100644
index 00000000000..0cb788ff33b
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.0"
+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
+    xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration"
+    xmi:id="_ubJcsKeUEeSUR5jX0TaAcA"
+    name="TestPaletteConfiguration"
+    description="Element types configuration for test palette configuration plugin"
+    identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"
+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_ubJcsaeUEeSUR5jX0TaAcA"
+      name="FakeClass"
+      identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.fake.tests">
+    <iconEntry
+        xmi:id="_ubJcsqeUEeSUR5jX0TaAcA"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_ubJcs6eUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>FakeProfile::FakeSto</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations
+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
+      xmi:id="_ubJcyaeUEeSUR5jX0TaAcA"
+      name="Apply Fake"
+      identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.fakeadvice"
+      target="_ubJcsaeUEeSUR5jX0TaAcA">
+    <stereotypesToApply
+        xmi:id="_ubJcyqeUEeSUR5jX0TaAcA"
+        stereotypeQualifiedName="FakeProfile::FakeSto">
+      <requiredProfiles>FakeProfile</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.paletteconfiguration b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.paletteconfiguration
new file mode 100644
index 00000000000..1a3dc71a1bc
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.paletteconfiguration
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ASCII"?>
+<paletteconfiguration:PaletteConfiguration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7"
+    id="TestFakePaletteConfiguration"
+    label="Test Fake Palette Configuration">
+  <drawerConfigurations
+      id="TestFakePaletteNodesDrawer"
+      label="TestFakePaletteConfigurationNodes"
+      description="Test Fake Paletteconfiguration Nodes">
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="testfakepalettemodel.StoOnClass"
+        label="FakeTool"
+        description="Create a Class With FAke Sto">
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.uml.diagram.paletteconfiguration.fake.tests"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <requiredProfiles>FakeProfile</requiredProfiles>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/Model.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/Model.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/Model.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/Model.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/Model.notation
new file mode 100644
index 00000000000..221df6bc5c9
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/Model.notation
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_OJb1UMpxEeSjn_SJapR5PA" type="PapyrusUMLClassDiagram" name="TestPalette" measurementUnit="Pixel">
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_OJb1UcpxEeSjn_SJapR5PA" name="diagram_compatibility_version" stringValue="1.0.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_OJb1UspxEeSjn_SJapR5PA"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_OJb1U8pxEeSjn_SJapR5PA">
+    <owner xmi:type="uml:Model" href="Model.uml#_OFw2QMpxEeSjn_SJapR5PA"/>
+  </styles>
+  <element xmi:type="uml:Model" href="Model.uml#_OFw2QMpxEeSjn_SJapR5PA"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/Model.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/Model.uml
new file mode 100644
index 00000000000..4404b42433a
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/Model.uml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_OFw2QMpxEeSjn_SJapR5PA" name="Model">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_OFw2QcpxEeSjn_SJapR5PA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_30kFQMqVEeSee4xAw73IAQ">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_30mhgMqVEeSee4xAw73IAQ" source="PapyrusVersion">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_30mhgcqVEeSee4xAw73IAQ" key="Version" value="0.0.1"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_30mhgsqVEeSee4xAw73IAQ" key="Comment" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_30mhg8qVEeSee4xAw73IAQ" key="Copyright" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_30mhhMqVEeSee4xAw73IAQ" key="Date" value="2015-03-14"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_30mhhcqVEeSee4xAw73IAQ" key="Author" value=""/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_30l6cMqVEeSee4xAw73IAQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <references xmi:type="ecore:EPackage" href="TestPalette.profile.uml#_GOiJYMpzEeSjn_SJapR5PA"/>
+    </eAnnotations>
+    <appliedProfile xmi:type="uml:Profile" href="TestPalette.profile.uml#_V8808MpxEeSjn_SJapR5PA"/>
+  </profileApplication>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/NoProfile.paletteconfiguration b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/NoProfile.paletteconfiguration
new file mode 100644
index 00000000000..3ee1221e7d3
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/NoProfile.paletteconfiguration
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ASCII"?>
+<paletteconfiguration:PaletteConfiguration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7"
+    id="NoProfilePaletteConfiguration"
+    label="Test No Profile  palette Configuration">
+  <drawerConfigurations
+      id="TestNoProfilePaletteNodesDrawer"
+      label="TestNoProfilePaletteConfigurationNodes"
+      description="Test No Profile Paletteconfiguration Nodes">
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="testnoprofile.tool"
+        label="NoProfileCreationTool"
+        description="Create a Class With no rofile">
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.uml.diagram.paletteconfiguration.fake.tests"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
new file mode 100644
index 00000000000..9846199b7dc
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.0"
+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
+    xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration"
+    xmi:id="_ubJcsKeUEeSUR5jX0TaAcA"
+    name="TestPaletteConfiguration"
+    description="Element types configuration for test palette configuration plugin"
+    identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"
+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_ubJcsaeUEeSUR5jX0TaAcA"
+      name="ClassWithStoOnClass"
+      identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests">
+    <iconEntry
+        xmi:id="_ubJcsqeUEeSUR5jX0TaAcA"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_ubJcs6eUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>TestPaletteConfiguration::TPC_StoOnClass</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations
+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
+      xmi:id="_ubJcyaeUEeSUR5jX0TaAcA"
+      name="Apply StoOnClass"
+      identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.advice"
+      target="_ubJcsaeUEeSUR5jX0TaAcA">
+    <stereotypesToApply
+        xmi:id="_ubJcyqeUEeSUR5jX0TaAcA"
+        stereotypeQualifiedName="TestPaletteConfiguration::TPC_StoOnClass">
+      <requiredProfiles>TestPaletteConfiguration</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.paletteconfiguration b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.paletteconfiguration
new file mode 100644
index 00000000000..1098a113b82
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.paletteconfiguration
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ASCII"?>
+<paletteconfiguration:PaletteConfiguration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7"
+    id="TestPaletteConfiguration"
+    label="Test Palette Configuration">
+  <drawerConfigurations
+      id="TestPaletteNodesDrawer"
+      label="TestPaletteConfigurationNodes"
+      description="Test Paletteconfiguration Nodes">
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="testpalettemodel.StoOnClass"
+        label="StoOnClass"
+        description="Create a Class With StoOnClass">
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"/>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <requiredProfiles>TestPaletteConfiguration</requiredProfiles>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.profile.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.profile.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.profile.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.profile.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.profile.notation
new file mode 100644
index 00000000000..d8cd4f19f60
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.profile.notation
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_V92M0MpxEeSjn_SJapR5PA" type="PapyrusUMLProfileDiagram" name="Main" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_PZ47IMpyEeSjn_SJapR5PA" type="1026">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PaA28MpyEeSjn_SJapR5PA" type="1034"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_PaGWgMpyEeSjn_SJapR5PA" type="1071">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PaGWgcpyEeSjn_SJapR5PA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PaGWgspyEeSjn_SJapR5PA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PaGWg8pyEeSjn_SJapR5PA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PaGWhMpyEeSjn_SJapR5PA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_PaGWhcpyEeSjn_SJapR5PA" type="1019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PaGWhspyEeSjn_SJapR5PA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PaGWh8pyEeSjn_SJapR5PA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PaGWiMpyEeSjn_SJapR5PA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PaGWicpyEeSjn_SJapR5PA"/>
+      </children>
+      <element xmi:type="uml:Stereotype" href="TestPalette.profile.uml#_PZTsUMpyEeSjn_SJapR5PA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PZ5iMMpyEeSjn_SJapR5PA" x="193" y="329" width="309" height="93"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_U1bWwMpyEeSjn_SJapR5PA" type="1031">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_U1foMMpyEeSjn_SJapR5PA" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U1gPQMpyEeSjn_SJapR5PA" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U1gPQcpyEeSjn_SJapR5PA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U1gPQspyEeSjn_SJapR5PA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U1g2UMpyEeSjn_SJapR5PA" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U1g2UcpyEeSjn_SJapR5PA" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_U1b90MpyEeSjn_SJapR5PA" type="1084"/>
+      <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U1ck4MpyEeSjn_SJapR5PA" x="197" y="141" width="309" height="93"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_V92M0cpxEeSjn_SJapR5PA" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_V92M0spxEeSjn_SJapR5PA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_V92M08pxEeSjn_SJapR5PA">
+      <owner xmi:type="uml:Profile" href="TestPalette.profile.uml#_V8808MpxEeSjn_SJapR5PA"/>
+    </styles>
+    <element xmi:type="uml:Profile" href="TestPalette.profile.uml#_V8808MpxEeSjn_SJapR5PA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Xn9IwMpyEeSjn_SJapR5PA" type="1013" source="_PZ47IMpyEeSjn_SJapR5PA" target="_U1bWwMpyEeSjn_SJapR5PA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xn9IwcpyEeSjn_SJapR5PA"/>
+      <element xmi:type="uml:Extension" href="TestPalette.profile.uml#_Xnz-0MpyEeSjn_SJapR5PA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xn9IwspyEeSjn_SJapR5PA" points="[7, -11, 0, 118]$[8, -106, 1, 23]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XojlsMpyEeSjn_SJapR5PA" id="(0.49514563106796117,0.11827956989247312)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XojlscpyEeSjn_SJapR5PA" id="(0.5048543689320388,0.7526881720430108)"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_OL_koMpyEeSjn_SJapR5PA"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.profile.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.profile.uml
new file mode 100644
index 00000000000..c2115e71fc9
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.profile.uml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_V8808MpxEeSjn_SJapR5PA" name="TestPaletteConfiguration" URI="http://www.eclipse.org/papyrus/tests/paletteconfiguration/1.1.0" metaclassReference="_U1aIoMpyEeSjn_SJapR5PA" metamodelReference="_V8808cpxEeSjn_SJapR5PA">
+  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_c9NWMMpyEeSjn_SJapR5PA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_GOiJYMpzEeSjn_SJapR5PA" name="TestPaletteConfiguration" nsURI="http://www.eclipse.org/papyrus/tests/paletteconfiguration/1.1.0" nsPrefix="TestPaletteConfiguration">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GOkloMpzEeSjn_SJapR5PA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GOklocpzEeSjn_SJapR5PA" key="Version" value="0.0.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GOklospzEeSjn_SJapR5PA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GOklo8pzEeSjn_SJapR5PA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GOklpMpzEeSjn_SJapR5PA" key="Date" value="2015-03-14"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GOklpcpzEeSjn_SJapR5PA" key="Author" value=""/>
+      </eAnnotations>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_GOiJYcpzEeSjn_SJapR5PA" name="TPC_StoOnClass">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GOiJYspzEeSjn_SJapR5PA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_PZTsUMpyEeSjn_SJapR5PA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_GOiJY8pzEeSjn_SJapR5PA" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:type="uml:ElementImport" xmi:id="_U1aIoMpyEeSjn_SJapR5PA" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_V8808cpxEeSjn_SJapR5PA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
+  </packageImport>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_V8808spxEeSjn_SJapR5PA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_PZTsUMpyEeSjn_SJapR5PA" name="TPC_StoOnClass">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_XnzXwMpyEeSjn_SJapR5PA" name="base_Class" association="_Xnz-0MpyEeSjn_SJapR5PA">
+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Extension" xmi:id="_Xnz-0MpyEeSjn_SJapR5PA" name="E_TPC_StoOnClass_Class1" memberEnd="_Xnz-0cpyEeSjn_SJapR5PA _XnzXwMpyEeSjn_SJapR5PA">
+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Xnz-0cpyEeSjn_SJapR5PA" name="extension_TPC_StoOnClass" type="_PZTsUMpyEeSjn_SJapR5PA" aggregation="composite" association="_Xnz-0MpyEeSjn_SJapR5PA"/>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/Activator.java
new file mode 100644
index 00000000000..4ddf8bacf3b
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/Activator.java
@@ -0,0 +1,33 @@
+package org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+	public final static String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"; // //$NON-NLS-1$
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+	}
+
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/AllTests.java
new file mode 100644
index 00000000000..ea70cbbfabe
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/AllTests.java
@@ -0,0 +1,27 @@
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests;
+
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.regression.Bug457712PaletteConfigurationRequiredProfile;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+/**
+ * All tests for this fragment
+ */
+@RunWith(Suite.class)
+@SuiteClasses({ Bug457712PaletteConfigurationRequiredProfile.class, })
+public class AllTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/regression/Bug457712PaletteConfigurationRequiredProfile.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/regression/Bug457712PaletteConfigurationRequiredProfile.java
new file mode 100644
index 00000000000..3e260d2c6cb
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/regression/Bug457712PaletteConfigurationRequiredProfile.java
@@ -0,0 +1,209 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.regression;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.palette.PaletteDrawer;
+import org.eclipse.gef.ui.palette.PaletteViewer;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorWithFlyOutPalette;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelUtils;
+import org.eclipse.papyrus.infra.core.resource.NotFoundException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.junit.utils.EditorUtils;
+import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.Activator;
+import org.eclipse.papyrus.uml.tools.model.UmlModel;
+import org.eclipse.papyrus.uml.tools.model.UmlUtils;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Profile;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+/**
+ * Regression test for bug 457712
+ */
+public class Bug457712PaletteConfigurationRequiredProfile implements ITestConstants {
+
+	public static final String RESOURCES_FOLDER = "/resources/";
+
+	@ClassRule
+	public static HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
+
+	protected static IProject createProject;
+
+	protected static IMultiDiagramEditor openPapyrusEditor;
+
+	protected static ModelSet modelset;
+
+	protected static UmlModel umlIModel;
+
+	protected static Model rootModel;
+
+	protected static TransactionalEditingDomain transactionalEditingDomain;
+
+	protected static IFile workspaceTestFile;
+
+	private static IFile copyTestModel;
+
+	private static Diagram classDiagram;
+
+	private Profile testProfile;
+
+	/**
+	 * Init test class
+	 */
+	@BeforeClass
+	public static void initCreateElementTest() {
+
+		// create Project
+		createProject = houseKeeper.createProject(BUG457712_PALETTE_CONFIGURATION);
+
+		// import test model and profile
+		try {
+			Bundle bundle = Platform.getBundle(Activator.PLUGIN_ID);
+			PapyrusProjectUtils.copyPapyrusModel(createProject, bundle, RESOURCES_FOLDER, "TestPalette.profile");
+			copyTestModel = PapyrusProjectUtils.copyPapyrusModel(createProject, bundle, RESOURCES_FOLDER, "Model");
+		} catch (CoreException e) {
+			fail(e.getMessage());
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+
+		// open project
+		Display.getDefault().syncExec(new Runnable() {
+
+			public void run() {
+				try {
+					openPapyrusEditor = houseKeeper.cleanUpLater(EditorUtils.openPapyrusEditor(copyTestModel));
+				} catch (PartInitException e) {
+					fail(e.getMessage());
+				}
+			}
+		});
+
+		transactionalEditingDomain = (TransactionalEditingDomain) openPapyrusEditor.getAdapter(TransactionalEditingDomain.class);
+		assertTrue("Impossible to init editing domain", transactionalEditingDomain instanceof TransactionalEditingDomain);
+
+		// retrieve UML model from this editor
+		try {
+			modelset = ModelUtils.getModelSetChecked(openPapyrusEditor.getServicesRegistry());
+			umlIModel = UmlUtils.getUmlModel(modelset);
+			rootModel = (Model) umlIModel.lookupRoot();
+
+			Assert.assertNotNull("root model should not be null", rootModel);
+
+			ICreationCommand command = new CreateClassDiagramCommand();
+			classDiagram = command.createDiagram(modelset, null, "DiagramToTest");
+			modelset.save(new NullProgressMonitor());
+
+			assertNotNull("There should be a class diagram for test", classDiagram);
+
+		} catch (ServiceException e) {
+			fail(e.getMessage());
+		} catch (NotFoundException e) {
+			fail(e.getMessage());
+		} catch (ClassCastException e) {
+			fail(e.getMessage());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Test
+	public void testNoProfileApplied() {
+		// check the palette. tool to create a class with stereotype StoOnClass should not be present
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				// check with profile applied (it is already applied in the model). The drawer should be visible
+				checkPaletteDrawer("TestPaletteNodesDrawer", true);
+				checkPaletteDrawer("TestFakePaletteNodesDrawer", false);
+				checkPaletteDrawer("TestNoProfilePaletteNodesDrawer", true);
+			}
+		});
+
+	}
+
+	protected void checkPaletteDrawer(String identifier, boolean isVisible) {
+		IEditorPart part = openPapyrusEditor.getActiveEditor();
+		if (part instanceof DiagramEditorWithFlyOutPalette) {
+			PaletteViewer paletteViewer = (PaletteViewer) ((DiagramEditorWithFlyOutPalette) part).getAdapter(PaletteViewer.class);
+			assertNotNull("There should be a palette viewer on active editor", paletteViewer);
+
+			// will do a shortcut here, only test if test drawer is active or not. This may be enhanced by testing the tool itself
+			List<?> drawers = paletteViewer.getPaletteRoot().getChildren();
+			boolean isDisplayed = false;
+			for (Object o : drawers) {
+
+				if (o instanceof PaletteDrawer) {
+					// check it does not have id: TestPaletteNodesDrawer
+					if (identifier.equals(((PaletteDrawer) o).getId())) {
+						if (!isVisible) {
+							fail("the drawer for test palette should not be here as the profile TestPalette is not applied");
+						}
+						isDisplayed = true;
+					}
+				}
+
+			}
+			if (isVisible & !isDisplayed) {
+				fail("the drawer for test palette was not there whereas the profile TestPalette is applied");
+			}
+		} else {
+			fail("impossible to adapt into a  papyrus editor");
+		}
+
+	}
+
+	/**
+	 * @throws java.lang.Exception
+	 */
+	@Before
+	public void setUp() throws Exception {
+	}
+
+	/**
+	 * @throws java.lang.Exception
+	 */
+	@After
+	public void tearDown() throws Exception {
+	}
+
+
+}
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/regression/ITestConstants.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/regression/ITestConstants.java
new file mode 100644
index 00000000000..4197e057015
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/regression/ITestConstants.java
@@ -0,0 +1,23 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.regression;
+
+/**
+ * Shared test constants
+ */
+public interface ITestConstants {
+
+	public static final String BUG457712_PALETTE_CONFIGURATION = "Bug457712_PaletteConfiguration";
+
+	public static final String RESOURCES_FOLDER = "/resources/";
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java
index ad84786550c..51f0b73f420 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

 

 import java.awt.Toolkit;

-import java.awt.datatransfer.DataFlavor;

 import java.awt.datatransfer.StringSelection;

 import java.io.StringReader;

 import java.util.HashMap;

@@ -44,7 +43,6 @@ import org.eclipse.papyrus.infra.nattable.handler.PasteInTableHandler;
 import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;

 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

 import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

@@ -123,9 +121,9 @@ public abstract class AbstractPasteWithCategoriesTests extends AbstractOpenTable
 	public static final String PARAMETER_ELEMENT_ID = "org.eclipse.papyrus.uml.Parameter"; //$NON-NLS-1$

 	public static final String PROPERTY_ELEMENT_ID = "org.eclipse.papyrus.uml.Property"; //$NON-NLS-1$

 

-	//TODO : create fields and constructors to get hidden, visibility, and number of categories by depth easily, instead of calculate them each time	

-	

-	

+	// TODO : create fields and constructors to get hidden, visibility, and number of categories by depth easily, instead of calculate them each time

+

+

 	@Before

 	public void initModel() throws Exception {

 		initModel("classTreeTable", getClass().getSimpleName(), getBundle()); //$NON-NLS-1$

@@ -273,9 +271,9 @@ public abstract class AbstractPasteWithCategoriesTests extends AbstractOpenTable
 			verifyModelContents();

 			checkTableDataStructure();

 

-			//TODO : activate me checkCopyToClipboard(str);

+			// TODO : activate me checkCopyToClipboard(str);

 

-			//TODO : activate me checkUndo_Redo();

+			// TODO : activate me checkUndo_Redo();

 

 			// we close the table, we re-open it and we check that is contains is correct!

 			testClose_Open();

@@ -316,9 +314,9 @@ public abstract class AbstractPasteWithCategoriesTests extends AbstractOpenTable
 	}

 

 	protected void checkUndo_Redo() throws Exception {

-		

-		//TODO : use eclipse command will be better

-		

+

+		// TODO : use eclipse command will be better

+

 		// IUndoableOperation[] undoContext = CheckedOperationHistory.getInstance().getUndoHistory(CheckedOperationHistory.GLOBAL_UNDO_CONTEXT);

 		EditingDomainUndoContext undoContext = new EditingDomainUndoContext(getTransactionalEditingDomain());

 		getTransactionalEditingDomain().getCommandStack().undo();

@@ -466,10 +464,10 @@ public abstract class AbstractPasteWithCategoriesTests extends AbstractOpenTable
 		// its seems that the clipboard must be filled with the same way than we read it!

 		java.awt.datatransfer.Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();

 

-		if (clipboard.isDataFlavorAvailable(DataFlavor.stringFlavor)) {

-			StringSelection s = new StringSelection(newClipBoardContents);

-			clipboard.setContents(s, s);

-		}

+		// if (clipboard.isDataFlavorAvailable(DataFlavor.stringFlavor)) {

+		StringSelection s = new StringSelection(newClipBoardContents);

+		clipboard.setContents(s, s);

+		// }

 	}

 

 	protected void checkRootClasses(ITreeItemAxis root, EObject parent) throws Exception {

diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/RevealGenericTableTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/RevealGenericTableTest.java
index 520063e4673..2b83f48ae0e 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/RevealGenericTableTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/RevealGenericTableTest.java
@@ -311,7 +311,6 @@ public class RevealGenericTableTest extends AbstractEditorTest {
 		Assert.assertTrue("index of row does not match", rowSelectedPositions[1] == 4); //$NON-NLS-1$

 		Assert.assertTrue("index of row does not match", rowSelectedPositions[2] == 5); //$NON-NLS-1$

 		Assert.assertTrue("number of selected columns does not match: " + columnSelectedPositions.length, columnSelectedPositions.length == 0); //$NON-NLS-1$

-

 	}